updated

diff --git a/mp3tohtml/mp3tohtml.py b/mp3tohtml/mp3tohtml.py
index 1cd1004..eefe8ce 100755 (executable)
--- a/mp3tohtml/mp3tohtml.py
+++ b/mp3tohtml/mp3tohtml.py
@@ -1,21 +1,8 @@
 #!/usr/bin/python2
 
 #!/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
 # http://wpitchoune.net/mp3tohtml

-#

 # Released under the terms of the GPLv2 license.
 # 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
 
 import argparse
 import eyeD3


@@ -73,65 +60,3 @@ def copy_footer(path):
                          + footer_path
                          + ": " + e.strerror + "\n")
         raise
                          + footer_path
                          + ": " + e.strerror + "\n")
         raise

-
-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)

diff --git a/scripts/mp3tohtml b/scripts/mp3tohtml
index e69de29..0a5719f 100644 (file)
--- a/scripts/mp3tohtml
+++ b/scripts/mp3tohtml
@@ -0,0 +1,84 @@
+#!/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
+#
+# http://wpitchoune.net/mp3tohtml
+# Released under the terms of the GPLv2 license.
+# (c) 2016 Jean-Philippe Orsini <jeanfi@gmail.com>
+
+import mp3tohtml
+
+
+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)