empty titles will now be failed + ability to fail files that do not h…

…ave custom variable

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 2.2.6 - 2017-11-09
+
+### Added
+
+* Titles, not found in `customVariables.json` can now be failed (skipped). Useful for MAME and similar emulators.
+
+### Fixed 
+
+* Empty titles (with a length of a 0) will now be failed (skipped) by a parser.
+
 ## 2.2.5 - 2017-11-07
 
 ### Added

package.json

@@ -1,6 +1,6 @@
 {
   "name": "steam-rom-manager",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "license": "GPL-3.0",
   "description": "An app for managing ROMs in Steam",
   "author": {
@@ -23,7 +23,7 @@
       "icon": "./src/assets/icons/win.ico"
     },
     "portable": {
-      "artifactName": "${productName} ${version} (portable).${ext}"
+      "artifactName": "${productName}-portable-${version}.${ext}"
     },
     "linux": {
       "category": "Utility",

src/lang/english/langData.ts

@@ -305,6 +305,7 @@ export const EnglishLang: languageContainer = {
                     skipWithMissingDataDir: 'Skip found accounts with missing data directories',
                     useCredentials: 'Use account credentials',
                     tryToMatchTitle: 'Enabled',
+                    skipFileIfVariableWasNotFound: 'Skip file if variable was not found',
                     caseInsensitiveVariables: 'Case-insensitive variables',
                     fuzzy_use: 'Use fuzzy matching',
                     fuzzy_removeCharacters: 'Aggressive matching',

src/lib/file-parser.ts

@@ -142,11 +142,18 @@ export class FileParser {
                     missingUserAccounts: filteredAccounts.missing,
                     steamDirectory: configs[i].steamDirectory,
                     files: [],
-                    failed: []
+                    failed: _.cloneDeep(data[i].failed)
                 });
 
                 for (let j = 0; j < data[i].success.length; j++) {
                     let fuzzyTitle = data[i].success[j].fuzzyTitle || data[i].success[j].extractedTitle;
+
+                    // Fail empty titles
+                    if (fuzzyTitle.length === 0) {
+                        parsedConfigs[i].failed.push(data[i].success[j].filePath);
+                        continue;
+                    }
+
                     let executableLocation = configs[i].executableLocation ? configs[i].executableLocation : data[i].success[j].filePath;
 
                     parsedConfigs[i].files.push({
@@ -189,8 +196,6 @@ export class FileParser {
                     })) : [];
                 }
 
-                parsedConfigs[i].failed = _.cloneDeep(data[i].failed);
-
                 localImagePromises.push(this.resolveFieldGlobs('localImages', configs[i], parsedConfigs[i], vParser).then((data) => {
                     for (let j = 0; j < data.parsedConfig.files.length; j++) {
                         data.parsedConfig.files[j].resolvedLocalImages = data.resolvedGlobs[j];
@@ -246,6 +251,13 @@ export class FileParser {
                     if (found)
                         break;
                 }
+                if (config.titleFromVariable.skipFileIfVariableWasNotFound && !found)
+                    data.success[i].extractedTitle = '';
+            }
+        }
+        else if (config.titleFromVariable.skipFileIfVariableWasNotFound) {
+            for (let i = 0; i < data.success.length; i++) {
+                data.success[i].extractedTitle = '';
             }
         }
     }

src/lib/fuzzy-matcher.ts

@@ -66,8 +66,11 @@ export class FuzzyMatcher {
     }
 
     private matchFromList(input: string, removeCharacters: boolean, removeBrackets: boolean) {
+        if (input.length === 0){
+            return { output: input, matched: false };
+        }
         // Check if title contains ", The..."
-        if (/,\s*the/i.test(input)) {
+        else if (/,\s*the/i.test(input)) {
             let modifiedInput = input.replace(/(.*?),\s*(.*)/i, '$2 $1');
             modifiedInput = this.modifyString(modifiedInput, removeCharacters, removeBrackets);
             let matches = this.performMatching(modifiedInput);

src/models/language.model.ts

@@ -258,6 +258,7 @@ export interface languageStruct {
                 skipWithMissingDataDir: string,
                 useCredentials: string,
                 tryToMatchTitle: string,
+                skipFileIfVariableWasNotFound: string,
                 caseInsensitiveVariables: string,
                 fuzzy_use: string,
                 fuzzy_removeCharacters: string,

src/models/user-configuration.model.ts

@@ -14,6 +14,7 @@ export interface UserConfiguration {
     parserInputs: { [inputKey: string]: string },
     titleFromVariable: {
         limitToGroups: string,
+        skipFileIfVariableWasNotFound: boolean,
         caseInsensitiveVariables: boolean,
         tryToMatchTitle: boolean
     },

src/renderer/components/parsers.component.ts

@@ -200,6 +200,9 @@ export class ParsersComponent implements AfterViewInit, OnDestroy {
                         caseInsensitiveVariables: new NestedFormElement.Toggle({
                             text: this.lang.text.caseInsensitiveVariables
                         }),
+                        skipFileIfVariableWasNotFound: new NestedFormElement.Toggle({
+                            text: this.lang.text.skipFileIfVariableWasNotFound
+                        }),
                         tryToMatchTitle: new NestedFormElement.Toggle({
                             text: this.lang.text.tryToMatchTitle
                         })

src/renderer/schemas/user-configuration.schema.ts

@@ -36,6 +36,7 @@ export const userConfiguration = {
             default: {},
             properties: {
                 limitToGroups: { type: 'string', default: '' },
+                skipFileIfVariableWasNotFound: { type: 'boolean', default: false },
                 caseInsensitiveVariables: { type: 'boolean', default: false },
                 tryToMatchTitle: { type: 'boolean', default: false }
             }