improvements and removed status texts
This commit is contained in:
@@ -123,7 +123,7 @@ fzf_reload_after_change() {
|
|||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
# Show results
|
# 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|'
|
sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\)$|\t\1\t\2|'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -2,16 +2,16 @@ ERR="\033[38;5;196m"
|
|||||||
INFO="\033[38;5;75m"
|
INFO="\033[38;5;75m"
|
||||||
DBG=$ERR
|
DBG=$ERR
|
||||||
OFF="\033[m"
|
OFF="\033[m"
|
||||||
LOGDIR="$HOME/.local/state/$APPNAME"
|
LOGDIR="$HOME/.local/state/$APP_NAME"
|
||||||
[ -d "$LOGDIR" ] || mkdir -p "$LOGDIR"
|
[ -d "$LOGDIR" ] || mkdir -p "$LOGDIR"
|
||||||
LOGFILE="$LOGDIR/log"
|
LOGFILE="$LOGDIR/log"
|
||||||
|
|
||||||
err() {
|
err() {
|
||||||
echo "${ERR}ERROR:${OFF} ${1:-}" >>"$LOGFILE"
|
echo "${ERR}ERROR:${OFF} ${1:-}" >/dev/stderr
|
||||||
}
|
}
|
||||||
|
|
||||||
info() {
|
info() {
|
||||||
echo "${INFO}Info:${OFF} ${1:-}" >>"$LOGFILE"
|
echo "${INFO}Info:${OFF} ${1:-}" >/dev/stderr
|
||||||
}
|
}
|
||||||
|
|
||||||
debug() {
|
debug() {
|
||||||
|
@@ -41,7 +41,7 @@ list_releasegroups() {
|
|||||||
"$AWK_RELEASEGROUPS" |
|
"$AWK_RELEASEGROUPS" |
|
||||||
sort -n -r |
|
sort -n -r |
|
||||||
cut -d "$(printf '\t')" -f 2- |
|
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|'
|
sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\)$|\t\1\t\2|'
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,7 +86,7 @@ list_releases() {
|
|||||||
"$AWK_RELEASES" |
|
"$AWK_RELEASES" |
|
||||||
sort -n -r |
|
sort -n -r |
|
||||||
cut -d "$(printf '\t')" -f 2- |
|
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|'
|
sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2\t\3|'
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -123,7 +123,7 @@ list_recordings() {
|
|||||||
"$AWK_RECORDINGS" |
|
"$AWK_RECORDINGS" |
|
||||||
sort -k1,1n -k2,2g |
|
sort -k1,1n -k2,2g |
|
||||||
cut -d "$(printf '\t')" -f 2- |
|
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|'
|
sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2\t\3|'
|
||||||
if [ "${rectmp:-}" ] && [ -f "$rectmp" ]; then
|
if [ "${rectmp:-}" ] && [ -f "$rectmp" ]; then
|
||||||
rm -f "$rectmp"
|
rm -f "$rectmp"
|
||||||
@@ -198,7 +198,7 @@ list_artists_from_json() {
|
|||||||
-v format_disambiguation="$AV_DISAMBIGUATION" \
|
-v format_disambiguation="$AV_DISAMBIGUATION" \
|
||||||
-v format_local="$FORMAT_LOCAL" \
|
-v format_local="$FORMAT_LOCAL" \
|
||||||
"$AWK_ARTISTS" |
|
"$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|'
|
sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\)$|\t\1\t\2|'
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -228,7 +228,7 @@ list_playlist() {
|
|||||||
-v current_id="$current_id" \
|
-v current_id="$current_id" \
|
||||||
"$AWK_RECORDINGS" |
|
"$AWK_RECORDINGS" |
|
||||||
cut -d "$(printf '\t')" -f 2- |
|
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|'
|
sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2\t\3|'
|
||||||
rm -f "$rectmp" "$mpvtmp"
|
rm -f "$rectmp" "$mpvtmp"
|
||||||
}
|
}
|
||||||
|
@@ -125,7 +125,7 @@ precompute_view() {
|
|||||||
-v format_local="$FORMAT_LOCAL" \
|
-v format_local="$FORMAT_LOCAL" \
|
||||||
"$AWK_ARTISTS" |
|
"$AWK_ARTISTS" |
|
||||||
sort |
|
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"
|
sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\)$|\t\1\t\2|' >"$LOCALDATA_ARTISTS_VIEW"
|
||||||
info "Precomputing releasegroup view"
|
info "Precomputing releasegroup view"
|
||||||
while IFS= read -r rgid; do
|
while IFS= read -r rgid; do
|
||||||
@@ -167,7 +167,7 @@ precompute_view() {
|
|||||||
"$AWK_RELEASEGROUPS" |
|
"$AWK_RELEASEGROUPS" |
|
||||||
sort -n -r |
|
sort -n -r |
|
||||||
cut -d "$(printf '\t')" -f 2- |
|
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"
|
sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\)$|\t\1\t\2|' >"$LOCALDATA_RELEASEGROUPS_VIEW"
|
||||||
info "Precomputing release view"
|
info "Precomputing release view"
|
||||||
cut -d "$(printf '\t')" -f 1 "$LOCALDATA_RELEASES" |
|
cut -d "$(printf '\t')" -f 1 "$LOCALDATA_RELEASES" |
|
||||||
@@ -204,7 +204,7 @@ precompute_view() {
|
|||||||
"$AWK_RELEASES" |
|
"$AWK_RELEASES" |
|
||||||
sort -n -r |
|
sort -n -r |
|
||||||
cut -d "$(printf '\t')" -f 2- |
|
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"
|
sed 's| \+\([0-9a-f-]\+\) \+\([0-9a-f-]\+\):\(.*$\)$|\t\1\t\2\t\3|' >"$LOCALDATA_RELEASES_VIEW"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -118,13 +118,13 @@ RV_ARTIST="${RV_ARTIST:-"${FAINT}by ${CARTIST}<<artist>>$OFF"}"
|
|||||||
|
|
||||||
# Release Status
|
# Release Status
|
||||||
# ==============
|
# ==============
|
||||||
FORMAT_STATUS_OFFICIAL="${FORMAT_STATUS_OFFICIAL:-"🟢 official"}"
|
FORMAT_STATUS_OFFICIAL="${FORMAT_STATUS_OFFICIAL:-"🟢"}"
|
||||||
FORMAT_STATUS_PROMO="${FORMAT_STATUS_PROMO:-"📣 promo"}"
|
FORMAT_STATUS_PROMO="${FORMAT_STATUS_PROMO:-"📣"}"
|
||||||
FORMAT_STATUS_BOOTLEG="${FORMAT_STATUS_BOOTLEG:-"💣 bootleg"}"
|
FORMAT_STATUS_BOOTLEG="${FORMAT_STATUS_BOOTLEG:-"💣"}"
|
||||||
FORMAT_STATUS_PSEUDO="${FORMAT_STATUS_PSEUDO:-"🌀 pseudo"}"
|
FORMAT_STATUS_PSEUDO="${FORMAT_STATUS_PSEUDO:-"🌀"}"
|
||||||
FORMAT_STATUS_WITHDRAWN="${FORMAT_STATUS_WITHDRAWN:-"🔙 withdrawn"}"
|
FORMAT_STATUS_WITHDRAWN="${FORMAT_STATUS_WITHDRAWN:-"🔙"}"
|
||||||
FORMAT_STATUS_EXPUNGED="${FORMAT_STATUS_EXPUNGED:-"🧹 expunged"}"
|
FORMAT_STATUS_EXPUNGED="${FORMAT_STATUS_EXPUNGED:-"🧹"}"
|
||||||
FORMAT_STATUS_CANCELLED="${FORMAT_STATUS_CANCELLED:-"❌ cancelled"}"
|
FORMAT_STATUS_CANCELLED="${FORMAT_STATUS_CANCELLED:-"❌"}"
|
||||||
|
|
||||||
# Recording view
|
# Recording view
|
||||||
# ==============
|
# ==============
|
||||||
|
Reference in New Issue
Block a user