Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-10 21:27:17 +08:00
Code Issues Releases Wiki Activity

[streamango] add support for streamcherry.com (#20592)

Browse Source
This commit is contained in:
Sergey M 2019-04-13 15:05:24 +07:00 committed by Forthrin
parent 3337739ba8
commit 04ff456503
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/utils.py
View File

@ -2729,9 +2729,9 @@ def parse_dfxp_time_expr(time_expr):
if mobj: if mobj:
return float(mobj.group('time_offset')) return float(mobj.group('time_offset'))
mobj = re.match(r'^(\d+):(\d\d):(\d\d)\.(\d{1,3})$', time_expr) mobj = re.match(r'^(\d+):(\d\d):(\d\d(?:(?:\.|:)\d+)?)$', time_expr)
if mobj: if mobj:
return 3600 * int(mobj.group(1)) + 60 * int(mobj.group(2)) + int(mobj.group(3)) + float("%03d" % int(mobj.group(4))) / 1000 return 3600 * int(mobj.group(1)) + 60 * int(mobj.group(2)) + float(mobj.group(3).replace(':', '.'))
def srt_subtitles_timecode(seconds): def srt_subtitles_timecode(seconds):
@ -2831,7 +2831,11 @@ def dfxp2srt(dfxp_data):
self._applied_styles.pop() self._applied_styles.pop()
def data(self, data): def data(self, data):
<<<<<<< HEAD
self._out += data.strip() self._out += data.strip()
=======
self._out += data
>>>>>>> [streamango] add support for streamcherry.com (#20592)
def close(self): def close(self):
return self._out.strip() return self._out.strip()