From 50b64caf5e6c9bdecd9793b8fc144e9077aa3382 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Wed, 27 Jan 2021 09:32:55 +0100
Subject: [PATCH] rclaudio: process the Group tag

---
 src/filters/rclaudio | 84 ++++++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/src/filters/rclaudio b/src/filters/rclaudio
index ea4d4f55..52e56cfc 100755
--- a/src/filters/rclaudio
+++ b/src/filters/rclaudio
@@ -28,46 +28,52 @@ re_pairnum = re.compile(b'''[([]*([0-9]+),\s*([0-9]+)''')
 # TRCK,TRK,trkn TRACKNUMBER/TOTALTRACKS
 # The conversions here are consistent with the ones in MinimServer (2019-03),
 # including the rating stuff and TXXX. Lacking: Itunes '----' handling ?
+
+# The 'GROUP' tag is a specific minimserver tag used to create
+# sub-containers inside a folder. We used to use 'CONTENTGROUP' for
+# this, which was wrong, the latter is a vaguely defined "music
+# category" thing.
 tagdict = {
-    'ALBUM ARTIST': 'ALBUMARTIST', 
+    'ALBUM ARTIST': 'ALBUMARTIST',
     'ALBUM' : 'ALBUM',
-    'ALBUMARTIST' : 'ALBUMARTIST', 
-    'ALBUMARTISTSORT' : 'ALBUMARTISTSORT', 
-    'ALBUMSORT' : 'ALBUMSORT', 
-    'ARTIST' : 'ARTIST', 
-    'ARTISTSORT' : 'ARTISTSORT', 
-    'BPM' : 'BPM', 
+    'ALBUMARTIST' : 'ALBUMARTIST',
+    'ALBUMARTISTSORT' : 'ALBUMARTISTSORT',
+    'ALBUMSORT' : 'ALBUMSORT',
+    'ARTIST' : 'ARTIST',
+    'ARTISTSORT' : 'ARTISTSORT',
+    'BPM' : 'BPM',
     'COM' : 'COMMENT',
     'COMM' : 'COMMENT',
-    'COMMENT' : 'COMMENT', 
-    'COMPILATION' : 'COMPILATION', 
-    'COMPOSER' : 'COMPOSER', 
-    'COMPOSERSORT' : 'COMPOSERSORT', 
-    'CONDUCTOR' : 'CONDUCTOR', 
-    'CONTENTGROUP' : 'CONTENTGROUP', 
-    'COPYRIGHT' : 'COPYRIGHT', 
-    'DATE' : 'DATE', 
-    'DISCNUMBER' : 'DISCNUMBER', 
-    'DISCSUBTITLE' : 'DISCSUBTITLE', 
-    'DISCTOTAL' : 'TOTALDISCS', 
-    'ENCODEDBY' : 'ENCODEDBY', 
+    'COMMENT' : 'COMMENT',
+    'COMPILATION' : 'COMPILATION',
+    'COMPOSER' : 'COMPOSER',
+    'COMPOSERSORT' : 'COMPOSERSORT',
+    'CONDUCTOR' : 'CONDUCTOR',
+    'CONTENTGROUP' : 'CONTENTGROUP',
+    'COPYRIGHT' : 'COPYRIGHT',
+    'DATE' : 'DATE',
+    'DISCNUMBER' : 'DISCNUMBER',
+    'DISCSUBTITLE' : 'DISCSUBTITLE',
+    'DISCTOTAL' : 'TOTALDISCS',
+    'ENCODEDBY' : 'ENCODEDBY',
     'ENSEMBLE' : 'ORCHESTRA',
-    'GENRE' : 'GENRE', 
-    'ISRC' : 'ISRC', 
-    'LABEL' : 'LABEL', 
-    'LANGUAGE' : 'LANGUAGE', 
-    'LYRICIST' : 'LYRICIST', 
-    'LYRICS' : 'LYRICS', 
-    'MOOD' : 'MOOD', 
+    'GENRE' : 'GENRE',
+    'GROUP' : 'GROUP',
+    'ISRC' : 'ISRC',
+    'LABEL' : 'LABEL',
+    'LANGUAGE' : 'LANGUAGE',
+    'LYRICIST' : 'LYRICIST',
+    'LYRICS' : 'LYRICS',
+    'MOOD' : 'MOOD',
     'ORCHESTRA' : 'ORCHESTRA',
     'PERFORMER' : 'PERFORMER',
     'POP' : 'RATING1',
     'POPM' : 'RATING1',
-    'ORIGINALARTIST' : 'ORIGINALARTIST', 
-    'ORIGINALDATE' : 'ORIGINALDATE', 
-    'RELEASEDATE' : 'RELEASEDATE', 
-    'REMIXER' : 'REMIXER', 
-    'SUBTITLE' : 'SUBTITLE', 
+    'ORIGINALARTIST' : 'ORIGINALARTIST',
+    'ORIGINALDATE' : 'ORIGINALDATE',
+    'RELEASEDATE' : 'RELEASEDATE',
+    'REMIXER' : 'REMIXER',
+    'SUBTITLE' : 'SUBTITLE',
     'TAL' : 'ALBUM',
     'TALB' : 'ALBUM',
     'TBP' : 'BPM',
@@ -91,7 +97,7 @@ tagdict = {
     'TIT1' : 'CONTENTGROUP',
     'TIT2' : 'TITLE',
     'TIT3' : 'SUBTITLE',
-    'TITLE' : 'TITLE', 
+    'TITLE' : 'TITLE',
     'TITLESORT' : 'TITLESORT',
     'TLA' : 'LANGUAGE',
     'TLAN' : 'LANGUAGE',
@@ -100,8 +106,8 @@ tagdict = {
     'TOPE' : 'ORIGINALARTIST',
     'TOR' : 'ORIGINALDATE',
     'TORY' : 'ORIGINALDATE',
-    'TOTALDISCS' : 'TOTALDISCS', 
-    'TOTALTRACKS' : 'TOTALTRACKS', 
+    'TOTALDISCS' : 'TOTALDISCS',
+    'TOTALTRACKS' : 'TOTALTRACKS',
     'TP1' : 'ARTIST',
     'TP2' : 'ALBUMARTIST',
     'TP3' : 'CONDUCTOR',
@@ -114,10 +120,10 @@ tagdict = {
     'TPE4' : 'REMIXER',
     'TPOS' : 'DISCNUMBER',
     'TPUB' : 'LABEL',
-    'TRACK' : 'TRACKNUMBER', 
-    'TRACKNUM' : 'TRACKNUMBER', 
-    'TRACKNUMBER' : 'TRACKNUMBER', 
-    'TRACKTOTAL' : 'TOTALTRACKS', 
+    'TRACK' : 'TRACKNUMBER',
+    'TRACKNUM' : 'TRACKNUMBER',
+    'TRACKNUMBER' : 'TRACKNUMBER',
+    'TRACKTOTAL' : 'TOTALTRACKS',
     'TRC' : 'ISRC',
     'TRCK' : 'TRACKNUMBER',
     'TRDA' : 'DATE',
@@ -141,7 +147,7 @@ tagdict = {
     'TXXX:ORCHESTRA' : 'ORCHESTRA',
     'TXX:ORCHESTRA' : 'ORCHESTRA',
     'TYE' : 'DATE',
-    'TYER' : 'DATE', # wikipedia id3: YEAR
+    'TYER' : 'DATE',# wikipedia id3: YEAR
     'ULT' : 'LYRICS',
     'USLT' : 'LYRICS',
     'YEAR' : 'DATE',