repo: music
action: commit
revision: 
path_from: 
revision_from: 3cb2d309762cac5d5d57bdfa271dde07125c76d2:
path_to: 
revision_to: 

commit 3cb2d309762cac5d5d57bdfa271dde07125c76d2
Author: epoch 
Date:   Tue Jun 9 21:32:59 2020 -0500

    music-fileinfo now supports ogg comments in flacs

diff --git a/music-fileinfo b/music-fileinfo

--- a/music-fileinfo
+++ b/music-fileinfo
@@ -1,12 +1,21 @@
 #!/bin/bash
-data="$(id3v2 -R "$1")"
-#echo $data
-artist="$(printf "%s\n" "$data" | grep '^TPE1: ' | cut '-d ' -f2-)"
-title="$(printf "%s\n" "$data" | grep '^TIT2: ' | cut '-d ' -f2-)"
-album="$(printf "%s\n" "$data" | grep '^TALB: ' | cut '-d ' -f2-)"
-year="$(printf "%s\n" "$data" | grep '^TYER: ' | cut '-d ' -f2-)"
+ext="$(printf "$1" | rev | cut -d. -f1 | rev)"
+if [ "$ext" = "mp3" ];then
+  data="$(id3v2 -R "$1")"
+  #echo $data
+  artist="$(printf "%s\n" "$data" | grep '^TPE1: ' | cut '-d ' -f2-)"
+  title="$(printf "%s\n" "$data" | grep '^TIT2: ' | cut '-d ' -f2-)"
+  album="$(printf "%s\n" "$data" | grep '^TALB: ' | cut '-d ' -f2-)"
+  year="$(printf "%s\n" "$data" | grep '^TYER: ' | cut '-d ' -f2-)"
+fi
+if [ "$ext" = "flac" ];then
+  artist="$(metaflac --show-tag=artist "$1" | cut -d= -f2-)"
+  title="$(metaflac --show-tag=title "$1" | cut -d= -f2-)"
+  album="$(metaflac --show-tag=album "$1" | cut -d= -f2-)"
+  year="$(metaflac --show-tag=date "$1" | cut -d= -f2-)"
+fi
 if [ "$artist" -a "$title" -a "$album" -a "$year" ];then
   printf '"%s" by %s on %s (%s)\n' "$title" "$artist" "$album" "$year"
 else
-  printf "%s\n" "$1" | sed "s|$HOME/Music/||"
+  printf "%s\n" "$ext" "$1" | sed "s|$HOME/Music/||"
 fi

-----END OF PAGE-----