1.0.0035 - New audioLyricType

#2

root/scripts/download.sh

@@ -38,7 +38,7 @@ Configuration () {
 	log ""
 	sleep 2
 	log "############# $dockerTitle"
-	log "############# SCRIPT VERSION 1.0.0034"
+	log "############# SCRIPT VERSION 1.0.0035"
 	log "############# DOCKER VERSION $dockerVersion"
 	
 	if [ -z $topLimit ]; then
@@ -735,14 +735,6 @@ SearchProcess () {
 			tidalArtistAlbumsIds=($(echo "${tidalArtistAlbumsData}" | jq -r "select(.explicit=="true") | .id"))
 		fi	
 	
-		if [ "$skipDeezer" = "false" ]; then
-			for dId in ${!deezeArtistIds[@]}; do
-				deezeArtistId="${deezeArtistIds[$dId]}"
-				deezerArtistAlbumsData=$(cat "/config/extended/cache/deezer/$deezeArtistId-albums.json" | jq -r "sort_by(.release_date) | sort_by(.explicit_lyrics) | reverse | .[]")
-				deezerArtistAlbumsIds=($(echo "${deezerArtistAlbumsData}" | jq -r "select(.explicit_lyrics=="true") | .id"))
-			done
-		fi
-
 		LidarrTaskStatusCheck
 		CheckLidarrBeforeImport "$lidarrAlbumForeignAlbumId" "notbeets"
 		if [ $alreadyImported = true ]; then
@@ -750,6 +742,9 @@ SearchProcess () {
 			continue
 		fi
 		
+		# Search for explicit matches
+		if [ $audioLyricType = both ] ||  [ $audioLyricType = explicit ]; then
+			# Deezer search
 			if [ "$skipDeezer" = "false" ]; then
 				for dId in ${!deezeArtistIds[@]}; do
 					deezeArtistId="${deezeArtistIds[$dId]}"
@@ -790,6 +785,7 @@ SearchProcess () {
 				continue
 			fi
 
+			# Tidal search
 			if [ "$skipTidal" = "false" ]; then
 				if echo "${tidalArtistAlbumsData}" | jq -r .title | grep -i "^$lidarrAlbumTitle" | read; then
 					for id in ${!tidalArtistAlbumsIds[@]}; do
@@ -824,7 +820,11 @@ SearchProcess () {
 				log ":: $processNumber of $wantedListAlbumTotal :: $lidarrArtistNameSanitized :: $lidarrAlbumTitle :: Already Imported, skipping..."
 				continue
 			fi
+		fi
 
+		# Search for clean matches
+		if [ $audioLyricType = both ] ||  [ $audioLyricType = clean ]; then
+			# Deezer search
 			if [ "$skipDeezer" = "false" ]; then
 				for dId in ${!deezeArtistIds[@]}; do
 					deezeArtistId="${deezeArtistIds[$dId]}"
@@ -866,6 +866,7 @@ SearchProcess () {
 				continue
 			fi
 
+			# Tidal search
 			if [ "$skipTidal" = "false" ]; then
 
 				tidalArtistAlbumsIds=($(echo "${tidalArtistAlbumsData}" | jq -r "select(.explicit=="false") | .id"))
@@ -896,7 +897,7 @@ SearchProcess () {
 					log ":: $processNumber of $wantedListAlbumTotal :: $lidarrArtistNameSanitized :: $lidarrAlbumTitle :: No Clean Tidal Match Found"
 				fi
 			fi
-
+		fi
 
 		mkdir -p /config/extended/logs/downloaded/notfound
 		touch /config/extended/logs/downloaded/notfound/$lidarrAlbumForeignAlbumId