pantalaimon: Refactor out the thread messages.

pantalaimon/client.py

@@ -10,7 +10,11 @@ from nio import (AsyncClient, ClientConfig, EncryptionError,
 from nio.store import SqliteStore
 
 from pantalaimon.log import logger
-from pantalaimon.ui import DevicesMessage, DeviceAuthStringMessage, InfoMessage
+from pantalaimon.thread_messages import (
+    DevicesMessage,
+    DeviceAuthStringMessage,
+    InfoMessage
+)
 
 
 class PanClient(AsyncClient):

pantalaimon/daemon.py

@@ -18,7 +18,7 @@ from nio import EncryptionError, GroupEncryptionError, LoginResponse
 from pantalaimon.client import PanClient
 from pantalaimon.log import logger
 from pantalaimon.store import ClientInfo, PanStore
-from pantalaimon.ui import (
+from pantalaimon.thread_messages import (
     DeviceVerifyMessage,
     DeviceUnverifyMessage,
     ExportKeysMessage,

pantalaimon/main.py

@@ -13,7 +13,8 @@ from logbook import StderrHandler
 
 from aiohttp import web
 
-from pantalaimon.ui import GlibT, InfoMessage
+from pantalaimon.ui import GlibT
+from pantalaimon.thread_messages import InfoMessage
 from pantalaimon.daemon import ProxyDaemon
 from pantalaimon.config import PanConfig, PanConfigError, parse_log_level
 from pantalaimon.log import logger

pantalaimon/thread_messages.py

@@ -0,0 +1,61 @@
+import attr
+
+
+@attr.s
+class Message:
+    pass
+
+
+@attr.s
+class InfoMessage(Message):
+    string = attr.ib()
+
+
+@attr.s
+class DevicesMessage(Message):
+    user_id = attr.ib()
+    devices = attr.ib()
+
+
+@attr.s
+class _KeysOperation(Message):
+    pan_user = attr.ib()
+    file_path = attr.ib()
+    passphrase = attr.ib()
+
+
+@attr.s
+class ImportKeysMessage(_KeysOperation):
+    pass
+
+
+@attr.s
+class ExportKeysMessage(_KeysOperation):
+    pass
+
+
+@attr.s
+class _VerificationMessage(Message):
+    pan_user = attr.ib()
+    user_id = attr.ib()
+    device_id = attr.ib()
+
+
+@attr.s
+class DeviceVerifyMessage(_VerificationMessage):
+    pass
+
+
+@attr.s
+class DeviceUnverifyMessage(_VerificationMessage):
+    pass
+
+
+@attr.s
+class DeviceConfirmSasMessage(_VerificationMessage):
+    pass
+
+
+@attr.s
+class DeviceAuthStringMessage(_VerificationMessage):
+    short_string = attr.ib()

pantalaimon/ui.py

@@ -10,72 +10,21 @@ from gi.repository import GLib
 from queue import Empty
 
 from pantalaimon.store import PanStore
+from pantalaimon.thread_messages import (
+    DeviceVerifyMessage,
+    DeviceUnverifyMessage,
+    DevicesMessage,
+    InfoMessage,
+    DeviceConfirmSasMessage,
+    DeviceAuthStringMessage,
+    ImportKeysMessage,
+    ExportKeysMessage,
+)
 from pantalaimon.log import logger
 
 DBusGMainLoop(set_as_default=True)
 
 
-@attr.s
-class Message:
-    pass
-
-
-@attr.s
-class InfoMessage(Message):
-    string = attr.ib()
-
-
-@attr.s
-class DevicesMessage(Message):
-    user_id = attr.ib()
-    devices = attr.ib()
-
-
-@attr.s
-class _KeysOperation(Message):
-    pan_user = attr.ib()
-    file_path = attr.ib()
-    passphrase = attr.ib()
-
-
-@attr.s
-class ImportKeysMessage(_KeysOperation):
-    pass
-
-
-@attr.s
-class ExportKeysMessage(_KeysOperation):
-    pass
-
-
-@attr.s
-class _VerificationMessage(Message):
-    pan_user = attr.ib()
-    user_id = attr.ib()
-    device_id = attr.ib()
-
-
-@attr.s
-class DeviceVerifyMessage(_VerificationMessage):
-    pass
-
-
-@attr.s
-class DeviceUnverifyMessage(_VerificationMessage):
-    pass
-
-
-@attr.s
-class DeviceConfirmSasMessage(_VerificationMessage):
-    pass
-
-
-@attr.s
-class DeviceAuthStringMessage(_VerificationMessage):
-    short_string = attr.ib()
-
-
-
 class Devices(dbus.service.Object):
     def __init__(self, bus_name, queue, device_list):
         super().__init__(bus_name, "/org/pantalaimon/Devices")