mirror of
https://github.com/blackjack4494/yt-dlc.git
synced 2024-12-25 17:27:36 +00:00
Check for both automatic captions and subtitles with options --write-sub
and --write-auto-sub
(fixes #1224)
This commit is contained in:
parent
e3dc22ca3a
commit
6bc520c207
1 changed files with 15 additions and 6 deletions
|
@ -7,6 +7,11 @@ from ..utils import (
|
||||||
|
|
||||||
|
|
||||||
class SubtitlesInfoExtractor(InfoExtractor):
|
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)])
|
||||||
|
|
||||||
def _list_available_subtitles(self, video_id, webpage=None):
|
def _list_available_subtitles(self, video_id, webpage=None):
|
||||||
""" outputs the available subtitles for the video """
|
""" outputs the available subtitles for the video """
|
||||||
|
@ -20,13 +25,17 @@ class SubtitlesInfoExtractor(InfoExtractor):
|
||||||
(video_id, auto_lang))
|
(video_id, auto_lang))
|
||||||
|
|
||||||
def extract_subtitles(self, video_id, video_webpage=None):
|
def extract_subtitles(self, video_id, video_webpage=None):
|
||||||
""" returns {sub_lang: sub} or {} if subtitles not found """
|
"""
|
||||||
if self._downloader.params.get('writesubtitles', False) or self._downloader.params.get('allsubtitles', False):
|
returns {sub_lang: sub} ,{} if subtitles not found or None if the
|
||||||
available_subs_list = self._get_available_subtitles(video_id)
|
subtitles aren't requested.
|
||||||
elif self._downloader.params.get('writeautomaticsub', False):
|
"""
|
||||||
available_subs_list = self._get_available_automatic_caption(video_id, video_webpage)
|
if not self._have_to_download_any_subtitles:
|
||||||
else:
|
|
||||||
return None
|
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))
|
||||||
|
if self._downloader.params.get('writesubtitles', False) or self._downloader.params.get('allsubtitles', False):
|
||||||
|
available_subs_list.update(self._get_available_subtitles(video_id))
|
||||||
|
|
||||||
if not available_subs_list: # error, it didn't get the available subtitles
|
if not available_subs_list: # error, it didn't get the available subtitles
|
||||||
return {}
|
return {}
|
||||||
|
|
Loading…
Reference in a new issue