Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] chore: Accounts: Fix type annotations, linting
by Daniel Brötzmann (＠wurstsalat) 23 May '22

23 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8bdd2319 by wurstsalat at 2022-05-23T13:58:30+02:00 chore: Accounts: Fix type annotations, linting Fixes #10897 - - - - - 3 changed files: - gajim/gtk/accounts.py - gajim/gtk/controls/base.py - pyrightconfig.json Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -32,19 +32,18 @@ from gajim.common.events import AccountDisonnected from gajim.common.i18n import _ from gajim.common.i18n import Q_ +from gajim.common.settings import AllSettingsT from .dialogs import DialogButton from .dialogs import ConfirmationDialog from .const import Setting from .const import SettingKind from .const import SettingType -from .controls.base import BaseControl from .settings import SettingsDialog from .settings import SettingsBox from .settings import PopoverSetting from .util import open_window - log = logging.getLogger('gajim.gui.accounts') @@ -58,7 +57,7 @@ def __init__(self) -> None: self.set_default_size(700, 550) self.set_resizable(True) self.set_title(_('Accounts')) - self._need_relogin: dict[str, list[str]] = {} + self._need_relogin: dict[str, list[AllSettingsT]] = {} self._accounts: dict[str, Account] = {} self._menu = AccountMenu() @@ -122,9 +121,10 @@ def _relog(self, account: str) -> None: return def relog(): - app.connections[account].disconnect(gracefully=True, - reconnect=True, - destroy_client=True) + client = app.get_client(account) + client.disconnect(gracefully=True, + reconnect=True, + destroy_client=True) ConfirmationDialog( _('Re-Login'), @@ -138,19 +138,16 @@ def relog(): transient_for=self).show() @staticmethod - def _get_relogin_settings(account: str) -> list[str]: - settings = [ - 'client_cert', - 'proxy', - 'resource', - 'use_custom_host', - 'custom_host', - 'custom_port' - ] - - values: list[Any] = [] - for setting in settings: - values.append(app.settings.get_account_setting(account, setting)) + def _get_relogin_settings(account: str) -> list[AllSettingsT]: + values: list[AllSettingsT] = [] + values.append( + app.settings.get_account_setting(account, 'client_cert')) + values.append(app.settings.get_account_setting(account, 'proxy')) + values.append(app.settings.get_account_setting(account, 'resource')) + values.append( + app.settings.get_account_setting(account, 'use_custom_host')) + values.append(app.settings.get_account_setting(account, 'custom_host')) + values.append(app.settings.get_account_setting(account, 'custom_port')) return values @staticmethod @@ -264,7 +261,7 @@ def remove_account(self, row: AccountRow) -> None: back_row = cast(Gtk.ListBoxRow, listbox.get_row_at_index(1)) back_row.emit('activate') self._accounts_listbox.remove(row) - sub_menu = self._stack.get_child_by_name('%s-menu' % row.account) + sub_menu = self._stack.get_child_by_name(f'{row.account}-menu') self._stack.remove(sub_menu) row.destroy() sub_menu.destroy() @@ -273,7 +270,7 @@ def _on_account_row_activated(self, _listbox: Gtk.ListBox, row: AccountRow ) -> None: - self._stack.set_visible_child_name('%s-menu' % row.account) + self._stack.set_visible_child_name(f'{row.account}-menu') listbox = cast(Gtk.ListBox, self._stack.get_visible_child()) listbox_row = cast(Gtk.ListBoxRow, listbox.get_row_at_index(2)) listbox_row.emit('activate') @@ -553,7 +550,8 @@ def _disable() -> None: app.ged.register_event_handler('account-disconnected', ged.CORE, _on_disconnect) - app.connections[account].change_status('offline', 'offline') + client = app.get_client(account) + client.change_status('offline', 'offline') switch.set_state(state) self._set_label(state) @@ -646,12 +644,16 @@ class GeneralPage(GenericSettingPage): def __init__(self, account: str) -> None: settings = [ - Setting(SettingKind.ENTRY, _('Label'), - SettingType.ACCOUNT_CONFIG, 'account_label', + Setting(SettingKind.ENTRY, + _('Label'), + SettingType.ACCOUNT_CONFIG, + 'account_label', callback=self._on_account_name_change), - Setting(SettingKind.COLOR, _('Color'), - SettingType.ACCOUNT_CONFIG, 'account_color', + Setting(SettingKind.COLOR, + _('Color'), + SettingType.ACCOUNT_CONFIG, + 'account_color', desc=_('Recognize your account by color')), Setting(SettingKind.LOGIN, @@ -662,29 +664,41 @@ def __init__(self, account: str) -> None: inverted=True, props={'dialog': LoginDialog}), - Setting(SettingKind.ACTION, _('Import Contacts'), - SettingType.ACTION, '-import-contacts', + Setting(SettingKind.ACTION, + _('Import Contacts'), + SettingType.ACTION, + '-import-contacts', props={'account': account}), # Currently not supported by nbxmpp # - # Setting(SettingKind.DIALOG, _('Client Certificate'), - # SettingType.DIALOG, props={'dialog': CertificateDialog}), + # Setting(SettingKind.DIALOG, + # _('Client Certificate'), + # SettingType.DIALOG, + # props={'dialog': CertificateDialog}), - Setting(SettingKind.SWITCH, _('Connect on startup'), - SettingType.ACCOUNT_CONFIG, 'autoconnect'), + Setting(SettingKind.SWITCH, + _('Connect on startup'), + SettingType.ACCOUNT_CONFIG, + 'autoconnect'), - Setting(SettingKind.SWITCH, _('Global Status'), - SettingType.ACCOUNT_CONFIG, 'sync_with_global_status', + Setting(SettingKind.SWITCH, + _('Global Status'), + SettingType.ACCOUNT_CONFIG, + 'sync_with_global_status', desc=_('Synchronise the status of all accounts')), - Setting(SettingKind.SWITCH, _('Remember Last Status'), - SettingType.ACCOUNT_CONFIG, 'restore_last_status', + Setting(SettingKind.SWITCH, + _('Remember Last Status'), + SettingType.ACCOUNT_CONFIG, + 'restore_last_status', desc=_('Restore status and status message of your ' 'last session')), - Setting(SettingKind.SWITCH, _('Use file transfer proxies'), - SettingType.ACCOUNT_CONFIG, 'use_ft_proxies'), + Setting(SettingKind.SWITCH, + _('Use file transfer proxies'), + SettingType.ACCOUNT_CONFIG, + 'use_ft_proxies'), ] GenericSettingPage.__init__(self, account, settings) @@ -699,6 +713,7 @@ class PrivacyPage(GenericSettingPage): def __init__(self, account: str) -> None: self._account = account + self._client = app.get_client(account) history_max_age = { -1: _('Forever'), @@ -717,36 +732,48 @@ def __init__(self, account: str) -> None: } settings = [ - Setting(SettingKind.SWITCH, _('Idle Time'), - SettingType.ACCOUNT_CONFIG, 'send_idle_time', + Setting(SettingKind.SWITCH, + _('Idle Time'), + SettingType.ACCOUNT_CONFIG, + 'send_idle_time', callback=self._send_idle_time, desc=_('Disclose the time of your last activity')), - Setting(SettingKind.SWITCH, _('Local System Time'), - SettingType.ACCOUNT_CONFIG, 'send_time_info', + Setting(SettingKind.SWITCH, + _('Local System Time'), + SettingType.ACCOUNT_CONFIG, + 'send_time_info', callback=self._send_time_info, desc=_('Disclose the local system time of the ' 'device Gajim runs on')), - Setting(SettingKind.SWITCH, _('Operating System'), - SettingType.ACCOUNT_CONFIG, 'send_os_info', + Setting(SettingKind.SWITCH, + _('Operating System'), + SettingType.ACCOUNT_CONFIG, + 'send_os_info', callback=self._send_os_info, desc=_('Disclose information about the ' 'operating system you currently use')), - Setting(SettingKind.SWITCH, _('Media Playback'), - SettingType.ACCOUNT_CONFIG, 'publish_tune', + Setting(SettingKind.SWITCH, + _('Media Playback'), + SettingType.ACCOUNT_CONFIG, + 'publish_tune', callback=self._publish_tune, desc=_('Disclose information about media that is ' 'currently being played on your system.')), - Setting(SettingKind.SWITCH, _('Ignore Unknown Contacts'), - SettingType.ACCOUNT_CONFIG, 'ignore_unknown_contacts', + Setting(SettingKind.SWITCH, + _('Ignore Unknown Contacts'), + SettingType.ACCOUNT_CONFIG, + 'ignore_unknown_contacts', desc=_('Ignore everything from contacts not in your ' - 'Roster')), + 'contact list')), - Setting(SettingKind.SWITCH, _('Send Message Receipts'), - SettingType.ACCOUNT_CONFIG, 'answer_receipts', + Setting(SettingKind.SWITCH, + _('Send Message Receipts'), + SettingType.ACCOUNT_CONFIG, + 'answer_receipts', desc=_('Tell your contacts if you received a message')), Setting(SettingKind.POPOVER, @@ -813,16 +840,16 @@ def _reset_gc_send_chatstate(button: Gtk.Button) -> None: app.settings.set_group_chat_settings('send_chatstate', None) def _send_idle_time(self, state: bool, _data: Any) -> None: - app.connections[self._account].get_module('LastActivity').set_enabled(state) + self._client.get_module('LastActivity').set_enabled(state) def _send_time_info(self, state: bool, _data: Any) -> None: - app.connections[self._account].get_module('EntityTime').set_enabled(state) + self._client.get_module('EntityTime').set_enabled(state) def _send_os_info(self, state: bool, _data: Any) -> None: - app.connections[self._account].get_module('SoftwareVersion').set_enabled(state) + self._client.get_module('SoftwareVersion').set_enabled(state) def _publish_tune(self, state: bool, _data: Any) -> None: - app.connections[self._account].get_module('UserTune').set_enabled(state) + self._client.get_module('UserTune').set_enabled(state) def _send_read_marker(self, state: bool, _data: Any) -> None: app.settings.set_account_setting( @@ -836,7 +863,6 @@ def _reset_send_read_marker(self, button: Gtk.Button) -> None: app.settings.set_group_chat_settings( 'send_marker', None, context='private') for ctrl in app.window.get_controls(account=self._account): - assert not isinstance(ctrl, BaseControl) ctrl.update_actions() @@ -847,28 +873,40 @@ class ConnectionPage(GenericSettingPage): def __init__(self, account: str) -> None: settings = [ - Setting(SettingKind.POPOVER, _('Proxy'), - SettingType.ACCOUNT_CONFIG, 'proxy', name='proxy', + Setting(SettingKind.POPOVER, + _('Proxy'), + SettingType.ACCOUNT_CONFIG, + 'proxy', + name='proxy', props={'entries': self._get_proxies(), 'default-text': _('System'), 'button-icon-name': 'preferences-system-symbolic', 'button-callback': self._on_proxy_edit}), - Setting(SettingKind.HOSTNAME, _('Hostname'), SettingType.DIALOG, + Setting(SettingKind.HOSTNAME, + _('Hostname'), + SettingType.DIALOG, desc=_('Manually set the hostname for the server'), props={'dialog': CutstomHostnameDialog}), - Setting(SettingKind.ENTRY, _('Resource'), - SettingType.ACCOUNT_CONFIG, 'resource'), + Setting(SettingKind.ENTRY, + _('Resource'), + SettingType.ACCOUNT_CONFIG, + 'resource'), - Setting(SettingKind.PRIORITY, _('Priority'), - SettingType.DIALOG, props={'dialog': PriorityDialog}), + Setting(SettingKind.PRIORITY, + _('Priority'), + SettingType.DIALOG, + props={'dialog': PriorityDialog}), - Setting(SettingKind.SWITCH, _('Use Unencrypted Connection'), - SettingType.ACCOUNT_CONFIG, 'use_plain_connection', + Setting(SettingKind.SWITCH, + _('Use Unencrypted Connection'), + SettingType.ACCOUNT_CONFIG, + 'use_plain_connection', desc=_('Use an unencrypted connection to the server')), - Setting(SettingKind.SWITCH, _('Confirm Unencrypted Connection'), + Setting(SettingKind.SWITCH, + _('Confirm Unencrypted Connection'), SettingType.ACCOUNT_CONFIG, 'confirm_unencrypted_connection', desc=_('Show a confirmation dialog before connecting ' @@ -896,22 +934,30 @@ class AdvancedPage(GenericSettingPage): def __init__(self, account: str) -> None: settings = [ - Setting(SettingKind.SWITCH, _('Contact Information'), - SettingType.ACCOUNT_CONFIG, 'request_user_data', + Setting(SettingKind.SWITCH, + _('Contact Information'), + SettingType.ACCOUNT_CONFIG, + 'request_user_data', desc=_('Request contact information (Tune, Location)')), - Setting(SettingKind.SWITCH, _('Accept all Contact Requests'), - SettingType.ACCOUNT_CONFIG, 'autoauth', + Setting(SettingKind.SWITCH, + _('Accept all Contact Requests'), + SettingType.ACCOUNT_CONFIG, + 'autoauth', desc=_('Automatically accept all contact requests')), - Setting(SettingKind.POPOVER, _('Filetransfer Preference'), - SettingType.ACCOUNT_CONFIG, 'filetransfer_preference', + Setting(SettingKind.POPOVER, + _('Filetransfer Preference'), + SettingType.ACCOUNT_CONFIG, + 'filetransfer_preference', props={'entries': {'httpupload': _('Upload Files'), 'jingle': _('Send Files Directly')}}, desc=_('Preferred file transfer mechanism for ' 'file drag&drop on a chat window')), - Setting(SettingKind.SWITCH, _('Security Labels'), - SettingType.ACCOUNT_CONFIG, 'enable_security_labels', + Setting(SettingKind.SWITCH, + _('Security Labels'), + SettingType.ACCOUNT_CONFIG, + 'enable_security_labels', desc=_('Show labels describing confidentiality of ' 'messages, if the server supports XEP-0258')) ] @@ -928,11 +974,13 @@ def __init__(self, account: str, parent: Gtk.Window) -> None: range_ = (0, 127) settings = [ - Setting(SettingKind.SWITCH, _('Adjust to status'), + Setting(SettingKind.SWITCH, + _('Adjust to status'), SettingType.ACCOUNT_CONFIG, 'adjust_priority_with_status'), - Setting(SettingKind.SPIN, _('Priority'), + Setting(SettingKind.SPIN, + _('Priority'), SettingType.ACCOUNT_CONFIG, 'priority', bind='account::adjust_priority_with_status', @@ -949,9 +997,10 @@ def on_destroy(self, *args: Any) -> None: # Update priority if self.account not in app.connections: return - show = app.connections[self.account].status - status = app.connections[self.account].status_message - app.connections[self.account].change_status(show, status) + client = app.get_client(self.account) + show = client.status + status = client.status_message + client.change_status(show, status) class CutstomHostnameDialog(SettingsDialog): @@ -960,21 +1009,28 @@ def __init__(self, account: str, parent: Gtk.Window) -> None: type_values = ('START TLS', 'DIRECT TLS', 'PLAIN') settings = [ - Setting(SettingKind.SWITCH, _('Enable'), + Setting(SettingKind.SWITCH, + _('Enable'), SettingType.ACCOUNT_CONFIG, 'use_custom_host'), - Setting(SettingKind.ENTRY, _('Hostname'), - SettingType.ACCOUNT_CONFIG, 'custom_host', + Setting(SettingKind.ENTRY, + _('Hostname'), + SettingType.ACCOUNT_CONFIG, + 'custom_host', bind='account::use_custom_host'), - Setting(SettingKind.SPIN, _('Port'), - SettingType.ACCOUNT_CONFIG, 'custom_port', + Setting(SettingKind.SPIN, + _('Port'), + SettingType.ACCOUNT_CONFIG, + 'custom_port', bind='account::use_custom_host', props={'range_': (0, 65535)},), - Setting(SettingKind.COMBO, _('Type'), - SettingType.ACCOUNT_CONFIG, 'custom_type', + Setting(SettingKind.COMBO, + _('Type'), + SettingType.ACCOUNT_CONFIG, + 'custom_type', bind='account::use_custom_host', props={'combo_items': type_values}), ] @@ -987,12 +1043,16 @@ class CertificateDialog(SettingsDialog): def __init__(self, account: str, parent: Gtk.Window) -> None: settings = [ - Setting(SettingKind.FILECHOOSER, _('Client Certificate'), - SettingType.ACCOUNT_CONFIG, 'client_cert', + Setting(SettingKind.FILECHOOSER, + _('Client Certificate'), + SettingType.ACCOUNT_CONFIG, + 'client_cert', props={'filefilter': (_('PKCS12 Files'), '*.p12')}), - Setting(SettingKind.SWITCH, _('Encrypted Certificate'), - SettingType.ACCOUNT_CONFIG, 'client_cert_encrypted'), + Setting(SettingKind.SWITCH, + _('Encrypted Certificate'), + SettingType.ACCOUNT_CONFIG, + 'client_cert_encrypted'), ] SettingsDialog.__init__(self, parent, _('Certificate Settings'), @@ -1003,21 +1063,29 @@ class LoginDialog(SettingsDialog): def __init__(self, account: str, parent: Gtk.Window) -> None: settings = [ - Setting(SettingKind.ENTRY, _('Password'), - SettingType.ACCOUNT_CONFIG, 'password', + Setting(SettingKind.ENTRY, + _('Password'), + SettingType.ACCOUNT_CONFIG, + 'password', bind='account::savepass'), - Setting(SettingKind.SWITCH, _('Save Password'), - SettingType.ACCOUNT_CONFIG, 'savepass', + Setting(SettingKind.SWITCH, + _('Save Password'), + SettingType.ACCOUNT_CONFIG, + 'savepass', enabled_func=(lambda: not app.settings.get('use_keyring') or passwords.KEYRING_AVAILABLE)), - Setting(SettingKind.CHANGEPASSWORD, _('Change Password'), - SettingType.DIALOG, callback=self.on_password_change, + Setting(SettingKind.CHANGEPASSWORD, + _('Change Password'), + SettingType.DIALOG, + callback=self.on_password_change, props={'dialog': None}), - Setting(SettingKind.SWITCH, _('Use GSSAPI'), - SettingType.ACCOUNT_CONFIG, 'enable_gssapi'), + Setting(SettingKind.SWITCH, + _('Use GSSAPI'), + SettingType.ACCOUNT_CONFIG, + 'enable_gssapi'), ] SettingsDialog.__init__(self, parent, _('Login Settings'), ===================================== gajim/gtk/controls/base.py ===================================== @@ -413,6 +413,11 @@ def allow_shutdown(self, method, on_response_yes, on_response_no): def focus(self) -> None: raise NotImplementedError + def update_actions(self) -> None: + """ + Derived types MAY implement this + """ + def draw_banner(self) -> None: """ Draw the fat line at the top of the window ===================================== pyrightconfig.json ===================================== @@ -37,6 +37,7 @@ "gajim/gtk/about.py", "gajim/gtk/account_page.py", "gajim/gtk/account_side_bar.py", + "gajim/gtk/accounts.py", "gajim/gtk/app_page.py", "gajim/gtk/app_side_bar.py", "gajim/gtk/application.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8bdd2319f65012b34994ade41158f924… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8bdd2319f65012b34994ade41158f924… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Jingle: Add missing return value
by Daniel Brötzmann (＠wurstsalat) 22 May '22

