Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] chore: Update copyright year
by Philipp Hörist (＠lovetox) 03 Jan '23

03 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1ff40989 by André Apitzsch at 2023-01-03T10:01:40+01:00 chore: Update copyright year - - - - - 4 changed files: - README.md - data/org.gajim.Gajim.appdata.xml.in - debian/copyright - gajim/gtk/about.py Changes: ===================================== README.md ===================================== @@ -106,7 +106,7 @@ #### Links That is all, **enjoy**! -(C) 2003-2022 +(C) 2003-2023 The Gajim Team [https://gajim.org](https://gajim.org) ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <component type="desktop-application"> <id>org.gajim.Gajim</id> <metadata_license>CC-BY-SA-3.0</metadata_license> ===================================== debian/copyright ===================================== @@ -4,7 +4,7 @@ Upstream Authors: - Philipp Hörist <philipp(a)hoerist.com> -Copyright: (c) 2003-2022 Gajim Team +Copyright: (c) 2003-2023 Gajim Team This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by ===================================== gajim/gtk/about.py ===================================== @@ -35,7 +35,7 @@ def __init__(self): self.set_transient_for(app.window) self.set_name('Gajim') self.set_version(app.version) - self.set_copyright('Copyright © 2003-2022 Gajim Team') + self.set_copyright('Copyright © 2003-2023 Gajim Team') self.set_license_type(Gtk.License.GPL_3_0_ONLY) self.set_website('https://gajim.org/') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1ff40989c371b714446ce6cb68e62786… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1ff40989c371b714446ce6cb68e62786… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ci: Update pre-commit config
by Philipp Hörist (＠lovetox) 02 Jan '23

02 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 94d509e8 by Philipp Hörist at 2023-01-03T00:50:02+01:00 ci: Update pre-commit config - - - - - a2c64772 by Philipp Hörist at 2023-01-03T00:50:21+01:00 cq: Sort imports with isort - - - - - 30 changed files: - .ci/appveyor_build.py - .ci/deploy.py - .ci/link-gtk.py - .ci/make_release.py - .githooks/update - .pre-commit-config.yaml - gajim/common/app.py - gajim/common/application.py - gajim/common/call_manager.py - gajim/common/cert_store.py - gajim/common/client.py - gajim/common/commands.py - gajim/common/config.py - gajim/common/configpaths.py - gajim/common/const.py - gajim/common/dbus/location.py - gajim/common/dbus/logind.py - gajim/common/dbus/remote_control.py - gajim/common/dbus/system_style.py - gajim/common/events.py - gajim/common/file_props.py - gajim/common/filetransfer.py - gajim/common/ged.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/idle.py - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/756b00081b6119d71dff9254d6fc9f8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/756b00081b6119d71dff9254d6fc9f8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: ci: Add isort config
by Philipp Hörist (＠lovetox) 02 Jan '23

