« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/upd8.js82
1 files 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;