Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: imprv: SideBarSwitcher: Add width parameter
by Daniel Brötzmann (＠wurstsalat) 28 May '22

28 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b764b510 by wurstsalat at 2022-05-28T21:01:20+02:00 imprv: SideBarSwitcher: Add width parameter - - - - - 661a3025 by wurstsalat at 2022-05-28T21:01:45+02:00 imprv: Unify ContactInfo and GroupchatDetails elements width - - - - - 6 changed files: - gajim/data/gui/contact_info.ui - gajim/gtk/contact_info.py - gajim/gtk/contact_settings.py - gajim/gtk/groupchat_details.py - gajim/gtk/groupchat_settings.py - gajim/gtk/sidebar_switcher.py Changes: ===================================== gajim/data/gui/contact_info.ui ===================================== @@ -409,6 +409,9 @@ </child> </object> </child> + <style> + <class name="padding-18"/> + </style> </object> <packing> <property name="name">information</property> @@ -711,6 +714,9 @@ </child> </object> </child> + <style> + <class name="padding-18"/> + </style> </object> <packing> <property name="name">settings</property> ===================================== gajim/gtk/contact_info.py ===================================== @@ -93,7 +93,7 @@ def __init__(self, self._tasks: list[Task] = [] self._devices: dict[str, DeviceGrid] = {} - self._switcher = SideBarSwitcher() + self._switcher = SideBarSwitcher(width=250) self._switcher.set_stack(self._ui.main_stack, rows_visible=False) self._ui.main_grid.attach(self._switcher, 0, 0, 1, 1) self._ui.main_stack.connect('notify::visible-child-name', ===================================== gajim/gtk/contact_settings.py ===================================== @@ -27,9 +27,9 @@ class ContactSettings(SettingsBox): def __init__(self, account: str, jid: JID) -> None: SettingsBox.__init__(self, account, str(jid)) - self.get_style_context().add_class('settings-border') self.set_selection_mode(Gtk.SelectionMode.NONE) + self.set_size_request(700, -1) self.set_valign(Gtk.Align.START) self.set_halign(Gtk.Align.CENTER) ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -62,7 +62,7 @@ def __init__(self, self._ui = get_builder('groupchat_details.ui') self._ui.connect_signals(self) - self._switcher = SideBarSwitcher() + self._switcher = SideBarSwitcher(width=250) self._switcher.set_stack(self._ui.main_stack) self._ui.main_grid.attach(self._switcher, 0, 0, 1, 1) self._ui.main_stack.connect('notify::visible-child-name', @@ -148,6 +148,7 @@ def _add_groupchat_info(self) -> None: def _add_groupchat_settings(self) -> None: main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=24) + main_box.get_style_context().add_class('padding-18') settings_box = GroupChatSettings(self.account, self._contact.jid) main_box.add(settings_box) ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -27,9 +27,9 @@ class GroupChatSettings(SettingsBox): def __init__(self, account: str, jid: JID) -> None: SettingsBox.__init__(self, account, str(jid)) - self.get_style_context().add_class('settings-border') self.set_selection_mode(Gtk.SelectionMode.NONE) + self.set_size_request(700, -1) self.set_valign(Gtk.Align.START) self.set_halign(Gtk.Align.CENTER) ===================================== gajim/gtk/sidebar_switcher.py ===================================== @@ -23,10 +23,12 @@ class SideBarSwitcher(Gtk.ListBox): - def __init__(self): + def __init__(self, width: Optional[int] = None) -> None: Gtk.ListBox.__init__(self) self.set_vexpand(True) self.get_style_context().add_class('settings-menu') + if width is not None: + self.set_size_request(width, -1) self.connect('row-activated', self._on_row_activated) self._stack = cast(Gtk.Stack, None) self._rows: dict[str, Row] = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/061c999533cd4b7c1ccdae99e06dda8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/061c999533cd4b7c1ccdae99e06dda8… You're receiving this email because of your account on dev.gajim.org.

1 0

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

28 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 926ba846 by wurstsalat at 2022-05-28T19:41:41+02:00 chore: AdHocCommands: Add type annotations - - - - - 7f1f80e2 by wurstsalat at 2022-05-28T20:10:43+02:00 chore: Bytestream: Add type annotations - - - - - efaf720e by wurstsalat at 2022-05-28T20:35:33+02:00 chore: Caps: Add type annotations - - - - - 061c9995 by wurstsalat at 2022-05-28T20:41:52+02:00 chore: TaskManager: Add type annotations - - - - - 6 changed files: - gajim/common/app.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/bytestream.py - gajim/common/modules/caps.py - gajim/common/task_manager.py - pyrightconfig.json Changes: ===================================== gajim/common/app.py ===================================== @@ -62,6 +62,7 @@ from gajim.common.cert_store import CertificateStore from gajim.common.call_manager import CallManager from gajim.common.preview import PreviewManager + from gajim.common.task_manager import TaskManager interface = cast(types.InterfaceT, None) @@ -112,7 +113,7 @@ def __init__(self): preview_manager = cast('PreviewManager', None) -task_manager = None +task_manager = cast('TaskManager', None) # These will be set in app.gui_interface. idlequeue = cast(IdleQueue, None) ===================================== gajim/common/modules/adhoc_commands.py ===================================== @@ -19,14 +19,23 @@ # 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 Callable +from typing import Optional +from typing import Type + import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq +from nbxmpp.structs import IqProperties from nbxmpp.structs import StanzaHandler from nbxmpp.modules import dataforms from nbxmpp.util import generate_id from gajim.common import app from gajim.common import helpers +from gajim.common import types from gajim.common.events import AdHocCommandError from gajim.common.events import AdHocCommandActionResponse from gajim.common.i18n import _ @@ -39,7 +48,7 @@ class AdHocCommand: commandfeatures = (Namespace.DATA,) @staticmethod - def is_visible_for(_samejid): + def is_visible_for(_samejid: bool) -> bool: """ This returns True if that command should be visible and invocable for others @@ -49,13 +58,21 @@ def is_visible_for(_samejid): """ return True - def __init__(self, conn, jid, sessionid): + def __init__(self, + conn: types.Client, + jid: str, + sessionid: str + ) -> None: self.connection = conn self.jid = jid self.sessionid = sessionid - def build_response(self, request, status='executing', defaultaction=None, - actions=None): + def build_response(self, + request: Iq, + status: str = 'executing', + defaultaction: Optional[str] = None, + actions: Optional[list[str]] = None + ) -> tuple[Iq, nbxmpp.Node]: assert status in ('executing', 'completed', 'canceled') response = request.buildReply('result') @@ -74,11 +91,11 @@ def build_response(self, request, status='executing', defaultaction=None, cmd.addChild('actions', attrs, actions) return response, cmd - def bad_request(self, stanza): + def bad_request(self, stanza: Iq) -> None: self.connection.connection.send( nbxmpp.Error(stanza, Namespace.STANZAS + ' bad-request')) - def cancel(self, request): + def cancel(self, request: Iq) -> bool: response = self.build_response(request, status='canceled')[0] self.connection.connection.send(response) return False # finish the session @@ -88,21 +105,25 @@ class ChangeStatusCommand(AdHocCommand): commandnode = 'change-status' commandname = _('Change status information') - def __init__(self, conn, jid, sessionid): + def __init__(self, + conn: types.Client, + jid: str, + sessionid: str + ) -> None: AdHocCommand.__init__(self, conn, jid, sessionid) - self._callback = self.first_step + self._callback: Callable[..., bool] = self.first_step @staticmethod - def is_visible_for(samejid): + def is_visible_for(samejid: bool) -> bool: """ Change status is visible only if the entity has the same bare jid """ return samejid - def execute(self, request): + def execute(self, request: Iq): return self._callback(request) - def first_step(self, request): + def first_step(self, request: Iq) -> bool: # first query... response, cmd = self.build_response(request, defaultaction='execute', @@ -141,7 +162,7 @@ def first_step(self, request): return True # keep the session - def second_step(self, request): + def second_step(self, request: Iq) -> bool: # check if the data is correct try: form = dataforms.SimpleDataForm( @@ -190,7 +211,7 @@ class AdHocCommands(BaseModule): 'execute_command', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -201,24 +222,24 @@ def __init__(self, con): ] # a list of all commands exposed: node -> command class - self._commands = {} + self._commands: dict[str, Type[AdHocCommand]] = {} if app.settings.get('remote_commands'): for cmdobj in (ChangeStatusCommand,): self._commands[cmdobj.commandnode] = cmdobj # a list of sessions; keys are tuples (jid, sessionid, node) - self._sessions = {} + self._sessions: dict[tuple[str, str, str], AdHocCommand] = {} - def get_own_bare_jid(self): + def get_own_bare_jid(self) -> str: return self._con.get_own_jid().bare - def is_same_jid(self, jid): + def is_same_jid(self, jid: str) -> bool: """ Test if the bare jid given is the same as our bare jid """ return nbxmpp.JID.from_string(jid).bare == self.get_own_bare_jid() - def command_list_query(self, stanza): + def command_list_query(self, stanza: Iq) -> None: iq = stanza.buildReply('result') jid = helpers.get_full_jid_from_iq(stanza) query = iq.getTag('query') @@ -235,7 +256,7 @@ def command_list_query(self, stanza): self._con.connection.send(iq) - def command_info_query(self, stanza): + def command_info_query(self, stanza: Iq) -> bool: """ Send disco#info result for query for command (XEP-0050, example 6.). Return True if the result was sent, False if not @@ -268,7 +289,7 @@ def command_info_query(self, stanza): return False - def command_items_query(self, stanza): + def command_items_query(self, stanza: Iq) -> bool: """ Send disco#items result for query for command. Return True if the result was sent, False if not. @@ -287,7 +308,11 @@ def command_items_query(self, stanza): return False - def _execute_command_received(self, _con, stanza, _properties): + def _execute_command_received(self, + _con: types.xmppClient, + stanza: Iq, + _properties: IqProperties + ) -> None: jid = helpers.get_full_jid_from_iq(stanza) cmd = stanza.getTag('command') @@ -364,8 +389,13 @@ def _execute_command_received(self, _con, stanza, _properties): raise nbxmpp.NodeProcessed - def send_command(self, jid, node, session_id, - form, action='execute'): + def send_command(self, + jid: str, + node: str, + session_id: str, + form: dataforms.SimpleDataForm, + action: str = 'execute' + ) -> None: """ Send the command with data form. Wait for reply """ @@ -386,7 +416,10 @@ def send_command(self, jid, node, session_id, self._con.connection.SendAndCallForResponse( stanza, self._action_response_received) - def _action_response_received(self, _nbxmpp_client, stanza): + def _action_response_received(self, + _nbxmpp_client: types.xmppClient, + stanza: Iq + ) -> None: if not nbxmpp.isResultNode(stanza): self._log.info('Error: %s', stanza.getError()) @@ -399,7 +432,11 @@ def _action_response_received(self, _nbxmpp_client, stanza): app.ged.raise_event( AdHocCommandActionResponse(conn=self._con, command=command)) - def send_cancel(self, jid, node, session_id): + def send_cancel(self, + jid: str, + node: str, + session_id: str + ) -> None: """ Send the command with action='cancel' """ @@ -415,7 +452,10 @@ def send_cancel(self, jid, node, session_id): self._con.connection.SendAndCallForResponse( stanza, self._cancel_result_received) - def _cancel_result_received(self, _nbxmpp_client, stanza): + def _cancel_result_received(self, + _nbxmpp_client: types.xmppClient, + stanza: Iq + ) -> None: if not nbxmpp.isResultNode(stanza): self._log.warning('Error: %s', stanza.getError()) else: ===================================== gajim/common/modules/bytestream.py ===================================== @@ -24,26 +24,37 @@ # 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 Any +from typing import Optional + import socket import logging import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq +from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import IqProperties from nbxmpp.structs import StanzaHandler + from gi.repository import GLib from gajim.common import app from gajim.common import helpers from gajim.common import jingle_xtls +from gajim.common import types from gajim.common.events import FileRequestError +from gajim.common.file_props import FileProp from gajim.common.file_props import FilesProp from gajim.common.socks5 import Socks5SenderClient from gajim.common.modules.base import BaseModule - log = logging.getLogger('gajim.c.m.bytestream') -def is_transfer_paused(file_props: FilesProp) -> bool: + +def is_transfer_paused(file_props: FileProp) -> bool: if file_props.stopped: return False if file_props.completed: @@ -52,7 +63,7 @@ def is_transfer_paused(file_props: FilesProp) -> bool: return False return file_props.paused -def is_transfer_active(file_props: FilesProp) -> bool: +def is_transfer_active(file_props: FileProp) -> bool: if file_props.stopped: return False if file_props.completed: @@ -63,7 +74,7 @@ def is_transfer_active(file_props: FilesProp) -> bool: return True return not file_props.paused -def is_transfer_stopped(file_props: FilesProp) -> bool: +def is_transfer_stopped(file_props: FileProp) -> bool: if not file_props: return True if file_props.error: @@ -76,7 +87,7 @@ def is_transfer_stopped(file_props: FilesProp) -> bool: class Bytestream(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -101,7 +112,7 @@ def __init__(self, con): self.ok_id = None self.fail_id = None - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: if Namespace.BYTESTREAM not in info.features: return if app.settings.get_account_setting(self._account, 'use_ft_proxies'): @@ -115,18 +126,18 @@ def pass_disco(self, info): raise nbxmpp.NodeProcessed @staticmethod - def _ft_get_receiver_jid(file_props): + def _ft_get_receiver_jid(file_props: FileProp) -> str: return file_props.receiver.jid + '/' + file_props.receiver.resource @staticmethod - def _ft_get_from(iq_obj): + def _ft_get_from(iq_obj: Iq) -> Optional[str]: return helpers.get_full_jid_from_iq(iq_obj) @staticmethod - def _ft_get_streamhost_jid_attr(streamhost): + def _ft_get_streamhost_jid_attr(streamhost: nbxmpp.Node) -> str: return helpers.parse_jid(streamhost.getAttr('jid')) - def send_file_approval(self, file_props): + def send_file_approval(self, file_props: FileProp) -> None: """ Send iq, confirming that we want to download the file """ @@ -166,7 +177,7 @@ def send_file_approval(self, file_props): session.approve_content('file', content.name) - def send_file_rejection(self, file_props): + def send_file_rejection(self, file_props: FileProp) -> None: """ Inform sender that we refuse to download the file @@ -181,7 +192,9 @@ def send_file_rejection(self, file_props): None, file_props.sid): session.cancel_session() - def send_success_connect_reply(self, streamhost): + def send_success_connect_reply(self, + streamhost: Optional[dict[str, Any]] + ) -> None: """ Send reply to the initiator of FT that we made a connection """ @@ -198,7 +211,7 @@ def send_success_connect_reply(self, streamhost): stream_tag.setAttr('jid', streamhost['jid']) self._con.connection.send(iq) - def stop_all_active_file_transfers(self, contact): + def stop_all_active_file_transfers(self, contact: types.ChatContactT): """ Stop all active transfer to or from the given contact """ @@ -212,7 +225,7 @@ def stop_all_active_file_transfers(self, contact): app.ged.raise_event( FileRequestError( conn=self._con, - jid=app.get_jid_without_resource(contact.jid), + jid=contact.jid.bare, file_props=file_props, error_msg='')) sender_jid = file_props.sender @@ -220,20 +233,20 @@ def stop_all_active_file_transfers(self, contact): file_props.error = -3 self.remove_transfer(file_props) - def remove_all_transfers(self): + def remove_all_transfers(self) -> None: """ Stop and remove all active connections from the socks5 pool """ for file_props in FilesProp.getAllFileProp(): self.remove_transfer(file_props) - def remove_transfer(self, file_props): + def remove_transfer(self, file_props: Optional[FileProp]) -> None: if file_props is None: return self.disconnect_transfer(file_props) @staticmethod - def disconnect_transfer(file_props): + def disconnect_transfer(file_props: FileProp) -> None: if file_props is None: return if file_props.hash_: @@ -245,7 +258,7 @@ def disconnect_transfer(file_props): app.socks5queue.remove_receiver(host['idx']) app.socks5queue.remove_sender(host['idx']) - def _send_socks5_info(self, file_props): + def _send_socks5_info(self, file_props: FileProp) -> None: """ Send iq for the present streamhosts and proxies """ @@ -287,7 +300,11 @@ def _send_socks5_info(self, file_props): # Upnp-igd is asynchronous, so it will send the iq itself @staticmethod - def _add_streamhosts_to_query(query, sender, port, hosts): + def _add_streamhosts_to_query(query: nbxmpp.Node, + sender: str, + port: str, + hosts: list[str] + ) -> None: for host in hosts: streamhost = nbxmpp.Node(tag='streamhost') query.addChild(node=streamhost) @@ -295,7 +312,10 @@ def _add_streamhosts_to_query(query, sender, port, hosts): streamhost.setAttr('host', host) streamhost.setAttr('jid', sender) - def _add_local_ips_as_streamhosts_to_query(self, query, file_props): + def _add_local_ips_as_streamhosts_to_query(self, + query: nbxmpp.Node, + file_props: FileProp + ) -> None: if not app.settings.get_account_setting(self._account, 'ft_send_local_ips'): return @@ -321,7 +341,10 @@ def _add_local_ips_as_streamhosts_to_query(self, query, file_props): except socket.gaierror: log.error('wrong host, invalid local address?') - def _add_addiditional_streamhosts_to_query(self, query, file_props): + def _add_addiditional_streamhosts_to_query(self, + query: nbxmpp.Node, + file_props: FileProp + ) -> None: sender = file_props.sender port = app.settings.get('file_transfers_port') ft_add_hosts_to_send = app.settings.get('ft_add_hosts_to_send') @@ -332,7 +355,11 @@ def _add_addiditional_streamhosts_to_query(self, query, file_props): add_hosts = [] self._add_streamhosts_to_query(query, sender, port, add_hosts) - def _add_upnp_igd_as_streamhost_to_query(self, query, file_props, iq): + def _add_upnp_igd_as_streamhost_to_query(self, + query: nbxmpp.Node, + file_props: FileProp, + iq: Iq + ) -> None: my_ip = self._con.local_address if my_ip is None or not app.is_installed('UPNP'): log.warning('No local address available') @@ -346,7 +373,7 @@ def _add_upnp_igd_as_streamhost_to_query(self, query, file_props, iq): self._con.connection.send(iq) return - def ip_is_local(ip): + def ip_is_local(ip: str) -> bool: if '.' not in ip: # it's an IPv6 return True @@ -370,7 +397,7 @@ def ip_is_local(ip): self.no_gupnp_reply_id = 0 - def cleanup_gupnp(): + def cleanup_gupnp() -> None: if self.no_gupnp_reply_id: GLib.source_remove(self.no_gupnp_reply_id) self.no_gupnp_reply_id = 0 @@ -410,7 +437,7 @@ def fail(_gupnp, error, _proto, _ext_ip, _local_ip, _local_port, _desc): self._con.connection.send(iq) cleanup_gupnp() - def no_upnp_reply(): + def no_upnp_reply() -> bool: log.debug('Got not GUPnP-IGD answer') # stop trying to use it app.disable_dependency('UPNP') @@ -432,7 +459,10 @@ def no_upnp_reply(): 3600, 'Gajim file transfer') - def _add_proxy_streamhosts_to_query(self, query, file_props): + def _add_proxy_streamhosts_to_query(self, + query: nbxmpp.Node, + file_props: FileProp + ) -> None: proxyhosts = self._get_file_transfer_proxies_from_config(file_props) if proxyhosts: file_props.proxy_receiver = file_props.receiver @@ -445,14 +475,16 @@ def _add_proxy_streamhosts_to_query(self, query, file_props): proxyhost['port'], [proxyhost['host']]) - def _get_file_transfer_proxies_from_config(self, file_props): + def _get_file_transfer_proxies_from_config(self, + file_props: FileProp + ) -> list[dict[str, Any]]: configured_proxies = app.settings.get_account_setting( self._account, 'file_transfer_proxies') shall_use_proxies = app.settings.get_account_setting( self._account, 'use_ft_proxies') if shall_use_proxies: - proxyhost_dicts = [] - proxies = [] + proxyhost_dicts: list[dict[str, Any]] = [] + proxies: list[str] = [] if configured_proxies: proxies = [item.strip() for item in configured_proxies.split(',')] @@ -469,7 +501,7 @@ def _get_file_transfer_proxies_from_config(self, file_props): proxy, self._account) if not host: continue - host_dict = { + host_dict: dict[str, Any] = { 'state': 0, 'target': file_props.receiver, 'id': file_props.sid, @@ -485,14 +517,19 @@ def _get_file_transfer_proxies_from_config(self, file_props): return [] @staticmethod - def _result_socks5_sid(sid, hash_id): + def _result_socks5_sid(sid: str, hash_id: str) -> None: """ Store the result of SHA message from auth """ file_props = FilesProp.getFilePropBySid(sid) file_props.hash_ = hash_id - def _connect_error(self, sid, error, error_type, msg=None): + def _connect_error(self, + sid: str, + error: str, + error_type: str, + msg: Optional[str] = None + ) -> None: """ Called when there is an error establishing BS connection, or when connection is rejected @@ -522,7 +559,7 @@ def _connect_error(self, sid, error, error_type, msg=None): file_props=file_props, error_msg=msg)) - def _proxy_auth_ok(self, proxy): + def _proxy_auth_ok(self, proxy: dict[str, Any]) -> None: """ Called after authentication to proxy server """ @@ -539,7 +576,11 @@ def _proxy_auth_ok(self, proxy): iq.setID(auth_id) self._con.connection.send(iq) - def _on_bytestream_error(self, _con, iq_obj, _properties): + def _on_bytestream_error(self, + _con: types.xmppClient, + iq_obj: Iq, + _properties: IqProperties + ) -> None: id_ = iq_obj.getAttr('id') frm = helpers.get_full_jid_from_iq(iq_obj) query = iq_obj.getTag('query') @@ -557,13 +598,16 @@ def _on_bytestream_error(self, _con, iq_obj, _properties): error_msg='')) raise nbxmpp.NodeProcessed - def _on_bytestream_set(self, _con, iq_obj, _properties): + def _on_bytestream_set(self, + _con: types.xmppClient, + iq_obj: Iq, + _properties: IqProperties): target = iq_obj.getAttr('to') id_ = iq_obj.getAttr('id') query = iq_obj.getTag('query') sid = query.getAttr('sid') file_props = FilesProp.getFileProp(self._account, sid) - streamhosts = [] + streamhosts: list[dict[str, Any]] = [] for item in query.getChildren(): if item.getName() == 'streamhost': host_dict = { @@ -602,7 +646,7 @@ def _on_bytestream_set(self, _con, iq_obj, _properties): raise nbxmpp.NodeProcessed file_props.streamhosts = streamhosts - def _connection_error(sid): + def _connection_error(sid: str) -> None: self._connect_error(sid, 'item-not-found', 'cancel', @@ -615,7 +659,11 @@ def _connection_error(sid): _connection_error) raise nbxmpp.NodeProcessed - def _on_result(self, _con, iq_obj, _properties): + def _on_result(self, + _con: types.xmppClient, + iq_obj: Iq, + _properties: IqProperties + ) -> None: # if we want to respect xep-0065 we have to check for proxy # activation result in any result iq real_id = iq_obj.getAttr('id') @@ -633,7 +681,11 @@ def _on_result(self, _con, iq_obj, _properties): app.socks5queue.activate_proxy(host['idx']) raise nbxmpp.NodeProcessed - def _on_bytestream_result(self, _con, iq_obj, _properties): + def _on_bytestream_result(self, + _con: types.xmppClient, + iq_obj: Iq, + _properties: IqProperties + ) -> None: frm = self._ft_get_from(iq_obj) real_id = iq_obj.getAttr('id') query = iq_obj.getTag('query') ===================================== gajim/common/modules/caps.py ===================================== @@ -17,16 +17,27 @@ # XEP-0115: Entity Capabilities +from __future__ import annotations + +from typing import Any +from typing import Callable +from typing import Optional + import weakref from collections import defaultdict +from nbxmpp.errors import StanzaError from nbxmpp.namespaces import Namespace -from nbxmpp.structs import StanzaHandler +from nbxmpp.protocol import JID +from nbxmpp.protocol import Presence from nbxmpp.structs import DiscoIdentity +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import PresenceProperties +from nbxmpp.task import Task as nbxmpp_Task from nbxmpp.util import compute_caps_hash -from nbxmpp.errors import StanzaError from gajim.common import app +from gajim.common import types from gajim.common.const import COMMON_FEATURES from gajim.common.const import Entity from gajim.common.helpers import get_optional_features @@ -42,7 +53,7 @@ class Caps(BaseModule): 'set_caps' ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -56,10 +67,11 @@ def __init__(self, con): DiscoIdentity(category='client', type='pc', name='Gajim') ] - self._queued_tasks_by_hash = defaultdict(set) - self._queued_tasks_by_jid = {} + self._queued_tasks_by_hash: defaultdict[ + str, set[EntityCapsTask]] = defaultdict(set) + self._queued_tasks_by_jid: dict[JID, EntityCapsTask] = {} - def _queue_task(self, task): + def _queue_task(self, task: EntityCapsTask) -> None: old_task = self._get_task(task.entity.jid) if old_task is not None: self._remove_task(old_task) @@ -69,24 +81,28 @@ def _queue_task(self, task): self._queued_tasks_by_jid[task.entity.jid] = task app.task_manager.add_task(task) - def _get_task(self, jid): + def _get_task(self, jid: JID) -> Optional[EntityCapsTask]: return self._queued_tasks_by_jid.get(jid) - def _get_similar_tasks(self, task): + def _get_similar_tasks(self, task: EntityCapsTask) -> set[EntityCapsTask]: return self._queued_tasks_by_hash.pop(task.entity.hash) - def _remove_task(self, task): + def _remove_task(self, task: EntityCapsTask) -> None: task.set_obsolete() del self._queued_tasks_by_jid[task.entity.jid] self._queued_tasks_by_hash[task.entity.hash].discard(task) - def _remove_all_tasks(self): + def _remove_all_tasks(self) -> None: for task in self._queued_tasks_by_jid.values(): task.set_obsolete() self._queued_tasks_by_jid.clear() self._queued_tasks_by_hash.clear() - def _entity_caps(self, _con, _stanza, properties): + def _entity_caps(self, + _con: types.xmppClient, + _stanza: Presence, + properties: PresenceProperties + ) -> None: if properties.type.is_error or properties.type.is_unavailable: return @@ -113,7 +129,7 @@ def _entity_caps(self, _con, _stanza, properties): contact = self._con.get_module('Contacts').get_contact(properties.jid) contact.notify('caps-update') - def _execute_task(self, task): + def _execute_task(self, task: EntityCapsTask) -> None: self._log.info('Request %s from %s', task.entity.hash, task.entity.jid) self._con.get_module('Discovery').disco_info( task.entity.jid, @@ -121,7 +137,7 @@ def _execute_task(self, task): callback=self._on_disco_info, user_data=task.entity.jid) - def _on_disco_info(self, nbxmpp_task): + def _on_disco_info(self, nbxmpp_task: nbxmpp_Task) -> None: jid = nbxmpp_task.get_user_data() task = self._get_task(jid) if task is None: @@ -162,7 +178,7 @@ def _on_disco_info(self, nbxmpp_task): task.entity.jid) contact.notify('caps-update') - def update_caps(self): + def update_caps(self) -> None: if not app.account_is_connected(self._account): return @@ -178,13 +194,17 @@ def update_caps(self): app.connections[self._account].status, app.connections[self._account].status_message) - def cleanup(self): + def cleanup(self) -> None: self._remove_all_tasks() BaseModule.cleanup(self) class EntityCapsTask(Task): - def __init__(self, account, properties, callback): + def __init__(self, + account: str, + properties: PresenceProperties, + callback: Callable[..., Any] + ) -> None: Task.__init__(self) self._account = account self._callback = weakref.WeakMethod(callback) @@ -196,12 +216,12 @@ def __init__(self, account, properties, callback): self._from_muc = properties.from_muc - def execute(self): + def execute(self) -> None: callback = self._callback() if callback is not None: callback(self) - def preconditions_met(self): + def preconditions_met(self) -> bool: try: client = app.get_client(self._account) except Exception: @@ -218,8 +238,8 @@ def preconditions_met(self): return client.state.is_available - def __repr__(self): + def __repr__(self) -> str: return f'Entity Caps ({self.entity.jid} {self.entity.hash})' - def __hash__(self): + def __hash__(self) -> int: return hash(self.entity) ===================================== gajim/common/task_manager.py ===================================== @@ -14,7 +14,7 @@ from __future__ import annotations -from typing import List +from typing import Optional import functools import queue @@ -26,16 +26,16 @@ class TaskManager: - def __init__(self): - self._timeout = None - self._queue = queue.PriorityQueue() + def __init__(self) -> None: + self._timeout: Optional[int] = None + self._queue: queue.PriorityQueue[Task] = queue.PriorityQueue() def _start_worker(self) -> None: self._timeout = GLib.timeout_add_seconds(2, self._process_queue) def _process_queue(self) -> bool: log.info('%s tasks queued', self._queue.qsize()) - requeue = [] + requeue: list[Task] = [] while not self._queue.empty(): task = self._queue.get_nowait() if task.is_obsolete(): @@ -63,7 +63,7 @@ def _process_queue(self) -> bool: self._timeout = None return False - def _requeue_tasks(self, tasks: List[Task]) -> bool: + def _requeue_tasks(self, tasks: list[Task]) -> bool: if not tasks: return False @@ -81,7 +81,7 @@ def add_task(self, task: Task) -> None: @functools.total_ordering class Task: - def __init__(self, priority: int = 0): + def __init__(self, priority: int = 0) -> None: self.priority = priority self._obsolete = False ===================================== pyrightconfig.json ===================================== @@ -37,6 +37,7 @@ "gajim/common/setting_values.py", "gajim/common/sound.py", "gajim/common/storage/", + "gajim/common/task_manager.py", "gajim/gtk/about.py", "gajim/gtk/account_page.py", "gajim/gtk/account_side_bar.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c0e0d3b58701643d65aa1c80252785e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c0e0d3b58701643d65aa1c80252785e… You're receiving this email because of your account on dev.gajim.org.

1 0

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

28 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d690d291 by wurstsalat at 2022-05-28T18:05:42+02:00 chore: BitsOfBinary: Add type annotations - - - - - c3d11637 by wurstsalat at 2022-05-28T18:21:58+02:00 chore: Discovery: Add type annotations - - - - - 4ea4d916 by wurstsalat at 2022-05-28T18:22:23+02:00 chore: Structs: Add type annotations - - - - - c0e0d3b5 by wurstsalat at 2022-05-28T18:22:40+02:00 chore: MUC: Add type annotations - - - - - 4 changed files: - gajim/common/modules/bits_of_binary.py - gajim/common/modules/discovery.py - gajim/common/modules/muc.py - gajim/common/structs.py Changes: ===================================== gajim/common/modules/bits_of_binary.py ===================================== @@ -14,23 +14,33 @@ # 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 Any +from typing import Optional + import logging import hashlib from base64 import b64decode +from pathlib import Path import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq +from nbxmpp.structs import BobData +from nbxmpp.structs import IqProperties from nbxmpp.structs import StanzaHandler from gajim.common import app from gajim.common import configpaths +from gajim.common import types from gajim.common.modules.base import BaseModule log = logging.getLogger('gajim.c.m.bob') class BitsOfBinary(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -41,9 +51,13 @@ def __init__(self, con): ] # Used to track which cids are in-flight. - self.awaiting_cids = {} + self.awaiting_cids: dict[str, tuple[Any, Any, int]] = {} - def _answer_bob_request(self, _con, stanza, _properties): + def _answer_bob_request(self, + _con: types.xmppClient, + stanza: Iq, + _properties: IqProperties + ) -> None: self._log.info('Request from %s for BoB data', stanza.getFrom()) iq = stanza.buildReply('error') err = nbxmpp.ErrorNode(nbxmpp.ERR_ITEM_NOT_FOUND) @@ -52,7 +66,11 @@ def _answer_bob_request(self, _con, stanza, _properties): self._con.connection.send(iq) raise nbxmpp.NodeProcessed - def _on_bob_received(self, _nbxmpp_client, result, cid): + def _on_bob_received(self, + _nbxmpp_client: types.xmppClient, + result: Iq, + cid: str + ) -> None: """ Called when we receive BoB data """ @@ -86,7 +104,13 @@ def recurs(node, cid, data): cb(*args) del self.awaiting_cids[cid] - def get_bob_data(self, cid, to, callback, args, position): + def get_bob_data(self, + cid: str, + to: str, + callback: Any, + args: Any, + position: int + ) -> None: """ Request for BoB (XEP-0231) and when data will arrive, call callback with given args, after having replaced cid by it's data in @@ -102,7 +126,7 @@ def get_bob_data(self, cid, to, callback, args, position): iq, self._on_bob_received, {'cid': cid}) -def parse_bob_data(stanza): +def parse_bob_data(stanza: Iq) -> Optional[Path]: data_node = stanza.getTag('data', namespace=Namespace.BOB) if data_node is None: return None @@ -176,11 +200,11 @@ def parse_bob_data(stanza): return filepath -def store_bob_data(bob_data): +def store_bob_data(bob_data: Optional[BobData]) -> Optional[Path]: if bob_data is None: return None - algo_hash = '%s+%s' % (bob_data.algo, bob_data.hash_) + algo_hash = f'{bob_data.algo}+{bob_data.hash_}' filepath = configpaths.get('BOB') / algo_hash if algo_hash in app.bob_cache or filepath.exists(): ===================================== gajim/common/modules/discovery.py ===================================== @@ -14,13 +14,24 @@ # XEP-0030: Service Discovery +from __future__ import annotations + +from typing import Optional +from typing import Union + import nbxmpp -from nbxmpp.namespaces import Namespace -from nbxmpp.structs import StanzaHandler from nbxmpp.errors import StanzaError from nbxmpp.errors import is_error +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq +from nbxmpp.protocol import JID +from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import IqProperties +from nbxmpp.structs import StanzaHandler +from nbxmpp.task import Task from gajim.common import app +from gajim.common import types from gajim.common.events import ServerDiscoReceived from gajim.common.events import MucDiscoUpdate from gajim.common.modules.util import as_task @@ -35,7 +46,7 @@ class Discovery(BaseModule): 'disco_items', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -49,22 +60,22 @@ def __init__(self, con): ns=Namespace.DISCO_ITEMS), ] - self._account_info = None - self._server_info = None + self._account_info: Optional[DiscoInfo] = None + self._server_info: Optional[DiscoInfo] = None @property - def account_info(self): + def account_info(self) -> Optional[DiscoInfo]: return self._account_info @property - def server_info(self): + def server_info(self) -> Optional[DiscoInfo]: return self._server_info - def discover_server_items(self): + def discover_server_items(self) -> None: server = self._con.get_own_jid().domain self.disco_items(server, callback=self._server_items_received) - def _server_items_received(self, task): + def _server_items_received(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -80,7 +91,7 @@ def _server_items_received(self, task): continue self.disco_info(item.jid, callback=self._server_items_info_received) - def _server_items_info_received(self, task): + def _server_items_info_received(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -99,11 +110,11 @@ def _server_items_info_received(self, task): app.ged.raise_event(ServerDiscoReceived()) - def discover_account_info(self): + def discover_account_info(self) -> None: own_jid = self._con.get_own_jid().bare self.disco_info(own_jid, callback=self._account_info_received) - def _account_info_received(self, task): + def _account_info_received(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -123,12 +134,12 @@ def _account_info_received(self, task): self._con.get_module('Caps').update_caps() - def discover_server_info(self): + def discover_server_info(self) -> None: # Calling this method starts the connect_maschine() server = self._con.get_own_jid().domain self.disco_info(server, callback=self._server_info_received) - def _server_info_received(self, task): + def _server_info_received(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -149,7 +160,7 @@ def _server_info_received(self, task): self._con.connect_machine(restart=True) - def _parse_transports(self, info): + def _parse_transports(self, info: DiscoInfo) -> None: for identity in info.identities: if identity.category not in ('gateway', 'headline'): continue @@ -166,7 +177,11 @@ def _parse_transports(self, info): else: self._con.available_transports[identity.type] = [jid] - def _answer_disco_items(self, _con, stanza, _properties): + def _answer_disco_items(self, + _con: types.xmppClient, + stanza: Iq, + _properties: IqProperties + ) -> None: from_ = stanza.getFrom() self._log.info('Answer disco items to %s', from_) @@ -183,7 +198,11 @@ def _answer_disco_items(self, _con, stanza, _properties): self._con.get_module('AdHocCommands').command_list_query(stanza) raise nbxmpp.NodeProcessed - def _answer_disco_info(self, _con, stanza, _properties): + def _answer_disco_info(self, + _con: types.xmppClient, + stanza: Iq, + _properties: IqProperties + ) -> None: from_ = stanza.getFrom() self._log.info('Answer disco info %s', from_) if str(from_).startswith('echo.'): @@ -195,9 +214,10 @@ def _answer_disco_info(self, _con, stanza, _properties): @as_task def disco_muc(self, - jid, - request_vcard=False, - allow_redirect=False): + jid: Union[JID, str], + request_vcard: bool = False, + allow_redirect: bool = False + ): _task = yield @@ -236,7 +256,7 @@ def disco_muc(self, yield result @as_task - def disco_contact(self, contact): + def disco_contact(self, contact: types.ContactT): _task = yield result = yield self.disco_info(contact.jid) ===================================== gajim/common/modules/muc.py ===================================== @@ -15,24 +15,37 @@ # XEP-0045: Multi-User Chat # XEP-0249: Direct MUC Invitations +from __future__ import annotations + +from typing import Any +from typing import Optional + import logging from collections import defaultdict import time import nbxmpp -from nbxmpp.namespaces import Namespace from nbxmpp.const import InviteType from nbxmpp.const import PresenceType from nbxmpp.const import StatusCode +from nbxmpp.errors import StanzaError +from nbxmpp.modules.dataforms import SimpleDataForm +from nbxmpp.namespaces import Namespace from nbxmpp.protocol import JID +from nbxmpp.protocol import Message +from nbxmpp.protocol import Presence +from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import MessageProperties +from nbxmpp.structs import PresenceProperties from nbxmpp.structs import StanzaHandler -from nbxmpp.errors import StanzaError +from nbxmpp.task import Task from gi.repository import GLib from gajim.common import app from gajim.common import helpers -from gajim.common.const import KindConstant +from gajim.common import types +from gajim.common.const import ClientState, KindConstant from gajim.common.const import MUCJoinedState from gajim.common.events import MessageModerated from gajim.common.events import MucAdded @@ -46,7 +59,6 @@ from gajim.common.modules.bits_of_binary import store_bob_data from gajim.common.modules.base import BaseModule - log = logging.getLogger('gajim.c.m.muc') @@ -72,7 +84,7 @@ class MUC(BaseModule): 'retract_message' ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -121,30 +133,38 @@ def __init__(self, con): self._con.connect_signal('resume-failed', self._on_client_resume_failed) - self._rejoin_muc = set() - self._join_timeouts = {} - self._rejoin_timeouts = {} + self._rejoin_muc: set[str] = set() + self._join_timeouts: dict[str, int] = {} + self._rejoin_timeouts: dict[str, int] = {} self._muc_service_jid = None - self._joined_users = defaultdict(dict) - self._mucs = {} + self._joined_users: defaultdict[ + str, dict[str, MUCPresenceData]] = defaultdict(dict) + self._mucs: dict[str, MUCData] = {} self._muc_nicknames = {} - def _on_resume_failed(self, _client, _signal_name): + def _on_resume_failed(self, + _client: types.Client, + _signal_name: str + ) -> None: self._reset_presence() - def _on_state_changed(self, _client, _signal_name, state): + def _on_state_changed(self, + _client: types.Client, + _signal_name: str, + state: ClientState + ) -> None: if state.is_disconnected: self._reset_presence() @property - def supported(self): + def supported(self) -> bool: return self._muc_service_jid is not None @property def service_jid(self): return self._muc_service_jid - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: if info.is_gateway: return @@ -158,17 +178,17 @@ def pass_disco(self, info): self._muc_service_jid = info.jid raise nbxmpp.NodeProcessed - def get_muc_data(self, room_jid): + def get_muc_data(self, room_jid: str) -> Optional[MUCData]: return self._mucs.get(room_jid) - def set_password(self, room_jid, password): + def set_password(self, room_jid: str, password: str) -> None: muc_data = self.get_muc_data(room_jid) muc_data.password = password - def _get_mucs_with_state(self, states): + def _get_mucs_with_state(self, states: list[MUCJoinedState]): return [muc for muc in self._mucs.values() if muc.state in states] - def _set_muc_state(self, room_jid, state): + def _set_muc_state(self, room_jid: str, state: MUCJoinedState) -> None: try: muc = self._mucs[room_jid] except KeyError: @@ -184,7 +204,7 @@ def _set_muc_state(self, room_jid, state): contact = self._get_contact(room_jid, groupchat=True) contact.notify('state-changed') - def _reset_state(self): + def _reset_state(self) -> None: for room_jid in list(self._rejoin_timeouts.keys()): self._remove_rejoin_timeout(room_jid) @@ -200,7 +220,12 @@ def _reset_state(self): self._joined_users.clear() - def _create_muc_data(self, room_jid, nick, password, config): + def _create_muc_data(self, + room_jid: str, + nick: Optional[str], + password: Optional[str], + config: Optional[dict[str, Any]] + ) -> MUCData: if not nick: nick = get_group_chat_nick(self._account, room_jid) @@ -212,7 +237,12 @@ def _create_muc_data(self, room_jid, nick, password, config): return MUCData(room_jid, nick, password, config) - def join(self, jid, nick=None, password=None, config=None): + def join(self, + jid: str, + nick: Optional[str] = None, + password: Optional[str] = None, + config: Optional[dict[str, Any]] = None + ) -> None: if not app.account_is_available(self._account): return @@ -245,7 +275,7 @@ def join(self, jid, nick=None, password=None, config=None): else: self._join(muc_data) - def create(self, jid, config): + def create(self, jid: str, config: dict[str, Any]) -> None: if not app.account_is_available(self._account): return @@ -259,7 +289,7 @@ def _push_muc_added_event(self, jid: str) -> None: app.ged.raise_event(MucAdded(account=self._account, jid=JID.from_string(jid))) - def _on_disco_result(self, task): + def _on_disco_result(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -275,7 +305,7 @@ def _on_disco_result(self, task): return self._join(muc_data) - def _join(self, muc_data): + def _join(self, muc_data: MUCData) -> None: presence = self._con.get_module('Presence').get_presence( muc_data.occupant_jid, show=self._con.status, @@ -291,14 +321,14 @@ def _join(self, muc_data): self._set_muc_state(muc_data.jid, MUCJoinedState.JOINING) self._con.send_stanza(presence) - def _rejoin(self, room_jid): + def _rejoin(self, room_jid: str) -> bool: muc_data = self._mucs[room_jid] if muc_data.state.is_not_joined: self._log.info('Rejoin %s', room_jid) self._join(muc_data) return True - def _create(self, muc_data): + def _create(self, muc_data: MUCData) -> None: presence = self._con.get_module('Presence').get_presence( muc_data.occupant_jid, show=self._con.status, @@ -310,7 +340,10 @@ def _create(self, muc_data): self._set_muc_state(muc_data.jid, MUCJoinedState.CREATING) self._con.send_stanza(presence) - def leave(self, room_jid, reason=None): + def leave(self, + room_jid: str, + reason: Optional[str] = None + ) -> None: self._log.info('Leave MUC: %s', room_jid) self._con.get_module('Bookmarks').modify(room_jid, autojoin=False) @@ -336,11 +369,11 @@ def leave(self, room_jid, reason=None): room.set_not_joined() room.notify('room-left') - def configure_room(self, room_jid): + def configure_room(self, room_jid: str) -> None: self._nbxmpp('MUC').request_config(room_jid, callback=self._on_room_config) - def _on_room_config(self, task): + def _on_room_config(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -359,7 +392,9 @@ def _on_room_config(self, task): callback=self._on_config_result) @staticmethod - def _apply_config(form, config=None): + def _apply_config(form: SimpleDataForm, + config: Optional[dict[str, Any]] = None + ) -> None: default_config = get_default_muc_config() if config is not None: default_config.update(config) @@ -371,7 +406,7 @@ def _apply_config(form, config=None): else: field.value = value - def _on_config_result(self, task): + def _on_config_result(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -398,7 +433,7 @@ def _on_config_result(self, task): for jid in invites: self.invite(result.jid, jid) - def _on_disco_result_after_config(self, task): + def _on_disco_result_after_config(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -414,7 +449,7 @@ def _on_disco_result_after_config(self, task): room = self._get_contact(jid.bare) room.notify('room-config-finished') - def update_presence(self): + def update_presence(self) -> None: mucs = self._get_mucs_with_state([MUCJoinedState.JOINED, MUCJoinedState.JOINING]) @@ -426,14 +461,18 @@ def update_presence(self): status=message, idle_time=idle) - def change_nick(self, room_jid, new_nick): + def change_nick(self, room_jid: str, new_nick: str) -> None: status, message, _idle = self._con.get_presence_state() self._con.get_module('Presence').send_presence( - '%s/%s' % (room_jid, new_nick), + f'{room_jid}/{new_nick}', show=status, status=message) - def _on_error_presence(self, _con, stanza, properties): + def _on_error_presence(self, + _con: types.xmppClient, + stanza: Presence, + properties: PresenceProperties + ) -> None: room_jid = properties.jid.bare muc_data = self._mucs.get(room_jid) if muc_data is None: @@ -479,7 +518,11 @@ def _on_error_presence(self, _con, stanza, properties): else: room.notify('room-presence-error', properties) - def _on_muc_user_presence(self, _con, stanza, properties): + def _on_muc_user_presence(self, + _con: types.xmppClient, + stanza: Presence, + properties: PresenceProperties + ) -> None: if properties.type == PresenceType.ERROR: return @@ -569,7 +612,9 @@ def _on_muc_user_presence(self, _con, stanza, properties): presence = self._process_user_presence(properties) occupant.update_presence(presence, properties) - def _process_user_presence(self, properties): + def _process_user_presence(self, + properties: PresenceProperties + ) -> MUCPresenceData: jid = properties.jid muc_presence = MUCPresenceData.from_presence(properties) if not muc_presence.available: @@ -578,24 +623,24 @@ def _process_user_presence(self, properties): self._joined_users[jid.bare][jid.resource] = muc_presence return muc_presence - def _is_user_joined(self, jid): + def _is_user_joined(self, jid: Optional[JID]) -> bool: try: self._joined_users[jid.bare][jid.resource] except KeyError: return False return True - def get_joined_users(self, jid): + def get_joined_users(self, jid: str) -> list[str]: return list(self._joined_users[jid].keys()) - def _start_rejoin_timeout(self, room_jid): + def _start_rejoin_timeout(self, room_jid: str) -> None: self._remove_rejoin_timeout(room_jid) self._rejoin_muc.add(room_jid) self._log.info('Start rejoin timeout for: %s', room_jid) id_ = GLib.timeout_add_seconds(2, self._rejoin, room_jid) self._rejoin_timeouts[room_jid] = id_ - def _remove_rejoin_timeout(self, room_jid): + def _remove_rejoin_timeout(self, room_jid: str) -> None: self._rejoin_muc.discard(room_jid) id_ = self._rejoin_timeouts.get(room_jid) if id_ is not None: @@ -603,21 +648,24 @@ def _remove_rejoin_timeout(self, room_jid): GLib.source_remove(id_) del self._rejoin_timeouts[room_jid] - def _start_join_timeout(self, room_jid): + def _start_join_timeout(self, room_jid: str) -> None: self._remove_join_timeout(room_jid) self._log.info('Start join timeout for: %s', room_jid) id_ = GLib.timeout_add_seconds( 10, self._fake_subject_change, room_jid) self._join_timeouts[room_jid] = id_ - def _remove_join_timeout(self, room_jid): + def _remove_join_timeout(self, room_jid: str) -> None: id_ = self._join_timeouts.get(room_jid) if id_ is not None: self._log.info('Remove join timeout for: %s', room_jid) GLib.source_remove(id_) del self._join_timeouts[room_jid] - def _log_muc_event(self, event_name, properties): + def _log_muc_event(self, + event_name: str, + properties: PresenceProperties + ) -> None: # TODO CURRENTLY NOT USED if event_name not in ['muc-user-joined', 'muc-user-left', @@ -650,7 +698,11 @@ def _log_muc_event(self, event_name, properties): show=show, additional_data=additional_data) - def _on_subject_change(self, _con, _stanza, properties): + def _on_subject_change(self, + _con: types.xmppClient, + _stanza: Message, + properties: MessageProperties + ) -> None: if not properties.is_muc_subject: return @@ -675,7 +727,11 @@ def _on_subject_change(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed - def _on_moderation(self, _con, _stanza, properties): + def _on_moderation(self, + _con: types.xmppClient, + _stanza: Message, + properties: MessageProperties + ) -> None: if not properties.is_moderation: return @@ -689,7 +745,7 @@ def _on_moderation(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed - def _fake_subject_change(self, room_jid): + def _fake_subject_change(self, room_jid: str) -> None: # This is for servers which don’t send empty subjects as part of the # event order on joining a MUC. For example jabber.ru self._log.warning('Fake subject received for %s', room_jid) @@ -697,7 +753,7 @@ def _fake_subject_change(self, room_jid): room = self._get_contact(room_jid) room.notify('room-joined') - def _room_join_complete(self, muc_data): + def _room_join_complete(self, muc_data: MUCData): self._remove_join_timeout(muc_data.jid) self._set_muc_state(muc_data.jid, MUCJoinedState.JOINED) self._remove_rejoin_timeout(muc_data.jid) @@ -714,7 +770,11 @@ def _room_join_complete(self, muc_data): self._con.get_module('MAM').request_archive_on_muc_join( muc_data.jid) - def _on_voice_request(self, _con, _stanza, properties): + def _on_voice_request(self, + _con: types.xmppClient, + _stanza: Message, + properties: MessageProperties + ) -> None: if not properties.is_voice_request: return @@ -723,7 +783,11 @@ def _on_voice_request(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed - def _on_captcha_challenge(self, _con, _stanza, properties): + def _on_captcha_challenge(self, + _con: types.xmppClient, + _stanza: Message, + properties: MessageProperties + ) -> None: if not properties.is_captcha_challenge: return @@ -753,7 +817,7 @@ def _on_captcha_challenge(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed - def cancel_captcha(self, room_jid): + def cancel_captcha(self, room_jid: str) -> None: muc_data = self._mucs.get(room_jid) if muc_data is None: return @@ -765,13 +829,16 @@ def cancel_captcha(self, room_jid): self._set_muc_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) - def send_captcha(self, room_jid, form_node): + def send_captcha(self, + room_jid: str, + form_node: SimpleDataForm + ) -> None: self._set_muc_state(room_jid, MUCJoinedState.JOINING) self._nbxmpp('MUC').send_captcha(room_jid, form_node, callback=self._on_captcha_result) - def _on_captcha_result(self, task): + def _on_captcha_result(self, task: Task) -> None: try: task.finish() except StanzaError as error: @@ -782,7 +849,11 @@ def _on_captcha_result(self, task): room = self._get_contact(error.jid) room.notify('room-captcha-error', error) - def _on_config_change(self, _con, _stanza, properties): + def _on_config_change(self, + _con: types.xmppClient, + _stanza: Message, + properties: MessageProperties + ) -> None: if not properties.is_muc_config_change: return @@ -795,7 +866,11 @@ def _on_config_change(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed - def _on_invite_or_decline(self, _con, _stanza, properties): + def _on_invite_or_decline(self, + _con: types.xmppClient, + _stanza: Message, + properties: MessageProperties + ) -> None: if properties.muc_decline is not None: data = properties.muc_decline if helpers.ignore_contact(self._account, data.from_): @@ -830,7 +905,7 @@ def _on_invite_or_decline(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed - def _on_disco_result_after_invite(self, task): + def _on_disco_result_after_invite(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -843,7 +918,12 @@ def _on_disco_result_after_invite(self, task): info=result.info, **invite_data._asdict())) - def invite(self, room, jid, reason=None, continue_=False): + def invite(self, + room: str, + jid: str, + reason: Optional[str] = None, + continue_: bool = False + ) -> str: type_ = InviteType.MEDIATED contact = self._get_contact(jid) if contact and contact.supports(Namespace.CONFERENCE): @@ -851,12 +931,19 @@ def invite(self, room, jid, reason=None, continue_=False): password = self._mucs[room].password self._log.info('Invite %s to %s', jid, room) - return self._nbxmpp('MUC').invite(room, jid, reason, password, - continue_, type_) - - def _on_client_state_changed(self, _client, _signal_name, state): + return self._nbxmpp('MUC').invite( + room, jid, reason, password, continue_, type_) + + def _on_client_state_changed(self, + _client: types.Client, + _signal_name: str, + state: ClientState + ) -> None: if state.is_disconnected: self._reset_state() - def _on_client_resume_failed(self, _client, _signal_name): + def _on_client_resume_failed(self, + _client: types.Client, + _signal_name: str + ) -> None: self._reset_state() ===================================== gajim/common/structs.py ===================================== @@ -15,7 +15,6 @@ from __future__ import annotations from typing import Any -from typing import Dict from typing import Type from typing import TypeVar from typing import NamedTuple @@ -28,11 +27,14 @@ from gi.repository import GLib -from nbxmpp.protocol import JID -from nbxmpp.const import Role from nbxmpp.const import Affiliation +from nbxmpp.const import Chatstate from nbxmpp.const import PresenceShow +from nbxmpp.const import Role +from nbxmpp.protocol import JID +from nbxmpp.structs import PresenceProperties +from gajim.common import types from gajim.common.const import MUCJoinedState from gajim.common.const import KindConstant from gajim.common.const import PresenceShowExt @@ -46,7 +48,7 @@ class URI(NamedTuple): type: URIType action: Optional[URIAction] = None - data: Optional[Union[Dict[str, str], str]] = None + data: Optional[Union[dict[str, str], str]] = None class MUCData: @@ -54,7 +56,8 @@ def __init__(self, room_jid: str, nick: str, password: str, - config=None) -> None: + config: Optional[dict[str, Any]] = None + ) -> None: self._room_jid = JID.from_string(room_jid) self._config = config @@ -74,29 +77,30 @@ def occupant_jid(self) -> JID: return self._room_jid.new_with(resource=self.nick) @property - def config(self): + def config(self) -> Optional[dict[str, Any]]: return self._config class OutgoingMessage: def __init__(self, account: str, - contact, + contact: types.ChatContactT, message: Optional[str], type_: str, subject: Optional[str] = None, - chatstate=None, + chatstate: Optional[Chatstate] = None, marker: Optional[tuple[str, str]] = None, resource: Optional[str] = None, user_nick: Optional[str] = None, label: Optional[str] = None, - control=None, + control: Optional[Any] = None, attention: Optional[bool] = None, correct_id: Optional[str] = None, oob_url: Optional[str] = None, - xhtml=None, - nodes=None, - play_sound: bool = True): + xhtml: Optional[str] = None, + nodes: Optional[Any] = None, + play_sound: bool = True + ) -> None: if type_ not in ('chat', 'groupchat', 'normal', 'headline'): raise ValueError('Unknown message type: %s' % type_) @@ -207,7 +211,7 @@ class PresenceData: available: bool @classmethod - def from_presence(cls, properties): + def from_presence(cls, properties: PresenceProperties) -> PresenceData: return cls(show=properties.show, status=properties.status, priority=properties.priority, @@ -233,7 +237,7 @@ class MUCPresenceData: real_jid: Optional[JID] @classmethod - def from_presence(cls, properties): + def from_presence(cls, properties: PresenceProperties) -> MUCPresenceData: return cls(show=properties.show, status=properties.status, idle_time=properties.idle_timestamp, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/39d9313850dfad3180f79647cce59d5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/39d9313850dfad3180f79647cce59d5… You're receiving this email because of your account on dev.gajim.org.

1 0

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

28 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8db0c67d by wurstsalat at 2022-05-28T11:42:47+02:00 chore: Presence: Add type annotations - - - - - 45093d19 by wurstsalat at 2022-05-28T11:49:18+02:00 chore: Ping: Add type annotations - - - - - 0760b9f5 by wurstsalat at 2022-05-28T13:41:37+02:00 chore: Register: Add type annotations - - - - - 581c5775 by wurstsalat at 2022-05-28T13:54:13+02:00 chore: Search: Add type annotations - - - - - 32dfa3d0 by wurstsalat at 2022-05-28T14:39:50+02:00 refactor: Port Search window to Gajim’s Assistant class - - - - - 39d93138 by wurstsalat at 2022-05-28T14:47:17+02:00 imprv: DirectorySearch: Use Gio.Menu, add Start Chat item - - - - - 8 changed files: - gajim/common/events.py - gajim/common/modules/ping.py - gajim/common/modules/presence.py - gajim/common/modules/register.py - gajim/common/modules/search.py - gajim/gtk/discovery.py - gajim/gtk/menus.py - gajim/gtk/search.py Changes: ===================================== gajim/common/events.py ===================================== @@ -599,7 +599,7 @@ class PingReply(ApplicationEvent): name: str = field(init=False, default='ping-reply') account: str contact: Any - seconds: int + seconds: float @dataclass ===================================== gajim/common/modules/ping.py ===================================== @@ -14,17 +14,20 @@ # XEP-0199: XMPP Ping +from __future__ import annotations + from typing import Generator import time from nbxmpp.errors import is_error +from nbxmpp.structs import CommonResult from gajim.common import app +from gajim.common import types from gajim.common.events import PingError from gajim.common.events import PingReply from gajim.common.events import PingSent -from gajim.common.types import ConnectionT from gajim.common.modules.base import BaseModule from gajim.common.modules.util import as_task @@ -36,13 +39,15 @@ class Ping(BaseModule): 'ping', ] - def __init__(self, con: ConnectionT) -> None: + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [] @as_task - def send_ping(self, contact) -> Generator: + def send_ping(self, + contact: types.ContactT + ) -> Generator[CommonResult, None, None]: _task = yield if not app.account_is_available(self._account): ===================================== gajim/common/modules/presence.py ===================================== @@ -14,15 +14,24 @@ # Presence handler +from __future__ import annotations + +from typing import Any +from typing import Optional +from typing import Union + import time import nbxmpp +from nbxmpp.const import PresenceType from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID +from nbxmpp.structs import PresenceProperties from nbxmpp.structs import StanzaHandler -from nbxmpp.const import PresenceType from gajim.common import app from gajim.common import idle +from gajim.common import types from gajim.common.events import PresenceReceived from gajim.common.events import ShowChanged from gajim.common.events import SubscribePresenceReceived @@ -42,7 +51,7 @@ class Presence(BaseModule): 'subscribed', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -67,16 +76,20 @@ def __init__(self, con): priority=49), ] - self._presence_store = {} + self._presence_store: dict[JID, PresenceData] = {} # keep the jids we auto added (transports contacts) to not send the # SUBSCRIBED event to GUI - self.automatically_added = [] + self.automatically_added: list[str] = [] # list of jid to auto-authorize - self._jids_for_auto_auth = set() + self._jids_for_auto_auth: set[str] = set() - def _presence_received(self, _con, stanza, properties): + def _presence_received(self, + _con: types.xmppClient, + stanza: nbxmpp.protocol.Presence, + properties: PresenceProperties + ) -> None: if properties.from_muc: # MUC occupant presences are already handled in MUC module return @@ -116,7 +129,7 @@ def _presence_received(self, _con, stanza, properties): if properties.type.is_unavailable: show = 'offline' - event_attrs = { + event_attrs: dict[str, Any] = { 'account': self._account, 'conn': self._con, 'stanza': stanza, @@ -144,7 +157,7 @@ def _presence_received(self, _con, stanza, properties): self._log_presence(properties) - def _log_presence(self, properties): + def _log_presence(self, properties: PresenceProperties) -> None: if not app.settings.get('log_contact_status_changes'): return @@ -159,7 +172,11 @@ def _log_presence(self, properties): message=properties.status, show=show) - def _subscribe_received(self, _con, _stanza, properties): + def _subscribe_received(self, + _con: types.xmppClient, + _stanza: nbxmpp.protocol.Presence, + properties: PresenceProperties + ) -> None: jid = properties.jid.bare fjid = str(properties.jid) @@ -190,7 +207,11 @@ def _subscribe_received(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed - def _subscribed_received(self, _con, _stanza, properties): + def _subscribed_received(self, + _con: types.xmppClient, + _stanza: nbxmpp.protocol.Presence, + properties: PresenceProperties + ) -> None: jid = properties.jid.bare self._log.info('Received Subscribed: %s', properties.jid) if jid in self.automatically_added: @@ -202,11 +223,19 @@ def _subscribed_received(self, _con, _stanza, properties): jid=properties.jid)) raise nbxmpp.NodeProcessed - def _unsubscribe_received(self, _con, _stanza, properties): + def _unsubscribe_received(self, + _con: types.xmppClient, + _stanza: nbxmpp.protocol.Presence, + properties: PresenceProperties + ) -> None: self._log.info('Received Unsubscribe: %s', properties.jid) raise nbxmpp.NodeProcessed - def _unsubscribed_received(self, _con, _stanza, properties): + def _unsubscribed_received(self, + _con: types.xmppClient, + _stanza: nbxmpp.protocol.Presence, + properties: PresenceProperties + ) -> None: self._log.info('Received Unsubscribed: %s', properties.jid) app.ged.raise_event(UnsubscribedPresenceReceived( conn=self._con, @@ -214,17 +243,23 @@ def _unsubscribed_received(self, _con, _stanza, properties): jid=properties.jid.bare)) raise nbxmpp.NodeProcessed - def unsubscribed(self, jid): + def unsubscribed(self, jid: Union[JID, str]) -> None: self._log.info('Unsubscribed: %s', jid) - self._jids_for_auto_auth.discard(jid) + self._jids_for_auto_auth.discard(str(jid)) self._nbxmpp('BasePresence').unsubscribed(jid) - def unsubscribe(self, jid): + def unsubscribe(self, jid: Union[JID, str]) -> None: self._log.info('Unsubscribe from %s', jid) - self._jids_for_auto_auth.discard(jid) + self._jids_for_auto_auth.discard(str(jid)) self._nbxmpp('BasePresence').unsubscribe(jid) - def subscribe(self, jid, msg=None, name=None, groups=None, auto_auth=False): + def subscribe(self, + jid: Union[JID, str], + msg: Optional[str] = None, + name: Optional[str] = None, + groups: Optional[list[str]] = None, + auto_auth: bool = False + ) -> None: self._log.info('Request Subscription to %s', jid) if auto_auth: @@ -235,9 +270,16 @@ def subscribe(self, jid, msg=None, name=None, groups=None, auto_auth=False): status=msg, nick=app.nicks[self._account]) - def get_presence(self, to=None, typ=None, priority=None, - show=None, status=None, nick=None, caps=True, - idle_time=False): + def get_presence(self, + to: Optional[str] = None, + typ: Optional[str] = None, + priority: Optional[int] = None, + show: Optional[str] = None, + status: Optional[str] = None, + nick: Optional[str] = None, + caps: bool = True, + idle_time: bool = False + ) -> nbxmpp.Presence: if show not in ('chat', 'away', 'xa', 'dnd'): # Gajim sometimes passes invalid show values here # until this is fixed this is a workaround @@ -265,7 +307,7 @@ def get_presence(self, to=None, typ=None, priority=None, return presence - def send_presence(self, *args, **kwargs): + def send_presence(self, *args: Any, **kwargs: Any) -> None: if not app.account_is_connected(self._account): return presence = self.get_presence(*args, **kwargs) ===================================== gajim/common/modules/register.py ===================================== @@ -34,7 +34,7 @@ class Register(BaseModule): 'submit_register_form', ] - def __init__(self, con: types.Client): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.supported = False ===================================== gajim/common/modules/search.py ===================================== @@ -14,10 +14,17 @@ # XEP-0055: Jabber Search +from __future__ import annotations + +from typing import Any + import nbxmpp +from nbxmpp.modules.dataforms import SimpleDataForm from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq from gajim.common import app +from gajim.common import types from gajim.common.events import SearchFormReceivedEvent from gajim.common.events import SearchResultReceivedEvent @@ -25,15 +32,18 @@ class Search(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) - def request_search_fields(self, jid): + def request_search_fields(self, jid: str) -> None: self._log.info('Request search fields from %s', jid) iq = nbxmpp.Iq(typ='get', to=jid, queryNS=Namespace.SEARCH) self._con.connection.SendAndCallForResponse(iq, self._fields_received) - def _fields_received(self, _nbxmpp_client, stanza): + def _fields_received(self, + _nbxmpp_client: types.xmppClient, + stanza: Iq + ) -> None: data = None is_dataform = False @@ -60,7 +70,11 @@ def _fields_received(self, _nbxmpp_client, stanza): is_dataform=is_dataform, data=data)) - def send_search_form(self, jid, form, is_form): + def send_search_form(self, + jid: str, + form: SimpleDataForm, + is_form: bool + ) -> None: iq = nbxmpp.Iq(typ='set', to=jid, queryNS=Namespace.SEARCH) item = iq.setQuery() if is_form: @@ -71,7 +85,10 @@ def send_search_form(self, jid, form, is_form): self._con.connection.SendAndCallForResponse(iq, self._received_result) - def _received_result(self, _nbxmpp_client, stanza): + def _received_result(self, + _nbxmpp_client: types.xmppClient, + stanza: Iq + ) -> None: data = None is_dataform = False @@ -86,7 +103,7 @@ def _received_result(self, _nbxmpp_client, stanza): if data is not None: is_dataform = True else: - data = [] + data: list[Any] = [] for item in tag.getTags('item'): # We also show attributes. jid is there field = item.attrs ===================================== gajim/gtk/discovery.py ===================================== @@ -59,7 +59,7 @@ from gajim.common.const import StyleAttr from .dialogs import ErrorDialog -from .search import Search +from .search import DirectorySearch from .util import icon_exists from .builder import get_builder from .util import open_window @@ -1310,7 +1310,7 @@ def on_search_button_clicked(self, widget=None): if not iter_: return service = model[iter_][0] - Search(self.account, service, self.window.window) + DirectorySearch(self.account, service, self.window.window) def cleanup(self): AgentBrowser.cleanup(self) ===================================== gajim/gtk/menus.py ===================================== @@ -549,18 +549,23 @@ def get_groupchat_roster_menu(account: str, return menu -class SearchMenu(Gtk.Menu): - def __init__(self, treeview: Gtk.TreeView) -> None: - Gtk.Menu.__init__(self) - self._copy_item = Gtk.MenuItem(label=_('Copy')) - self._copy_item.set_action_name('app.copy-text') - self.set_copy_text('') - self._copy_item.show() - self.append(self._copy_item) - self.attach_to_widget(treeview, None) - - def set_copy_text(self, text: str) -> None: - self._copy_item.set_action_target_value(GLib.Variant('s', text)) +def get_directory_search_menu(jid: str, copy_text: str) -> Gio.Menu: + menu_items: list[tuple[str, str]] = [ + ('app.copy-text', _('Copy')), + ('app.start-chat', _('Start Chat…')) + ] + menu = Gio.Menu() + for item in menu_items: + action, label = item + menuitem = Gio.MenuItem.new(label, action) + if action == 'app.copy-text': + data = copy_text + else: + data = jid + variant = GLib.Variant('s', data) + menuitem.set_action_and_target_value(action, variant) + menu.append_item(menuitem) + return menu def escape_mnemonic(label: Optional[str]) -> Optional[str]: ===================================== gajim/gtk/search.py ===================================== @@ -14,257 +14,222 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import cast +from typing import Any +from typing import Optional +from typing import Union +from typing import Type + import logging import itertools -from enum import IntEnum +from gi.repository import Gdk from gi.repository import Gtk +from nbxmpp.simplexml import Node from nbxmpp.modules import dataforms from gajim.common import app from gajim.common import ged +from gajim.common.events import SearchFormReceivedEvent +from gajim.common.events import SearchResultReceivedEvent from gajim.common.i18n import _ -from .menus import SearchMenu +from .assistant import Assistant +from .assistant import ErrorPage +from .assistant import Page +from .assistant import ProgressPage from .dataform import DataFormWidget +from .menus import get_directory_search_menu from .util import ensure_not_destroyed -from .util import find_widget from .util import EventHelper log = logging.getLogger('gajim.gui.search') -class Page(IntEnum): - REQUEST_FORM = 0 - FORM = 1 - REQUEST_RESULT = 2 - COMPLETED = 3 - ERROR = 4 - - -class Search(Gtk.Assistant, EventHelper): - def __init__(self, account, jid, transient_for=None): - Gtk.Assistant.__init__(self) +class DirectorySearch(Assistant, EventHelper): + def __init__(self, + account: str, + jid: str, + transient_for: Optional[Gtk.Window] = None + ) -> None: + Assistant.__init__(self, + transient_for=transient_for, + width=700, + height=500) EventHelper.__init__(self) - self._con = app.connections[account] - self._account = account + self._client = app.get_client(account) + self.account = account self._jid = jid self._destroyed = False - self.set_application(app.app) - self.set_resizable(True) - self.set_position(Gtk.WindowPosition.CENTER) - if transient_for is not None: - self.set_transient_for(transient_for) + self.add_button('search', _('Search'), 'suggested-action') + self.add_button('new-search', _('New Search')) + self.add_button('close', _('Close')) - self.set_size_request(500, 400) - self.get_style_context().add_class('dialog-margin') + self.add_pages({ + 'prepare': RequestForm(), + 'form': SearchForm(), + 'result': Result(), + 'error': Error() + }) - self._add_page(RequestForm()) - self._add_page(Form()) - self._add_page(RequestResult()) - self._add_page(Completed()) - self._add_page(Error()) + progress = cast(ProgressPage, self.add_default_page('progress')) + progress.set_title(_('Searching')) + progress.set_text(_('Searching…')) - self.connect('prepare', self._on_page_change) - self.connect('cancel', self._on_cancel) - self.connect('close', self._on_cancel) + self.connect('button-clicked', self._on_button_clicked) self.connect('destroy', self._on_destroy) - self._remove_sidebar() - - self._buttons = {} - self._add_custom_buttons() - - self.show() self.register_events([ ('search-form-received', ged.GUI1, self._search_form_received), ('search-result-received', ged.GUI1, self._search_result_received), ]) - self._request_search_fields() - - def _add_custom_buttons(self): - action_area = find_widget('action_area', self) - for button in list(action_area.get_children()): - self.remove_action_widget(button) - - search = Gtk.Button(label=_('Search')) - search.connect('clicked', self._execute_search) - search.get_style_context().add_class('suggested-action') - self._buttons['search'] = search - self.add_action_widget(search) - - new_search = Gtk.Button(label=_('New Search')) - new_search.get_style_context().add_class('suggested-action') - new_search.connect('clicked', - lambda *args: self.set_current_page(Page.FORM)) - self._buttons['new-search'] = new_search - self.add_action_widget(new_search) - - def _set_button_visibility(self, page): - for button in self._buttons.values(): - button.hide() - - if page == Page.FORM: - self._buttons['search'].show() - - elif page in (Page.ERROR, Page.COMPLETED): - self._buttons['new-search'].show() + self._client.get_module('Search').request_search_fields(self._jid) - def _add_page(self, page): - self.append_page(page) - self.set_page_type(page, page.type_) - self.set_page_title(page, page.title) - self.set_page_complete(page, page.complete) + self.show_all() - def set_stage_complete(self, is_valid): - self._buttons['search'].set_sensitive(is_valid) + def _on_button_clicked(self, + _assistant: Assistant, + button_name: str + ) -> None: + if button_name == 'search': + self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) + form = cast(SearchForm, self.get_page('form')).get_submit_form() + self._client.get_module('Search').send_search_form( + self._jid, form, True) + return - def _request_search_fields(self): - self._con.get_module('Search').request_search_fields(self._jid) + if button_name == 'new-search': + self.show_page('form', Gtk.StackTransitionType.SLIDE_RIGHT) + return - def _execute_search(self, *args): - self.set_current_page(Page.REQUEST_RESULT) - form = self.get_nth_page(Page.FORM).get_submit_form() - self._con.get_module('Search').send_search_form(self._jid, form, True) + if button_name == 'close': + self.destroy() @ensure_not_destroyed - def _search_form_received(self, event): + def _search_form_received(self, event: SearchFormReceivedEvent) -> None: if not event.is_dataform: - self.set_current_page(Page.ERROR) + error_page = cast(Error, self.get_page('error')) + error_page.set_text(_('Error while retrieving search form.')) + self.show_page('error') return - self.get_nth_page(Page.FORM).process_search_form(event.data) - self.set_current_page(Page.FORM) + form_page = cast(SearchForm, self.get_page('form')) + form_page.process_search_form(event.data) + self.show_page('form') @ensure_not_destroyed - def _search_result_received(self, event): + def _search_result_received(self, + event: SearchResultReceivedEvent + ) -> None: if event.data is None: - self._on_error('') + error_page = cast(Error, self.get_page('error')) + error_page.set_text(_('Error while receiving search results.')) + self.show_page('error') return - self.get_nth_page(Page.COMPLETED).process_result(event.data) - self.set_current_page(Page.COMPLETED) - - def _remove_sidebar(self): - main_box = self.get_children()[0] - sidebar = main_box.get_children()[0] - main_box.remove(sidebar) - - def _on_page_change(self, _assistant, _page): - self._set_button_visibility(self.get_current_page()) - def _on_error(self, error_text): - log.info('Show Error page') - page = self.get_nth_page(Page.ERROR) - page.set_text(error_text) - self.set_current_page(Page.ERROR) + result_page = cast(Result, self.get_page('result')) + result_page.process_result(event.data) + self.show_page('result') - def _on_cancel(self, _widget): - self.destroy() - - def _on_destroy(self, *args): + def _on_destroy(self, *args: Any) -> None: self._destroyed = True -class RequestForm(Gtk.Box): - - type_ = Gtk.AssistantPageType.CUSTOM - title = _('Request Search Form') - complete = False - +class RequestForm(ProgressPage): def __init__(self): - super().__init__(orientation=Gtk.Orientation.VERTICAL) - self.set_spacing(18) - spinner = Gtk.Spinner() - self.pack_start(spinner, True, True, 0) - spinner.start() - self.show_all() + ProgressPage.__init__(self) + self.set_title(_('Request Search Form')) + self.set_text(_('Requesting search form from server')) + def get_visible_buttons(self) -> list[str]: + return ['close'] -class Form(Gtk.Box): - type_ = Gtk.AssistantPageType.CUSTOM - title = _('Search') - complete = True +class SearchForm(Page): + def __init__(self) -> None: + Page.__init__(self) + self.title = _('Search') + + self.complete = False - def __init__(self): - super().__init__(orientation=Gtk.Orientation.VERTICAL) - self.set_spacing(18) self._dataform_widget = None + self.show_all() @property - def search_form(self): + def search_form(self) -> dataforms.SimpleDataForm: return self._dataform_widget.get_submit_form() - def clear(self): + def clear(self) -> None: self._show_form(None) - def process_search_form(self, form): + def process_search_form(self, form: Node) -> None: self._show_form(form) - def _show_form(self, form): + def _show_form(self, form: Optional[Node]) -> None: if self._dataform_widget is not None: self.remove(self._dataform_widget) self._dataform_widget.destroy() if form is None: return - options = {'form-width': 350} + options = {'form-width': 350, + 'entry-activates-default': True + } form = dataforms.extend_form(node=form) self._dataform_widget = DataFormWidget(form, options=options) + self._dataform_widget.set_propagate_natural_height(True) self._dataform_widget.connect('is-valid', self._on_is_valid) self._dataform_widget.validate() self._dataform_widget.show_all() self.add(self._dataform_widget) - def _on_is_valid(self, _widget, is_valid): - self.get_toplevel().set_stage_complete(is_valid) + def _on_is_valid(self, _widget: DataFormWidget, is_valid: bool) -> None: + self.complete = True + self.update_page_complete() - def get_submit_form(self): + def get_submit_form(self) -> dataforms.SimpleDataForm: return self._dataform_widget.get_submit_form() + def get_visible_buttons(self) -> list[str]: + return ['close', 'search'] -class RequestResult(RequestForm): - - type_ = Gtk.AssistantPageType.CUSTOM - title = _('Search…') - complete = False + def get_default_button(self) -> str: + return 'search' -class Completed(Gtk.Box): +class Result(Page): + def __init__(self) -> None: + Page.__init__(self) + self.title = _('Search Result') - type_ = Gtk.AssistantPageType.CUSTOM - title = _('Search Result') - complete = True - - def __init__(self): - super().__init__(orientation=Gtk.Orientation.VERTICAL) - self.set_spacing(12) - self.show_all() self._label = Gtk.Label(label=_('No results found')) self._label.get_style_context().add_class('bold16') self._label.set_no_show_all(True) self._label.set_halign(Gtk.Align.CENTER) + self._scrolled = Gtk.ScrolledWindow() + self._scrolled.set_propagate_natural_height(True) self._scrolled.get_style_context().add_class('search-scrolled') self._scrolled.set_no_show_all(True) - self._treeview = None - self._menu = None + self.add(self._label) self.add(self._scrolled) + + self._treeview: Optional[Gtk.TreeView] = None + self.show_all() - def process_result(self, form): + def process_result(self, form: Optional[Node]) -> None: if self._treeview is not None: self._scrolled.remove(self._treeview) self._treeview.destroy() self._treeview = None - self._menu = None self._label.hide() self._scrolled.hide() @@ -274,8 +239,8 @@ def process_result(self, form): form = dataforms.extend_form(node=form) - fieldtypes = [] - fieldvars = [] + fieldtypes: list[Union[Type[bool], Type[str]]] = [] + fieldvars: list[Any] = [] for field in form.reported.iter_fields(): if field.type_ == 'boolean': fieldtypes.append(bool) @@ -301,7 +266,6 @@ def process_result(self, form): self._treeview.set_vexpand(True) self._treeview.get_style_context().add_class('search-treeview') self._treeview.connect('button-press-event', self._on_button_press) - self._menu = SearchMenu(self._treeview) for field, counter in zip(form.reported.iter_fields(), itertools.count()): @@ -315,42 +279,51 @@ def process_result(self, form): self._scrolled.add(self._treeview) self._scrolled.show() - def _on_button_press(self, treeview, event): - if event.button != 3: - return - path, _column, _x, _y = treeview.get_path_at_pos(event.x, event.y) + def _on_button_press(self, + treeview: Gtk.TreeView, + event: Gdk.EventButton + ) -> bool: + if event.button != 3: # Right click + return False + + path = treeview.get_path_at_pos(int(event.x), int(event.y)) if path is None: - return + return False + + path, _column, _x, _y = path store = treeview.get_model() + assert store is not None + assert path is not None iter_ = store.get_iter(path) column_values = store[iter_] text = ' '.join(column_values) - self._menu.set_copy_text(text) - self._menu.popup_at_pointer() + menu = get_directory_search_menu(column_values[0], text) -class Error(Gtk.Box): + rectangle = Gdk.Rectangle() + rectangle.x = int(event.x) + rectangle.y = int(event.y) + rectangle.width = rectangle.height = 1 - type_ = Gtk.AssistantPageType.CUSTOM - title = _('Error') - complete = True + popover = Gtk.Popover.new_from_model(self, menu) + popover.set_relative_to(self) + popover.set_position(Gtk.PositionType.RIGHT) + popover.set_pointing_to(rectangle) + popover.popup() + return True - def __init__(self): - super().__init__(orientation=Gtk.Orientation.VERTICAL) - self.set_spacing(12) - self.set_homogeneous(True) - - icon = Gtk.Image.new_from_icon_name('dialog-error-symbolic', - Gtk.IconSize.DIALOG) - icon.get_style_context().add_class('error-color') - icon.set_valign(Gtk.Align.END) - self._label = Gtk.Label() - self._label.get_style_context().add_class('bold16') - self._label.set_valign(Gtk.Align.START) + def get_visible_buttons(self) -> list[str]: + return ['close', 'new-search'] - self.add(icon) - self.add(self._label) - self.show_all() + def get_default_button(self) -> str: + return 'close' + + +class Error(ErrorPage): + def __init__(self) -> None: + ErrorPage.__init__(self) + self.set_title(_('Error')) + self.set_heading(_('An error occurred')) - def set_text(self, text): - self._label.set_text(text) + def get_visible_buttons(self) -> list[str]: + return ['close'] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7857ebea0ae32984c40de704de05a90… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7857ebea0ae32984c40de704de05a90… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] ci: Use python3 for deploy script
by Philipp Hörist (＠lovetox) 28 May '22

28 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5fb40a6c by lovetox at 2022-05-28T12:00:37+02:00 ci: Use python3 for deploy script - - - - - 1 changed file: - .ci/deploy.py Changes: ===================================== .ci/deploy.py ===================================== @@ -13,7 +13,7 @@ PASSWORD = os.environ['PYPI_TOKEN'] def build() -> None: cmd = [ - 'python', + 'python3', 'setup.py', 'sdist', 'bdist_wheel' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5fb40a6c546aca5303994a1b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5fb40a6c546aca5303994a1b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag 3.1.0
by Philipp Hörist (＠lovetox) 28 May '22

28 May '22

Philipp Hörist pushed new tag 3.1.0 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/3.1.0 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: chore: Update ChangeLog
by Philipp Hörist (＠lovetox) 28 May '22

28 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 80e82238 by lovetox at 2022-05-28T11:14:25+02:00 chore: Update ChangeLog - - - - - c49a7d0e by lovetox at 2022-05-28T11:27:46+02:00 chore: Update git-chglog config - - - - - a1d3e5ac by lovetox at 2022-05-28T11:27:58+02:00 release: 3.1.0 - - - - - 4 changed files: - .chglog/config.yml - ChangeLog - nbxmpp/__init__.py - setup.cfg Changes: ===================================== .chglog/config.yml ===================================== @@ -8,17 +8,20 @@ options: filters: Type: - feat + - imprv - perf - fix commit_groups: sort_by: Custom title_order: - feat + - imprv - perf - fix title_maps: feat: New - perf: Performance Improvements + imprv: Improvements + perf: Performance fix: Bug Fixes header: pattern: "^(\\w*)\\:\\s(.*)$" ===================================== ChangeLog ===================================== @@ -1,3 +1,13 @@ +python-nbxmpp 3.1.0 (28 May 2022) + + New + + * Examples: Allow to connect with different modes + + Bug Fixes + + * Client: Disconnect after stream restart in Login mode + python-nbxmpp 3.0.2 (18 May 2022) Bug Fixes ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__: str = '3.0.2' +__version__: str = '3.1.0' ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 3.0.2 +version = 3.1.0 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/5516d597e8158fd746a4d50… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/5516d597e8158fd746a4d50… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: Client: Disconnect after stream restart in Login mode
by Philipp Hörist (＠lovetox) 28 May '22

28 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5516d597 by lovetox at 2022-05-28T11:08:56+02:00 fix: Client: Disconnect after stream restart in Login mode RFC 6120 states that ending the stream after successful auth is not allowed because the stream is considererd ended. Sending </stream:stream> would run into a parser error. So we restart the stream and end it afterwards. - - - - - 1 changed file: - nbxmpp/client.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -645,6 +645,11 @@ class Client(Observable): # other connection methods if an error happensafterwards self._connect_successful = True + if self._stream_authenticated and self._mode.is_login_test: + self.notify('login-successful') + self.disconnect() + return + self.state = StreamState.WAIT_FOR_FEATURES elif self.state == StreamState.WAIT_FOR_FEATURES: @@ -687,14 +692,6 @@ class Client(Observable): elif self.state == StreamState.AUTH_SUCCESSFUL: self._stream_authenticated = True - if self._mode.is_login_test: - self.notify('login-successful') - # Reset parser because we will receive a new stream header - # which will otherwise lead to a parsing error - self._dispatcher.reset_parser() - self.disconnect() - return - self._start_stream() elif self.state == StreamState.AUTH_FAILED: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5516d597e8158fd746a4d501… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5516d597e8158fd746a4d501… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] feat: Examples: Allow to connect with different modes
by Philipp Hörist (＠lovetox) 28 May '22

28 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 637b3930 by lovetox at 2022-05-28T10:49:07+02:00 feat: Examples: Allow to connect with different modes - - - - - 2 changed files: - nbxmpp/examples/client.py - nbxmpp/examples/client.ui Changes: ===================================== nbxmpp/examples/client.py ===================================== @@ -16,10 +16,10 @@ from nbxmpp.protocol import JID from nbxmpp.client import Client from nbxmpp.structs import ProxyData from nbxmpp.structs import StanzaHandler -from nbxmpp.addresses import ServerAddress from nbxmpp.const import ConnectionType from nbxmpp.const import ConnectionProtocol from nbxmpp.const import StreamError +from nbxmpp.const import Mode consoleloghandler = logging.StreamHandler() log = logging.getLogger('nbxmpp') @@ -94,6 +94,17 @@ class TestClient(Gtk.Window): self._builder.proxy_password.get_text() or None) self._client.set_proxy(proxy) + if self._builder.login_mode.get_active(): + self._client.set_mode(Mode.LOGIN_TEST) + elif self._builder.client_mode.get_active(): + self._client.set_mode(Mode.CLIENT) + elif self._builder.register_mode.get_active(): + self._client.set_mode(Mode.REGISTER) + elif self._builder.anon_mode.get_active(): + self._client.set_mode(Mode.ANONYMOUS_TEST) + else: + raise ValueError('No mode selected') + self._client.set_connection_types(self._get_connection_types()) self._client.set_protocols(self._get_connection_protocols()) @@ -168,8 +179,10 @@ class TestClient(Gtk.Window): self._scroll_timeout = GLib.timeout_add(50, self.scroll_to_end) def _connect_clicked(self, *args): - if self._client is None: - self._create_client() + if self._client is not None: + self._client.destroy() + + self._create_client() self._client.connect() ===================================== nbxmpp/examples/client.ui ===================================== @@ -1,27 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> +  <object class="GtkGrid" id="grid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">24</property> - <property name="margin_right">24</property> - <property name="margin_top">24</property> - <property name="margin_bottom">24</property> - <property name="row_spacing">12</property> + <property name="can-focus">False</property> + <property name="margin-start">24</property> + <property name="margin-end">24</property> + <property name="margin-top">24</property> + <property name="margin-bottom">24</property> + <property name="row-spacing">12</property> <child> <object class="GtkButtonBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> - <property name="layout_style">start</property> + <property name="layout-style">start</property> <child> <object class="GtkButton"> <property name="label" translatable="yes">Connect</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="clicked" handler="_connect_clicked" swapped="no"/> <style> <class name="suggested-action"/> @@ -37,8 +38,8 @@ <object class="GtkButton"> <property name="label" translatable="yes">Disconnect</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="clicked" handler="_disconnect_clicked" swapped="no"/> <style> <class name="destructive-action"/> @@ -54,8 +55,8 @@ <object class="GtkButton"> <property name="label" translatable="yes">Reconnect</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="clicked" handler="_on_reconnect_clicked" swapped="no"/> </object> <packing> @@ -68,8 +69,8 @@ <object class="GtkButton" id="clear"> <property name="label" translatable="yes">Clear</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="clicked" handler="_clear_clicked" swapped="no"/> </object> <packing> @@ -80,242 +81,244 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> +  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">XMPP-Address</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Password</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkEntry" id="address"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="valign">center</property> <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkEntry" id="password"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="valign">center</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Proxy Host or IP</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Proxy Port</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Proxy Password</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="left-attach">0</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Proxy Username</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="left-attach">0</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkEntry" id="proxy_ip"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkEntry" id="proxy_username"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="left-attach">1</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkEntry" id="proxy_port"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left-attach">1</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkEntry" id="proxy_password"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="left-attach">1</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Save</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="left-attach">0</property> + <property name="top-attach">7</property> </packing> </child> <child> <object class="GtkButton"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Save</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Save</property> <property name="halign">start</property> <signal name="clicked" handler="_on_save_clicked" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">document-save-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">document-save-symbolic</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> + <property name="left-attach">1</property> + <property name="top-attach">7</property> </packing> </child> <child> <object class="GtkFrame"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkAlignment"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">12</property> - <property name="bottom_padding">12</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="top-padding">12</property> + <property name="bottom-padding">12</property> + <property name="left-padding">12</property> <child> +  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkCheckButton" id="directtls"> <property name="label" translatable="yes">DIRECT TLS</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="starttls"> <property name="label" translatable="yes">START TLS</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="plain"> <property name="label" translatable="yes">PLAIN</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> </object> @@ -325,60 +328,61 @@ <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Connection Type</property> </object> </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> <property name="height">3</property> </packing> </child> <child> <object class="GtkFrame"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkAlignment"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">12</property> - <property name="bottom_padding">12</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="top-padding">12</property> + <property name="bottom-padding">12</property> + <property name="left-padding">12</property> <child> +  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkCheckButton" id="tcp"> <property name="label" translatable="yes">TCP</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="websocket"> <property name="label" translatable="yes">WEBSOCKET</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> @@ -388,34 +392,34 @@ <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Connection Protocol</property> </object> </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> + <property name="left-attach">2</property> + <property name="top-attach">3</property> <property name="height">3</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Proxy Type</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkComboBoxText" id="proxy_type"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="active">0</property> <items> @@ -423,37 +427,128 @@ </items> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> - <placeholder/> + <object class="GtkFrame"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <object class="GtkAlignment"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="top-padding">12</property> + <property name="bottom-padding">12</property> + <property name="left-padding">12</property> + <child> +  + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkRadioButton" id="client_mode"> + <property name="label" translatable="yes">Client</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + <property name="group">login_mode</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="login_mode"> + <property name="label" translatable="yes">Login</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="register_mode"> + <property name="label" translatable="yes">Register</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + <property name="group">login_mode</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="anon_mode"> + <property name="label" translatable="yes">Anyonymous</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + <property name="group">login_mode</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Modes</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">6</property> + </packing> </child> <child> <placeholder/> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwin"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkListBox" id="xml_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="vexpand">True</property> </object> </child> @@ -461,8 +556,8 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/637b3930db025e67439f283e… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/637b3930db025e67439f283e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Don’t fail on GajimPlugin equality test
by Philipp Hörist (＠lovetox) 28 May '22

28 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f43aeeb5 by lovetox at 2022-05-28T09:28:09+02:00 fix: Don’t fail on GajimPlugin equality test - - - - - 7857ebea by lovetox at 2022-05-28T09:48:41+02:00 fix: Plugins: Unregister modules after calling deactivate() - - - - - 2 changed files: - gajim/plugins/gajimplugin.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/gajimplugin.py ===================================== @@ -96,6 +96,8 @@ def load_config(self) -> None: self.config.load() def __eq__(self, plugin: Any) -> bool: + if not isinstance(plugin, GajimPlugin): + return False return self.manifest.short_name == plugin.manifest.short_name def __ne__(self, plugin: Any) -> bool: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -543,10 +543,12 @@ def deactivate_plugin(self, plugin: GajimPlugin) -> None: self._remove_events_handler_from_ged(plugin) self._remove_name_from_encryption_plugins(plugin) - self._unregister_modules_with_handlers(plugin) - # removing plug-in from active plug-ins list + # deactivate() must be before _unregister_modules_with_handlers(), + # because plugin.deactivate() may want to use the module plugin.deactivate() + + self._unregister_modules_with_handlers(plugin) self.active_plugins.remove(plugin) app.settings.set_plugin_setting(plugin.manifest.short_name, 'active', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2bdb296a66147ed4e52be52d77d434e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2bdb296a66147ed4e52be52d77d434e… 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