Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

attempt to fix cb/python event handling

Browse Source
This commit is contained in:
holger krekel
2020-05-19 15:02:05 +02:00
parent cfd68f9f2e
commit a6409dcd27
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
python/src/deltachat/account.py
View File

@@ -53,7 +53,7 @@ class Account(object):
self._threads = iothreads.IOThreads(self) self._threads = iothreads.IOThreads(self)
self._in_use_iter_events = False self._in_use_iter_events = False
self._shutdown_event = Event() self._shutdown_event = Event()
# open database # open database
self.db_path = db_path self.db_path = db_path
if hasattr(db_path, "encode"): if hasattr(db_path, "encode"):
@@ -73,11 +73,6 @@ class Account(object):
""" re-enable logging. """ """ re-enable logging. """
self._logging = True self._logging = True
@hookspec.account_hookimpl
def ac_process_ffi_event(self, ffi_event):
for name, kwargs in self._map_ffi_event(ffi_event):
yield HookEvent(self, name=name, kwargs=kwargs)
# def __del__(self): # def __del__(self):
# self.shutdown() # self.shutdown()
@@ -616,7 +611,6 @@ class Account(object):
if event == ffi.NULL: if event == ffi.NULL:
break break
ctx = self._dc_context
evt = lib.dc_event_get_id(event) evt = lib.dc_event_get_id(event)
data1 = lib.dc_event_get_data1(event) data1 = lib.dc_event_get_data1(event)
data2 = lib.dc_event_get_data2(event) data2 = lib.dc_event_get_data2(event)
@@ -638,8 +632,9 @@ class Account(object):
lib.dc_event_unref(event) lib.dc_event_unref(event)
ffi_event = FFIEvent(name=evt_name, data1=data1, data2=data2) ffi_event = FFIEvent(name=evt_name, data1=data1, data2=data2)
for event in self._pm.hook.ac_process_ffi_event(account=self, ffi_event=ffi_event): self._pm.hook.ac_process_ffi_event(account=self, ffi_event=ffi_event)
yield event for name, kwargs in self._map_ffi_event(ffi_event):
yield HookEvent(self, name=name, kwargs=kwargs)
def _map_ffi_event(self, ffi_event): def _map_ffi_event(self, ffi_event):
name = ffi_event.name name = ffi_event.name