cleanup

diff --git a/mp3tohtml.py b/mp3tohtml.py
index 221269a..9aa51ac 100755 (executable)
--- a/mp3tohtml.py
+++ b/mp3tohtml.py
@@ -10,6 +10,7 @@
 #
 # (c) 2016 Jean-Philippe Orsini  <jeanfi@gmail.com>
 
+import argparse;
 import eyeD3
 import glob
 import os.path
@@ -39,27 +40,31 @@ 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)
+parser = argparse.ArgumentParser(description='Generate an HTLM containing information about the MP3 files.')
+parser.add_argument('dir', help='The directory containing the MP3 files')
 
-files = glob.glob(sys.argv[1] + "/**/*mp3")
+args = parser.parse_args()
+
+copy_header(sys.argv[0])
+
+files = glob.iglob(args.dir + "/**/*mp3")
 
 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 +90,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>")