Add various debug logs

Unvanquished · Jul 25, 2018 · c7454d3 · c7454d3
1 parent 3febcc5
commit c7454d3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/ariadownloader.cpp b/ariadownloader.cpp
@@ -1,3 +1,5 @@
+#include <QDebug>
+
 #include "ariadownloader.h"
 #include "system.h"
 
@@ -42,24 +44,30 @@ AriaDownloader::~AriaDownloader()
 bool AriaDownloader::addUri(const std::string& uri)
 {
     int ret = aria2::addUri(session_, nullptr, { uri }, aria2::KeyVals());
-    return ret == 1;
+    qDebug() << "aria2::addUri returned" << ret;
+    return ret == 0;
 }
 
 bool AriaDownloader::run(void)
 {
     int ret = aria2::run(session_, aria2::RUN_ONCE);
+    if (ret != 1) {
+        qDebug() << "aria2::run returned" << ret;
+    }
     return ret == 1;
 }
 
 void AriaDownloader::toggleDownloads(void)
 {
     if (pausedGids_.empty()) {
+        qDebug() << "AriaDownloader::toggleDownloads - pausing";
         auto gids = aria2::getActiveDownload(session_);
         for (aria2::A2Gid gid : gids) {
             aria2::pauseDownload(session_, gid, true);
             pausedGids_.push_back(gid);
         }
     } else {
+        qDebug() << "AriaDownloader::toggleDownloads - resuming";
         while (!pausedGids_.empty()) {
             aria2::unpauseDownload(session_, pausedGids_.front());
             pausedGids_.pop_front();

diff --git a/downloadworker.cpp b/downloadworker.cpp
@@ -33,17 +33,21 @@ void DownloadWorker::onDownloadCallback(aria2::Session* session, aria2::Download
 {
     switch (event) {
         case aria2::EVENT_ON_BT_DOWNLOAD_COMPLETE:
+            qDebug() << "onDownloadCallback event BT_DOWNLOAD_COMPLETE";
             if (!extractUpdate()) return;
             break;
 
         case aria2::EVENT_ON_DOWNLOAD_COMPLETE:
+            qDebug() << "onDownloadCallback event DOWNLOAD_COMPLETE";
             if (state == DOWNLOADING_TORRENT) {
+                qDebug() << "DownloadWorker.state changed from DOWNLOADING_TORRENT to DOWNLOADING_UNVANQUISHED";
                 state = DOWNLOADING_UNVANQUISHED;
                 aria2::DownloadHandle* handle = aria2::getDownloadHandle(session, gid);
                 aria2::A2Gid torrentGid = handle->getFollowedBy()[0];
                 setDownloadPathAndFiles(session, torrentGid);
                 aria2::deleteDownloadHandle(handle);
             } else if (state == DOWNLOADING_UPDATER) {
+                qDebug() << "Updater download complete";
                 aria2::DownloadHandle* handle = aria2::getDownloadHandle(session, gid);
                 qDebug() << handle->getNumFiles();
                 if (handle->getNumFiles() > 1) {
@@ -54,21 +58,26 @@ void DownloadWorker::onDownloadCallback(aria2::Session* session, aria2::Download
                 Sys::updateUpdater(QString(files[0].path.c_str()));
                 return;
             } else {
+                qDebug() << "Unvanquished download complete (?)";
                 event = aria2::EVENT_ON_BT_DOWNLOAD_COMPLETE;
                 if (!extractUpdate()) return;
             }
             break;
 
         case aria2::EVENT_ON_DOWNLOAD_ERROR:
+            qDebug() << "onDownloadCallback event DOWNLOAD_ERROR";
             break;
 
         case aria2::EVENT_ON_DOWNLOAD_PAUSE:
+            qDebug() << "onDownloadCallback event DOWNLOAD_PAUSE";
             break;
 
         case aria2::EVENT_ON_DOWNLOAD_START:
+            qDebug() << "onDownloadCallback event DOWNLOAD_START";
             break;
 
         case aria2::EVENT_ON_DOWNLOAD_STOP:
+            qDebug() << "onDownloadCallback event DOWNLOAD_STOP";
             break;
     }
     emit onDownloadEvent(event);

diff --git a/main.cpp b/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    qDebug() << "Git version: " << GIT_VERSION;
+    qDebug() << "Git version:" << GIT_VERSION;
 
     app.setWindowIcon(QIcon(":resources/updater.png"));
     int fontId = QFontDatabase::addApplicationFont(":resources/Roboto-Regular.ttf");

diff --git a/qmldownloader.cpp b/qmldownloader.cpp
@@ -72,6 +72,7 @@ void QmlDownloader::onDownloadEvent(int event)
     switch (event) {
         case aria2::EVENT_ON_BT_DOWNLOAD_COMPLETE:
             if (state() != COMPLETED) {
+                qDebug() << "Calling Sys::install";
                 Sys::install();
                 settings_.setCurrentVersion(currentVersion_);
                 settings_.setInstallFinished(true);
@@ -151,11 +152,13 @@ void QmlDownloader::startGame(void)
     QProcess *process = new QProcess;
     connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), process, SLOT(deleteLater()));
     connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), QApplication::instance(), SLOT(quit()));
+    qDebug() << "Starting game with command line:" << commandLine;
     process->start(commandLine);
 }
 
 void QmlDownloader::toggleDownload(void)
 {
+    qDebug() << "QmlDownloader::toggleDownload called";
     if (state() == COMPLETED) return;
     if (!worker_) {
         startUpdate();
@@ -168,6 +171,7 @@ void QmlDownloader::toggleDownload(void)
 void QmlDownloader::stopAria(void)
 {
     if (worker_) {
+        qDebug() << "Stopping downloader thread";
         worker_->stop();
         thread_.quit();
         thread_.wait();
@@ -192,6 +196,7 @@ void QmlDownloader::checkForUpdate()
 void QmlDownloader::onCurrentVersions(QString updater, QString game)
 {
     if (!updater.isEmpty() && updater != QString(GIT_VERSION)) {
+        qDebug() << "Updater update to version" << updater << "required";
         QString url = UPDATER_BASE_URL + "/" + updater + "/" + Sys::updaterArchiveName();
         temp_dir_.reset(new QTemporaryDir());
         worker_ = new DownloadWorker();

diff --git a/win.cpp b/win.cpp
@@ -32,6 +32,9 @@ void setRegistryKey(const QString& key,
 bool CreateLink(const QString& sourcePath, const QString& workingDir,
                 const QString& linkPath, QString& linkName)
 {
+    qDebug() << "Shortcut location:" << linkPath;
+    qDebug() << "Shortcut target:" << sourcePath;
+
     HRESULT hres;
     IShellLink* psl;