From 45de5693089d6ccc073849835e44d25817d36298 Mon Sep 17 00:00:00 2001 From: aj Date: Mon, 4 Mar 2019 21:31:32 +0000 Subject: [PATCH] added path specification for export and user playlists only --- backup.py | 7 +++++-- main.py | 2 +- spotframework/io/csv.py | 4 ++-- spotframework/net/playlist.py | 6 ++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/backup.py b/backup.py index 81e3658..18e2e0e 100644 --- a/backup.py +++ b/backup.py @@ -2,11 +2,14 @@ import spotframework.net.user as userclass import spotframework.net.playlist as playlist import spotframework.io.csv as csvwrite +import sys + if __name__ == '__main__': user = userclass.User() - playlists = playlist.getPlaylists(user) + playlists = playlist.getUserPlaylists(user) for play in playlists: - csvwrite.exportPlaylist(user, play['id'], play['name']) + csvwrite.exportPlaylist(user, play['id'], play['name'], sys.argv[1]) + print(play['name'] + ' exported') diff --git a/main.py b/main.py index 853779d..d7c0d15 100644 --- a/main.py +++ b/main.py @@ -27,6 +27,6 @@ if __name__ == '__main__': import spotframework.io.csv as csvwrite - csvwrite.exportPlaylist(user, '000Eh2vXzYGgrEFlgcWZj3', 'february') + csvwrite.exportPlaylist(user, '000Eh2vXzYGgrEFlgcWZj3', 'february', '') print(user.access_token) diff --git a/spotframework/io/csv.py b/spotframework/io/csv.py index 9b87f87..b40f886 100644 --- a/spotframework/io/csv.py +++ b/spotframework/io/csv.py @@ -4,11 +4,11 @@ import datetime headers = ['name', 'artist', 'album', 'album artist', 'added', 'spotify id', 'added by'] -def exportPlaylist(user, playlistid, name): +def exportPlaylist(user, playlistid, name, path): playlist = playlistpull.getPlaylistTracks(user, playlistid) - with open('{}_{}.csv'.format(name, str(datetime.datetime.now()).split('.')[0]), 'w') as fileobj: + with open('{}{}_{}.csv'.format(path, name.replace('/', '_'), str(datetime.datetime.now()).split('.')[0]), 'w') as fileobj: writer = csv.DictWriter(fileobj, fieldnames = headers) writer.writeheader() diff --git a/spotframework/net/playlist.py b/spotframework/net/playlist.py index de10725..7eb067e 100644 --- a/spotframework/net/playlist.py +++ b/spotframework/net/playlist.py @@ -57,7 +57,7 @@ def getPlaylistTracks(user, playlistid, offset = 0): if req.status_code == 200: - print(req.text) + #print(req.text) resp = req.json() tracks += resp['items'] @@ -70,6 +70,4 @@ def getPlaylistTracks(user, playlistid, offset = 0): return tracks else: - return None - - + raise ValueError("Couldn't Pull Playlist " + str(playlistid) + ' ' + str(req.status_code))