cleanup
authorJean Philip Orsini <orsinije@fr.ibm.com>
Thu, 28 Jan 2016 10:59:32 +0000 (11:59 +0100)
committerJean Philip Orsini <orsinije@fr.ibm.com>
Thu, 28 Jan 2016 10:59:32 +0000 (11:59 +0100)
header.tpl [deleted file]
mp3tohtml.py [deleted file]
mp3tohtml/footer.tpl [new file with mode: 0644]
mp3tohtml/header.tpl [new file with mode: 0644]
mp3tohtml/mp3tohtml.py [new file with mode: 0755]

diff --git a/header.tpl b/header.tpl
deleted file mode 100644 (file)
index e5c636b..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-        <head>
-                <title>All songs</title>
-
-                <link rel="stylesheet"
-                      type="text/css"
-                      href="https://cdn.datatables.net/1.10.10/css/jquery.dataTables.min.css"/>
-
-                <script type="text/javascript"
-                        language="javascript"
-                        src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js">
-                </script>
-
-                <script type="text/javascript"
-                        language="javascript"
-                        src="https://cdn.datatables.net/1.10.10/js/jquery.dataTables.min.js">
-                </script>
-
-                <link rel="stylesheet"
-                      type="text/css"
-                      href="style.css"/>
-
-                <script>$(document).ready(function() { $('#songs').DataTable(); } );</script>
-        </head>
-
-        <body>
-                <nav>
-                        <ul>
-                                <li><a href="index.html">Proxy Radio</a></li>
-                                <li><a href="last_songs.html">Played songs</a></li>
-                                <li class="selected">All songs</li>
-                        </ul>
-                </nav>
-
-                <section>
-                        <table id="songs" class="display compact" width="100%">
-                                <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
deleted file mode 100755 (executable)
index f0ba0d1..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/python2
-
-# Generate an HTML page containing information about MP3s in a
-# directory.
-#
-# Usage: mp3tohtml.py <mp3_dir>
-#
-# Last version of this tool can be get from the GIT repository:
-# http://git.wpitchoune.net/radio.git
-#
-# (c) 2016 Jean-Philippe Orsini  <jeanfi@gmail.com>
-
-import argparse;
-import eyeD3
-import fnmatch
-import glob
-import os
-import os.path
-import re
-import sys
-
-def fma_copyright_to_html(path, copyright):
-    if copyright == "":
-        sys.stderr.write(path + ": no FMA copyright.\n")
-        return ""
-
-    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("Noncommercial", "NC")
-        name = name.replace("NoDerivatives", "ND")
-        name = name.replace("ShareAlike", "SA")
-        name = name.replace("Share Alike", "SA")
-        name = name.replace("United States", "US")
-        return "<a href=\"" + m.group(2) + "\">" + name + "</a>"
-    else:
-        sys.stderr.write(path + ": invalid FMA copyright: "
-                         + copyright + ".\n");
-        return copyright
-
-def copy_header(path):
-    header_path = os.path.dirname(path) + "/header.tpl"
-    header = open(header_path, "r")
-    for line in header:
-        sys.stdout.write(line)
-
-def copy_footer(path):
-    footer_path = os.path.dirname(path) + "/header.tpl"
-    footer = open(footer_path, "r")
-    for line in footer:
-        sys.stdout.write(line)
-
-parser = argparse.ArgumentParser(description='Generate an HTML containing information about the MP3 files.')
-parser.add_argument('dir', help='The directory containing the MP3 files')
-
-args = parser.parse_args()
-
-cfg_dir = sys.argv[0]
-
-copy_header(cfg_dir)
-
-files = []
-for root, dirnames, filenames in os.walk(args.dir):
-    for filename in fnmatch.filter(filenames, '*.mp3'):
-        files.append(os.path.join(root, filename))
-
-for f in files:
-    tag = eyeD3.Tag()
-
-    tag.link(f)
-
-    print("\t<tr>")
-
-    print("\t\t<td>" + tag.getArtist().encode("UTF8") + "</td>\n")
-    print("\t\t<td>" + tag.getAlbum().encode("UTF-8") + "</td>")
-    print("\t\t<td>" + tag.getTitle().encode("UTF-8") + "</td>")
-
-    comments = tag.getComments()
-    strComments = ""
-    for c in comments:
-        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(f, 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>")
-
-copy_footer(cfg_dir)
-
-print("</table>")
-print ("            <ul>")
-print ("<footer>")
-print ("                    <li><a href=\"mailto:proxyradio@wpitchoune.net\">Contact</a></li>")
-print ("            </ul>")
-print( "</footer>")
-print( "</body></html>")
diff --git a/mp3tohtml/footer.tpl b/mp3tohtml/footer.tpl
new file mode 100644 (file)
index 0000000..70dba06
--- /dev/null
@@ -0,0 +1,10 @@
+</table>
+</section>
+
+<footer>
+        <ul>
+                <li><a href="mailto:proxyradio@wpitchoune.net">Contact</a></li>
+        </ul>
+</footer>
+</body>
+</html>
diff --git a/mp3tohtml/header.tpl b/mp3tohtml/header.tpl
new file mode 100644 (file)
index 0000000..e5c636b
--- /dev/null
@@ -0,0 +1,46 @@
+<html>
+        <head>
+                <title>All songs</title>
+
+                <link rel="stylesheet"
+                      type="text/css"
+                      href="https://cdn.datatables.net/1.10.10/css/jquery.dataTables.min.css"/>
+
+                <script type="text/javascript"
+                        language="javascript"
+                        src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js">
+                </script>
+
+                <script type="text/javascript"
+                        language="javascript"
+                        src="https://cdn.datatables.net/1.10.10/js/jquery.dataTables.min.js">
+                </script>
+
+                <link rel="stylesheet"
+                      type="text/css"
+                      href="style.css"/>
+
+                <script>$(document).ready(function() { $('#songs').DataTable(); } );</script>
+        </head>
+
+        <body>
+                <nav>
+                        <ul>
+                                <li><a href="index.html">Proxy Radio</a></li>
+                                <li><a href="last_songs.html">Played songs</a></li>
+                                <li class="selected">All songs</li>
+                        </ul>
+                </nav>
+
+                <section>
+                        <table id="songs" class="display compact" width="100%">
+                                <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/mp3tohtml.py b/mp3tohtml/mp3tohtml.py
new file mode 100755 (executable)
index 0000000..0ef84de
--- /dev/null
@@ -0,0 +1,113 @@
+#!/usr/bin/python2
+
+# Generate an HTML page containing information about MP3s in a
+# directory.
+#
+# Usage: mp3tohtml.py <mp3_dir>
+#
+# Last version of this tool can be get from the GIT repository:
+# http://git.wpitchoune.net/radio.git
+#
+# (c) 2016 Jean-Philippe Orsini  <jeanfi@gmail.com>
+
+import argparse;
+import eyeD3
+import fnmatch
+import glob
+import os
+import os.path
+import re
+import sys
+
+def fma_copyright_to_html(path, copyright):
+    if copyright == "":
+        sys.stderr.write(path + ": no FMA copyright.\n")
+        return ""
+
+    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("Noncommercial", "NC")
+        name = name.replace("NoDerivatives", "ND")
+        name = name.replace("ShareAlike", "SA")
+        name = name.replace("Share Alike", "SA")
+        name = name.replace("United States", "US")
+        return "<a href=\"" + m.group(2) + "\">" + name + "</a>"
+    else:
+        sys.stderr.write(path + ": invalid FMA copyright: "
+                         + copyright + ".\n");
+        return copyright
+
+def copy_header(path):
+    header_path = os.path.dirname(path) + "/header.tpl"
+    header = open(header_path, "r")
+    for line in header:
+        sys.stdout.write(line)
+
+def copy_footer(path):
+    footer_path = os.path.dirname(path) + "/footer.tpl"
+    footer = open(footer_path, "r")
+    for line in footer:
+        sys.stdout.write(line)
+
+parser = argparse.ArgumentParser(description='Generate an HTML containing information about the MP3 files.')
+parser.add_argument('dir', help='The directory containing the MP3 files')
+
+args = parser.parse_args()
+
+cfg_dir = sys.argv[0]
+
+copy_header(cfg_dir)
+
+files = []
+for root, dirnames, filenames in os.walk(args.dir):
+    for filename in fnmatch.filter(filenames, '*.mp3'):
+        files.append(os.path.join(root, filename))
+
+for f in files:
+    tag = eyeD3.Tag()
+
+    tag.link(f)
+
+    print("\t<tr>")
+
+    print("\t\t<td>" + tag.getArtist().encode("UTF8") + "</td>\n")
+    print("\t\t<td>" + tag.getAlbum().encode("UTF-8") + "</td>")
+    print("\t\t<td>" + tag.getTitle().encode("UTF-8") + "</td>")
+
+    comments = tag.getComments()
+    strComments = ""
+    for c in comments:
+        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(f, 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>")
+
+copy_footer(cfg_dir)