rdelaage
/
zspotify
mirror of https://github.com/afkcodes/zspotify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix infinite loop

This commit is contained in:
davidsalido 2021-10-24 17:11:01 +00:00 committed by GitHub
parent a3e27d4f2a
commit 85344f573c
1 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/app.py
View File

@ -27,45 +27,18 @@ def client() -> None:
print('[ DETECTED FREE ACCOUNT - USING HIGH QUALITY ]\n\n') print('[ DETECTED FREE ACCOUNT - USING HIGH QUALITY ]\n\n')
ZSpotify.DOWNLOAD_QUALITY = AudioQuality.HIGH ZSpotify.DOWNLOAD_QUALITY = AudioQuality.HIGH
while True: if len(sys.argv) > 1:
if len(sys.argv) > 1: if sys.argv[1] == '-p' or sys.argv[1] == '--playlist':
if sys.argv[1] == '-p' or sys.argv[1] == '--playlist': download_from_user_playlist()
download_from_user_playlist() elif sys.argv[1] == '-ls' or sys.argv[1] == '--liked-songs':
elif sys.argv[1] == '-ls' or sys.argv[1] == '--liked-songs': for song in get_saved_tracks():
for song in get_saved_tracks(): if not song[TRACK][NAME]:
if not song[TRACK][NAME]: print('### SKIPPING: SONG DOES NOT EXISTS ON SPOTIFY ANYMORE ###')
print('### SKIPPING: SONG DOES NOT EXISTS ON SPOTIFY ANYMORE ###') else:
else: download_track(song[TRACK][ID], 'Liked Songs/')
download_track(song[TRACK][ID], 'Liked Songs/') print('\n')
print('\n')
else:
track_id, album_id, playlist_id, episode_id, show_id, artist_id = regex_input_for_urls(sys.argv[1])
if track_id is not None:
download_track(track_id)
elif artist_id is not None:
download_artist_albums(artist_id)
elif album_id is not None:
download_album(album_id)
elif playlist_id is not None:
playlist_songs = get_playlist_songs(playlist_id)
name, _ = get_playlist_info(playlist_id)
for song in playlist_songs:
download_track(song[TRACK][ID],
sanitize_data(name) + '/')
print('\n')
elif episode_id is not None:
download_episode(episode_id)
elif show_id is not None:
for episode in get_show_episodes(show_id):
download_episode(episode)
else: else:
search_text = '' track_id, album_id, playlist_id, episode_id, show_id, artist_id = regex_input_for_urls(sys.argv[1])
while len(search_text) == 0:
search_text = input('Enter search or URL: ')
track_id, album_id, playlist_id, episode_id, show_id, artist_id = regex_input_for_urls(search_text)
if track_id is not None: if track_id is not None:
download_track(track_id) download_track(track_id)
@ -77,16 +50,41 @@ def client() -> None:
playlist_songs = get_playlist_songs(playlist_id) playlist_songs = get_playlist_songs(playlist_id)
name, _ = get_playlist_info(playlist_id) name, _ = get_playlist_info(playlist_id)
for song in playlist_songs: for song in playlist_songs:
download_track(song[TRACK][ID], sanitize_data(name) + '/') download_track(song[TRACK][ID],
sanitize_data(name) + '/')
print('\n') print('\n')
elif episode_id is not None: elif episode_id is not None:
download_episode(episode_id) download_episode(episode_id)
elif show_id is not None: elif show_id is not None:
for episode in get_show_episodes(show_id): for episode in get_show_episodes(show_id):
download_episode(episode) download_episode(episode)
else:
search(search_text) else:
# wait() search_text = ''
while len(search_text) == 0:
search_text = input('Enter search or URL: ')
track_id, album_id, playlist_id, episode_id, show_id, artist_id = regex_input_for_urls(search_text)
if track_id is not None:
download_track(track_id)
elif artist_id is not None:
download_artist_albums(artist_id)
elif album_id is not None:
download_album(album_id)
elif playlist_id is not None:
playlist_songs = get_playlist_songs(playlist_id)
name, _ = get_playlist_info(playlist_id)
for song in playlist_songs:
download_track(song[TRACK][ID], sanitize_data(name) + '/')
print('\n')
elif episode_id is not None:
download_episode(episode_id)
elif show_id is not None:
for episode in get_show_episodes(show_id):
download_episode(episode)
else:
search(search_text)
def search(search_term): def search(search_term):