mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-12-13 14:37:43 +01:00
[subtitles] Simplify the extraction of subtitles in subclasses and remove NoAutoSubtitlesInfoExtractor
Subclasses just need to call the method extract_subtitles, which will call _extract_subtitles and _request_automatic_caption Now the default implementation of _request_automatic_caption returns {}.
This commit is contained in:
parent
54d39d8b2f
commit
d82134c339
@ -4,7 +4,7 @@
|
||||
import socket
|
||||
|
||||
from .common import InfoExtractor
|
||||
from .subtitles import NoAutoSubtitlesInfoExtractor
|
||||
from .subtitles import SubtitlesInfoExtractor
|
||||
|
||||
from ..utils import (
|
||||
compat_http_client,
|
||||
@ -18,7 +18,7 @@
|
||||
)
|
||||
|
||||
|
||||
class DailymotionIE(NoAutoSubtitlesInfoExtractor):
|
||||
class DailymotionIE(SubtitlesInfoExtractor):
|
||||
"""Information Extractor for Dailymotion"""
|
||||
|
||||
_VALID_URL = r'(?i)(?:https?://)?(?:www\.)?dailymotion\.[a-z]{2,3}/(?:embed/)?video/([^/]+)'
|
||||
@ -81,14 +81,7 @@ def _real_extract(self, url):
|
||||
video_url = info[max_quality]
|
||||
|
||||
# subtitles
|
||||
video_subtitles = None
|
||||
video_webpage = None
|
||||
|
||||
if self._downloader.params.get('writesubtitles', False) or self._downloader.params.get('allsubtitles', False):
|
||||
video_subtitles = self._extract_subtitles(video_id)
|
||||
elif self._downloader.params.get('writeautomaticsub', False):
|
||||
video_subtitles = self._request_automatic_caption(video_id, video_webpage)
|
||||
|
||||
video_subtitles = self.extract_subtitles(video_id)
|
||||
if self._downloader.params.get('listsubtitles', False):
|
||||
self._list_available_subtitles(video_id)
|
||||
return
|
||||
|
@ -62,19 +62,31 @@ def _request_subtitle_url(self, sub_lang, url):
|
||||
return sub
|
||||
|
||||
def _get_available_subtitles(self, video_id):
|
||||
""" 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
|
||||
|
||||
def _request_automatic_caption(self, video_id, webpage):
|
||||
""" returns {sub_lang: sub} or {} if not available """
|
||||
""" Must be redefined by the subclasses """
|
||||
pass
|
||||
|
||||
|
||||
class NoAutoSubtitlesInfoExtractor(SubtitlesInfoExtractor):
|
||||
""" A subtitle class for the servers that don't support auto-captions"""
|
||||
|
||||
def _request_automatic_caption(self, video_id, webpage):
|
||||
"""
|
||||
returns {sub_lang: sub} or {} if not available
|
||||
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')
|
||||
return {}
|
||||
|
||||
def extract_subtitles(self, video_id, video_webpage=None):
|
||||
"""
|
||||
Extract the subtitles and/or the automatic captions if requested.
|
||||
Returns None or a dictionary in the format {sub_lang: sub}
|
||||
"""
|
||||
video_subtitles = None
|
||||
if self._downloader.params.get('writesubtitles', False) or self._downloader.params.get('allsubtitles', False):
|
||||
video_subtitles = self._extract_subtitles(video_id)
|
||||
elif self._downloader.params.get('writeautomaticsub', False):
|
||||
video_subtitles = self._request_automatic_caption(video_id, video_webpage)
|
||||
return video_subtitles
|
||||
|
||||
|
||||
|
@ -707,12 +707,7 @@ def _real_extract(self, url):
|
||||
video_description = u''
|
||||
|
||||
# subtitles
|
||||
video_subtitles = None
|
||||
|
||||
if self._downloader.params.get('writesubtitles', False) or self._downloader.params.get('allsubtitles', False):
|
||||
video_subtitles = self._extract_subtitles(video_id)
|
||||
elif self._downloader.params.get('writeautomaticsub', False):
|
||||
video_subtitles = self._request_automatic_caption(video_id, video_webpage)
|
||||
video_subtitles = self.extract_subtitles(video_id, video_webpage)
|
||||
|
||||
if self._downloader.params.get('listsubtitles', False):
|
||||
self._list_available_subtitles(video_id)
|
||||
|
Loading…
Reference in New Issue
Block a user