Merge remote-tracking branch 'jtwaleson/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 23 Nov 2014 20:33:31 +0000 (21:33 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 23 Nov 2014 20:33:31 +0000 (21:33 +0100)
1  2 
youtube_dl/extractor/youtube.py

index b4bbaf902461a7f03d73cd592533319b7c6c2674,8711b06d468c9ad83a67a75f0d4f431cd5102226..45c85ed01f4e891293b3b0d37f87e174ab2773d1
@@@ -1557,29 -1565,33 +1565,33 @@@ class YoutubeFeedsInfoExtractor(Youtube
              paging = mobj.group('paging')
          return self.playlist_result(feed_entries, playlist_title=self._PLAYLIST_TITLE)
  
  class YoutubeRecommendedIE(YoutubeFeedsInfoExtractor):
 -    IE_DESC = 'YouTube.com recommended videos, "ytrec" keyword (requires authentication)'
 +    IE_DESC = 'YouTube.com recommended videos, ":ytrec" for short (requires authentication)'
      _VALID_URL = r'https?://www\.youtube\.com/feed/recommended|:ytrec(?:ommended)?'
      _FEED_NAME = 'recommended'
      _PLAYLIST_TITLE = 'Youtube Recommended videos'
  
  class YoutubeWatchLaterIE(YoutubeFeedsInfoExtractor):
 -    IE_DESC = 'Youtube watch later list, "ytwatchlater" keyword (requires authentication)'
 +    IE_DESC = 'Youtube watch later list, ":ytwatchlater" for short (requires authentication)'
      _VALID_URL = r'https?://www\.youtube\.com/feed/watch_later|:ytwatchlater'
      _FEED_NAME = 'watch_later'
      _PLAYLIST_TITLE = 'Youtube Watch Later'
      _PERSONAL_FEED = True
  
  class YoutubeHistoryIE(YoutubeFeedsInfoExtractor):
 -    IE_DESC = 'Youtube watch history, "ythistory" keyword (requires authentication)'
 +    IE_DESC = 'Youtube watch history, ":ythistory" for short (requires authentication)'
      _VALID_URL = 'https?://www\.youtube\.com/feed/history|:ythistory'
      _FEED_NAME = 'history'
      _PERSONAL_FEED = True
      _PLAYLIST_TITLE = 'Youtube Watch History'
  
  class YoutubeFavouritesIE(YoutubeBaseInfoExtractor):
      IE_NAME = 'youtube:favorites'
 -    IE_DESC = 'YouTube.com favourite videos, "ytfav" keyword (requires authentication)'
 +    IE_DESC = 'YouTube.com favourite videos, ":ytfav" for short (requires authentication)'
      _VALID_URL = r'https?://www\.youtube\.com/my_favorites|:ytfav(?:ou?rites)?'
      _LOGIN_REQUIRED = True