From 69728e21ee3b5e6104f4a30326eaa7b264669ea3 Mon Sep 17 00:00:00 2001 From: nathannathant <74019033+pynathanthomas@users.noreply.github.com> Date: Thu, 25 Feb 2021 13:58:04 -0800 Subject: [PATCH 1/6] fixed genre formatting issue --- qobuz_dl/metadata.py | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/qobuz_dl/metadata.py b/qobuz_dl/metadata.py index b3264e4..37162d7 100644 --- a/qobuz_dl/metadata.py +++ b/qobuz_dl/metadata.py @@ -30,6 +30,25 @@ def _format_copyright(s: str) -> str: return s +def _format_genres(genres: list) -> str: + '''Fixes the weirdly formatted genre lists returned by the API. + >>> g = ['Pop/Rock', 'Pop/Rock→Rock', 'Pop/Rock→Rock→Alternatif et Indé'] + >>> _format_genres(g) + 'Pop/Rock, Rock, Alternatif et Indé' + ''' + + if len(genres) <= 1: + return ''.join(genres) + + prev = genres[0] + new_genres = [prev] + for genre in genres[1:]: + new_genres.append(genre.replace(f'{prev}→', '')) + prev = genre + + return ', '.join(new_genres) + + # Use KeyError catching instead of dict.get to avoid empty tags def tag_flac(filename, root_dir, final_name, d, album, istrack=True, em_image=False): @@ -72,17 +91,17 @@ def tag_flac(filename, root_dir, final_name, d, album, pass if istrack: - audio["GENRE"] = ", ".join(d["album"]["genres_list"]) # GENRE - audio["ALBUMARTIST"] = d["album"]["artist"]["name"] # ALBUM ARTIST - audio["TRACKTOTAL"] = str(d["album"]["tracks_count"]) # TRACK TOTAL - audio["ALBUM"] = d["album"]["title"] # ALBUM TITLE + audio["GENRE"] = _format_genres(d["album"]["genres_list"]) # GENRE + audio["ALBUMARTIST"] = d["album"]["artist"]["name"] # ALBUMARTIST + audio["TRACKTOTAL"] = str(d["album"]["tracks_count"]) # TRACK TOTAL + audio["ALBUM"] = d["album"]["title"] # ALBUM TITLE audio["DATE"] = d["album"]["release_date_original"] audio["COPYRIGHT"] = _format_copyright(d["copyright"]) else: - audio["GENRE"] = ", ".join(album["genres_list"]) # GENRE - audio["ALBUMARTIST"] = album["artist"]["name"] # ALBUM ARTIST - audio["TRACKTOTAL"] = str(album["tracks_count"]) # TRACK TOTAL - audio["ALBUM"] = album["title"] # ALBUM TITLE + audio["GENRE"] = _format_genres(album["genres_list"]) # GENRE + audio["ALBUMARTIST"] = album["artist"]["name"] # ALBUM ARTIST + audio["TRACKTOTAL"] = str(album["tracks_count"]) # TRACK TOTAL + audio["ALBUM"] = album["title"] # ALBUM TITLE audio["DATE"] = album["release_date_original"] audio["COPYRIGHT"] = _format_copyright(album["copyright"]) @@ -161,14 +180,14 @@ def tag_mp3(filename, root_dir, final_name, d, album, tags['artist'] = album["artist"]["name"] if istrack: - tags["genre"] = ", ".join(d["album"]["genres_list"]) + tags["genre"] = _format_genres(d["album"]["genres_list"]) tags["albumartist"] = d["album"]["artist"]["name"] tags["album"] = d["album"]["title"] tags["date"] = d["album"]["release_date_original"] tags["copyright"] = _format_copyright(d["copyright"]) tracktotal = str(d["album"]["tracks_count"]) else: - tags["genre"] = ", ".join(album["genres_list"]) + tags["genre"] = _format_genres(album["genres_list"]) tags["albumartist"] = album["artist"]["name"] tags["album"] = album["title"] tags["date"] = album["release_date_original"] From 678910d2f3b2fea6ab25b3e3959354c111f17fea Mon Sep 17 00:00:00 2001 From: nathannathant <74019033+pynathanthomas@users.noreply.github.com> Date: Thu, 25 Feb 2021 14:00:48 -0800 Subject: [PATCH 2/6] misc --- qobuz_dl/downloader.py | 27 ++++++++++++++++++--------- qobuz_dl/metadata.py | 14 ++++---------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/qobuz_dl/downloader.py b/qobuz_dl/downloader.py index ad1a25b..d42bd91 100644 --- a/qobuz_dl/downloader.py +++ b/qobuz_dl/downloader.py @@ -141,7 +141,8 @@ def download_and_tag( if artist or album_artist: new_track_title = ( - f"{artist if artist else album_artist}" f' - {track_metadata["title"]}' + f"{artist if artist else album_artist}" + f' - {track_metadata["title"]}' ) if version: new_track_title = f"{new_track_title} ({version})" @@ -215,11 +216,13 @@ def download_id_by_type( album_format, quality_met = get_format(client, meta, quality) if not downgrade_quality and not quality_met: logger.info( - f"{OFF}Skipping {album_title} as doesn't met quality requirement" + f"{OFF}Skipping {album_title} as it doesn't " + "meet quality requirement" ) return - logger.info(f"\n{YELLOW}Downloading: {album_title}\nQuality: {album_format}\n") + logger.info(f"\n{YELLOW}Downloading: {album_title}\n" + f"Quality: {album_format}\n") dirT = ( meta["artist"]["name"], album_title, @@ -233,14 +236,16 @@ def download_id_by_type( if no_cover: logger.info(f"{OFF}Skipping cover") else: - get_extra(meta["image"]["large"], dirn, og_quality=cover_og_quality) + get_extra(meta["image"]["large"], dirn, + og_quality=cover_og_quality) if "goodies" in meta: try: get_extra(meta["goodies"][0]["url"], dirn, "booklet.pdf") except: # noqa pass - media_numbers = [track["media_number"] for track in meta["tracks"]["items"]] + media_numbers = [track["media_number"] for track in + meta["tracks"]["items"]] is_multiple = True if len([*{*media_numbers}]) > 1 else False for i in meta["tracks"]["items"]: parse = client.get_track_url(i["id"], quality) @@ -267,10 +272,12 @@ def download_id_by_type( meta = client.get_track_meta(item_id) track_title = get_title(meta) logger.info(f"\n{YELLOW}Downloading: {track_title}") - track_format, quality_met = get_format(client, meta, quality, True, parse) + track_format, quality_met = get_format(client, meta, + quality, True, parse) if not downgrade_quality and not quality_met: logger.info( - f"{OFF}Skipping {track_title} as doesn't met quality requirement" + f"{OFF}Skipping {track_title} as it doesn't " + "meet quality requirement" ) return dirT = ( @@ -286,10 +293,12 @@ def download_id_by_type( logger.info(f"{OFF}Skipping cover") else: get_extra( - meta["album"]["image"]["large"], dirn, og_quality=cover_og_quality + meta["album"]["image"]["large"], dirn, + og_quality=cover_og_quality ) is_mp3 = True if int(quality) == 5 else False - download_and_tag(dirn, count, parse, meta, meta, True, is_mp3, embed_art) + download_and_tag(dirn, count, parse, meta, + meta, True, is_mp3, embed_art) else: logger.info(f"{OFF}Demo. Skipping") logger.info(f"{GREEN}Completed") diff --git a/qobuz_dl/metadata.py b/qobuz_dl/metadata.py index 37162d7..4fec874 100644 --- a/qobuz_dl/metadata.py +++ b/qobuz_dl/metadata.py @@ -37,16 +37,10 @@ def _format_genres(genres: list) -> str: 'Pop/Rock, Rock, Alternatif et Indé' ''' - if len(genres) <= 1: - return ''.join(genres) - - prev = genres[0] - new_genres = [prev] - for genre in genres[1:]: - new_genres.append(genre.replace(f'{prev}→', '')) - prev = genre - - return ', '.join(new_genres) + if genres == []: + return '' + else: + return ', '.join(genres[-1].split("→")) # Use KeyError catching instead of dict.get to avoid empty tags From c9e6eb13a6ddbbc7417715a1410c9b2b241cf8cc Mon Sep 17 00:00:00 2001 From: nathannathant <74019033+pynathanthomas@users.noreply.github.com> Date: Thu, 25 Feb 2021 21:03:42 -0800 Subject: [PATCH 3/6] changed unicode arrow symbol to ascii code --- qobuz_dl/metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qobuz_dl/metadata.py b/qobuz_dl/metadata.py index 4fec874..fe2fbf1 100644 --- a/qobuz_dl/metadata.py +++ b/qobuz_dl/metadata.py @@ -40,7 +40,7 @@ def _format_genres(genres: list) -> str: if genres == []: return '' else: - return ', '.join(genres[-1].split("→")) + return ', '.join(genres[-1].split('\u2192')) # Use KeyError catching instead of dict.get to avoid empty tags From c7e2d0007b843845122422b7b75a95d693ecc642 Mon Sep 17 00:00:00 2001 From: nathannathant <74019033+pynathanthomas@users.noreply.github.com> Date: Thu, 25 Feb 2021 21:09:38 -0800 Subject: [PATCH 4/6] formatting --- qobuz_dl/metadata.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qobuz_dl/metadata.py b/qobuz_dl/metadata.py index fe2fbf1..8d594a2 100644 --- a/qobuz_dl/metadata.py +++ b/qobuz_dl/metadata.py @@ -85,17 +85,17 @@ def tag_flac(filename, root_dir, final_name, d, album, pass if istrack: - audio["GENRE"] = _format_genres(d["album"]["genres_list"]) # GENRE - audio["ALBUMARTIST"] = d["album"]["artist"]["name"] # ALBUMARTIST - audio["TRACKTOTAL"] = str(d["album"]["tracks_count"]) # TRACK TOTAL - audio["ALBUM"] = d["album"]["title"] # ALBUM TITLE + audio["GENRE"] = _format_genres(d["album"]["genres_list"]) + audio["ALBUMARTIST"] = d["album"]["artist"]["name"] + audio["TRACKTOTAL"] = str(d["album"]["tracks_count"]) + audio["ALBUM"] = d["album"]["title"] audio["DATE"] = d["album"]["release_date_original"] audio["COPYRIGHT"] = _format_copyright(d["copyright"]) else: - audio["GENRE"] = _format_genres(album["genres_list"]) # GENRE - audio["ALBUMARTIST"] = album["artist"]["name"] # ALBUM ARTIST - audio["TRACKTOTAL"] = str(album["tracks_count"]) # TRACK TOTAL - audio["ALBUM"] = album["title"] # ALBUM TITLE + audio["GENRE"] = _format_genres(album["genres_list"]) + audio["ALBUMARTIST"] = album["artist"]["name"] + audio["TRACKTOTAL"] = str(album["tracks_count"]) + audio["ALBUM"] = album["title"] audio["DATE"] = album["release_date_original"] audio["COPYRIGHT"] = _format_copyright(album["copyright"]) From bdb98bb59e4bf14298246a3baa2ea2941652db8d Mon Sep 17 00:00:00 2001 From: nathannathant <74019033+pynathanthomas@users.noreply.github.com> Date: Thu, 25 Feb 2021 21:21:44 -0800 Subject: [PATCH 5/6] Change formatting to suppress linter warnings --- qobuz_dl/downloader.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/qobuz_dl/downloader.py b/qobuz_dl/downloader.py index d42bd91..192c293 100644 --- a/qobuz_dl/downloader.py +++ b/qobuz_dl/downloader.py @@ -30,13 +30,15 @@ def tqdm_download(url, fname, track_name): def get_description(u: dict, track_title, multiple=None): - downloading_title = f'{track_title} [{u["bit_depth"]}/{u["sampling_rate"]}]' + downloading_title = f'{track_title} ' + f'[{u["bit_depth"]}/{u["sampling_rate"]}]' if multiple: downloading_title = f"[Disc {multiple}] {downloading_title}" return downloading_title -def get_format(client, item_dict, quality, is_track_id=False, track_url_dict=None): +def get_format(client, item_dict, quality, + is_track_id=False, track_url_dict=None): quality_met = True if int(quality) == 5: return "MP3", quality_met @@ -53,7 +55,8 @@ def get_format(client, item_dict, quality, is_track_id=False, track_url_dict=Non restrictions = new_track_dict.get("restrictions") if isinstance(restrictions, list): if any( - restriction.get("code") == QL_DOWNGRADE for restriction in restrictions + restriction.get("code") == QL_DOWNGRADE + for restriction in restrictions ): quality_met = False if ( @@ -62,7 +65,8 @@ def get_format(client, item_dict, quality, is_track_id=False, track_url_dict=Non ): return "FLAC", quality_met return ( - f'{new_track_dict["bit_depth"]}B-{new_track_dict["sampling_rate"]}Khz', + f'{new_track_dict["bit_depth"]}B-' + f'{new_track_dict["sampling_rate"]}Khz', quality_met, ) except (KeyError, requests.exceptions.HTTPError): @@ -112,7 +116,7 @@ def download_and_tag( :param int tmp_count: Temporal download file number :param dict track_url_dict: get_track_url dictionary from Qobuz client :param dict track_metadata: Track item dictionary from Qobuz client - :param dict album_or_track_metadata: Album/track dictionary from Qobuz client + :param dict album_or_track_metadata: Album/track dict from Qobuz client :param bool is_track :param bool is_mp3 :param bool embed_art: Embed cover art into file (FLAC-only) @@ -135,7 +139,8 @@ def download_and_tag( # Determine the filename artist = track_metadata.get("performer", {}).get("name") - album_artist = track_metadata.get("album", {}).get("artist", {}).get("name") + album_artist = track_metadata.get("album", {}).get("artist", + {}).get("name") new_track_title = track_metadata.get("title") version = track_metadata.get("version") @@ -148,7 +153,8 @@ def download_and_tag( new_track_title = f"{new_track_title} ({version})" track_file = f'{track_metadata["track_number"]:02}. {new_track_title}' - final_file = os.path.join(root_dir, sanitize_filename(track_file))[:250] + extension + final_file = os.path.join(root_dir, sanitize_filename(track_file))[:250] + + extension if os.path.isfile(final_file): logger.info(f"{OFF}{new_track_title} was already downloaded") @@ -286,7 +292,9 @@ def download_id_by_type( meta["album"]["release_date_original"].split("-")[0], track_format, ) - sanitized_title = sanitize_filename("{} - {} [{}] [{}]".format(*dirT)) + sanitized_title = sanitize_filename( + "{} - {} [{}] [{}]".format(*dirT) + ) dirn = os.path.join(path, sanitized_title) os.makedirs(dirn, exist_ok=True) if no_cover: From e03d3aa97fc46d3a573bd0e54e2a3b0113bab9a0 Mon Sep 17 00:00:00 2001 From: nathannathant <74019033+pynathanthomas@users.noreply.github.com> Date: Thu, 25 Feb 2021 21:35:47 -0800 Subject: [PATCH 6/6] fixed + operator error --- qobuz_dl/downloader.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qobuz_dl/downloader.py b/qobuz_dl/downloader.py index 192c293..86dde5a 100644 --- a/qobuz_dl/downloader.py +++ b/qobuz_dl/downloader.py @@ -153,8 +153,7 @@ def download_and_tag( new_track_title = f"{new_track_title} ({version})" track_file = f'{track_metadata["track_number"]:02}. {new_track_title}' - final_file = os.path.join(root_dir, sanitize_filename(track_file))[:250] - + extension + final_file = os.path.join(root_dir, sanitize_filename(track_file))[:250] + extension if os.path.isfile(final_file): logger.info(f"{OFF}{new_track_title} was already downloaded")