diff options
| author | Rasmus Steinke <rasi@xssn.at> | 2017-07-15 22:37:41 +0200 |
|---|---|---|
| committer | Rasmus Steinke <rasi@xssn.at> | 2017-07-15 22:37:41 +0200 |
| commit | f0483ca2c4768b5fcccff50480bac722b7a8e7c6 (patch) | |
| tree | 63f4ad5e0a4afe00869ee332cfc616205a8ccdc6 | |
| parent | 2667f66583e00505397e555cadc42835cf207358 (diff) | |
| download | perl-app-clerk-f0483ca2c4768b5fcccff50480bac722b7a8e7c6.tar.gz perl-app-clerk-f0483ca2c4768b5fcccff50480bac722b7a8e7c6.tar.xz | |
make clerk_fzf use new perl column script
| -rwxr-xr-x | clerk_fzf/clerk_fzf | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/clerk_fzf/clerk_fzf b/clerk_fzf/clerk_fzf index e8f9dcd..a51fd88 100755 --- a/clerk_fzf/clerk_fzf +++ b/clerk_fzf/clerk_fzf @@ -51,7 +51,7 @@ albums () { tracklist="$(cat ~/.config/clerk/albums.cache | fzf --no-sort -m -e --reverse -i --with-nth=1,2,3 -d '\t' --tabstop=4 +s --ansi --bind "ctrl-a:select-all,ctrl-n:deselect-all")" val=$? if [[ $val -eq 130 ]]; then - exit + albums fi track="$(echo "${tracklist}" | gawk -F "\t" '{print $NF}')" actions @@ -62,7 +62,7 @@ latest () { tracklist=$(cat ~/.config/clerk/latest.cache | fzf --no-sort -m -e --reverse -i --with-nth=1,2,3 -d '\t' --tabstop=4 +s --ansi --bind "ctrl-a:select-all,ctrl-n:deselect-all") val=$? if [[ $val -eq 130 ]]; then - exit + latest fi track="$(echo "${tracklist}" | gawk -F "\t" '{print $NF}')" actions @@ -73,7 +73,7 @@ tracks () { tracklist=$(cat ~/.config/clerk/tracks.cache | fzf -m --reverse -i -e --with-nth=1,2,3,4,5 -d '\t' --tabstop=4 +s --ansi --bind "ctrl-a:select-all,ctrl-n:deselect-all") val=$? if [[ $val -eq 130 ]]; then - exit + tracks fi if [[ $tracklist == "< Go to Albumlist"* ]]; then latest @@ -99,6 +99,8 @@ actions () { echo "${track}" | while read line; do mpc insert "${line}" done + elif [[ $action -eq 130 ]]; then + exit fi tmux findw -t music queue $(${script}) @@ -186,18 +188,18 @@ updateCache () { | sed 's:/[^/]*$::' | gawk -F ' ○ ' '!seen[$1 $2 $3 $4]++' \ | uniq \ | gawk -F ' ○ ' '{ printf "%."'${artist_width}'"s\t%."'${date_width}'"s\t%."'${album_width}'"s\t%.300s\n", $1, $2, $3, $4 }' \ - | column -s $'\t' -t -o $'\t' > $HOME/.config/clerk/latest.cache + | clerk_column.pl > $HOME/.config/clerk/latest.cache mpc --format '[%albumartist%|%artist%]\t(%date%)\t%album% [(CD %disc%)]\t%file%' \ search filename '' \ | sed 's:/[^/]*$::' \ | gawk -F '\t' '!seen[$1 $2 $3 $4]++' \ | sort \ | gawk -F '\t' '{ printf "%."'${artist_width}'"s\t%."'${date_width}'"s\t%."'${album_width}'"s\t%.300s\n", $1, $2, $3, $4 }' \ - | column -t -s $'\t' -o $'\t' > $HOME/.config/clerk/albums.cache + | clerk_column.pl > $HOME/.config/clerk/albums.cache mpc --format '%track%\t%title%\t%artist%\t(%date%)\t%album%\t%file%' \ search filename '' \ | gawk -F '\t' '{ printf "%."'${track_width}'"s\t%."'${title_width}'"s\t%."'${artist_width}'"s\t%."'${date_width}'"s\t%."'${album_width}'"s\t%.500s\n", $1, $2, $3, $4, $5, $6 }' \ - | column -s $'\t' -t -o $'\t' \ + | clerk_column.pl \ > $HOME/.config/clerk/tracks.cache date=$(mpc stats | grep 'DB Updated: ') file="$HOME/.config/clerk/.lastupdate" |