enhancement to scrape with custom file extensions with screenscraper.fr

Author: Gemba

src/screenscraper.cpp

@@ -263,6 +263,7 @@ void ScreenScraper::getSearchResults(QList<GameEntry> &gameEntries,
 
     // If title still unset, no acceptable rom was found, so return with no
     // results
+    // TODO: replace with isEmpty()
     if (game.title.isNull()) {
         return;
     }
@@ -572,11 +573,20 @@ QList<QString> ScreenScraper::getSearchNames(const QFileInfo &info,
 
     // Only one searchName, but direct match query
     if (info.size() != 0) {
-        searchNames.append("crc=" + hashList.at(1) + "&md5=" + hashList.at(2) +
-                           "&sha1=" + hashList.at(3) +
-                           "&romnom=" + hashList.at(0) +
-                           "&romtaille=" + QString::number(info.size()));
+        if (!config->addExtensions.contains(info.suffix().toLower())) {
+            // sunny day approach
+            searchNames.append(
+                "crc=" + hashList.at(1) + "&md5=" + hashList.at(2) +
+                "&sha1=" + hashList.at(3) + "&romnom=" + hashList.at(0) +
+                "&romtaille=" + QString::number(info.size()));
+        } else {
+            // edge case: user has provided additional extensions via
+            // addExtensions, then use basename only for search
+            searchNames.append("romnom=" +
+                               QUrl::toPercentEncoding(baseName, "()"));
+        }
     } else {
+        // provided file has no content or can not be accessed
         searchNames.append("romnom=" + hashList.at(0));
     }
 

src/settings.cpp

@@ -562,8 +562,8 @@ void RuntimeCfg::applyCli(bool &inputFolderSet, bool &gameListFolderSet,
             config->frontendExtra = parser->value("e");
         } else {
             printf("\033[1;33mParameter -e is ignored. Only applicable "
-                    "with frontend %s.\n\033[0m",
-                    allowedFe.join(" or ").toUtf8().constData());
+                   "with frontend %s.\n\033[0m",
+                   allowedFe.join(" or ").toUtf8().constData());
         }
     }
     if (parser->isSet("i")) {

test/getsearchnames/rom_samples/Pac Man.desktop

@@ -0,0 +1 @@
+AAAA

test/getsearchnames/test_getsearchnames.cpp

@@ -326,9 +326,13 @@ private slots:
              QPair<QString, QStringList>(
                  "./rom_samples/BillsTomatoGame_v2.0_1748.lha",
                  {"romnom=BillsTomatoGame_v2.0_1748.lha"})},
+            {"Screenscraper, ROM with uncommon suffix and size greater zero",
+             QPair<QString, QStringList>("./rom_samples/Pac Man.desktop",
+                                         {"romnom=Pac%20Man"})},
 
         };
         settings.mameMap.insert("zaxxon.zip", "Should not break the test.zip");
+        settings.addExtensions = "*.desktop";
 
         match(tests);
     }