mirrors/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[subtitles] Improved docs + new class for servers who don't support

Browse Source 
auto-caption
This commit is contained in:
Ismael Mejia 2013-08-08 11:20:56 +02:00
parent 447591e1ae
commit 69df680b97
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/dailymotion.py
View File

@ -3,7 +3,7 @@ import json
import socket import socket
from .common import InfoExtractor from .common import InfoExtractor
from .subtitles import SubtitlesIE from .subtitles import NoAutoSubtitlesIE
from ..utils import ( from ..utils import (
compat_http_client, compat_http_client,
@ -17,7 +17,7 @@ from ..utils import (
) )
class DailyMotionSubtitlesIE(SubtitlesIE): class DailyMotionSubtitlesIE(NoAutoSubtitlesIE):
def _get_available_subtitles(self, video_id): def _get_available_subtitles(self, video_id):
request = compat_urllib_request.Request('https://api.dailymotion.com/video/%s/subtitles?fields=id,language,url' % video_id) request = compat_urllib_request.Request('https://api.dailymotion.com/video/%s/subtitles?fields=id,language,url' % video_id)
@ -33,11 +33,6 @@ class DailyMotionSubtitlesIE(SubtitlesIE):
self._downloader.report_warning(u'video doesn\'t have subtitles') self._downloader.report_warning(u'video doesn\'t have subtitles')
return {} return {}
def _request_automatic_caption(self, video_id, webpage):
self._downloader.report_warning(u'Automatic Captions not supported by this server')
return {}
class DailymotionIE(DailyMotionSubtitlesIE): class DailymotionIE(DailyMotionSubtitlesIE):
"""Information Extractor for Dailymotion""" """Information Extractor for Dailymotion"""

32
youtube_dl/extractor/subtitles.py
View File

@ -12,21 +12,15 @@ from ..utils import (
class SubtitlesIE(InfoExtractor): class SubtitlesIE(InfoExtractor):
def report_video_subtitles_available(self, video_id, sub_lang_list): def _list_available_subtitles(self, video_id):
"""Report available subtitles.""" """ outputs the available subtitles for the video """
sub_lang_list = self._get_available_subtitles(video_id)
sub_lang = ",".join(list(sub_lang_list.keys())) sub_lang = ",".join(list(sub_lang_list.keys()))
self.to_screen(u'%s: Available subtitles for video: %s' % self.to_screen(u'%s: Available subtitles for video: %s' %
(video_id, sub_lang)) (video_id, sub_lang))
def _list_available_subtitles(self, video_id):
sub_lang_list = self._get_available_subtitles(video_id)
self.report_video_subtitles_available(video_id, sub_lang_list)
def _extract_subtitles(self, video_id): def _extract_subtitles(self, video_id):
""" """ returns {sub_lang: sub} or {} if subtitles not found """
Return a dictionary: {language: subtitles} or {} if the subtitles
couldn't be found
"""
sub_lang_list = self._get_available_subtitles(video_id) sub_lang_list = self._get_available_subtitles(video_id)
if not sub_lang_list: # error, it didn't get the available subtitles if not sub_lang_list: # error, it didn't get the available subtitles
return {} return {}
@ -51,6 +45,7 @@ class SubtitlesIE(InfoExtractor):
return subtitles return subtitles
def _request_subtitle_url(self, sub_lang, url): def _request_subtitle_url(self, sub_lang, url):
""" makes the http request for the subtitle """
try: try:
sub = compat_urllib_request.urlopen(url).read().decode('utf-8') sub = compat_urllib_request.urlopen(url).read().decode('utf-8')
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
@ -62,12 +57,19 @@ class SubtitlesIE(InfoExtractor):
return sub return sub
def _get_available_subtitles(self, video_id): def _get_available_subtitles(self, video_id):
"""returns the list of available subtitles like this {lang: url} """ """ returns {sub_lang: url} or {} if not available """
"""or {} if not available. Must be redefined by the subclasses.""" """ Must be redefined by the subclasses """
pass pass
def _request_automatic_caption(self, video_id, webpage): def _request_automatic_caption(self, video_id, webpage):
"""Request automatic caption. Redefine in subclasses.""" """ returns {sub_lang: sub} or {} if not available """
"""returns a tuple of ... """ """ Must be redefined by the subclasses """
# return [(err_msg, None, None)]
pass pass
class NoAutoSubtitlesIE(SubtitlesIE):
""" A subtitle class for the servers that don't support auto-captions"""
def _request_automatic_caption(self, video_id, webpage):
self._downloader.report_warning(u'Automatic Captions not supported by this server')
return {}