2.2.11 bugfix

Author: FrogTheFrog

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 2.2.11 - 2018-03-17
+
+### Fixed
+
+* Improved diacritic character handling for fuzzy matcher. For ex. `Pokémon Snap` should now be matched to `Pokemon Snap` with diacritic option enabled.
+
+### Added
+
+* More emulator examples (by **Chocobubba** and **Wesim**).
+
 ## 2.2.10 - 2017-11-21
 
 ### Fixed

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "steam-rom-manager",
-  "version": "2.2.10",
+  "version": "2.2.11",
   "license": "GPL-3.0",
   "description": "An app for managing ROMs in Steam",
   "author": {
@@ -110,7 +110,6 @@
     "@types/bluebird": "^3.5.20",
     "@types/crc": "^3.4.0",
     "@types/fs-extra": "^5.0.0",
-    "@types/fuzzaldrin-plus": "0.0.1",
     "@types/glob": "^5.0.35",
     "@types/he": "^0.5.29",
     "@types/highlight.js": "^9.12.2",

package.json

@@ -1,8 +1,9 @@
 import { ParsedDataWithFuzzy, FuzzyEventCallback, FuzzyMatcherOptions } from "../models";
-import * as Fuzzy from 'fuzzaldrin-plus';
+const Fuzzy = require('fuzzaldrin-plus');
 
 export class FuzzyMatcher {
     private list: { totalGames: number, games: string[] };
+    private latinList: string[];
 
     constructor(private eventCallback?: FuzzyEventCallback, list?: { totalGames: number, games: string[] }) {
         this.setEventCallback(eventCallback || ((event: any, data: any) => { }));
@@ -15,6 +16,13 @@ export class FuzzyMatcher {
 
     setFuzzyList(list: { totalGames: number, games: string[] }) {
         this.list = list;
+        if (this.isLoaded()){
+            this.latinList = new Array(list.games.length);
+
+            for (let i = 0; i < list.games.length; i++) {
+                this.latinList[i] = list.games[i].replaceDiacritics();
+            }
+        }
     }
 
     fuzzyMatchParsedData(data: ParsedDataWithFuzzy, options: FuzzyMatcherOptions, verbose: boolean = true) {
@@ -66,32 +74,44 @@ export class FuzzyMatcher {
     }
 
     private matchFromList(input: string, options: FuzzyMatcherOptions) {
-        if (input.length === 0){
+        if (input.length === 0) {
             return { output: input, matched: false };
         }
         // Check if title contains ", The..."
         else if (/,\s*the/i.test(input)) {
             let modifiedInput = input.replace(/(.*?),\s*(.*)/i, '$2 $1');
             modifiedInput = this.modifyString(modifiedInput, options);
-            let matches = this.performMatching(modifiedInput);
+            let matches = this.performMatching(modifiedInput, options.replaceDiacritics);
             if (matches.matched)
                 return matches;
         }
 
         let modifiedInput = this.modifyString(input, options);
-        return this.performMatching(modifiedInput);
+        return this.performMatching(modifiedInput, options.replaceDiacritics);
     }
 
-    private performMatching(input: string){
-        let matches = Fuzzy.filter(this.list.games, input);
+    private performMatching(input: string, diacriticsRemoved: boolean) {
+        const list = diacriticsRemoved ? this.latinList : this.list.games;
+        const preparedQuery = Fuzzy.prepareQuery(input, { usePathScoring: false });
+        let bestScore = 0;
+        let matches: string[] = [];
+
+        for (let i = 0; i < list.length; i++) {
+            let score = Fuzzy.score(list[i], preparedQuery.query, { preparedQuery, usePathScoring: false });
+            if (score >= bestScore && score !== 0){
+                bestScore = score;
+                matches.push(this.list.games[i]);
+            }
+        }
+
         if (matches.length)
             return { output: this.getBestMatch(input, matches), matched: true };
         else
             return { output: input, matched: false };
     }
 
     private modifyString(input: string, options: FuzzyMatcherOptions) {
-        if (options.replaceDiacritics){
+        if (options.replaceDiacritics) {
             input = input.replaceDiacritics();
         }