Makefile: Rename the dep files.

[epls] / mkm3u

diff --git a/mkm3u b/mkm3u
index b66ad4b..3eb16b1 100755 (executable)
--- a/mkm3u
+++ b/mkm3u
@@ -135,7 +135,7 @@ class Source (object):
   def __init__(me, fn):
     me.fn = fn
     me.neps = None
-    me.used_titles = dict()
+    me.used_titles = set()
     me.used_chapters = set()
     me.nuses = 0
 
@@ -215,7 +215,9 @@ class Source (object):
         else:
           raise ExpectedError("`%s' title %d chapter %d already used" %
                               (me.fn, title, k[1]))
-    if end_chapter != -1:
+    if end_chapter == -1:
+      me.used_titles.add(title)
+    else:
       for ch in range(start_chapter, end_chapter):
         me.used_chapters.add((title, ch))
     return me.PREFIX + ROOT + urlencode(me.fn) + suffix, duration
@@ -483,9 +485,10 @@ class MovieSeason (BaseSeason):
     return label
 
 class Series (object):
-  def __init__(me, playlist, name, title = None, wantedp = True):
+  def __init__(me, playlist, name, title = None,
+               full_title = None, wantedp = True):
     me.playlist = playlist
-    me.name, me.title = name, title
+    me.name, me.title, me.full_title = name, title, full_title
     me.cur_season = None
     me.wantedp = wantedp
   def _add_season(me, season):
@@ -507,6 +510,8 @@ class Playlist (object):
     me.episodes = []
     me.epname, me.epnames = "Episode", "Episodes"
     me.nseries = 0
+    me.single_series_p = False
+    me.series_title = None
 
   def add_episode(me, episode):
     me.episodes.append(episode)
@@ -641,7 +646,19 @@ class EpisodeListParser (object):
     except ValueError: opts = None
     else: cmd, opts = cmd[:sep], cmd[sep + 1:]
 
-    if cmd == "series":
+    if cmd == "title":
+      for k, v in me._keyvals(opts): me._bad_keyval("title", k, v)
+      title = ww.rest(); check(title is not None, "missing title")
+      check(me._pl.series_title is None, "already set a title")
+      me._pl.series_title = title
+
+    elif cmd == "single":
+      for k, v in me._keyvals(opts): me._bad_keyval("single", k, v)
+      check(ww.rest() is None, "trailing junk")
+      check(not me._pl.single_series_p, "single-series already set")
+      me._pl.single_series_p = True
+
+    elif cmd == "series":
       name = None
       for k, v in me._keyvals(opts):
         if k is None: name = v
@@ -649,8 +666,17 @@ class EpisodeListParser (object):
       check(name is not None, "missing series name")
       check(name not in me._series, "series `%s' already defined" % name)
       title = ww.rest()
+      if title is None:
+        full = None
+      else:
+        try: sep = title.index("::")
+        except ValueError: full = title
+        else:
+          full = title[sep + 2:].strip()
+          if sep == 0: title = None
+          else: title = title[:sep].strip()
       me._set_mode(MODE_MULTI)
-      me._series[name] = series = Series(me._pl, name, title,
+      me._series[name] = series = Series(me._pl, name, title, full,
                                          me._series_wanted is None or
                                            name in me._series_wanted)
       if series.wantedp: me._pl.nseries += 1