diff --git a/fmframework/io/csv.py b/fmframework/io/csv.py index 3891f34..b76dec7 100644 --- a/fmframework/io/csv.py +++ b/fmframework/io/csv.py @@ -13,8 +13,8 @@ def exportScrobbles(scrobbles, path): writer.writeheader() for track in scrobbles: - - trackdict = { + if '@attr' not in track: + trackdict = { 'track':track['name'].replace(';', '_').replace(',', '_'), 'album':track['album']['#text'].replace(';', '_').replace(',', '_'), 'artist':track['artist']['#text'].replace(';', '_').replace(',', '_'), @@ -23,4 +23,4 @@ def exportScrobbles(scrobbles, path): 'album id':track['album']['mbid'], 'artist id':track['artist']['mbid']} - writer.writerow(trackdict) + writer.writerow(trackdict) diff --git a/fmframework/net/user.py b/fmframework/net/user.py index b9db9f6..2ba356e 100644 --- a/fmframework/net/user.py +++ b/fmframework/net/user.py @@ -21,11 +21,15 @@ class User: } data.update(extra) - req = requests.post('http://ws.audioscrobbler.com/2.0/', data = data) + req = requests.get('http://ws.audioscrobbler.com/2.0/', params = data) if req.status_code < 200 or req.status_code > 299: - raise ValueError('HTTP Error Raised: ' + str(req.json()['error']) + ' ' + req.json()['message']) + if req.json()['error'] == 8: + print('ERROR: retrying call ' + method) + return __makeRequest(method, extra, page) + else: + raise ValueError('HTTP Error Raised: ' + str(req.json()['error']) + ' ' + req.json()['message']) return req.json()