From f978ec46e6d31e5b3125534d0c24310c90a0edb5 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Sun, 11 Nov 2018 11:30:10 +0100
Subject: [PATCH] rclaudio needs to output text/plain, because setfield only
 works with text/plain for now

---
 src/filters/rclaudio          | 9 ++++++---
 src/filters/rclbasehandler.py | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/filters/rclaudio b/src/filters/rclaudio
index 22ce49bb..fa299673 100755
--- a/src/filters/rclaudio
+++ b/src/filters/rclaudio
@@ -19,7 +19,7 @@ except:
     sys.exit(1);
 
 
-re_pairnum = re.compile(b'''\(([0-9]+),\s*([0-9]+)\)''')
+re_pairnum = re.compile(b'''[[(]*([0-9]+),\s*([0-9]+)''')
 
 # The 'Easy' mutagen tags conversions are incomplete. We do it ourselves.
 # TPA,TPOS,disc DISCNUMBER/TOTALDISCS
@@ -230,12 +230,15 @@ class AudioTagExtractor(RclBaseHandler):
         val = time.mktime(pdt.timetuple())
         return "%d" % val
 
-    def html_text(self, filename):
 
+    def html_text(self, filename):
         if not self.inputmimetype:
             raise Exception("html_text: input MIME type not set")
         mimetype = self.inputmimetype
 
+        # We actually output text/plain
+        self.outputmimetype = 'text/plain'
+        
         mutf = File(filename)
         if not mutf:
             raise Exception("mutagen failed opening %s" % filename)
@@ -324,6 +327,7 @@ class AudioTagExtractor(RclBaseHandler):
                     #self.em.rclog("minf[%s] = %s" % (k, minf[k]))
                     if l[1] != 0:
                         minf['total' + what + 's'] = l[1]
+                #self.em.rclog("%s finally: %s" %(k,minf[k]))
 
         if 'orchestra' in minf:
             val = minf['orchestra']
@@ -338,7 +342,6 @@ class AudioTagExtractor(RclBaseHandler):
             #self.em.rclog("Embedded image format: %s" % embdimg)
             minf['embdimg'] = tobytes(embdimg)
         
-        self.em.setmimetype("text/plain")
         self.em.setfield("charset", 'utf-8')
 
         for tag,val in minf.items():
diff --git a/src/filters/rclbasehandler.py b/src/filters/rclbasehandler.py
index 2f1a66f6..d4529d4f 100644
--- a/src/filters/rclbasehandler.py
+++ b/src/filters/rclbasehandler.py
@@ -49,7 +49,10 @@ class RclBaseHandler(object):
         else:
             self.inputmimetype = None
 
+        self.outputmimetype = 'text/html'
         try:
+            # Note: "html_text" can change self.outputmimetype and
+            # output text/plain
             html = self.html_text(fn)
         except Exception as err:
             import traceback
@@ -57,7 +60,7 @@ class RclBaseHandler(object):
             self.em.rclog("RclBaseHandler: %s : %s" % (fn, err))
             return (False, "", "", rclexecm.RclExecM.eofnow)
 
-        self.em.setmimetype('text/html')
+        self.em.setmimetype(self.outputmimetype)
         return (True, html, "", rclexecm.RclExecM.eofnext)