fix #14 reduce redundancy in search algorithm

dmstern · Sep 5, 2018 · ccdf04d · ccdf04d
1 parent f188722
commit ccdf04d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 40 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -241,8 +241,11 @@ export default class App extends Vue {
     });
   }
 
-  private getSearchItemText(item: Searchable) {
-    return item.getSearchItemText();
+  private getSearchItemText(item: Searchable): string[] {
+    if ('getSearchItemText' in item) {
+      return item.getSearchItemText();
+    }
+    return [];
   }
 
   private isPackage(item: Searchable): boolean {

diff --git a/src/components/PackageList.vue b/src/components/PackageList.vue
@@ -81,7 +81,6 @@ export default class Packages extends Vue {
 
     this.loadConfig();
 
-    // TODO: refactor this (#14)
     EventBus.$on(Events.FILTER_SEARCH, async ( args: { filters: Searchable[], query: string} ) => {
       this.packages.all = await DataStore.Instance.getPackages();
       this.packages.data = this.packages.all
@@ -91,27 +90,7 @@ export default class Packages extends Vue {
           return true;
         }
         const pattern = new RegExp(args.query.replace(/[`~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, ''), 'gi');
-        const someCrafterMatches = item.crafters.some((crafter) => {
-          if (
-            crafter.name &&
-            (crafter.name.match(pattern) ||
-            `crafter:${crafter.name}`.match(pattern) ||
-            `author:${crafter.name}`.match(pattern))
-            ) {
-              return true;
-            }
-          return false;
-        });
-        return `/${item.name}`.match(pattern) ||
-          someCrafterMatches ||
-          item.description && `/${item.description}`.match(pattern) ||
-          item.keywords && item.keywords.some((keyword) => {
-            if (`#${keyword}`.match(pattern)) {
-              return true;
-            } else {
-              return false;
-            }
-          });
+        return item.matchesPattern(pattern);
       });
     });
   }

diff --git a/types/Crafter.ts b/types/Crafter.ts
@@ -87,6 +87,12 @@ export default class Crafter implements Searchable {
     return false;
   }
 
+  public matchesPattern(pattern: RegExp): boolean {
+    return this.getSearchItemText().some((text) => {
+      return text.match(pattern) != null;
+    });
+  }
+
   public getSearchItemText(): string[] {
     const text: string[] = [];
     if (this.name) {

diff --git a/types/Keyword.ts b/types/Keyword.ts
@@ -26,6 +26,12 @@ export class Keyword implements Searchable {
     return false;
   }
 
+  public matchesPattern(pattern: RegExp): boolean {
+    return this.getSearchItemText().some((text) => {
+      return text.match(pattern) != null;
+    });
+  }
+
   public getSearchItemText(): string[] {
     return [
       `#${this.value}`,

diff --git a/types/Package.ts b/types/Package.ts
@@ -115,6 +115,16 @@ export default class Package implements PackageMetaDataDTO, Searchable  {
     return false;
   }
 
+  public matchesPattern(pattern: RegExp): boolean {
+    const someCrafterMatch: boolean = this.crafters.some((crafter) => crafter.matchesPattern(pattern));
+    const nameMatch: boolean = `/${this.name}`.match(pattern) !== null;
+    const descriptionMatch: boolean = this.description !== undefined
+      && `/${this.description}`.match(pattern) !== null;
+    const someKeywordsMatch: boolean = this.keywords !== undefined
+      && this.keywords.some((keyword) => keyword.match(pattern) != null);
+    return someCrafterMatch || nameMatch || descriptionMatch || someKeywordsMatch;
+  }
+
   public getSearchItemText(): string[] {
     return [
         this.name || '',
@@ -138,22 +148,6 @@ export default class Package implements PackageMetaDataDTO, Searchable  {
     return this.craftersList;
   }
 
-  public matchesCrafter(pattern: RegExp): boolean {
-    for (const crafter of this.crafters) {
-      if (crafter.name) {
-        if (
-          crafter.name.match(pattern) ||
-          `crafter:${crafter.name}`.match(pattern) ||
-          `author:${crafter.name}`.match(pattern)
-        ) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-
   public get repositoryName(): string | undefined {
     if (this.repositoryUrl) {
       return this.url2Name(this.repositoryUrl);

diff --git a/types/Searchable.ts b/types/Searchable.ts
@@ -3,4 +3,5 @@ import Package from './Package';
 export default interface Searchable {
   matches(other: Searchable, packages: Package[]): boolean;
   getSearchItemText(): string[];
+  matchesPattern(pattern: RegExp): boolean;
 }