1.7 - univ functions

sonarr/YoutubeSeriesDownloader.service

@@ -1,35 +1,19 @@
 #!/usr/bin/env bash
-scriptVersion="1.6"
+scriptVersion="1.7"
 ytdlpExtraOpts="--user-agent facebookexternalhit/1.1"
 scriptName="YoutubeSeriesDownloader"
 
-log () {
+#### Import Settings
-  m_time=`date "+%F %T"`
+source /config/extended.conf
-  echo $m_time" :: $scriptName :: $scriptVersion :: "$1
+#### Import Functions
-}
+source /config/extended/functions
-
+#### Create Log File
-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
-      touch "/config/logs/$scriptName.txt"
-      chmod 666 "/config/logs/$scriptName.txt"
-  fi
-}
-
-# Create Log, start writing...
 logfileSetup
-exec &> >(tee -a "/config/logs/$scriptName.txt")
+#### Check Arr App
+getArrAppInfo
+verifyApiAccess
 
 verifyConfig () {
-  #### Import Settings
-  source /config/extended.conf
-
   if [ "$enableYoutubeSeriesDownloader" != "true" ]; then
 	log "Script is not enabled, enable by setting enableYoutubeSeriesDownloader to \"true\" by modifying the \"/config/extended.conf\" config file..."
 	log "Sleeping (infinity)"
@@ -41,42 +25,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
-}
-
 CookiesCheck () {
     # Check for cookies file
     if [ -f /config/cookies.txt ]; then