better handling for age restricted videos

pytube/__main__.py

@@ -79,8 +79,7 @@ class YouTube:
         self.watch_url = f"https://youtube.com/watch?v={self.video_id}"
         self.embed_url = f"https://www.youtube.com/embed/{self.video_id}"
 
-        # A dictionary shared between all instances of :class:`Stream <Stream>`
-        # (Borg pattern). Boooooo.
+        # Shared between all instances of `Stream` (Borg pattern).
         self.stream_monostate = Monostate(
             on_progress=on_progress_callback, on_complete=on_complete_callback
         )
@@ -139,7 +138,8 @@ class YouTube:
                     self.player_config_args, fmt, self.js  # type: ignore
                 )
             except TypeError:
-                assert self.embed_html is not None
+                if not self.embed_html:
+                    self.embed_html = request.get(url=self.embed_url)
                 self.js_url = extract.js_url(self.embed_html, self.age_restricted)
                 self.js = request.get(self.js_url)
                 assert self.js is not None
@@ -167,14 +167,15 @@ class YouTube:
 
         """
         self.watch_html = request.get(url=self.watch_url)
-        if (
-            self.watch_html is None
-            or '<img class="icon meh" src="/yts/img' not in self.watch_html
-        ):
+        if self.watch_html is None:
             raise VideoUnavailable(video_id=self.video_id)
-
-        self.embed_html = request.get(url=self.embed_url)
         self.age_restricted = extract.is_age_restricted(self.watch_html)
+        if not self.age_restricted and 'id="player-unavailable"' in self.watch_html:
+            raise VideoUnavailable(video_id=self.video_id)
+
+        if self.age_restricted:
+            self.embed_html = request.get(url=self.embed_url)
+
         self.vid_info_url = extract.video_info_url(
             video_id=self.video_id,
             watch_url=self.watch_url,

pytube/extract.py

@@ -97,7 +97,10 @@ def video_info_url(
     """
     if age_restricted:
         assert embed_html is not None
-        sts = regex_search(r'"sts"\s*:\s*(\d+)', embed_html, group=1)
+        try:
+            sts = regex_search(r'"sts"\s*:\s*(\d+)', embed_html, group=1)
+        except RegexMatchError:
+            sts = ""
         # Here we use ``OrderedDict`` so that the output is consistent between
         # Python 2.7+.
         eurl = f"https://youtube.googleapis.com/v/{video_id}"

tests/conftest.py

@@ -48,7 +48,7 @@ def presigned_video():
 @pytest.fixture
 def age_restricted():
     """Youtube instance initialized with video id zRbsm3e2ltw."""
-    filename = "yt-video-zRbsm3e2ltw-1507777044.json.gz"
+    filename = "yt-video-irauhITDrsE.json.gz"
     return load_playback_file(filename)
 
 

tests/generate_fixture.py

@@ -19,6 +19,7 @@ output = {
     "watch_html": yt.watch_html,
     "video_info": yt.vid_info,
     "js": yt.js,
+    "embed_html": yt.embed_html,
 }
 
 outpath = path.join(currentdir, "mocks", "yt-video-" + yt.video_id + ".json")

tests/test_extract.py

@@ -12,7 +12,21 @@ def test_extract_video_id():
     assert video_id == "9bZkp7q19f0"
 
 
-def test_info_url(cipher_signature):
+def test_info_url(age_restricted):
+    video_info_url = extract.video_info_url(
+        video_id="QRS8MkLhQmM",
+        watch_url=age_restricted["url"],
+        embed_html=age_restricted["embed_html"],
+        age_restricted=True,
+    )
+    expected = (
+        "https://youtube.com/get_video_info?video_id=QRS8MkLhQmM&eurl"
+        "=https%3A%2F%2Fyoutube.googleapis.com%2Fv%2FQRS8MkLhQmM&sts="
+    )
+    assert video_info_url == expected
+
+
+def test_info_url_age_restricted(cipher_signature):
     video_info_url = extract.video_info_url(
         video_id=cipher_signature.video_id,
         watch_url=cipher_signature.watch_url,