Commits January 2023

commits@gajim.org

1 participants
135 discussions

[Git][gajim/gajim][master] cq: Use OSError instead of alias
by Philipp Hörist (＠lovetox) 02 Jan '23

02 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: d7d80b47 by Philipp Hörist at 2023-01-02T19:22:29+01:00 cq: Use OSError instead of alias - - - - - 3 changed files: - gajim/common/jingle_ft.py - gajim/common/modules/bytestream.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/jingle_ft.py ===================================== @@ -289,7 +289,7 @@ def _compute_hash(self) -> Optional[nbxmpp.Hashes2]: return try: file_ = open(self.file_props.file_name, 'rb') - except IOError: + except OSError: # can't open file return h = nbxmpp.Hashes2() ===================================== gajim/common/modules/bytestream.py ===================================== @@ -360,7 +360,7 @@ def _add_upnp_igd_as_streamhost_to_query(self, # check if we are connected with an IPv4 address try: socket.inet_aton(my_ip) - except socket.error: + except OSError: self._con.connection.send(iq) return ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -572,7 +572,7 @@ def install_from_zip(self, except zipfile.BadZipfile: # it is not zip file raise PluginsystemError(_('Archive corrupted')) - except IOError: + except OSError: raise PluginsystemError(_('Archive empty')) if zip_file.testzip(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d7d80b47d867577378e91d3993c901a5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d7d80b47d867577378e91d3993c901a5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] refactor: Don’t cancel when content-length is not available
by Philipp Hörist (＠lovetox) 01 Jan '23

01 Jan '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 964fa149 by Philipp Hörist at 2023-01-02T00:06:47+01:00 refactor: Don’t cancel when content-length is not available In this case we default to content-length = 0 - - - - - 2 changed files: - nbxmpp/const.py - nbxmpp/http.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -456,12 +456,11 @@ class Mode(IntEnum): class HTTPRequestError(IntEnum): UNKNOWN = 0 - MISSING_CONTENT_LENGTH = 1 - INCOMPLETE = 2 - STATUS_NOT_OK = 3 - CANCELLED = 4 - CONTENT_OVERFLOW = 5 - TIMEOUT = 6 + INCOMPLETE = 1 + STATUS_NOT_OK = 2 + CANCELLED = 3 + CONTENT_OVERFLOW = 4 + TIMEOUT = 5 MOODS = [ ===================================== nbxmpp/http.py ===================================== @@ -30,7 +30,6 @@ from gi.repository import GLib from gi.repository import GObject import nbxmpp -from .util import convert_soup_encoding from .const import HTTPRequestError @@ -109,7 +108,6 @@ class HTTPRequest(GObject.GObject): self._is_complete = False self._timeout_reached = False self._timeout_id = None - self._no_content_length_set = False self._response_body_file: Optional[Gio.File] = None self._response_body_data = b'' @@ -315,10 +313,7 @@ class HTTPRequest(GObject.GObject): except GLib.Error as error: quark = GLib.quark_try_string('g-io-error-quark') if error.matches(quark, Gio.IOErrorEnum.CANCELLED): - if self._no_content_length_set: - self._set_failed(HTTPRequestError.MISSING_CONTENT_LENGTH) - else: - self._set_failed(HTTPRequestError.CANCELLED) + self._set_failed(HTTPRequestError.CANCELLED) return self._log.error(error) @@ -407,26 +402,18 @@ class HTTPRequest(GObject.GObject): _params: GLib.HashTable, ) -> None: - if self._message.get_status() not in (Soup.Status.OK, - Soup.Status.CREATED): - return + # Signal is only raised when there is content in the response headers = message.get_response_headers() - encoding = headers.get_encoding() - if Soup.Encoding.CONTENT_LENGTH not in convert_soup_encoding(encoding): - self._log.warning('No content-length in response') - self._no_content_length_set = True - self.cancel() - return self._response_content_length = headers.get_content_length() if content_type is None: # According to the docs, content_type is None when the sniffer # decides to trust the content-type sent by the server. - self._response_content_type = headers.get_content_type() - else: - self._response_content_type = content_type + content_type, _ = headers.get_content_type() + + self._response_content_type = content_type or '' self._log.info('Sniffed: content-type: %s, content-length: %s', self._response_content_type, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/964fa149cf0502bdb43b561e… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/964fa149cf0502bdb43b561e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: cfix: HTTP: Handle case where sniffer omits content-type
by Philipp Hörist (＠lovetox) 01 Jan '23

01 Jan '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 1dbc2ed4 by Philipp Hörist at 2023-01-01T22:12:01+01:00 cfix: HTTP: Handle case where sniffer omits content-type - - - - - c3b9bd4e by Philipp Hörist at 2023-01-01T22:21:38+01:00 cfix: HTTP: Store lost content-length again - - - - - 1 changed file: - nbxmpp/http.py Changes: ===================================== nbxmpp/http.py ===================================== @@ -403,7 +403,7 @@ class HTTPRequest(GObject.GObject): def _on_content_sniffed(self, message: Soup.Message, - content_type: str, + content_type: Optional[str], _params: GLib.HashTable, ) -> None: @@ -419,7 +419,14 @@ class HTTPRequest(GObject.GObject): self.cancel() return - self._response_content_type = content_type + self._response_content_length = headers.get_content_length() + + if content_type is None: + # According to the docs, content_type is None when the sniffer + # decides to trust the content-type sent by the server. + self._response_content_type = headers.get_content_type() + else: + self._response_content_type = content_type self._log.info('Sniffed: content-type: %s, content-length: %s', self._response_content_type, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/156a365a688f7e5071c2d1a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/156a365a688f7e5071c2d1a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: new: HTTP: Add more logging
by Philipp Hörist (＠lovetox) 01 Jan '23

01 Jan '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: feffa352 by Philipp Hörist at 2023-01-01T20:47:12+01:00 new: HTTP: Add more logging - - - - - 8fc874b6 by Philipp Hörist at 2023-01-01T20:48:19+01:00 cfix: Don’t sniff content on unsuccessful responses - - - - - 156a365a by Philipp Hörist at 2023-01-01T22:00:31+01:00 cfix: HTTP: Don’t special handle contet-length of zero - - - - - 1 changed file: - nbxmpp/http.py Changes: ===================================== nbxmpp/http.py ===================================== @@ -290,7 +290,7 @@ class HTTPRequest(GObject.GObject): self._timeout_id = GLib.timeout_add_seconds( timeout, self._on_timeout) - self._log.info('Request sent') + self._log.info('Request sent, method: %s, uri: %s', method, uri_string) def _on_request_body_progress(self, _message: Soup.Message, @@ -325,8 +325,10 @@ class HTTPRequest(GObject.GObject): self._set_failed(HTTPRequestError.UNKNOWN) return - if self._message.get_status() not in (Soup.Status.OK, - Soup.Status.CREATED): + status = self._message.get_status() + if status not in (Soup.Status.OK, Soup.Status.CREATED): + self._log.info('Response status: %s %s', + int(status), self._message.get_reason_phrase()) self._set_failed(HTTPRequestError.STATUS_NOT_OK) return @@ -405,6 +407,10 @@ class HTTPRequest(GObject.GObject): _params: GLib.HashTable, ) -> None: + if self._message.get_status() not in (Soup.Status.OK, + Soup.Status.CREATED): + return + headers = message.get_response_headers() encoding = headers.get_encoding() if Soup.Encoding.CONTENT_LENGTH not in convert_soup_encoding(encoding): @@ -413,14 +419,12 @@ class HTTPRequest(GObject.GObject): self.cancel() return - self._response_content_length = headers.get_content_length() - if self._response_content_length == 0: - self._log.warning('No content-length in response') - self._no_content_length_set = True - self.cancel() - return - self._response_content_type = content_type + + self._log.info('Sniffed: content-type: %s, content-length: %s', + self._response_content_type, + self._response_content_length) + self.emit('content-sniffed', self._response_content_length, self._response_content_type) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/4bed9a95bf654147b9cb74a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/4bed9a95bf654147b9cb74a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Update .gitignore
by Philipp Hörist (＠lovetox) 01 Jan '23

01 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1f54a80e by Philipp Hörist at 2023-01-01T10:54:13+01:00 chore: Update .gitignore - - - - - 787405ac by Philipp Hörist at 2023-01-01T10:56:28+01:00 refactor: Simplify HigDialog - Remove unused code - Simplify inheritence - Better handle markup - - - - - 5 changed files: - .gitignore - gajim/gtk/blocking.py - gajim/gtk/dialogs.py - gajim/gtk/plugins.py - gajim/gtk/themes.py Changes: ===================================== .gitignore ===================================== @@ -11,6 +11,7 @@ syntax: glob gajim/gui/* !gajim/gui/__init__.py +gajim/data/locale # Cache ===================================== gajim/gtk/blocking.py ===================================== @@ -18,7 +18,6 @@ from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GLib from nbxmpp.errors import StanzaError from nbxmpp.protocol import JID @@ -29,7 +28,7 @@ from gajim.common.helpers import to_user_string from .builder import get_builder -from .dialogs import HigDialog +from .dialogs import ErrorDialog log = logging.getLogger('gajim.gui.blocking_list') @@ -64,11 +63,7 @@ def __init__(self, account: str) -> None: callback=self._on_blocking_list_received) def _show_error(self, error: str) -> None: - dialog = HigDialog( - self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, - _('Error!'), - GLib.markup_escape_text(error)) - dialog.popup() + ErrorDialog(_('Error!'), error) def _on_blocking_list_received(self, task: Task) -> None: try: ===================================== gajim/gtk/dialogs.py ===================================== @@ -85,148 +85,61 @@ def make(cls, type_: Optional[str] = None, **kwargs: Any) -> DialogButton: class HigDialog(Gtk.MessageDialog): + + _message_type = Gtk.MessageType.INFO + _buttons_type = Gtk.ButtonsType.OK + _modal = True + def __init__(self, - parent: Gtk.Window, - type_: Gtk.MessageType, - buttons: Gtk.ButtonsType, - pritext: str, - sectext: str, - on_response_ok: Optional[Any] = None, - on_response_cancel: Optional[Any] = None, - on_response_yes: Optional[Any] = None, - on_response_no: Optional[Any] = None + text: str, + secondary_text: str | None = None, + *, + use_markup: bool = False, + secondary_use_markup: bool = False, + transient_for: Gtk.Window | None = None, ) -> None: - self.call_cancel_on_destroy = True - Gtk.MessageDialog.__init__(self, - transient_for=parent, - modal=True, - destroy_with_parent=True, - message_type=type_, - buttons=buttons, - text=pritext) - self.format_secondary_markup(sectext) + if transient_for is None: + transient_for = app.app.get_active_window() + assert transient_for is not None - self.possible_responses: dict[Gtk.ResponseType, Any] = { - Gtk.ResponseType.OK: on_response_ok, - Gtk.ResponseType.CANCEL: on_response_cancel, - Gtk.ResponseType.YES: on_response_yes, - Gtk.ResponseType.NO: on_response_no - } + Gtk.MessageDialog.__init__(self, + transient_for=transient_for, + modal=self._modal, + destroy_with_parent=True, + message_type=self._message_type, + buttons=self._buttons_type, + text=text, + use_markup=use_markup, + secondary_text=secondary_text, + secondary_use_markup=secondary_use_markup) self.connect('response', self.on_response) - self.connect('destroy', self.on_dialog_destroy) + self.show() def on_response(self, - dialog: Gtk.MessageDialog, - response_id: Gtk.ResponseType + _dialog: Gtk.MessageDialog, + _response_id: Gtk.ResponseType ) -> None: - if response_id not in self.possible_responses: - return - if not self.possible_responses[response_id]: - self.destroy() - elif isinstance(self.possible_responses[response_id], tuple): - if len(self.possible_responses[response_id]) == 1: - self.possible_responses[response_id][0](dialog) - else: - self.possible_responses[response_id][0]( - dialog, *self.possible_responses[response_id][1:]) - else: - self.possible_responses[response_id](dialog) - - def on_dialog_destroy(self, _widget: Gtk.Widget) -> Optional[bool]: - if not self.call_cancel_on_destroy: - return None - cancel_handler = self.possible_responses[Gtk.ResponseType.CANCEL] - if not cancel_handler: - return False - if isinstance(cancel_handler, tuple): - cancel_handler[0](None, *cancel_handler[1:]) - else: - cancel_handler(None) - return None - - def popup(self) -> None: - ''' - Show dialog - ''' - # Give focus to top vbox - box = cast(Gtk.Box, self.get_children()[0]) - inner_box = cast(Gtk.Box, box.get_children()[0]) - inner_box.grab_focus() - self.show_all() + self.destroy() -class WarningDialog(HigDialog): - ''' - HIG compliant warning dialog - ''' +class InformationDialog(HigDialog): - def __init__(self, - pritext: str, - sectext: str = '', - transient_for: Optional[Gtk.Window] = None - ) -> None: - if transient_for is None: - transient_for = app.app.get_active_window() - assert transient_for - HigDialog.__init__(self, - transient_for, - Gtk.MessageType.WARNING, - Gtk.ButtonsType.OK, - pritext, - sectext) - self.set_modal(False) - self.popup() + _message_type = Gtk.MessageType.INFO + _modal = False -class InformationDialog(HigDialog): - ''' - HIG compliant info dialog - ''' +class WarningDialog(HigDialog): - def __init__(self, - pritext: str, - sectext: str = '', - transient_for: Optional[Gtk.Window] = None - ) -> None: - if transient_for is None: - transient_for = app.app.get_active_window() - assert transient_for - HigDialog.__init__(self, - transient_for, - Gtk.MessageType.INFO, - Gtk.ButtonsType.OK, - pritext, - sectext) - self.set_modal(False) - self.popup() + _message_type = Gtk.MessageType.WARNING + _modal = False class ErrorDialog(HigDialog): - ''' - HIG compliant error dialog - ''' - def __init__(self, - pritext: str, - sectext: str = '', - on_response_ok: Optional[Any] = None, - on_response_cancel: Optional[Any] = None, - transient_for: Optional[Gtk.Window] = None - ) -> None: - if transient_for is None: - transient_for = app.app.get_active_window() - assert transient_for - HigDialog.__init__(self, - transient_for, - Gtk.MessageType.ERROR, - Gtk.ButtonsType.OK, - pritext, - sectext, - on_response_ok=on_response_ok, - on_response_cancel=on_response_cancel) - self.popup() + _message_type = Gtk.MessageType.ERROR + _modal = True class ConfirmationDialog(Gtk.MessageDialog): ===================================== gajim/gtk/plugins.py ===================================== @@ -333,8 +333,7 @@ def _on_enabled_toggled(self, try: app.plugin_manager.activate_plugin(plugin) except GajimPluginActivateException as e: - WarningDialog(_('Plugin failed'), str(e), - transient_for=self) + WarningDialog(_('Plugin failed'), str(e)) return self._update_selected_plugin() @@ -361,7 +360,7 @@ def _on_uninstall_plugin(self, _button: Gtk.ToolButton) -> None: app.plugin_manager.uninstall_plugin(plugin) except PluginsystemError as error: WarningDialog(_('Unable to properly remove the plugin'), - str(error), self) + str(error)) return def _on_plugin_removed(self, event: PluginRemoved) -> None: @@ -398,9 +397,7 @@ def _on_download_clicked(self, _button: Gtk.Button) -> None: def _on_install_plugin_from_zip(self, _button: Gtk.ToolButton) -> None: def _show_warn_dialog() -> None: text = _('Archive is malformed') - dialog = WarningDialog(text, '', transient_for=self) - dialog.set_modal(False) - dialog.popup() + WarningDialog(text, transient_for=self) def _on_plugin_exists(zip_filename: str) -> None: def _on_yes(): @@ -430,7 +427,7 @@ def _try_install(paths: list[str]) -> None: _on_plugin_exists(zip_filename) return - WarningDialog(error_text, f'"{zip_filename}"', self) + WarningDialog(error_text, f'"{zip_filename}"') return if not plugin: _show_warn_dialog() ===================================== gajim/gtk/themes.py ===================================== @@ -194,14 +194,13 @@ def _on_theme_name_edit(self, ErrorDialog( _('Invalid Name'), _('Name <b>default</b> is not allowed'), - transient_for=self) + secondary_use_markup=True) return if ' ' in new_name: ErrorDialog( _('Invalid Name'), - _('Spaces are not allowed'), - transient_for=self) + _('Spaces are not allowed')) return if new_name == '': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d084fd30582766a4cc2593e67f498bf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d084fd30582766a4cc2593e67f498bf… 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 January 2023