From eb884e0e80160385bffb564f1740aecd2421c7dc Mon Sep 17 00:00:00 2001
From: Vincent Riquer <vincent+gitorious@riquer.fr>
Date: Fri, 8 Mar 2013 12:53:29 +0100
Subject: [PATCH] fix tag parsing (Ogg, FLAC)

---
 atom | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/atom b/atom
index bcdeb0a..13a3c74 100755
--- a/atom
+++ b/atom
@@ -650,12 +650,8 @@ getRateChannelMPC() {
 }
 
 gettag() {
-	tagval=$(
-		echo -e "$infos"	\
-		| egrep -i "^${1}="
-	)
-	echo "${tagval#${1^^}=}"
-	unset tagval
+	echo -e "$infos"			\
+	| sed -n "/^${1}=/I{s/^${1}=//I;p}"
 }
 
 getInfos::MP3() {
@@ -681,7 +677,7 @@ getInfos::MP3() {
 getInfos::Ogg() {
 	infos=$(
 		ogginfo "$sourcepath/$filename"	\
-		sed 's/\t//'
+		| sed 's/\t//'
 	)
 	albumartist=$(gettag albumartist)
 	album=$(gettag album)
@@ -740,6 +736,11 @@ getInfos::FLAC() {
 	title=$(gettag title)
 	tracknum="$(gettag tracknumber)/$(gettag tracktotal)"
 	year=$(gettag date)
+	if [ -n "$tracknum" -a -n "$tracktotal" ]
+	then
+		tracknum="$tracknum/$tracktotal"
+	fi
+	year=$(gettag DATE)
 	{
 		read rate
 		read channels