From 0726e15c9d25206070e42c9aa9700db3ac0c5ce1 Mon Sep 17 00:00:00 2001 From: aj Date: Tue, 30 Apr 2019 16:48:46 +0100 Subject: [PATCH] list comprehension on export --- spotframework/io/csv.py | 19 ++++--------------- spotframework/net/network.py | 2 +- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/spotframework/io/csv.py b/spotframework/io/csv.py index 2f7a532..581e225 100644 --- a/spotframework/io/csv.py +++ b/spotframework/io/csv.py @@ -1,21 +1,18 @@ import csv -import spotframework.net.network as network import datetime headers = ['name', 'artist', 'album', 'album artist', 'added', 'track id', 'album id', 'added by'] def exportPlaylist(playlist, path, name=None): - - #playlist = network.getPlaylistTracks(user, playlistid) date = str(datetime.datetime.now()) if name is None: name = playlist.name - with open('{}/{}_{}.csv'.format(path, name.replace('/', '_'), date.split('.')[0]), 'w') as fileobj: + with open('{}/{}_{}.csv'.format(path, name.replace('/', '_'), date.split('.')[0]), 'w', newline='') as fileobj: - writer = csv.DictWriter(fileobj, fieldnames = headers) + writer = csv.DictWriter(fileobj, fieldnames=headers) writer.writeheader() for track in playlist.tracks: @@ -27,17 +24,9 @@ def exportPlaylist(playlist, path, name=None): 'track id':track['track']['id'], 'album id':track['track']['album']['id'], 'added by':track['added_by']['id']} - - alart = [] - for albumartist in track['track']['album']['artists']: - alart.append(albumartist['name']) - trackdict['album artist'] = ', '.join(alart) + trackdict['album artist'] = ', '.join(x['name'] for x in track['track']['album']['artists']) - art = [] - for artist in track['track']['artists']: - art.append(artist['name']) - - trackdict['artist'] = ', '.join(art) + trackdict['artist'] = ', '.join(x['name'] for x in track['track']['artists']) writer.writerow(trackdict) diff --git a/spotframework/net/network.py b/spotframework/net/network.py index 51c99b0..3131224 100644 --- a/spotframework/net/network.py +++ b/spotframework/net/network.py @@ -24,7 +24,7 @@ class network: return playlist def getPlaylists(self, offset=0): - print('getting user playlists') + print('getting user playlists {}'.format(offset)) headers = {'Authorization': 'Bearer ' + self.user.access_token}