Merge branch 'sonicaj-playlist_exception'

* sonicaj-playlist_exception:
lint
fixed bug that caused on_complete to fail
Suppress exception while downloaiding Playlist

.gitignore

@@ -41,5 +41,7 @@ _templates
 _autosummary
 .pytest_cache*
 
+# IDE Files
+.idea/
 #Pycharm stuff
 .idea/*

pytube/contrib/playlist.py

@@ -18,16 +18,17 @@ class Playlist(object):
     playlist
     """
 
-    def __init__(self, url):
+    def __init__(self, url, suppress_exception=False):
         self.playlist_url = url
         self.video_urls = []
+        self.suppress_exception = suppress_exception
 
     def construct_playlist_url(self):
-        """There are two kinds of playlist urls in YouTube. One that
-        contains watch?v= in URL, another one contains the "playlist?list="
-        portion. It is preferable to work with the later one.
+        """There are two kinds of playlist urls in YouTube. One that contains
+        watch?v= in URL, another one contains the "playlist?list=" portion. It
+        is preferable to work with the later one.
 
-        :return: playlist url -> string
+        :return: playlist url
         """
 
         if 'watch?v=' in self.playlist_url:
@@ -41,8 +42,6 @@ class Playlist(object):
     def _load_more_url(self, req):
         """Given an html page or a fragment thereof, looks for
         and returns the "load more" url if found.
-
-        :return: string
         """
         try:
             load_more_url = 'https://www.youtube.com' + re.search(
@@ -57,8 +56,6 @@ class Playlist(object):
         """Parse the video links from the page source, extracts and
         returns the /watch?v= part from video link href
         It's an alternative for BeautifulSoup
-
-        :return: list
         """
 
         url = self.construct_playlist_url()
@@ -120,7 +117,9 @@ class Playlist(object):
         return (str(i).zfill(digits) for i in range(start, stop, step))
 
     def download_all(
-        self, download_path=None, prefix_number=True,
+        self,
+        download_path=None,
+        prefix_number=True,
         reverse_numbering=False,
     ):
         """Download all the videos in the the playlist. Initially, download
@@ -151,17 +150,26 @@ class Playlist(object):
         prefix_gen = self._path_num_prefix_generator(reverse_numbering)
 
         for link in self.video_urls:
-            yt = YouTube(link)
-            # TODO: this should not be hardcoded to a single user's preference
-            dl_stream = yt.streams.filter(
-                progressive=True, subtype='mp4',
-            ).order_by('resolution').desc().first()
-
-            logger.debug('download path: %s', download_path)
-            if prefix_number:
-                prefix = next(prefix_gen)
-                logger.debug('file prefix is: %s', prefix)
-                dl_stream.download(download_path, filename_prefix=prefix)
+            try:
+                yt = YouTube(link)
+            except Exception as e:
+                logger.debug(e)
+                if not self.suppress_exception:
+                    raise e
+                else:
+                    logger.debug('Exception suppressed')
             else:
-                dl_stream.download(download_path)
-            logger.debug('download complete')
+                # TODO: this should not be hardcoded to a single user's
+                # preference
+                dl_stream = yt.streams.filter(
+                    progressive=True, subtype='mp4',
+                ).order_by('resolution').desc().first()
+
+                logger.debug('download path: %s', download_path)
+                if prefix_number:
+                    prefix = next(prefix_gen)
+                    logger.debug('file prefix is: %s', prefix)
+                    dl_stream.download(download_path, filename_prefix=prefix)
+                else:
+                    dl_stream.download(download_path)
+                logger.debug('download complete')

pytube/streams.py

@@ -226,7 +226,7 @@ class Stream(object):
                 bytes_remaining -= len(chunk)
                 # send to the on_progress callback.
                 self.on_progress(chunk, fh, bytes_remaining)
-            self.on_complete(fh)
+        self.on_complete(fh)
         return fp
 
     def stream_to_buffer(self):