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

* 'master' of github.com:nficano/pytube:
Add default for age_restricted in extract.get_ytplayer_config and extract.js_url
Added age_restricted arg to test_js_url
Flake8 E501 errors fix
Added support for age restricted videos without a signature in the url
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md

README.md

@@ -1,6 +1,8 @@
 
 <div align="center">
-  <img src="./images/pytube.png" width="400" height="375" alt="pytube logo" /><br>
+  <p>
+  <img src="./images/pytube.png" width="350" height="328" alt="pytube logo" />
+  </p> 
   <p align="center">
 	  <img src="https://img.shields.io/pypi/v/pytube.svg" alt="pypi">
 	  <a href="https://travis-ci.org/nficano/pytube"><img src="https://travis-ci.org/nficano/pytube.svg?branch=master" /></a>
@@ -10,13 +12,10 @@
   </p>
 </div>
 
-pytube
-======
+# pytube
 *pytube* is a lightweight, dependency-free Python library (and command-line utility) for downloading YouTube Videos.
 
-Description
-===========
-
+## Description
 YouTube is the most popular video-sharing platform in the world and as a hacker you may encounter a situation where you want to script something to download videos.  For this I present to you *pytube*.
 
 *pytube* is a lightweight library written in Python. It has no third party dependencies and aims to be highly reliable.
@@ -25,7 +24,7 @@ YouTube is the most popular video-sharing platform in the world and as a hacker
 
 Finally *pytube* also includes a command-line utility, allowing you to quickly download videos right from terminal.
 
-**Behold, a perfect balance of simplicity versus flexibility**:
+### Behold, a perfect balance of simplicity versus flexibility:
 
 ```python
  >>> YouTube('https://youtu.be/9bZkp7q19f0').streams.first().download()
@@ -38,9 +37,7 @@ Finally *pytube* also includes a command-line utility, allowing you to quickly d
   ... .download()
 ```
 
-Features
---------
-
+## Features
 - Support for Both Progressive & DASH Streams
 - Support for downloading complete playlist
 - Easily Register ``on_download_progress`` & ``on_download_complete`` callbacks
@@ -51,17 +48,15 @@ Features
 - Extensively Documented Source Code
 - No Third-Party Dependencies
 
-Installation
-------------
+## Installation
 
 Download using pip via pypi.
 
 ```bash
-pip install pytube
+$ pip install pytube
 ```
 
-Getting started
----------------
+## Getting started
 
 Let's begin with showing how easy it is to download a video with pytube:
 
@@ -218,9 +213,7 @@ Similarly, if your application requires on-download progress logic, pytube expos
  >>> yt.register_on_progress_callback(show_progress_bar)
 ```
 
-
-Command-line interface
-======================
+## Command-line interface
 
 pytube also ships with a tiny cli interface for downloading and probing videos.
 

pytube/__main__.py

@@ -109,7 +109,7 @@ class YouTube(object):
             self.player_config_args = self.vid_info
         else:
             self.player_config_args = extract.get_ytplayer_config(
-                self.watch_html,
+                self.watch_html
             )['args']
 
         # https://github.com/nficano/pytube/issues/165
@@ -123,8 +123,13 @@ class YouTube(object):
                 mixins.apply_descrambler(self.vid_info, fmt)
             mixins.apply_descrambler(self.player_config_args, fmt)
 
-            # apply the signature to the download url.
-            mixins.apply_signature(self.player_config_args, fmt, self.js)
+            try:
+                mixins.apply_signature(self.player_config_args, fmt, self.js)
+            except TypeError:
+                self.js_url = extract.js_url(
+                    self.embed_html, self.age_restricted)
+                self.js = request.get(self.js_url)
+                mixins.apply_signature(self.player_config_args, fmt, self.js)
 
             # build instances of :class:`Stream <Stream>`
             self.initialize_stream_objects(fmt)
@@ -157,7 +162,7 @@ class YouTube(object):
         )
         self.vid_info = request.get(self.vid_info_url)
         if not self.age_restricted:
-            self.js_url = extract.js_url(self.watch_html)
+            self.js_url = extract.js_url(self.watch_html, self.age_restricted)
             self.js = request.get(self.js_url)
 
     def initialize_stream_objects(self, fmt):

pytube/extract.py

@@ -111,7 +111,7 @@ def video_info_url(
     return 'https://youtube.com/get_video_info?' + urlencode(params)
 
 
-def js_url(watch_html):
+def js_url(html, age_restricted=False):
     """Get the base JavaScript url.
 
     Construct the base JavaScript url, which contains the decipher
@@ -119,9 +119,11 @@ def js_url(watch_html):
 
     :param str watch_html:
         The html contents of the watch page.
+    :param bool age_restricted:
+        Is video age restricted.
 
     """
-    ytplayer_config = get_ytplayer_config(watch_html)
+    ytplayer_config = get_ytplayer_config(html, age_restricted)
     base_js = ytplayer_config['assets']['js']
     return 'https://youtube.com' + base_js
 
@@ -150,7 +152,7 @@ def mime_type_codec(mime_type_codec):
     return mime_type, [c.strip() for c in codecs.split(',')]
 
 
-def get_ytplayer_config(watch_html):
+def get_ytplayer_config(html, age_restricted=False):
     """Get the YouTube player configuration data from the watch html.
 
     Extract the ``ytplayer_config``, which is json data embedded within the
@@ -159,10 +161,15 @@ def get_ytplayer_config(watch_html):
 
     :param str watch_html:
         The html contents of the watch page.
+    :param bool age_restricted:
+        Is video age restricted.
     :rtype: str
     :returns:
         Substring of the html containing the encoded manifest data.
     """
-    pattern = r';ytplayer\.config\s*=\s*({.*?});'
-    yt_player_config = regex_search(pattern, watch_html, group=1)
+    if age_restricted:
+        pattern = r";yt\.setConfig\(\{'PLAYER_CONFIG':\s*({.*})(,'EXPERIMENT_FLAGS'|;)"  # noqa: E501
+    else:
+        pattern = r';ytplayer\.config\s*=\s*({.*?});'
+    yt_player_config = regex_search(pattern, html, group=1)
     return json.loads(yt_player_config)

pytube/mixins.py

@@ -33,11 +33,16 @@ def apply_signature(config_args, fmt, js):
         if 'signature=' in url:
             # For certain videos, YouTube will just provide them pre-signed, in
             # which case there's no real magic to download them and we can skip
-            # the whole signature decrambling entirely.
+            # the whole signature descrambling entirely.
             logger.debug('signature found, skip decipher')
             continue
 
-        signature = cipher.get_signature(js, stream['s'])
+        if js is not None:
+            signature = cipher.get_signature(js, stream['s'])
+        else:
+            # signature not present in url (line 33), need js to descramble
+            # TypeError caught in __main__
+            raise TypeError('JS is None')
 
         logger.debug(
             'finished descrambling signature for itag=%s\n%s',