From ef16c1475413c0289f305cde6689a0d176fb8e8c Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Mon, 10 Jun 2024 20:52:18 -0300 Subject: client: filter by kind as postprocessing --- src/static/js/search-worker.js | 55 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/src/static/js/search-worker.js b/src/static/js/search-worker.js index e998e7af..5c7f43f6 100644 --- a/src/static/js/search-worker.js +++ b/src/static/js/search-worker.js @@ -409,9 +409,11 @@ function queryGenericIndex(index, query, options) { const interestingFields = unique(interestingFieldCombinations.flat()); - const terms = query.split(' '); + const {genericTerms, queriedKind} = + processTerms(query); - const particles = particulate(terms); + const particles = + particulate(genericTerms); const groupedParticles = groupArray(particles, ({length}) => length); @@ -475,7 +477,54 @@ function queryGenericIndex(index, query, options) { } } - return boilerplate.constitute(results); + const constituted = + boilerplate.constitute(results); + + const constitutedAndFiltered = + constituted + .filter(({id}) => + (queriedKind + ? id.split(':')[0] === queriedKind + : true)); + + return constitutedAndFiltered; +} + +function processTerms(query) { + const kindTermSpec = [ + {kind: 'album', terms: ['album']}, + {kind: 'artist', terms: ['artist']}, + {kind: 'flash', terms: ['flash']}, + {kind: 'group', terms: ['group']}, + {kind: 'tag', terms: ['art tag', 'tag']}, + {kind: 'track', terms: ['track']}, + ]; + + const genericTerms = []; + let queriedKind = null; + + const termRegexp = + new RegExp( + String.raw`(?${kindTermSpec.flatMap(spec => spec.terms).join('|')})` + + String.raw`|\S+`, + 'gi'); + + for (const match of query.matchAll(termRegexp)) { + const {groups} = match; + + if (groups.kind && !queriedKind) { + queriedKind = + kindTermSpec + .find(({terms}) => terms.includes(groups.kind.toLowerCase())) + .kind; + + continue; + } + + genericTerms.push(match[0]); + } + + return {genericTerms, queriedKind}; } function particulate(terms) { -- cgit 1.3.0-6-gf8a5