Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Jingle file transfers: Typing
by Daniel Brötzmann (＠wurstsalat) 14 Jan '22

14 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: bbafe882 by wurstsalat at 2022-01-14T10:08:12+01:00 Jingle file transfers: Typing - - - - - 7 changed files: - gajim/common/events.py - gajim/common/file_props.py - gajim/common/modules/iq.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - gajim/gtk/conversation/view.py - gajim/gtk/filetransfer.py Changes: ===================================== gajim/common/events.py ===================================== @@ -12,6 +12,8 @@ # 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 + import typing from typing import Any from typing import Union @@ -29,11 +31,13 @@ from nbxmpp.const import InviteType from gajim.common import app +from gajim.common.file_props import FileProp if typing.TYPE_CHECKING: from gajim.common.helpers import AdditionalDataDict from gajim.common.const import KindConstant from gajim.common.client import Client + from gajim.common.jingle_session import JingleSession @dataclass @@ -167,14 +171,14 @@ class AdHocCommandActionResponse(ApplicationEvent): @dataclass class FileProgress(ApplicationEvent): name: str = field(init=False, default='file-progress') - file_props: Any + file_props: FileProp @dataclass class FileCompleted(ApplicationEvent): name: str = field(init=False, default='file-completed') account: str - file_props: Any + file_props: FileProp jid: str @@ -182,7 +186,7 @@ class FileCompleted(ApplicationEvent): class FileError(ApplicationEvent): name: str = field(init=False, default='file-error') account: str - file_props: Any + file_props: FileProp jid: str @@ -190,7 +194,7 @@ class FileError(ApplicationEvent): class FileHashError(ApplicationEvent): name: str = field(init=False, default='file-hash-error') account: str - file_props: Any + file_props: FileProp jid: str @@ -198,7 +202,7 @@ class FileHashError(ApplicationEvent): class FileRequestSent(ApplicationEvent): name: str = field(init=False, default='file-request-sent') account: str - file_props: Any + file_props: FileProp jid: str @@ -206,7 +210,7 @@ class FileRequestSent(ApplicationEvent): class FileRequestError(ApplicationEvent): name: str = field(init=False, default='file-request-error') conn: 'Client' - file_props: Any + file_props: FileProp jid: str error_msg: str = '' @@ -215,8 +219,9 @@ class FileRequestError(ApplicationEvent): class FileSendError(ApplicationEvent): name: str = field(init=False, default='file-send-error') account: str - file_props: Any + file_props: FileProp jid: str + error_msg: str = '' @dataclass @@ -484,7 +489,7 @@ class JingleEvent(ApplicationEvent): jid: str sid: str resource: str - jingle_session: Any + jingle_session: JingleSession @dataclass @@ -651,7 +656,7 @@ class FileRequestReceivedEvent(ApplicationEvent): fjid: str = field(init=False) account: str = field(init=False) jid: str = field(init=False) - file_props: Any = field(init=False) + file_props: FileProp = field(init=False) def __post_init__(self): from gajim.common.jingle_transport import JingleTransportSocks5 ===================================== gajim/common/file_props.py ===================================== @@ -112,7 +112,7 @@ def __init__(self, account: str, sid: str) -> None: # Do not instantiate this class directly! # Call FilesProp.getNeFileProp instead self.streamhosts = [] - self.transfered_size: list[int] = [] + self.transfered_size: list[tuple[float, int]] = [] self.started: bool = False self.completed: bool = False self.paused: bool = False ===================================== gajim/common/modules/iq.py ===================================== @@ -66,7 +66,8 @@ def _iq_error_received(self, _con, _stanza, properties): app.ged.raise_event( FileSendError(account=self._account, jid=str(properties.jid), - file_props=file_props)) + file_props=file_props, + error_msg='')) self._con.get_module('Bytestream').disconnect_transfer( file_props) raise nbxmpp.NodeProcessed ===================================== gajim/gtk/controls/base.py ===================================== @@ -29,6 +29,7 @@ from typing import Dict from typing import List from typing import Optional +from typing import Union import os import logging @@ -54,7 +55,10 @@ from gajim.common.helpers import get_file_path_from_dnd_dropped_uri from gajim.common.i18n import _ from gajim.common.ged import EventHelper +from gajim.common.events import ApplicationEvent from gajim.common.events import JingleRequestReceived +from gajim.common.events import FileRequestReceivedEvent +from gajim.common.events import FileRequestSent from gajim.common.events import Notification from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_retraction_text @@ -293,7 +297,7 @@ def _connect_contact_signals(self) -> None: def _get_action(self, name: str) -> Gio.SimpleAction: return app.window.lookup_action(f'{name}{self.control_id}') - def process_event(self, event): + def process_event(self, event: ApplicationEvent) -> None: if event.account != self.account: return @@ -311,6 +315,7 @@ def process_event(self, event): if event.name in jingle_av_events: self._process_jingle_av_event(event) return + if event.name in ('file-request-received', 'file-request-sent'): self.add_jingle_file_transfer(event=event) return @@ -1173,7 +1178,12 @@ def add_info_message(self, text: str) -> None: def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: self.conversation_view.add_file_transfer(transfer) - def add_jingle_file_transfer(self, event): + def add_jingle_file_transfer(self, + event: Union[ + FileRequestReceivedEvent, + FileRequestSent, + None] + ) -> None: if self._allow_add_message(): self.conversation_view.add_jingle_file_transfer(event) ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.py ===================================== @@ -12,11 +12,17 @@ # 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 Union +from typing import Optional + import logging import os import time from datetime import datetime +from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import Gtk @@ -24,27 +30,44 @@ from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import KindConstant +from gajim.common.events import FileRequestReceivedEvent +from gajim.common.events import FileRequestSent +from gajim.common.events import FileCompleted +from gajim.common.events import FileProgress +from gajim.common.events import FileError +from gajim.common.events import FileHashError +from gajim.common.events import FileSendError +from gajim.common.events import FileRequestError +from gajim.common.events import JingleErrorReceived +from gajim.common.events import JingleFtCancelledReceived from gajim.common.file_props import FileProp from gajim.common.file_props import FilesProp from gajim.common.helpers import open_file from gajim.common.i18n import _ +from gajim.common.modules.contacts import BareContact +from gajim.common.storage.archive import ConversationRow from .base import BaseRow from ...builder import get_builder from ...util import format_eta +TransferEventT = Union[FileRequestReceivedEvent, FileRequestSent] + log = logging.getLogger('gajim.gui.conversation.rows.file_transfer_jingle') class FileTransferJingleRow(BaseRow): - def __init__(self, account, contact, event=None, db_message=None): + def __init__(self, + account: str, + contact: BareContact, + event: Optional[TransferEventT] = None, + db_message: Optional[ConversationRow] = None + ) -> None: BaseRow.__init__(self, account) self.type = 'file-transfer' - is_from_db = bool(db_message is not None) - - if is_from_db: + if db_message is not None: timestamp = db_message.time else: timestamp = time.time() @@ -53,12 +76,14 @@ def __init__(self, account, contact, event=None, db_message=None): self._contact = contact - if is_from_db: + if db_message is not None: sid = db_message.additional_data.get_value('gajim', 'sid') + assert sid is not None self._file_props = FilesProp.getFilePropBySid(sid) if self._file_props is None: - log.debug('File props not found for SID: %s', sid) + log.debug('File prop not found for SID: %s', sid) else: + assert event is not None self._file_props = event.file_props self._start_time = 0 @@ -72,7 +97,7 @@ def __init__(self, account, contact, event=None, db_message=None): avatar_placeholder.set_valign(Gtk.Align.START) self.grid.attach(avatar_placeholder, 0, 0, 1, 1) - if is_from_db: + if db_message is not None: if db_message.kind == KindConstant.FILE_TRANSFER_INCOMING: contact = self._contact is_self = True @@ -81,7 +106,7 @@ def __init__(self, account, contact, event=None, db_message=None): str(self._client.get_own_jid().bare)) is_self = False else: - if event.name == 'file-request-sent': + if isinstance(event, FileRequestSent): contact = self._client.get_module('Contacts').get_contact( str(self._client.get_own_jid().bare)) is_self = False @@ -91,6 +116,7 @@ def __init__(self, account, contact, event=None, db_message=None): scale = self.get_scale_factor() avatar = contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) + assert not isinstance(avatar, GdkPixbuf.Pixbuf) avatar_image = Gtk.Image.new_from_surface(avatar) avatar_placeholder.add(avatar_image) @@ -112,9 +138,10 @@ def __init__(self, account, contact, event=None, db_message=None): self.show_all() - if is_from_db: + if db_message is not None: self._reconstruct_transfer() else: + assert event is not None self._display_transfer_info(event.name) if self._file_props is None: @@ -170,7 +197,7 @@ def _show_file_infos(self) -> None: self._ui.file_size.hide() return - file_name = GLib.markup_escape_text(self._file_props.name) + file_name = GLib.markup_escape_text(str(self._file_props.name)) if self._file_props.mime_type: file_name = f'{file_name} ({self._file_props.mime_type})' self._ui.file_name.set_text(file_name) @@ -186,8 +213,8 @@ def _show_file_infos(self) -> None: self._ui.file_size.set_text( GLib.format_size_full(self._file_props.size, self._units)) - def process_event(self, event): - if event.name == 'jingle-error-received': + def process_event(self, event: TransferEventT) -> None: + if isinstance(event, JingleErrorReceived): if event.sid != self._file_props.sid: return self._ui.action_stack.set_visible_child_name('error') @@ -195,7 +222,7 @@ def process_event(self, event): self._ui.error_label.set_text(event.reason) return - if event.name == 'jingle-ft-cancelled-received': + if isinstance(event, JingleFtCancelledReceived): if event.sid != self._file_props.sid: return self._ui.action_stack.set_visible_child_name('error') @@ -209,14 +236,15 @@ def process_event(self, event): if event.file_props.sid != self._file_props.sid: return - if event.name == 'file-completed': + if isinstance(event, FileCompleted): self._show_completed() - elif event.name == 'file-error': + elif isinstance(event, FileError): self._show_error(event.file_props) - elif event.name == 'file-hash-error': + elif isinstance(event, FileHashError): self._ui.action_stack.set_visible_child_name('hash-error') self._ui.transfer_action.set_text(_('File Verification Failed')) - elif event.name in ('file-request-error', 'file-send-error'): + elif (isinstance(event, FileRequestError) or + isinstance(event, FileSendError)): self._ui.action_stack.set_visible_child_name('error') self._ui.transfer_action.set_text(_('File Transfer Cancelled')) error_text = _('Connection with %s could not be ' @@ -225,7 +253,7 @@ def process_event(self, event): error_text = f'{error_text} ({event.error_msg})' self._ui.error_label.set_text(error_text) - elif event.name == 'file-progress': + elif isinstance(event, FileProgress): self._update_progress(event.file_props) def _update_progress(self, file_props: FileProp) -> None: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -36,6 +36,8 @@ from gajim.common import app from gajim.common.client import Client from gajim.common.events import JingleRequestReceived +from gajim.common.events import FileRequestReceivedEvent +from gajim.common.events import FileRequestSent from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day @@ -231,7 +233,14 @@ def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: transfer_row = FileTransferRow(self._account, transfer) self._insert_message(transfer_row) - def add_jingle_file_transfer(self, event=None, db_message=None): + def add_jingle_file_transfer(self, + event: Union[ + FileRequestReceivedEvent, + FileRequestSent, + None] = None, + db_message: Optional[ConversationRow] = None + ) -> None: + assert isinstance(self._contact, BareContact) jingle_transfer_row = FileTransferJingleRow( self._account, self._contact, event=event, db_message=db_message) self._insert_message(jingle_transfer_row) ===================================== gajim/gtk/filetransfer.py ===================================== @@ -30,6 +30,8 @@ from gi.repository import GLib from gi.repository import Pango +from nbxmpp.protocol import JID + from gajim.common import app from gajim.common import ged from gajim.common import helpers @@ -38,12 +40,14 @@ from gajim.common.const import KindConstant from gajim.common.i18n import _ from gajim.common.file_props import FilesProp +from gajim.common.file_props import FileProp from gajim.common.helpers import open_file from gajim.common.helpers import file_is_locked from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.bytestream import is_transfer_active from gajim.common.modules.bytestream import is_transfer_paused from gajim.common.modules.bytestream import is_transfer_stopped +from gajim.common.modules.contacts import BareContact from .dialogs import DialogButton from .dialogs import ConfirmationDialog @@ -343,7 +347,11 @@ def show_stopped(self, jid, file_props, error_msg=''): ErrorDialog(_('File transfer stopped'), sectext) self._ui.transfers_list.get_selection().unselect_all() - def show_hash_error(self, jid, file_props, account): + def show_hash_error(self, + jid: JID, + file_props: FileProp, + account: str + ) -> None: def _on_yes(): # Delete old file os.remove(file_props.file_name) @@ -436,7 +444,11 @@ def _start_receive(self, file_path, account, contact, file_props): client = app.get_client(account) client.get_module('Bytestream').send_file_approval(file_props) - def on_file_request_accepted(self, account, contact, file_props): + def on_file_request_accepted(self, + account: str, + contact: BareContact, + file_props: FileProp + ) -> None: def _on_accepted(account, contact, file_props, file_path): if os.path.exists(file_path): app.settings.set('last_save_dir', os.path.dirname(file_path)) @@ -887,10 +899,10 @@ def _on_cancel_button_clicked(self, widget): file_props = FilesProp.getFilePropByType(sid[0], sid[1:]) self.cancel_transfer(file_props) - def cancel_transfer(self, file_props): + def cancel_transfer(self, file_props: FileProp) -> None: # TODO: does not cancel transfer somehow account = file_props.tt_account - if account not in app.connections: + if account is None or account not in app.connections: return client = app.get_client(account) # Check if we are in a IBB transfer View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bbafe882fa17592704f25cd2b3add602… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bbafe882fa17592704f25cd2b3add602… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Bookmarks: Typing
by Daniel Brötzmann (＠wurstsalat) 13 Jan '22

