diff --git a/src/main.sh b/src/main.sh index f01279c..205c65d 100755 --- a/src/main.sh +++ b/src/main.sh @@ -288,15 +288,16 @@ if [ "${1:-}" = "--internal-list-recordings" ]; then cut -d "$(printf '\t')" -f 2- | column -t -s "$(printf '\t')" -R 2,3,6 | sed 's| \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2|' - if [ -f "$rectmp" ]; then + if [ "${rectmp:-}" ] && [ -f "$rectmp" ]; then rm -f "$rectmp" fi exit 0 fi if [ "${1:-}" = "--internal-list-local-artists" ]; then - while IFS= read -r aid; do - mb_artist "$aid" | $JQ -r '[ + if ! cat "$LOCALDATA_ARTISTS_VIEW" 2>/dev/null; then + while IFS= read -r aid; do + mb_artist "$aid" | $JQ -r '[ .id, .type, .name, @@ -304,23 +305,27 @@ if [ "${1:-}" = "--internal-list-local-artists" ]; then .["life-span"].begin, .["life-span"].end ] | join("\t")' - done <"$LOCALDATA_ARTISTS" | - awk \ - -F "\t" \ - -v file_local_artists="${LOCALDATA_ARTISTS:-}" \ - -v format_person="$AV_PERSON" \ - -v format_group="$AV_GROUP" \ - -v format_disambiguation="$AV_DISAMBIGUATION" \ - -v format_local="$FORMAT_LOCAL" \ - "$AWK_ARTISTS" | - column -t -s "$(printf '\t')" | - sed 's| \+\([0-9a-f-]\+\)$|\t\1|' + done <"$LOCALDATA_ARTISTS" | + awk \ + -F "\t" \ + -v file_local_artists="${LOCALDATA_ARTISTS:-}" \ + -v format_person="$AV_PERSON" \ + -v format_group="$AV_GROUP" \ + -v format_disambiguation="$AV_DISAMBIGUATION" \ + -v format_local="$FORMAT_LOCAL" \ + "$AWK_ARTISTS" | + sort | + column -t -s "$(printf '\t')" | + sed 's| \+\([0-9a-f-]\+\)$|\t\1|' | + tee "$LOCALDATA_ARTISTS_VIEW" + fi exit 0 fi if [ "${1:-}" = "--internal-list-local-releasegroups" ]; then - while IFS= read -r rgid; do - mb_releasegroup "$rgid" | $JQ -r '[ + if ! cat "$LOCALDATA_RELEASEGROUPS_VIEW" 2>/dev/null; then + while IFS= read -r rgid; do + mb_releasegroup "$rgid" | $JQ -r '[ .id, ."primary-type", (."secondary-types" // []|join(";")), @@ -328,43 +333,48 @@ if [ "${1:-}" = "--internal-list-local-releasegroups" ]; then .title, (."artist-credit" | map(([.name, .joinphrase]|join(""))) | join("")) ] | join("\t")' - done <"$LOCALDATA_RELEASEGROUPS" | - awk \ - -F "\t" \ - -v format_release="$RGV_RELEASE" \ - -v format_release_w_artist="$RGV_RELEASE_W_ARTIST" \ - -v format_year="$RGV_YEAR" \ - -v format_album="$FORMAT_TYPE_ALBUM" \ - -v format_single="$FORMAT_TYPE_SINGLE" \ - -v format_ep="$FORMAT_TYPE_EP" \ - -v format_broadcast="$FORMAT_TYPE_BROADCAST" \ - -v format_other="$FORMAT_TYPE_OTHER" \ - -v format_has_secondary="$FORMAT_TYPE_HAS_SECONDARY" \ - -v format_secondary="$FORMAT_TYPE_SECONDARY" \ - -v format_compilation="$FORMAT_TYPE_SECONDARY_COMPILATION" \ - -v format_soundtrack="$FORMAT_TYPE_SECONDARY_SOUNDTRACK" \ - -v format_spokenword="$FORMAT_TYPE_SECONDARY_SPOKENWORD" \ - -v format_interview="$FORMAT_TYPE_SECONDARY_INTERVIEW" \ - -v format_audiobook="$FORMAT_TYPE_SECONDARY_AUDIOBOOK" \ - -v format_audiodrama="$FORMAT_TYPE_SECONDARY_AUDIODRAMA" \ - -v format_live="$FORMAT_TYPE_SECONDARY_LIVE" \ - -v format_remix="$FORMAT_TYPE_SECONDARY_REMIX" \ - -v format_djmix="$FORMAT_TYPE_SECONDARY_DJMIX" \ - -v format_mixtape="$FORMAT_TYPE_SECONDARY_MIXTAPE" \ - -v format_demo="$FORMAT_TYPE_SECONDARY_DEMO" \ - -v format_fieldrec="$FORMAT_TYPE_SECONDARY_FIELDREC" \ - "$AWK_RELEASEGROUPS" | - sort -n -r | - cut -d "$(printf '\t')" -f 2- | - column -t -s "$(printf '\t')" | - sed 's| \+\([0-9a-f-]\+\)$|\t\1|' + done <"$LOCALDATA_RELEASEGROUPS" | + awk \ + -F "\t" \ + -v file_local_releasegroups="${LOCALDATA_RELEASEGROUPS:-}" \ + -v format_release="$RGV_RELEASE" \ + -v format_release_w_artist="$RGV_RELEASE_W_ARTIST" \ + -v format_year="$RGV_YEAR" \ + -v format_album="$FORMAT_TYPE_ALBUM" \ + -v format_single="$FORMAT_TYPE_SINGLE" \ + -v format_ep="$FORMAT_TYPE_EP" \ + -v format_broadcast="$FORMAT_TYPE_BROADCAST" \ + -v format_other="$FORMAT_TYPE_OTHER" \ + -v format_has_secondary="$FORMAT_TYPE_HAS_SECONDARY" \ + -v format_secondary="$FORMAT_TYPE_SECONDARY" \ + -v format_compilation="$FORMAT_TYPE_SECONDARY_COMPILATION" \ + -v format_soundtrack="$FORMAT_TYPE_SECONDARY_SOUNDTRACK" \ + -v format_spokenword="$FORMAT_TYPE_SECONDARY_SPOKENWORD" \ + -v format_interview="$FORMAT_TYPE_SECONDARY_INTERVIEW" \ + -v format_audiobook="$FORMAT_TYPE_SECONDARY_AUDIOBOOK" \ + -v format_audiodrama="$FORMAT_TYPE_SECONDARY_AUDIODRAMA" \ + -v format_live="$FORMAT_TYPE_SECONDARY_LIVE" \ + -v format_remix="$FORMAT_TYPE_SECONDARY_REMIX" \ + -v format_djmix="$FORMAT_TYPE_SECONDARY_DJMIX" \ + -v format_mixtape="$FORMAT_TYPE_SECONDARY_MIXTAPE" \ + -v format_demo="$FORMAT_TYPE_SECONDARY_DEMO" \ + -v format_fieldrec="$FORMAT_TYPE_SECONDARY_FIELDREC" \ + -v format_local="$FORMAT_LOCAL" \ + "$AWK_RELEASEGROUPS" | + sort -n -r | + cut -d "$(printf '\t')" -f 2- | + column -t -s "$(printf '\t')" | + sed 's| \+\([0-9a-f-]\+\)$|\t\1|' | + tee "$LOCALDATA_RELEASEGROUPS_VIEW" + fi exit 0 fi if [ "${1:-}" = "--internal-list-local-releases" ]; then - list_releases | - while IFS= read -r rid; do - mb_release "$rid" | $JQ -r '[ + if ! cat "$LOCALDATA_RELEASES_VIEW" 2>/dev/null; then + list_releases | + while IFS= read -r rid; do + mb_release "$rid" | $JQ -r '[ .id, .status, .date, @@ -376,25 +386,29 @@ if [ "${1:-}" = "--internal-list-local-releases" ]; then .title, (."artist-credit" | map(([.name, .joinphrase]|join(""))) | join("")) ] | join("\t")' - done | - awk \ - -F "\t" \ - -v release_official="$FORMAT_STATUS_OFFICIAL" \ - -v release_promotion="$FORMAT_STATUS_PROMO" \ - -v release_bootleg="$FORMAT_STATUS_BOOTLEG" \ - -v release_pseudo="$FORMAT_STATUS_PSEUDO" \ - -v release_withdrawn="$FORMAT_STATUS_WITHDRAWN" \ - -v release_expunged="$FORMAT_STATUS_EXPUNGED" \ - -v release_cancelled="$FORMAT_STATUS_CANCELLED" \ - -v release_format="$RV_FORMAT" \ - -v release_format_title_artist="$RV_TITLE_ARTIST" \ - -v release_format_title="$RV_TITLE" \ - -v release_format_artist="$RV_ARTIST" \ - "$AWK_RELEASES" | - sort -n -r | - cut -d "$(printf '\t')" -f 2- | - column -t -s "$(printf '\t')" | - sed 's| \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2|' + done | + awk \ + -F "\t" \ + -v file_local_releases="${LOCALDATA_RELEASES:-}" \ + -v release_official="$FORMAT_STATUS_OFFICIAL" \ + -v release_promotion="$FORMAT_STATUS_PROMO" \ + -v release_bootleg="$FORMAT_STATUS_BOOTLEG" \ + -v release_pseudo="$FORMAT_STATUS_PSEUDO" \ + -v release_withdrawn="$FORMAT_STATUS_WITHDRAWN" \ + -v release_expunged="$FORMAT_STATUS_EXPUNGED" \ + -v release_cancelled="$FORMAT_STATUS_CANCELLED" \ + -v release_format="$RV_FORMAT" \ + -v release_format_title_artist="$RV_TITLE_ARTIST" \ + -v release_format_title="$RV_TITLE" \ + -v release_format_artist="$RV_ARTIST" \ + -v format_local="$FORMAT_LOCAL" \ + "$AWK_RELEASES" | + sort -n -r | + cut -d "$(printf '\t')" -f 2- | + column -t -s "$(printf '\t')" | + sed 's| \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2|' | + tee "$LOCALDATA_RELEASES_VIEW" + fi exit 0 fi @@ -551,10 +565,14 @@ while true; do $JQ -r 'map([.artist.id, .artist.type, .name] | join("\t")) | join("\n")' | awk \ -F "\t" \ + -v file_local_artists="${LOCALDATA_ARTISTS:-}" \ -v format_person="$AV_PERSON" \ -v format_group="$AV_GROUP" \ -v format_disambiguation="$AV_DISAMBIGUATION" \ + -v format_local="$FORMAT_LOCAL" \ "$AWK_ARTISTS" | + column -t -s "$(printf '\t')" | + sed 's| \+\([0-9a-f-]\+\)$|\t\1|' | $FZF \ --no-clear \ -1 \ @@ -646,14 +664,12 @@ while true; do ;; "--albums") sel=$( - $0 --internal-list-local-releases | + $0 --internal-list-local-releasegroups | $FZF \ --no-clear \ --ansi \ --reverse \ --cycle \ - --no-sort \ - --query="$FORMAT_STATUS_OFFICIAL " \ --delimiter="\t" \ --prompt="$SEARCH_PROMPT" \ --info="inline-right" \ @@ -673,9 +689,9 @@ 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" ] && [ "$mid" ] && set -- "--release" "$mid" - [ "$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"')" + [ "$lns" -eq 2 ] && [ ! "$key" ] && [ "$mid" ] && set -- "--releasegroup" "$mid" + [ "$lns" -eq 2 ] && [ "$key" = "ctrl-h" ] && set -- "--albums" + [ "$lns" -eq 2 ] && [ "$key" = "ctrl-a" ] && set -- "--select-artist" "$(mb_releasegroup "$mid" | $JQ -r -c '."artist-credit"')" [ "$key" = "ctrl-c" ] && tput rmcup && exit 0 [ "$key" = "ctrl-q" ] && tput rmcup && exit 0 [ "$key" = "ctrl-/" ] && set -- "--search-album" @@ -688,7 +704,6 @@ while true; do --no-clear \ --ansi \ --reverse \ - --no-sort \ --cycle \ --delimiter="\t" \ --prompt="$SEARCH_PROMPT" \ diff --git a/src/sh/local.sh b/src/sh/local.sh index 0cc18af..3b28c94 100644 --- a/src/sh/local.sh +++ b/src/sh/local.sh @@ -98,6 +98,9 @@ LOCALDATADIR="$HOME/.cache/$APP_NAME/local" LOCALDATA_ARTISTS="$LOCALDATADIR/artists" LOCALDATA_RELEASEGROUPS="$LOCALDATADIR/releasegroups" LOCALDATA_RELEASES="$LOCALDATADIR/releases" +LOCALDATA_ARTISTS_VIEW="$LOCALDATADIR/artists_view" +LOCALDATA_RELEASEGROUPS_VIEW="$LOCALDATADIR/releasegroups_view" +LOCALDATA_RELEASES_VIEW="$LOCALDATADIR/releases_view" # Load local music load_local() { diff --git a/src/sh/theme.sh b/src/sh/theme.sh index 996a0b6..af9cf8b 100644 --- a/src/sh/theme.sh +++ b/src/sh/theme.sh @@ -23,8 +23,8 @@ AV_GROUP="${AV_GROUP:-"๐Ÿง‘โ€๐Ÿคโ€๐Ÿง‘ $CARTIST<>$OFF"}" AV_DISAMBIGUATION="${AV_DISAMBIGUATION:-"$CDISAMB(<>)$OFF"}" # Release group view -RGV_RELEASE="${RGV_RELEASE:-"${CTITLE}<>"}" -RGV_RELEASE_W_ARTIST="${RGV_RELEASE_W_ARTIST:-"${CTITLE}<<title>> โ€” ${CARTIST}<<artist>>"}" +RGV_RELEASE="${RGV_RELEASE:-"${CTITLE}<<title>>$OFF"}" +RGV_RELEASE_W_ARTIST="${RGV_RELEASE_W_ARTIST:-"${CTITLE}<<title>>$OFF โ€” ${CARTIST}<<artist>>$OFF"}" RGV_YEAR="${RGV_YEAR:-"${CYEAR}(<<year>>)$OFF"}" # Types @@ -34,7 +34,7 @@ FORMAT_TYPE_SINGLE="${FORMAT_TYPE_SINGLE:-"SI ๐ŸŽถ"}" FORMAT_TYPE_BROADCAST="${FORMAT_TYPE_BROADCAST:-"BR ๐Ÿ“ป"}" FORMAT_TYPE_OTHER="${FORMAT_TYPE_OTHER:-"OT โ”"}" FORMAT_TYPE_HAS_SECONDARY="${FORMAT_TYPE_HAS_SECONDARY:-"%sโ˜ผ"}" -FORMAT_TYPE_SECONDARY="${FORMAT_TYPE_SECONDARY:-"${CNOTE}[โ˜ผ: %s]"}" +FORMAT_TYPE_SECONDARY="${FORMAT_TYPE_SECONDARY:-"${CNOTE}[โ˜ผ: %s]$OFF"}" FORMAT_TYPE_SECONDARY_COMPILATION="${FORMAT_TYPE_SECONDARY_COMPILATION:-"๐Ÿงฉ compilation"}" FORMAT_TYPE_SECONDARY_SOUNDTRACK="${FORMAT_TYPE_SECONDARY_SOUNDTRACK:-"๐ŸŽฌ soundtrack"}" FORMAT_TYPE_SECONDARY_SPOKENWORD="${FORMAT_TYPE_SECONDARY_SPOKENWORD:-"๐Ÿ“– spokenword"}" @@ -66,10 +66,10 @@ FORMAT_STATUS_EXPUNGED="${FORMAT_STATUS_EXPUNGED:-"๐Ÿงน expunged"}" FORMAT_STATUS_CANCELLED="${FORMAT_STATUS_CANCELLED:-"โŒ cancelled"}" # Release view -RV_FORMAT="<<status>>\t${CXXX}<<tracks>> tracks\t<<media>>\t${CYEAR}<<year>>\t<<country>>\t${CARTIST}<<label>>$OFF" -RV_TITLE_ARTIST="${FAINT}as ${CTITLE}<<title>> by ${FAINT}${CARTIST}<<artist>>$OFF" +RV_FORMAT="<<status>>\t${CXXX}<<tracks>> tracks\t<<media>>$OFF\t${CYEAR}<<year>>\t<<country>>$OFF\t${CARTIST}<<label>>$OFF" +RV_TITLE_ARTIST="${FAINT}as ${CTITLE}<<title>>$OFF by ${FAINT}${CARTIST}<<artist>>$OFF" RV_TITLE="${FAINT}as ${CTITLE}<<title>>$OFF" RV_ARTIST="${FAINT}by ${CARTIST}<<artist>>$OFF" # Recording view -REC_FORMAT="${CNOTE}${FAINT}<<med>>\t${CNOTE}<<nr>>\t$OFF${CTITLE}<<title>>\t${CARTIST}<<artist>>\t${CXXX}<<duration>>$OFF" +REC_FORMAT="${CNOTE}${FAINT}<<med>>\t${CNOTE}<<nr>>$OFF\t${CTITLE}<<title>>\t${CARTIST}<<artist>>\t${CXXX}<<duration>>$OFF"