22 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6eafbbb8 by wurstsalat at 2022-05-23T01:50:32+02:00 fix: Jingle: Add missing return value - - - - - 1 changed file: - gajim/common/modules/jingle.py Changes: ===================================== gajim/common/modules/jingle.py ===================================== @@ -230,7 +230,7 @@ def start_file_transfer(self, else: logger.error('No suitable transport method available for %s', contact.jid) - return + return None senders = 'initiator' if request: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6eafbbb8f67f098fc29ef184be5903db… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6eafbbb8f67f098fc29ef184be5903db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: FileTransferWindow: Fix variable name
by Daniel Brötzmann (＠wurstsalat) 22 May '22

22 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 71707400 by wurstsalat at 2022-05-23T01:45:04+02:00 fix: FileTransferWindow: Fix variable name - - - - - 1 changed file: - gajim/gtk/filetransfer.py Changes: ===================================== gajim/gtk/filetransfer.py ===================================== @@ -905,8 +905,8 @@ def _on_pause_resume_button_clicked(self, widget): if is_transfer_paused(file_props): file_props.last_time = time.time() file_props.paused = False - types = {'r': 'download', 's': 'upload'} - self.set_status(file_props, types[sid[0]]) + status_types = {'r': 'download', 's': 'upload'} + self.set_status(file_props, status_types[sid[0]]) self._toggle_pause_continue(True) if file_props.continue_cb: file_props.continue_cb() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/71707400e64447c236ef746191713603… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/71707400e64447c236ef746191713603… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Socks5: Catch exception error correctly
by Daniel Brötzmann (＠wurstsalat) 22 May '22

22 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: dcd84306 by wurstsalat at 2022-05-23T01:38:20+02:00 fix: Socks5: Catch exception error correctly - - - - - 1 changed file: - gajim/common/socks5.py Changes: ===================================== gajim/common/socks5.py ===================================== @@ -683,16 +683,18 @@ def write_next(self): lenn = 0 try: lenn = self._send(buff) - except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError) as e: - log.info('SSL rehandshake request: %s', repr(e)) - raise e + except (OpenSSL.SSL.WantReadError, + OpenSSL.SSL.WantWriteError, + OpenSSL.SSL.WantX509LookupError) as err: + log.info('SSL rehandshake request: %s', repr(err)) + raise err except OpenSSL.SSL.SysCallError: return self._on_send_exception() except socket.error as err: - if e.errno not in (EINTR, ENOBUFS, EWOULDBLOCK): + if err.errno not in (EINTR, ENOBUFS, EWOULDBLOCK): return self._on_send_exception() except Exception as err: + log.error(err) return self._on_send_exception() self.size += lenn View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dcd843065919c9f9cc44c577b7743c18… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dcd843065919c9f9cc44c577b7743c18… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: chore: JingleTransport: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 22 May '22