13 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 02e29ce8 by wurstsalat at 2022-01-13T23:04:56+01:00 Bookmarks: Typing - - - - - 1 changed file: - gajim/gtk/bookmarks.py Changes: ===================================== gajim/gtk/bookmarks.py ===================================== @@ -27,7 +27,7 @@ class Bookmarks(Gtk.ApplicationWindow): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -55,10 +55,13 @@ def __init__(self, account): self.show_all() - def _on_key_press(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey): if event.keyval == Gdk.KEY_Escape: self.destroy() @staticmethod - def _search_func(model, _column, search_text, iter_): + def _search_func(model: Gtk.TreeModel, + _column: int, + search_text: str, + iter_: Gtk.TreeIter): return search_text.lower() not in model[iter_][0].lower() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02e29ce873a06ccd849661d635dcbd77… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02e29ce873a06ccd849661d635dcbd77… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] VariantMixin: Fix integer type
by Philipp Hörist (＠lovetox) 13 Jan '22

13 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: bbec6ffe by lovetox at 2022-01-13T22:28:47+01:00 VariantMixin: Fix integer type - - - - - 1 changed file: - gajim/common/structs.py Changes: ===================================== gajim/common/structs.py ===================================== @@ -272,7 +272,7 @@ def _get_type_and_variant_string(self, return str, f'{variant_str}s' if 'int' in field_type: - return str, f'{variant_str}i' + return int, f'{variant_str}i' if 'bool' in field_type: return bool, f'{variant_str}b' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bbec6ffe44eb9e7f82098ab8809825f9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bbec6ffe44eb9e7f82098ab8809825f9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] VariantMixin: Support boolean fields
by Philipp Hörist (＠lovetox) 13 Jan '22

13 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: b0d561f5 by lovetox at 2022-01-13T22:25:30+01:00 VariantMixin: Support boolean fields Fixes #10749 - - - - - 1 changed file: - gajim/common/structs.py Changes: ===================================== gajim/common/structs.py ===================================== @@ -274,6 +274,9 @@ def _get_type_and_variant_string(self, if 'int' in field_type: return str, f'{variant_str}i' + if 'bool' in field_type: + return bool, f'{variant_str}b' + if 'JID' in field_type: return JID, f'{variant_str}s' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b0d561f5aab4ab32d9c3ffcf1ad7eac2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b0d561f5aab4ab32d9c3ffcf1ad7eac2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: AudioWidget: Typing
by Daniel Brötzmann (＠wurstsalat) 13 Jan '22

