Cleaning up services' classes

1 files changed, 10 insertions, 9 deletions

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