gronod/ha_ecovacs_bumper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26 from torbjornaxelsson/server-argument

Browse Source 
XMPP server address as optional argument
This commit is contained in:
William Pietri
2017-12-22 00:40:16 -05:00
committed by GitHub
parent bda504df6a 06e2a3e440
commit 624d54c77f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sucks/__init__.py
+9 -6
View File
@@ -127,14 +127,15 @@ class EcoVacsAPI:
class VacBot():
def __init__(self, user, domain, resource, secret, vacuum, continent):
def __init__(self, user, domain, resource, secret, vacuum, continent, server_address=None):
self.vacuum = vacuum
self.clean_status = None
self.charge_status = None
self.battery_status = None
self.xmpp = EcoVacsXMPP(user, domain, resource, secret, continent)
self.xmpp = EcoVacsXMPP(user, domain, resource, secret, continent, server_address)
self.xmpp.subscribe_to_ctls(self._handle_ctl)
def connect_and_wait_until_ready(self):
@@ -184,7 +185,7 @@ class VacBot():
class EcoVacsXMPP(ClientXMPP):
def __init__(self, user, domain, resource, secret, continent):
def __init__(self, user, domain, resource, secret, continent, server_address=None):
ClientXMPP.__init__(self, user + '@' + domain, '0/' + resource + '/' + secret)
self.user = user
@@ -192,8 +193,11 @@ class EcoVacsXMPP(ClientXMPP):
self.resource = resource
self.continent = continent
self.credentials['authzid'] = user
if server_address is None:
self.server_address = ('msg-{}.ecouser.net'.format(self.continent), '5223')
else:
self.server_address = server_address
self.add_event_handler("session_start", self.session_start)
self.ctl_subscribers = []
self.ready_flag = Event()
@@ -206,7 +210,6 @@ class EcoVacsXMPP(ClientXMPP):
self.register_handler(Callback("general",
MatchXPath('{jabber:client}iq/{com:ctl}query/{com:ctl}'),
self._handle_ctl))
self.ready_flag.set()
def subscribe_to_ctls(self, function):
@@ -256,7 +259,7 @@ class EcoVacsXMPP(ClientXMPP):
q.send()
def connect_and_wait_until_ready(self):
self.connect(('msg-{}.ecouser.net'.format(self.continent), '5223'))
self.connect(self.server_address)
self.process()
self.wait_until_ready()