X-Git-Url: https://git.distorted.org.uk/~mdw/epls/blobdiff_plain/be6d4012f9b1568dddaf83d83576ecf7e69a5138..ac58261bf47b7accf6db18a273d369d3f7b6de5c:/mkm3u diff --git a/mkm3u b/mkm3u index 3f5a5dd..ea60ddc 100755 --- a/mkm3u +++ b/mkm3u @@ -81,7 +81,7 @@ URL_SAFE_P = 256*[False] for ch in \ b"ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ b"abcdefghijklmnopqrstuvwxyz" \ - b"0123456789" b"!$%-.,/": + b"0123456789" b"!$%_-.,/": URL_SAFE_P[ch] = True def urlencode(s): return "".join((URL_SAFE_P[ch] and chr(ch) or "%%%02x" % ch @@ -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,36 @@ class VideoDir (object): raise ExpectedError("bad ep list in `%s'", fn) me.seasons = seasons -class AudioDisc (Source): +class SingleFileDir (object): + + _CHECK_COMPLETE = True + + def __init__(me, dir): + me.dir = dir + fns = OS.listdir(OS.path.join(ROOT, dir)) + fns.sort() + episodes = {} + last_i = 0 + rx = RX.compile(r""" + E (\d+) + (?: \. \ (.*))? + %s $ + """ % RX.escape(me._EXT), RX.X) + + for fn in fns: + path = OS.path.join(dir, fn) + if not fn.endswith(me._EXT): continue + m = rx.match(fn) + if not m: continue + i = filter(m.group(1), int) + etitle = m.group(2) + if me._CHECK_COMPLETE: + check(i == last_i + 1, "episode %d /= %d" % (i, last_i + 1)) + episodes[i] = me._mkepisode(path, i) + last_i = i + me.episodes = episodes + +class AudioFile (Source): PREFIX = "file://" TITLEP = CHAPTERP = False @@ -371,36 +400,37 @@ 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 -class AudioDir (object): +class AudioDir (SingleFileDir): + _EXT = ".flac" - _R_FLAC = RX.compile(r""" ^ - E (\d+) - (?: \. \ (.*))? - \. flac $ - """, RX.X) + def _mkepisode(me, path, i): + return AudioEpisode(path, i) - def __init__(me, dir): - me.dir = dir - fns = OS.listdir(OS.path.join(ROOT, dir)) - fns.sort() - episodes = {} - last_i = 0 - for fn in fns: - path = OS.path.join(dir, fn) - if not fn.endswith(".flac"): continue - m = me._R_FLAC.match(fn) - if not m: continue - i = filter(m.group(1), int) - etitle = m.group(2) - check(i == last_i + 1, "episode %d /= %d" % (i, last_i + 1)) - episodes[i] = AudioEpisode(path, i) - last_i = i - me.episodes = episodes +class VideoFile (Source): + PREFIX = "file://" + TITLEP = CHAPTERP = False + + def _duration(me, title, start_chapter, end_chaptwr): + out = program_output(["mediainfo", "--output=General;%Duration%", + OS.path.join(ROOT, me.fn)]) + return int(out)//1000 + +class VideoEpisode (VideoFile): + def __init__(me, fn, i, *args, **kw): + super().__init__(fn, *args, **kw) + me.i = i + +class VideoDir (SingleFileDir): + _EXT = ".mp4" + _CHECK_COMPLETE = False + + def _mkepisode(me, path, i): + return VideoEpisode(path, i) class Chapter (object): def __init__(me, episode, title, i): @@ -517,6 +547,7 @@ class Playlist (object): me.nseries = 0 me.single_series_p = False me.series_title = None + me.series_sep = "" def add_episode(me, episode): me.episodes.append(episode) @@ -534,9 +565,9 @@ class Playlist (object): label = ep.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 ep.season.i is None: sep = ":" + else: sep = me.series_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: @@ -545,6 +576,7 @@ class Playlist (object): (ch.duration, label, ch.title, ch.url)) def dump(me, f): + if opts.list_name is not None: f.write("LIST %s\n" % opts.list_name) if me.series_title is not None and \ me.nseries > 1 and not me.single_series_p: raise ExpectedError("can't force series name for multi-series list") @@ -557,7 +589,7 @@ class Playlist (object): title = ep.season.series.full_title if me.single_series_p: stag = "-" - if title is not None: label = title + " " + label + if title is not None: label = title + me.series_sep + " " + label else: if title is None: title = me.series_title stag = ep.season.series.name @@ -614,7 +646,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 @@ -749,29 +781,36 @@ class EpisodeListParser (object): if not series.wantedp: return series.ensure_season().ep_i = epi - elif cmd == "iso": + elif cmd == "dvd": series = me._opts_series(cmd, opts) fn = ww.rest(); check(fn is not None, "missing filename") if not series.wantedp: return 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": + elif cmd == "dvddir": 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 == "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._sfdirs, series.name) + else: me._sfdirs[series.name] = VideoDir(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) @@ -779,6 +818,10 @@ class EpisodeListParser (object): src = me._auto_epsrc(series) src.nuses += n + elif cmd == "sep": + sep = ww.rest(); check(sep is not None, "missing separator") + me._pl.series_sep = sep + else: raise ExpectedError("unknown command `%s'" % cmd) @@ -819,10 +862,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] @@ -873,8 +917,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: @@ -883,12 +927,15 @@ class EpisodeListParser (object): return me._pl op = OP.OptionParser \ - (usage = "%prog [-Dc] [-M DEPS] [-d CACHE] [-o OUT] [-s SERIES] EPLS\n" + (usage = "%prog [-Dc] [-L NAME] [-M DEPS] [-d CACHE] [-o OUT] [-s SERIES] EPLS\n" "%prog -i -d CACHE", description = "Generate M3U playlists from an episode list.") op.add_option("-D", "--dump", dest = "dump", action = "store_true", default = False, help = "Dump playlist in machine-readable form") +op.add_option("-L", "--list-name", metavar = "NAME", + dest = "list_name", type = "str", default = None, + help = "Set the playlist name") op.add_option("-M", "--make-deps", metavar = "DEPS", dest = "deps", type = "str", default = None, help = "Write a `make' fragment for dependencies") @@ -941,6 +988,9 @@ try: ep.parse_file(argv[0]) pl = ep.done() + if opts.list_name is None: + opts.list_name, _ = OS.path.splitext(OS.path.basename(argv[0])) + if opts.dump: outfn = pl.dump else: outfn = pl.write if opts.output is None or opts.output == "-":