update format

2 files changed, 12 insertions, 15 deletions

diff --git a/clerk b/clerk
index c41659d..84480ad 100755
--- a/clerk
+++ b/clerk
@@ -80,13 +80,12 @@ updateCache() {
     cd $HOME/.config/clerk
     rm -f *.cache
     clerk_helper createcache
-    for i in {tracks,albums}.cache; do
-        cat "$i" | column -o $'\t' -s $'\t' -t | sort -n > "${i}.new"
-        mv "${i}.new" "$i"
-        cat latest.cache | column -o $'\t' -s $'\t' -t > latest.cache.new
-        mv latest.cache.new latest.cache
-    done
-
+    cat tracks.cache | sed 's,^\([^\t]\{40\}\)[^\t]*,\1…,' | column -o $'\t' -s $'\t' -t > tracks.cache.new
+    mv tracks.cache.new tracks.cache
+    cat latest.cache | column -o $'\t' -s $'\t' -t > latest.cache.new
+    mv latest.cache.new latest.cache
+    cat albums.cache | column -o $'\t' -s $'\t' -t > albums.cache.new
+    mv albums.cache.new albums.cache
 }
 
 # main Menu
@@ -1093,14 +1092,12 @@ TRACK_TEMP=$((echo -e "0  Return to Browse Menu\n---"; cat $HOME/.config/clerk/t
     elif [[ "$TRACK" == "${add}: Add | ${insert}: Insert | ${replace}: Replace | ${rate}: Rate" ]]; then
         AddTrackTags
     else
-        group1=$(echo -en "$TRACK" | awk -F "\t" '{print $1}' | sed -e 's/[[:space:]]*$//')
-        artist=$(echo -ne "$group1" | awk -F " - " '{print $1}')
-        date=$(echo -ne "$group1" | awk -F " - " '{print $2}' | awk '{print substr($0, 2, length($0) - 2)}')
-        album=$(echo -ne "$group1" | awk -F " - " '{print $2}')
-        group2=$(echo -en "$TRACK" | awk -F "\t" '{print $2}' | sed -e 's/[[:space:]]*$//')
-        track=$(echo -ne "$group2" | awk -F " - " '{print $1}')
-        title=$(echo -en "$group2" | awk -F " - " '{print $2}')
         filename=$(echo "$TRACK" | awk -F "\t" '{print $3}')
+        artist=$(mpc search --format '%artist%' filename "${filename}")
+        album=$(mpc search --format '%album%' filename "${filename}")
+        date=$(mpc search --format '%date%' filename "${filename}")
+        track=$(mpc search --format '%track%' filename "${filename}")
+        title=$(mpc search --format '%title%' filename "${filename}")
 
         echo -e "artist: ${artist}\nalbum: ${album}\ntitle: ${title}\ntrack: ${track}\ndate: ${date}\ngroup1: ${group1}\ngroup2: ${group2}"
         if [[ $val -eq 11 ]]; then
diff --git a/clerk_helper b/clerk_helper
index fa6ce69..a465c15 100755
--- a/clerk_helper
+++ b/clerk_helper
@@ -120,7 +120,7 @@ def createCache(args):
         taglist = ['date', 'artist', 'albumartist', 'album', 'track', 'title', 'file']
         track.update([(k, reduceToFstElm(v)) for (k, v) in track.items() if k in taglist])       
 
-        tracklist.append(track['artist']+" - ("+track['date']+") - "+track['album']+"\t"+track['track']+" - "+track['title']+"\t"+track['file'])
+        tracklist.append(track['track']+" "+track['title']+"\tby "+track['artist']+" on "+track['album']+" ("+track['date']+")\t"+track['file'])
 #
     with open(os.getenv('HOME')+'/.config/clerk/tracks.cache', "w") as cache_file:
         for track in tracklist: