X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=mp3tohtml.py;h=c8631c55b8458665483a3a34b2b347632ed6039b;hb=806a30f9e27dfe92748e971bb3d683d7841aab19;hp=221269ad59b4edd4a8dc4618799f8cc592c40b55;hpb=696f6e09743ba34e6f50692a3dd290cefc69e5cd;p=radio.git

diff --git a/mp3tohtml.py b/mp3tohtml.py
index 221269a..c8631c5 100755
--- a/mp3tohtml.py
+++ b/mp3tohtml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 # Generate an HTML page containing information about MP3s in a
 # directory.
@@ -10,8 +10,11 @@
 #
 # (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
@@ -39,27 +42,39 @@ def fma_copyright_to_html(path, copyright):
                          + copyright + ".\n");
         return copyright
 
-if len(sys.argv) != 2:
-    sys.stderr.write("Usage: mp3tohtml.py <mp3_dir>\n")
-    exit(1)
+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)
 
-header_path = os.path.dirname(sys.argv[0]) + "/header.tpl"
-header = open(header_path, "r")
-for line in header:
-    sys.stdout.write(line)
+def get_mp3s(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))
 
-files = glob.glob(sys.argv[1] + "/**/*mp3")
+    return files
+
+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()
+
+copy_header(sys.argv[0])
+
+files = get_mp3s(args.dir)
 
 for f in files:
     tag = eyeD3.Tag()
 
     tag.link(f)
 
-    print "\t<tr>"
+    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>"
+    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 = ""
@@ -85,17 +100,17 @@ for f in files:
 
         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\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>"
+    print("\t</tr>")
 
-print "</table>"
-print "<footer>"
-print "            <ul>"
-print "                    <li><a href=\"mailto:proxyradio@wpitchoune.net\">Contact</a></li>"
-print "            </ul>"
-print "</footer>"
-print "</body></html>"
+print("</table>")
+print ("            <ul>")
+print ("<footer>")
+print ("                    <li><a href=\"mailto:proxyradio@wpitchoune.net\">Contact</a></li>")
+print ("            </ul>")
+print( "</footer>")
+print( "</body></html>")