From b7224d55159e051a8bee5d91318c5ea91d968c40 Mon Sep 17 00:00:00 2001 From: vitiko98 Date: Sat, 12 Dec 2020 17:40:52 -0400 Subject: [PATCH] Fix string formatting on folder names --- qobuz_dl/__init__.py | 2 +- qobuz_dl/commands.py | 2 +- qobuz_dl/downloader.py | 12 ++++++++++-- setup.py | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/qobuz_dl/__init__.py b/qobuz_dl/__init__.py index c88afc3..b08c1c5 100644 --- a/qobuz_dl/__init__.py +++ b/qobuz_dl/__init__.py @@ -1,2 +1,2 @@ -from .cli import main from .qopy import Client +from .cli import main diff --git a/qobuz_dl/commands.py b/qobuz_dl/commands.py index af581a6..fed8e07 100644 --- a/qobuz_dl/commands.py +++ b/qobuz_dl/commands.py @@ -92,7 +92,7 @@ def qobuz_dl_args( "-n", "--number", metavar="int", - default=default_limit, + default=1, help="number of results to download (default: 1)", ) add_common_arg(lucky) diff --git a/qobuz_dl/downloader.py b/qobuz_dl/downloader.py index 282902b..459860b 100644 --- a/qobuz_dl/downloader.py +++ b/qobuz_dl/downloader.py @@ -143,7 +143,11 @@ def download_id_by_type(client, item_id, path, quality, album=False, embed_art=F if album: meta = client.get_album_meta(item_id) try: - album_title = "{} ({})".format(meta["title"], meta["version"]) + album_title = ( + ("{} ({})".format(meta["title"], meta["version"])) + if meta["version"] + else meta["title"] + ) except KeyError: album_title = meta["title"] print("\nDownloading: {}\n".format(album_title)) @@ -188,7 +192,11 @@ def download_id_by_type(client, item_id, path, quality, album=False, embed_art=F if "sample" not in parse and parse["sampling_rate"]: meta = client.get_track_meta(item_id) try: - track_title = "{} ({})".format(meta["title"], meta["version"]) + track_title = ( + ("{} ({})".format(meta["title"], meta["version"])) + if meta["version"] + else meta["title"] + ) except KeyError: track_title = meta["title"] print("\nDownloading: {}\n".format(track_title)) diff --git a/setup.py b/setup.py index 433357d..1c66fd1 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ if os.name == "nt" or "win" in sys.platform: setup( name=pkg_name, - version="0.5.3", + version="0.5.4.1", author="Vitiko", author_email="vhnz98@gmail.com", description="The complete Lossless and Hi-Res music downloader for Qobuz",