Merge pull request #1378 from spotDL/dev

Publish v3.8.0
spotDL · Sep 6, 2021 · 41496bd · 41496bd
2 parents a8eef6e + 7859272
commit 41496bd
Show file tree

Hide file tree

Showing 11 changed files with 54,730 additions and 53,497 deletions.
diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md
@@ -21,7 +21,7 @@ When installing Python, ensure to select "**Add to PATH**".
 
 - [Windows Tutorial](https://windowsloop.com/install-ffmpeg-windows-10/)
 - OSX - `brew install ffmpeg`
-- Linux - `sudo snap install ffmpeg`
+- Linux - `sudo apt install ffmpeg` or use your distros package manager
 
 ### Verifying Versions
 

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-version = 3.7.2
+version = 3.8.0
 
 name = spotdl
 url = https://github.com/spotDL/spotify-downloader
@@ -28,13 +28,13 @@ classifiers =
 [options]
 include_package_data = true
 install_requires =
-    spotipy
-    pytube
+    spotipy >= 2.19.0
+    pytube >= 11.0.0
     rich
     rapidfuzz
     mutagen
     ytmusicapi
-    youtube_dl
+    yt-dlp
     tqdm
     beautifulsoup4
     requests

diff --git a/spotdl/download/downloader.py b/spotdl/download/downloader.py
@@ -5,7 +5,7 @@
 import concurrent.futures
 
 from pathlib import Path
-from youtube_dl import YoutubeDL
+from yt_dlp import YoutubeDL
 from typing import List, Optional
 
 from spotdl.search import SongObject

diff --git a/spotdl/providers/provider_utils.py b/spotdl/providers/provider_utils.py
@@ -126,7 +126,7 @@ def _get_smaller_file_path(input_song, output_format: str) -> Path:
 
     try:
         return Path(f"{smaller_name}.{output_format}").resolve()
-    except (OSError, WindowsError):
+    except OSError:
         # Expected to happen in the rare case when the saved path is too long,
         # even with the short filename
         raise OSError("Cannot save song due to path issues.")
@@ -166,7 +166,7 @@ def _get_converted_file_path(song_obj, output_format: str = None) -> Path:
         if len(str(converted_file_path.resolve().name)) > 256:
             print("Path was too long. Using Small Path.")
             return _get_smaller_file_path(song_obj, output_format)
-    except (OSError, WindowsError):
+    except OSError:
         return _get_smaller_file_path(song_obj, output_format)
 
     return converted_file_path
diff --git a/tests/cassettes/test_download_a_playlist.yaml b/tests/cassettes/test_download_a_playlist.yaml
diff --git a/tests/cassettes/test_download_a_single_song.yaml b/tests/cassettes/test_download_a_single_song.yaml
diff --git a/tests/cassettes/test_download_an_album.yaml b/tests/cassettes/test_download_an_album.yaml
diff --git a/tests/cassettes/test_download_long_artists_song.yaml b/tests/cassettes/test_download_long_artists_song.yaml
diff --git a/tests/cassettes/test_download_single_song.yaml b/tests/cassettes/test_download_single_song.yaml
diff --git a/tests/cassettes/test_multiple_elements.yaml b/tests/cassettes/test_multiple_elements.yaml
diff --git a/tests/cassettes/test_search_and_download.yaml b/tests/cassettes/test_search_and_download.yaml
@@ -7,7 +7,7 @@ interactions:
       Accept-Encoding:
       - gzip, deflate
       Authorization:
-      - Bearer BQBbSe1hJOnpkb4G2InTMhA2mE7A3uZ05jxOiHTHKUNJlqUPy0mFp-z7-01Xe0NC_Ldg7uZrycpwAafON5c
+      - Bearer BQAZWdfkrJFAjE_JkZzWo0qEVvfs8s1lJyQ5JfACHhyqE8TcFYily0YtM1ssFOWV_So9JTEDgcP7vzoVkLw
       Connection:
       - keep-alive
       Content-Type:
@@ -48,7 +48,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Mon, 26 Jul 2021 23:10:26 GMT
+      - Tue, 24 Aug 2021 22:59:17 GMT
       server:
       - envoy
       strict-transport-security: