read versions from current.json file

Author: illwieckz

currentversionfetcher.cpp

@@ -20,33 +20,50 @@ void CurrentVersionFetcher::fetchCurrentVersion(QString url)
 
 void CurrentVersionFetcher::reply(QNetworkReply* reply)
 {
-    QString game;
-    QString updater;
+    QString gameVersion;
+    QString updaterVersion;
+
     if (reply->error() != QNetworkReply::NoError) {
         qDebug() << "CurrentVersionFetcher: network error";
-        emit onCurrentVersions(updater, game);
+        emit onCurrentVersions(updaterVersion, gameVersion);
         return;
     }
+
     QJsonParseError error;
     QJsonDocument json = QJsonDocument::fromJson(reply->readAll(), &error);
     if (error.error != QJsonParseError::NoError) {
         qDebug() << "CurrentVersionFetcher: JSON parsing error";
-        emit onCurrentVersions(updater, game);
+        emit onCurrentVersions(updaterVersion, gameVersion);
         return;
     }
-    QJsonValue value = json.object().value("updater");
-    if (value != QJsonValue::Undefined) {
-        updater = value.toString();
+    QJsonObject jsonObject = json.object();
+
+    QJsonObject updaterObject = jsonObject["updater"].toObject();
+    if (!updaterObject.isEmpty()) {
+        QJsonValue version = updaterObject.value("version");
+        if (version != QJsonValue::Undefined) {
+            updaterVersion = version.toString();
+        } else {
+            qDebug() << "CurrentVersionFetcher: undefined “version” updater value";
+        }
     } else {
-        qDebug() << "CurrentVersionFetcher: undefined “updater” value";
+        qDebug() << "CurrentVersionFetcher: undefined “updater” key";
     }
-    value = json.object().value("unvanquished");
-    if (value != QJsonValue::Undefined) {
-        game = value.toString();
+
+    QJsonObject gameObject = jsonObject["game"].toObject();
+    if (!gameObject.isEmpty()) {
+        QJsonValue version = gameObject.value("version");
+        if (version != QJsonValue::Undefined) {
+            gameVersion = version.toString();
+        } else {
+            qDebug() << "CurrentVersionFetcher: undefined “version” game value";
+        }
     } else {
-        qDebug() << "CurrentVersionFetcher: undefined “unvanquished” value";
+        qDebug() << "CurrentVersionFetcher: undefined “game” key";
     }
-    qDebug() << "CurrentVersionFetcher: fetched versions: updater =" << updater << "game =" << game;
-    emit onCurrentVersions(updater, game);
+
+    qDebug() << "CurrentVersionFetcher: fetched versions: updater =" << updaterVersion << "game =" << gameVersion;
+
+    emit onCurrentVersions(updaterVersion, gameVersion);
 }
 

currentversionfetcher.h

@@ -14,7 +14,7 @@ class CurrentVersionFetcher : public QObject
     void fetchCurrentVersion(QString url);
 
 signals:
-    void onCurrentVersions(QString updater, QString game);
+    void onCurrentVersions(QString updaterVersion, QString gameVersion);
 
 private slots:
     void reply(QNetworkReply* reply);

qmldownloader.cpp

@@ -200,14 +200,14 @@ void QmlDownloader::stopAria()
 void QmlDownloader::checkForUpdate()
 {
     connect(&fetcher_, SIGNAL(onCurrentVersions(QString, QString)), this, SLOT(onCurrentVersions(QString, QString)));
-    fetcher_.fetchCurrentVersion("https://dl.unvanquished.net/versions.json");
+    fetcher_.fetchCurrentVersion("https://cdn.unvanquished.net/current.json");
 }
 
 // Receives the results of the checkForUpdate request.
-void QmlDownloader::onCurrentVersions(QString updater, QString game)
+void QmlDownloader::onCurrentVersions(QString updaterVersion, QString gameVersion)
 {
-    latestUpdaterVersion_ = updater;
-    latestGameVersion_ = game;
+    latestUpdaterVersion_ = updaterVersion;
+    latestGameVersion_ = gameVersion;
 }
 
 // This runs after the splash screen has been displayed for the programmed amount of time (and the
@@ -216,9 +216,10 @@ void QmlDownloader::onCurrentVersions(QString updater, QString game)
 void QmlDownloader::autoLaunchOrUpdate()
 {
     qDebug() << "Previously-installed game version:" << settings_.currentVersion();
-    if (!latestUpdaterVersion_.isEmpty() && latestUpdaterVersion_ != QString(GIT_VERSION)) {
+	QString gitUpdaterVersion = "v" + latestUpdaterVersion_;
+    if (!latestUpdaterVersion_.isEmpty() && gitUpdaterVersion != QString(GIT_VERSION)) {
         qDebug() << "Updater update to version" << latestUpdaterVersion_ << "required";
-        QString url = UPDATER_BASE_URL + "/" + latestUpdaterVersion_ + "/" + Sys::updaterArchiveName();
+        QString url = UPDATER_BASE_URL + "/" + gitUpdaterVersion + "/" + Sys::updaterArchiveName();
         temp_dir_.reset(new QTemporaryDir());
         worker_ = new DownloadWorker(ariaLogFilename_);
         worker_->setDownloadDirectory(QDir(temp_dir_->path()).canonicalPath().toStdString());

qmldownloader.h

@@ -64,7 +64,7 @@ public slots:
     void setTotalSize(int size);
     void setCompletedSize(int size);
     void onDownloadEvent(int event);
-    void onCurrentVersions(QString updater, QString game);
+    void onCurrentVersions(QString updaterVersion, QString gameVersion);
 
     Q_INVOKABLE void startUpdate();
     Q_INVOKABLE void toggleDownload();