projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[viewster] Improve extraction
[youtube-dl]
/
youtube_dl
/
extractor
/
drtv.py
diff --git
a/youtube_dl/extractor/drtv.py
b/youtube_dl/extractor/drtv.py
index d5df18d7c971c18f01c51128c75fbe4ee09ea070..8257e35a437b075461114fbaf1b4dd2d578f56d8 100644
(file)
--- a/
youtube_dl/extractor/drtv.py
+++ b/
youtube_dl/extractor/drtv.py
@@
-1,11
+1,10
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
-from .subtitles import SubtitlesInfoExtractor
-from .common import ExtractorError
+from .common import InfoExtractor, ExtractorError
from ..utils import parse_iso8601
from ..utils import parse_iso8601
-class DRTVIE(
Subtitles
InfoExtractor):
+class DRTVIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?dr\.dk/tv/se/(?:[^/]+/)*(?P<id>[\da-z-]+)(?:[/#?]|$)'
_TEST = {
_VALID_URL = r'https?://(?:www\.)?dr\.dk/tv/se/(?:[^/]+/)*(?P<id>[\da-z-]+)(?:[/#?]|$)'
_TEST = {
@@
-76,7
+75,7
@@
class DRTVIE(SubtitlesInfoExtractor):
}
for subs in subtitles_list:
lang = subs['Language']
}
for subs in subtitles_list:
lang = subs['Language']
- subtitles[LANGS.get(lang, lang)] =
subs['Uri'
]
+ subtitles[LANGS.get(lang, lang)] =
[{'url': subs['Uri'], 'ext': 'vtt'}
]
if not formats and restricted_to_denmark:
raise ExtractorError(
if not formats and restricted_to_denmark:
raise ExtractorError(
@@
-84,10
+83,6
@@
class DRTVIE(SubtitlesInfoExtractor):
self._sort_formats(formats)
self._sort_formats(formats)
- if self._downloader.params.get('listsubtitles', False):
- self._list_available_subtitles(video_id, subtitles)
- return
-
return {
'id': video_id,
'title': title,
return {
'id': video_id,
'title': title,
@@
-96,5
+91,5
@@
class DRTVIE(SubtitlesInfoExtractor):
'timestamp': timestamp,
'duration': duration,
'formats': formats,
'timestamp': timestamp,
'duration': duration,
'formats': formats,
- 'subtitles': s
elf.extract_subtitles(video_id, subtitles)
,
+ 'subtitles': s
ubtitles
,
}
}