Release v3.9.6

spotDL · May 11, 2022 · d20a906 · d20a906
2 parents 4bc6ec3 + 4c43882
commit d20a906
Show file tree

Hide file tree

Showing 10 changed files with 32,990 additions and 37,328 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3-alpine
 
 # Install ffmpeg and g++
-RUN apk add --no-cache ffmpeg g++
+RUN apk add --no-cache ffmpeg g++ git
 
 # Create project directory
 WORKDIR /app
@@ -17,6 +17,11 @@ RUN pip install --no-cache-dir .
 
 # Create music directory
 RUN mkdir /music
+
+# Create a volume for the output directory
+VOLUME /music
+
+# Change CWD to /music
 WORKDIR /music
 
 # Entrypoint command

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-version = 3.9.5
+version = 3.9.6
 
 name = spotdl
 url = https://github.com/spotDL/spotify-downloader
@@ -38,6 +38,7 @@ install_requires =
     beautifulsoup4
     requests
     Unidecode
+    setuptools
 python_requires = >=3.6.1
 packages = find:
 
@@ -51,8 +52,10 @@ test =
     pytest-subprocess
 dev =
     tox
-    mypy==0.790
-    flake8==3.8.4
+    mypy
+    flake8
+    types-setuptools
+    types-requests
 
 [options.entry_points]
 console_scripts=

diff --git a/spotdl/providers/ytm_provider.py b/spotdl/providers/ytm_provider.py
@@ -46,7 +46,7 @@ def search_and_get_best_match(
         if len(isrc_results) == 1:
             isrc_result = isrc_results[0]
 
-            name_match = isrc_result["name"].lower() == song_name.lower()
+            name_match = _match_percentage(isrc_result["name"].lower(), song_name.lower())
 
             delta = isrc_result["length"] - song_duration
             non_match_value = (delta**2) / song_duration * 100
@@ -56,7 +56,7 @@ def search_and_get_best_match(
             if (
                 isrc_result is not None
                 and "link" in isrc_result
-                and name_match
+                and name_match > 90
                 and time_match > 90
             ):
                 return isrc_result["link"]

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, br
       Authorization:
-      - Bearer BQBsPxGhEDptm5mNPjcO7_XSAY_Z9G8_dYmSSWS-mtvVRsHLZNsPYchwvV5dyANKPJ8HrZJPv51XFNSfmmc
+      - Bearer BQBskKQmL-xSqawTL0YTQysg0DoIEraX_-DmeQ7-1Up7YcqXT-aSrQWFUH_r9PF7iy47lkguKbzzcMHWM1U
       Connection:
       - keep-alive
       Content-Type:
@@ -25,7 +25,7 @@ interactions:
         5mk3fQEAAP//AwArFp7t9AAAAA==
     headers:
       Alt-Svc:
-      - clear
+      - h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
       Transfer-Encoding:
       - chunked
       Via:
@@ -48,7 +48,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Thu, 14 Apr 2022 14:13:31 GMT
+      - Wed, 11 May 2022 13:54:11 GMT
       server:
       - envoy
       strict-transport-security: