is_dash property, more tests

pytube/contrib/playlist.py

@@ -6,6 +6,7 @@ import logging
 import re
 from collections import OrderedDict
 from typing import List, Optional
+from urllib.parse import parse_qs
 
 from pytube import request
 from pytube.__main__ import YouTube
@@ -25,9 +26,8 @@ class Playlist:
 
         if "watch?v=" in url:
             base_url = "https://www.youtube.com/playlist?list="
-            # TODO: should be parse q
-            playlist_code = self.playlist_url.split("&list=")[1]
-            self.playlist_url = base_url + playlist_code
+            query_parameters = parse_qs(url.split("?")[1])
+            self.playlist_url = base_url + query_parameters["list"][0]
 
     @staticmethod
     def _find_load_more_url(req: str) -> Optional[str]:

pytube/itags.py

@@ -98,7 +98,8 @@ _3D = [82, 83, 84, 85, 100, 101, 102]
 LIVE = [91, 92, 93, 94, 95, 96, 132, 151]
 DASH_MP4_VIDEO = [133, 134, 135, 136, 137, 138, 160, 212, 264, 266, 298, 299]
 DASH_MP4_AUDIO = [139, 140, 141, 256, 258, 325, 328]
-
+DASH_WEBM_VIDEO = [167, 168, 169, 170, 218, 219, 278, 242, 243, 244, 245, 246, 247, 248, 271, 272, 302, 303, 308, 313, 315]
+DASH_WEBM_AUDIO = [171, 172, 249, 250, 251]
 
 def get_format_profile(itag: int) -> Dict:
     """Get additional format information for a given itag.
@@ -118,5 +119,5 @@ def get_format_profile(itag: int) -> Dict:
         "is_3d": itag in _3D,
         "is_hdr": itag in HDR,
         "fps": 60 if itag in _60FPS else 30,
-        "is_dash": itag in DASH_MP4_VIDEO or itag in DASH_MP4_AUDIO,
+        "is_dash": itag in DASH_MP4_VIDEO or itag in DASH_MP4_AUDIO or itag in DASH_WEBM_VIDEO or itag in DASH_WEBM_AUDIO,
     }

pytube/query.py

@@ -34,6 +34,7 @@ class StreamQuery:
         only_video=None,
         progressive=None,
         adaptive=None,
+        is_dash=None,
         custom_filter_functions=None,
     ):
         """Apply the given filtering criterion.
@@ -103,6 +104,9 @@ class StreamQuery:
             Excludes progressive streams (audio and video are on separate
             tracks).
 
+        :param bool is_dash:
+            Include/exclude dash streams.
+
         :param bool only_audio:
             Excludes streams with video tracks.
 
@@ -161,6 +165,9 @@ class StreamQuery:
             for fn in custom_filter_functions:
                 filters.append(fn)
 
+        if is_dash is not None:
+            filters.append(lambda s: s.is_dash == is_dash)
+
         fmt_streams = self.fmt_streams
         for fn in filters:
             fmt_streams = list(filter(fn, fmt_streams))

pytube/streams.py

@@ -59,6 +59,7 @@ class Stream:
         self.codecs: List[str] = []  # audio/video encoders (e.g.: vp8, mp4a)
         self.audio_codec = None  # audio codec of the stream (e.g.: vorbis)
         self.video_codec = None  # video codec of the stream (e.g.: vp8)
+        self.is_dash: Optional[bool] = None
 
         # Iterates over the key/values of stream and sets them as class
         # attributes. This is an anti-pattern and should be removed.

tests/contrib/test_playlist.py

@@ -14,3 +14,15 @@ def test_title(request_get):
     pl = Playlist(url)
     pl_title = pl.title()
     assert pl_title == "(149) Python Tutorial for Beginners (For Absolute Beginners)"
+
+
+def test_init_with_playlist_url():
+    url = "https://www.youtube.com/playlist?list=PLynhp4cZEpTbRs_PYISQ8v_uwO0_mDg_X"
+    playlist = Playlist(url)
+    assert playlist.playlist_url == url
+
+
+def test_init_with_watch_url():
+    url = "https://www.youtube.com/watch?v=1KeYzjILqDo&list=PLynhp4cZEpTbRs_PYISQ8v_uwO0_mDg_X&index=2&t=661s"
+    playlist = Playlist(url)
+    assert playlist.playlist_url == "https://www.youtube.com/playlist?list=PLynhp4cZEpTbRs_PYISQ8v_uwO0_mDg_X"

tests/test_query.py

@@ -137,3 +137,11 @@ def test_get_by_itag(cipher_signature):
 
 def test_get_by_non_existent_itag(cipher_signature):
     assert not cipher_signature.streams.get_by_itag(22983)
+
+
+def test_get_by_resolution(cipher_signature):
+    assert cipher_signature.streams.get_by_resolution("360p").itag == 18
+
+
+def test_get_lowest_resolution(cipher_signature):
+    assert cipher_signature.streams.get_lowest_resolution().itag == 18