From fd9b19f0c9a8fe943367fadd1ef0c9da535eb330 Mon Sep 17 00:00:00 2001
From: RandomNinjaAtk <RandomNinjaAtk@users.noreply.github.com>
Date: Thu, 20 Jul 2023 11:18:55 +0000
Subject: [PATCH] 1.7 univ functions

---
 universal/services/Recyclarr | 75 +++++-------------------------------
 1 file changed, 9 insertions(+), 66 deletions(-)

diff --git a/universal/services/Recyclarr b/universal/services/Recyclarr
index 70b8a5a..16c9490 100644
--- a/universal/services/Recyclarr
+++ b/universal/services/Recyclarr
@@ -1,32 +1,18 @@
 #!/usr/bin/env bash
-scriptVersion="1.6"
+scriptVersion="1.7"
 scriptName="Recyclarr"
 
-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
-  	find /config/logs -type f -name "$scriptName.txt" -size +1024k -delete
-  fi
-  
-  if [ ! -f "/config/logs/$scriptName.txt" ]; then
-      touch "/config/logs/$scriptName.txt"
-      chmod 666 "/config/logs/$scriptName.txt"
-  fi
-}
-
-# Create Log, start writing...
+#### Import Settings
+source /config/extended.conf
+#### Import Functions
+source /config/extended/functions
+#### Create Log File
 logfileSetup
-exec &> >(tee -a "/config/logs/$scriptName.txt")
+#### Check Arr App
+getArrAppInfo
+verifyApiAccess
 
 verifyConfig () {
-  #### Import Settings
-  source /config/extended.conf
-
   if [ "$enableRecyclarr" != "true" ]; then
     log "Script is not enabled, enable by setting enableRecyclarr to \"true\" by modifying the \"/config/extended.conf\" config file..."
     log "Sleeping (infinity)"
@@ -38,49 +24,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
-  if [ "$arrPort" == "7878" ]; then
-    recylcarrApp="radarr"
-  fi
-  if [ "$arrPort" == "8989" ]; then
-    recylcarrApp="sonarr"
-  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
-}
-
 RecyclarrProcess () {  
   # Configure Yaml with URL and API Key
   sed -i "s%arrUrl%$arrUrl%g" "/config/extended/recyclarr.yaml"