From 90ff48ab87be414f9b0822b36d797e6938fa1b6f Mon Sep 17 00:00:00 2001 From: RemixDev Date: Wed, 7 Oct 2020 21:27:41 +0200 Subject: [PATCH] Added "More Albums" to "All". Made artist download "All" category. All category doesn't include Featured in, you still need to use "/discography" for that --- deemix/__init__.py | 2 +- deemix/api/deezer.py | 1 + deemix/app/queuemanager.py | 5 +++-- setup.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/deemix/__init__.py b/deemix/__init__.py index b580c2a..fe091b4 100644 --- a/deemix/__init__.py +++ b/deemix/__init__.py @@ -1,3 +1,3 @@ #!/usr/bin/env python3 -__version__ = "1.5.9" +__version__ = "1.5.10" diff --git a/deemix/api/deezer.py b/deemix/api/deezer.py index 5eeb746..9928f5b 100755 --- a/deemix/api/deezer.py +++ b/deemix/api/deezer.py @@ -436,6 +436,7 @@ class Deezer: if not 'more' in result: result['more'] = [] result['more'].append(obj) + result['all'].append(obj) return result def search_main_gw(self, term): diff --git a/deemix/app/queuemanager.py b/deemix/app/queuemanager.py index 084a5aa..3ba7260 100644 --- a/deemix/app/queuemanager.py +++ b/deemix/app/queuemanager.py @@ -184,9 +184,10 @@ class QueueManager: if interface: interface.send("startAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']}) - artistAPITracks = dz.get_artist_albums(id) + artistDiscographyAPI = dz.get_artist_discography_gw(id, 100) + allReleases = artistDiscographyAPI.pop('all', None) albumList = [] - for album in artistAPITracks['data']: + for album in allReleases: albumList.append(self.generateAlbumQueueItem(dz, album['id'], settings, bitrate)) if interface: interface.send("finishAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']}) diff --git a/setup.py b/setup.py index 4e2684e..46fe69a 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ README = (HERE / "README.md").read_text() setup( name="deemix", - version="1.5.9", + version="1.5.10", description="A barebone deezer downloader library", long_description=README, long_description_content_type="text/markdown",