Merge pull request #558 from ritiek/pafy-prefer-secure-by-default

Pafy prefer secure HTTPS by default

CHANGES.md

@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 -
 
+## [1.2.2] - 2019-06-03
+### Fixed
+- Patch bug in Pafy to prefer secure HTTPS ([@ritiek](https://github.com/ritiek)) (#558)
+
 ## [1.2.1] - 2019-04-28
 ### Fixed
 - Patch bug in Pafy when fetching audiostreams with latest youtube-dl ([@ritiek](https://github.com/ritiek)) (#539)

spotdl/__init__.py

@@ -1 +1 @@
-__version__ = "1.2.1"
+__version__ = "1.2.2"

spotdl/patcher.py

@@ -35,11 +35,21 @@ def _content_available(cls, url):
 
 
 class PatchPafy:
+    """
+    These patches have not been released by pafy on PyPI yet but
+    are useful to us.
+    """
     def patch_getbestthumb(self):
+        # https://github.com/mps-youtube/pafy/pull/211
         pafy.backend_shared.BasePafy._bestthumb = None
         pafy.backend_shared.BasePafy._content_available = _content_available
         pafy.backend_shared.BasePafy.getbestthumb = _getbestthumb
 
     def patch_process_streams(self):
+        # https://github.com/mps-youtube/pafy/pull/230
         backend_youtube_dl.YtdlPafy._old_process_streams = backend_youtube_dl.YtdlPafy._process_streams
         backend_youtube_dl.YtdlPafy._process_streams = _process_streams
+
+    def patch_insecure_streams(self):
+        # https://github.com/mps-youtube/pafy/pull/235
+        pafy.g.def_ydl_opts["prefer_insecure"] = False

spotdl/youtube_tools.py

@@ -21,6 +21,7 @@
     pafy_patcher = patcher.PatchPafy()
     pafy_patcher.patch_getbestthumb()
     pafy_patcher.patch_process_streams()
+    pafy_patcher.patch_insecure_streams()
 
 
 def set_api_key():

test/test_spotify_tools.py

@@ -115,7 +115,7 @@ def test_write_playlist(tmpdir):
     assert tracks == expect_tracks
 
 
-# XXX: Mock this test off if it fails in future
+# XXX: Monkeypatch these tests if they fail in future
 class TestFetchAlbum:
     @pytest.fixture(scope="module")
     def album_fixture(self):
@@ -131,7 +131,7 @@ def test_tracks(self, album_fixture):
         assert album_fixture["tracks"]["total"] == 15
 
 
-# XXX: Mock this test off if it fails in future
+# XXX: Monkeypatch these tests if they fail in future
 class TestFetchAlbumsFromArtist:
     @pytest.fixture(scope="module")
     def albums_from_artist_fixture(self):
@@ -141,7 +141,7 @@ def albums_from_artist_fixture(self):
         return albums
 
     def test_len(self, albums_from_artist_fixture):
-        assert len(albums_from_artist_fixture) == 52
+        assert len(albums_from_artist_fixture) == 53
 
     def test_zeroth_album_name(self, albums_from_artist_fixture):
         assert albums_from_artist_fixture[0]["name"] == "Revolution Radio"