From d1b7f655df1918f04e013acbb4ec0eb36122c40b Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 26 Mar 2024 15:07:56 -0300 Subject: search: code style cleanup (no logic changes) --- src/data/things/search.js | 75 ++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 40 deletions(-) (limited to 'src/data/things/search.js') diff --git a/src/data/things/search.js b/src/data/things/search.js index df177071..ad641c38 100644 --- a/src/data/things/search.js +++ b/src/data/things/search.js @@ -2,21 +2,14 @@ 'use strict'; -import { - writeFile, -} from 'node:fs/promises'; +import {writeFile} from 'node:fs/promises'; -import { - logWarn, - logInfo, - logError, -} from '#cli'; +import FlexSearch from 'flexsearch'; +import {logError, logInfo, logWarn} from '#cli'; import Thing from '#thing'; -import FlexSearch from 'flexsearch'; - -export async function writeSearchIndex(search_index_path, wikiData) { +export async function writeSearchIndex(searchIndexPath, wikiData) { // Basic flow is: // 1. Define schema for type @@ -29,62 +22,64 @@ export async function writeSearchIndex(search_index_path, wikiData) { id: "reference", index: ["name", "groups"], }), + tracks: new FlexSearch.Document({ id: "reference", index: ["track", "album", "artists", "directory", "additionalNames"], }), + artists: new FlexSearch.Document({ id: "reference", index: ["names"], - }) - } + }), + }; - wikiData.albumData.forEach((album) => { + for (const album of wikiData.albumData) { indexes.albums.add({ reference: Thing.getReference(album), name: album.name, groups: album.groups.map(group => group.name), - }) + }); - album.tracks.forEach((track) => { + for (const track of album.tracks) { indexes.tracks.add({ reference: Thing.getReference(track), album: album.name, track: track.name, + artists: [ track.artistContribs.map(contrib => contrib.artist.name), ...track.artistContribs.map(contrib => contrib.artist.aliasNames) ], - additionalNames: track.additionalNames.map(entry => entry.name) - }) - }) - }); - - wikiData.artistData - .filter(artist => !artist.isAlias) - .forEach((artist) => { + + additionalNames: + track.additionalNames.map(entry => entry.name), + }); + } + } + + for (const artist of wikiData.artistData) { + if (artist.isAlias) { + continue; + } + indexes.artists.add({ reference: Thing.getReference(artist), - names: [ - artist.name, - ...artist.aliasNames - ] - }) - }) + names: [artist.name, ...artist.aliasNames], + }); + } // Export indexes to json - let searchData = {} + const searchData = {} await Promise.all( Object.entries(indexes) - .map(pair => { - const [index_name, index] = pair - searchData[index_name] = {} - return index.export((key, data) => { - searchData[index_name][key] = data - }); - }) - ) + .map(([indexName, index]) => { + searchData[indexName] = {}; + return index.export((key, data) => { + searchData[indexName][key] = data + }); + })); - writeFile(search_index_path, JSON.stringify(searchData)) + await writeFile(searchIndexPath, JSON.stringify(searchData)); } -- cgit 1.3.0-6-gf8a5