Added Stable Branch Support

Author: LRFLEW

configuration.cpp

@@ -11,25 +11,25 @@
 #include <QAudioDeviceInfo>
 #endif
 
-Configuration::Configuration(QString file, QWidget *parent) :
+Configuration::Configuration(QSettings *mainSettings, QString file, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::Configuration),
-    config(file, QSettings::IniFormat)
+    config(file, QSettings::IniFormat),
+    mainSettings(mainSettings)
 {
     ui->setupUi(this);
     setComboBoxData();
 
-    {
-        QSettings main;
+    ui->launcherVersionMsg->setText(tr("Launcher Version: ") + QStringLiteral(APP_VERSION));
 
-        ui->launcherVersionMsg->setText(tr("Launcher Version: ") + QStringLiteral(APP_VERSION));
+    QVariant build = mainSettings->value(QStringLiteral("downloadId"));
+    if (build.isValid()) ui->buildVersionMsg->setText(tr("OpenRCT2 Build: ") + build.toString());
 
-        QVariant build = main.value(QStringLiteral("downloadId"));
-        if (build.isValid()) ui->buildVersionMsg->setText(tr("OpenRCT2 Build: ") + build.toString());
+    QVariant hash = mainSettings->value(QStringLiteral("gitHash"));
+    if (hash.isValid()) ui->buildHashMsg->setText(tr("OpenRCT2 Git Hash: ") + hash.toByteArray().left(4).toHex().left(7));
 
-        QVariant hash = main.value(QStringLiteral("gitHash"));
-        if (build.isValid()) ui->buildHashMsg->setText(tr("OpenRCT2 Git Hash: ") + hash.toByteArray().left(4).toHex().left(7));
-    }
+    QVariant stable = mainSettings->value(QStringLiteral("stable"));
+    if (stable.isValid() && stable.toBool()) ui->stableButton->setChecked(true);
 
     for (QLineEdit *w : ui->tabWidget->findChildren<QLineEdit *>()) {
         QVariant setting = w->property("config");
@@ -247,6 +247,15 @@ Configuration::~Configuration()
         }
     }
 
+    QVariant stableVar = mainSettings->value(QStringLiteral("stable"));
+    bool stable = stableVar.isValid() && stableVar.toBool();
+    bool newStable = ui->stableButton->isChecked();
+    if (stable != newStable) {
+        mainSettings->setValue(QStringLiteral("stable"), newStable);
+        mainSettings->sync();
+        emit redownload();
+    }
+
     delete ui;
 }
 

configuration.h

@@ -14,16 +14,20 @@ class Configuration : public QDialog
     Q_OBJECT
 
 public:
-    explicit Configuration(QString file, QWidget *parent = 0);
+    explicit Configuration(QSettings *mainSettings, QString file, QWidget *parent = 0);
     ~Configuration();
 
+signals:
+    void redownload();
+
 public slots:
     void on_locateRCT2_clicked();
 
 private:
     Ui::Configuration *ui;
     void setComboBoxData();
     QSettings config;
+    QSettings *mainSettings;
     QMap<QString, QString> langEquiv;
 };
 

configuration.ui

@@ -102,13 +102,7 @@
           </spacer>
          </item>
          <item>
-          <widget class="QRadioButton" name="radioButton_2">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="toolTip">
-            <string>Stable is not currently avaiable through the launcher</string>
-           </property>
+          <widget class="QRadioButton" name="stableButton">
            <property name="text">
             <string>Stable</string>
            </property>
@@ -118,7 +112,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QRadioButton" name="radioButton">
+          <widget class="QRadioButton" name="developButton">
            <property name="text">
             <string>Develop</string>
            </property>

mainwindow.cpp

@@ -42,7 +42,8 @@ void MainWindow::on_optionsButton_clicked() {
         dir.cd(QStringLiteral(OPENRCT2_BASE));
     }
 
-    Configuration config(dir.filePath(QStringLiteral("config.ini")));
+    Configuration config(&updater.settings, dir.filePath(QStringLiteral("config.ini")));
+    connect(&config, &Configuration::redownload, [this]{ ui->launchButton->setEnabled(false); updater.download(); });
     config.exec();
 }
 

updater.cpp

@@ -18,42 +18,49 @@
 #include <QMessageBox>
 #include <QNetworkRequest>
 #include <QProcess>
-#include <QSettings>
 #include <QStringBuilder>
 #include <QTemporaryFile>
 #include <QUrlQuery>
 
 Updater::Updater(QObject *parent) : QObject(parent), url(QStringLiteral("https://openrct2.org/altapi/"))
 {
     connect(&net, &QNetworkAccessManager::sslErrors, [](QNetworkReply * reply, const QList<QSslError> & errors){Q_UNUSED(reply); qDebug() << errors;});
+}
+
+void Updater::download() {
+    if (update != nullptr) update->abort(), update = nullptr;
+    if (api != nullptr) api->abort(), api = nullptr;
+    if (bundle != nullptr) bundle->abort(), bundle = nullptr;
 
     QUrlQuery query;
     query.addQueryItem(QStringLiteral("command"), QStringLiteral("get-latest-download"));
     query.addQueryItem(QStringLiteral("flavourId"), QStringLiteral(OPENRCT2_FLAVOR));
-    query.addQueryItem(QStringLiteral("gitBranch"), QStringLiteral("develop"));
+
+    QVariant stableVar = settings.value(QStringLiteral("stable"));
+    bool stable = stableVar.isValid() && stableVar.toBool();
+    query.addQueryItem(QStringLiteral("gitBranch"), stable ? QStringLiteral("master") : QStringLiteral("develop"));
 
     url.setQuery(query.query());
-}
 
