From 78ceefe33f20d08a67edee6176ea2f958e74d55a Mon Sep 17 00:00:00 2001
From: Lightling <contact@lightling.xyz>
Date: Fri, 23 Feb 2024 23:31:07 -0500
Subject: [PATCH] fix initDb always running in downloadDb

---
 lib/io.js         |  2 +-
 lib/schema.js     | 15 +++++++++++++++
 run-downloadDb.js |  5 ++---
 run-initDb.js     | 14 +++-----------
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/lib/io.js b/lib/io.js
index 270d20b..ff253af 100644
--- a/lib/io.js
+++ b/lib/io.js
@@ -1,4 +1,4 @@
-import { readdir } from 'fs/promises'
+import { readdir } from 'fs/promises';
 
 /**
  * Gets the directories under the specified source directory
diff --git a/lib/schema.js b/lib/schema.js
index 55df317..bed31aa 100644
--- a/lib/schema.js
+++ b/lib/schema.js
@@ -1,3 +1,5 @@
+import { log } from './log.js';
+
 /**
  * Returns valid db schema
  */
@@ -18,3 +20,16 @@ export const userSchema = (entry) => {
     pastUsernames: entry.pastUsernames,
   }
 }
+
+/**
+ * Creates db at the specified directory
+ * @param {string} directory the directory the db.json file will be stored in
+ */
+export const createDb = async (directory) => {
+  log(ctx, 'Grabbing existing directories');
+  const children = await getChildDirectories(directory);
+  const db = dbSchema(Object.fromEntries(children.map(e => [e, userSchema({})])));
+  log(ctx, 'Writing database');
+  await writeFile(`${directory}/db.json`, JSON.stringify(db, null, 2));
+  log(ctx, 'Writing complete!');
+}
diff --git a/run-downloadDb.js b/run-downloadDb.js
index c6176fb..f7c0e85 100644
--- a/run-downloadDb.js
+++ b/run-downloadDb.js
@@ -3,8 +3,7 @@ import { readFile, writeFile } from 'fs/promises';
 import { getArg } from './lib/args.js';
 import { getMany } from './lib/dl.js';
 import { error, log } from './lib/log.js';
-import { initDb } from './run-initDb.js';
-import { userSchema } from './lib/schema.js';
+import { createDb, userSchema } from './lib/schema.js';
 
 const ctx = 'downloadDb.js';
 
@@ -43,7 +42,7 @@ const downloadDb = async () => {
     if (err.toString().includes('ENOENT')) {
       try {
         log(ctx, 'Database was not yet present. Creating it now.');
-        await initDb();
+        await createDb();
         await tryReadDb();
       } catch (err2) {
         error(ctx, err2);
diff --git a/run-initDb.js b/run-initDb.js
index 59d62c9..60fdc19 100644
--- a/run-initDb.js
+++ b/run-initDb.js
@@ -1,9 +1,6 @@
-import { writeFile } from 'fs/promises';
-
 import { getArg } from './lib/args.js';
-import { getChildDirectories } from './lib/io.js';
-import { error, log } from './lib/log.js';
-import { userSchema, dbSchema } from './lib/schema.js';
+import { createDb } from './lib/schema.js';
+import { error } from './lib/log.js';
 
 const ctx = 'initDb.js';
 
@@ -13,7 +10,6 @@ const ctx = 'initDb.js';
  * Useful when there is already a collection of folders.
  */
 export const initDb = async () => {
-  log(ctx, 'Grabbing existing directories');
   let directory = '';
   try {
     directory = getArg('path');
@@ -21,11 +17,7 @@ export const initDb = async () => {
     error(ctx, err);
     return;
   }
-  const children = await getChildDirectories(directory);
-  const db = dbSchema(Object.fromEntries(children.map(e => [e, userSchema({})])));
-  log(ctx, 'Writing database');
-  await writeFile(`${directory}/db.json`, JSON.stringify(db, null, 2));
-  log(ctx, 'Writing complete!');
+  createDb();
 };
 
 initDb();