WIP: pass updater mirrors on relaunch

Author: illwieckz

main.cpp

@@ -63,7 +63,7 @@ struct CommandLineOptions {
     QString ariaLogFilename;
     int splashMilliseconds = 3000;
     RelaunchCommand relaunchCommand = RelaunchCommand::NONE;
-    QString updateUpdaterUrl;
+    QStringList updateUpdaterUrls;
     QString connectUrl;
 };
 
@@ -151,9 +151,9 @@ CommandLineOptions getCommandLineOptions(const QApplication& app) {
         } else if (command.startsWith("updateupdater")) {
             options.relaunchCommand = RelaunchCommand::UPDATE_UPDATER;
             if (optionParser.isSet(updaterUrl)) {
-                options.updateUpdaterUrl = optionParser.value(updaterUrl);
+                options.updateUpdaterUrls = optionParser.values(updaterUrl);
             } else {
-                options.updateUpdaterUrl = "";
+                options.updateUpdaterUrls = QStringList();
             }
         } else {
             argParseError("Invalid --internalcommand option: " + command);
@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
     }
 
     SplashController splashController(
-        options.relaunchCommand, options.updateUpdaterUrl, options.connectUrl, settings);
+        options.relaunchCommand, options.updateUpdaterUrls, options.connectUrl, settings);
     splashController.checkForUpdate();
     QmlDownloader downloader(options.ariaLogFilename, options.connectUrl, splashController, settings);
     QQmlApplicationEngine engine;

splashcontroller.cpp

@@ -23,9 +23,9 @@
 #include "system.h"
 
 SplashController::SplashController(
-    RelaunchCommand command, const QString& updateUpdaterUrl,
+    RelaunchCommand command, const QStringList& updateUpdaterUrls,
     const QString& connectUrl, const Settings& settings) :
-        relaunchCommand_(command), updateUpdaterUrl_(updateUpdaterUrl),
+        relaunchCommand_(command), updateUpdaterUrls_(updateUpdaterUrls),
         connectUrl_(connectUrl), settings_(settings) {}
 
 // Possibly initiates an asynchronous request for the latest available versions.
@@ -37,7 +37,7 @@ void SplashController::checkForUpdate()
         case RelaunchCommand::UPDATE_GAME:
             break;
         case RelaunchCommand::UPDATE_UPDATER:
-            if (!updateUpdaterUrl_.isEmpty()) {
+            if (!updateUpdaterUrls_.isEmpty()) {
                 return;
             }
             break;
@@ -82,8 +82,8 @@ void SplashController::onCurrentVersions(QString updaterVersion, QStringList upd
 
     emit newsUrlFetched(newsUrl);
 
-    if (relaunchCommand_ == RelaunchCommand::UPDATE_UPDATER && updateUpdaterUrl_.isEmpty()) {
-        updateUpdaterUrl_ = latestUpdaterUrls_.at(0);
+    if (relaunchCommand_ == RelaunchCommand::UPDATE_UPDATER && updateUpdaterUrls_.isEmpty()) {
+        updateUpdaterUrls_ = latestUpdaterUrls_;
         emit updaterUpdateNeeded();
     }
 }
@@ -126,10 +126,12 @@ void SplashController::autoLaunchOrUpdate()
             // fetch has not succeeded yet. Only do something at that time when the updater url is
             // passed by command line. When the current.json fetch has succeeded, this function is
             // called again if there was no url passed by command line.
-            if (!updateUpdaterUrl_.isEmpty()) {
-                qDebug() << "Updater update to" << updateUpdaterUrl_ << "requested as relaunch action";
+            if (!updateUpdaterUrls_.isEmpty()) {
+                for (auto& url : updateUpdaterUrls_) {
+                    qDebug() << "Updater update to" << url << "requested as relaunch action";
+                }
                 // It is assumed the process is already elevated
-                emit updaterUpdate(updateUpdaterUrl_);
+                emit updaterUpdate(updateUpdaterUrls_);
             }
             return;
 
@@ -143,14 +145,19 @@ void SplashController::autoLaunchOrUpdate()
     // If no relaunch action, detect update needed based on versions.json
     if (!latestUpdaterVersion_.isEmpty() && latestUpdaterVersion_ != updaterAppVersion()) {
         qDebug() << "Updater update to version" << latestUpdaterVersion_ << "required";
-        QString updaterArgs = "--splashms 1 --internalcommand updateupdater --updaterurl " + latestUpdaterUrls_.at(0);
+        QString updaterArgs = "--splashms 1 --internalcommand updateupdater";
+
+        for (auto& url : latestUpdaterUrls_) {
+            updaterArgs += " --updaterurl " + url;
+        }
+
         // Remember the URL if we are doing updater update
         if (!connectUrl_.isEmpty()) {
             updaterArgs += " -- " + connectUrl_;
         }
         switch (Sys::RelaunchElevated(updaterArgs)) {
             case Sys::ElevationResult::UNNEEDED:
-                emit updaterUpdate(latestUpdaterUrls_.at(0));
+                emit updaterUpdate(latestUpdaterUrls_);
                 return;
             case Sys::ElevationResult::RELAUNCHED:
                 QCoreApplication::quit();

splashcontroller.h

@@ -48,7 +48,7 @@ class SplashController : public QObject
 private:
     // Actions from command line args
     RelaunchCommand relaunchCommand_;
-    QString updateUpdaterUrl_; // If command is UPDATE_UPDATER
+    QStringList updateUpdaterUrls_; // If command is UPDATE_UPDATER
     QString connectUrl_; // for pre-updater-update elevation
 
     const Settings& settings_;
@@ -63,7 +63,7 @@ class SplashController : public QObject
 
 public:
     SplashController(
-        RelaunchCommand command, const QString& updateUpdaterUrl,
+        RelaunchCommand command, const QStringList& updateUpdaterUrls,
         const QString& connectUrl, const Settings& settings);
     void checkForUpdate();
     QString gameUrl();
@@ -75,7 +75,7 @@ class SplashController : public QObject
 signals:
     void updateNeeded(bool updateNeeded);
     void updaterUpdateNeeded();
-    void updaterUpdate(QString updaterUrl);
+    void updaterUpdate(QStringList updaterUrls);
     void newsUrlFetched(QString newsUrl);
 
 private slots: