From: Andrew Lorimer Date: Tue, 17 Jul 2018 12:05:44 +0000 (+1000) Subject: added regex to strip 'feat. *' from title, made into module X-Git-Url: https://git.lorimer.id.au/lastsong.git/diff_plain added regex to strip 'feat. *' from title, made into module --- diff --git a/lastsong.py b/lastsong.py index 94e43bd..6201884 100755 --- a/lastsong.py +++ b/lastsong.py @@ -1,14 +1,16 @@ #! /bin/python -import requests, json, collections +import requests, json, collections, sys, re id = "censored" secret = "censored" Token = collections.namedtuple('token', ['access', 'refresh', 'err']) + + def refresh() : - authfile = open('./.auth', 'r+') # current refresh token is kept in .auth + authfile = open("/mnt/andrew/code/lastsong" + '/.auth', 'r+') # current refresh token is kept in .auth rt = authfile.read().splitlines()[0]; params = {'client_id':id, @@ -24,8 +26,12 @@ def refresh() : # print("Refresh token unchanged") return(data['access_token']); -header = {'Authorization': "Authorization: Bearer " + refresh()} -response = requests.get("https://api.spotify.com/v1/me/player/recently-played", headers = header).text -data = json.loads(response) -# open('./sampleoutput.json', 'w').write(response); # for debugging -print("\"" + data['items'][0]['track']['name'] + "\" by " + data['items'][0]['track']['artists'][0]['name']); +def getsong() : + header = {'Authorization': "Authorization: Bearer " + refresh()} + response = requests.get("https://api.spotify.com/v1/me/player/recently-played", headers = header).text + data = json.loads(response) + # open('./sampleoutput.json', 'w').write(response); # for debugging + return("\"" + re.sub('\s[\(][F|f][t|e][a][t][\.].*', '', data['items'][0]['track']['name']) + "\" by " + data['items'][0]['track']['artists'][0]['name']); + +if __name__ == '__getsong__' or '__main__': + getsong()