projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release 2014.12.12.1
[youtube-dl]
/
youtube_dl
/
extractor
/
subtitles.py
diff --git
a/youtube_dl/extractor/subtitles.py
b/youtube_dl/extractor/subtitles.py
index 90de7de3a709d4385b29e62d44ae1e82349d883e..59a51268d25ed4b0718c67ae91a5e8f07fcfe42c 100644
(file)
--- a/
youtube_dl/extractor/subtitles.py
+++ b/
youtube_dl/extractor/subtitles.py
@@
-1,7
+1,8
@@
+from __future__ import unicode_literals
from .common import InfoExtractor
from .common import InfoExtractor
+from ..compat import compat_str
from ..utils import (
from ..utils import (
- compat_str,
ExtractorError,
)
ExtractorError,
)
@@
-12,18
+13,18
@@
class SubtitlesInfoExtractor(InfoExtractor):
return any([self._downloader.params.get('writesubtitles', False),
self._downloader.params.get('writeautomaticsub')])
return any([self._downloader.params.get('writesubtitles', False),
self._downloader.params.get('writeautomaticsub')])
- def _list_available_subtitles(self, video_id, webpage
=None
):
+ def _list_available_subtitles(self, video_id, webpage):
""" outputs the available subtitles for the video """
""" outputs the available subtitles for the video """
- sub_lang_list = self._get_available_subtitles(video_id)
+ sub_lang_list = self._get_available_subtitles(video_id
, webpage
)
auto_captions_list = self._get_available_automatic_caption(video_id, webpage)
sub_lang = ",".join(list(sub_lang_list.keys()))
auto_captions_list = self._get_available_automatic_caption(video_id, webpage)
sub_lang = ",".join(list(sub_lang_list.keys()))
- self.to_screen(
u
'%s: Available subtitles for video: %s' %
+ self.to_screen('%s: Available subtitles for video: %s' %
(video_id, sub_lang))
auto_lang = ",".join(auto_captions_list.keys())
(video_id, sub_lang))
auto_lang = ",".join(auto_captions_list.keys())
- self.to_screen(
u
'%s: Available automatic captions for video: %s' %
+ self.to_screen('%s: Available automatic captions for video: %s' %
(video_id, auto_lang))
(video_id, auto_lang))
- def extract_subtitles(self, video_id,
video_webpage=Non
e):
+ def extract_subtitles(self, video_id,
webpag
e):
"""
returns {sub_lang: sub} ,{} if subtitles not found or None if the
subtitles aren't requested.
"""
returns {sub_lang: sub} ,{} if subtitles not found or None if the
subtitles aren't requested.
@@
-32,9
+33,9
@@
class SubtitlesInfoExtractor(InfoExtractor):
return None
available_subs_list = {}
if self._downloader.params.get('writeautomaticsub', False):
return None
available_subs_list = {}
if self._downloader.params.get('writeautomaticsub', False):
- available_subs_list.update(self._get_available_automatic_caption(video_id,
video_
webpage))
+ available_subs_list.update(self._get_available_automatic_caption(video_id, webpage))
if self._downloader.params.get('writesubtitles', False):
if self._downloader.params.get('writesubtitles', False):
- available_subs_list.update(self._get_available_subtitles(video_id))
+ available_subs_list.update(self._get_available_subtitles(video_id
, webpage
))
if not available_subs_list: # error, it didn't get the available subtitles
return {}
if not available_subs_list: # error, it didn't get the available subtitles
return {}
@@
-50,8
+51,8
@@
class SubtitlesInfoExtractor(InfoExtractor):
sub_lang_list = {}
for sub_lang in requested_langs:
sub_lang_list = {}
for sub_lang in requested_langs:
- if
not sub_lang
in available_subs_list:
- self._downloader.report_warning(
u
'no closed captions found in the specified language "%s"' % sub_lang)
+ if
sub_lang not
in available_subs_list:
+ self._downloader.report_warning('no closed captions found in the specified language "%s"' % sub_lang)
continue
sub_lang_list[sub_lang] = available_subs_list[sub_lang]
continue
sub_lang_list[sub_lang] = available_subs_list[sub_lang]
@@
-62,24
+63,31
@@
class SubtitlesInfoExtractor(InfoExtractor):
subtitles[sub_lang] = subtitle
return subtitles
subtitles[sub_lang] = subtitle
return subtitles
+ def _download_subtitle_url(self, sub_lang, url):
+ return self._download_webpage(url, None, note=False)
+
def _request_subtitle_url(self, sub_lang, url):
""" makes the http request for the subtitle """
try:
def _request_subtitle_url(self, sub_lang, url):
""" makes the http request for the subtitle """
try:
- sub = self._download_
webpage(url, None, note=False
)
+ sub = self._download_
subtitle_url(sub_lang, url
)
except ExtractorError as err:
except ExtractorError as err:
- self._downloader.report_warning(
u
'unable to download video subtitles for %s: %s' % (sub_lang, compat_str(err)))
+ self._downloader.report_warning('unable to download video subtitles for %s: %s' % (sub_lang, compat_str(err)))
return
if not sub:
return
if not sub:
- self._downloader.report_warning(
u
'Did not fetch video subtitles')
+ self._downloader.report_warning('Did not fetch video subtitles')
return
return sub
return
return sub
- def _get_available_subtitles(self, video_id):
+ def _get_available_subtitles(self, video_id
, webpage
):
"""
returns {sub_lang: url} or {} if not available
Must be redefined by the subclasses
"""
"""
returns {sub_lang: url} or {} if not available
Must be redefined by the subclasses
"""
- pass
+
+ # By default, allow implementations to simply pass in the result
+ assert isinstance(webpage, dict), \
+ '_get_available_subtitles not implemented'
+ return webpage
def _get_available_automatic_caption(self, video_id, webpage):
"""
def _get_available_automatic_caption(self, video_id, webpage):
"""
@@
-87,5
+95,5
@@
class SubtitlesInfoExtractor(InfoExtractor):
Must be redefined by the subclasses that support automatic captions,
otherwise it will return {}
"""
Must be redefined by the subclasses that support automatic captions,
otherwise it will return {}
"""
- self._downloader.report_warning(
u
'Automatic Captions not supported by this server')
+ self._downloader.report_warning('Automatic Captions not supported by this server')
return {}
return {}