X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/71050031bb901b19a829cc44763bf68e67b1f648..099764c0c91f4ad7db03d9347798f8619383ea7e:/youtube_dl/extractor/subtitles.py?ds=sidebyside diff --git a/youtube_dl/extractor/subtitles.py b/youtube_dl/extractor/subtitles.py index 4b4c523..db33745 100644 --- a/youtube_dl/extractor/subtitles.py +++ b/youtube_dl/extractor/subtitles.py @@ -62,10 +62,13 @@ class SubtitlesInfoExtractor(InfoExtractor): 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: - sub = self._download_webpage(url, None, note=False) + sub = self._download_subtitle_url(sub_lang, url) except ExtractorError as err: self._downloader.report_warning(u'unable to download video subtitles for %s: %s' % (sub_lang, compat_str(err))) return @@ -79,7 +82,11 @@ class SubtitlesInfoExtractor(InfoExtractor): 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): """