refactoring

[mtxbot.git] / src / presence.py

diff --git a/src/presence.py b/src/presence.py
index 0a7b1a13888f5085d44431911c9c1c9a9d7da380..0ab1ad44a3f2f43e7cb4c0032c199e91eff09051 100644 (file)
--- a/src/presence.py
+++ b/src/presence.py
@@ -8,10 +8,12 @@ class Presence:
     def __init__(self, room_name, fifo_path):
         self._room_name = room_name
         self._fifo_path = fifo_path
     def __init__(self, room_name, fifo_path):
         self._room_name = room_name
         self._fifo_path = fifo_path

+        self._is_member = False

 
     async def run(self, client):
         self._log(logging.INFO, "Presence running")
         self._stop = False
 
     async def run(self, client):
         self._log(logging.INFO, "Presence running")
         self._stop = False

+        asyncio.create_task( self._do_watch(client) )

         while not self._stop:
             room_id = await self._enter_room(client)
             try:
         while not self._stop:
             room_id = await self._enter_room(client)
             try:


@@ -21,26 +23,23 @@ class Presence:
         self._log(logging.INFO, "Presence stopped")
 
     def stop(self):
         self._log(logging.INFO, "Presence stopped")
 
     def stop(self):

+        asyncio.get_running_loop().call_soon_threadsafe(
+            Presence._do_stop, self
+        )
+
+    def _do_stop(self):

         self._stop = True
         self._stop = True

-        fifo = -1
-        try:
-            fifo = posix.open(self._fifo_path, posix.O_WRONLY | posix.O_NONBLOCK)
-            posix.write(fifo, "\n".encode())
-        except OSError as e:
-            if e.errno == errno.ENXIO:
-                pass
-        finally:
-            if fifo != -1:
-                posix.close(fifo)
+        self._tickle_fifo()

 
     async def _enter_room(self, client):
         while not self._stop:
             await client.sync()
 
 
     async def _enter_room(self, client):
         while not self._stop:
             await client.sync()
 

-            for room_id, room in client.rooms.items():
-                if room.display_name == self._room_name:
-                    self._log(logging.INFO, "A room member already")
-                    return room_id
+            room_id = await self._joined_room_id(client)
+            if room_id != None:
+                self._log(logging.INFO, "A room member already")
+                self._is_member = True
+                return room_id

 
             self._log(logging.INFO, "Not yet a room member")
 
 
             self._log(logging.INFO, "Not yet a room member")
 


@@ -57,11 +56,33 @@ class Presence:
 
             await asyncio.sleep(3.0)
 
 
             await asyncio.sleep(3.0)
 

+    async def _do_watch(self, client):
+        while not self._stop:
+            await client.sync()
+            if await self._joined_room_id(client) == None:
+                self._is_member = False
+                self._tickle_fifo()
+            else:
+                self._is_member = True
+            await asyncio.sleep(3.0)
+
+    def _tickle_fifo(self):
+        fifo = -1
+        try:
+            fifo = posix.open(self._fifo_path, posix.O_WRONLY | posix.O_NONBLOCK)
+            posix.write(fifo, "\n".encode())
+        except OSError as e:
+            if e.errno == errno.ENXIO:
+                pass
+        finally:
+            if fifo != -1:
+                posix.close(fifo)
+

     async def _process_messages(self, client, room_id):
     async def _process_messages(self, client, room_id):

-        if self._stop:
+        if self._stop or not self._is_member:

             return
         async for line in self._read_fifo(self._fifo_path):
             return
         async for line in self._read_fifo(self._fifo_path):

-            if self._stop:
+            if self._stop or not self._is_member:

                 break
             await client.room_send(
                 room_id=room_id,
                 break
             await client.room_send(
                 room_id=room_id,


@@ -72,6 +93,14 @@ class Presence:
                 }
             )
 
                 }
             )
 

+    async def _joined_room_id(self, client):
+        joined_room_ids = ( await client.joined_rooms() ).rooms
+        for room_id, room in client.rooms.items():
+            if room.display_name == self._room_name:
+                if room_id in joined_room_ids:
+                    return room_id
+        return None
+

     def _log(self, level, msg, *args, **kwargs):
         logging.log(level, "P{%s}: %s" % (self._room_name, msg), *args, **kwargs)
 
     def _log(self, level, msg, *args, **kwargs):
         logging.log(level, "P{%s}: %s" % (self._room_name, msg), *args, **kwargs)