From 3d882ae64a2da3b3c64bce895de02dee3a9541d8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Thu, 21 Jan 2016 03:18:01 +0100 Subject: [PATCH] improve layout --- header.tpl | 11 ++++++++++- mp3tohtml.py | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/header.tpl b/header.tpl index fa6016b..e5c636b 100644 --- a/header.tpl +++ b/header.tpl @@ -34,4 +34,13 @@
- + + + + + + + + + + diff --git a/mp3tohtml.py b/mp3tohtml.py index 5f8ca2d..370cb1f 100755 --- 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 +# (c) 2016 Jean-Philippe Orsini -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 "" + name + "" + else: + return copyright if len(sys.argv) != 2: + sys.stderr.write("Usage: mp3tohtml.py \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" - print "\t\t" + 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 = "FMA" + else: + strComments = m.group(2) + url = "source" + + curator = m.group(3) + + copyright = fma_copyright_to_html(m.group(4)) + + print "\t\t" + print "\t\t" + print "\t\t" + print "\t\t" print "\t" -- 2.7.4
ArtistAlbumTitleComments
ArtistAlbumTitleSoureCuratorCopyrightComments
" + comments = tag.getComments() + strComments = "" for c in comments: - print c.comment - print "\t\t" + url + "" + curator + "" + copyright + "" + strComments + "