13 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 79b6cb15 by wurstsalat at 2022-01-13T20:19:02+01:00 AudioWidget: Typing - - - - - c14cc32b by wurstsalat at 2022-01-13T20:38:15+01:00 ResourceSelector: Typing - - - - - c9537bbd by wurstsalat at 2022-01-13T20:38:20+01:00 SearchView: Typing - - - - - 23b9a50a by wurstsalat at 2022-01-13T20:38:20+01:00 Features: Typing - - - - - a44ae974 by wurstsalat at 2022-01-13T20:46:58+01:00 SendFileDialog: Typing - - - - - 6 changed files: - gajim/common/storage/archive.py - gajim/gtk/features.py - gajim/gtk/file_transfer_send.py - gajim/gtk/preview_audio.py - gajim/gtk/resource_selector.py - gajim/gtk/search_view.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -121,6 +121,8 @@ class LastConversationRow(NamedTuple): class SearchLogRow(NamedTuple): + account_id: int + jid_id: int contact_name: str time: float kind: int @@ -675,8 +677,8 @@ def search_log(self, users_query_string = 'AND UPPER(contact_name) IN (?)' sql = ''' - SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id + SELECT account_id, jid_id, contact_name, time, kind, show, message, + subject, additional_data, log_line_id FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND message LIKE like(?) AND kind NOT IN ({kinds}) ===================================== gajim/gtk/features.py ===================================== @@ -20,7 +20,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import NamedTuple -from typing import List +from typing import Optional import os import sys @@ -38,7 +38,7 @@ class Feature(NamedTuple): tooltip: str dependency_u: str dependency_w: str - enabled: bool + enabled: Optional[bool] class Features(Gtk.ApplicationWindow): @@ -77,7 +77,7 @@ def __init__(self) -> None: def _on_key_press(self, _widget: Gtk.Widget, - event: Gdk.EventButton) -> None: + event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() @@ -85,7 +85,7 @@ def _add_feature(self, feature: Feature) -> None: item = FeatureItem(feature) self.feature_listbox.add(item) - def _get_features(self) -> List[Feature]: + def _get_features(self) -> list[Feature]: notification_sounds_available: bool = ( app.is_installed('GSOUND') or sys.platform in ('win32', 'darwin')) notification_sounds_enabled: bool = app.settings.get('sounds_on') @@ -210,7 +210,7 @@ def __init__(self, feature: Feature) -> None: self.add(self._icon) self.add(self._box) - def _set_feature(self, available: bool, enabled: bool) -> None: + def _set_feature(self, available: bool, enabled: Optional[bool]) -> None: self._icon.get_style_context().remove_class('error-color') self._icon.get_style_context().remove_class('warning-color') self._icon.get_style_context().remove_class('success-color') @@ -219,7 +219,9 @@ def _set_feature(self, available: bool, enabled: bool) -> None: self._icon.set_from_icon_name( 'window-close-symbolic', Gtk.IconSize.MENU) self._icon.get_style_context().add_class('error-color') - elif enabled is False: + return + + if enabled is not None and not enabled: self._icon.set_from_icon_name( 'dialog-warning-symbolic', Gtk.IconSize.MENU) self._box.pack_start(self._label_disabled, True, True, 0) ===================================== gajim/gtk/file_transfer_send.py ===================================== @@ -17,16 +17,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 cast + from pathlib import Path from gi.repository import Gdk from gi.repository import Gtk from gi.repository import Pango -from nbxmpp import Namespace +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID from gajim.common import app from gajim.common.i18n import _ +from gajim.common.modules.contacts import BareContact from .filechoosers import FileChooserDialog from .resource_selector import ResourceSelector @@ -34,7 +41,11 @@ class SendFileDialog(Gtk.ApplicationWindow): - def __init__(self, contact, send_callback, transient_for): + def __init__(self, + contact: BareContact, + send_callback: Callable[..., bool], + transient_for: Gtk.Window + ) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_show_menubar(False) @@ -61,24 +72,28 @@ def __init__(self, contact, send_callback, transient_for): constraints=[Namespace.JINGLE_FILE_TRANSFER_5]) self._resource_selector.connect( 'selection-changed', self._on_resource_selection) - self._ui.resource_box.pack_start(self._resource_selector, 1, 0, 0) + self._ui.resource_box.pack_start( + self._resource_selector, True, False, 0) - self.connect('key-press-event', self._key_press_event) + self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self) self.show_all() - def _on_files_changed(self, _listbox, _row): + def _on_files_changed(self, _listbox: Gtk.ListBox, _row: FileRow) -> None: sensitive = bool(len(self._ui.listbox.get_children()) > 0) self._ui.files_send.set_sensitive(sensitive) - def _on_resource_selection(self, _selector, state): + def _on_resource_selection(self, + _selector: ResourceSelector, + state: bool + ) -> None: self._ui.resource_send.set_sensitive(state) - def _on_send_to_resource(self, _button): + def _on_send_to_resource(self, _button: Gtk.Button) -> None: resource_jid = self._resource_selector.get_jid() self._send_files(resource_jid) - def _on_send_clicked(self, _button): + def _on_send_clicked(self, _button: Gtk.Button) -> None: count = len(self._contact.get_resources()) if count == 0 or count > 1: self._ui.send_stack.set_visible_child_name('resource_selection') @@ -87,48 +102,50 @@ def _on_send_clicked(self, _button): resource_jid = self._contact.get_resources()[0].jid self._send_files(resource_jid) - def _send_files(self, resource_jid): - for file in self._ui.listbox.get_children(): + def _send_files(self, resource_jid: JID) -> None: + files = cast(list[FileRow], self._ui.listbox.get_children()) + for file in files: self._send_callback( - resource_jid, str(file.path), self._get_description()) + resource_jid, str(file.file_path), self._get_description()) self.destroy() - def _select_files(self, _button): + def _select_files(self, _button: Gtk.Button) -> None: FileChooserDialog(self._set_files, select_multiple=True, transient_for=self, path=app.settings.get('last_send_dir')) - def _remove_files(self, _button): + def _remove_files(self, _button: Gtk.Button) -> None: selected = self._ui.listbox.get_selected_rows() for item in selected: self._ui.listbox.remove(item) - def _set_files(self, file_names): + def _set_files(self, file_names: str) -> None: + last_dir = '' for file in file_names: row = FileRow(file) - if row.path.is_dir(): + if row.file_path.is_dir(): continue - last_dir = row.path.parent + last_dir = row.file_path.parent self._ui.listbox.add(row) self._ui.listbox.show_all() app.settings.set('last_send_dir', str(last_dir)) - def _get_description(self): + def _get_description(self) -> str: buffer_ = self._ui.description.get_buffer() start, end = buffer_.get_bounds() return buffer_.get_text(start, end, False) - def _key_press_event(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() class FileRow(Gtk.ListBoxRow): - def __init__(self, path): + def __init__(self, path: str) -> None: Gtk.ListBoxRow.__init__(self) - self.path = Path(path) - label = Gtk.Label(label=self.path.name) + self.file_path: Path = Path(path) + label = Gtk.Label(label=self.file_path.name) label.set_ellipsize(Pango.EllipsizeMode.END) label.set_xalign(0) self.add(label) ===================================== gajim/gtk/preview_audio.py ===================================== @@ -79,6 +79,7 @@ def _build_audio_widget(self) -> None: self.show_all() def _setup_audio_player(self, file_path: Path) -> None: + assert self._playbin is not None self._playbin.set_property('uri', f'file://{file_path}') state_return = self._playbin.set_state(Gst.State.PAUSED) if state_return == Gst.StateChangeReturn.FAILURE: @@ -93,13 +94,17 @@ def _setup_audio_player(self, file_path: Path) -> None: bus.connect('message', self._on_bus_message) def _on_bus_message(self, _bus: Gst.Bus, message: Gst.Message) -> None: + assert self._playbin is not None if message.type == Gst.MessageType.EOS: self._set_pause(True) self._playbin.seek_simple( Gst.Format.TIME, Gst.SeekFlags.FLUSH, 0) elif message.type == Gst.MessageType.STATE_CHANGED: - _success, duration = self._playbin.query_duration( + success, duration = self._playbin.query_duration( Gst.Format.TIME) + if not success: + return + assert duration is not None if duration > 0: self._seek_bar.set_range(0.0, duration) @@ -114,6 +119,7 @@ def _on_seek(self, _scroll: Gtk.ScrollType, value: float ) -> bool: + assert self._playbin is not None self._playbin.seek_simple( Gst.Format.TIME, Gst.SeekFlags.FLUSH, int(value)) return False @@ -122,13 +128,16 @@ def _on_play_clicked(self, _button: Gtk.Button) -> None: self._set_pause(not self._get_paused()) def _on_destroy(self, _widget: Gtk.Widget) -> None: + assert self._playbin is not None self._playbin.set_state(Gst.State.NULL) def _get_paused(self) -> bool: + assert self._playbin is not None _, state, _ = self._playbin.get_state(20) return state == Gst.State.PAUSED def _set_pause(self, paused: bool) -> None: + assert self._playbin is not None if paused: self._playbin.set_state(Gst.State.PAUSED) self._play_icon.set_from_icon_name( @@ -145,6 +154,7 @@ def _update_seek_bar(self) -> bool: self._has_timeout = False return False + assert self._playbin is not None if self._playbin.query(self._query): _fmt, cur_pos = self._query.parse_position() if cur_pos is not None: @@ -167,4 +177,6 @@ def _format_audio_timestamp(_widget: Gtk.Scale, ns: float) -> str: @staticmethod def _on_realize(event_box: Gtk.EventBox) -> None: - event_box.get_window().set_cursor(get_cursor('pointer')) + window = event_box.get_window() + if window is not None: + window.set_cursor(get_cursor('pointer')) ===================================== gajim/gtk/resource_selector.py ===================================== @@ -14,7 +14,7 @@ from __future__ import annotations from typing import Optional -from typing import Tuple +from typing import cast import locale import logging @@ -23,7 +23,6 @@ from gi.repository import Gtk from nbxmpp import JID -from nbxmpp.namespaces import _Namespaces from nbxmpp.structs import DiscoInfo from gajim.common import app @@ -46,7 +45,7 @@ class ResourceSelector(Gtk.ScrolledWindow): def __init__(self, contact: BareContact, - constraints: Optional[list[_Namespaces]] = None) -> None: + constraints: Optional[list[str]] = None) -> None: Gtk.ScrolledWindow.__init__(self) self.set_shadow_type(Gtk.ShadowType.IN) self.set_size_request(-1, 200) @@ -61,7 +60,7 @@ def __init__(self, self._contact.connect('presence-update', self._on_update) self._contact.connect('caps-update', self._on_update) - # Constraints include Namespaces a resource has to support + # Constraints include nbxmpp Namespaces a resource has to support self._constraints = constraints or [] self._set_placeholder() @@ -106,13 +105,14 @@ def _on_update(self, self._add_entries() def get_jid(self) -> JID: - return self._listbox.get_selected_row().jid + resource_row = cast(ResourceRow, self._listbox.get_selected_row()) + return resource_row.jid class ResourceRow(Gtk.ListBoxRow): def __init__(self, resource_contact: ResourceContact, - constraints: list[_Namespaces] + constraints: list[str] ) -> None: Gtk.ListBoxRow.__init__(self) @@ -145,7 +145,7 @@ def __init__(self, box.add(name_label) for constraint in constraints: - if not resource_contact.supports(str(constraint)): + if not resource_contact.supports(constraint): self.set_sensitive(False) self.set_tooltip_text(_('This devices is not compatible.')) @@ -154,7 +154,7 @@ def __init__(self, @staticmethod def _get_client_identity(disco_info: DiscoInfo - ) -> Tuple[Optional[str], Optional[str]]: + ) -> tuple[Optional[str], Optional[str]]: for identity in disco_info.identities: if identity.category == 'client': return identity.name, identity.type ===================================== gajim/gtk/search_view.py ===================================== @@ -35,6 +35,7 @@ from gajim.common.const import KindConstant from gajim.common.const import FILE_CATEGORIES from gajim.common.i18n import _ +from gajim.common.storage.archive import SearchLogRow from .conversation.message_widget import MessageWidget from .builder import get_builder @@ -56,8 +57,8 @@ def __init__(self) -> None: self._account: Optional[str] = None self._jid: Optional[JID] = None - self._results: list[str] = [] - self._scope: Optional[str] = None + self._results: list[SearchLogRow] = [] + self._scope: str = 'everywhere' self._ui = get_builder('search_view.ui') self._ui.results_listbox.set_header_func(self._header_func) @@ -86,6 +87,9 @@ def _header_func(row: Union[CounterRow, ResultRow], else: row.set_header(RowHeader(row.account, row.jid, row.time)) else: + if isinstance(row, CounterRow): + row.set_header(None) + return date1 = time.strftime('%x', time.localtime(row.time)) date2 = time.strftime('%x', time.localtime(before.time)) if before.jid != row.jid: @@ -184,13 +188,13 @@ def _on_search(self, entry: Gtk.Entry) -> None: def _filter_results_for_files(self, filetypes: list[str]) -> None: if 'file' in filetypes: - results = [] + results: list[SearchLogRow] = [] for result in self._results: if result.additional_data.get_value('gajim', 'oob_url'): results.append(result) self._results = results else: - results = [] + results: list[SearchLogRow] = [] for result in self._results: url = result.additional_data.get_value('gajim', 'oob_url') if url is None: @@ -223,11 +227,14 @@ def _add_results(self) -> None: accounts = self._get_accounts() for msg in self._results[:25]: if self._scope == 'everywhere': + archive_jid = app.storage.archive.get_jid_from_id(msg.jid_id) result_row = ResultRow( msg, - accounts.get(msg.account_id), - app.storage.archive.get_jid_from_id(msg.jid_id).jid) + accounts[msg.account_id], + archive_jid.jid) else: + assert self._account is not None + assert self._jid is not None result_row = ResultRow(msg, self._account, self._jid) self._ui.results_listbox.add(result_row) @@ -242,8 +249,8 @@ def _on_edge_reached(self, self._add_results() @staticmethod - def _get_accounts() -> dict[str, str]: - accounts: dict[str, str] = {} + def _get_accounts() -> dict[int, str]: + accounts: dict[int, str] = {} for account in app.settings.get_accounts(): account_id = app.storage.archive.get_account_id(account) accounts[account_id] = account View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/aa3b45d6b434923303e9442263b0631… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/aa3b45d6b434923303e9442263b0631… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Helpers: Allow play_sound to have no account
by Daniel Brötzmann (＠wurstsalat) 13 Jan '22

13 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6e48f01c by wurstsalat at 2022-01-13T09:58:42+01:00 Helpers: Allow play_sound to have no account - - - - - 0e0a78de by wurstsalat at 2022-01-13T10:02:19+01:00 CallWidget: Fix wrong arg - - - - - b0460387 by wurstsalat at 2022-01-13T10:06:48+01:00 AppPage: Typing - - - - - e880f36c by wurstsalat at 2022-01-13T10:15:22+01:00 AccountSideBar: Typing - - - - - aa3b45d6 by wurstsalat at 2022-01-13T10:15:37+01:00 Update pyrightconfig.json - - - - - 5 changed files: - gajim/common/helpers.py - gajim/gtk/account_side_bar.py - gajim/gtk/app_page.py - gajim/gtk/call_widget.py - pyrightconfig.json Changes: ===================================== gajim/common/helpers.py ===================================== @@ -466,13 +466,14 @@ def get_contact_dict_for_account(account: str) -> dict[str, types.BareContact]: def play_sound(sound_event: str, - account: str, + account: Optional[str] = None, force: bool = False, loop: bool = False) -> None: if sound_event is None: return - if force or allow_sound_notification(account, sound_event): + if (force or account is None or + allow_sound_notification(account, sound_event)): play_sound_file( app.settings.get_soundevent_settings(sound_event)['path'], loop) ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -14,8 +14,8 @@ from __future__ import annotations -from typing import List from typing import Optional +from typing import cast from gi.repository import Gtk @@ -34,7 +34,7 @@ def __init__(self) -> None: self.get_style_context().add_class('account-sidebar') self.connect('row-activated', self._on_row_activated) - self._accounts: List[str] = list(app.connections.keys()) + self._accounts: list[str] = list(app.connections.keys()) for account in self._accounts: self.add_account(account) @@ -42,7 +42,8 @@ def add_account(self, account: str) -> None: self.add(Account(account)) def remove_account(self, account: str) -> None: - for row in self.get_children(): + accounts = cast(list[Account], self.get_children()) + for row in accounts: if row.account == account: row.destroy() return @@ -52,7 +53,7 @@ def _on_row_activated(_listbox: AccountSideBar, row: Account) -> None: app.window.show_account_page(row.account) def activate_account_page(self, account: str) -> None: - row = self.get_selected_row() + row = cast(Account, self.get_selected_row()) if row is not None and row.account == account: return ===================================== gajim/gtk/app_page.py ===================================== @@ -12,7 +12,10 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Optional +from typing import cast from gi.repository import GObject from gi.repository import Gtk @@ -103,7 +106,8 @@ def add_app_message(self, category: str, message: Optional[str]) -> None: def remove_app_message(self, row: Gtk.ListBoxRow) -> None: self.remove(row) - self.get_parent().remove_app_message() + app_page = cast(AppPage, self.get_parent()) + app_page.remove_app_message() class AppMessageRow(Gtk.ListBoxRow): @@ -124,15 +128,19 @@ def __init__(self, category: str, message: Optional[str] = None) -> None: def _on_check_clicked(self, _button: Gtk.Button) -> None: app.interface.get_latest_release() - self.get_parent().remove_app_message(self) + list_box = cast(AppMessageListBox, self.get_parent()) + list_box.remove_app_message(self) def _on_dismiss_check_clicked(self, _button: Gtk.Button) -> None: app.settings.set('check_for_update', False) - self.get_parent().remove_app_message(self) + list_box = cast(AppMessageListBox, self.get_parent()) + list_box.remove_app_message(self) def _on_visit_website_clicked(self, _button: Gtk.Button) -> None: open_uri('https://gajim.org/download') - self.get_parent().remove_app_message(self) + list_box = cast(AppMessageListBox, self.get_parent()) + list_box.remove_app_message(self) def _on_dismiss_update_clicked(self, _button: Gtk.Button) -> None: - self.get_parent().remove_app_message(self) + list_box = cast(AppMessageListBox, self.get_parent()) + list_box.remove_app_message(self) ===================================== gajim/gtk/call_widget.py ===================================== @@ -553,7 +553,7 @@ def _set_jingle_state(self, def _stop_jingle(self, sid: Optional[str] = None, - _reason: Optional[str] = None + reason: Optional[str] = None ) -> None: audio_sid = self._jingle['audio'].sid video_sid = self._jingle['video'].sid ===================================== pyrightconfig.json ===================================== @@ -18,15 +18,20 @@ "gajim/common/sound.py", "gajim/common/storage/", "gajim/gtk/account_page.py", + "gajim/gtk/account_side_bar.py", + "gajim/gtk/app_page.py", "gajim/gtk/app_side_bar.py", + "gajim/gtk/call_widget.py", "gajim/gtk/chat_filter.py", "gajim/gtk/chat_list_stack.py", "gajim/gtk/chat_page.py", + "gajim/gtk/contacts_flowbox.py", "gajim/gtk/conversation/code_widget.py", "gajim/gtk/conversation/jump_to_end_button.py", "gajim/gtk/conversation/plain_widget.py", "gajim/gtk/conversation/quote_widget.py", "gajim/gtk/conversation/rows/base.py", + "gajim/gtk/conversation/rows/call.py", "gajim/gtk/conversation/rows/command_output.py", "gajim/gtk/conversation/rows/date.py", "gajim/gtk/conversation/rows/file_transfer.py", @@ -43,6 +48,7 @@ "gajim/gtk/groupchat_nick.py", "gajim/gtk/groupchat_state.py", "gajim/gtk/main_stack.py", + "gajim/gtk/manage_sounds.py", "gajim/gtk/notification.py", "gajim/gtk/structs.py", "gajim/gtk/sidebar_switcher.py", @@ -50,5 +56,8 @@ "gajim/gtk/status_icon.py", "gajim/gtk/status_message_selector.py", "gajim/gtk/status_selector.py", + "gajim/gtk/themes.py", + "gajim/gtk/video_preview.py", + "gajim/gtk/workspace_dialog.py", ], } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a0c8587b358b21e06e41f3499108773… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a0c8587b358b21e06e41f3499108773… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Use JID objects instead of str
by Philipp Hörist (＠lovetox) 12 Jan '22

12 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1657c701 by lovetox at 2022-01-13T00:22:35+01:00 Use JID objects instead of str - - - - - 5e448f25 by lovetox at 2022-01-13T00:22:35+01:00 Base: Add new attribute alias So we can migrate from _con -> _client - - - - - 161e7203 by lovetox at 2022-01-13T00:22:35+01:00 Client: Add type annotations - - - - - 492fed4b by lovetox at 2022-01-13T00:22:35+01:00 Types: Add type alias - - - - - f70ecce4 by lovetox at 2022-01-13T00:22:35+01:00 Structs: Add type annotations - - - - - e32af9e8 by lovetox at 2022-01-13T00:22:35+01:00 Settings: Fix type annotation - - - - - a0c8587b by lovetox at 2022-01-13T00:22:35+01:00 ChatMarkers: Add type annotations - - - - - 11 changed files: - gajim/common/client.py - gajim/common/helpers.py - gajim/common/modules/base.py - gajim/common/modules/caps.py - gajim/common/modules/chat_markers.py - gajim/common/modules/contacts.py - gajim/common/settings.py - gajim/common/structs.py - gajim/common/types.py - gajim/gtk/controls/base.py - pyrightconfig.json Changes: ===================================== gajim/common/client.py ===================================== @@ -55,6 +55,7 @@ from gajim.common.idle import Monitor from gajim.common.idle import IdleMonitorManager from gajim.common.i18n import _ +from gajim.common.structs import OutgoingMessage from gajim.gui.util import open_window @@ -471,13 +472,13 @@ def _finish_connect(self) -> None: app.ged.raise_event(SignedIn(account=self._account, conn=self)) modules.send_stored_publish(self._account) - def send_stanza(self, stanza): + def send_stanza(self, stanza: Any) -> None: """ Send a stanza untouched """ return self._client.send_stanza(stanza) - def send_message(self, message): + def send_message(self, message: OutgoingMessage) -> None: if not self._state.is_available: log.warning('Trying to send message while offline') return @@ -504,7 +505,7 @@ def send_message(self, message): message, self._send_message) - def _send_message(self, message): + def _send_message(self, message: OutgoingMessage) -> None: message.set_sent_timestamp() message.message_id = self.send_stanza(message.stanza) @@ -525,7 +526,7 @@ def _send_message(self, message): self.get_module('Message').log_message(message) - def send_messages(self, jids, message): + def send_messages(self, jids: list[JID], message: OutgoingMessage) -> None: if not self._state.is_available: log.warning('Trying to send message while offline') return ===================================== gajim/common/helpers.py ===================================== @@ -1414,7 +1414,7 @@ def get_group_chat_nick(account: str, room_jid: Union[JID, str]) -> str: return nick -def get_muc_context(jid: Union[JID, str]) -> Optional[str]: +def get_muc_context(jid: JID) -> Optional[str]: disco_info = app.storage.cache.get_last_disco_info(jid) if disco_info is None: return None ===================================== gajim/common/modules/base.py ===================================== @@ -43,6 +43,7 @@ def __init__(self, EventHelper.__init__(self) self._con = con + self._client = con self._account = con.account self._log = self._set_logger(plugin) self._nbxmpp_callbacks: dict[str, Any] = {} ===================================== gajim/common/modules/caps.py ===================================== @@ -106,8 +106,9 @@ def _entity_caps(self, _con, _stanza, properties): self._queue_task(task) return - jid = str(properties.jid) - app.storage.cache.set_last_disco_info(jid, disco_info, cache_only=True) + app.storage.cache.set_last_disco_info(properties.jid, + disco_info, + cache_only=True) contact = self._con.get_module('Contacts').get_contact(properties.jid) contact.notify('caps-update') @@ -145,7 +146,7 @@ def _on_disco_info(self, nbxmpp_task): return app.storage.cache.add_caps_entry( - str(disco_info.jid), + disco_info.jid, task.entity.method, disco_info.get_caps_hash(), disco_info) ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -14,10 +14,15 @@ # Chat Markers (XEP-0333) +from __future__ import annotations + +from typing import Any + from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler from gajim.common import app +from gajim.common import types from gajim.common.events import DisplayedReceived from gajim.common.events import ReadStateSync from gajim.common.modules.base import BaseModule @@ -28,8 +33,8 @@ class ChatMarkers(BaseModule): _nbxmpp_extends = 'ChatMarkers' - def __init__(self, con): - BaseModule.__init__(self, con) + def __init__(self, client: types.Client): + BaseModule.__init__(self, client) self.handlers = [ StanzaHandler(name='message', @@ -38,7 +43,11 @@ def __init__(self, con): priority=47), ] - def _process_chat_marker(self, _con, _stanza, properties): + def _process_chat_marker(self, + _client: types.xmppClient, + _stanza: Any, + properties: Any) -> None: + if not properties.is_marker or not properties.marker.is_displayed: return @@ -46,7 +55,7 @@ def _process_chat_marker(self, _con, _stanza, properties): return if properties.type.is_groupchat: - contact = self._con.get_module('Contacts').get_contact( + contact = self._client.get_module('Contacts').get_contact( properties.muc_jid, groupchat=True) if not contact.is_joined: @@ -64,12 +73,12 @@ def _process_chat_marker(self, _con, _stanza, properties): return if properties.is_mam_message: - if properties.from_.bare_match(self._con.get_own_jid()): + if properties.from_.bare_match(self._client.get_own_jid()): return self._raise_event('displayed-received', properties) - def _raise_event(self, name, properties): + def _raise_event(self, name: str, properties: Any) -> None: self._log.info('%s: %s %s', name, properties.jid, @@ -100,10 +109,15 @@ def _raise_event(self, name, properties): is_muc_pm=properties.is_muc_pm, marker_id=properties.marker.id)) - def _send_marker(self, contact, marker, id_, type_): + def _send_marker(self, + contact: types.ChatContacts, + marker: str, + id_: str, + type_: str) -> None: + jid = contact.jid if contact.is_pm_contact: - jid = contact.jid.bare + jid = contact.jid.new_as_bare() if type_ in ('gc', 'pm'): if not app.settings.get_group_chat_setting( @@ -121,8 +135,11 @@ def _send_marker(self, contact, marker, id_, type_): type_=typ, marker=(marker, id_), play_sound=False) - self._con.send_message(message) + self._client.send_message(message) self._log.info('Send %s: %s', marker, contact.jid) - def send_displayed_marker(self, contact, id_, type_): - self._send_marker(contact, 'displayed', id_, str(type_)) + def send_displayed_marker(self, + contact: types.ChatContacts, + id_: str, + type_: str) -> None: + self._send_marker(contact, 'displayed', id_, type_) ===================================== gajim/common/modules/contacts.py ===================================== @@ -45,13 +45,13 @@ class ContactSettings: - def __init__(self, account: str, jid: str) -> None: + def __init__(self, account: str, jid: JID) -> None: self.get = partial(app.settings.get_contact_setting, account, jid) self.set = partial(app.settings.set_contact_setting, account, jid) class GroupChatSettings: - def __init__(self, account: str, jid: str) -> None: + def __init__(self, account: str, jid: JID) -> None: self._account = account self._jid = jid @@ -73,7 +73,7 @@ def set(self, setting: BoolGroupChatSettings, value: bool) -> None: ... def set(self, setting: IntGroupChatSettings, value: int) -> None: ... def set(self, setting: Any, value: Any) -> None: app.settings.set_group_chat_setting( - self._account, str(self._jid), setting, value) + self._account, self._jid, setting, value) class Contacts(BaseModule): @@ -228,7 +228,7 @@ class BareContact(CommonContact): def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: CommonContact.__init__(self, logger, jid, account) - self.settings = ContactSettings(account, str(jid)) + self.settings = ContactSettings(account, jid) self._avatar_sha = app.storage.cache.get_contact(jid, 'avatar') @@ -474,7 +474,7 @@ class GroupchatContact(CommonContact): def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: CommonContact.__init__(self, logger, jid, account) - self.settings = GroupChatSettings(account, str(jid)) + self.settings = GroupChatSettings(account, jid) @property def is_groupchat(self) -> bool: ===================================== gajim/common/settings.py ===================================== @@ -73,7 +73,7 @@ from gajim.common.setting_values import BoolSettings from gajim.common.setting_values import BoolAccountSettings -SETTING_TYPE = Union[bool, int, str, object, list] +SETTING_TYPE = Union[bool, int, str, object] log = logging.getLogger('gajim.c.settings') @@ -705,27 +705,27 @@ def set_account_setting(self, @overload def get_group_chat_setting(self, account: str, - jid: Union[str, JID], + jid: JID, setting: IntGroupChatSettings ) -> int: ... @overload def get_group_chat_setting(self, account: str, - jid: Union[str, JID], + jid: JID, setting: BoolGroupChatSettings ) -> bool: ... @overload def get_group_chat_setting(self, account: str, - jid: Union[str, JID], + jid: JID, setting: StringGroupChatSettings ) -> str: ... def get_group_chat_setting(self, account: str, - jid: Union[str, JID], + jid: JID, setting: AllGroupChatSettings ) -> AllGroupChatSettingsT: @@ -766,27 +766,27 @@ def get_group_chat_setting(self, @overload def set_group_chat_setting(self, account: str, - jid: str, + jid: JID, setting: StringGroupChatSettings, value: str) -> None: ... @overload def set_group_chat_setting(self, account: str, - jid: str, + jid: JID, setting: IntGroupChatSettings, value: int) -> None: ... @overload def set_group_chat_setting(self, account: str, - jid: str, + jid: JID, setting: BoolGroupChatSettings, value: bool) -> None: ... def set_group_chat_setting(self, account: str, - jid: str, + jid: JID, setting: AllGroupChatSettings, value: AllGroupChatSettingsT) -> None: @@ -851,7 +851,7 @@ def set_group_chat_settings(self, def get_contact_setting(self, account: str, - jid: str, + jid: JID, setting: str) -> SETTING_TYPE: if account not in self._account_settings: @@ -874,7 +874,7 @@ def get_contact_setting(self, def set_contact_setting(self, account: str, - jid: str, + jid: JID, setting: str, value: SETTING_TYPE) -> None: ===================================== gajim/common/structs.py ===================================== @@ -25,6 +25,7 @@ import time from dataclasses import dataclass from dataclasses import fields + from gi.repository import GLib from nbxmpp.protocol import JID @@ -49,7 +50,12 @@ class URI(NamedTuple): class MUCData: - def __init__(self, room_jid, nick, password, config=None): + def __init__(self, + room_jid: str, + nick: str, + password: str, + config=None) -> None: + self._room_jid = JID.from_string(room_jid) self._config = config self.nick = nick @@ -60,11 +66,11 @@ def __init__(self, room_jid, nick, password, config=None): self.subject = None @property - def jid(self): + def jid(self) -> JID: return self._room_jid @property - def occupant_jid(self): + def occupant_jid(self) -> JID: return self._room_jid.new_with(resource=self.nick) @property @@ -74,23 +80,23 @@ def config(self): class OutgoingMessage: def __init__(self, - account, + account: str, contact, - message, - type_, - subject=None, + message: Optional[str], + type_: str, + subject: Optional[str] = None, chatstate=None, - marker=None, - resource=None, - user_nick=None, - label=None, + marker: Optional[tuple[str, str]] = None, + resource: Optional[str] = None, + user_nick: Optional[str] = None, + label: Optional[str] = None, control=None, - attention=None, - correct_id=None, - oob_url=None, + attention: Optional[bool] = None, + correct_id: Optional[str] = None, + oob_url: Optional[str] = None, xhtml=None, nodes=None, - play_sound=True): + play_sound: bool = True): if type_ not in ('chat', 'groupchat', 'normal', 'headline'): raise ValueError('Unknown message type: %s' % type_) @@ -157,37 +163,37 @@ def copy(self): return message @property - def jid(self): + def jid(self) -> JID: return self.contact.jid @property - def is_groupchat(self): + def is_groupchat(self) -> bool: return self.type_ == 'groupchat' @property - def is_chat(self): + def is_chat(self) -> bool: return self.type_ == 'chat' @property - def is_normal(self): + def is_normal(self) -> bool: return self.type_ == 'normal' - def set_sent_timestamp(self): + def set_sent_timestamp(self) -> None: if self.is_groupchat: return self.timestamp = time.time() @property - def is_encrypted(self): + def is_encrypted(self) -> bool: return bool(self.additional_data.get_value('encrypted', 'name', False)) @property - def msg_iq(self): + def msg_iq(self) -> Any: # Backwards compatibility for plugins return self.stanza @msg_iq.setter - def msg_iq(self, value): + def msg_iq(self, value: Any) -> None: # Backwards compatibility for plugins self.stanza = value @@ -245,6 +251,7 @@ def from_presence(cls, properties): role=Role.NONE, real_jid=None) + class VariantMixin: _type_to_variant_funcs = { ===================================== gajim/common/types.py ===================================== @@ -34,6 +34,7 @@ if TYPE_CHECKING: # pylint: disable=unused-import from gajim.common.client import Client + from nbxmpp.client import Client as xmppClient from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf from gajim.common.modules.contacts import CommonContact from gajim.common.modules.contacts import BareContact @@ -41,6 +42,8 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant + ChatContacts = Union[BareContact, GroupchatContact, GroupchatParticipant] + from gajim.gui_interface import Interface from gajim.common.settings import Settings from gajim.gtk.css_config import CSSConfig ===================================== gajim/gtk/controls/base.py ===================================== @@ -570,7 +570,7 @@ def mark_as_read(self, send_marker: bool = True) -> None: self._client.get_module('ChatMarkers').send_displayed_marker( self.contact, self.last_msg_id, - self._type) + str(self._type)) self.last_msg_id = None def change_encryption(self, ===================================== pyrightconfig.json ===================================== @@ -12,6 +12,7 @@ "gajim/common/i18n.py", "gajim/common/idle.py", "gajim/common/logging_helpers.py", + "gajim/common/modules/chat_markers.py", "gajim/common/passwords.py", "gajim/common/regex.py", "gajim/common/sound.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/098274e8b580eb11f555e81b97f76f6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/098274e8b580eb11f555e81b97f76f6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: App: Typing
by Daniel Brötzmann (＠wurstsalat) 12 Jan '22

12 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ba20dc5e by wurstsalat at 2022-01-12T23:25:42+01:00 App: Typing - - - - - 347a89b4 by wurstsalat at 2022-01-12T23:25:42+01:00 ContactsFlowBox: Typing - - - - - 098274e8 by wurstsalat at 2022-01-12T23:25:42+01:00 Add type annotations for AV methods and classes - - - - - 9 changed files: - gajim/common/app.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py - gajim/gtk/call_widget.py - gajim/gtk/contacts_flowbox.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/conversation/rows/call.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/app.py ===================================== @@ -223,12 +223,11 @@ def detect_dependencies() -> None: gi.require_version('Farstream', '0.2') from gi.repository import Farstream _dependencies['FARSTREAM'] = True - except Exception: - pass + except Exception as error: + log('gajim').warning('AV dependency test failed: %s', error) try: if _dependencies['GST'] and _dependencies['FARSTREAM']: - Gst.init(None) conference = Gst.ElementFactory.make('fsrtpconference', None) conference.new_session(Farstream.MediaType.AUDIO) from gajim.gui.gstreamer import create_gtk_widget @@ -412,7 +411,7 @@ def get_enabled_accounts_with_labels( Returns a list with [account, account_label] entries. Order by account_label """ - accounts = [] + accounts: list[list[str]] = [] for acc in connections: if exclude_local and account_is_zeroconf(acc): continue ===================================== gajim/common/jingle_rtp.py ===================================== @@ -155,7 +155,7 @@ def _next_dtmf(self, events): else: self._dtmf_running = False - def start_dtmf(self, key): + def start_dtmf(self, key: str) -> None: if key == 'star': event = Farstream.DTMFEvent.STAR elif key == 'pound': @@ -344,13 +344,13 @@ def __init__(self, session, transport=None): JingleRTPContent.__init__(self, session, 'audio', transport) self.setup_stream() - def set_mic_volume(self, vol): + def set_mic_volume(self, vol: float) -> None: """ vol must be between 0 and 1 """ self.mic_volume.set_property('volume', vol) - def set_out_volume(self, vol): + def set_out_volume(self, vol: float) -> None: """ vol must be between 0 and 1 """ ===================================== gajim/common/jingle_session.py ===================================== @@ -27,6 +27,10 @@ # - Tie-breaking # * timeout +from __future__ import annotations + +from typing import Optional + import time import logging from enum import Enum, unique @@ -38,11 +42,13 @@ from gajim.common import app from gajim.common import events +from gajim.common.client import Client from gajim.common.const import KindConstant from gajim.common.helpers import AdditionalDataDict from gajim.common.jingle_transport import get_jingle_transport from gajim.common.jingle_transport import JingleTransportIBB from gajim.common.jingle_content import get_jingle_content +from gajim.common.jingle_content import JingleContent from gajim.common.jingle_content import JingleContentSetupException from gajim.common.jingle_ft import State from gajim.common.file_props import FilesProp @@ -93,14 +99,21 @@ class JingleSession: negotiated between an initiator and a responder. """ - def __init__(self, con, weinitiate, jid, iq_id=None, sid=None, - werequest=False): + def __init__(self, + con: Client, + weinitiate: bool, + jid: str, + iq_id: Optional[str] = None, + sid: Optional[str] = None, + werequest: bool = False + ) -> None: """ con -- connection object, weinitiate -- boolean, are we the initiator? jid - jid of the other entity """ - self.contents = {} # negotiated contents + # negotiated contents + self.contents: dict[tuple[str, str], JingleContent] = {} self.connection = con # connection to use # our full jid self.ourjid = str(self.connection.get_own_jid()) @@ -188,13 +201,13 @@ def cancel_session(self): reason.addChild('cancel') self._session_terminate(reason) - def approve_content(self, media, name=None): + def approve_content(self, media: str, name: Optional[str] = None) -> None: content = self.get_content(media, name) if content: content.accepted = True self.on_session_state_changed(content) - def reject_content(self, media, name=None): + def reject_content(self, media: str, name: Optional[str] = None) -> None: content = self.get_content(media, name) if content: if self.state == JingleStates.ACTIVE: @@ -213,15 +226,23 @@ def end_session(self): reason.addChild('cancel') self._session_terminate(reason) - def get_content(self, media=None, name=None): + def get_content(self, + media: Optional[str] = None, + name: Optional[str] = None + ) -> Optional[JingleContent]: if media is None: - return + return None for content in self.contents.values(): if content.media == media: if name is None or content.name == name: return content + return None - def add_content(self, name, content, creator='we'): + def add_content(self, + name: str, + content: JingleContent, + creator: str = 'we' + ) -> None: """ Add new content to session. If the session is active, this will send proper stanza to update session @@ -268,7 +289,9 @@ def modify_content(self, creator, name, transport=None): content.sent = False content.accepted = True - def on_session_state_changed(self, content=None): + def on_session_state_changed(self, + content: Optional[JingleContent] = None + ) -> None: if self.state == JingleStates.ENDED: # Session not yet started, only one action possible: session-initiate if self.is_ready() and self.weinitiate: @@ -825,7 +848,7 @@ def _session_terminate(self, reason=None): media=None, reason=text) - def __content_add(self, content): + def __content_add(self, content: JingleContent) -> None: # TODO: test assert self.state != JingleStates.ENDED stanza, jingle = self.__make_jingle('content-add') @@ -834,7 +857,7 @@ def __content_add(self, content): id_ = self.connection.connection.send(stanza) self.collect_iq_id(id_) - def __content_accept(self, content): + def __content_accept(self, content: JingleContent) -> None: # TODO: test assert self.state != JingleStates.ENDED stanza, jingle = self.__make_jingle('content-accept') @@ -843,7 +866,7 @@ def __content_accept(self, content): id_ = self.connection.connection.send(stanza) self.collect_iq_id(id_) - def __content_reject(self, content): + def __content_reject(self, content: JingleContent) -> None: assert self.state != JingleStates.ENDED stanza, jingle = self.__make_jingle('content-reject') self.__append_content(jingle, content) ===================================== gajim/gtk/call_widget.py ===================================== @@ -14,8 +14,7 @@ from __future__ import annotations -from typing import Any -from typing import List +from typing import Callable from typing import Optional import logging @@ -29,14 +28,20 @@ from gajim.common import app from gajim.common import types +from gajim.common import sound from gajim.common.const import JingleState from gajim.common.const import KindConstant +from gajim.common.events import JingleEvent +from gajim.common.events import JingleConnectedReceived +from gajim.common.events import JingleDisconnectedReceived +from gajim.common.events import JingleErrorReceived +from gajim.common.events import JingleRequestReceived +from gajim.common.events import Notification from gajim.common.helpers import AdditionalDataDict +from gajim.common.helpers import play_sound from gajim.common.i18n import _ from gajim.common.jingle_rtp import JingleAudio -from gajim.common.events import Notification -from gajim.common.helpers import play_sound -from gajim.common import sound +from gajim.common.jingle_session import JingleSession from .gstreamer import create_gtk_widget from .builder import get_builder @@ -69,9 +74,9 @@ def __init__(self, account: str, contact: types.BareContact) -> None: # Helper for upgrading voice call to voice + video without # having to show a new call row - self._incoming_video_event = None + self._incoming_video_event: Optional[JingleRequestReceived] = None - self._jingle: dict(str, JingleObject) = { + self._jingle: dict[str, JingleObject] = { 'audio': JingleObject( JingleState.NULL, self._update_audio), @@ -88,7 +93,7 @@ def __init__(self, account: str, contact: types.BareContact) -> None: self._ui.connect_signals(self) - def _on_destroy(self, *args: Any) -> None: + def _on_destroy(self, _widget: Gtk.Widget) -> None: for jingle_type in ('audio', 'video'): self._close_jingle_content(jingle_type, shutdown=True) self._jingle.clear() @@ -121,7 +126,8 @@ def _on_call_with_mic_and_cam(self, _button: Gtk.Button) -> None: self._ui.av_start_box.hide() def _on_answer_video_clicked(self, button: Gtk.Button) -> None: - self.accept_call(self._incoming_video_event) + assert self._incoming_video_event is not None + self.accept_call(self._incoming_video_event.jingle_session) self._incoming_video_event = None button.hide() @@ -137,7 +143,7 @@ def _on_end_call_clicked(self, _button: Gtk.Button) -> None: def _on_video(self, _button: Gtk.Button) -> None: self._on_jingle_button_toggled(['video']) - def _on_jingle_button_toggled(self, jingle_types: List[str]) -> None: + def _on_jingle_button_toggled(self, jingle_types: list[str]) -> None: call_resources = self._get_call_resources() if not call_resources: return @@ -185,40 +191,48 @@ def _on_num_button_press(self, ) -> None: button_id = Gtk.Buildable.get_name(button) key = button_id.split('_')[1] - self._get_audio_content().start_dtmf(key) + content = self._get_audio_content() + if content is not None: + content.start_dtmf(key) def _on_num_button_release(self, _button: Gtk.Button, _event: Gdk.EventButton ) -> None: - self._get_audio_content().stop_dtmf() + content = self._get_audio_content() + if content is not None: + content.stop_dtmf() def _on_mic_volume_changed(self, _button: Gtk.VolumeButton, value: float ) -> None: - self._get_audio_content().set_mic_volume(value / 100) - app.settings.set('audio_input_volume', int(value)) + content = self._get_audio_content() + if content is not None: + content.set_mic_volume(value / 100) + app.settings.set('audio_input_volume', int(value)) def _on_output_volume_changed(self, _button: Gtk.VolumeButton, value: float ) -> None: - self._get_audio_content().set_out_volume(value / 100) - app.settings.set('audio_output_volume', int(value)) + content = self._get_audio_content() + if content is not None: + content.set_out_volume(value / 100) + app.settings.set('audio_output_volume', int(value)) - def process_event(self, event): - if event.name == 'jingle-request-received': + def process_event(self, event: JingleEvent) -> None: + if isinstance(event, JingleRequestReceived): self._on_jingle_request(event) - if event.name == 'jingle-connected-received': + if isinstance(event, JingleConnectedReceived): self._on_jingle_connected(event) - if event.name == 'jingle-disconnected-received': + if isinstance(event, JingleDisconnectedReceived): self._on_jingle_disconnected(event) - if event.name == 'jingle-error': + if isinstance(event, JingleErrorReceived): self._on_jingle_error(event) - def _on_jingle_request(self, event): - content_types: list(str) = [] + def _on_jingle_request(self, event: JingleRequestReceived) -> None: + content_types: list[str] = [] for item in event.contents: content_types.append(item.media) if not any(item in ('audio', 'video') for item in content_types): @@ -251,7 +265,7 @@ def _on_jingle_request(self, event): title=_('Incoming Call'), text=_('%s is calling') % self._contact.name)) - def _on_jingle_connected(self, event): + def _on_jingle_connected(self, event: JingleConnectedReceived) -> None: session = self._client.get_module('Jingle').get_jingle_session( event.fjid, event.sid) @@ -272,9 +286,11 @@ def _on_jingle_connected(self, event): session.approve_session() for content in event.media: session.approve_content(content) - sound.stop() # dialing/ringing + sound.stop() - def _on_jingle_disconnected(self, event): + def _on_jingle_disconnected(self, + event: JingleDisconnectedReceived + ) -> None: if event.media is None: self._stop_jingle(sid=event.sid, reason=event.reason) if event.media == 'audio': @@ -289,15 +305,15 @@ def _on_jingle_disconnected(self, event): JingleState.NULL, sid=event.sid, reason=event.reason) - sound.stop() # dialing/ringing + sound.stop() - def _on_jingle_error(self, event): + def _on_jingle_error(self, event: JingleErrorReceived) -> None: if event.sid == self._jingle['audio'].sid: self._set_jingle_state( 'audio', JingleState.ERROR, reason=event.reason) - sound.stop() # dialing/ringing + sound.stop() def start_call(self) -> None: audio_state = self._jingle['audio'].state @@ -311,8 +327,8 @@ def start_call(self) -> None: self._jingle['video'].available) self._ui.av_cam_button.set_sensitive(False) - def accept_call(self, session): - sound.stop() # dialing/ringing + def accept_call(self, session: JingleSession) -> None: + sound.stop() if not session: return @@ -336,8 +352,8 @@ def accept_call(self, session): session.approve_content('video') @staticmethod - def decline_call(session): - sound.stop() # dialing/ringing + def decline_call(session: JingleSession) -> None: + sound.stop() if not session: return @@ -473,6 +489,10 @@ def _update_video(self) -> None: other_gtk_widget = create_gtk_widget() self_gtk_widget = create_gtk_widget() + if other_gtk_widget is None or self_gtk_widget is None: + log.warning('Could not create GStreamer widgets') + return + sink_other, self._video_widget_other, _name = other_gtk_widget sink_self, self._video_widget_self, _name = self_gtk_widget self._ui.incoming_viewport.add(self._video_widget_other) @@ -498,8 +518,12 @@ def _update_video(self) -> None: self._ui.jingle_connection_spinner.stop() self._ui.jingle_connection_spinner.hide() - def _set_jingle_state(self, jingle_type: str, state: str, sid: str = None, - reason: str = None) -> None: + def _set_jingle_state(self, + jingle_type: str, + state: JingleState, + sid: Optional[str] = None, + reason: Optional[str] = None + ) -> None: jingle = self._jingle[jingle_type] if state in ( JingleState.CONNECTING, @@ -529,7 +553,7 @@ def _set_jingle_state(self, jingle_type: str, state: str, sid: str = None, def _stop_jingle(self, sid: Optional[str] = None, - reason: Optional[str] = None + _reason: Optional[str] = None ) -> None: audio_sid = self._jingle['audio'].sid video_sid = self._jingle['video'].sid @@ -563,18 +587,22 @@ def _get_audio_content(self) -> Optional[JingleAudio]: self._contact.jid, self._jingle['audio'].sid) return session.get_content('audio') - def _get_call_resources(self) -> List[types.ResourceContact]: - resource_list = [] + def _get_call_resources(self) -> list[types.ResourceContact]: + resource_list: list[types.ResourceContact] = [] for resource_contact in self._contact.iter_resources(): if resource_contact.supports(Namespace.JINGLE_RTP): resource_list.append(resource_contact) return resource_list + class JingleObject: __slots__ = ('sid', 'state', 'available', 'update') - def __init__(self, state, update): - self.sid = None + def __init__(self, + state: JingleState, + update: Callable[..., None] + ) -> None: + self.sid: Optional[str] = None self.state = state - self.available = False + self.available: bool = False self.update = update ===================================== gajim/gtk/contacts_flowbox.py ===================================== @@ -11,7 +11,9 @@ # 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 List +from __future__ import annotations + +from typing import cast from gi.repository import GObject from gi.repository import Gtk @@ -69,7 +71,8 @@ def __init__(self, account: str, jid: str, is_new: bool = False) -> None: self.show_all() def _on_remove(self, _button: Gtk.Button) -> None: - self.get_parent().on_contact_removed(self) + flow_box = cast(ContactsFlowBox, self.get_parent()) + flow_box.on_contact_removed(self) class ContactsFlowBox(Gtk.FlowBox): @@ -91,7 +94,7 @@ def __init__(self) -> None: self.show_all() def clear(self) -> None: - def _remove(item): + def _remove(item: Gtk.FlowBoxChild): self.remove(item) item.destroy() self.foreach(_remove) @@ -107,9 +110,10 @@ def add_contact(self, def has_contacts(self) -> bool: return bool(self.get_child_at_index(0) is not None) - def get_contact_jids(self) -> List[str]: - contacts = [] - for contact in self.get_children(): + def get_contact_jids(self) -> list[str]: + contacts: list[str] = [] + contact_items = cast(list[ContactItem], self.get_children()) + for contact in contact_items: contacts.append(contact.jid) return contacts ===================================== gajim/gtk/controls/base.py ===================================== @@ -54,6 +54,7 @@ from gajim.common.helpers import get_file_path_from_dnd_dropped_uri from gajim.common.i18n import _ from gajim.common.ged import EventHelper +from gajim.common.events import JingleRequestReceived from gajim.common.events import Notification from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_retraction_text @@ -61,6 +62,7 @@ from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import guess_simple_file_type +from gajim.common.storage.archive import ConversationRow from gajim.common.structs import OutgoingMessage from gajim.gui.conversation.view import ConversationView @@ -1175,7 +1177,7 @@ def add_jingle_file_transfer(self, event): if self._allow_add_message(): self.conversation_view.add_jingle_file_transfer(event) - def add_call_message(self, event): + def add_call_message(self, event: JingleRequestReceived) -> None: if self._allow_add_message(): self.conversation_view.add_call_message(event=event) @@ -1451,7 +1453,7 @@ def fetch_n_lines_history(self, self.conversation_view.unlock() - def add_messages(self, messages): + def add_messages(self, messages: list[ConversationRow]): for msg in messages: if msg.kind in (KindConstant.FILE_TRANSFER_INCOMING, KindConstant.FILE_TRANSFER_OUTGOING): ===================================== gajim/gtk/controls/chat.py ===================================== @@ -23,6 +23,8 @@ # 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 ClassVar # pylint: disable=unused-import from typing import Type # pylint: disable=unused-import from typing import Optional @@ -42,13 +44,17 @@ from gajim.common import app from gajim.common import helpers +from gajim.common.events import JingleRequestReceived from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.const import PEPEventType +from gajim.common.jingle_session import JingleSession from gajim.gui.call_widget import CallWidget +from gajim.gui.controls.base import BaseControl +from gajim.gui.conversation.view import ConversationView from gajim.gui.const import TARGET_TYPE_URI_LIST from gajim.gui.const import ControlType from gajim.gui.dialogs import DialogButton @@ -58,7 +64,6 @@ from gajim.command_system.implementation.hosts import ChatCommands from gajim.command_system.framework import CommandHost # pylint: disable=unused-import -from gajim.gui.controls.base import BaseControl from ..menus import get_encryption_menu from ..menus import get_singlechat_menu @@ -475,16 +480,25 @@ def _on_start_call(self, def _process_jingle_av_event(self, event): self._call_widget.process_event(event) - def _on_accept_call(self, _view, session): + def _on_accept_call(self, + _view: ConversationView, + session: JingleSession + ) -> None: self._call_widget.accept_call(session) - def _on_decline_call(self, _view, session): + def _on_decline_call(self, + _view: ConversationView, + session: JingleSession + ) -> None: self._call_widget.decline_call(session) - def _on_call_ended(self, _call_widget): + def _on_call_ended(self, _call_widget: CallWidget) -> None: self.conversation_view.update_call_rows() - def _add_incoming_call(self, _call_widget, event): + def _add_incoming_call(self, + _call_widget: CallWidget, + event: JingleRequestReceived + ) -> None: self.add_call_message(event) def on_location_eventbox_button_release_event(self, _widget, _event): ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -12,34 +12,48 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Optional +from typing import cast +from typing import TYPE_CHECKING import time from datetime import datetime +from gi.repository import GdkPixbuf from gi.repository import Gtk from gajim.common import app +from gajim.common import types from gajim.common.const import AvatarSize from gajim.common.const import KindConstant +from gajim.common.events import JingleRequestReceived from gajim.common.i18n import _ from gajim.common.jingle_session import JingleSession +from gajim.common.storage.archive import ConversationRow from .widgets import SimpleLabel from .base import BaseRow +if TYPE_CHECKING: + from gajim.gui.conversation.view import ConversationView + class CallRow(BaseRow): - def __init__(self, account, contact, event=None, db_message=None): + def __init__(self, + account: str, + contact: types.BareContact, + event: Optional[JingleRequestReceived] = None, + db_message: Optional[ConversationRow] = None + ) -> None: BaseRow.__init__(self, account) self.type = 'call' self._client = app.get_client(account) - is_from_db = bool(db_message is not None) - - if is_from_db: + if db_message is not None: timestamp = db_message.time else: timestamp = time.time() @@ -52,7 +66,7 @@ def __init__(self, account, contact, event=None, db_message=None): self._session: Optional[JingleSession] = None - if is_from_db: + if db_message is not None: sid = db_message.additional_data.get_value('gajim', 'sid') module = self._client.get_module('Jingle') self._session = module.get_jingle_session(self._contact.jid, sid) @@ -87,36 +101,39 @@ def update(self) -> None: def _on_accept(self, button: Gtk.Button) -> None: button.set_sensitive(False) self._decline_button.set_sensitive(False) + view = cast('ConversationView', self.get_parent()) if self._event is not None: session = self._client.get_module('Jingle').get_jingle_session( self._event.fjid, self._event.sid) - self.get_parent().accept_call(session) + view.accept_call(session) else: - self.get_parent().accept_call(self._session) + assert self._session is not None + view.accept_call(self._session) def _on_decline(self, _button: Gtk.Button) -> None: + view = cast('ConversationView', self.get_parent()) if self._event is not None: session = self._client.get_module('Jingle').get_jingle_session( self._event.fjid, self._event.sid) - self.get_parent().decline_call(session) + view.decline_call(session) else: - self.get_parent().decline_call(self._session) + assert self._session is not None + view.decline_call(self._session) self._session = None def _add_history_call_widget(self) -> None: + contact = self._client.get_module('Contacts').get_contact( + str(self._client.get_own_jid().bare)) + is_self = True if self._db_message is not None: if self._db_message.kind == KindConstant.CALL_INCOMING: contact = self._contact is_self = True else: - contact = self._client.get_module('Contacts').get_contact( - str(self._client.get_own_jid().bare)) is_self = False if self._event is not None: if self._event == 'incoming-call': - contact = self._client.get_module('Contacts').get_contact( - str(self._client.get_own_jid().bare)) is_self = False else: contact = self._contact @@ -124,6 +141,7 @@ def _add_history_call_widget(self) -> None: scale = self.get_scale_factor() avatar = contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) + assert not isinstance(avatar, GdkPixbuf.Pixbuf) avatar_image = Gtk.Image.new_from_surface(avatar) self._avatar_placeholder.add(avatar_image) @@ -157,10 +175,11 @@ def _add_incoming_call_widget(self) -> None: AvatarSize.CALL, scale, add_show=False) + assert not isinstance(avatar, GdkPixbuf.Pixbuf) avatar_image = Gtk.Image.new_from_surface(avatar) self._call_box.add(avatar_image) - content_types = [] + content_types: list[str] = [] if self._event is not None: for item in self._event.contents: content_types.append(item.media) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -35,13 +35,16 @@ from gajim.common import app from gajim.common.client import Client +from gajim.common.events import JingleRequestReceived from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day +from gajim.common.jingle_session import JingleSession from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import BareContact from gajim.common.modules.httpupload import HTTPFileTransfer +from gajim.common.storage.archive import ConversationRow from .rows.base import BaseRow from .rows.read_marker import ReadMarkerRow @@ -233,7 +236,11 @@ def add_jingle_file_transfer(self, event=None, db_message=None): self._account, self._contact, event=event, db_message=db_message) self._insert_message(jingle_transfer_row) - def add_call_message(self, event=None, db_message=None): + def add_call_message(self, + event: Optional[JingleRequestReceived] = None, + db_message: Optional[ConversationRow] = None + ) -> None: + assert isinstance(self._contact, BareContact) call_row = CallRow( self._account, self._contact, event=event, db_message=db_message) self._insert_message(call_row) @@ -455,8 +462,9 @@ def iter_rows(self) -> Generator[BaseRow, None, None]: yield row def update_call_rows(self) -> None: - for row in self.get_children(): - if row.type == 'call': + rows = cast(list[BaseRow], self.get_children()) + for row in rows: + if isinstance(row, CallRow): row.update() def set_read_marker(self, id_: str) -> None: @@ -516,11 +524,11 @@ def on_quote(self, text: str) -> None: def on_mention(self, name: str) -> None: self.emit('mention', name) - def accept_call(self, event): - self.emit('accept-call', event) + def accept_call(self, session: JingleSession) -> None: + self.emit('accept-call', session) - def decline_call(self, event): - self.emit('decline-call', event) + def decline_call(self, session: JingleSession) -> None: + self.emit('decline-call', session) def _on_contact_setting_changed(self, *args: Any) -> None: self.invalidate_filter() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f55750ca581db312ba5aeb6750332dd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f55750ca581db312ba5aeb6750332dd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Cache: Force JID objects
by Philipp Hörist (＠lovetox) 12 Jan '22

12 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f55750ca by lovetox at 2022-01-12T22:44:03+01:00 Cache: Force JID objects - - - - - 1 changed file: - gajim/common/storage/cache.py Changes: ===================================== gajim/common/storage/cache.py ===================================== @@ -17,7 +17,6 @@ from typing import Any from typing import NamedTuple from typing import Optional -from typing import Union import json import time @@ -101,7 +100,7 @@ def __init__(self): CACHE_SQL_STATEMENT) self._entity_caps_cache: dict[tuple[str, str], DiscoInfo] = {} - self._disco_info_cache: dict[Union[JID, str], DiscoInfo] = {} + self._disco_info_cache: dict[JID, DiscoInfo] = {} self._muc_cache: dict[JID, dict[str, Any]] = defaultdict(dict) self._contact_cache: dict[JID, dict[str, Any]] = defaultdict(dict) @@ -181,7 +180,7 @@ def _clean_caps_table(self) -> None: @timeit def _fill_disco_info_cache(self) -> None: sql = '''SELECT disco_info as "disco_info [disco_info]", - jid, last_seen FROM + jid as "jid [jid]", last_seen FROM last_seen_disco_info''' rows = self._con.execute(sql).fetchall() for row in rows: @@ -190,7 +189,7 @@ def _fill_disco_info_cache(self) -> None: log.info('%d DiscoInfo entries loaded', len(rows)) def get_last_disco_info(self, - jid: Union[str, JID], + jid: JID, max_age: int = 0) -> Optional[DiscoInfo]: """ Get last disco info from jid @@ -210,7 +209,7 @@ def get_last_disco_info(self, @timeit def set_last_disco_info(self, - jid: Union[str, JID], + jid: JID, disco_info: DiscoInfo, cache_only: bool = False) -> None: """ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f55750ca581db312ba5aeb6750332dd1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f55750ca581db312ba5aeb6750332dd1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Show leak warnings when running with warnings enabled
by Philipp Hörist (＠lovetox) 12 Jan '22

12 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 197bcf47 by lovetox at 2022-01-12T22:28:00+01:00 Show leak warnings when running with warnings enabled - - - - - 1 changed file: - gajim/common/application.py Changes: ===================================== gajim/common/application.py ===================================== @@ -18,6 +18,7 @@ from typing import Type from typing import TextIO +import os import sys from gajim.common import app @@ -92,6 +93,7 @@ def _quit_app(self) -> None: def _show_warnings() -> None: import traceback import warnings + os.environ['GAJIM_LEAK'] = 'true' def warn_with_traceback(message: Union[Warning, str], category: Type[Warning], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/197bcf474e5caf41f79c7d51c1b0c9df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/197bcf474e5caf41f79c7d51c1b0c9df… 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