From 7519a78657685f14f93983f474d75ae0efb4a2ad Mon Sep 17 00:00:00 2001 From: Edi Feschiyan Date: Wed, 15 Apr 2020 15:04:02 +0300 Subject: Cleaning up services' classes --- geoclue.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'geoclue.py') diff --git a/geoclue.py b/geoclue.py index f31d91e..ab4eba2 100644 --- a/geoclue.py +++ b/geoclue.py @@ -4,15 +4,16 @@ from aglbaseservice import AGLBaseService class GeoClueService(AGLBaseService): - def __init__(self, ip, port, api='geoclue'): - super().__init__(ip=ip, port=port, api=api) + def __init__(self, ip, port=None, api='geoclue', service='agl-service-geoclue'): + super().__init__(ip=ip, port=port, api=api, service=service) - async def location(self): - verb = 'location' - msgid = randint(0, 999999) - - await self.send(f'[2,"{msgid}","{self.api}/{verb}",""]') - return await self.receive() + async def location(self, waitresponse=False): + return await self.request('location', waitresponse=waitresponse) + # verb = 'location' + # msgid = randint(0, 999999) + # + # await self.send(f'[2,"{msgid}","{self.api}/{verb}",""]') + # return await self.receive() async def subscribe(self, event='location'): super().subscribe(event=event) @@ -22,7 +23,7 @@ class GeoClueService(AGLBaseService): async def main(loop): - GCS = await GeoClueService(ip='192.168.234.202', port='30009') + GCS = await GeoClueService(ip='192.168.128.13') print(await GCS.location()) listener = loop.create_task(GCS.listener()) await listener -- cgit 1.2.3-korg