Commits June 2022

commits@gajim.org

1 participants
132 discussions

[Git][gajim/gajim][master] 2 commits: refactor: Application: Handle cmdline options only on startup
by Philipp Hörist (＠lovetox) 12 Jun '22

12 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0a0a583e by lovetox at 2022-06-12T21:35:35+02:00 refactor: Application: Handle cmdline options only on startup Call startup() from the `handle-local-options` handler. This allows us to register() the application ourself and see if we are a remote instance. Then parse and handle startup related cmdline options, only if we are not a remote instance. - - - - - 774d32b0 by lovetox at 2022-06-12T21:35:35+02:00 feat: Add new command --show - - - - - 3 changed files: - gajim/common/application.py - gajim/gtk/application.py - gajim/gtk/const.py Changes: ===================================== gajim/common/application.py ===================================== @@ -35,6 +35,7 @@ from gajim.common import app from gajim.common import ged from gajim.common import configpaths +from gajim.common import logging_helpers from gajim.common.events import AccountDisonnected from gajim.common.events import AllowGajimUpdateCheck from gajim.common.events import GajimUpdateAvailable @@ -94,6 +95,38 @@ def _init_core(self) -> None: def _log(self) -> logging.Logger: return app.log('gajim.application') + def _core_command_line(self, options: GLib.VariantDict) -> None: + if options.contains('cprofile'): + self.start_profiling() + + if options.contains('gdebug'): + os.environ['G_MESSAGES_DEBUG'] = 'all' + + if options.contains('separate'): + configpaths.set_separation(True) + + config_path = options.lookup_value('config-path') + if config_path is not None: + config_path = config_path.get_string() + configpaths.set_config_root(config_path) + + configpaths.init() + logging_helpers.init() + + if options.contains('quiet'): + logging_helpers.set_quiet() + + if options.contains('verbose'): + logging_helpers.set_verbose() + + loglevel = options.lookup_value('loglevel') + if loglevel is not None: + loglevel = loglevel.get_string() + logging_helpers.set_loglevels(loglevel) + + if options.contains('warnings'): + self._show_warnings() + def start_profiling(self) -> None: self._log.info('Start profiling') self._profiling_session = cProfile.Profile() ===================================== gajim/gtk/application.py ===================================== @@ -58,7 +58,6 @@ from gajim.common import events from gajim.common import ged from gajim.common import idle -from gajim.common import logging_helpers from gajim.common.application import CoreApplication from gajim.common.const import GAJIM_FAQ_URI from gajim.common.const import GAJIM_WIKI_URI @@ -194,11 +193,16 @@ def __init__(self): GLib.OptionArg.NONE, _('Start a new chat')) + self.add_main_option( + 'show', 0, + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show Gajim')) + self.add_main_option_entries(self._get_remaining_entry()) self.connect('handle-local-options', self._handle_local_options) self.connect('command-line', self._command_line) - self.connect('startup', self._startup) self.connect('shutdown', self._shutdown) self.interface = None @@ -218,7 +222,7 @@ def _get_remaining_entry(): option.short_name = 0 return [option] - def _startup(self, _application: GajimApplication) -> None: + def _startup(self) -> None: if sys.platform == 'win32': # Changing the PANGOCAIRO_BACKEND is necessary on Windows # to render colored emoji glyphs @@ -335,11 +339,15 @@ def _quit_app(self) -> None: def _command_line(self, _application: GajimApplication, command_line: Gio.ApplicationCommandLine) -> int: + '''Handles command line options not related to the startup of Gajim. + ''' + options = command_line.get_options_dict() remote_commands = [ ('ipython', None), ('start-chat', GLib.Variant('s', '')), + ('show', None) ] remaining = options.lookup_value(GLib.OPTION_REMAINING, @@ -359,14 +367,11 @@ def _command_line(self, def _handle_local_options(self, _application: Gtk.Application, options: GLib.VariantDict) -> int: - # Parse all options that have to be executed before ::startup + if options.contains('version'): print(gajim.__version__) return 0 - if options.contains('cprofile'): - self.start_profiling() - profile = options.lookup_value('profile') if profile is not None: # Incorporate profile name into application id @@ -376,35 +381,12 @@ def _handle_local_options(self, self.set_application_id(app_id) configpaths.set_profile(profile) - if options.contains('separate'): - configpaths.set_separation(True) - - config_path = options.lookup_value('config-path') - if config_path is not None: - config_path = config_path.get_string() - configpaths.set_config_root(config_path) - - configpaths.init() - - if options.contains('gdebug'): - os.environ['G_MESSAGES_DEBUG'] = 'all' - - logging_helpers.init() - - if options.contains('quiet'): - logging_helpers.set_quiet() - - if options.contains('verbose'): - logging_helpers.set_verbose() - - loglevel = options.lookup_value('loglevel') - if loglevel is not None: - loglevel = loglevel.get_string() - logging_helpers.set_loglevels(loglevel) - - if options.contains('warnings'): - self._show_warnings() + self.register() + if self.get_is_remote(): + return -1 + self._core_command_line(options) + self._startup() return -1 def _add_app_actions(self) -> None: @@ -444,6 +426,7 @@ def _connect_app_actions(self) -> None: ('create-groupchat', self._on_create_groupchat_action), ('forget-groupchat', self._on_forget_groupchat_action), ('groupchat-join', self._on_groupchat_join_action), + ('show', self._on_show), ] for action in actions: @@ -837,3 +820,7 @@ def _on_groupchat_join_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: account, jid = param.get_strv() open_window('GroupchatJoin', account=account, jid=jid) + + @staticmethod + def _on_show(_action: Gio.SimpleAction, param: GLib.Variant) -> None: + app.window.show() ===================================== gajim/gtk/const.py ===================================== @@ -181,6 +181,7 @@ def __str__(self): ('quit', None), ('remove-history', 'a{sv}'), ('shortcuts', None), + ('show', None), ('start-chat', 's'), ('xml-console', None), ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/dcf7c1a317ef801d8139639bddaa289… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/dcf7c1a317ef801d8139639bddaa289… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Groupchat: Show correct icon when toggling roster revealer
by Philipp Hörist (＠lovetox) 12 Jun '22

12 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: dcf7c1a3 by Dexter Gaon-Shatford at 2022-06-12T19:24:12+00:00 fix: Groupchat: Show correct icon when toggling roster revealer Fixes #10944 - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -126,14 +126,14 @@ def __init__(self, account: str, jid: JID) -> None: show_roster = app.settings.get('hide_groupchat_occupants_list') self.xml.roster_revealer.set_reveal_child(show_roster) - icon = 'go-next-symbolic' if show_roster else 'go-previous-symbolic' - self.xml.toggle_roster_image.set_from_icon_name( - icon, Gtk.IconSize.BUTTON) - app.settings.bind_signal( 'hide_groupchat_occupants_list', self.xml.roster_revealer, 'set_reveal_child') + self._set_toggle_roster_button_icon(show_roster) + app.settings.connect_signal( + 'hide_groupchat_occupants_list', + self._set_toggle_roster_button_icon) self.roster.connect('row-activated', self._on_roster_row_activated) self.add_actions() @@ -522,12 +522,17 @@ def _on_change_affiliation(self, self.room_jid, {jid: {'affiliation': affiliation}}) - def _show_roster(self, *args: Any) -> None: - show = not self.xml.roster_revealer.get_reveal_child() - icon = 'go-next-symbolic' if show else 'go-previous-symbolic' + def _set_toggle_roster_button_icon(self, + show_roster: bool, + *args: Any) -> None: + icon = 'go-next-symbolic' if show_roster else 'go-previous-symbolic' self.xml.toggle_roster_image.set_from_icon_name( icon, Gtk.IconSize.BUTTON) + def _show_roster(self, *args: Any) -> None: + show = not self.xml.roster_revealer.get_reveal_child() + self._set_toggle_roster_button_icon(show) + transition = Gtk.RevealerTransitionType.SLIDE_RIGHT if show: transition = Gtk.RevealerTransitionType.SLIDE_LEFT View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dcf7c1a317ef801d8139639bddaa2892… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dcf7c1a317ef801d8139639bddaa2892… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: StatusMessageSelector: Enable emoji completion
by Daniel Brötzmann (＠wurstsalat) 12 Jun '22

12 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 580cfc9e by wurstsalat at 2022-06-12T21:17:45+02:00 imprv: StatusMessageSelector: Enable emoji completion - - - - - 197298f1 by wurstsalat at 2022-06-12T21:18:20+02:00 imprv: CreateGroupchatWindow: Enable emoji completion for description - - - - - 2 changed files: - gajim/data/gui/groupchat_creation.ui - gajim/gtk/status_message_selector.py Changes: ===================================== gajim/data/gui/groupchat_creation.ui ===================================== @@ -97,6 +97,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="show-emoji-icon">True</property> + <property name="enable-emoji-completion">True</property> </object> <packing> <property name="left-attach">1</property> ===================================== gajim/gtk/status_message_selector.py ===================================== @@ -41,6 +41,7 @@ def __init__(self, account: Optional[str] = None) -> None: self._entry = Gtk.Entry() self._entry.set_size_request(200, -1) self._entry.set_property('show-emoji-icon', True) + self._entry.set_property('enable-emoji-completion', True) self._entry.set_placeholder_text(_('Status message…')) self._entry.connect('activate', self._set_status_message) self._entry.connect('changed', self._on_changed) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/17ae6e75b4fb7785377c31774d44922… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/17ae6e75b4fb7785377c31774d44922… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Chat banner: Show phone image if last message came from a phone
by Daniel Brötzmann (＠wurstsalat) 12 Jun '22

12 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 17ae6e75 by wurstsalat at 2022-06-12T14:24:36+02:00 fix: Chat banner: Show phone image if last message came from a phone - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/gtk/controls/chat.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -492,6 +492,17 @@ def identity_type(self) -> Optional[str]: return None + @property + def is_phone(self): + disco_info = app.storage.cache.get_last_disco_info(self._jid) + if disco_info is None: + return False + + for identity in disco_info.identities: + if identity.type == 'phone': + return True + return False + @property def is_available(self) -> bool: return self._presence.available ===================================== gajim/gtk/controls/chat.py ===================================== @@ -323,13 +323,6 @@ def _on_send_marker(self, def _on_nickname_received(self, _event): self.update_ui() - def _on_update_client_info(self, event): - # TODO: Test if this works - contact = self._client.get_module('Contacts').get_contact(event.jid) - if contact is None: - return - self.xml.phone_image.set_visible(contact.uses_phone) - def _on_chatstate_update(self, _contact: types.BareContact, _signal_name: str @@ -382,6 +375,9 @@ def _on_message_received(self, event: events.MessageReceived) -> None: if event.properties.is_sent_carbon: kind = 'outgoing' + resource_contact = self.contact.get_resource(event.resource) + self.xml.phone_image.set_visible(resource_contact.is_phone) + self.add_message(event.msgtxt, kind, tim=event.properties.timestamp, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17ae6e75b4fb7785377c31774d449220… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17ae6e75b4fb7785377c31774d449220… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Groupchat: Prevent automatic roster revealer toggling on join
by Daniel Brötzmann (＠wurstsalat) 12 Jun '22

12 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ffca46fc by wurstsalat at 2022-06-12T13:43:02+02:00 fix: Groupchat: Prevent automatic roster revealer toggling on join - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -123,8 +123,13 @@ def __init__(self, account: str, jid: JID) -> None: self.roster = GroupchatRoster(self.account, self.room_jid, self) self.xml.roster_revealer.add(self.roster) - self.xml.roster_revealer.set_reveal_child( - not app.settings.get('hide_groupchat_occupants_list')) + + show_roster = app.settings.get('hide_groupchat_occupants_list') + self.xml.roster_revealer.set_reveal_child(show_roster) + icon = 'go-next-symbolic' if show_roster else 'go-previous-symbolic' + self.xml.toggle_roster_image.set_from_icon_name( + icon, Gtk.IconSize.BUTTON) + app.settings.bind_signal( 'hide_groupchat_occupants_list', self.xml.roster_revealer, @@ -244,7 +249,6 @@ def _on_muc_state_changed(self, if self.contact.is_joined: self._set_control_active() - self._show_roster() self._groupchat_state.set_joined() elif self.contact.is_not_joined: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ffca46fce4aaa25a9bd6a8a00546f469… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ffca46fce4aaa25a9bd6a8a00546f469… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Add type annotation for emoji_data
by Daniel Brötzmann (＠wurstsalat) 11 Jun '22

11 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d8a7b278 by wurstsalat at 2022-06-11T17:03:00+02:00 chore: Add type annotation for emoji_data - - - - - e6393492 by wurstsalat at 2022-06-11T17:46:48+02:00 imprv: Gateways: Use avatar if published - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/gtk/emoji_data.pyi Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -361,7 +361,6 @@ def get_avatar(self, transport_icon = None if self.is_gateway: - show = None disco_info = app.storage.cache.get_last_disco_info(self._jid) if disco_info is not None: if disco_info.gateway_type == 'sms': @@ -374,6 +373,9 @@ def get_avatar(self, transport_icon = 'gajim-agent-sms' break + if self.avatar_sha is not None: + transport_icon = None + if pixbuf: return app.app.avatar_storage.get_pixbuf( self, ===================================== gajim/gtk/emoji_data.pyi ===================================== @@ -22,6 +22,7 @@ class Emoji(IntEnum): ... def is_emoji(codepoints: str) -> bool: ... +def get_emoji_font() -> str: ... def get_emoji_pixbuf(codepoints: str) -> GdkPixbuf.Pixbuf: ... class EmojiData(OrderedDict): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/901014263230f6a8042922fab65a94c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/901014263230f6a8042922fab65a94c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Workspaces: Fix image scaling
by Daniel Brötzmann (＠wurstsalat) 11 Jun '22

11 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 90101426 by wurstsalat at 2022-06-11T14:37:33+02:00 fix: Workspaces: Fix image scaling Fixes #10961 - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -127,9 +127,8 @@ def make_workspace_avatar(letter: str, style: str = 'round-corners') -> cairo.ImageSurface: surface = generate_avatar(letter, color, size, scale) - surface = clip(surface, style) surface.set_device_scale(scale, scale) - return surface + return clip(surface, style) def add_status_to_avatar(surface: cairo.ImageSurface, @@ -294,18 +293,21 @@ def clip_circle(surface: cairo.ImageSurface) -> cairo.ImageSurface: def round_corners(surface: cairo.ImageSurface) -> cairo.ImageSurface: - new_surface = cairo.ImageSurface(cairo.Format.ARGB32, - surface.get_width(), - surface.get_height()) + width = surface.get_width() + height = surface.get_height() + scale = surface.get_device_scale()[0] + new_surface = cairo.ImageSurface(cairo.Format.ARGB32, + width, + height) new_surface.set_device_scale(*surface.get_device_scale()) context = cairo.Context(new_surface) context.set_source_surface(surface, 0, 0) - width = surface.get_width() - height = surface.get_height() - scale = surface.get_device_scale()[0] - radius = 9 * scale + width = width / scale + height = height / scale + + radius = 9 degrees = pi / 180 context.new_sub_path() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/901014263230f6a8042922fab65a94c1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/901014263230f6a8042922fab65a94c1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: AvatarSelector: Add fail-safes for loading images
by Daniel Brötzmann (＠wurstsalat) 11 Jun '22

11 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9bc3ef10 by wurstsalat at 2022-06-11T13:32:13+02:00 fix: AvatarSelector: Add fail-safes for loading images Fixes #10965 - - - - - 3 changed files: - gajim/gtk/avatar_selector.py - gajim/gtk/workspace_dialog.py - pyrightconfig.json Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -16,6 +16,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Any +from typing import cast from typing import Optional import os @@ -34,6 +35,7 @@ from gajim.common.i18n import _ from gajim.common.helpers import get_file_path_from_dnd_dropped_uri +from .dialogs import ErrorDialog from .filechoosers import AvatarChooserDialog from .util import scale_with_ratio @@ -107,6 +109,11 @@ def __init__(self) -> None: def _on_destroy(self, *args: Any) -> None: app.check_finalize(self) + def reset(self) -> None: + self._load_button.show() + self._helper_label.show() + self._crop_area.hide() + def prepare_crop_area(self, path: str) -> None: pixbuf = self._get_pixbuf_from_path(path) if pixbuf is None: @@ -165,9 +172,10 @@ def _scale_for_publish(pixbuf: GdkPixbuf.Pixbuf if width > AvatarSize.PUBLISH or height > AvatarSize.PUBLISH: # Scale only down, never up width, height = scale_with_ratio(AvatarSize.PUBLISH, width, height) - pixbuf = pixbuf.scale_simple(width, - height, - GdkPixbuf.InterpType.BILINEAR) + scaled_pixbuf = pixbuf.scale_simple( + width, height, GdkPixbuf.InterpType.BILINEAR) + assert scaled_pixbuf is not None + return scaled_pixbuf, width, height return pixbuf, width, height def get_avatar_surface(self) -> Optional[tuple[cairo.Surface, int, int]]: @@ -238,14 +246,16 @@ def set_contstrain_aspect(self, constrain: bool) -> None: else: self._aspect = -1 - def set_pixbuf(self, pixbuf: GdkPixbuf.Pixbuf) -> None: - if pixbuf: - self._browse_pixbuf = pixbuf - width = pixbuf.get_width() - height = pixbuf.get_height() - else: - width = 0 - height = 0 + def set_pixbuf(self, pixbuf: Optional[GdkPixbuf.Pixbuf]) -> None: + if pixbuf is None: + self._browse_pixbuf = None + avatar_selector = cast(AvatarSelector, self.get_parent()) + avatar_selector.reset() + return + + self._browse_pixbuf = pixbuf + width = pixbuf.get_width() + height = pixbuf.get_height() self._crop.width = 2 * self._base_width self._crop.height = 2 * self._base_height @@ -281,7 +291,12 @@ def _on_draw(self, _widget: Gtk.Widget, context: cairo.Context) -> bool: self._update_pixbufs() - assert self._pixbuf + if self._pixbuf is None: + ErrorDialog(_('Error Loading Image'), + _('Selected image could not be loaded.')) + self.set_pixbuf(None) + return False + width = self._pixbuf.get_width() height = self._pixbuf.get_height() crop = self._crop_to_widget() @@ -289,6 +304,7 @@ def _on_draw(self, _widget: Gtk.Widget, context: cairo.Context) -> bool: ix = self._image.x iy = self._image.y + assert self._color_shifted_pixbuf is not None Gdk.cairo_set_source_pixbuf( context, self._color_shifted_pixbuf, ix, iy) context.rectangle( @@ -604,9 +620,13 @@ def _update_pixbufs(self) -> None: dest_width = int(width * scale) dest_height = int(height * scale) + if dest_width == 0 or dest_height == 0: + log.warning('Image width or height is zero') + return + if (self._pixbuf is None or - self._pixbuf.get_width != allocation.width or - self._pixbuf.get_height != allocation.height): + self._pixbuf.get_width() != allocation.width or + self._pixbuf.get_height() != allocation.height): self._pixbuf = GdkPixbuf.Pixbuf.new( GdkPixbuf.Colorspace.RGB, @@ -614,6 +634,7 @@ def _update_pixbufs(self) -> None: 8, dest_width, dest_height) + if self._pixbuf is None: return @@ -770,5 +791,6 @@ def _generate_color_shifted_pixbuf(self) -> None: context.paint() surface = context.get_target() + assert isinstance(surface, cairo.ImageSurface) self._color_shifted_pixbuf = Gdk.pixbuf_get_from_surface( surface, 0, 0, surface.get_width(), surface.get_height()) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -134,6 +134,7 @@ def _on_image_switch_toggled(self, switch: Gtk.Switch, *args: Any) -> None: else: self._ui.style_stack.set_visible_child_name('color') self._avatar_sha = None + self._avatar_selector.reset() self._update_avatar() def _update_avatar(self) -> None: ===================================== pyrightconfig.json ===================================== @@ -50,6 +50,7 @@ "gajim/gtk/app_side_bar.py", "gajim/gtk/application.py", "gajim/gtk/apply_button_box.py", + "gajim/gtk/avatar_selector.py", "gajim/gtk/blocking.py", "gajim/gtk/bookmarks.py", "gajim/gtk/builder.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9bc3ef100a5c4b334f4833d9536c7695… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9bc3ef100a5c4b334f4833d9536c7695… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Add new profiling command line switch
by Philipp Hörist (＠lovetox) 11 Jun '22

11 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 47c04155 by lovetox at 2022-06-11T11:59:53+02:00 feat: Add new profiling command line switch Usage: gajim --cprofile > stats.txt - - - - - 2 changed files: - gajim/common/application.py - gajim/gtk/application.py Changes: ===================================== gajim/common/application.py ===================================== @@ -22,6 +22,9 @@ import sys import json import logging +import cProfile +import pstats +from pstats import SortKey from datetime import datetime from packaging.version import Version as V @@ -46,6 +49,9 @@ class CoreApplication: + def __init__(self) -> None: + self._profiling_session = None + def _init_core(self) -> None: # Create and initialize Application Paths & Databases app.app = self @@ -88,6 +94,21 @@ def _init_core(self) -> None: def _log(self) -> logging.Logger: return app.log('gajim.application') + def start_profiling(self) -> None: + self._log.info('Start profiling') + self._profiling_session = cProfile.Profile() + self._profiling_session.enable() + + def end_profiling(self) -> None: + if self._profiling_session is None: + return + + self._profiling_session.disable() + self._log.info('End profiling') + ps = pstats.Stats(self._profiling_session) + ps = ps.sort_stats(SortKey.CUMULATIVE) + ps.print_stats() + def start_shutdown(self, *args: Any, **kwargs: Any) -> None: app.app.systray.shutdown() @@ -119,6 +140,7 @@ def _shutdown_core(self) -> None: app.storage.archive.cleanup_chat_history() app.storage.cache.shutdown() app.storage.archive.shutdown() + self.end_profiling() def _quit_app(self) -> None: self._shutdown_core() ===================================== gajim/gtk/application.py ===================================== @@ -96,6 +96,7 @@ class GajimApplication(Gtk.Application, CoreApplication): '''Main class handling activation and command line.''' def __init__(self): + CoreApplication.__init__(self) flags = (Gio.ApplicationFlags.HANDLES_COMMAND_LINE | Gio.ApplicationFlags.CAN_OVERRIDE_APP_ID) Gtk.Application.__init__(self, @@ -180,6 +181,13 @@ def __init__(self): _('Sets an environment variable so ' 'GLib debug messages are printed')) + self.add_main_option( + 'cprofile', + 0, + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Profile application with cprofile')) + self.add_main_option( 'start-chat', 0, GLib.OptionFlags.NONE, @@ -356,6 +364,9 @@ def _handle_local_options(self, print(gajim.__version__) return 0 + if options.contains('cprofile'): + self.start_profiling() + profile = options.lookup_value('profile') if profile is not None: # Incorporate profile name into application id View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47c04155978951df5972fccd0952d7a6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47c04155978951df5972fccd0952d7a6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Use newest pyright version
by Philipp Hörist (＠lovetox) 08 Jun '22

08 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9e04b522 by lovetox at 2022-06-08T23:44:28+02:00 ci: Use newest pyright version - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -27,7 +27,7 @@ test-pyright: script: - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git - pip3 install git+https://github.com/pygobject/pygobject-stubs.git - - npm install pyright(a)1.1.249 + - npm install pyright - python3 .ci/link-gtk.py - $(npm bin)/pyright --version - $(npm bin)/pyright View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9e04b5223adee02fee496e126100bd86… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9e04b5223adee02fee496e126100bd86… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
7
8
9
10
11
12
13
14
Older →

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 June 2022