diff options
author | rzhxeo <rzhxeo@users.noreply.github.com> | 2013-09-30 21:39:58 -0700 |
---|---|---|
committer | rzhxeo <rzhxeo@users.noreply.github.com> | 2013-09-30 21:39:58 -0700 |
commit | c0de39e6d42d8de6a77768b2a96570fd8df8ad36 (patch) | |
tree | ef10e4ee36c43121490ae5bf89275c1793a30f88 /youtube_dl/extractor/subtitles.py | |
parent | a921f40799d2ecb4be53b3241d2dbfc80f804d73 (diff) | |
parent | 722076a123c60ed6d5a978c4bc2609f46c8e3ee9 (diff) |
Merge pull request #2 from rg3/master
Update
Diffstat (limited to 'youtube_dl/extractor/subtitles.py')
-rw-r--r-- | youtube_dl/extractor/subtitles.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/youtube_dl/extractor/subtitles.py b/youtube_dl/extractor/subtitles.py index 97215f289..90de7de3a 100644 --- a/youtube_dl/extractor/subtitles.py +++ b/youtube_dl/extractor/subtitles.py @@ -10,8 +10,7 @@ class SubtitlesInfoExtractor(InfoExtractor): @property def _have_to_download_any_subtitles(self): return any([self._downloader.params.get('writesubtitles', False), - self._downloader.params.get('writeautomaticsub'), - self._downloader.params.get('allsubtitles', False)]) + self._downloader.params.get('writeautomaticsub')]) def _list_available_subtitles(self, video_id, webpage=None): """ outputs the available subtitles for the video """ @@ -34,7 +33,7 @@ class SubtitlesInfoExtractor(InfoExtractor): available_subs_list = {} if self._downloader.params.get('writeautomaticsub', False): available_subs_list.update(self._get_available_automatic_caption(video_id, video_webpage)) - if self._downloader.params.get('writesubtitles', False) or self._downloader.params.get('allsubtitles', False): + if self._downloader.params.get('writesubtitles', False): available_subs_list.update(self._get_available_subtitles(video_id)) if not available_subs_list: # error, it didn't get the available subtitles |