Merge branch 'master' into vimeo
authorRogério Brito <rbrito@ime.usp.br>
Thu, 17 Feb 2011 11:17:30 +0000 (09:17 -0200)
committerRogério Brito <rbrito@ime.usp.br>
Thu, 17 Feb 2011 11:17:30 +0000 (09:17 -0200)
1  2 
youtube-dl

diff --combined youtube-dl
index 780a6d9a25ea7eaabd4576af71435490fd459589,26af2e5bc57e37084bc5d9b2988e40006e69c9f2..0e837868f28fa3179823905a56fd827aebe6f3dd
@@@ -1719,123 -1719,6 +1719,123 @@@ class YahooIE(InfoExtractor)
                        self._downloader.trouble(u'\nERROR: unable to download video')
  
  
 +class VimeoIE(InfoExtractor):
 +      """Information extractor for vimeo.com."""
 +
 +      # _VALID_URL matches Vimeo URLs
 +      _VALID_URL = r'(?:http://)?(?:(?:www|player).)?vimeo\.com/(?:video/)?([0-9]+)'
 +
 +      def __init__(self, downloader=None):
 +              InfoExtractor.__init__(self, downloader)
 +
 +      @staticmethod
 +      def suitable(url):
 +              return (re.match(VimeoIE._VALID_URL, url) is not None)
 +
 +      def report_download_webpage(self, video_id):
 +              """Report webpage download."""
 +              self._downloader.to_screen(u'[video.vimeo] %s: Downloading webpage' % video_id)
 +
 +      def report_extraction(self, video_id):
 +              """Report information extraction."""
 +              self._downloader.to_screen(u'[video.vimeo] %s: Extracting information' % video_id)
 +
 +      def _real_initialize(self):
 +              return
 +
 +      def _real_extract(self, url, new_video=True):
 +              # Extract ID from URL
 +              mobj = re.match(self._VALID_URL, url)
 +              if mobj is None:
 +                      self._downloader.trouble(u'ERROR: Invalid URL: %s' % url)
 +                      return
 +
 +              # At this point we have a new video
 +              self._downloader.increment_downloads()
 +              video_id = mobj.group(1)
 +              video_extension = 'flv' # FIXME
 +
 +              # Retrieve video webpage to extract further information
 +              request = urllib2.Request("http://vimeo.com/moogaloop/load/clip:%s" % video_id, None, std_headers)
 +              try:
 +                      self.report_download_webpage(video_id)
 +                      webpage = urllib2.urlopen(request).read()
 +              except (urllib2.URLError, httplib.HTTPException, socket.error), err:
 +                      self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % str(err))
 +                      return
 +
 +              # Now we begin extracting as much information as we can from what we
 +              # retrieved. First we extract the information common to all extractors,
 +              # and latter we extract those that are Vimeo specific.
 +              self.report_extraction(video_id)
 +
 +              # Extract title
 +              mobj = re.search(r'<caption>(.*?)</caption>', webpage)
 +              if mobj is None:
 +                      self._downloader.trouble(u'ERROR: unable to extract video title')
 +                      return
 +              video_title = mobj.group(1).decode('utf-8')
 +              simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title)
 +
 +              # Extract uploader
 +              mobj = re.search(r'<uploader_url>http://vimeo.com/(.*?)</uploader_url>', webpage)
 +              if mobj is None:
 +                      self._downloader.trouble(u'ERROR: unable to extract video uploader')
 +                      return
 +              video_uploader = mobj.group(1).decode('utf-8')
 +
 +              # Extract video thumbnail
 +              mobj = re.search(r'<thumbnail>(.*?)</thumbnail>', webpage)
 +              if mobj is None:
 +                      self._downloader.trouble(u'ERROR: unable to extract video thumbnail')
 +                      return
 +              video_thumbnail = mobj.group(1).decode('utf-8')
 +
 +              # # Extract video description
 +              # mobj = re.search(r'<meta property="og:description" content="(.*)" />', webpage)
 +              # if mobj is None:
 +              #       self._downloader.trouble(u'ERROR: unable to extract video description')
 +              #       return
 +              # video_description = mobj.group(1).decode('utf-8')
 +              # if not video_description: video_description = 'No description available.'
 +              video_description = 'Foo.'
 +
 +              # Vimeo specific: extract request signature
 +              mobj = re.search(r'<request_signature>(.*?)</request_signature>', webpage)
 +              if mobj is None:
 +                      self._downloader.trouble(u'ERROR: unable to extract request signature')
 +                      return
 +              sig = mobj.group(1).decode('utf-8')
 +
 +              # Vimeo specific: Extract request signature expiration
 +              mobj = re.search(r'<request_signature_expires>(.*?)</request_signature_expires>', webpage)
 +              if mobj is None:
 +                      self._downloader.trouble(u'ERROR: unable to extract request signature expiration')
 +                      return
 +              sig_exp = mobj.group(1).decode('utf-8')
 +
 +              video_url = "http://vimeo.com/moogaloop/play/clip:%s/%s/%s" % (video_id, sig, sig_exp)
 +
 +              try:
 +                      # Process video information
 +                      self._downloader.process_info({
 +                              'id':           video_id.decode('utf-8'),
 +                              'url':          video_url,
 +                              'uploader':     video_uploader,
 +                              'upload_date':  u'NA',
 +                              'title':        video_title,
 +                              'stitle':       simple_title,
 +                              'ext':          video_extension.decode('utf-8'),
 +                              'thumbnail':    video_thumbnail.decode('utf-8'),
 +                              'description':  video_description,
 +                              'thumbnail':    video_thumbnail,
 +                              'description':  video_description,
 +                              'player_url':   None,
 +                      })
 +              except UnavailableVideoError:
 +                      self._downloader.trouble(u'ERROR: unable to download video')
 +
 +
  class GenericIE(InfoExtractor):
        """Generic last-resort information extractor."""
  
@@@ -2213,7 -2096,7 +2213,7 @@@ class YahooSearchIE(InfoExtractor)
  class YoutubePlaylistIE(InfoExtractor):
        """Information Extractor for YouTube playlists."""
  
-       _VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:(?:view_play_list|my_playlists|artist)\?.*?(p|a)=|user/.*?/user/|p/)([^&]+).*'
+       _VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:(?:view_play_list|my_playlists|artist)\?.*?(p|a)=|user/.*?/user/|p/|user/.*?#[pg]/c/)([0-9A-Za-z]+)(?:/.*?/([0-9A-Za-z_-]+))?.*'
        _TEMPLATE_URL = 'http://www.youtube.com/%s?%s=%s&page=%s&gl=US&hl=en'
        _VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
        _MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
                        self._downloader.trouble(u'ERROR: invalid url: %s' % url)
                        return
  
+               # Single video case
+               if mobj.group(3) is not None:
+                       self._youtube_ie.extract(mobj.group(3))
+                       return
                # Download playlist pages
                # prefix is 'p' as default for playlists but there are other types that need extra care
                playlist_prefix = mobj.group(1)
                if playlist_prefix == 'a':
                        playlist_access = 'artist'
                else:
+                       playlist_prefix = 'p'
                        playlist_access = 'view_play_list'
                playlist_id = mobj.group(2)
                video_ids = []
@@@ -2693,7 -2582,6 +2699,7 @@@ if __name__ == '__main__'
                        parser.error(u'invalid playlist end number specified')
  
                # Information extractors
 +              vimeo_ie = VimeoIE()
                youtube_ie = YoutubeIE()
                metacafe_ie = MetacafeIE(youtube_ie)
                dailymotion_ie = DailymotionIE()
                        'nopart': opts.nopart,
                        'updatetime': opts.updatetime,
                        })
 +              fd.add_info_extractor(vimeo_ie)
                fd.add_info_extractor(youtube_search_ie)
                fd.add_info_extractor(youtube_pl_ie)
                fd.add_info_extractor(youtube_user_ie)