From c270aa836595caa866eae2e735faf57fbd11e65c Mon Sep 17 00:00:00 2001 From: Ritiek Date: Sun, 18 Jun 2017 02:16:25 +0530 Subject: [PATCH] Message on unavailable local tracks --- core/misc.py | 11 +++++++++++ spotdl.py | 14 ++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/core/misc.py b/core/misc.py index bd17f46..fad1376 100644 --- a/core/misc.py +++ b/core/misc.py @@ -64,6 +64,17 @@ def is_spotify(raw_song): else: return False +# write tracks into list file +def feed_tracks(file, tracks): + with open(file, 'a') as fout: + for item in tracks['items']: + track = item['track'] + try: + fout.write(track['external_urls']['spotify'] + '\n') + except KeyError: + title = track['name'] + ' by '+ track['artists'][0]['name'] + print('Skipping track ' + title + ' (local only?)') + # generate filename of the song to be downloaded def generate_filename(title): raw_title = title.replace(' ', '_') diff --git a/spotdl.py b/spotdl.py index c3c390b..6fccbe3 100644 --- a/spotdl.py +++ b/spotdl.py @@ -98,16 +98,6 @@ def get_YouTube_title(content, number): else: return str(number) + '. ' + title -# write tracks into list file -def feed_tracks(file, tracks): - with open(file, 'a') as fout: - for item in tracks['items']: - track = item['track'] - try: - fout.write(track['external_urls']['spotify'] + '\n') - except KeyError: - pass - # fetch user playlists when using -u option def feed_playlist(username): playlists = spotify.user_playlists(username) @@ -125,10 +115,10 @@ def feed_playlist(username): file = slugify(playlist['name'], ok='-_()[]{}') + '.txt' print('Feeding ' + str(playlist['tracks']['total']) + ' tracks to ' + file) tracks = results['tracks'] - feed_tracks(file, tracks) + misc.feed_tracks(file, tracks) while tracks['next']: tracks = spotify.next(tracks) - feed_tracks(file, tracks) + misc.feed_tracks(file, tracks) def download_song(content): music_file = misc.generate_filename(content.title)