From 70a4d4b33818fb30201094ee00a1f418a04c25a6 Mon Sep 17 00:00:00 2001 From: iRet Date: Sat, 13 Mar 2021 04:40:55 +0700 Subject: [PATCH 1/3] Fix cover art based on pauloup:fixcoverart --- spotify_ripper/tags.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/spotify_ripper/tags.py b/spotify_ripper/tags.py index 7d2cc3d..debc788 100644 --- a/spotify_ripper/tags.py +++ b/spotify_ripper/tags.py @@ -10,6 +10,7 @@ import os import sys import base64 +import urllib def set_metadata_tags(args, audio_file, idx, track, ripper): @@ -65,16 +66,19 @@ def set_metadata_tags(args, audio_file, idx, track, ripper): genres_ascii = [to_ascii(genre) for genre in genres] # cover art image - image = None - if args.large_cover_art: - image = ripper.web.get_large_coverart(track.link.uri) + def get_cover_image(image_link): + image_link = 'https://i.scdn.co%s' % ( + image_link[len('spotify'):].replace(':', '/')) + cover_file = urllib.urlretrieve(image_link)[0] + + with open(cover_file, "rb") as f: + if f.mode == "rb": + return f.read() + else: + return None - # if we fail, use regular cover size - if image is None: - image = track.album.cover() - if image is not None: - image.load(args.timeout) - image = image.data + image_link = str(track.album.cover(2).link) + image = get_cover_image(image_link) def tag_to_ascii(_str, _str_ascii): return _str if args.ascii_path_only else _str_ascii From 7aa4c38a96b6b45caf0d328e9c5eba6a3015dce3 Mon Sep 17 00:00:00 2001 From: iRet Date: Sat, 13 Mar 2021 04:45:33 +0700 Subject: [PATCH 2/3] Bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ba8f599..095d77d 100755 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ def _read(fn): setup( name='spotify-ripper', - version='2.15', + version='2.17', packages=find_packages(exclude=["tests"]), #scripts=['spotify_ripper/main.py'], include_package_data=True, From b636c1669a441cb8cdf6b8c32c4830508dd9e556 Mon Sep 17 00:00:00 2001 From: iRet Date: Sat, 13 Mar 2021 05:00:20 +0700 Subject: [PATCH 3/3] Fix urllib call --- spotify_ripper/tags.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spotify_ripper/tags.py b/spotify_ripper/tags.py index debc788..baa7ffa 100644 --- a/spotify_ripper/tags.py +++ b/spotify_ripper/tags.py @@ -10,7 +10,7 @@ import os import sys import base64 -import urllib +import urllib.request def set_metadata_tags(args, audio_file, idx, track, ripper): @@ -69,7 +69,7 @@ def set_metadata_tags(args, audio_file, idx, track, ripper): def get_cover_image(image_link): image_link = 'https://i.scdn.co%s' % ( image_link[len('spotify'):].replace(':', '/')) - cover_file = urllib.urlretrieve(image_link)[0] + cover_file = urllib.request.urlretrieve(image_link)[0] with open(cover_file, "rb") as f: if f.mode == "rb":