Cleanup

web/packages/new/photos/services/search/index.ts

@@ -102,31 +102,14 @@ const clipSuggestion = async (
     return { type: "clip", clipScoreForFileID: matches, label: searchString };
 };
 
-// const suggestionsToOptions = async (suggestions: SearchSuggestion[]) =>
-//     Promise.all(
-//         suggestions.map(async (suggestion) => {
-//             const matchingFiles = await filterSearchableFiles(suggestion);
-//             return matchingFiles.length
-//                 ? {
-//                       suggestion,
-//                       fileCount: matchingFiles.length,
-//                       previewFiles: matchingFiles.slice(0, 3),
-//                   }
-//                 : undefined;
-//         }),
-//     ).then((r) => r.filter((o) => !!o));
-    const suggestionsToOptions = async (suggestions: SearchSuggestion[]) => {
-        const filess = await filterSearchableFiles2(suggestions);
-        const f2 = filess.map((f, i) => [f, suggestions[i]!] as const);
-        return f2
-            .filter(([fs]) => fs.length)
-            .map(([f, s]) => ({
-                // suggestion: suggestions[i],
-                suggestion: s,
-                fileCount: f.length,
-                previewFiles: f.slice(0, 3),
-            }));
-    };
+const suggestionsToOptions = (suggestions: SearchSuggestion[]) =>
+    filterSearchableFilesMulti(suggestions).then((res) =>
+        res.map(([files, suggestion]) => ({
+            suggestion,
+            fileCount: files.length,
+            previewFiles: files.slice(0, 3),
+        })),
+    );
 
 /**
  * Return the list of {@link EnteFile}s (from amongst the previously set
@@ -135,8 +118,15 @@ const clipSuggestion = async (
 export const filterSearchableFiles = async (suggestion: SearchSuggestion) =>
     worker().then((w) => w.filterSearchableFiles(suggestion));
 
-export const filterSearchableFiles2 = async (suggestion: SearchSuggestion[]) =>
-    worker().then((w) => w.filterSearchableFiles2(suggestion));
+/**
+ * A batched variant of {@link filterSearchableFiles}.
+ *
+ * This has drastically (10x) better performance when filtering files for a
+ * large number of suggestions (e.g. single letter searches that lead to a large
+ * number of city prefix matches), likely because of reduced worker IPC.
+ */
+const filterSearchableFilesMulti = async (suggestions: SearchSuggestion[]) =>
+    worker().then((w) => w.filterSearchableFilesMulti(suggestions));
 
 /**
  * Cached value of {@link localizedSearchData}.

web/packages/new/photos/services/search/worker.ts

@@ -89,23 +89,17 @@ export class SearchWorker {
      * Return {@link EnteFile}s that satisfy the given {@link suggestion}.
      */
     filterSearchableFiles(suggestion: SearchSuggestion) {
-        return sortMatchesIfNeeded(
-            this.searchableData.files.filter((f) =>
-                isMatchingFile(f, suggestion),
-            ),
-            suggestion,
-        );
+        return filterSearchableFiles(this.searchableData.files, suggestion);
     }
 
-    filterSearchableFiles2(suggestions: SearchSuggestion[]) {
-        return suggestions.map((suggestion) => {
-            return sortMatchesIfNeeded(
-                this.searchableData.files.filter((f) =>
-                    isMatchingFile(f, suggestion),
-                ),
-                suggestion,
-            );
-        });
+    /**
+     * Batched variant of {@link filterSearchableFiles}.
+     */
+    filterSearchableFilesMulti(suggestions: SearchSuggestion[]) {
+        const files = this.searchableData.files;
+        return suggestions
+            .map((sg) => [filterSearchableFiles(files, sg), sg] as const)
+            .filter(([files]) => files.length);
     }
 }
 
@@ -342,6 +336,15 @@ const locationSuggestions = (
     ].flat();
 };
 
+const filterSearchableFiles = (
+    files: EnteFile[],
+    suggestion: SearchSuggestion,
+) =>
+    sortMatchesIfNeeded(
+        files.filter((f) => isMatchingFile(f, suggestion)),
+        suggestion,
+    );
+
 /**
  * Return true if file satisfies the given {@link query}.
  */