diff --git a/src/awk/artists.awk b/src/awk/artists.awk index caea0a3..aee21b1 100644 --- a/src/awk/artists.awk +++ b/src/awk/artists.awk @@ -2,9 +2,11 @@ BEGIN { OFS="\t" local_artists[0] = 0 delete local_artists[0] - while ((getline < file_local_artists) == 1) - local_artists[$1] = 1 - close(file_local_artists) + if (file_local_artists) { + while ((getline < file_local_artists) == 1) + local_artists[$1] = 1 + close(file_local_artists) + } } { gsub("&", "\\\\&") diff --git a/src/awk/releasegroups.awk b/src/awk/releasegroups.awk index 3e15acd..091f6a3 100644 --- a/src/awk/releasegroups.awk +++ b/src/awk/releasegroups.awk @@ -2,9 +2,11 @@ BEGIN { OFS="\t" local_releasegroups[0] = 0 delete local_releasegroups[0] - while ((getline < file_local_releasegroups) == 1) - local_releasegroups[$1] = 1 - close(file_local_releasegroups) + if (file_local_releasegroups) { + while ((getline < file_local_releasegroups) == 1) + local_releasegroups[$1] = 1 + close(file_local_releasegroups) + } } { line_type="" diff --git a/src/awk/releases.awk b/src/awk/releases.awk index abf1ebc..adae212 100644 --- a/src/awk/releases.awk +++ b/src/awk/releases.awk @@ -2,9 +2,11 @@ BEGIN { OFS="\t" local_releases[0] = 0 delete local_releases[0] - while ((getline < file_local_releases) == 1) - local_releases[$1] = 1 - close(file_local_releases) + if (file_local_releases) { + while ((getline < file_local_releases) == 1) + local_releases[$1] = 1 + close(file_local_releases) + } } { id = $1 diff --git a/src/main.sh b/src/main.sh index 2c3901b..0898b40 100755 --- a/src/main.sh +++ b/src/main.sh @@ -457,8 +457,8 @@ while true; do key=$(echo "$sel" | head -1 | tail -1) mid=$(echo "$sel" | head -2 | tail -1) [ "$lns" -eq 2 ] && [ ! "$key" ] && [ "$mid" ] && set -- "--release" "$mid" - [ "$lns" -eq 2 ] && [ "$key" = "ctrl-h" ] && set -- "--select-artist" "$(mb_releasegroup "$2" | $JQ -r '."artist-credit"')" - [ "$lns" -eq 2 ] && [ "$key" = "ctrl-a" ] && set -- "--select-artist" "$(mb_release "$mid" | $JQ -r '."artist-credit"')" + [ "$lns" -eq 2 ] && [ "$key" = "ctrl-h" ] && set -- "--select-artist" "$(mb_releasegroup "$2" | $JQ -r -c '."artist-credit"')" + [ "$lns" -eq 2 ] && [ "$key" = "ctrl-a" ] && set -- "--select-artist" "$(mb_release "$mid" | $JQ -r -c '."artist-credit"')" ;; "--release") title="$(mb_release "$2" | @@ -484,8 +484,8 @@ while true; do lns=$(echo "$sel" | wc -l) key=$(echo "$sel" | head -1 | tail -1) mid=$(echo "$sel" | head -2 | tail -1) - [ "$lns" -eq 2 ] && [ "$key" = "ctrl-h" ] && set -- "--releasegroup" "$(mb_release "$2" | $JQ -r '."release-group".id')" - [ "$lns" -eq 2 ] && [ "$key" = "ctrl-a" ] && set -- "--select-artist" "$(mb_release "$2" | $JQ -r ".media[].tracks[] | select(.id==\"$mid\") | .\"artist-credit\"")" + [ "$lns" -eq 2 ] && [ "$key" = "ctrl-h" ] && set -- "--releasegroup" "$(mb_release "$2" | $JQ -r -c '."release-group".id')" + [ "$lns" -eq 2 ] && [ "$key" = "ctrl-a" ] && set -- "--select-artist" "$(mb_release "$2" | $JQ -r -c ".media[].tracks[] | select(.id==\"$mid\") | .\"artist-credit\"")" ;; "--select-artist") tput rmcup