KevinMidboe/spotify-downloader
1
0
Fork 0
mirror of https://github.com/KevinMidboe/spotify-downloader.git synced 2025-12-08 20:39:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use enumerate, remove random usages of exit codes

Browse Source 
As per the documentation for `sys.exit` most codes besides 0 and 1 are underdeveloped and produce mostly undefined results. Nothing wrong with sticking to the safe route.
This commit is contained in:
Aareon Sullivan
2018-01-14 13:54:00 -08:00
committed by GitHub
parent 66e16e4b33
commit beafd4e446
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spotdl.py
View File

@@ -72,12 +72,11 @@ def grab_list(text_file):
except ValueError: except ValueError:
pass pass
log.info(u'Preparing to download {} songs'.format(len(lines))) log.info(u'Preparing to download {} songs'.format(len(lines)))
number = 1
for raw_song in lines: for number, raw_song in enumerate(lines):
print('') print('')
try: try:
grab_single(raw_song, number=number) grab_single(raw_song, number=number+1)
# token expires after 1 hour # token expires after 1 hour
except spotipy.client.SpotifyException: except spotipy.client.SpotifyException:
# refresh token when it expires # refresh token when it expires
@@ -100,7 +99,6 @@ def grab_list(text_file):
log.debug('Removing downloaded song from text file') log.debug('Removing downloaded song from text file')
internals.trim_song(text_file) internals.trim_song(text_file)
number += 1
def grab_playlist(playlist): def grab_playlist(playlist):
@@ -116,14 +114,14 @@ def grab_playlist(playlist):
except IndexError: except IndexError:
# Wrong format, in either case # Wrong format, in either case
log.error('The provided playlist URL is not in a recognized format!') log.error('The provided playlist URL is not in a recognized format!')
sys.exit(10) sys.exit(1)
playlist_id = splits[-1] playlist_id = splits[-1]
try: try:
spotify_tools.write_playlist(username, playlist_id) spotify_tools.write_playlist(username, playlist_id)
except spotipy.client.SpotifyException: except spotipy.client.SpotifyException:
log.error('Unable to find playlist') log.error('Unable to find playlist')
log.info('Make sure the playlist is set to publicly visible and then try again') log.info('Make sure the playlist is set to publicly visible and then try again')
sys.exit(11) sys.exit(1)
def grab_single(raw_song, number=None): def grab_single(raw_song, number=None):
@@ -221,4 +219,4 @@ if __name__ == '__main__':
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
log.exception(e) log.exception(e)
sys.exit(3) sys.exit(1)