nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 00:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved JSON string parsing in QT4. This uses a regexp based parser.

Browse Source
This commit is contained in:
Magnus Gille
2015-12-31 12:56:52 -05:00
parent 62fa11194c
commit 145653c608
1 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/OAuthDialog.cpp
View File

@@ -349,21 +349,55 @@ OAuthDialog::loadFinished(bool ok) {
}
}
static QString RawJsonStringGrab(const QByteArray& payload,
const QString& needle) {
// A RegExp based JSON string parser. Not the best, but it does the job.
QString regex =
// This matches the key.
"(" + needle + "|\"" + needle + "\"|'" + needle + "')"
// Matches the separator.
"[\\s]*:[\\s]*"
// matches the value.
"(\"\\S+\"|'\\S+')";
QRegExp q(regex);
if (!q.isValid()) {
// Somehow failed to build the regex.
return "";
}
int start = q.indexIn(payload);
int pos = q.pos(2);
if (start == -1 || pos == -1) {
// Failed to find the key or the value.
return "";
}
QString ret = payload.mid(pos, q.matchedLength() + start - pos);
// Remove " or ' from the value.
ret.remove(0, 1);
ret.remove(ret.size() - 1, 1);
return ret;
}
void OAuthDialog::networkRequestFinished(QNetworkReply *reply) {
if (reply->error() == QNetworkReply::NoError) {
QByteArray payload = reply->readAll(); // JSON
QJsonParseError parseError;
QJsonDocument document = QJsonDocument::fromJson(payload, &parseError);
QString refresh_token;
QString access_token;
#if QT_VERSION > 0x050000
QJsonParseError parseError;
QJsonDocument document = QJsonDocument::fromJson(payload, &parseError);
if (parseError.error == QJsonParseError::NoError) {
refresh_token = document.object()["refresh_token"].toString();
access_token = document.object()["access_token"].toString();
}
#else
refresh_token = RawJsonStringGrab(payload, "refresh_token");
access_token = RawJsonStringGrab(payload, "access_token");
#endif
if (((site == GOOGLE_DRIVE || site == GOOGLE_CALENDAR) &&
refresh_token == "" ) || access_token == "") {
// Something failed.
// Only Google uses both refresh and access tokens.
QString error = QString(
tr("Error retrieving authoriation credentials"));
QMessageBox oautherr(QMessageBox::Critical,
@@ -374,7 +408,8 @@ void OAuthDialog::networkRequestFinished(QNetworkReply *reply) {
}
if (site == DROPBOX) {
appsettings->setCValue(context->athlete->cyclist, GC_DROPBOX_TOKEN, access_token);
appsettings->setCValue(context->athlete->cyclist, GC_DROPBOX_TOKEN,
access_token);
QString info = QString(tr("Dropbox authorization was successful."));
QMessageBox information(QMessageBox::Information, tr("Information"), info);
information.exec();
@@ -412,7 +447,7 @@ void OAuthDialog::networkRequestFinished(QNetworkReply *reply) {
context->athlete->cyclist,
GC_GOOGLE_DRIVE_LAST_ACCESS_TOKEN_REFRESH,
QDateTime::currentDateTime());
QString info = QString(
tr("Google Drive authorization was successful."));
QMessageBox information(QMessageBox::Information,