dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Moved getProxySettings from service.character to service.settings

Browse Source
This commit is contained in:
HomeWorld
2011-12-23 22:13:39 +02:00
parent c51a1400e1
commit 0a1ac49c97
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
service/character.py
View File

@@ -113,28 +113,18 @@ class Character():
char = eos.db.getCharacter(charID)
return (char.apiID or "", char.apiKey or "")
def getProxySettings(self):
ps = service.settings.ProxySettings.getInstance()
if ps.getMode() == 0:
return None
if ps.getMode() == 1:
return ps.autodetect()
if ps.getMode() == 2:
return (ps.getAddress(), int(ps.getPort()))
def charList(self, charID, userID, apiKey):
char = eos.db.getCharacter(charID)
try:
char.apiID = userID
char.apiKey = apiKey
return char.apiCharList(proxy = self.getProxySettings())
return char.apiCharList(proxy = service.settings.ProxySettings.getInstance().getProxySettings())
except:
return None
def apiFetch(self, charID, charName):
char = eos.db.getCharacter(charID)
char.apiFetch(charName, proxy = self.getProxySettings())
char.apiFetch(charName, proxy = service.settings.ProxySettings.getInstance().getProxySettings())
eos.db.commit()
def changeLevel(self, charID, skillID, level):

11
service/settings.py
View File

@@ -170,4 +170,13 @@ class ProxySettings():
proxy = (proxAddr, proxPort)
break
return proxy
return proxy
def getProxySettings(self):
if self.getMode() == 0:
return None
if self.getMode() == 1:
return ps.autodetect()
if self.getMode() == 2:
return (self.getAddress(), int(self.getPort()))