Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-24 04:05:39 +01:00
Code Issues Projects Releases Wiki Activity

wrstsegments: fix so we handle newlines better

Browse Source 
Fixes: #1050
Fixes: #1038
This commit is contained in:
Johan Andersson 2019-04-08 23:21:59 +02:00
parent 2c3352c57e
commit 60c043da62
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/svtplay_dl/subtitle/__init__.py
View File

@ -276,40 +276,39 @@ class subtitle(object):
if 'X-TIMESTAMP-MAP=MPEGTS' in t: if 'X-TIMESTAMP-MAP=MPEGTS' in t:
time = float(re.search(r"X-TIMESTAMP-MAP=MPEGTS:(\d+)", t).group(1)) / 90000 - 10 time = float(re.search(r"X-TIMESTAMP-MAP=MPEGTS:(\d+)", t).group(1)) / 90000 - 10
text = text[3:len(text) - 2] text = text[3:len(text) - 2]
itmes = []
if len(text) > 1: if len(text) > 1:
itmes = []
for n in text: for n in text:
if n: if n: # don't get the empty lines.
itmes.append(n) itmes.append(n)
else:
if len(subs) > 1 and len(itmes) < 2: # Ignore empty lines in unexpected places
pass
elif len(subs) > 1 and itmes[1] == subs[-1][1]: # This will happen when there are two sections in file
ha = strdate(subs[-1][0])
ha3 = strdate(itmes[0])
second = str2sec(ha3.group(2)) + time
subs[-1][0] = "{} --> {}".format(ha.group(1), sec2str(second))
itmes = []
else:
ha = strdate(itmes[0])
first = str2sec(ha.group(1)) + time
second = str2sec(ha.group(2)) + time
itmes[0] = "{} --> {}".format(sec2str(first), sec2str(second))
subs.append(itmes)
itmes = []
if itmes:
if len(subs) > 0 and itmes[1] == subs[-1][1]:
ha = strdate(subs[-1][0])
ha3 = strdate(itmes[0])
second = str2sec(ha3.group(2)) + time
subs[-1][0] = "{} --> {}".format(ha.group(1), sec2str(second))
else:
ha = strdate(itmes[0])
first = str2sec(ha.group(1)) + time
second = str2sec(ha.group(2)) + time
itmes[0] = "{} --> {}".format(sec2str(first), sec2str(second))
subs.append(itmes)
itemsn = 0
several_items = False
sub = []
for x in range(len(itmes)):
item = itmes[itemsn]
if strdate(item) and len(subs) > 0 and itmes[itemsn + 1] == subs[-1][1]:
ha = strdate(subs[-1][0])
ha3 = strdate(item)
second = str2sec(ha3.group(2)) + time
subs[-1][0] = "{} --> {}".format(ha.group(1), sec2str(second))
continue
else:
has_date = strdate(item)
if has_date:
if several_items:
subs.append(sub)
sub = []
first = str2sec(has_date.group(1)) + time
second = str2sec(has_date.group(2)) + time
sub.append("{} --> {}".format(sec2str(first), sec2str(second)))
several_items = True
elif has_date is None:
sub.append(item)
itemsn += 1
if sub:
subs.append(sub)
string = "" string = ""
nr = 1 nr = 1
for sub in subs: for sub in subs: