From: Mark Wooding Date: Thu, 17 Mar 2022 18:16:12 +0000 (+0000) Subject: mkm3u: Support one-episode-per-file arrangements. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/epls/commitdiff_plain/9b82ff075c7dfbaf6b5588c4a6d7b9675409bf47 mkm3u: Support one-episode-per-file arrangements. --- diff --git a/mkm3u b/mkm3u index 44e17d6..7583937 100755 --- a/mkm3u +++ b/mkm3u @@ -163,11 +163,12 @@ class VideoDir (object): D \d+ \. \ | (?= E \d+ \. \ ) | \. \ ) | - \d+ \. \ ) + (?P \d+) \. \ ) (?: (?P (?: S \d+ \ )? E \d+ (?: – \d+)? (?: , \ (?: S \d+ \ )? E \d+ (?: – \d+)?)*) | - (?P E \d+) \. \ .*) + (?P E \d+) \. \ .* | + .*) \. iso $ """, RX.X) @@ -209,8 +210,12 @@ class VideoDir (object): ts = season any, bad = False, False epname = m.group("epname") + epexpr = m.group("eplist") + epnum = m.group("epnum") if epname is not None: eplist = [epname] - else: eplist = m.group("eplist").split(", ") + elif epexpr is not None: eplist = epexpr.split(", ") + elif epnum is not None: eplist = ["E" + epnum] + else: continue #print(";; `%s'" % path, file = SYS.stderr) for eprange in eplist: mm = me._R_ISO_EP.match(eprange)