Revert "whyboris#617"

kanwal019 · Jan 22, 2021 · c39cdcf · c39cdcf
1 parent 9c8b0d2
commit c39cdcf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/node/main-support.ts b/node/main-support.ts
@@ -276,9 +276,8 @@ export function createDotPlsFile(savePath: string, playlist: ImageElement[], sou
 export function cleanUpFileName(original: string): string {
   return original.split('.').slice(0, -1).join('.')   // (1)
                  .split('_').join(' ')                // (2)
-                 .split('-').join(' ')                // (3)
-                 .split('.').join(' ')                // (4)
-                 .split(/\s+/).join(' ')              // (5)
+                 .split('.').join(' ')                // (3)
+                 .split(/\s+/).join(' ')              // (4)
 }
 
 /**

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/pipes/file-search.pipe.ts b/src/app/pipes/file-search.pipe.ts
@@ -69,8 +69,8 @@ export class FileSearchPipe implements PipeTransform {
               searchString += ' ' + item.partialPath.replace(/(\/)/, ' ');
             }
           }
-          const regex = new RegExp(`\\b${element.toLowerCase()}`, 'i');
-          if (regex.test(searchString.toLowerCase())) {
+
+          if (searchString.toLowerCase().indexOf(element.toLowerCase()) !== -1) {
             matchFound++;
           }
         });

diff --git a/src/app/pipes/magic-search.pipe.ts b/src/app/pipes/magic-search.pipe.ts
@@ -17,11 +17,9 @@ export class MagicSearchPipe implements PipeTransform {
       return finalArray;
     } else {
       // console.log('magic search pipe working');
-      const regex = new RegExp(`\\b${searchString.toLowerCase()}`, 'i');
       return finalArray.filter(item =>
-        regex.test(item.partialPath.toLowerCase())
-        || (regex.test(item.fileName.toLowerCase())
-        || regex.test(item.cleanName.toLowerCase()))
+        item.partialPath.toLowerCase().indexOf(searchString.toLowerCase()) !== -1
+        || item.fileName.toLowerCase().indexOf(searchString.toLowerCase()) !== -1
       );
     }
   }