Minor fixes and enhancements

.github/workflows/mkdocs.yml

@@ -9,7 +9,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@vmaster
+      - uses: actions/checkout@master
       - uses: actions/setup-python@master
         with:
           python-version: 3.x

src/compositor.cpp

@@ -294,7 +294,7 @@ GameEntry::Types Compositor::saveAll(GameEntry &game, QString completeBaseName,
                                      bool esdeMiximage) {
     bool createSubfolder = false;
     QString fn = "/" % completeBaseName;
-    QString subPath = getSubpath(game.path);
+    QString subPath = getMediaSubpath(game.path);
     if (subPath != ".") {
         fn.prepend("/" % subPath);
         createSubfolder = true;
@@ -581,7 +581,7 @@ void Compositor::processChildLayers(GameEntry &game, Layer &layer) {
     }
 }
 
-QString Compositor::getSubpath(const QString &absPath) {
+QString Compositor::getMediaSubpath(const QString &absPath) {
     QString subPath = ".";
     if (config->frontend == "esde") {
         // ES-DE expects media files in same subpath (tree structure) as

src/compositor.h

@@ -42,8 +42,7 @@ class Compositor : public QObject {
     void processXml();
     GameEntry::Types saveAll(GameEntry &game, QString completeBaseName,
                              bool isEsde);
-    // TODO: check, does member fit in here?
-    QString getSubpath(const QString &absPath);
+    QString getMediaSubpath(const QString &absPath);
 
 private:
     void addChildLayers(Layer &layer, QXmlStreamReader &xml);

src/main.cpp

@@ -101,7 +101,7 @@ BOOL WINAPI ConsoleHandler(DWORD dwType) {
             if (skyscraper != nullptr) {
                 if (skyscraper->state == Skyscraper::OpMode::SINGLE) {
                     // Nothing important going on, just exit
-                    exit(1);
+                    exit(2);
                 } else if (skyscraper->state == Skyscraper::OpMode::NO_INTR) {
                     // Ignore signal, something important is going on
                     // that needs to finish!
@@ -119,12 +119,12 @@ BOOL WINAPI ConsoleHandler(DWORD dwType) {
                     skyscraper->queue->clearAll();
                 }
             } else {
-                exit(1);
+                exit(2);
             }
         } else {
             ncprintf("\033[1;31mUser REALLY wants to quit NOW, forcing "
                     "unclean exit...\033[0m\n");
-            exit(1);
+            exit(2);
         }
     }
 #if defined(Q_OS_WIN)

src/scraperworker.cpp

@@ -335,7 +335,7 @@ void ScraperWorker::run() {
             }
             // copy extra media files (not part of compositor/artwork)
             const QString baseName = info.completeBaseName();
-            const QString subPath = compositor.getSubpath(game.path);
+            const QString subPath = compositor.getMediaSubpath(game.path);
             frontend->copyMedia(mediaSaved, baseName, subPath, game);
         }