fixed build

diff --git a/configure.ac b/configure.ac
index d49d04c..c8f7130 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,4 @@ AM_INIT_AUTOMAKE
 
 AM_PATH_PYTHON([2])
 
-AC_CONFIG_FILES([Makefile src/Makefile])
-
-AC_OUTPUT
+AC_OUTPUT([Makefile src/Makefile src/mp3tohtml.py])

diff --git a/src/mp3tohtml.py b/src/mp3tohtml.py
deleted file mode 100755 (executable)
index db32bdc..0000000
--- a/src/mp3tohtml.py
+++ /dev/null
@@ -1,116 +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 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 = path + "/header.tpl"
-    header = open(header_path, "r")
-    for line in header:
-        sys.stdout.write(line)
-
-def copy_footer(path):
-    footer_path = 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')
-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/src/mp3tohtml.py.in b/src/mp3tohtml.py.in
new file mode 100755 (executable)
index 0000000..db32bdc
--- /dev/null
+++ b/src/mp3tohtml.py.in
@@ -0,0 +1,116 @@
+#!/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 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 = path + "/header.tpl"
+    header = open(header_path, "r")
+    for line in header:
+        sys.stdout.write(line)
+
+def copy_footer(path):
+    footer_path = 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')
+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)