Merge pull request #50 from rolandbernard/devel

Fixes and improvements
rolandbernard · Sep 28, 2021 · 5401c70 · 5401c70
2 parents 601f8dd + a3d875a
commit 5401c70
Show file tree

Hide file tree

Showing 4 changed files with 305 additions and 275 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "marvin",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "This is a keystroke launcher for Linux",
     "repository": "https://github.com/rolandbernard/marvin/",
     "author": "Roland Bernard",

diff --git a/src/common/query.ts b/src/common/query.ts
@@ -8,7 +8,8 @@ export class Query {
     readonly regex: RegExp;
 
     escapeRegex(text: string, map?: (c: string) => string, join = '') {
-        return text.split('').map((ch) => {
+        return this.normalizeString(text.substr(0, MAX_MATCH_LENGTH))
+            .split('').map((ch) => {
             // Escape special regex characters
             if ([
                 '\\', '.', '*', '+', '[', ']', '(', ')', '{', '}',
@@ -46,6 +47,12 @@ export class Query {
         }
     }
 
+    normalizeString(text: string): string {
+        return text.normalize('NFKD')
+            .replace(/[\u0300-\u036F]/g, '')
+            .replace(/\s+/g, ' ');
+    }
+
     bestMatch(text: string): string | undefined {
         text = text.substr(0, MAX_MATCH_LENGTH);
         let best: string | undefined;
@@ -57,7 +64,8 @@ export class Query {
         return best;
     }
 
-    matchText(text: string): number {
+    matchText(full_text: string): number {
+        const text = this.normalizeString(full_text.substr(0, MAX_MATCH_LENGTH));
         if (text.length > 0 && this.text.length > 0) {
             const best_match = this.bestMatch(text);
             if (best_match) {

diff --git a/src/main/modules/updates.ts b/src/main/modules/updates.ts
@@ -37,6 +37,7 @@ ipcMain.on(IpcChannels.CHECK_FOR_UPDATE, async (msg) => {
 ipcMain.on(IpcChannels.INSTALL_UPDATE, async () => {
     if (!isDevelopment()) {
         try {
+            await checkForUpdate();
             await autoUpdater.downloadUpdate();
             autoUpdater.quitAndInstall();
         } catch (e) {