mkm3u: Pull out the episode automatic naming logic.

diff --git a/mkm3u b/mkm3u
index 2e2f5cdf1563523e54b8cd322254eefa8a352f84..5fd2196d8142a5031eb1813a8d6fd56b194b8b29 100755 (executable)
--- a/mkm3u
+++ b/mkm3u
@@ -299,16 +299,18 @@ class BaseSeason (object):
     me.episodes.append(ep)
     src.nuses += neps; me.ep_i += neps
     return ep
     me.episodes.append(ep)
     src.nuses += neps; me.ep_i += neps
     return ep

+  def _epnames(me, i, neps):
+    playlist = me.series.playlist
+    if neps == 1: return playlist.epname, "%d" % i
+    elif neps == 2: return playlist.epnames, "%d, %d" % (i, i + 1)
+    else: return playlist.epnames, "%d–%d" % (i, i + neps - 1)

 
 class Season (BaseSeason):
   def __init__(me, series, title, i, *args, **kw):
     super().__init__(series, *args, **kw)
     me.title, me.i = title, i
   def _eplabel(me, i, neps, title):
 
 class Season (BaseSeason):
   def __init__(me, series, title, i, *args, **kw):
     super().__init__(series, *args, **kw)
     me.title, me.i = title, i
   def _eplabel(me, i, neps, title):

-    playlist = me.series.playlist
-    if neps == 1: epname = playlist.epname; epn = "%d" % i
-    elif neps == 2: epname = playlist.epnames; epn = "%d, %d" % (i, i + 1)
-    else: epname = playlist.epnames; epn = "%d–%d" % (i, i + neps - 1)
+    epname, epn = me._epnames(i, neps)

     if title is None:
       if me.implicitp: label = "%s %s" % (epname, epn)
       elif me.title is None: label = "%s %d.%s" % (epname, me.i, epn)
     if title is None:
       if me.implicitp: label = "%s %s" % (epname, epn)
       elif me.title is None: label = "%s %d.%s" % (epname, me.i, epn)