Philipp Hörist pushed to branch master at gajim / gajim
Commits: e00dad0b by Philipp Hörist at 2019-12-10T22:12:48Z Bytestream: Simplify event code
- - - - - 1b1ca88c by Philipp Hörist at 2019-12-10T22:18:10Z Interface: Simplify event code
- - - - -
3 changed files:
- gajim/common/connection_handlers_events.py - gajim/common/modules/bytestream.py - gajim/gui_interface.py
Changes:
===================================== gajim/common/connection_handlers_events.py ===================================== @@ -168,21 +168,6 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): self.file_props.transfered_size = [] return True
-class FileRequestErrorEvent(nec.NetworkIncomingEvent): - name = 'file-request-error' - - def generate(self): - self.jid = app.get_jid_without_resource(self.jid) - return True - -class FileTransferCompletedEvent(nec.NetworkIncomingEvent): - name = 'file-transfer-completed' - - def generate(self): - jid = str(self.file_props.receiver) - self.jid = app.get_jid_without_resource(jid) - return True - class NotificationEvent(nec.NetworkIncomingEvent): name = 'notification' base_network_events = ['decrypted-message-received',
===================================== gajim/common/modules/bytestream.py ===================================== @@ -36,8 +36,8 @@ from gajim.common import helpers from gajim.common import jingle_xtls from gajim.common.file_props import FilesProp from gajim.common.socks5 import Socks5SenderClient +from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule -from gajim.common.connection_handlers_events import FileRequestErrorEvent
log = logging.getLogger('gajim.c.m.bytestream') @@ -218,12 +218,12 @@ class Bytestream(BaseModule): if contact.get_full_jid() == receiver_jid: file_props.error = -5 self.remove_transfer(file_props) - app.nec.push_incoming_event(FileRequestErrorEvent( - None, - conn=self._con, - jid=contact.jid, - file_props=file_props, - error_msg='')) + app.nec.push_incoming_event( + NetworkEvent('file-request-error', + conn=self._con, + jid=app.get_jid_without_resource(contact.jid), + file_props=file_props, + error_msg='')) sender_jid = file_props.sender if contact.get_full_jid() == sender_jid: file_props.error = -3 @@ -273,12 +273,12 @@ class Bytestream(BaseModule): self._result_socks5_sid, file_props) if not listener: file_props.error = -5 - app.nec.push_incoming_event(FileRequestErrorEvent( - None, - conn=self._con, - jid=receiver, - file_props=file_props, - error_msg='')) + app.nec.push_incoming_event( + NetworkEvent('file-request-error', + conn=self._con, + jid=app.get_jid_without_resource(receiver), + file_props=file_props, + error_msg='')) self._connect_error(file_props.sid, error='not-acceptable', error_type='modify') @@ -524,12 +524,12 @@ class Bytestream(BaseModule): if msg: self.disconnect_transfer(file_props) file_props.error = -3 - app.nec.push_incoming_event(FileRequestErrorEvent( - None, - conn=self._con, - jid=to, - file_props=file_props, - error_msg=msg)) + app.nec.push_incoming_event( + NetworkEvent('file-request-error', + conn=self._con, + jid=app.get_jid_without_resource(to), + file_props=file_props, + error_msg=msg))
def _proxy_auth_ok(self, proxy): """ @@ -559,12 +559,12 @@ class Bytestream(BaseModule): if not file_props: return file_props.error = -4 - app.nec.push_incoming_event(FileRequestErrorEvent( - None, - conn=self._con, - jid=jid, - file_props=file_props, - error_msg='')) + app.nec.push_incoming_event( + NetworkEvent('file-request-error', + conn=self._con, + jid=app.get_jid_without_resource(jid), + file_props=file_props, + error_msg='')) raise nbxmpp.NodeProcessed
def _on_bytestream_set(self, con, iq_obj):
===================================== gajim/gui_interface.py ===================================== @@ -77,8 +77,7 @@ from gajim.common import logging_helpers from gajim.common.structs import MUCData from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ -from gajim.common.connection_handlers_events import ( - OurShowEvent, FileTransferCompletedEvent) +from gajim.common.connection_handlers_events import OurShowEvent
from gajim.common.modules.httpupload import HTTPUploadProgressEvent from gajim.common.connection import Connection @@ -637,8 +636,12 @@ class Interface: if file_props.error == 0: ft.set_progress( file_props.type_, file_props.sid, file_props.received_len) + jid = app.get_jid_without_resource(str(file_props.receiver)) app.nec.push_incoming_event( - FileTransferCompletedEvent(None, file_props=file_props)) + NetworkEvent('file-transfer-completed', + file_props=file_props, + jid=jid)) + else: ft.set_status(file_props, 'stop') if not file_props.completed and (file_props.stalled or
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/294eece25bcf57ebc6e0ad86311fc0a143...