read game url from current.json file

Author: illwieckz

currentversionfetcher.cpp

@@ -78,38 +78,29 @@ void CurrentVersionFetcher::reply(QNetworkReply* reply)
 {
     QString updaterVersion;
     QString updaterUrl;
-    QString gameVersion;
+    QString productVersion;
+    QString productUrl;
 
     if (reply->error() != QNetworkReply::NoError) {
         qDebug() << "CurrentVersionFetcher: network error";
-        emit onCurrentVersions(updaterVersion, updaterUrl, gameVersion);
+        emit onCurrentVersions(updaterVersion, updaterUrl, productVersion, productUrl);
         return;
     }
 
     QJsonParseError error;
     QJsonDocument json = QJsonDocument::fromJson(reply->readAll(), &error);
     if (error.error != QJsonParseError::NoError) {
         qDebug() << "CurrentVersionFetcher: JSON parsing error";
-        emit onCurrentVersions(updaterVersion, updaterUrl, gameVersion);
+        emit onCurrentVersions(updaterVersion, updaterUrl, productVersion, productUrl);
         return;
     }
 
     QJsonObject jsonObject = json.object();
 
     ComponentVersionFetcher(jsonObject, "updater", Sys::updaterSystem(), &updaterVersion, &updaterUrl);
 
-    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 “game” key";
-    }
+    ComponentVersionFetcher(jsonObject, "product", "all-all", &productVersion, &productUrl);
 
-    emit onCurrentVersions(updaterVersion, updaterUrl, gameVersion);
+    emit onCurrentVersions(updaterVersion, updaterUrl, productVersion, productUrl);
 }
 

currentversionfetcher.h

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

qmldownloader.cpp

@@ -79,8 +79,8 @@ void QmlDownloader::onDownloadEvent(int event)
                 }
                 qDebug() << "Calling Sys::install";
                 Sys::install();
-                // FIXME: latestGameVersion_ could be empty if CurrentVersionFetcher didn't succeed
-                settings_.setCurrentVersion(latestGameVersion_);
+                // FIXME: latestProductVersion_ could be empty if CurrentVersionFetcher didn't succeed
+                settings_.setCurrentVersion(latestProductVersion_);
                 settings_.setInstallFinished(true);
                 setState(COMPLETED);
                 setDownloadSpeed(0);
@@ -142,7 +142,7 @@ void QmlDownloader::startUpdate()
 
     worker_ = new DownloadWorker(ariaLogFilename_);
     worker_->setDownloadDirectory(dir.canonicalPath().toStdString());
-    worker_->addTorrent("https://cdn.unvanquished.net/current.torrent");
+    worker_->addTorrent(latestProductUrl_.toStdString());
     worker_->moveToThread(&thread_);
     connect(&thread_, SIGNAL(finished()), worker_, SLOT(deleteLater()));
     connect(worker_, SIGNAL(onDownloadEvent(int)), this, SLOT(onDownloadEvent(int)));
@@ -198,16 +198,17 @@ void QmlDownloader::stopAria()
 // Initiates an asynchronous request for the latest available versions.
 void QmlDownloader::checkForUpdate()
 {
-    connect(&fetcher_, SIGNAL(onCurrentVersions(QString, QString, QString)), this, SLOT(onCurrentVersions(QString, QString, QString)));
+    connect(&fetcher_, SIGNAL(onCurrentVersions(QString, QString, QString, QString)), this, SLOT(onCurrentVersions(QString, QString, QString, QString)));
     fetcher_.fetchCurrentVersion("https://cdn.unvanquished.net/current.json");
 }
 
 // Receives the results of the checkForUpdate request.
-void QmlDownloader::onCurrentVersions(QString updaterVersion, QString updaterUrl, QString gameVersion)
+void QmlDownloader::onCurrentVersions(QString updaterVersion, QString updaterUrl, QString productVersion, QString productUrl)
 {
     latestUpdaterVersion_ = updaterVersion;
     latestUpdaterUrl_ = updaterUrl;
-    latestGameVersion_ = gameVersion;
+    latestProductVersion_ = productVersion;
+    latestProductUrl_ = productUrl;
 }
 
 // This runs after the splash screen has been displayed for the programmed amount of time (and the
@@ -233,7 +234,7 @@ void QmlDownloader::autoLaunchOrUpdate()
         connect(&thread_, SIGNAL(started()), worker_, SLOT(download()));
         thread_.start();
     } else if (settings_.currentVersion().isEmpty() ||
-               (!latestGameVersion_.isEmpty() && settings_.currentVersion() != latestGameVersion_)) {
+               (!latestProductVersion_.isEmpty() && settings_.currentVersion() != latestProductVersion_)) {
         qDebug() << "Game update required.";
         emit updateNeeded(true);
     } else {

qmldownloader.h

@@ -64,7 +64,7 @@ public slots:
     void setTotalSize(int size);
     void setCompletedSize(int size);
     void onDownloadEvent(int event);
-    void onCurrentVersions(QString updaterVersion, QString updaterUrl, QString gameVersion);
+    void onCurrentVersions(QString updaterVersion, QString updaterUrl, QString productVersion, QString productUrl);
 
     Q_INVOKABLE void startUpdate();
     Q_INVOKABLE void toggleDownload();
@@ -89,7 +89,8 @@ public slots:
     Settings settings_;
     QString latestUpdaterVersion_;
     QString latestUpdaterUrl_;
-    QString latestGameVersion_;
+    QString latestProductVersion_;
+    QString latestProductUrl_;
     DownloadState state_;
     std::unique_ptr<QTemporaryDir> temp_dir_;