X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fdailymotion.py;h=360113f9c46840ad4e0f38a8cc9974f36d6a25c5;hb=cc6943e86aef74bef767be7f4027ab6122c95d55;hp=f7dffd4cce3a1fc2d04bd016111aa354717072a6;hpb=cf1dd0c59e8ff4c66130bc47954c415be5db8cc3;p=youtube-dl.git

diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py
index f7dffd4cc..360113f9c 100644
--- a/youtube_dl/extractor/dailymotion.py
+++ b/youtube_dl/extractor/dailymotion.py
@@ -1,14 +1,11 @@
 import re
 import json
 import itertools
-import socket
 
 from .common import InfoExtractor
-from .subtitles import NoAutoSubtitlesIE
+from .subtitles import SubtitlesInfoExtractor
 
 from ..utils import (
-    compat_http_client,
-    compat_urllib_error,
     compat_urllib_request,
     compat_str,
     get_element_by_attribute,
@@ -18,23 +15,7 @@ from ..utils import (
 )
 
 
-class DailyMotionSubtitlesIE(NoAutoSubtitlesIE):
-
-    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)
-        try:
-            sub_list = compat_urllib_request.urlopen(request).read().decode('utf-8')
-        except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
-            self._downloader.report_warning(u'unable to download video subtitles: %s' % compat_str(err))
-            return {}
-        info = json.loads(sub_list)
-        if (info['total'] > 0):
-            sub_lang_list = dict((l['language'], l['url']) for l in info['list'])
-            return sub_lang_list
-        self._downloader.report_warning(u'video doesn\'t have subtitles')
-        return {}
-
-class DailymotionIE(DailyMotionSubtitlesIE, InfoExtractor):
+class DailymotionIE(SubtitlesInfoExtractor):
     """Information Extractor for Dailymotion"""
 
     _VALID_URL = r'(?i)(?:https?://)?(?:www\.)?dailymotion\.[a-z]{2,3}/(?:embed/)?video/([^/]+)'
@@ -97,14 +78,7 @@ class DailymotionIE(DailyMotionSubtitlesIE, InfoExtractor):
         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
@@ -120,6 +94,21 @@ class DailymotionIE(DailyMotionSubtitlesIE, InfoExtractor):
             'thumbnail': info['thumbnail_url']
         }]
 
+    def _get_available_subtitles(self, video_id):
+        try:
+            sub_list = self._download_webpage(
+                'https://api.dailymotion.com/video/%s/subtitles?fields=id,language,url' % video_id,
+                video_id, note=False)
+        except ExtractorError as err:
+            self._downloader.report_warning(u'unable to download video subtitles: %s' % compat_str(err))
+            return {}
+        info = json.loads(sub_list)
+        if (info['total'] > 0):
+            sub_lang_list = dict((l['language'], l['url']) for l in info['list'])
+            return sub_lang_list
+        self._downloader.report_warning(u'video doesn\'t have subtitles')
+        return {}
+
 
 class DailymotionPlaylistIE(InfoExtractor):
     _VALID_URL = r'(?:https?://)?(?:www\.)?dailymotion\.[a-z]{2,3}/playlist/(?P<id>.+?)/'