22 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: da837340 by wurstsalat at 2022-05-23T01:33:37+02:00 chore: JingleTransport: Add type annotations - - - - - ddc4e211 by wurstsalat at 2022-05-23T01:33:37+02:00 fix: Socks5: Catch specific exception Fixes #10265 - - - - - f2459751 by wurstsalat at 2022-05-23T01:33:37+02:00 chore: Jingle: Add type annotations - - - - - 3429c7bf by wurstsalat at 2022-05-23T01:33:37+02:00 fix: Jingle: Stop early if no transport is available Fixes #10889 - - - - - 27173321 by wurstsalat at 2022-05-23T01:33:37+02:00 fix: JingleFileTransfer: Fix unbound variable - - - - - d129668a by wurstsalat at 2022-05-23T01:33:37+02:00 fix: FileTransferWindow: Set file props receiver JID correctly - - - - - 5 changed files: - gajim/common/jingle_ft.py - gajim/common/jingle_transport.py - gajim/common/modules/jingle.py - gajim/common/socks5.py - gajim/gtk/filetransfer.py Changes: ===================================== gajim/common/jingle_ft.py ===================================== @@ -74,13 +74,13 @@ class State(IntEnum): class JingleFileTransfer(JingleContent): - def __init__(self, session: JingleSession, + file_props: FileProp, transport: Optional[JingleTransport] = None, - file_props: Optional[FileProp] = None, use_security: bool = False, - senders: Optional[str] = None): + senders: Optional[str] = None + ) -> None: JingleContent.__init__(self, session, transport, senders) log.info("transport value: %s", transport) @@ -99,29 +99,31 @@ def __init__(self, self.callbacks['transport-reject'] += [self.__on_transport_reject] self.callbacks['transport-info'] += [self.__on_transport_info] self.callbacks['iq-result'] += [self.__on_iq_result] + self.use_security = use_security self.x509_fingerprint = None self.file_props = file_props self.weinitiate = self.session.weinitiate self.werequest = self.session.werequest - if self.file_props is not None: - if self.session.werequest: - self.file_props.sender = self.session.peerjid - self.file_props.receiver = self.session.ourjid - else: - self.file_props.sender = self.session.ourjid - self.file_props.receiver = self.session.peerjid - self.file_props.session_type = 'jingle' - self.file_props.sid = session.sid - self.file_props.transfered_size = [] - self.file_props.transport_sid = self.transport.sid - log.info("FT request: %s", file_props) + if transport is None: self.transport = JingleTransportSocks5() self.transport.set_connection(session.connection) self.transport.set_file_props(self.file_props) self.transport.set_our_jid(session.ourjid) log.info('ourjid: %s', session.ourjid) + + if self.session.werequest: + self.file_props.sender = self.session.peerjid + self.file_props.receiver = self.session.ourjid + else: + self.file_props.sender = self.session.ourjid + self.file_props.receiver = self.session.peerjid + self.file_props.session_type = 'jingle' + self.file_props.sid = session.sid + self.file_props.transfered_size = [] + self.file_props.transport_sid = self.transport.sid + self.session = session self.media = 'file' self.nominated_cand = {} ===================================== gajim/common/jingle_transport.py ===================================== @@ -16,8 +16,8 @@ Handles Jingle Transports (currently only ICE-UDP) """ -from typing import Any # pylint: disable=unused-import -from typing import Dict # pylint: disable=unused-import +from typing import Any +from typing import Optional import logging import socket @@ -29,11 +29,13 @@ from nbxmpp.util import generate_id from gajim.common import app +from gajim.common.client import Client +from gajim.common.file_props import FileProp log = logging.getLogger('gajim.c.jingle_transport') +transports: dict[str, Any] = {} -transports = {} # type: Dict[str, Any] def get_jingle_transport(node): namespace = node.getNamespace() @@ -59,15 +61,15 @@ class JingleTransport: __slots__ = ['type_', 'candidates', 'remote_candidates', 'connection', 'file_props', 'ourjid', 'sid'] - def __init__(self, type_): + def __init__(self, type_: TransportType) -> None: self.type_ = type_ self.candidates = [] self.remote_candidates = [] - self.connection = None - self.file_props = None - self.ourjid = None - self.sid = None + self.connection: Optional[Client] = None + self.file_props: Optional[FileProp] = None + self.ourjid: Optional[str] = None + self.sid: Optional[str] = None def _iter_candidates(self): for candidate in self.candidates: @@ -96,20 +98,21 @@ def parse_transport_stanza(self, transport): """ return [] - def set_connection(self, conn): + def set_connection(self, conn: Client) -> None: self.connection = conn if not self.sid: self.sid = generate_id() - def set_file_props(self, file_props): + def set_file_props(self, file_props: FileProp) -> None: self.file_props = file_props - def set_our_jid(self, jid): + def set_our_jid(self, jid: str) -> None: self.ourjid = jid - def set_sid(self, sid): + def set_sid(self, sid: str) -> None: self.sid = sid + class JingleTransportSocks5(JingleTransport): """ Socks5 transport in jingle scenario ===================================== gajim/common/modules/jingle.py ===================================== @@ -28,6 +28,8 @@ # * config: # - codecs +from typing import Optional + import logging import nbxmpp @@ -36,8 +38,8 @@ from gajim.common import helpers from gajim.common import jingle_xtls +from gajim.common.file_props import FileProp from gajim.common.modules.base import BaseModule - from gajim.common.jingle_session import JingleSession from gajim.common.jingle_session import JingleStates from gajim.common.jingle_ft import JingleFileTransfer @@ -74,14 +76,14 @@ def __init__(self, con): ] # dictionary: sessionid => JingleSession object - self._sessions = {} + self._sessions: dict[str, JingleSession] = {} # dictionary: (jid, iq stanza id) => JingleSession object, # one time callbacks self.__iq_responses = {} self.files = [] - def delete_jingle_session(self, sid): + def delete_jingle_session(self, sid: str) -> None: """ Remove a jingle session from a jingle stanza dispatcher """ @@ -204,7 +206,11 @@ def start_audio_video(self, jid): jingle_session.start_session() return jingle_session.sid - def start_file_transfer(self, jid, file_props, request=False): + def start_file_transfer(self, + jid: str, + file_props: FileProp, + request: bool = False + ) -> Optional[str]: logger.info("start file transfer with file: %s", file_props) contact = self._con.get_module('Contacts').get_contact(jid) use_security = contact.supports(Namespace.JINGLE_XTLS) @@ -222,7 +228,9 @@ def start_file_transfer(self, jid, file_props, request=False): elif contact.supports(Namespace.JINGLE_IBB): transport = JingleTransportIBB() else: - transport = None + logger.error('No suitable transport method available for %s', + contact.jid) + return senders = 'initiator' if request: ===================================== gajim/common/socks5.py ===================================== @@ -689,9 +689,12 @@ def write_next(self): raise e except OpenSSL.SSL.SysCallError: return self._on_send_exception() - except Exception as e: + except socket.error as err: if e.errno not in (EINTR, ENOBUFS, EWOULDBLOCK): return self._on_send_exception() + except Exception as err: + return self._on_send_exception() + self.size += lenn current_time = time.time() self.file_props.elapsed_time += current_time - \ ===================================== gajim/gtk/filetransfer.py ===================================== @@ -17,6 +17,10 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Optional + import os import time import logging @@ -48,6 +52,7 @@ from gajim.common.modules.bytestream import is_transfer_paused from gajim.common.modules.bytestream import is_transfer_stopped from gajim.common.modules.contacts import BareContact +from gajim.common import types from .dialogs import DialogButton from .dialogs import ConfirmationDialog @@ -390,12 +395,20 @@ def _on_yes(): text=_('_Download Again'), callback=_on_yes)]).show() - def show_file_send_request(self, account, contact): + def show_file_send_request(self, + account: str, + contact: types.BareContact + ) -> None: send_callback = partial(self.send_file, account, contact) SendFileDialog(contact, send_callback, self.window) - def send_file(self, account, contact, resource_jid, file_path, - file_desc=''): + def send_file(self, + account: str, + contact: types.BareContact, + resource_jid: JID, + file_path: str, + file_desc: str = '' + ) -> bool: """ Start the real transfer(upload) of the file """ @@ -403,11 +416,15 @@ def send_file(self, account, contact, resource_jid, file_path, pritext = _('Gajim can not read this file') sextext = _('Another process is using this file.') ErrorDialog(pritext, sextext) - return + return False file_name = os.path.split(file_path)[1] - file_props = self.get_send_file_props(account, contact, file_path, - file_name, file_desc) + file_props = self.get_send_file_props( + account, + resource_jid, + file_path, + file_name, + file_desc) if file_props is None: return False @@ -682,13 +699,19 @@ def get_iter_by_sid(self, typ, sid): return iter_ iter_ = self.model.iter_next(iter_) - def __convert_date(self, epoch): + @staticmethod + def __convert_date(epoch: float) -> str: # Converts date-time from seconds from epoch to iso 8601 dt = datetime.utcfromtimestamp(epoch) return dt.isoformat() + 'Z' - def get_send_file_props(self, account, contact, file_path, file_name, - file_desc=''): + def get_send_file_props(self, + account: str, + resource_jid: JID, + file_path: str, + file_name: str, + file_desc: str = '' + ) -> Optional[FileProp]: """ Create new file_props object and set initial file transfer properties in it @@ -696,15 +719,20 @@ def get_send_file_props(self, account, contact, file_path, file_name, if os.path.isfile(file_path): stat = os.stat(file_path) else: - ErrorDialog(_('Invalid File'), _('File: ') + file_path) + ErrorDialog( + _('Invalid File'), + _('File: %s') % file_path) return None + if stat[6] == 0: ErrorDialog( _('Invalid File'), _('It is not possible to send empty files')) return None + file_props = FilesProp.getNewFileProp( - account, sid=helpers.get_random_string()) + account, + sid=helpers.get_random_string()) mod_date = os.path.getmtime(file_path) file_props.file_name = file_path file_props.name = file_name @@ -714,7 +742,7 @@ def get_send_file_props(self, account, contact, file_path, file_name, file_props.elapsed_time = 0 file_props.size = stat[6] file_props.sender = account - file_props.receiver = contact + file_props.receiver = str(resource_jid) file_props.tt_account = account return file_props View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/810b140b5420b0cb57baf28b27df551… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/810b140b5420b0cb57baf28b27df551… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: MUC: Enable history when creating rooms
by Philipp Hörist (＠lovetox) 22 May '22

