Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2026-06-08 00:49:29 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into nrk

Browse Source
This commit is contained in:
einarhb
2015-04-08 06:43:45 +02:00
Unverified
parent 29713e4268 8ded20e125
commit cb711c67ca
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
youtube_dl/extractor/nrk.py
+8 -1
View File
@@ -210,7 +210,14 @@ class NRKTVIE(InfoExtractor):
duration = parse_duration(p.get('dur'))
starttime = self._subtitles_timecode(begin)
endtime = self._subtitles_timecode(begin + duration)
srt += '%s\r\n%s --> %s\r\n%s\r\n\r\n' % (compat_str(pos), starttime, endtime, p.text)
subs = []
subs.append(unicode(p.text).strip())
for child in p:
subs.append(unicode(child.text).strip())
subs.append(unicode(child.tail).strip())
srt += '%s\r\n%s --> %s\r\n%s\r\n\r\n' % (compat_str(pos), starttime, endtime, '\n'.join(filter(None, subs)))
return {lang: [
{'ext': 'ttml', 'url': url},
{'ext': 'srt', 'data': srt},