ytobi's aria2 fixes

.gitlab-ci.yml

@@ -39,7 +39,7 @@ build linux x86_64:
 
     # Post-processing
     - mv launcher/bin .
-    - upx --lzma -9 --force bin/launcher
+    - upx -9 --force bin/launcher
   artifacts:
     paths:
       - bin/
@@ -64,7 +64,7 @@ build windows i686:
 
     # Post-processing
     - mv launcher/bin .
-    - upx --lzma -9 --force bin/launcher.exe
+    - upx -9 --force bin/launcher.exe
   artifacts:
     paths:
       - bin/
@@ -87,7 +87,6 @@ deploy linux x86_64:
       - artifact/
 
 deploy windows i686:
-  image: ubuntu
   stage: deploy
   dependencies:
     - build windows i686

launcher/ci.patch

@@ -1,13 +1,13 @@
 diff --git a/launcher/launcher.pro b/launcher/launcher.pro
-index 2484f07..f7940f2 100644
+index 1f2bf6c..fbd06ad 100644
 --- a/launcher/launcher.pro
 +++ b/launcher/launcher.pro
-@@ -59,7 +59,7 @@ RESOURCES += \
+@@ -59,7 +59,6 @@ RESOURCES += \
  # For QArchive
  QT += concurrent
 
 -LIBS += ../libs/QArchive/libQArchive.a -larchive -lbz2 -llzma -llz4 -lz -lzstd -lnettle -lexpat -lxml2
-+LIBS += ../libs/QArchive/release/libQArchive.a -larchive -lbz2 -llzma -llz4 -lz -lzstd -lnettle -lexpat -lxml2 /opt/mxe/usr/i686-w64-mingw32.static.posix/lib/liblzma.a
- win32:LIBS += -lbcrypt -liconv
+-win32:LIBS += -lbcrypt -liconv
++LIBS += ../libs/QArchive/release/libQArchive.a -larchive -lnettle -lxml2
 
  INCLUDEPATH += ../libs/QArchive ../libs/QArchive/include

launcher/launcher.pro

@@ -11,7 +11,7 @@ TEMPLATE = app
 
 DESTDIR = $$PWD/bin
 
-VERSION = 1.2.2
+VERSION = 1.3.0
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 
 RC_ICONS = logo.ico
@@ -61,7 +61,6 @@ RESOURCES += \
 # For QArchive
 QT += concurrent
 
-LIBS += ../libs/QArchive/libQArchive.a -larchive -lbz2 -llzma -llz4 -lz -lzstd -lnettle -lexpat -lxml2
-win32:LIBS += -lbcrypt -liconv
+LIBS += ../libs/QArchive/release/libQArchive.a -larchive -lnettle -lxml2
 
 INCLUDEPATH += ../libs/QArchive ../libs/QArchive/include

launcher/mainwindow.cpp

@@ -14,6 +14,7 @@
 #include <QtNetwork/QSslConfiguration>
 #include <QtNetwork/QNetworkReply>
 
+#include <QCoreApplication>
 #include <QSettings>
 #include <QFile>
 #include <QJsonDocument>
@@ -98,7 +99,7 @@ void MainWindow::play() {
     QString gamePath = installPath.filePath(versionInfo.value("program/executable").toString());
     qDebug() << "Starting" << gamePath;
     if (game.startDetached(gamePath, {}, installPath.absolutePath())) {
-        this->close();
+        QCoreApplication::quit();
     } else {
         QMessageBox::critical(this, "Error Starting Game", tr("Error starting %1: %2").arg(gamePath, game.errorString()));
     }

launcher/options.cpp

@@ -6,9 +6,9 @@
 #include <QtDebug>
 
 const std::map<const QString, const QVariant> Options::defaultOptions = {
-    {"path", "."},
-    {"repos/program", "https://s3.wasabisys.com/ao-manifests/program_${os}_${arch}.json"},
-    {"repos/assets", "https://s3.wasabisys.com/ao-manifests/assets.json"},
+    {"path", "client"},
+    {"repos/program", "https://server.raidensnakesden.net/program_${os}_${arch}.json"},
+    {"repos/assets", "https://server.raidensnakesden.net/assets.json"},
     {"checkOnLaunch", Qt::CheckState::Checked},
     {"version", APP_VERSION}
 };

launcher/updater.cpp

@@ -399,13 +399,13 @@ void Updater::taskDownload(QDir &installDir, const QUrl &url, const QString &has
         }
 
         if (!hash.isEmpty()) {
-            QCryptographicHash sha1(QCryptographicHash::Sha1);
-            sha1.addData(&file);
-            if (sha1.result().toHex() == hash) {
+            QCryptographicHash sha256(QCryptographicHash::Sha256);
+            sha256.addData(&file);
+            if (sha256.result().toHex() == hash) {
                 skipDownload = true;
             } else {
                 qWarning() << "checksum mismatch: expected" << hash
-                           << "but got" << sha1.result().toHex();
+                           << "but got" << sha256.result().toHex();
             }
         }
 
@@ -467,11 +467,11 @@ void Updater::taskDownload(QDir &installDir, const QUrl &url, const QString &has
 
         // Calculate SHA-1 checksum of file
         if (!hash.isEmpty()) {
-            QCryptographicHash sha1(QCryptographicHash::Sha1);
-            sha1.addData(&file);
-            if (sha1.result().toHex() != hash) {
+            QCryptographicHash sha256(QCryptographicHash::Sha256);
+            sha256.addData(&file);
+            if (sha256.result().toHex() != hash) {
                 qCritical() << "checksum: expected" << hash
-                            << "but got" << sha1.result().toHex();
+                            << "but got" << sha256.result().toHex();
                 throw RuntimeError(tr("Checksum of file %1 was invalid.")
                                    .arg(url.toDisplayString()));
             }
@@ -493,12 +493,15 @@ void Updater::taskDownload(QDir &installDir, const QUrl &url, const QString &has
         // (Yeah, we're gonna do this crappy trick again...)
         eventLoop.reset(new QEventLoop());
         QArchive::DiskExtractor extractor(filename, installDir.path(), this, false);
+        // Note. The parmeters of the signal QArchive::DiskExtractor::error do not match the slot.
+        // QArchive::DiskExtractor::error emits short code only
         QObject::connect(&extractor, &QArchive::DiskExtractor::error,
-                         [&](short code, const QString &file) {
-            error = true;
-            errorMsg = file;
-            errorCode = code;
-            qCritical() << "Error extracting" << file << "- code" << code;
+                         [&](short code) {
+             const QString file("Unknown file");
+             error = true;
+             errorMsg = file;
+             errorCode = code;
+             qCritical() << "Error extracting" << file << "- code" << code;
             emit eventLoop->quit();
         });
         QObject::connect(&extractor, &QArchive::DiskExtractor::progress,
@@ -550,7 +553,7 @@ void Updater::taskDelete(QDir &installDir, const QStringList &targets) {
         if (!fileInfo.canonicalFilePath().startsWith(installDir.canonicalPath())) {
             qWarning() << target << ": ignoring invalid path!";
         } else {
-            QFile::remove(target);
+            QFile::remove(installDir.filePath(target));
         }
 
         completed++;