From e02ee00b0f933a2e09aad86e8875b8135b7e3d6f Mon Sep 17 00:00:00 2001 From: heck Date: Wed, 5 Jan 2022 15:16:16 +0100 Subject: [PATCH] re-add set_sync_mode() (OFF,SYNC,ASYNC) --- src/pEp/__init__.py | 22 ++++++++++++++-------- test/start_sync.py | 6 +++--- test/sync_handshake.py | 4 ++-- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/pEp/__init__.py b/src/pEp/__init__.py index 9b9fa65..4758c5c 100755 --- a/src/pEp/__init__.py +++ b/src/pEp/__init__.py @@ -55,16 +55,22 @@ def shutdown_sync() -> None: # set_sync_mode(SyncModes.Off) -# def set_sync_mode(mode): - # _pEp._set_sync_mode(mode) - # if mode == SyncModes.Sync: - # Sync.shutdown_sync() - # if mode == SyncModes.Async: - # Sync.start_sync() - # if mode == SyncModes.Off: - # Sync.shutdown_sync() +class SyncModes(Enum): + OFF: int = 0 + SYNC: int = 1 + ASYNC: int = 2 +def set_sync_mode(mode): + if mode == SyncModes.SYNC: + Sync.shutdown_sync() + _pEp._init_session(False) + if mode == SyncModes.ASYNC: + _pEp._init_session(True) + Sync.start_sync() + if mode == SyncModes.OFF: + Sync.shutdown_sync() + def is_sync_active() -> bool: """True if sync is active, False otherwise""" diff --git a/test/start_sync.py b/test/start_sync.py index 88fdf10..afd18c8 100755 --- a/test/start_sync.py +++ b/test/start_sync.py @@ -23,7 +23,7 @@ pEp.myself(alice) print(alice.fpr) while True: - pEp.set_sync_mode(pEp.SyncModes.Async) + pEp.set_sync_mode(pEp.SyncModes.ASYNC) print("start_sync()") pEp.start_sync() print("Running...") @@ -34,7 +34,7 @@ while True: print("END") time.sleep(3) - pEp.set_sync_mode(pEp.SyncModes.Sync) + pEp.set_sync_mode(pEp.SyncModes.SYNC) print("start_sync()") pEp.start_sync() print("Running...") @@ -45,7 +45,7 @@ while True: print("END") time.sleep(3) - pEp.set_sync_mode(pEp.SyncModes.Off) + pEp.set_sync_mode(pEp.SyncModes.OFF) print("start_sync()") pEp.start_sync() print("Running...") diff --git a/test/sync_handshake.py b/test/sync_handshake.py index fa05121..c5c413f 100755 --- a/test/sync_handshake.py +++ b/test/sync_handshake.py @@ -192,10 +192,10 @@ def run(name, color=None, imap=False, own_ident=1, leave=False): if multithreaded: print("Sync Start multi-threaded") - pEp.set_sync_mode(pEp.SyncModes.Async) + pEp.set_sync_mode(pEp.SyncModes.ASYNC) else: print("Sync Start single-threaded") - pEp.set_sync_mode(pEp.SyncModes.Sync); + pEp.set_sync_mode(pEp.SyncModes.SYNC); try: if leave: