From 5038549631b0413552fe6589e7c77f66e53e7bcd Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Mon, 13 May 2024 09:02:11 -0300 Subject: upd8, search: pass urls & thumbs utils into search spec process --- src/util/search-spec.js | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'src/util/search-spec.js') diff --git a/src/util/search-spec.js b/src/util/search-spec.js index 08717d92..92ed4dec 100644 --- a/src/util/search-spec.js +++ b/src/util/search-spec.js @@ -222,7 +222,34 @@ export function makeSearchIndex(descriptor, {FlexSearch}) { }); } -export function populateSearchIndex(index, descriptor, {wikiData}) { +// TODO: This function basically mirrors bind-utilities.js, which isn't +// exactly robust, but... binding might need some more thought across the +// codebase in *general.* +function bindSearchUtilities({ + checkIfImagePathHasCachedThumbnails, + getThumbnailEqualOrSmaller, + thumbsCache, + urls, +}) { + const bound = { + urls, + }; + + bound.checkIfImagePathHasCachedThumbnails = + (imagePath) => + checkIfImagePathHasCachedThumbnails(imagePath, thumbsCache); + + bound.getThumbnailEqualOrSmaller = + (preferred, imagePath) => + getThumbnailEqualOrSmaller(preferred, imagePath, thumbsCache); + + return bound; +} + +export function populateSearchIndex(index, descriptor, opts) { + const {wikiData} = opts; + const bound = bindSearchUtilities(opts); + const collection = descriptor.query(wikiData); for (const thing of collection) { @@ -230,7 +257,7 @@ export function populateSearchIndex(index, descriptor, {wikiData}) { let processed; try { - processed = descriptor.process(thing); + processed = descriptor.process(thing, bound); } catch (caughtError) { throw new Error( `Failed to process searchable thing ${reference}`, -- cgit 1.3.0-6-gf8a5