mkm3u: Rename internal things for better consistency.

  * Rename `Video...' to `DVD' to make space for single-file `Video...'
    things.

  * Rename `...Disc' to `...File' because some of these files aren't
    from discs.

  * Rename `_audirs' to `_sfdirs' because the significant thing about
    them is that they're one-episode-per file, not audio.

diff --git a/mkm3u b/mkm3u
index 9c50c3e..29b2e54 100755 (executable)
--- a/mkm3u
+++ b/mkm3u
@@ -226,7 +226,7 @@ class Source (object):
         me.used_chapters.add((title, ch))
     return me.PREFIX + ROOT + urlencode(me.fn) + suffix, duration
 
-class VideoDisc (Source):
+class DVDFile (Source):
   PREFIX = "dvd://"
   TITLEP = CHAPTERP = True
 
@@ -254,7 +254,7 @@ class VideoDisc (Source):
     duration = int(program_output(["dvd-info", path, durq]))
     return duration
 
-class VideoSeason (object):
+class DVDSeason (object):
   def __init__(me, i, title):
     me.i = i
     me.title = title
@@ -272,7 +272,7 @@ def match_group(m, *groups, dflt = None, mustp = False):
   if mustp: raise ValueError("no match found")
   else: return dflt
 
-class VideoDir (object):
+class DVDDir (object):
 
   _R_ISO_PRE = list(map(lambda pats:
                           list(map(lambda pat:
@@ -325,12 +325,12 @@ class VideoDir (object):
                 "season %d /= %d" %
                   (si, season is None and -1 or season.i + 1))
           check(si not in seasons, "season %d already seen" % si)
-          seasons[si] = season = VideoSeason(si, stitle)
+          seasons[si] = season = DVDSeason(si, stitle)
         else:
           check(stitle == season.title,
                 "season title `%s' /= `%s'" % (stitle, season.title))
 
-      disc = VideoDisc(path)
+      disc = DVDFile(path)
       ts = season
       any, bad = False, False
       epnum = match_group(m, "epnum")
@@ -345,9 +345,9 @@ class VideoDir (object):
         i = filter(mm.group("si"), int)
         if i is not None:
           try: ts = seasons[i]
-          except KeyError: ts = seasons[i] = VideoSeason(i, None)
+          except KeyError: ts = seasons[i] = DVDSeason(i, None)
         if ts is None:
-          ts = season = seasons[1] = VideoSeason(1, None)
+          ts = season = seasons[1] = DVDSeason(1, None)
         start = filter(mm.group("ei"), int)
         end = filter(mm.group("ej"), int, start)
         for k in range(start, end + 1):
@@ -360,7 +360,7 @@ class VideoDir (object):
         raise ExpectedError("bad ep list in `%s'", fn)
     me.seasons = seasons
 
-class AudioDisc (Source):
+class AudioFile (Source):
   PREFIX = "file://"
   TITLEP = CHAPTERP = False
 
@@ -371,7 +371,7 @@ class AudioDisc (Source):
     nsamples, hz = map(float, out.split())
     return int(nsamples/hz)
 
-class AudioEpisode (AudioDisc):
+class AudioEpisode (AudioFile):
   def __init__(me, fn, i, *args, **kw):
     super().__init__(fn, *args, **kw)
     me.i = i
@@ -615,7 +615,7 @@ class EpisodeListParser (object):
   def __init__(me, series_wanted = None, chapters_wanted_p = False):
     me._pl = Playlist()
     me._cur_episode = me._cur_chapter = None
-    me._series = {}; me._vdirs = {}; me._audirs = {}; me._isos = {}
+    me._series = {}; me._vdirs = {}; me._sfdirs = {}; me._isos = {}
     me._series_wanted = series_wanted
     me._chaptersp = chapters_wanted_p
     me._explen, me._expvar = None, DEFAULT_EXPVAR
@@ -757,22 +757,22 @@ class EpisodeListParser (object):
       if fn == "-": forget(me._isos, series.name)
       else:
         check(OS.path.exists(OS.path.join(ROOT, fn)),
-              "iso file `%s' not found" % fn)
-        me._isos[series.name] = VideoDisc(fn)
+              "dvd iso file `%s' not found" % fn)
+        me._isos[series.name] = DVDFile(fn)
 
     elif cmd == "vdir":
       series = me._opts_series(cmd, opts)
       dir = ww.rest(); check(dir is not None, "missing directory")
       if not series.wantedp: return
       if dir == "-": forget(me._vdirs, series.name)
-      else: me._vdirs[series.name] = VideoDir(dir)
+      else: me._vdirs[series.name] = DVDDir(dir)
 
     elif cmd == "adir":
       series = me._opts_series(cmd, opts)
       dir = ww.rest(); check(dir is not None, "missing directory")
       if not series.wantedp: return
-      if dir == "-": forget(me._audirs, series.name)
-      else: me._audirs[series.name] = AudioDir(dir)
+      if dir == "-": forget(me._sfdirs, series.name)
+      else: me._sfdirs[series.name] = AudioDir(dir)
 
     elif cmd == "displaced":
       series = me._opts_series(cmd, opts)
@@ -820,10 +820,11 @@ class EpisodeListParser (object):
     if ti == -1:
       check(season.implicitp or season.i is None,
             "audio source, but explicit non-movie season")
-      dir = lookup(me._audirs, series.name,
-                   "no title, and no audio directory")
+      dir = lookup(me._sfdirs, series.name,
+                   "no title, and no single-file directory")
       src = lookup(dir.episodes, season.ep_i,
-                   "episode %d not found in audio dir `%s'" % (epi, dir.dir))
+                   "episode %d not found in single-file dir `%s'" %
+                     (epi, dir.dir))
 
     else:
       try: src = me._isos[series.name]
@@ -874,8 +875,8 @@ class EpisodeListParser (object):
       for s in vdir.seasons.values():
         for d in s.episodes.values():
           discs.add(d)
-    for adir in me._audirs.values():
-      for d in adir.episodes.values():
+    for sfdir in me._sfdirs.values():
+      for d in sfdir.episodes.values():
         discs.add(d)
     for d in sorted(discs, key = lambda d: d.fn):
       if d.neps is not None and d.neps != d.nuses: