Matrix-Mirrors/pantalaimon
1
0
Fork 0
mirror of https://github.com/matrix-org/pantalaimon.git synced 2025-01-05 12:51:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

pantalaimon: Fix the formatting.

Browse Source
This commit is contained in:
Damir Jelić 2019-08-07 13:02:15 +02:00
parent c0cd6a3b98
commit 87b37e366e
4 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
pantalaimon/client.py
View File

@ -130,15 +130,13 @@ class InvalidLimit(Exception):
class SqliteQStore(SqliteStore):
def _create_database(self):
return SqliteQueueDatabase(
self.database_path,
pragmas=(("foregign_keys", 1), ("secure_delete", 1))
self.database_path, pragmas=(("foregign_keys", 1), ("secure_delete", 1))
)
def close(self):
self.database.stop()
class PanClient(AsyncClient):
"""A wrapper class around a nio AsyncClient extending its functionality."""
@ -157,7 +155,9 @@ class PanClient(AsyncClient):
proxy=None,
store_class=None,
):
config = config or ClientConfig(store=store_class or SqliteStore, store_name="pan.db")
config = config or ClientConfig(
store=store_class or SqliteStore, store_name="pan.db"
)
super().__init__(homeserver, user_id, device_id, store_path, config, ssl, proxy)
index_dir = os.path.join(store_path, server_name, user_id)
@ -196,13 +196,9 @@ class PanClient(AsyncClient):
self.history_fetcher_task = None
self.history_fetch_queue = asyncio.Queue()
self.add_to_device_callback(self.key_verification_cb, KeyVerificationEvent)
self.add_to_device_callback(
self.key_verification_cb,
KeyVerificationEvent
)
self.add_to_device_callback(
self.key_request_cb,
(RoomKeyRequest, RoomKeyRequestCancellation)
self.key_request_cb, (RoomKeyRequest, RoomKeyRequestCancellation)
)
self.add_event_callback(self.undecrypted_event_cb, MegolmEvent)
@ -648,8 +644,8 @@ class PanClient(AsyncClient):
if isinstance(message, ContinueKeyShare):
continued = False
for share in self.get_active_key_requests(
message.user_id,
message.device_id):
message.user_id, message.device_id
):
continued = True
@ -659,9 +655,11 @@ class PanClient(AsyncClient):
message.message_id,
self.user_id,
"m.error",
(f"Unable to continue the key sharing for "
f"{message.user_id} via {message.device_id}: The "
f"device is still not verified.")
(
f"Unable to continue the key sharing for "
f"{message.user_id} via {message.device_id}: The "
f"device is still not verified."
),
)
)
return
@ -674,47 +672,45 @@ class PanClient(AsyncClient):
# after the next sync in the sync_forever method.
pass
response = (f"Succesfully continued the key requests from "
f"{message.user_id} via {message.device_id}")
response = (
f"Succesfully continued the key requests from "
f"{message.user_id} via {message.device_id}"
)
ret = "m.ok"
else:
response = (f"No active key requests from {message.user_id} "
f"via {message.device_id} found.")
response = (
f"No active key requests from {message.user_id} "
f"via {message.device_id} found."
)
ret = "m.error"
await self.send_message(
DaemonResponse(
message.message_id,
self.user_id,
ret,
response
)
DaemonResponse(message.message_id, self.user_id, ret, response)
)
elif isinstance(message, CancelKeyShare):
cancelled = False
for share in self.get_active_key_requests(
message.user_id,
message.device_id):
message.user_id, message.device_id
):
cancelled = self.cancel_key_share(share)
if cancelled:
response = (f"Succesfully cancelled key requests from "
f"{message.user_id} via {message.device_id}")
response = (
f"Succesfully cancelled key requests from "
f"{message.user_id} via {message.device_id}"
)
ret = "m.ok"
else:
response = (f"No active key requests from {message.user_id} "
f"via {message.device_id} found.")
response = (
f"No active key requests from {message.user_id} "
f"via {message.device_id} found."
)
ret = "m.error"
await self.send_message(
DaemonResponse(
message.message_id,
self.user_id,
ret,
response
)
DaemonResponse(message.message_id, self.user_id, ret, response)
)
async def loop_stop(self):

4
pantalaimon/daemon.py
View File

@ -131,7 +131,7 @@ class ProxyDaemon:
store_path=self.data_dir,
ssl=self.ssl,
proxy=self.proxy,
store_class=self.client_store_class
store_class=self.client_store_class,
)
pan_client.user_id = user_id
pan_client.access_token = token
@ -554,7 +554,7 @@ class ProxyDaemon:
store_path=self.data_dir,
ssl=self.ssl,
proxy=self.proxy,
store_class=self.client_store_class
store_class=self.client_store_class,
)
response = await pan_client.login(password, "pantalaimon")

1
pantalaimon/panctl.py
View File

@ -391,7 +391,6 @@ class PanCtl:
"Export end-to-end encryption keys to the given file "
"for the given pan-user."
),
}
commands = list(command_help.keys())

4
pantalaimon/ui.py
View File

@ -458,9 +458,7 @@ if UI_ENABLED:
id_counter = IdCounter()
self.control_if = Control(
self.send_queue, self.server_list, id_counter
)
self.control_if = Control(self.send_queue, self.server_list, id_counter)
self.device_if = Devices(self.send_queue, id_counter)
self.bus = SessionBus()