pew/phenny
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

switch to requests for HTTP queries

Browse Source
This commit is contained in:
mutantmonkey
2013-06-08 22:27:24 -07:00
parent 259c222623
commit 5cb88f3cf8
23 changed files with 131 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/lastfm.py
View File

@@ -6,12 +6,9 @@ author: Casey Link <unnamedrambler@gmail.com>
"""
import random
import configparser, os
import http.client
from urllib.parse import quote as urlquote
from urllib.request import urlopen
from urllib.error import HTTPError
import configparser
import os
import web
from lxml import etree
from datetime import datetime
@@ -85,19 +82,15 @@ def now_playing(phenny, input):
user = arg
user = user.strip()
try:
req = urlopen("%smethod=user.getrecenttracks&user=%s" % (APIURL, urlquote(user)))
except HTTPError as e:
if e.code == 400:
req = web.get("%smethod=user.getrecenttracks&user=%s" % (APIURL, web.quote(user)))
except web.HTTPError as e:
if e.response.status_code == 400:
phenny.say("%s doesn't exist on last.fm, perhaps they need to set user" % (user))
return
else:
phenny.say("uhoh. try again later, mmkay?")
return
except http.client.BadStatusLine:
phenny.say("uhoh. try again later, mmkay?")
return
doc = etree.parse(req)
root = doc.getroot()
root = etree.fromstring(req.encode('utf-8'))
recenttracks = list(root)
if len(recenttracks) == 0:
phenny.say("%s hasn't played anything recently. this isn't you? try lastfm-set" % (user))
@@ -155,16 +148,15 @@ def tasteometer(phenny, input):
if not user2:
user2 = input.nick
try:
req = urlopen("%smethod=tasteometer.compare&type1=user&type2=user&value1=%s&value2=%s" % (APIURL, urlquote(user1), urlquote(user2)))
except (HTTPError, http.client.BadStatusLine) as e:
if e.code == 400:
req = web.get("%smethod=tasteometer.compare&type1=user&type2=user&value1=%s&value2=%s" % (APIURL, web.quote(user1), web.quote(user2)))
except web.HTTPError as e:
if e.response.status_code == 400:
phenny.say("uhoh, someone doesn't exist on last.fm, perhaps they need to set user")
return
else:
phenny.say("uhoh. try again later, mmkay?")
return
doc = etree.parse(req)
root = doc.getroot()
root = etree.fromstring(req.encode('utf-8'))
score = root.xpath('comparison/result/score')
if len(score) == 0:
phenny.say("something isn't right. have those users scrobbled?")