From 5f2cb4de2831e005ccc85734e15d1c3d54d8b1bb Mon Sep 17 00:00:00 2001
From: RandomNinjaAtk <RandomNinjaAtk@users.noreply.github.com>
Date: Thu, 20 Jul 2023 10:52:24 +0000
Subject: [PATCH] v1.3 - Use universal functions

---
 lidarr/UnmappedFilesCleaner.bash | 67 +++-----------------------------
 1 file changed, 5 insertions(+), 62 deletions(-)

diff --git a/lidarr/UnmappedFilesCleaner.bash b/lidarr/UnmappedFilesCleaner.bash
index e00669e..f5c8182 100644
--- a/lidarr/UnmappedFilesCleaner.bash
+++ b/lidarr/UnmappedFilesCleaner.bash
@@ -1,34 +1,13 @@
 #!/usr/bin/with-contenv bash
-scriptVersion="1.2"
+scriptVersion="1.3"
 scriptName="UnmappedFilesCleaner"
 
-log () {
-  m_time=`date "+%F %T"`
-  echo $m_time" :: $scriptName :: $scriptVersion :: "$1
-}
-
-logfileSetup () {
-  # auto-clean up log file to reduce space usage
-  if [ -f "/config/logs/$scriptName.txt" ]; then
-  	if find /config/logs -type f -name "$scriptName.txt" -size +1024k | read; then
-		  echo "" > /config/logs/$scriptName.txt
-	  fi
-  fi
-  
-  if [ ! -f "/config/logs/$scriptName.txt" ]; then
-    echo "" > /config/logs/$scriptName.txt
-    chmod 666 "/config/logs/$scriptName.txt"
-  fi
-}
-
-# Create Log, start writing...
-logfileSetup
-exec &> >(tee -a "/config/logs/$scriptName.txt")
+#### Import Settings
+source /config/extended.conf
+#### Import Functions
+source /config/extended/functions
 
 verifyConfig () {
-  #### Import Settings
-  source /config/extended.conf
-
   if [ "$enableUnmappedFilesCleaner" != "true" ]; then
     log "Script is not enabled, enable by setting enableUnmappedFilesCleaner to \"true\" by modifying the \"/config/extended.conf\" config file..."
     log "Sleeping (infinity)"
@@ -40,42 +19,6 @@ verifyConfig () {
   fi
 }
 
-getArrAppInfo () {
-  # Get Arr App information
-  if [ -z "$arrUrl" ] || [ -z "$arrApiKey" ]; then
-    arrUrlBase="$(cat /config/config.xml | xq | jq -r .Config.UrlBase)"
-    if [ "$arrUrlBase" == "null" ]; then
-      arrUrlBase=""
-    else
-      arrUrlBase="/$(echo "$arrUrlBase" | sed "s/\///g")"
-    fi
-    arrName="$(cat /config/config.xml | xq | jq -r .Config.InstanceName)"
-    arrApiKey="$(cat /config/config.xml | xq | jq -r .Config.ApiKey)"
-    arrPort="$(cat /config/config.xml | xq | jq -r .Config.Port)"
-    arrUrl="http://127.0.0.1:${arrPort}${arrUrlBase}"
-  fi
-}
-
-verifyApiAccess () {
-  until false
-  do
-    arrApiTest=""
-    arrApiVersion=""
-    if [ "$arrPort" == "8989" ] || [ "$arrPort" == "7878" ]; then
-      arrApiVersion="v3"
-    elif [ "$arrPort" == "8686" ] || [ "$arrPort" == "8787" ]; then
-      arrApiVersion="v1"
-    fi
-    arrApiTest=$(curl -s "$arrUrl/api/$arrApiVersion/system/status?apikey=$arrApiKey" | jq -r .instanceName)
-    if [ "$arrApiTest" == "$arrName" ]; then
-      break
-    else
-      log "$arrName is not ready, sleeping until valid response..."
-      sleep 1
-    fi
-  done
-}
-
 UnmappedFilesCleanerProcess () {
     log "Finding UnmappedFiles to purge..."
     OLDIFS="$IFS"