finish of m3l_prep_table

1 files changed, 4 insertions, 3 deletions

diff --git a/bin/mp3dirlist b/bin/mp3dirlist
index 46c0653..41671dc 100755
--- a/bin/mp3dirlist
+++ b/bin/mp3dirlist
@@ -23,15 +23,16 @@ function m3l_rm_verb {
 function m3l_prep_table {
 	#Let's create a tab separated table with empty values where we have none but need at least an empty one.
 	#	(Besides, this kind of rhymes.)
+	# Additionally: ampersand handling
 	sed 's/========.*/====/g' | sed 's/\t$/\t" "/g' | tr '\n' '\t' |\
-	sed 's/====/\n====/g;s/====\t/====/g'
+	sed 's/====/\n====/g;s/====\t/====/g' |\
+	sed 's/Artist\t//;s/Title\t//;s/Album\t//;s/\(.*\)Year\t/\1/;s/\(.*\)Track\t/\1/' |\
+	uniq | sed 's/====//g;s/\ &\ /\ \&amp\;\ /g'
 }
 
 exiftool -ext .mp3 -ext .MP3 -ext .wma -ext .WMA -ext .ogg -ext .OGG -lang en -Artist -Title -Album -Year -Track -t -r $SDIR |\
 	m3l_rm_verb |\
 	m3l_prep_table |\
-	sed 's/Artist\t//;s/Title\t//;s/Album\t//;s/\(.*\)Year\t/\1/;s/\(.*\)Track\t/\1/' |\
-	sed 's/\[ \t0-9\]*image files read//g' |\
 	uniq |\
 	sed 's/====//g' |\
 	sed 's/\ &\ /\ \&amp\;\ /g' |\