if not s.isdigit(): raise ExpectedError("bad integer `%s'" % s)
return int(s)
+def getbool(s):
+ if s == "t": return True
+ elif s == "nil": return False
+ else: raise ExpectedError("bad boolean `%s'" % s)
+
class Words (object):
def __init__(me, s):
me._s = s
episode.source.url_and_duration(episode.tno, i, i + 1)
class Episode (object):
- def __init__(me, season, i, neps, title, src, tno = None,
- startch = None, endch = None):
+ def __init__(me, season, i, neps, title, src, series_title_p = True,
+ tno = None, startch = None, endch = None):
me.season = season
me.i, me.neps, me.title = i, neps, title
me.chapters = []
me.source, me.tno = src, tno
+ me.series_title_p = series_title_p
me.url, me.duration = src.url_and_duration(tno, startch, endch)
def add_chapter(me, title, j):
ch = Chapter(me, title, j)
me.episodes = []
me.implicitp = implicitp
me.ep_i, episodes = 1, []
- def add_episode(me, j, neps, title, src, tno, startch, endch):
- ep = Episode(me, j, neps, title, src, tno, startch, endch)
+ def add_episode(me, j, neps, title, src, series_title_p,
+ tno, startch, endch):
+ ep = Episode(me, j, neps, title, src, series_title_p,
+ tno, startch, endch)
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)
+ if neps == 1: return playlist.epname, ["%d" % i]
+ elif neps == 2: return playlist.epnames, ["%d" % i, "%d" % (i + 1)]
+ else: return playlist.epnames, ["%d–%d" % (i, i + neps - 1)]
class Season (BaseSeason):
def __init__(me, series, title, i, *args, **kw):
def _eplabel(me, i, neps, title):
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)
- else: label = "%s—%s %s" % (me.title, epname, epn)
+ if me.implicitp:
+ label = "%s %s" % (epname, ", ".join(epn))
+ elif me.title is None:
+ label = "%s %s" % \
+ (epname, ", ".join("%d.%s" % (me.i, e) for e in epn))
+ else:
+ label = "%s—%s %s" % (me.title, epname, ", ".join(epn))
else:
- if me.implicitp: label = "%s. %s" % (epn, title)
- elif me.title is None: label = "%d.%s. %s" % (me.i, epn, title)
- else: label = "%s—%s. %s" % (me.title, epn, title)
+ if me.implicitp:
+ label = "%s. %s" % (", ".join(epn), title)
+ elif me.title is None:
+ label = "%s. %s" % \
+ (", ".join("%d.%s" % (me.i, e) for e in epn), title)
+ else:
+ label = "%s—%s. %s" % (me.title, ", ".join(epn), title)
return label
class MovieSeason (BaseSeason):
super().__init__(series, *args, **kw)
me.title = title
me.i = None
- def add_episode(me, j, neps, title, src, tno, startch, endch):
+ def add_episode(me, j, neps, title, src, series_title_p,
+ tno, startch, endch):
if me.title is None and title is None:
raise ExpectedError("movie or movie season must have a title")
- return super().add_episode(j, neps, title, src, tno, startch, endch)
+ return super().add_episode(j, neps, title, src, series_title_p,
+ tno, startch, endch)
def _eplabel(me, i, neps, title):
if me.title is None:
label = title
elif title is None:
epname, epn = me._epnames(i, neps)
- label = "%s—%s %s" % (me.title, epname, epn)
+ label = "%s—%s %s" % (me.title, epname, ", ".join(epn))
else:
label = "%s—%s" % (me.title, title)
return label
f.write("\n")
for ep in season:
label = ep.label()
- if me.nseries > 1: label = ep.season.series.title + " " + label
+ if me.nseries > 1 and ep.series_title_p and \
+ ep.season.series.title is not None:
+ if ep.season.i is None: sep = "—"
+ else: sep = " "
+ label = ep.season.series.title + sep + label
if not ep.chapters:
f.write("#EXTINF:%d,,%s\n%s\n" % (ep.duration, label, ep.url))
else:
else: me._bad_keyval(cmd, k, v)
check(name is not None, "missing series name")
check(name not in me._series, "series `%s' already defined" % name)
- title = ww.rest(); check(title is not None, "missing title")
+ title = ww.rest()
me._set_mode(MODE_MULTI)
me._series[name] = series = Series(me._pl, name, title,
me._series_wanted is None or
elif cmd == "explen":
w = ww.rest(); check(w is not None, "missing duration spec")
- d, v = parse_duration(w)
- me._explen = d
- if v is not None: me._expvar = v
+ if w == "-":
+ me._explen, me._expvar = None, DEFAULT_EXPVAR
+ else:
+ d, v = parse_duration(w)
+ me._explen = d
+ if v is not None: me._expvar = v
elif cmd == "epname":
for k, v in me._keyvals(opts): me._bad_keyval("epname", k, v)
name = ww.rest(); check(name is not None, "missing episode name")
- try: sep = name.index(",")
+ try: sep = name.index("::")
except ValueError: names = name + "s"
else: name, names = name[:sep], name[sep + 1:]
me._pl.epname, me._pl.epnames = name, names
opts = ww.nextword(); check(opts is not None, "missing title/options")
ti = None; sname = None; neps = 1; epi = None; loch = hich = None
explen, expvar, explicitlen = me._explen, me._expvar, False
+ series_title_p = True
for k, v in me._keyvals(opts):
if k is None:
if v.isdigit(): ti = int(v)
elif k == "s": sname = v
elif k == "n": neps = getint(v)
elif k == "ep": epi = getint(v)
+ elif k == "st": series_title_p = getbool(v)
elif k == "l":
if v == "-": me._explen, me._expvar = None, DEFAULT_EXPVAR
else:
try: src = me._isos[series.name]
except KeyError: src = me._auto_epsrc(series)
- episode = season.add_episode(epi, neps, title, src, ti, loch, hich)
+ episode = season.add_episode(epi, neps, title, src,
+ series_title_p, ti, loch, hich)
if episode.duration != -1 and explen is not None:
if not explicitlen: explen *= neps