From 44337f03079e0f4eb74ad065e4b53ced5c814232 Mon Sep 17 00:00:00 2001 From: RandomNinjaAtk Date: Mon, 5 Sep 2022 15:09:46 -0400 Subject: [PATCH] v1.0.001 - Adjusted for Sonarr --- root/scripts/QueueCleaner.bash | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/root/scripts/QueueCleaner.bash b/root/scripts/QueueCleaner.bash index c3fcb69..49b7320 100644 --- a/root/scripts/QueueCleaner.bash +++ b/root/scripts/QueueCleaner.bash @@ -1,5 +1,5 @@ #!/usr/bin/env bash -scriptVersion="1.0.000" +scriptVersion="1.0.001" if [ -z "$arrUrl" ] || [ -z "$arrApiKey" ]; then arrUrlBase="$(cat /config/config.xml | xq | jq -r .Config.UrlBase)" @@ -26,7 +26,7 @@ log () { 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[])" +arrQueueData="$(curl -s "$arrUrl/api/v3/queue?page=1&pagesize=1000000000&sortDirection=descending&sortKey=progress&includeUnknownSeriesItems=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 @@ -35,12 +35,12 @@ else for queueId in $(echo $arrQueueIds); do arrQueueItemData="$(echo "$arrQueueData" | jq -r "select(.id==$queueId)")" arrQueueItemTitle="$(echo "$arrQueueItemData" | jq -r .title)" - log "Removing Failed Queue Item ID: $queueId ($arrQueueItemTitle) from Radarr..." + log "Removing Failed Queue Item ID: $queueId ($arrQueueItemTitle) from Sonarr..." curl -sX DELETE "$arrUrl/api/v3/queue/$queueId?removeFromClient=true&blocklist=true&apikey=${arrApiKey}" done fi -arrQueueData="$(curl -s "$arrUrl/api/v3/queue?page=1&pagesize=1000000000&sortDirection=descending&sortKey=progress&includeUnknownMovieItems=true&apikey=${arrApiKey}" | jq -r .records[])" +arrQueueData="$(curl -s "$arrUrl/api/v3/queue?page=1&pagesize=1000000000&sortDirection=descending&sortKey=progress&includeUnknownSeriesItems=true&apikey=${arrApiKey}" | jq -r .records[])" arrQueueIds=$(echo "$arrQueueData" | jq -r 'select(.status=="failed") | select(.trackedDownloadStatus=="warning") | .id') arrQueueIdsCount=$(echo "$arrQueueData" | jq -r 'select(.status=="failed") | select(.trackedDownloadStatus=="warning") | .id' | wc -l) if [ $arrQueueIdsCount -eq 0 ]; then @@ -50,7 +50,7 @@ else for queueId in $(echo $arrQueueIds); do arrQueueItemData="$(echo "$arrQueueData" | jq -r "select(.id==$queueId)")" arrQueueItemTitle="$(echo "$arrQueueItemData" | jq -r .title)" - log "Removing Failed Queue Item ID: $queueId ($arrQueueItemTitle) from Radarr..." + log "Removing Failed Queue Item ID: $queueId ($arrQueueItemTitle) from Sonarr..." curl -sX DELETE "$arrUrl/api/v3/queue/$queueId?removeFromClient=true&blocklist=true&apikey=${arrApiKey}" done fi