Merge branch 'master' of github.com:rg3/youtube-dl

diff --combined youtube_dl/InfoExtractors.py
index 1d774b91e7d0ea6fb3a409ad04acfb375d35b3ba,5ebe64b6e9de0a342d83477834809ad477fc41f0..ae17acd5dcd67e5dc10046174a17611924c1b187
--- 1/youtube_dl/InfoExtractors.py
--- 2/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@@ -1674,7 -1674,7 +1674,7 @@@ class YoutubePlaylistIE(InfoExtractor)
      _VALID_URL = r'(?:(?:https?://)?(?:\w+\.)?youtube\.com/(?:(?:course|view_play_list|my_playlists|artist|playlist)\?.*?(p|a|list)=|user/.*?/user/|p/|user/.*?#[pg]/c/)(?:PL|EC)?|PL|EC)([0-9A-Za-z-_]{10,})(?:/.*?/([0-9A-Za-z_-]+))?.*'
      _TEMPLATE_URL = 'http://www.youtube.com/%s?%s=%s&page=%s&gl=US&hl=en'
      _VIDEO_INDICATOR_TEMPLATE = r'/watch\?v=(.+?)&([^&"]+&)*list=.*?%s'
-     _MORE_PAGES_INDICATOR = r'yt-uix-pager-next'
+     _MORE_PAGES_INDICATOR = u"Next \N{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}"
      IE_NAME = u'youtube:playlist'
  
      def __init__(self, downloader=None):
@@@ -1713,7 -1713,7 +1713,7 @@@
              url = self._TEMPLATE_URL % (playlist_access, playlist_prefix, playlist_id, pagenum)
              request = compat_urllib_request.Request(url)
              try:
-                 page = compat_urllib_request.urlopen(request).read()
+                 page = compat_urllib_request.urlopen(request).read().decode('utf8')
              except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
                  self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))
                  return
@@@ -1725,10 -1725,12 +1725,12 @@@
                      ids_in_page.append(mobj.group(1))
              video_ids.extend(ids_in_page)
  
-             if re.search(self._MORE_PAGES_INDICATOR, page) is None:
+             if self._MORE_PAGES_INDICATOR not in page:
                  break
              pagenum = pagenum + 1
  
+         total = len(video_ids)
+ 
          playliststart = self._downloader.params.get('playliststart', 1) - 1
          playlistend = self._downloader.params.get('playlistend', -1)
          if playlistend == -1:
@@@ -1736,6 -1738,11 +1738,11 @@@
          else:
              video_ids = video_ids[playliststart:playlistend]
  
+         if len(video_ids) == total:
+             self._downloader.to_screen(u'[youtube] PL %s: Found %i videos' % (playlist_id, total))
+         else:
+             self._downloader.to_screen(u'[youtube] PL %s: Found %i videos, downloading %i' % (playlist_id, total, len(video_ids)))
+ 
          for id in video_ids:
              self._downloader.download(['http://www.youtube.com/watch?v=%s' % id])
          return
@@@ -1746,7 -1753,7 +1753,7 @@@ class YoutubeChannelIE(InfoExtractor)
  
      _VALID_URL = r"^(?:https?://)?(?:youtu\.be|(?:\w+\.)?youtube(?:-nocookie)?\.com)/channel/([0-9A-Za-z_-]+)(?:/.*)?$"
      _TEMPLATE_URL = 'http://www.youtube.com/channel/%s/videos?sort=da&flow=list&view=0&page=%s&gl=US&hl=en'
-     _MORE_PAGES_INDICATOR = r'yt-uix-button-content">Next' # TODO
+     _MORE_PAGES_INDICATOR = u"Next \N{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}"
      IE_NAME = u'youtube:channel'
  
      def report_download_page(self, channel_id, pagenum):
@@@ -1770,7 -1777,7 +1777,7 @@@
              url = self._TEMPLATE_URL % (channel_id, pagenum)
              request = compat_urllib_request.Request(url)
              try:
-                 page = compat_urllib_request.urlopen(request).read()
+                 page = compat_urllib_request.urlopen(request).read().decode('utf8')
              except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
                  self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))
                  return
@@@ -1782,10 -1789,12 +1789,12 @@@
                      ids_in_page.append(mobj.group(1))
              video_ids.extend(ids_in_page)
  
-             if re.search(self._MORE_PAGES_INDICATOR, page) is None:
+             if self._MORE_PAGES_INDICATOR not in page:
                  break
              pagenum = pagenum + 1
  
+         self._downloader.to_screen(u'[youtube] Channel %s: Found %i videos' % (channel_id, len(video_ids)))
+ 
          for id in video_ids:
              self._downloader.download(['http://www.youtube.com/watch?v=%s' % id])
          return
@@@ -2262,7 -2271,7 +2271,7 @@@ class BlipTVIE(InfoExtractor)
          else:
              cchar = '?'
          json_url = url + cchar + 'skin=json&version=2&no_wrap=1'
 -        request = compat_urllib_request.Request(json_url.encode('utf-8'))
 +        request = compat_urllib_request.Request(json_url)
          self.report_extraction(mobj.group(1))
          info = None
          try:
@@@ -2287,8 -2296,7 +2296,8 @@@
              return
          if info is None: # Regular URL
              try:
 -                json_code = urlh.read()
 +                json_code_bytes = urlh.read()
 +                json_code = json_code_bytes.decode('utf-8')
              except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
                  self._downloader.trouble(u'ERROR: unable to read video info webpage: %s' % compat_str(err))
                  return