-void Updater::download() {
     QNetworkRequest urequest(QStringLiteral("https://api.github.com/repos/LRFLEW/OpenRCT2Launcher/releases/latest"));
-    QNetworkReply *ureply = net.get(urequest);
-    connect(ureply, &QNetworkReply::finished, [this, ureply]() { receivedUpdate(ureply); });
+    update = net.get(urequest);
+    connect(update, &QNetworkReply::finished, this, &Updater::receivedUpdate);
 
     QNetworkRequest request(url);
-    QNetworkReply *reply = net.get(request);
-    connect(reply, &QNetworkReply::finished, [this, reply]() { receivedAPI(reply); });
+    api = net.get(request);
+    connect(api, &QNetworkReply::finished, this, &Updater::receivedAPI);
 }
 
-void Updater::receivedUpdate(QNetworkReply *reply) {
-    if (reply->error() != QNetworkReply::NoError) {
-        emit error(reply->errorString());
+void Updater::receivedUpdate() {
+    if (update->error() != QNetworkReply::NoError) {
+        emit error(update->errorString());
         return;
     }
 
-    QByteArray data = reply->readAll();
-    reply->close();
-    reply->deleteLater();
+    QByteArray data = update->readAll();
+    update->close();
+    update->deleteLater();
+    update = nullptr;
 
     QJsonDocument response = QJsonDocument::fromJson(data);
     QJsonObject robj = response.object();
@@ -87,15 +94,16 @@ void Updater::receivedUpdate(QNetworkReply *reply) {
     }
 }
 
-void Updater::receivedAPI(QNetworkReply *reply) {
-    if (reply->error() != QNetworkReply::NoError) {
-        emit error(reply->errorString());
+void Updater::receivedAPI() {
+    if (api->error() != QNetworkReply::NoError) {
+        emit error(api->errorString());
         return;
     }
 
-    QByteArray data = reply->readAll();
-    reply->close();
-    reply->deleteLater();
+    QByteArray data = api->readAll();
+    api->close();
+    api->deleteLater();
+    api = nullptr;
 
     QJsonDocument response = QJsonDocument::fromJson(data);
     QJsonObject robj = response.object();
@@ -104,7 +112,6 @@ void Updater::receivedAPI(QNetworkReply *reply) {
         return;
     }
 
-    QSettings settings;
     QString have = settings.value(QStringLiteral("downloadId")).toString();
     version = robj[QStringLiteral("downloadId")].toString();
 
@@ -116,21 +123,22 @@ void Updater::receivedAPI(QNetworkReply *reply) {
         githash = QByteArray::fromHex(robj[QStringLiteral("gitHash")].toString().toLatin1());
 
         QNetworkRequest request(robj[QStringLiteral("url")].toString());
-        QNetworkReply *dreply = net.get(request);
-        connect(dreply, &QNetworkReply::finished, [this, dreply]() { this->receivedBundle(dreply); });
-        connect(dreply, &QNetworkReply::downloadProgress, this, &Updater::downloadProgress);
+        bundle = net.get(request);
+        connect(bundle, &QNetworkReply::finished, this, &Updater::receivedBundle);
+        connect(bundle, &QNetworkReply::downloadProgress, this, &Updater::downloadProgress);
     }
 }
 
-void Updater::receivedBundle(QNetworkReply *reply) {
-    if (reply->error() != QNetworkReply::NoError) {
-        emit error(reply->errorString());
+void Updater::receivedBundle() {
+    if (bundle->error() != QNetworkReply::NoError) {
+        emit error(bundle->errorString());
         return;
     }
 
-    QByteArray data = reply->readAll();
-    reply->close();
-    reply->deleteLater();
+    QByteArray data = bundle->readAll();
+    bundle->close();
+    bundle->deleteLater();
+    bundle = nullptr;
 
     if (data.size() != size) {
         emit error(tr("Invalid Download"));
@@ -161,9 +169,9 @@ void Updater::receivedBundle(QNetworkReply *reply) {
     if (extract(data, bin)) {
         emit installed();
 
-        QSettings settings;
         settings.setValue(QStringLiteral("downloadId"), version);
         settings.setValue(QStringLiteral("gitHash"), githash);
+        settings.sync();
     } else {
         emit error(tr("Error extracting archive"));
     }

updater.h

@@ -5,13 +5,15 @@
 #include <QByteArray>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QSettings>
 #include <QUrl>
 
 class Updater : public QObject
 {
     Q_OBJECT
 public:
     explicit Updater(QObject *parent = 0);
+    QSettings settings;
 
 signals:
     void installed();
@@ -21,10 +23,10 @@ class Updater : public QObject
 public slots:
     void download();
 
-private:
-    void receivedUpdate(QNetworkReply *reply);
-    void receivedAPI(QNetworkReply *reply);
-    void receivedBundle(QNetworkReply *reply);
+private slots:
+    void receivedUpdate();
+    void receivedAPI();
+    void receivedBundle();
 
 private:
     bool extract(QByteArray &data, QDir &bin);
@@ -35,6 +37,10 @@ public slots:
     QByteArray hash;
     QByteArray githash;
     QString version;
+
+    QNetworkReply *update = nullptr;
+    QNetworkReply *api = nullptr;
+    QNetworkReply *bundle = nullptr;
 };
 
 #endif // UPDATER_H