mkm3u, stargate.epls, star-wars.epls: Introduce `full series titles'.

These aren't used by anything yet, but they will be.

diff --git a/mkm3u b/mkm3u
index d70485662a6cbdaee7bc88a756c3b499fddc15fa..5d9841dc2110dbd1ec44e75e3f27c9dffa2b26d9 100755 (executable)
--- a/mkm3u
+++ b/mkm3u
@@ -485,9 +485,10 @@ class MovieSeason (BaseSeason):
     return label
 
 class Series (object):
     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.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):
     me.cur_season = None
     me.wantedp = wantedp
   def _add_season(me, season):


@@ -651,8 +652,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()
       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._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
                                          me._series_wanted is None or
                                            name in me._series_wanted)
       if series.wantedp: me._pl.nseries += 1

diff --git a/star-wars.epls b/star-wars.epls
index 401eae5db22771e70038a051a56cdfb8b7183247..bb4b48b8c31bc1fe57291871b5a4005ca6df019d 100644 (file)
--- a/star-wars.epls
+++ b/star-wars.epls
@@ -1,13 +1,13 @@
 ;;; -*-fundamental-*-
 
 ;;; -*-fundamental-*-
 

-!series:sws
+!series:sws :: Star Wars

 
 

-!series:sty
+!series:sty :: Star Wars stories

 
 

-!series:tcw The Clone Wars
+!series:tcw The Clone Wars :: Star Wars: The Clone Wars

 !vdir:tcw S/Star Wars—The Clone Wars
 
 !vdir:tcw S/Star Wars—The Clone Wars
 

-!series:rbl Rebels
+!series:rbl Rebels :: Star Wars: Rebels

 !vdir:rbl S/Star Wars—Rebels
 
 !season:sws -
 !vdir:rbl S/Star Wars—Rebels
 
 !season:sws -

diff --git a/stargate.epls b/stargate.epls
index b100a1142aec0b8e6aa7b13f14cd3984b45eb8fb..0f1f912201519cf969b2d6714fcb1daacabb0e31 100644 (file)
--- a/stargate.epls
+++ b/stargate.epls
@@ -2,7 +2,7 @@
 
 !explen 42:30
 
 
 !explen 42:30
 

-!series:movie
+!series:movie :: Stargate

 
 !series:sg1 Stargate SG-1
 !vdir:sg1 S/Stargate SG-1
 
 !series:sg1 Stargate SG-1
 !vdir:sg1 S/Stargate SG-1