improve layout

diff --git a/header.tpl b/header.tpl
index fa6016b..e5c636b 100644 (file)
--- a/header.tpl
+++ b/header.tpl
@@ -34,4 +34,13 @@
 
                 <section>
                         <table id="songs" class="display compact" width="100%">
-                                <thead><tr><th>Artist</th><th>Album</th><th>Title</th><th>Comments</th></tr></thead>
+                                <thead>
+                                        <tr>
+                                                <th>Artist</th>
+                                                <th>Album</th>
+                                                <th>Title</th>
+                                                <th>Soure</th>
+                                                <th>Curator</th>
+                                                <th>Copyright</th>
+                                                <th>Comments</th>
+                                        </tr></thead>

diff --git a/mp3tohtml.py b/mp3tohtml.py
index 5f8ca2d..370cb1f 100755 (executable)
--- a/mp3tohtml.py
+++ b/mp3tohtml.py
@@ -8,14 +8,30 @@
 # Last version of this tool can be get from the GIT repository:
 # http://git.wpitchoune.net/radio.git
 #
-# (c) 2015 Jean-Philippe Orsini  <jeanfi@gmail.com>
+# (c) 2016 Jean-Philippe Orsini  <jeanfi@gmail.com>
 
-import glob
-import sys
 import eyeD3
+import glob
 import os.path
+import re
+import sys
+
+def fma_copyright_to_html(copyright):
+    p = re.compile("(.*): (.*)")
+    m = p.match(copyright)
+    if m is not None:
+        name = m.group(1)
+        name = name.replace("Creative Commons", "CC")
+        name = name.replace("Attribution", "BY")
+        name = name.replace("NonCommercial", "NC")
+        name = name.replace("NoDerivatives", "ND")
+        name = name.replace("ShareAlike", "SA")
+        return "<a href=\"" + m.group(2) + "\">" + name + "</a>"
+    else:
+        return copyright
 
 if len(sys.argv) != 2:
+    sys.stderr.write("Usage: mp3tohtml.py <mp3_dir>\n")
     exit(1)
 
 header_path = os.path.dirname(sys.argv[0]) + "/header.tpl"
@@ -48,11 +64,35 @@ for f in files:
     except UnicodeEncodeError:
         print "\t\t<td></td>"
 
-    print "\t\t<td>"
+
     comments = tag.getComments()
+    strComments = ""
     for c in comments:
-        print c.comment
-    print "\t\t</td>"
+        strComments += c.comment
+
+    p = re.compile("URL: (.*)\r\nComments: (.*)\r\nCurators?: (.*)\r\nCopyright: (.*)")
+    m = p.match(strComments)
+
+    if m is None:
+        url = ""
+        curator = ""
+        copyright = ""
+    else:
+        if m.group(2) == "http://freemusicarchive.org/":
+            strComments = ""
+            url = "<a href=\"" + m.group(1) + "\">FMA</a>"
+        else:
+            strComments =  m.group(2)
+            url = "<a href=\"" + m.group(1) + "\">source</a>"
+
+        curator = m.group(3)
+
+        copyright = fma_copyright_to_html(m.group(4))
+
+    print "\t\t<td>" + url + "</td>"
+    print "\t\t<td>" + curator + "</td>"
+    print "\t\t<td>" + copyright + "</td>"
+    print "\t\t<td>" + strComments + "</td>"
 
     print "\t</tr>"