Merge branch 'master' into doc_update

Author: Gemba

docs/CLIHELP.md

@@ -224,8 +224,10 @@ If you have a rom that Skyscraper doesn't even try to gather data for, it might
 **Example(s)**
 
 ```
-Skyscraper -p snes -s thegamesdb --addext *.ext
+Skyscraper -p snes -s thegamesdb --addext '*.ext'
 Skyscraper -p snes -s thegamesdb --addext '*.ext1 *.ext2'
+# or even
+Skyscraper -p snes -s thegamesdb --addext '.ext1 ext2'
 ```
 
 ### --cache <COMMAND[:OPTIONS]>

docs/CONFIGINI.md

@@ -846,7 +846,7 @@ Allowed in sections: `[<PLATFORM>]`
 
 #### addExtensions
 
-Adds the rom extensions to the ones that are already supported by the platform, use a space between each extension.
+Adds the rom extensions to the ones that are already supported by the platform, use a space between each extension. You may omit the `*` or even `*.` when providing an extension.
 
 !!! info
 

hints.xml

@@ -31,11 +31,12 @@
   <hint>You can scrape game manuals with Skyscraper and display them if your frontend supports this. Use manuals=true in config.ini.</hint>
   <hint>You can make Skyscraper use the XDG Base Directories on Linux systems. See the https://gemba.github.io/skyscraper/XDG documentation.</hint>
   <hint>Skyscraper supports the ES-DE frontend gamelist format.</hint>
-  <hint>You can add new platforms (i.e., systems to scrape) with configuration file edits. See https://gemba.github.io/skyscraper/PLATFORMS</hint>
+  <hint>You can add new platforms (i.e., systems to scrape) by editing configuration files. See https://gemba.github.io/skyscraper/PLATFORMS</hint>
   <hint>You can scrape data from GameBase DB files with Skyscraper. GameBase DBs are a well of information especially for indie or homebrew games for retro systems.</hint>
   <hint>Skyscraper supports ten scraping modules: 7 for online sources and 3 for local sources.</hint>
   <hint>Pizza and beer go well together.</hint>
   <hint>Skyscraper debuted at June, 11th 2017.</hint>
   <hint>Skyscraper runs on Linux, macOS and Windows.</hint>
   <hint>You can use relative paths for almost every path related option. See https://gemba.github.io/skyscraper/PATHHANDLING</hint>
+  <hint>For a file extension/suffix option value like '*.ext', you can use the shorter forms '.ext' or even only 'ext'.</hint>
 </hints>

src/cli.cpp

@@ -154,7 +154,7 @@ void Cli::createParser(QCommandLineParser *parser, QString platforms) {
     QCommandLineOption addextOption(
         "addext",
         "Add this or these file extension(s) to accepted file extensions "
-        "during a scraping run. (example: '*.zst' or '*.zst *.ext')",
+        "during a scraping run. (ex.: '*.zst *.ext', also valid: '.zst ext')",
         "EXTENSION(S)", "");
     QCommandLineOption flagsOption(
         "flags",

src/platform.cpp

@@ -154,15 +154,13 @@ QString Platform::getFormats(QString platform, QString extensions,
     addExts = addExtensions.split(" ", QString::SkipEmptyParts);
 #endif
     for (auto f : addExts) {
-        if (f.startsWith("*.")) {
-            formats << f;
-        }
+        formats << f;
     }
 
     QStringList myFormats = peas[platform].toHash()["formats"].toStringList();
     for (auto f : myFormats) {
         if (f.trimmed().startsWith("*.")) {
-            formats << f.trimmed();
+            formats << f.trimmed().toLower();
         }
     }
 

src/settings.cpp

@@ -155,7 +155,7 @@ void RuntimeCfg::applyConfigIni(CfgType type, QSettings *settings,
             if (v.isEmpty())
                 continue;
             if (k == "addExtensions") {
-                config->addExtensions = v;
+                config->addExtensions = parseExtensions(v);
                 continue;
             }
             if (k == "artworkXml") {
@@ -191,7 +191,7 @@ void RuntimeCfg::applyConfigIni(CfgType type, QSettings *settings,
                 continue;
             }
             if (k == "extensions") {
-                config->extensions = v;
+                config->extensions = parseExtensions(v);
                 continue;
             }
             if (k == "gameListFilename") {
@@ -321,7 +321,8 @@ void RuntimeCfg::applyConfigIni(CfgType type, QSettings *settings,
                 continue;
             }
             if (k == "videoConvertExtension") {
-                config->videoConvertExtension = v;
+                config->videoConvertExtension =
+                    parseExtensions(v).replace("*.", "");
                 continue;
             }
         } else if (conv == "bool") {
@@ -611,7 +612,7 @@ void RuntimeCfg::applyCli(bool &inputFolderSet, bool &gameListFolderSet,
         }
     }
     if (parser->isSet("addext")) {
-        config->addExtensions = parser->value("addext");
+        config->addExtensions = parseExtensions(parser->value("addext"));
     }
     if (parser->isSet("refresh")) {
         config->refresh = true;
@@ -815,3 +816,20 @@ QString RuntimeCfg::toAbsolutePath(bool isCliOpt, QString optionVal) {
     }
     return Config::lexicallyNormalPath(optionVal);
 }
+
+QString RuntimeCfg::parseExtensions(const QString &optionVal) {
+    // --addext, addExtension, extensions
+    // 'foo .bar *.bAZ' --> '*.foo *.bar *.baz'
+    QStringList exts = optionVal.simplified().split(" ");
+    QStringList ret;
+    for (const auto &e : exts) {
+        if (e.startsWith("*.")) {
+            ret.append(e.toLower());
+        } else if (e.startsWith(".")) {
+            ret.append("*" % e.toLower());
+        } else {
+            ret.append("*." % e.toLower());
+        }
+    }
+    return ret.join(" ");
+}

src/settings.h

@@ -185,6 +185,7 @@ class RuntimeCfg : public QObject {
     bool scraperAllowedForMatch(const QString &providedScraper,
                                 const QString &opt);
     QString toAbsolutePath(bool isCliOpt, QString optionVal);
+    QString parseExtensions(const QString &optionVal);
 
     Settings *config;
     const QCommandLineParser *parser;