22 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8071c0ab by lovetox at 2022-05-23T00:45:04+02:00 imprv: MUC: Enable history when creating rooms - - - - - 810b140b by lovetox at 2022-05-23T00:46:06+02:00 fix: MUC: Ignore gateway services for room creation This is a temporary workaround until we have a proper UI to support multiple MUC services - - - - - 2 changed files: - gajim/common/helpers.py - gajim/common/modules/muc.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1137,6 +1137,7 @@ def get_default_muc_config() -> dict[str, Union[bool, str]]: 'muc#roomconfig_persistentroom': True, 'muc#roomconfig_whois': 'anyone', 'muc#roomconfig_moderatedroom': False, + 'muc#roomconfig_enablelogging': True, # Ejabberd options 'allow_voice_requests': False, ===================================== gajim/common/modules/muc.py ===================================== @@ -145,6 +145,9 @@ def service_jid(self): return self._muc_service_jid def pass_disco(self, info): + if info.is_gateway: + return + for identity in info.identities: if identity.category != 'conference': continue View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9706d962bf6d552ccdd310c41f2f316… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9706d962bf6d552ccdd310c41f2f316… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update .gitignore
by Philipp Hörist (＠lovetox) 22 May '22

22 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9706d962 by lovetox at 2022-05-22T22:50:41+02:00 chore: Update .gitignore - - - - - 1 changed file: - .gitignore Changes: ===================================== .gitignore ===================================== @@ -20,6 +20,7 @@ stamp-h1 Makefile __pycache__/ .mypy_cache/ +debian_build/ build/ dist/ gajim.egg-info/ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9706d962bf6d552ccdd310c41f2f3161… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9706d962bf6d552ccdd310c41f2f3161… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Run debian build
by Philipp Hörist (＠lovetox) 22 May '22