02 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: c63d3324 by Philipp Hörist at 2023-01-02T22:26:09+01:00 ci: Add isort config - - - - - 26afcb62 by Philipp Hörist at 2023-01-02T22:31:33+01:00 ci: Update pre-commit config - - - - - 756b0008 by Philipp Hörist at 2023-01-03T00:35:54+01:00 cq: Fix typos - - - - - 12 changed files: - .ci/link-gtk.py - .pre-commit-config.yaml - CONTRIBUTING.md - ChangeLog - README.md - gajim/common/ged.py - gajim/common/helpers.py - gajim/gtk/preview_audio.py - pyproject.toml - scripts/generate_ui_types.py - test/no_gui/test_gtk_util.py - test/no_gui/test_styling.py Changes: ===================================== .ci/link-gtk.py ===================================== @@ -13,7 +13,7 @@ cwd = Path.cwd() if cwd.name != 'gajim': - sys.exit('Script needs to be excecuted from gajim repository ' + sys.exit('Script needs to be executed from gajim repository ' 'root directory') gui_path = cwd / 'gajim' / 'gui' ===================================== .pre-commit-config.yaml ===================================== @@ -3,6 +3,8 @@ repos: rev: v0.0.206 hooks: - id: ruff + exclude: ".githooks/" + args: ["--force-exclude"] - repo: https://github.com/codespell-project/codespell rev: v2.2.2 @@ -15,3 +17,15 @@ repos: rev: v1.1.286 hooks: - id: pyright + pass_filenames: false + additional_dependencies: + - nbxmpp @ git+https://dev.gajim.org/gajim/python-nbxmpp.git + - PyGObject-stubs @ git+https://github.com/pygobject/pygobject-stubs.git + - python-gitlab + - sentry-sdk + stages: [manual] + + - repo: https://github.com/pycqa/isort + rev: 5.11.4 + hooks: + - id: isort ===================================== CONTRIBUTING.md ===================================== @@ -61,7 +61,7 @@ # Commit Messages # Use pre-commit -Execute the following inside the repositor dir +Execute the following inside the repository dir $ pip install pre-commit $ pre-commit install ===================================== ChangeLog ===================================== @@ -121,7 +121,7 @@ Gajim 1.5.3 (31 Oct 2022) * Notification: Draw avatar correctly on scale > 1 (#11229) * Preview: Don’t fail hard when parsing fragments * PreviewAudio: Increase update rate for seek bar (#11215) - * AccountPage: Disable Excute Command button by default (#11216) + * AccountPage: Disable Execute Command button by default (#11216) * Client: Load trusted certificates on connect() (#11220) * ChatList: Don’t increase in width while drag and drop * Roster: Always show workspace when starting chat @@ -561,7 +561,7 @@ Gajim 1.4.0 (11 May 2022) * #8584 Display vcard-temp JABBERIDs somewhere * #8631 Vertical tabs can not be adjusted in width in latest master * #8742 Integrate the Appindicator plugin into Gajim - * #8745 Allow successive bookmarked MUC autojoins (in oposite to concurrent) + * #8745 Allow successive bookmarked MUC autojoins (in opposite to concurrent) * #8849 Error when disabling an account: Account iter of <the server> could not be found * #8897 Roster filter crashes * #8898 Roster tree elements have wrong collapse state during and after roster filtering @@ -569,11 +569,11 @@ Gajim 1.4.0 (11 May 2022) * #9041 HTTPUpload: Add upload button to contact right-click menu * #9046 Add a "Minimize on close" in Preferences for all MUC rooms * #9145 Roster not showing number of contacts logged in per group - * #9164 Chatstates: Color of tab as "typing/composing" indicator get's lost on focus + * #9164 Chatstates: Color of tab as "typing/composing" indicator gets lost on focus * #9174 Changing status results in an error * #9202 No context menu on MUC's tab * #9321 Cannot allow contact to see my status - * #9360 Allow disabling keyboard shorcut ctrl+L (clear chat window) + * #9360 Allow disabling keyboard shortcut ctrl+L (clear chat window) * #9457 Add global search in History window * #9501 Mark corrected messages (LMC) in history browser * #9596 Add UI to search history from contact/chat window @@ -599,7 +599,7 @@ Gajim 1.4.0 (11 May 2022) * #10166 AttributeError: 'NoneType' object has no attribute 'show' * #10205 Restoring conversation tabs fails if JID contains comma * #10236 MUC: Error in update_actions when clicking on tray notification - * #10242 Bug with roster: Repeating error message: "too many values to unpack (exptected 2)" + * #10242 Bug with roster: Repeating error message: "too many values to unpack (expected 2)" * #10248 logind timeout error (24) in _inhibit_sleep * #10249 StatusIcon: Show connection lost icon when at least one account is not connected * #10279 error after wake-up from hibernation @@ -607,7 +607,7 @@ Gajim 1.4.0 (11 May 2022) * #10450 Clicking a link in the message window can cause Gajim 1.3 to crash * #10452 Various contact list issues * #10455 App crashing if quit from tray in Windows - * #10461 TypeError: can only concatenate str (not "NoneType") to str when receving bare jid presence from localpart(a)component.domain.tld + * #10461 TypeError: can only concatenate str (not "NoneType") to str when receiving bare jid presence from localpart(a)component.domain.tld * #10472 ConfirmationCheckDialog: DELETE_EVENT does not propagate checkbox state * #10483 Don't interrupt onboarding with update dialog * #10490 Gajim does not send XHTML in MUC @@ -852,7 +852,7 @@ Gajim 1.2.1 (08 July 2020) * ServerInfo: Display status address * Add block and spam reporting in various places * Roster: Allow to add contacts from `Not in contact list` group via DND - * Roster: Allow sending message to serveral groups + * Roster: Allow sending message to several groups * Groupchat/Chat: Rework DND * Groupchat: Display recent history from the database @@ -1009,12 +1009,12 @@ Gajim 1.1.0-beta2 / 1.0.99.1 (13 October 2018) * Support more media players for broadcasting the current tune * Windows: Add a debug logging switch in preferences * Preferences: enable/disable dark theme - * Preferences: enable/disable the MUC subject beeing shown on join + * Preferences: enable/disable the MUC subject being shown on join * Preferences: enable/disable ascii emoji conversion Bug fixes - * #9198 Creating new MUCs with captial letters is not possible + * #9198 Creating new MUCs with capital letters is not possible * #9210 Error when clicking on new message indicator * #9280 Inviting users to a MUC causes error * #9301 Error when opening service discovery window @@ -1047,7 +1047,7 @@ Gajim 1.1.0-beta1 / 1.0.99 (19 August 2018) Bug fixes - * #8658 Translation doesnt work on Windows + * #8658 Translation doesn't work on Windows * #8750 Increase time frame for duplicate search in MUCs * #9138 Translation in Flatpak does not work * #9140 Error when clicking on the notification of an incoming message @@ -1108,10 +1108,10 @@ Gajim 1.0.2 (30 April 2018) * #9055 Removing a bookmark causes error * #9057 Avatar is deleted when updating vCard * #9065 Account label isn't change in tooltip of notification area icon - * #9066 Placeholder text does't disappear + * #9066 Placeholder text doesn't disappear * #9068 Missing pulseaudio in Flatpak image * #9070 Fix History Manager search - * #9074 Proxy comobobox in accounts/connections doesn't get update after ManageProxies + * #9074 Proxy comobo-box in accounts/connections doesn't get update after ManageProxies * #9094 problem receiving file * #9101 Notification never autohides in gnome @@ -1207,7 +1207,7 @@ Gajim 0.16.6 (02 October 2016) Gajim 0.16.5 (28 December 2015) * Improve MAM implementation - * Improve security on connexion and for roster managment + * Improve security on connection and for roster management * Ability for emoticons to be sorted in menu Gajim 0.16.4 (26 September 2015) @@ -1282,7 +1282,7 @@ Gajim 0.15 (18 March 2012) * Plugin system * Whiteboard (via a plugin) * Message archiving - * Stream managment + * Stream management * IBB * Nested roster group * Roster filtrering @@ -1299,7 +1299,7 @@ Gajim 0.14.3 (19 June 2011) * Fix history viewer * Fix closing roster window - * Prevent some erros with metacontacts + * Prevent some errors with metacontacts Gajim 0.14.2 (07 June 2011) @@ -1429,7 +1429,7 @@ Gajim 0.12 (17 December 2008) * Better auto-away support * Fix banshee support * Quodlibet support - * Fix GSSAPI authentification + * Fix GSSAPI authentication * Fix IPV4 filetransfer on Windows Vista when IPV6 is used too * Fix caps usage * Fix end to end encryption autonegotiation @@ -1533,7 +1533,7 @@ Gajim 0.11.2 (22 September 2007) * Improve idle, transports support * Enable ellipsization in roster and chatwindow * Fixed some metacontacts problems (#2156, #2761) - * Beter support of XEP-0070 (Verifying HTTP Requests via XMPP) + * Better support of XEP-0070 (Verifying HTTP Requests via XMPP) * Make the same height of a banner for all chat tabs * Fix a bug with french translation and invitations (#3043) * Fix a bug with UTF-8 and emoticons @@ -1573,7 +1573,7 @@ Gajim 0.11 (19 December 2006) * Completion for "Start Chat" input dialog * Metacontacts across accounts (#1596) * Ability to have a different spellchecking language in each chat window. (#2383 and #746) - * Forbid to run multiple instances (but you can use differents profiles) + * Forbid to run multiple instances (but you can use different profiles) * Ability to save avatar with right click on avatar in chat banner * Annotations (XEP-0145) * XHTML Support @@ -1581,7 +1581,7 @@ Gajim 0.11 (19 December 2006) * Ability to operate on more than one contact at once in roster (#1514) * Send single message to a whole group * Delete a whole group - * Gajim now remembers if GPG encyption was enabled per contact + * Gajim now remembers if GPG encryption was enabled per contact * Priority can be changed automatically when we change status * Fuzzyclock support * Mute sounds from systray menu @@ -1685,7 +1685,7 @@ Gajim 0.8 (18 Aug 2005) Gajim 0.7.1 (5 Jun 2005) - * Transports icon as an option and error/mesage icon for transports + * Transports icon as an option and error/message icon for transports * Gajim is more HIG compatible * Editing registration information on transports * Messages stanza without <body> element are not printed ===================================== README.md ===================================== @@ -78,13 +78,13 @@ #### Mac #### Developing -To create a virutalenv you can execute +To create a virtualenv you can execute ./scripts/dev_env.sh Be sure all install requirements are available. -Afterwards activate the vitual environment with +Afterwards activate the virtual environment with source .venv/bin/activate ./launch.py ===================================== gajim/common/ged.py ===================================== @@ -79,7 +79,7 @@ def remove_event_handler(self, except ValueError as error: log.warning( '''Function (%s) with priority "%s" never - registered as handler of event "%s". Couldn\'t remove. + registered as handler of event "%s". Error: %s''', handler, priority, event_name, error) def raise_event(self, event_obj: ApplicationEvent) -> Any: ===================================== gajim/common/helpers.py ===================================== @@ -924,7 +924,7 @@ def parse_uri(uri: str) -> URI: data: dict[str, str] = {} try: data['addr'] = unquote(urlparts.path, errors='strict') - validate_jid(data['addr'], 'bare') # meh, good enuf + validate_jid(data['addr'], 'bare') # meh, good enough except ValueError as err: data['error'] = str(err) return URI(URIType.INVALID, uri, data=data) ===================================== gajim/gtk/preview_audio.py ===================================== @@ -186,7 +186,7 @@ def _update_duration(self, duration: float): def _setup_audio_player(self, file_path: Path) -> None: assert self._playbin is not None - # Set up the whole pipline + # Set up the whole pipeline # For reference see # https://gstreamer.freedesktop.org/ # documentation/audiofx/scaletempo.html ===================================== pyproject.toml ===================================== @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [tool.codespell] -skip = "*__pycache__*,gajim/gui,gajim/data/icons,gajim/data/sounds" +skip = "*__pycache__*,test,*.egg-info,.git,*.po,*.nsi,*.spec" ignore-words-list = "claus,pres,ser,trough" @@ -170,3 +170,11 @@ max-complexity = 15 inline-quotes = "single" docstring-quotes = "single" multiline-quotes = "single" + +[tool.isort] +force_alphabetical_sort_within_sections = true +force_single_line = true +group_by_package = true +known_typing = ["typing"] +sections = ["FUTURE", "TYPING", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"] +skip_gitignore = true ===================================== scripts/generate_ui_types.py ===================================== @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Reads all .ui files and creates builder.pyi -# Excecute this script from the repo root dir +# Execute this script from the repo root dir import logging import sys @@ -16,7 +16,7 @@ cwd = Path.cwd() if cwd.name != 'gajim': - sys.exit('Script needs to be excecuted from gajim repository ' + sys.exit('Script needs to be executed from gajim repository ' 'root directory') in_path = cwd / 'gajim' / 'data' / 'gui' ===================================== test/no_gui/test_gtk_util.py ===================================== @@ -64,7 +64,7 @@ def test_get_first_grapheme(self): self.assertEqual( get_first_grapheme(devanagari_kshi), '\u0915\u094D', 'क्षि -> क् ') # This probably won't fail on *any* locale, ever, again because the - # implementaion doesn't seem locale-specific. + # implementation doesn't seem locale-specific. if __name__ == '__main__': ===================================== test/no_gui/test_styling.py ===================================== @@ -486,7 +486,7 @@ r'somenick!user\22\26\27\2f\3a\3c\3e\5c3address(a)example.com', # https://en.wikipedia.org/wiki/E-mail_address#Internationalization_examples - # Do note that these are *e-mail* addresses and might not all be vaild JIDs. + # Do note that these are *e-mail* addresses and might not all be valid JIDs. 'Pelé(a)example.com', 'δοκιμή(a)xn--hxajbheg2az3al.xn--jxalpdlp', '我買(a)xn--hoqu73a.xn--j6w193g', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7bf5267cf22600c38500c8ac311e2ac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7bf5267cf22600c38500c8ac311e2ac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Remove obsolete script
by Philipp Hörist (＠lovetox) 02 Jan '23

02 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7bf5267c by Philipp Hörist at 2023-01-02T20:18:24+01:00 other: Remove obsolete script - - - - - 1 changed file: - − scripts/pre-push-tests.sh Changes: ===================================== scripts/pre-push-tests.sh deleted ===================================== @@ -1,18 +0,0 @@ -#!/bin/sh - -# exit when any command fails -set -e - -GREEN='\033[0;32m' - - -ruff . -echo "${GREEN}ruff: \t\t OK" - -codespell gajim -echo "${GREEN}codespell: \t OK" - -pyright -echo "${GREEN}pyright: \t OK" - -echo "${GREEN}ready to push" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7bf5267cf22600c38500c8ac311e2acb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7bf5267cf22600c38500c8ac311e2acb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Add pre-commit config
by Philipp Hörist (＠lovetox) 02 Jan '23

02 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0ef3cf9d by Philipp Hörist at 2023-01-02T20:17:19+01:00 ci: Add pre-commit config - - - - - 2 changed files: - + .pre-commit-config.yaml - CONTRIBUTING.md Changes: ===================================== .pre-commit-config.yaml ===================================== @@ -0,0 +1,17 @@ +repos: + - repo: https://github.com/charliermarsh/ruff-pre-commit + rev: v0.0.206 + hooks: + - id: ruff + + - repo: https://github.com/codespell-project/codespell + rev: v2.2.2 + hooks: + - id: codespell + additional_dependencies: + - tomli + + - repo: https://github.com/RobertCraigie/pyright-python + rev: v1.1.286 + hooks: + - id: pyright ===================================== CONTRIBUTING.md ===================================== @@ -59,6 +59,19 @@ # Commit Messages `feat: New Button which does something` +# Use pre-commit + +Execute the following inside the repositor dir + + $ pip install pre-commit + $ pre-commit install + +Now pre-commit will run various checks before code can be committed. + +To update to the newest versions + + $ pre-commit autoupdate + # Man Pages Man pages are written in markdown and converted with pandoc View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ef3cf9d5e9d4badd086fb637ede0b52… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0ef3cf9d5e9d4badd086fb637ede0b52… You're receiving this email because of your account on dev.gajim.org.

1 0

[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