X-Git-Url: https://git.wpitchoune.net/gitweb/?p=mp3tohtml.git;a=blobdiff_plain;f=mp3tohtml%2Fmp3tohtml.py;h=eefe8cedc2f96511dadb9379161b7a4b106cc9e9;hp=4a9d8a353cce919767bcee8e66c8bdd2a8692e20;hb=02d4e6cb926ebee97f3e6e45a93a0b6c86be2b33;hpb=09378a563a2e0f94e94fd83c0089edc59b33b77c

diff --git a/mp3tohtml/mp3tohtml.py b/mp3tohtml/mp3tohtml.py
index 4a9d8a3..eefe8ce 100755
--- a/mp3tohtml/mp3tohtml.py
+++ b/mp3tohtml/mp3tohtml.py
@@ -1,21 +1,8 @@
 #!/usr/bin/python2
 
-# usage: mp3tohtml.py [-h] [--config CONFIG] dir
-#
-# Generate an HTML containing information about the MP3 files.
-#
-# positional arguments:
-#  dir              The directory containing the MP3 files
-#
-# optional arguments:
-#  -h, --help       show this help message and exit
-#  --config CONFIG  The directory containing the configuration
-#
-# Last version of this tool can be get from the GIT repository:
 # http://wpitchoune.net/mp3tohtml
-#
 # Released under the terms of the GPLv2 license.
-# (c) 2016 Jean-Philippe Orsini  <jeanfi@gmail.com>
+# (c) 2016 Jean-Philippe Orsini <jeanfi@gmail.com>
 
 import argparse
 import eyeD3
@@ -54,12 +41,12 @@ def copy_header(path):
         header = open(header_path, "r")
         for line in header:
             sys.stdout.write(line)
-    except IOError as err:
+        header.close()
+    except IOError as e:
         sys.stderr.write("Failed to read header file "
                          + header_path
-                         + ": " + err.strerror + "\n")
-        sys.exit(1)
-    header.close()
+                         + ": " + e.strerror + "\n")
+        raise
 
 def copy_footer(path):
     footer_path = path + "/footer.tpl"
@@ -67,72 +54,9 @@ def copy_footer(path):
         footer = open(footer_path, "r")
         for line in footer:
             sys.stdout.write(line)
-    except IOError as err:
+        footer.close()
+    except IOError as e:
         sys.stderr.write("Failed to read footer file "
                          + footer_path
-                         + ": " + err.strerror + "\n")
-        sys.exit(1)
-    footer.close()
-
-
-parser = argparse.ArgumentParser(description='Generate an HTML containing information about the MP3 files.')
-parser.add_argument('dir', help='The directory containing the MP3 files')
-parser.add_argument("--config", help="The directory containing the configuration")
-
-args = parser.parse_args()
-
-if (args.config is None):
-    cfg_dir = os.path.dirname(sys.argv[0])
-else:
-    cfg_dir = args.config
-
-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)
+                         + ": " + e.strerror + "\n")
+        raise