Removed references to sp from function calls in QueueManager
This commit is contained in:
parent
5e735cdbe7
commit
38a16d9fdd
|
@ -1,3 +1,3 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
__version__ = "1.3.1"
|
__version__ = "1.3.2"
|
||||||
|
|
|
@ -88,7 +88,7 @@ class QueueManager:
|
||||||
albumAPI['nb_disk'] = albumAPI_gw['NUMBER_DISK']
|
albumAPI['nb_disk'] = albumAPI_gw['NUMBER_DISK']
|
||||||
albumAPI['copyright'] = albumAPI_gw['COPYRIGHT']
|
albumAPI['copyright'] = albumAPI_gw['COPYRIGHT']
|
||||||
if albumAPI['nb_tracks'] == 1:
|
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)
|
settings, bitrate, albumAPI)
|
||||||
tracksArray = dz.get_album_tracks_gw(id)
|
tracksArray = dz.get_album_tracks_gw(id)
|
||||||
if albumAPI['nb_tracks'] == 255:
|
if albumAPI['nb_tracks'] == 255:
|
||||||
|
@ -178,7 +178,7 @@ class QueueManager:
|
||||||
artistAPITracks = dz.get_artist_albums(id)
|
artistAPITracks = dz.get_artist_albums(id)
|
||||||
albumList = []
|
albumList = []
|
||||||
for album in artistAPITracks['data']:
|
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:
|
if interface:
|
||||||
interface.send("finishAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']})
|
interface.send("finishAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']})
|
||||||
|
@ -200,7 +200,7 @@ class QueueManager:
|
||||||
for type in artistDiscographyAPI:
|
for type in artistDiscographyAPI:
|
||||||
if type != 'all':
|
if type != 'all':
|
||||||
for album in artistDiscographyAPI[type]:
|
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:
|
if interface:
|
||||||
interface.send("finishAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']})
|
interface.send("finishAddingArtist", {'name': artistAPI['name'], 'id': artistAPI['id']})
|
||||||
|
@ -284,7 +284,7 @@ class QueueManager:
|
||||||
return QueueError(url, "Something went wrong: "+str(e))
|
return QueueError(url, "Something went wrong: "+str(e))
|
||||||
|
|
||||||
if track_id != "0":
|
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:
|
else:
|
||||||
logger.warn("Track not found on deezer!")
|
logger.warn("Track not found on deezer!")
|
||||||
return QueueError(url, "Track not found on deezer!", "trackNotOnDeezer")
|
return QueueError(url, "Track not found on deezer!", "trackNotOnDeezer")
|
||||||
|
@ -302,7 +302,7 @@ class QueueManager:
|
||||||
return QueueError(url, "Something went wrong: "+str(e))
|
return QueueError(url, "Something went wrong: "+str(e))
|
||||||
|
|
||||||
if album_id != "0":
|
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:
|
else:
|
||||||
logger.warn("Album not found on deezer!")
|
logger.warn("Album not found on deezer!")
|
||||||
return QueueError(url, "Album not found on deezer!", "albumNotOnDeezer")
|
return QueueError(url, "Album not found on deezer!", "albumNotOnDeezer")
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -7,7 +7,7 @@ README = (HERE / "README.md").read_text()
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="deemix",
|
name="deemix",
|
||||||
version="1.3.1",
|
version="1.3.2",
|
||||||
description="A barebone deezer downloader library",
|
description="A barebone deezer downloader library",
|
||||||
long_description=README,
|
long_description=README,
|
||||||
long_description_content_type="text/markdown",
|
long_description_content_type="text/markdown",
|
||||||
|
|
Loading…
Reference in New Issue