From dba3e5732089554c443f10c5082feaef6e1136f8 Mon Sep 17 00:00:00 2001 From: RandomNinjaAtk Date: Fri, 2 Sep 2022 17:33:44 -0400 Subject: [PATCH] Improve Logging... --- root/scripts/QueueCleaner.bash | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/root/scripts/QueueCleaner.bash b/root/scripts/QueueCleaner.bash index 2e23b53..fb32a12 100644 --- a/root/scripts/QueueCleaner.bash +++ b/root/scripts/QueueCleaner.bash @@ -1,5 +1,5 @@ #!/usr/bin/env bash -scriptVersion="1.0.002" +scriptVersion="1.0.003" if [ -z "$arrUrl" ] || [ -z "$arrApiKey" ]; then arrUrlBase="$(cat /config/config.xml | xq | jq -r .Config.UrlBase)" @@ -23,16 +23,22 @@ chmod 666 "/config/logs/QueueCleaner.txt" log () { m_time=`date "+%F %T"` - echo $m_time" :: "$1 + echo $m_time" :: QueueCleaner :: "$1 } arrQueueData="$(curl -s "$arrUrl/api/v3/queue?page=1&pagesize=1000000000&sortDirection=descending&sortKey=progress&includeUnknownMovieItems=true&apikey=${arrApiKey}" | jq -r .records[])" arrQueueIds=$(echo "$arrQueueData" | jq -r 'select(.status=="completed") | select(.trackedDownloadStatus=="warning") | .id') +arrQueueIdsCount=$(echo "$arrQueueData" | jq -r 'select(.status=="completed") | select(.trackedDownloadStatus=="warning") | .id' | wc -l) +if [ $arrQueueIdsCount -eq 0 ]; then + log "No items in queue to clean up..." + exit +fi + for queueId in $(echo $arrQueueIds); do arrQueueItemData="$(echo "$arrQueueData" | jq -r "select(.id==$queueId)")" arrQueueItemTitle="$(echo "$arrQueueItemData" | jq -r .title)" - log "Removing Failed Queue ID: $queueId ($arrQueueItemTitle) from Radarr Queue..." + log "Removing Failed Queue Item ID: $queueId ($arrQueueItemTitle) from Radarr..." curl -sX DELETE "$arrUrl/api/v3/queue/$queueId?removeFromClient=true&blocklist=true&apikey=${arrApiKey}" done - +a exit