diff --git a/service/character.py b/service/character.py index 59a80dbab..f97a1daa7 100644 --- a/service/character.py +++ b/service/character.py @@ -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): diff --git a/service/settings.py b/service/settings.py index 420434597..066973b81 100644 --- a/service/settings.py +++ b/service/settings.py @@ -170,4 +170,13 @@ class ProxySettings(): proxy = (proxAddr, proxPort) break - return proxy \ No newline at end of file + 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())) \ No newline at end of file