From f89b4b923417eea17a3af88fb97edc280c3c5d18 Mon Sep 17 00:00:00 2001 From: Makario1337 <74052988+Makario1337@users.noreply.github.com> Date: Sat, 24 Sep 2022 00:08:29 +0200 Subject: [PATCH] Implemented Checks and double release entry fix Implemented Check for already added releases, added logfile --- root/scripts/ERA.sh | 95 ++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 49 deletions(-) diff --git a/root/scripts/ERA.sh b/root/scripts/ERA.sh index 1fef348..2a0124c 100644 --- a/root/scripts/ERA.sh +++ b/root/scripts/ERA.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -scriptVersion="1.0.4" +scriptVersion="1.0.2" agent="ERA ( https://github.com/Makario1337/ExtendedReleaseAdder )" ArtistsJSON=$(jq '.artists[]' /config/artists.json) @@ -20,7 +20,7 @@ if [ -z "$lidarrUrl" ] || [ -z "$lidarrApiKey" ]; then lidarrUrl="http://127.0.0.1:${lidarrPort}${lidarrUrlBase}" fi - +LidarrAudiobookRootFolder=$(curl -s GET "$lidarrUrl/api/v1/rootFolder" -H "X-Api-Key: ${lidarrApiKey}" | grep '\/audiobooks\/') log "-----------------------------------------------------------------------------" log " |\/| _ | _ ._o _ '|~/~/~/" log " | |(_||<(_|| |(_) |_)_)/ " @@ -44,35 +44,33 @@ log "3"; sleep 1 log "2"; sleep 1 log "1"; sleep 1 -if [ ! -d "$lidarrAudiobookRootFolder" ]; then - log "ERROR :: Audiobooks \"$lidarrAudiobookRootFolder\" folder doesn't exist... " +if [ -z "$LidarrAudiobookRootFolder" ]; then + log "ERROR :: Audiobooks folder doesn't exist... " log "ERROR :: Check your Docker path mappings..." log "ERROR :: Exiting ERA..." exit fi -lidarrAudiobookRootFolderCheck=$(curl -s GET "$lidarrUrl/api/v1/rootFolder" -H "X-Api-Key: ${lidarrApiKey}" | grep "$lidarrAudiobookRootFolder") - -if [ -z "$lidarrAudiobookRootFolderCheck" ]; then - log "ERROR :: Audiobooks \"$lidarrAudiobookRootFolder\" is not added to Lidarr as a root folder... " - log "ERROR :: Add \"$lidarrAudiobookRootFolder\" to Lidarr as a root folder" +if [ ! -d "/audiobooks" ]; then + log "ERROR :: Audiobooks folder doesn't exist... " + log "ERROR :: Check your Docker path mappings..." log "ERROR :: Exiting ERA..." exit fi AddReleaseToLidarr() { - lidarrAlbumSearch=$(curl -X GET "$lidarrUrl/api/v1/album/lookup?term="lidarr%3A%20$1"" -H "accept: */*" -H "X-Api-Key: "$lidarrApiKey"" | jq '.') - lidarrAlbumSearch=$(echo $lidarrAlbumSearch | - sed 's/"monitored": false/"monitored": true/g'| - sed 's/"qualityProfileId": 0/"qualityProfileId": 1/g' | - sed 's/"metadataProfileId": 0/"metadataProfileId": 1/g' | - sed "s%\"metadataProfileId\": 1%\"metadataProfileId\": 1,\"rootFolderPath\": \"$lidarrAudiobookRootFolder/\" %g" | - sed 's/"metadataProfileId": 1/"metadataProfileId": 1,\"addOptions": {"monitor": "all","searchForMissingAlbums": false}/g' | - sed 's/"grabbed": false/"grabbed": false,\"addOptions": {"searchForNewAlbum": false}/g'| - jq '.' | - cut -c 2- | - head -c -2) - curl -X POST "$lidarrUrl/api/v1/album?apikey="$lidarrApiKey"" -H "accept: text/plain" -H "Content-Type: application/json" -d "$lidarrAlbumSearch" +lidarrAlbumSearch=$(curl -X GET "$lidarrUrl/api/v1/album/lookup?term="lidarr%3A%20$1"" -H "accept: */*" -H "X-Api-Key: "$lidarrApiKey"" | jq '.') +lidarrAlbumSearch=$(echo $lidarrAlbumSearch | +sed 's/"monitored": false/"monitored": true/g'| +sed 's/"qualityProfileId": 0/"qualityProfileId": 1/g' | +sed 's/"metadataProfileId": 0/"metadataProfileId": 2/g' | +sed 's/"metadataProfileId": 2/"metadataProfileId": 2,\"rootFolderPath": "\/audiobooks\/" /g'| +sed 's/"metadataProfileId": 2/"metadataProfileId": 2,\"addOptions": {"monitor": "all","searchForMissingAlbums": false}/g' | +sed 's/"grabbed": false/"grabbed": false,\"addOptions": {"searchForNewAlbum": false}/g'| +jq '.' | +cut -c 2- | +head -c -2) +curl -X POST "$lidarrUrl/api/v1/album?apikey="$lidarrApiKey"" -H "accept: text/plain" -H "Content-Type: application/json" -d "$lidarrAlbumSearch" } SearchRelease(){ ReleaseName=$(wget -U "$agent" --timeout=0 -q -O - "https://musicbrainz.org/ws/2/release-group/$1" | grep -o ".*" | sed 's///g' | head -c -9 | sed 's/\&/\&/g' | sed 's/???/???‎/g') @@ -80,36 +78,35 @@ SearchRelease(){ AddReleaseToLidarr $1 &> /dev/null } SearchAllReleasesForArtist() { - offset=0 - while [ $offset -le 500 ] - do - offset=$(( $offset + 100 )) - sleep 1.5 - SearchAllReleasesForArtist=$(wget -U "$agent" --timeout=0 -q -O - "https://musicbrainz.org/ws/2/release-group/?artist="$1"&limit=100&offset=$offset&fmt=json&type=other&secondary_type="audio%20drama"") - lines=$(echo $SearchAllReleasesForArtist | jq '."release-groups"[]."id"') - if [ -z "$lines" ] - then - log "ERROR :: Did not find matching release , skipping... " - log "ERROR :: Make sure the wanted items are listed under Other + Audio Drama on Musicbrainz" - offset=$(( $offset + 1337 )) - else - for line in $lines - do - trim=$(echo $line | cut -c 2- | head -c -2) - SearchRelease $trim - sleep 1.5 - done - fi - done +offset=0 +while [ $offset -le 500 ] +do + offset=$(( $offset + 100 )) + sleep 1.5 + SearchAllReleasesForArtist=$(wget -U "$agent" --timeout=0 -q -O - "https://musicbrainz.org/ws/2/release-group/?artist="$1"&limit=100&offset=$offset&fmt=json&type=other&secondary_type="audio%20drama"") + lines=$(echo $SearchAllReleasesForArtist | jq '."release-groups"[]."id"') + if [ -z "$lines" ] + then + log "ERROR :: Did not find matching release , skipping... " + log "ERROR :: Make sure the wanted items are listed under Other + Audio Drama on Musicbrainz" + offset=$(( $offset + 1337 )) + else + for line in $lines + do + trim=$(echo $line | cut -c 2- | head -c -2) + SearchRelease $trim + sleep 1.5 + done + fi +done } ArtistLookup() { - search=$(echo $1 | sed 's/\"//g') - artist=$(wget -U "$agent" --timeout=0 -q -O - "https://musicbrainz.org/ws/2/artist/$search" | grep -o "<name>.*</name>" | sed 's/<name>//' | sed 's/<\/name>.*//' | sed 's/???/???‎/g' ) - log "Adding :: $artist" - sleep 1.5 - SearchAllReleasesForArtist $search +search=$(echo $1 | sed 's/\"//g') +artist=$(wget -U "$agent" --timeout=0 -q -O - "https://musicbrainz.org/ws/2/artist/$search" | grep -o "<name>.*</name>" | sed 's/<name>//' | sed 's/<\/name>.*//' | sed 's/???/???‎/g' ) +log "Adding :: $artist" +sleep 1.5 +SearchAllReleasesForArtist $search } - if [ -z "$ArtistsJSON" ] then log "ERROR :: Did not find /config/artists.json or no artists in file... " @@ -118,4 +115,4 @@ else for str in ${ArtistsJSON[@]}; do ArtistLookup $str done -fi +fi \ No newline at end of file