Merge branch 'master' of github.com:nficano/pytube

* 'master' of github.com:nficano/pytube:
Update playlist.py
Update playlist.py
fix total videos found string
Update docstring.
Update exception message.
Catch unavailable videos.

pytube/__main__.py

@@ -21,6 +21,7 @@ from pytube import Stream
 from pytube import StreamQuery
 from pytube.compat import install_proxy
 from pytube.compat import parse_qsl
+from pytube.exceptions import VideoUnavailable
 from pytube.helpers import apply_mixin
 
 logger = logging.getLogger(__name__)
@@ -156,6 +157,8 @@ class YouTube(object):
 
         """
         self.watch_html = request.get(url=self.watch_url)
+        if '<img class="icon meh" src="/yts/img' not in self.watch_html:
+            raise VideoUnavailable('This video is unavailable.')
         self.embed_html = request.get(url=self.embed_url)
         self.age_restricted = extract.is_age_restricted(self.watch_html)
         self.vid_info_url = extract.video_info_url(

pytube/contrib/playlist.py

@@ -110,7 +110,7 @@ class Playlist(object):
         """
 
         self.populate_video_urls()
-        logger.debug('total videos found: ', len(self.video_urls))
+        logger.debug('total videos found: %d', len(self.video_urls))
         logger.debug('starting download')
 
         prefix_gen = self._path_num_prefix_generator(reverse_numbering)

pytube/exceptions.py

@@ -34,3 +34,7 @@ class ExtractError(PytubeError):
 
 class RegexMatchError(ExtractError):
     """Regex pattern did not return any matches."""
+
+
+class VideoUnavailable(PytubeError):
+    """Video is unavailable."""