mkm3u: Output the playlist tag in the dump file.

Add an option to supply the list tag, but default it from the input
filename.

diff --git a/mkm3u b/mkm3u
index 3f5a5ddffd4dde9eb693898c7c3dc1cd086fc03d..e4a32c75c169941dc695337a1ff7aa4a755ddc8f 100755 (executable)
--- a/mkm3u
+++ b/mkm3u
@@ -545,6 +545,7 @@ class Playlist (object):
                       (ch.duration, label, ch.title, ch.url))
 
   def dump(me, f):
                       (ch.duration, label, ch.title, ch.url))
 
   def dump(me, f):

+    if opts.list_name is not None: f.write("LIST %s\n" % opts.list_name)

     if me.series_title is not None and \
        me.nseries > 1 and not me.single_series_p:
       raise ExpectedError("can't force series name for multi-series list")
     if me.series_title is not None and \
        me.nseries > 1 and not me.single_series_p:
       raise ExpectedError("can't force series name for multi-series list")


@@ -883,12 +884,15 @@ class EpisodeListParser (object):
     return me._pl
 
 op = OP.OptionParser \
     return me._pl
 
 op = OP.OptionParser \

-  (usage = "%prog [-Dc] [-M DEPS] [-d CACHE] [-o OUT] [-s SERIES] EPLS\n"
+  (usage = "%prog [-Dc] [-L NAME] [-M DEPS] [-d CACHE] [-o OUT] [-s SERIES] EPLS\n"

             "%prog -i -d CACHE",
    description = "Generate M3U playlists from an episode list.")
 op.add_option("-D", "--dump",
               dest = "dump", action = "store_true", default = False,
               help = "Dump playlist in machine-readable form")
             "%prog -i -d CACHE",
    description = "Generate M3U playlists from an episode list.")
 op.add_option("-D", "--dump",
               dest = "dump", action = "store_true", default = False,
               help = "Dump playlist in machine-readable form")

+op.add_option("-L", "--list-name", metavar = "NAME",
+              dest = "list_name", type = "str", default = None,
+              help = "Set the playlist name")

 op.add_option("-M", "--make-deps", metavar = "DEPS",
               dest = "deps", type = "str", default = None,
               help = "Write a `make' fragment for dependencies")
 op.add_option("-M", "--make-deps", metavar = "DEPS",
               dest = "deps", type = "str", default = None,
               help = "Write a `make' fragment for dependencies")


@@ -941,6 +945,9 @@ try:
     ep.parse_file(argv[0])
     pl = ep.done()
 
     ep.parse_file(argv[0])
     pl = ep.done()
 

+    if opts.list_name is None:
+      opts.list_name, _ = OS.path.splitext(OS.path.basename(argv[0]))
+

     if opts.dump: outfn = pl.dump
     else: outfn = pl.write
     if opts.output is None or opts.output == "-":
     if opts.dump: outfn = pl.dump
     else: outfn = pl.write
     if opts.output is None or opts.output == "-":