From 8b60ba764f46dba557857a3d188c1d53c1b0bf67 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Tue, 7 Apr 2020 15:31:00 +0200
Subject: [PATCH] Optional key load in make

---
 make.sh          |  5 +++++
 utils/dbSetup.js | 35 ++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/make.sh b/make.sh
index 96baded..5aaebbe 100755
--- a/make.sh
+++ b/make.sh
@@ -44,6 +44,11 @@ if [ "$?" -ne "0" ]; then
   echo '{"Subjects":[],"version":"TESET","motd":"hai"}' > ./public/data.json
 fi
 
+pushd utils
+rm -v ../data/dbs/users.db
+NS_SQL_DEBUG_LOG=true NS_LOGLEVEL=2 node dbSetup.js
+popd
+
 echo "Done!"
 echo "npm start {loglevel}"
 echo "To start server"
diff --git a/utils/dbSetup.js b/utils/dbSetup.js
index 8b7dacb..c229118 100644
--- a/utils/dbSetup.js
+++ b/utils/dbSetup.js
@@ -1,4 +1,3 @@
-
 const utils = require('../utils/utils.js')
 const logger = require('../utils/logger.js')
 const dbtools = require('../utils/dbtools.js')
@@ -25,23 +24,25 @@ function CreateDB () {
   })
 
   try {
-    const uids = utils.ReadFile('../dbUsers/keys').split('\n')
+    if (utils.FileExists('../dbUsers/keys')) {
+      const uids = utils.ReadFile('../dbUsers/keys').split('\n')
 
-    uids.forEach((cid, i) => {
-      if (!cid) { return }
-      logger.Log(`[ ${i} / ${uids.length} ]`)
-      try {
-        dbtools.Insert(authDB, 'users', {
-          pw: uuidv4(),
-          oldCID: cid,
-          avaiblePWRequests: 4,
-          created: utils.GetDateString()
-        })
-      } catch (e) {
-        logger.Log('Error during inserting', logger.GetColor('redbg'))
-        console.error(e)
-      }
-    })
+      uids.forEach((cid, i) => {
+        if (!cid) { return }
+        logger.Log(`[ ${i} / ${uids.length} ]`)
+        try {
+          dbtools.Insert(authDB, 'users', {
+            pw: uuidv4(),
+            oldCID: cid,
+            avaiblePWRequests: 4,
+            created: utils.GetDateString()
+          })
+        } catch (e) {
+          logger.Log('Error during inserting', logger.GetColor('redbg'))
+          console.error(e)
+        }
+      })
+    }
   } catch (e) {
     console.error(e)
   }