22 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 297127ac by lovetox at 2022-05-22T22:47:51+02:00 ci: Run debian build - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -63,6 +63,7 @@ build-linux: - if: '$CI_COMMIT_TAG' script: - python3 setup.py sdist + - python3 .ci/debian_build.py "$(find dist/gajim-*)" artifacts: name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/297127ac16895a77150f43c605e33fc4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/297127ac16895a77150f43c605e33fc4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ci: Add debian build script
by Philipp Hörist (＠lovetox) 22 May '22

22 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ce5c3f48 by lovetox at 2022-05-22T21:58:34+02:00 ci: Add debian build script - - - - - 86d8ea51 by lovetox at 2022-05-22T21:58:34+02:00 ci: Update debian files - Make changelog generic - Change package name - - - - - 3 changed files: - + .ci/debian_build.py - debian/changelog - debian/control Changes: ===================================== .ci/debian_build.py ===================================== @@ -0,0 +1,99 @@ +#!/usr/bin/env python3 + +from __future__ import annotations + +import argparse +import dataclasses +import logging +import shutil +import subprocess +from datetime import datetime +from datetime import timezone +from pathlib import Path + +LOG_FORMAT = '%(asctime)s %(levelname)s %(message)s' +logging.basicConfig(format=LOG_FORMAT, level=logging.DEBUG) +log = logging.getLogger() + +ROOT_DIR = Path(__file__).resolve().parent.parent +BUILD_DIR = ROOT_DIR / 'debian_build' + +DATE = datetime.now().strftime('%Y%m%d') +DATE_TIME = datetime.now(tz=timezone.utc).strftime('%a, %d %b %Y %T %z') + + +(a)dataclasses.dataclass +class ReleaseContext: + app: str + pkg_name: str + release_name: str + release_dir: Path + tarball: Path + + @classmethod + def from_tarball(cls, path: str) -> ReleaseContext: + tarball = Path(path) + app = tarball.name.split('-', maxsplit=1)[0] + pkg_name = f'{app}-nightly' + release_name = f'{pkg_name}_{DATE}' + release_dir = BUILD_DIR / release_name + return cls(app=app, + pkg_name=pkg_name, + release_name=release_name, + release_dir=release_dir, + tarball=tarball) + + +def clean_build_dir() -> None: + log.info('Cleanup build directory') + if BUILD_DIR.exists(): + shutil.rmtree(BUILD_DIR) + BUILD_DIR.mkdir() + + +def prepare_package_dir(context: ReleaseContext) -> None: + log.info('Extract tarball') + tarball = Path(shutil.copy(context.tarball, BUILD_DIR)) + tarball = tarball.rename(BUILD_DIR / f'{context.release_name}.orig.tar.gz') + shutil.unpack_archive(tarball, BUILD_DIR) + + log.info('Rename dir to: %s', context.release_name) + folder = list(BUILD_DIR.glob(f'{context.app}-?.?.?'))[0] + folder = folder.rename(context.release_dir) + + log.info('Copy debian folder into release directory') + shutil.copytree(ROOT_DIR / 'debian', context.release_dir / 'debian') + + +def prepare_changelog(context: ReleaseContext) -> None: + log.info('Prepare Changelog') + changelog = context.release_dir / 'debian' / 'changelog' + content = changelog.read_text() + content = content.replace('{DATE}', DATE) + content = content.replace('{DATE_TIME}', DATE_TIME) + changelog.write_text(content) + + +def build(context: ReleaseContext) -> None: + log.info('Start package build') + subprocess.run( + [ + 'dpkg-buildpackage', + '-rfakeroot', + '--no-sign' + ], + cwd=context.release_dir, + check=True) + + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Build debian package') + parser.add_argument('tarball', help='Path to tarball e.g. app.tar.gz') + args = parser.parse_args() + + context = ReleaseContext.from_tarball(args.tarball) + + clean_build_dir() + prepare_package_dir(context) + prepare_changelog(context) + build(context) ===================================== debian/changelog ===================================== @@ -1,6 +1,5 @@ -gajim-svn (20060820) unstable; urgency=low +gajim-nightly ({DATE}) unstable; urgency=low - * daily snapshot - - -- Yann Le Boulanger <asterix(a)lagaule.org> Sun, 20 Aug 2006 01:30:01 +0200 + * https://dev.gajim.org/gajim/gajim/-/commits/master + -- Gajim CI <ci(a)gajim.org> {DATE_TIME} ===================================== debian/control ===================================== @@ -1,4 +1,4 @@ -Source: gajim-default-nightly +Source: gajim-nightly Section: net Priority: optional Maintainer: Yann Leboulanger <asterix(a)lagaule.org> @@ -12,7 +12,7 @@ Homepage: https://gajim.org Vcs-Git: https://dev.gajim.org/gajim/gajim.git Vcs-Browser: https://dev.gajim.org/gajim/gajim/tree/master -Package: gajim-default-nightly +Package: gajim-nightly Architecture: all Depends: python3 (>= 3.9), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c88a131bc02ea7d1fe04d0960c8c28c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c88a131bc02ea7d1fe04d0960c8c28c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Add debian folder
by Yann Leboulanger (＠asterix) 22 May '22

22 May '22

Yann Leboulanger pushed to branch master at gajim / gajim Commits: c88a131b by Yann Leboulanger at 2022-05-22T19:06:51+02:00 chore: Add debian folder - - - - - 9 changed files: - + debian/changelog - + debian/compat - + debian/control - + debian/copyright - + debian/gajim.manpages - + debian/pyversions - + debian/rules - + debian/source/format - + debian/watch Changes: ===================================== debian/changelog ===================================== @@ -0,0 +1,6 @@ +gajim-svn (20060820) unstable; urgency=low + + * daily snapshot + + -- Yann Le Boulanger <asterix(a)lagaule.org> Sun, 20 Aug 2006 01:30:01 +0200 + ===================================== debian/compat ===================================== @@ -0,0 +1 @@ +13 ===================================== debian/control ===================================== @@ -0,0 +1,56 @@ +Source: gajim-default-nightly +Section: net +Priority: optional +Maintainer: Yann Leboulanger <asterix(a)lagaule.org> +Build-Depends: + debhelper (>= 9), + dh-python, + python3 (>= 3.9), + gettext (>= 0.17-4), +Standards-Version: 4.0.0 +Homepage: https://gajim.org +Vcs-Git: https://dev.gajim.org/gajim/gajim.git +Vcs-Browser: https://dev.gajim.org/gajim/gajim/tree/master + +Package: gajim-default-nightly +Architecture: all +Depends: + python3 (>= 3.9), + ${misc:Depends}, ${python3:Depends}, + python3-gi (>=3.32.0), + python3-gi-cairo, + gir1.2-gtk-3.0 (>=3.22), + python3-nbxmpp-nightly (>= 20160905), + python3-openssl, + python3-keyring, + python3-css-parser, + python3-precis-i18n, + python3-packaging, +Recommends: + ca-certificates, + dbus, + python3-dbus, + notification-daemon, + python3-crypto, + pulseaudio-utils | alsa-utils | sox | oss4-base, + python3-gnupg (>= 0.3.8), +Suggests: + network-manager, + gir1.2-gtkspell3-3.0, + aspell-en | aspell-dictionary, + gir1.2-gnomekeyring-1.0, + gnome-keyring, + python3-kerberos, + texlive-latex-base, + dvipng, + gir1.2-farstream-0.2, + gir1.2-gstreamer-1.0, + gstreamer1.0-plugins-good, + gstreamer1.0-gtk3, + python3-pycurl, + gir1.2-gupnpigd-1.0, +Conflicts: gajim +Description: XMPP client written in Python / GTK + Gajim is a XMPP client. It has a tabbed user interface with normal + chats, group chats, and has many features such as, TLS, GPG, SSL, multiple + accounts, avatars, file transfers, audio/video call, D-Bus and Metacontacts. ===================================== debian/copyright ===================================== @@ -0,0 +1,27 @@ +This package was debianized by Yann L.B. asterix(a)lagaule.org on +Wed, 16 Jun 2005 20:00:00 +0100. + +It was downloaded from: + http://www.gajim.org/downloads/ + +Upstream Authors: + - Yann Le Boulanger <asterix(a)lagaule.org> + + +Copyright: (c) 2003-2011 Gajim Team + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Debian system; see the file /usr/share/common-licenses/GPL. If not, +write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. + ===================================== debian/gajim.manpages ===================================== @@ -0,0 +1 @@ +data/gajim.1 ===================================== debian/pyversions ===================================== @@ -0,0 +1 @@ +3.9- ===================================== debian/rules ===================================== @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk + +export PYBUILD_NAME=gajim + +%: + dh $@ --with python3 --buildsystem=pybuild + +# test target is broken +override_dh_auto_test: ===================================== debian/source/format ===================================== @@ -0,0 +1 @@ +3.0 (quilt) ===================================== debian/watch ===================================== @@ -0,0 +1,8 @@ +# Control file for uscan +# Run the "uscan" command to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://gajim.org/downloads/([\d.]*)/gajim-([\d\.]*)\.tar\.(?:gz|bz2|xz) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c88a131bc02ea7d1fe04d0960c8c28cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c88a131bc02ea7d1fe04d0960c8c28cb… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits