From d8fa13aa59b5667076ad54974c4fe70b2034bde9 Mon Sep 17 00:00:00 2001 From: Dante Date: Sun, 19 May 2019 05:41:37 -0300 Subject: [PATCH 1/3] Fixing download error when track name has weird symbols on windows --- soundscrape/soundscrape.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soundscrape/soundscrape.py b/soundscrape/soundscrape.py index 33cf39b..fc7ced9 100755 --- a/soundscrape/soundscrape.py +++ b/soundscrape/soundscrape.py @@ -626,7 +626,7 @@ def scrape_bandcamp_url(url, num_tracks=sys.maxsize, folders=False, custom_path= puts_safe(colored.yellow("Track unavailble for scraping: ") + colored.white(track_name)) continue - puts_safe(colored.green("Downloading") + colored.white(": " + track_name)) + puts_safe(colored.green("Downloading") + colored.white(f': {track_name}'.encode('utf-8', errors='replace'))) path = download_file(track['file']['mp3-128'], path) album_year = album_data['album_release_date'] From f4c044e09452a33fab3f2e632fb26f7aea97f97d Mon Sep 17 00:00:00 2001 From: Dante Date: Sun, 19 May 2019 06:25:58 -0300 Subject: [PATCH 2/3] Better fix download error when track name has weird symbols on windows --- soundscrape/soundscrape.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soundscrape/soundscrape.py b/soundscrape/soundscrape.py index fc7ced9..5c07314 100755 --- a/soundscrape/soundscrape.py +++ b/soundscrape/soundscrape.py @@ -626,7 +626,7 @@ def scrape_bandcamp_url(url, num_tracks=sys.maxsize, folders=False, custom_path= puts_safe(colored.yellow("Track unavailble for scraping: ") + colored.white(track_name)) continue - puts_safe(colored.green("Downloading") + colored.white(f': {track_name}'.encode('utf-8', errors='replace'))) + puts_safe(colored.green("Downloading") + colored.white(': ' + track_name)) path = download_file(track['file']['mp3-128'], path) album_year = album_data['album_release_date'] @@ -1314,7 +1314,7 @@ def puts_safe(text): if sys.version_info < (3,0,0): puts(text) else: - puts(text.encode(sys.stdout.encoding, errors='replace').decode()) + puts(text.encode('ascii', errors='replace').decode()) else: puts(text) From 44350a51e8fb023d241c1387ea56834e01e1834e Mon Sep 17 00:00:00 2001 From: Dante Date: Sun, 19 May 2019 06:32:38 -0300 Subject: [PATCH 3/3] Fix ' should be " --- soundscrape/soundscrape.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soundscrape/soundscrape.py b/soundscrape/soundscrape.py index 5c07314..4747bc9 100755 --- a/soundscrape/soundscrape.py +++ b/soundscrape/soundscrape.py @@ -626,7 +626,7 @@ def scrape_bandcamp_url(url, num_tracks=sys.maxsize, folders=False, custom_path= puts_safe(colored.yellow("Track unavailble for scraping: ") + colored.white(track_name)) continue - puts_safe(colored.green("Downloading") + colored.white(': ' + track_name)) + puts_safe(colored.green("Downloading") + colored.white(": " + track_name)) path = download_file(track['file']['mp3-128'], path) album_year = album_data['album_release_date']