diff --git a/src/sh/fzf.sh b/src/sh/fzf.sh index e7c38bd..2c7ccd7 100644 --- a/src/sh/fzf.sh +++ b/src/sh/fzf.sh @@ -123,7 +123,7 @@ fzf_reload_after_change() { sleep 1 done # Show results - column -t -s "$(printf '\t')" "$RESULTS" | + column -t -s "$(printf '\t')" -E 0 "$RESULTS" | sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\)$|\t\1\t\2|' } diff --git a/src/sh/helper.sh b/src/sh/helper.sh index aa00e4a..3aa9961 100644 --- a/src/sh/helper.sh +++ b/src/sh/helper.sh @@ -2,16 +2,16 @@ ERR="\033[38;5;196m" INFO="\033[38;5;75m" DBG=$ERR OFF="\033[m" -LOGDIR="$HOME/.local/state/$APPNAME" +LOGDIR="$HOME/.local/state/$APP_NAME" [ -d "$LOGDIR" ] || mkdir -p "$LOGDIR" LOGFILE="$LOGDIR/log" err() { - echo "${ERR}ERROR:${OFF} ${1:-}" >>"$LOGFILE" + echo "${ERR}ERROR:${OFF} ${1:-}" >/dev/stderr } info() { - echo "${INFO}Info:${OFF} ${1:-}" >>"$LOGFILE" + echo "${INFO}Info:${OFF} ${1:-}" >/dev/stderr } debug() { diff --git a/src/sh/lists.sh b/src/sh/lists.sh index cbfd892..f99c325 100644 --- a/src/sh/lists.sh +++ b/src/sh/lists.sh @@ -41,7 +41,7 @@ list_releasegroups() { "$AWK_RELEASEGROUPS" | sort -n -r | cut -d "$(printf '\t')" -f 2- | - column -t -s "$(printf '\t')" | + column -t -s "$(printf '\t')" -E 0 | sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\)$|\t\1\t\2|' } @@ -86,7 +86,7 @@ list_releases() { "$AWK_RELEASES" | sort -n -r | cut -d "$(printf '\t')" -f 2- | - column -t -s "$(printf '\t')" | + column -t -s "$(printf '\t')" -E 0 | sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2\t\3|' } @@ -123,7 +123,7 @@ list_recordings() { "$AWK_RECORDINGS" | sort -k1,1n -k2,2g | cut -d "$(printf '\t')" -f 2- | - column -t -s "$(printf '\t')" -R 3,4,7 | + column -t -s "$(printf '\t')" -R 3,4,7 -E 0 | sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2\t\3|' if [ "${rectmp:-}" ] && [ -f "$rectmp" ]; then rm -f "$rectmp" @@ -198,7 +198,7 @@ list_artists_from_json() { -v format_disambiguation="$AV_DISAMBIGUATION" \ -v format_local="$FORMAT_LOCAL" \ "$AWK_ARTISTS" | - column -t -s "$(printf '\t')" | + column -t -s "$(printf '\t')" -E 0 | sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\)$|\t\1\t\2|' } @@ -228,7 +228,7 @@ list_playlist() { -v current_id="$current_id" \ "$AWK_RECORDINGS" | cut -d "$(printf '\t')" -f 2- | - column -t -s "$(printf '\t')" -R 5 | + column -t -s "$(printf '\t')" -R 5 -E 0 | sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2\t\3|' rm -f "$rectmp" "$mpvtmp" } diff --git a/src/sh/local.sh b/src/sh/local.sh index 7ff4ae9..5a3a3a4 100644 --- a/src/sh/local.sh +++ b/src/sh/local.sh @@ -125,7 +125,7 @@ precompute_view() { -v format_local="$FORMAT_LOCAL" \ "$AWK_ARTISTS" | sort | - column -t -s "$(printf '\t')" | + column -t -s "$(printf '\t')" -E 0 | sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\)$|\t\1\t\2|' >"$LOCALDATA_ARTISTS_VIEW" info "Precomputing releasegroup view" while IFS= read -r rgid; do @@ -167,7 +167,7 @@ precompute_view() { "$AWK_RELEASEGROUPS" | sort -n -r | cut -d "$(printf '\t')" -f 2- | - column -t -s "$(printf '\t')" | + column -t -s "$(printf '\t')" -E 0 | sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\)$|\t\1\t\2|' >"$LOCALDATA_RELEASEGROUPS_VIEW" info "Precomputing release view" cut -d "$(printf '\t')" -f 1 "$LOCALDATA_RELEASES" | @@ -204,7 +204,7 @@ precompute_view() { "$AWK_RELEASES" | sort -n -r | cut -d "$(printf '\t')" -f 2- | - column -t -s "$(printf '\t')" | + column -t -s "$(printf '\t')" -E 0 | sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2\t\3|' >"$LOCALDATA_RELEASES_VIEW" } diff --git a/src/sh/theme.sh b/src/sh/theme.sh index 8210652..8cbaf6b 100644 --- a/src/sh/theme.sh +++ b/src/sh/theme.sh @@ -118,13 +118,13 @@ RV_ARTIST="${RV_ARTIST:-"${FAINT}by ${CARTIST}<>$OFF"}" # Release Status # ============== -FORMAT_STATUS_OFFICIAL="${FORMAT_STATUS_OFFICIAL:-"๐ŸŸข official"}" -FORMAT_STATUS_PROMO="${FORMAT_STATUS_PROMO:-"๐Ÿ“ฃ promo"}" -FORMAT_STATUS_BOOTLEG="${FORMAT_STATUS_BOOTLEG:-"๐Ÿ’ฃ bootleg"}" -FORMAT_STATUS_PSEUDO="${FORMAT_STATUS_PSEUDO:-"๐ŸŒ€ pseudo"}" -FORMAT_STATUS_WITHDRAWN="${FORMAT_STATUS_WITHDRAWN:-"๐Ÿ”™ withdrawn"}" -FORMAT_STATUS_EXPUNGED="${FORMAT_STATUS_EXPUNGED:-"๐Ÿงน expunged"}" -FORMAT_STATUS_CANCELLED="${FORMAT_STATUS_CANCELLED:-"โŒ cancelled"}" +FORMAT_STATUS_OFFICIAL="${FORMAT_STATUS_OFFICIAL:-"๐ŸŸข"}" +FORMAT_STATUS_PROMO="${FORMAT_STATUS_PROMO:-"๐Ÿ“ฃ"}" +FORMAT_STATUS_BOOTLEG="${FORMAT_STATUS_BOOTLEG:-"๐Ÿ’ฃ"}" +FORMAT_STATUS_PSEUDO="${FORMAT_STATUS_PSEUDO:-"๐ŸŒ€"}" +FORMAT_STATUS_WITHDRAWN="${FORMAT_STATUS_WITHDRAWN:-"๐Ÿ”™"}" +FORMAT_STATUS_EXPUNGED="${FORMAT_STATUS_EXPUNGED:-"๐Ÿงน"}" +FORMAT_STATUS_CANCELLED="${FORMAT_STATUS_CANCELLED:-"โŒ"}" # Recording view # ==============