From 8e8011d79511d68309d99ea93688d2a64d6149a6 Mon Sep 17 00:00:00 2001 From: Gio Date: Tue, 26 Mar 2024 20:36:24 -0500 Subject: search: minor client refactor --- src/static/js/client.js | 11 +++++++---- src/util/searchSchema.js | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/static/js/client.js b/src/static/js/client.js index 650a3925..a3d63719 100644 --- a/src/static/js/client.js +++ b/src/static/js/client.js @@ -3426,23 +3426,26 @@ async function initSearch() { // Copied directly from server search.js const indexes = makeSearchIndexes(FlexSearch); - window.indexes = indexes; - const searchData = await fetch('/search-data/index.json') .then(resp => resp.json()); + // If this fails, it's because an outdated index was cached. + // TODO: If this fails, try again once with a cache busting url. for (const [indexName, indexData] of Object.entries(searchData)) { for (const [key, value] of Object.entries(indexData)) { - window.indexes[indexName].import(key, value); + indexes[indexName].import(key, value); } } + + // Expose variable to window + window.searchIndexes = indexes; } function searchAll(query, options = {}) { const results = {}; - for (const [indexName, index] of Object.entries(window.indexes)) { + for (const [indexName, index] of Object.entries(window.searchIndexes)) { results[indexName] = index.search(query, options); } diff --git a/src/util/searchSchema.js b/src/util/searchSchema.js index 99ba869a..a4604dd4 100644 --- a/src/util/searchSchema.js +++ b/src/util/searchSchema.js @@ -9,7 +9,7 @@ export function makeSearchIndexes(FlexSearch) { tracks: new FlexSearch.Document({ id: "reference", - index: ["name", "album", "artists", "directory", "additionalNames"], + index: ["name", "album", "artists", "additionalNames"], }), artists: new FlexSearch.Document({ -- cgit 1.3.0-6-gf8a5