From 7931244d09168988d72f7b757773ded5d66ed956 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Thu, 30 May 2024 21:04:57 -0300 Subject: upd8: move buildSearchIndex nearly to bottom --- src/upd8.js | 82 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/upd8.js b/src/upd8.js index 3ac9dcc7..eecc7e53 100755 --- a/src/upd8.js +++ b/src/upd8.js @@ -1485,47 +1485,6 @@ async function main() { const urls = generateURLs(urlSpec); - if (stepStatusSummary.buildSearchIndex.status === STATUS_NOT_STARTED) { - Object.assign(stepStatusSummary.buildSearchIndex, { - status: STATUS_STARTED_NOT_DONE, - timeStart: Date.now(), - }); - - try { - await writeSearchData({ - thumbsCache, - urls, - wikiCachePath, - wikiData, - }); - - logInfo`Search data successfully written - nice!`; - paragraph = false; - - Object.assign(stepStatusSummary.buildSearchIndex, { - status: STATUS_DONE_CLEAN, - timeEnd: Date.now(), - }); - } catch (error) { - if (!paragraph) console.log(''); - niceShowAggregate(error); - - logError`There was an error preparing or writing search data.`; - fileIssue(); - logWarn`Any existing search data will be reused, and search may be`; - logWarn`generally dysfunctional. The site should work otherwise, though!`; - - console.log(''); - paragraph = true; - - Object.assign(stepStatusSummary.buildSearchIndex, { - status: STATUS_HAS_WARNINGS, - annotation: `see log for details`, - timeEnd: Date.now(), - }); - } - } - // Filter out any things with duplicate directories throughout the data, // warning about them too. @@ -2182,6 +2141,47 @@ async function main() { } } + if (stepStatusSummary.buildSearchIndex.status === STATUS_NOT_STARTED) { + Object.assign(stepStatusSummary.buildSearchIndex, { + status: STATUS_STARTED_NOT_DONE, + timeStart: Date.now(), + }); + + try { + await writeSearchData({ + thumbsCache, + urls, + wikiCachePath, + wikiData, + }); + + logInfo`Search data successfully written - nice!`; + paragraph = false; + + Object.assign(stepStatusSummary.buildSearchIndex, { + status: STATUS_DONE_CLEAN, + timeEnd: Date.now(), + }); + } catch (error) { + if (!paragraph) console.log(''); + niceShowAggregate(error); + + logError`There was an error preparing or writing search data.`; + fileIssue(); + logWarn`Any existing search data will be reused, and search may be`; + logWarn`generally dysfunctional. The site should work otherwise, though!`; + + console.log(''); + paragraph = true; + + Object.assign(stepStatusSummary.buildSearchIndex, { + status: STATUS_HAS_WARNINGS, + annotation: `see log for details`, + timeEnd: Date.now(), + }); + } + } + let webRouteSources = null; let preparedWebRoutes = null; -- cgit 1.3.0-6-gf8a5