From 38a16d9fdd886368e1b213760e0b43d5b8556954 Mon Sep 17 00:00:00 2001 From: RemixDev Date: Mon, 14 Sep 2020 00:19:28 +0200 Subject: [PATCH] Removed references to sp from function calls in QueueManager --- deemix/__init__.py | 2 +- deemix/app/queuemanager.py | 10 +++++----- setup.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deemix/__init__.py b/deemix/__init__.py index 6cd6b07..06dac33 100644 --- a/deemix/__init__.py +++ b/deemix/__init__.py @@ -1,3 +1,3 @@ #!/usr/bin/env python3 -__version__ = "1.3.1" +__version__ = "1.3.2" diff --git a/deemix/app/queuemanager.py b/deemix/app/queuemanager.py index da4bf4b..f0bf981 100644 --- a/deemix/app/queuemanager.py +++ b/deemix/app/queuemanager.py @@ -88,7 +88,7 @@ class QueueManager: albumAPI['nb_disk'] = albumAPI_gw['NUMBER_DISK'] albumAPI['copyright'] = albumAPI_gw['COPYRIGHT'] if albumAPI['nb_tracks'] == 1: - return self.generateQueueItem(dz, sp, f"https://www.deezer.com/track/{albumAPI['tracks']['data'][0]['id']}", + return self.generateQueueItem(dz, f"https://www.deezer.com/track/{albumAPI['tracks']['data'][0]['id']}", settings, bitrate, albumAPI) tracksArray = dz.get_album_tracks_gw(id) if albumAPI['nb_tracks'] == 255: @@ -178,7 +178,7 @@ class QueueManager: artistAPITracks = dz.get_artist_albums(id) albumList = [] for album in artistAPITracks['data']: - albumList.append(self.generateQueueItem(dz, sp, album['link'], settings, bitrate)) + albumList.append(self.generateQueueItem(dz, album['link'], settings, bitrate)) if interface: interface.send("finishAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']}) @@ -200,7 +200,7 @@ class QueueManager: for type in artistDiscographyAPI: if type != 'all': for album in artistDiscographyAPI[type]: - albumList.append(self.generateQueueItem(dz, sp, album['link'], settings, bitrate)) + albumList.append(self.generateQueueItem(dz, album['link'], settings, bitrate)) if interface: interface.send("finishAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']}) @@ -284,7 +284,7 @@ class QueueManager: return QueueError(url, "Something went wrong: "+str(e)) if track_id != "0": - return self.generateQueueItem(dz, sp, f'https://www.deezer.com/track/{track_id}', settings, bitrate) + return self.generateQueueItem(dz, f'https://www.deezer.com/track/{track_id}', settings, bitrate) else: logger.warn("Track not found on deezer!") return QueueError(url, "Track not found on deezer!", "trackNotOnDeezer") @@ -302,7 +302,7 @@ class QueueManager: return QueueError(url, "Something went wrong: "+str(e)) if album_id != "0": - return self.generateQueueItem(dz, sp, f'https://www.deezer.com/album/{album_id}', settings, bitrate) + return self.generateQueueItem(dz, f'https://www.deezer.com/album/{album_id}', settings, bitrate) else: logger.warn("Album not found on deezer!") return QueueError(url, "Album not found on deezer!", "albumNotOnDeezer") diff --git a/setup.py b/setup.py index a2fd445..13ab44c 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ README = (HERE / "README.md").read_text() setup( name="deemix", - version="1.3.1", + version="1.3.2", description="A barebone deezer downloader library", long_description=README, long_description_content_type="text/markdown",