From 084ebeca80cb6df8f55ae74be6ce01fa5e106817 Mon Sep 17 00:00:00 2001
From: purple <hello@prpl.wtf>
Date: Mon, 15 Jan 2024 23:59:09 +0100
Subject: [PATCH] feat `libraries`: Make new "misc" library that is a
 collection of all tiny functions of other libraries.

---
 blueprint/lib/db.sh                           | 15 -----------
 .../{updateAdminCacheReminder.sh => misc.sh}  | 24 ++++++++++++++++-
 blueprint/lib/telemetry.sh                    | 13 ----------
 blueprint/lib/throwError.sh                   | 26 -------------------
 4 files changed, 23 insertions(+), 55 deletions(-)
 delete mode 100644 blueprint/lib/db.sh
 rename blueprint/lib/{updateAdminCacheReminder.sh => misc.sh} (61%)
 delete mode 100644 blueprint/lib/telemetry.sh
 delete mode 100644 blueprint/lib/throwError.sh

diff --git a/blueprint/lib/db.sh b/blueprint/lib/db.sh
deleted file mode 100644
index 1fa4070..0000000
--- a/blueprint/lib/db.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# 
-# This script has been created as part of the Blueprint source code
-# and uses the same license as the rest of the codebase.
-
-FLDR=".blueprint/extensions/blueprint/private/db/database"
-
-# dbAdd "database.record"
-dbAdd() { echo "* ${1};" >> $FLDR; }
-
-# dbValidate "database.record"
-dbValidate() { grep -Fxq "* ${1};" $FLDR > /dev/null; }
-
-# dbRemove "database.record"
-dbRemove() { sed -i "s/* ${1};//g" $FLDR > /dev/null; }
diff --git a/blueprint/lib/updateAdminCacheReminder.sh b/blueprint/lib/misc.sh
similarity index 61%
rename from blueprint/lib/updateAdminCacheReminder.sh
rename to blueprint/lib/misc.sh
index b1f8443..d780744 100644
--- a/blueprint/lib/updateAdminCacheReminder.sh
+++ b/blueprint/lib/misc.sh
@@ -1,8 +1,30 @@
 #!/bin/bash
-#
+# 
 # This script has been created as part of the Blueprint source code
 # and uses the same license as the rest of the codebase.
 
+
+# === DATABASE ===
+FLDR=".blueprint/extensions/blueprint/private/db/database"
+# dbAdd "database.record"
+dbAdd() { echo "* ${1};" >> $FLDR; }
+# dbValidate "database.record"
+dbValidate() { grep -Fxq "* ${1};" $FLDR > /dev/null; }
+# dbRemove "database.record"
+dbRemove() { sed -i "s/* ${1};//g" $FLDR > /dev/null; }
+
+
+# === TELEMETRY ===
+sendTelemetry() {
+  cd "${BLUEPRINT__FOLDER}" || exit
+  key=$(cat .blueprint/extensions/blueprint/private/db/telemetry_id)
+  if [[ $key == "KEY_NOT_UPDATED" ]]; then 
+    exit 1
+  fi
+  curl --location --silent "http://api.blueprint.zip:50000/send/$key/$1" > /dev/null
+}
+
+# === CACHEREMINDER ===
 updateCacheReminder() {
   cd "${BLUEPRINT__FOLDER}" || exit
   # Overwrite previous adminCacheReminderHider with the default one.
diff --git a/blueprint/lib/telemetry.sh b/blueprint/lib/telemetry.sh
deleted file mode 100644
index d9c4ce3..0000000
--- a/blueprint/lib/telemetry.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# 
-# This script has been created as part of the Blueprint source code
-# and uses the same license as the rest of the codebase.
-
-sendTelemetry() {
-  cd "${BLUEPRINT__FOLDER}" || exit
-  key=$(cat .blueprint/extensions/blueprint/private/db/telemetry_id)
-  if [[ $key == "KEY_NOT_UPDATED" ]]; then 
-    exit 1
-  fi
-  curl --location --silent "http://api.blueprint.zip:50000/send/$key/$1" > /dev/null
-}
diff --git a/blueprint/lib/throwError.sh b/blueprint/lib/throwError.sh
deleted file mode 100644
index 8abe610..0000000
--- a/blueprint/lib/throwError.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# 
-# This script has been created as part of the Blueprint source code
-# and uses the same license as the rest of the codebase.
-
-source "${BLUEPRINT__FOLDER}/.blueprint/lib/bash_colors.sh"
-source "${BLUEPRINT__FOLDER}/.blueprint/lib/logFormat.sh"
-
-function throwError {
-  if [[ $1 == "cdMissingDirectory"      ]]; then err="Tried to navigate to a directory that does not exist, halting process.";fi
-  if [[ $1 == "confymlNotFound"         ]]; then err="Could not find a conf.yml file.";fi
-  if [[ $1 == "confymlMissingFiles"     ]]; then err="A conf.yml value is pointing to a file that does not exist.";fi
-  if [[ $1 == "scriptsMissingFiles"     ]]; then err="Could not find install/remove/export script even though it's enabled.";fi
-  if [[ $1 == "scriptsNoDataDir"        ]]; then err="Could not run extension's install/remove/export script as the extension does not have a data directory.";fi
-
-  if [[ $err == "" ]]; then err="$1"; fi
-  PRINT FATAL "$err"
-  return 1
-}
-                                 
-function throwByte {
-  # [  ^^] ello
-  if [[ $err == "" ]]; then err="$1"; fi
-  log_blue "[  " log_white "^^" log_blue "] $err"
-  return 1
-}
\ No newline at end of file