Hirad/pylast
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed Libre.fm scrobbling. Now it actually works! It's weird that no one noticed.

Browse source
This commit is contained in:
Amr Hassan 2009-11-20 19:08:18 +00:00
parent fbb869de1c
commit c2f8333c7c
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.build
View file

@ -1 +1 @@
18 19

19
pylast.py
View file

@ -784,7 +784,7 @@ class _Request(object):
headers = { headers = {
"Content-type": "application/x-www-form-urlencoded", "Content-type": "application/x-www-form-urlencoded",
'Accept-Charset': 'utf-8', 'Accept-Charset': 'utf-8',
'User-Agent': __name__ + '/' + __version__ 'User-Agent': "pylast" + '/' + __version__
} }
(HOST_NAME, HOST_SUBDIR) = self.network.ws_server (HOST_NAME, HOST_SUBDIR) = self.network.ws_server
@ -3487,10 +3487,10 @@ class BadSessionError(ScrobblingError):
class _ScrobblerRequest(object): class _ScrobblerRequest(object):
def __init__(self, url, params, network): def __init__(self, url, params, network, type="POST"):
self.params = params self.params = params
self.hostname = url[url.find("//") + 2:url.rfind("/")] self.type = type
self.subdir = url[url.rfind("/"):] (self.hostname, self.subdir) = urllib.splithost(url[len("http:"):])
self.network = network self.network = network
def execute(self): def execute(self):
@ -3507,11 +3507,14 @@ class _ScrobblerRequest(object):
headers = { headers = {
"Content-type": "application/x-www-form-urlencoded", "Content-type": "application/x-www-form-urlencoded",
"Accept-Charset": "utf-8", "Accept-Charset": "utf-8",
"User-Agent": __name__ + "/" + __version__, "User-Agent": "pylast" + "/" + __version__,
"HOST": self.hostname "HOST": self.hostname
} }
connection.request("POST", self.subdir, data, headers) if self.type == "GET":
connection.request("GET", self.subdir + "?" + data, headers = headers)
else:
connection.request("POST", self.subdir, data, headers)
response = connection.getresponse().read() response = connection.getresponse().read()
self._check_response_for_errors(response) self._check_response_for_errors(response)
@ -3563,8 +3566,8 @@ class Scrobbler(object):
"v": self.client_version, "u": self.username, "t": timestamp, "v": self.client_version, "u": self.username, "t": timestamp,
"a": token} "a": token}
SUBMISSION_SERVER = self.network.submission_server server = self.network.submission_server
response = _ScrobblerRequest(SUBMISSION_SERVER, params, self.network).execute().split("\n") response = _ScrobblerRequest(server, params, self.network, "GET").execute().split("\n")
self.session_id = response[1] self.session_id = response[1]
self.nowplaying_url = response[2] self.nowplaying_url = response[2]