Merge branch 'master' into subtitles_rework
authorIsmael Mejia <iemejia@gmail.com>
Wed, 11 Sep 2013 12:26:48 +0000 (14:26 +0200)
committerIsmael Mejia <iemejia@gmail.com>
Wed, 11 Sep 2013 12:26:48 +0000 (14:26 +0200)
1  2 
youtube_dl/extractor/youtube.py

index 11611f10da73f085843ba0586c90065f3feae816,0e828263c1b7f255d6f5bb8452d191f65f547fbf..e71cd62ec3d43e2b541a7e024c6a02adbe16a355
@@@ -7,7 -7,6 +7,7 @@@ import socke
  import itertools
  
  from .common import InfoExtractor, SearchInfoExtractor
 +from .subtitles import SubtitlesIE
  from ..utils import (
      compat_http_client,
      compat_parse_qs,
@@@ -131,65 -130,7 +131,65 @@@ class YoutubeBaseInfoExtractor(InfoExtr
              return
          self._confirm_age()
  
 -class YoutubeIE(YoutubeBaseInfoExtractor):
 +class YoutubeSubtitlesIE(SubtitlesIE):
 +
 +    def _get_available_subtitles(self, video_id):
 +        request = compat_urllib_request.Request('http://video.google.com/timedtext?hl=en&type=list&v=%s' % 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 {}
 +        lang_list = re.findall(r'name="([^"]*)"[^>]+lang_code="([\w\-]+)"', sub_list)
 +
 +        sub_lang_list = {}
 +        for l in lang_list:
 +            lang = l[1]
 +            params = compat_urllib_parse.urlencode({
 +                'lang': lang,
 +                'v': video_id,
 +                'fmt': self._downloader.params.get('subtitlesformat'),
 +            })
 +            url = u'http://www.youtube.com/api/timedtext?' + params
 +            sub_lang_list[lang] = url
 +        if not sub_lang_list:
 +            self._downloader.report_warning(u'video doesn\'t have subtitles')
 +            return {}
 +        return sub_lang_list
 +
 +    def _request_automatic_caption(self, video_id, webpage):
 +        """We need the webpage for getting the captions url, pass it as an
 +           argument to speed up the process."""
 +        sub_lang = (self._downloader.params.get('subtitleslangs') or ['en'])[0]
 +        sub_format = self._downloader.params.get('subtitlesformat')
 +        self.to_screen(u'%s: Looking for automatic captions' % video_id)
 +        mobj = re.search(r';ytplayer.config = ({.*?});', webpage)
 +        err_msg = u'Couldn\'t find automatic captions for "%s"' % sub_lang
 +        if mobj is None:
 +            self._downloader.report_warning(err_msg)
 +            return {}
 +        player_config = json.loads(mobj.group(1))
 +        try:
 +            args = player_config[u'args']
 +            caption_url = args[u'ttsurl']
 +            timestamp = args[u'timestamp']
 +            params = compat_urllib_parse.urlencode({
 +                'lang': 'en',
 +                'tlang': sub_lang,
 +                'fmt': sub_format,
 +                'ts': timestamp,
 +                'kind': 'asr',
 +            })
 +            subtitles_url = caption_url + '&' + params
 +            sub = self._download_webpage(subtitles_url, video_id, u'Downloading automatic captions')
 +            return {sub_lang: sub}
 +        # An extractor error can be raise by the download process if there are
 +        # no automatic captions but there are subtitles
 +        except (KeyError, ExtractorError):
 +            self._downloader.report_warning(err_msg)
 +            return {}
 +
 +class YoutubeIE(YoutubeSubtitlesIE, YoutubeBaseInfoExtractor):
      IE_DESC = u'YouTube.com'
      _VALID_URL = r"""^
                       (
                           |youtu\.be/                                          # just youtu.be/xxxx
                           )
                       )?                                                       # all until now is optional -> you can pass the naked ID
-                      ([0-9A-Za-z_-]+)                                         # here is it! the YouTube video ID
+                      ([0-9A-Za-z_-]{11})                                      # here is it! the YouTube video ID
                       (?(1).+)?                                                # if we found the ID, everything can follow
                       $"""
      _NEXT_URL_RE = r'[\?&]next_url=([^&]+)'
          """Report attempt to download video info webpage."""
          self.to_screen(u'%s: Downloading video info webpage' % video_id)
  
 -    def report_video_subtitles_download(self, video_id):
 -        """Report attempt to download video info webpage."""
 -        self.to_screen(u'%s: Checking available subtitles' % video_id)
 -
 -    def report_video_subtitles_request(self, video_id, sub_lang, format):
 -        """Report attempt to download video info webpage."""
 -        self.to_screen(u'%s: Downloading video subtitles for %s.%s' % (video_id, sub_lang, format))
 -
 -    def report_video_subtitles_available(self, video_id, sub_lang_list):
 -        """Report available subtitles."""
 -        sub_lang = ",".join(list(sub_lang_list.keys()))
 -        self.to_screen(u'%s: Available subtitles for video: %s' % (video_id, sub_lang))
 -
      def report_information_extraction(self, video_id):
          """Report attempt to extract video information."""
          self.to_screen(u'%s: Extracting video information' % video_id)
          elif len(s) == 86:
              return s[5:34] + s[0] + s[35:38] + s[3] + s[39:45] + s[38] + s[46:53] + s[73] + s[54:73] + s[85] + s[74:85] + s[53]
          elif len(s) == 85:
-             return s[83:34:-1] + s[0] + s[33:27:-1] + s[3] + s[26:19:-1] + s[34] + s[18:3:-1] + s[27]
+             return s[40] + s[82:43:-1] + s[22] + s[42:40:-1] + s[83] + s[39:22:-1] + s[0] + s[21:2:-1]
          elif len(s) == 84:
              return s[81:36:-1] + s[0] + s[35:2:-1]
          elif len(s) == 83:
              # Fallback to the other algortihms
              return self._decrypt_signature(s)
  
 -
 -    def _get_available_subtitles(self, video_id):
 -        self.report_video_subtitles_download(video_id)
 -        request = compat_urllib_request.Request('http://video.google.com/timedtext?hl=en&type=list&v=%s' % 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 {}
 -        sub_lang_list = re.findall(r'name="([^"]*)"[^>]+lang_code="([\w\-]+)"', sub_list)
 -        sub_lang_list = dict((l[1], l[0]) for l in sub_lang_list)
 -        if not sub_lang_list:
 -            self._downloader.report_warning(u'video doesn\'t have subtitles')
 -            return {}
 -        return sub_lang_list
 -
 -    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 _request_subtitle(self, sub_lang, sub_name, video_id, format):
 -        """
 -        Return the subtitle as a string or None if they are not found
 -        """
 -        self.report_video_subtitles_request(video_id, sub_lang, format)
 -        params = compat_urllib_parse.urlencode({
 -            'lang': sub_lang,
 -            'name': sub_name,
 -            'v': video_id,
 -            'fmt': format,
 -        })
 -        url = 'http://www.youtube.com/api/timedtext?' + params
 -        try:
 -            sub = compat_urllib_request.urlopen(url).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 for %s: %s' % (sub_lang, compat_str(err)))
 -            return
 -        if not sub:
 -            self._downloader.report_warning(u'Did not fetch video subtitles')
 -            return
 -        return sub
 -
 -    def _request_automatic_caption(self, video_id, webpage):
 -        """We need the webpage for getting the captions url, pass it as an
 -           argument to speed up the process."""
 -        sub_lang = (self._downloader.params.get('subtitleslangs') or ['en'])[0]
 -        sub_format = self._downloader.params.get('subtitlesformat')
 -        self.to_screen(u'%s: Looking for automatic captions' % video_id)
 -        mobj = re.search(r';ytplayer.config = ({.*?});', webpage)
 -        err_msg = u'Couldn\'t find automatic captions for "%s"' % sub_lang
 -        if mobj is None:
 -            self._downloader.report_warning(err_msg)
 -            return {}
 -        player_config = json.loads(mobj.group(1))
 -        try:
 -            args = player_config[u'args']
 -            caption_url = args[u'ttsurl']
 -            timestamp = args[u'timestamp']
 -            params = compat_urllib_parse.urlencode({
 -                'lang': 'en',
 -                'tlang': sub_lang,
 -                'fmt': sub_format,
 -                'ts': timestamp,
 -                'kind': 'asr',
 -            })
 -            subtitles_url = caption_url + '&' + params
 -            sub = self._download_webpage(subtitles_url, video_id, u'Downloading automatic captions')
 -            return {sub_lang: sub}
 -        # An extractor error can be raise by the download process if there are
 -        # no automatic captions but there are subtitles
 -        except (KeyError, ExtractorError):
 -            self._downloader.report_warning(err_msg)
 -            return {}
 -    
 -    def _extract_subtitles(self, video_id):
 -        """
 -        Return a dictionary: {language: subtitles} or {} if the subtitles
 -        couldn't be found
 -        """
 -        available_subs_list = self._get_available_subtitles(video_id)
 -        sub_format = self._downloader.params.get('subtitlesformat')
 -        if  not available_subs_list: #There was some error, it didn't get the available subtitles
 -            return {}
 -        if self._downloader.params.get('allsubtitles', False):
 -            sub_lang_list = available_subs_list
 -        else:
 -            if self._downloader.params.get('subtitleslangs', False):
 -                reqested_langs = self._downloader.params.get('subtitleslangs')
 -            elif 'en' in available_subs_list:
 -                reqested_langs = ['en']
 -            else:
 -                reqested_langs = [list(available_subs_list.keys())[0]]
 -
 -            sub_lang_list = {}
 -            for sub_lang in reqested_langs:
 -                if not sub_lang in available_subs_list:
 -                    self._downloader.report_warning(u'no closed captions found in the specified language "%s"' % sub_lang)
 -                    continue
 -                sub_lang_list[sub_lang] = available_subs_list[sub_lang]
 -        subtitles = {}
 -        for sub_lang in sub_lang_list:
 -            subtitle = self._request_subtitle(sub_lang, sub_lang_list[sub_lang].encode('utf-8'), video_id, sub_format)
 -            if subtitle:
 -                subtitles[sub_lang] = subtitle
 -        return subtitles
 -
      def _print_formats(self, formats):
          print('Available formats:')
          for x in formats:
          manifest = self._download_webpage(manifest_url, video_id, u'Downloading formats manifest')
          formats_urls = _get_urls(manifest)
          for format_url in formats_urls:
-             itag = self._search_regex(r'itag%3D(\d+?)/', format_url, 'itag')
+             itag = self._search_regex(r'itag/(\d+?)/', format_url, 'itag')
              url_map[itag] = format_url
          return url_map