gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-05-02 01:39:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix search hang in pygazelle if server didn't respond, timeout is now 30 secs

Browse Source
This commit is contained in:
cohena
2013-12-01 19:43:00 -08:00
parent 8ded4b6edc
commit 162c3cb604
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pygazelle/api.py
View File

@@ -51,6 +51,7 @@ class GazelleAPI(object):
self.passkey = None
self.userid = None
self.logged_in_user = None
self.default_timeout = 30
self.cached_users = {}
self.cached_artists = {}
self.cached_tags = {}
@@ -97,7 +98,8 @@ class GazelleAPI(object):
loginpage = 'https://what.cd/login.php'
data = {'username': self.username,
'password': self.password}
r = self.session.post(loginpage, data=data)
r = self.session.post(loginpage, data=data, timeout=self.default_timeout)
self.past_request_timestamps.append(time.time())
if r.status_code != 200:
raise LoginException("Login returned status code %s" % r.status_code)
@@ -112,7 +114,6 @@ class GazelleAPI(object):
self.passkey = accountinfo['passkey']
self.logged_in_user = User(self.userid, self)
self.logged_in_user.set_index_data(accountinfo)
self.past_request_timestamps.append(time.time())
def request(self, action, autologin=True, **kwargs):
"""
@@ -153,7 +154,7 @@ class GazelleAPI(object):
if self.authkey:
params['auth'] = self.authkey
params.update(kwargs)
r = self.session.get(url, params=params, allow_redirects=False)
r = self.session.get(url, params=params, allow_redirects=False, timeout=self.default_timeout)
self.past_request_timestamps.append(time.time())
return r.content