Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Configpaths: Fix get_paths()
by Philipp Hörist (＠lovetox) 07 Nov '21

07 Nov '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 944ad9cc by lovetox at 2021-11-07T16:18:04+01:00 Configpaths: Fix get_paths() _paths is not a dict we can’t use values() - - - - - 5f15291a by lovetox at 2021-11-07T16:19:40+01:00 Fix dict iteration - - - - - 2 changed files: - gajim/common/configpaths.py - gajim/common/helpers.py Changes: ===================================== gajim/common/configpaths.py ===================================== @@ -53,11 +53,12 @@ def get_plugin_dirs() -> List[Path]: def get_paths(type_: PathType) -> Generator[Path, None, None]: - for value in _paths.values(): + # pylint: disable=unnecessary-dict-index-lookup + for key, value in _paths.items(): path_type = value[2] if type_ != path_type: continue - yield value + yield _paths[key] def override_path(*args, **kwargs): ===================================== gajim/common/helpers.py ===================================== @@ -569,7 +569,7 @@ def statuses_unified(): Test if all statuses are the same """ reference = None - for con, account in app.connections.items(): + for account, con in app.connections.items(): if not app.settings.get_account_setting(account, 'sync_with_global_status'): continue View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/064f77e9451f045773452b3788da778… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/064f77e9451f045773452b3788da778… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 16 commits: Remove unused variable
by Philipp Hörist (＠lovetox) 07 Nov '21

07 Nov '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5b0aa07a by lovetox at 2021-11-07T13:18:08+01:00 Remove unused variable - - - - - 26cd9331 by lovetox at 2021-11-07T13:18:35+01:00 Remove obsolete pylint code - - - - - 7f6d934d by lovetox at 2021-11-07T13:20:06+01:00 JingleSession: Remove unused method - - - - - 3d7f9a61 by lovetox at 2021-11-07T15:43:49+01:00 Application: Disable pylint check - - - - - 68ab106f by lovetox at 2021-11-07T15:43:57+01:00 Use list literal instead of list() - - - - - 226e08a1 by lovetox at 2021-11-07T15:43:57+01:00 ChatControlBase: Simplify code - - - - - b7ccba57 by lovetox at 2021-11-07T15:43:57+01:00 Remove unnecessary dict lookup - - - - - d0a03682 by lovetox at 2021-11-07T15:43:57+01:00 Simplify code - - - - - 927604f6 by lovetox at 2021-11-07T15:43:57+01:00 Remove unnecessary dict lookups - - - - - 0d4f73e5 by lovetox at 2021-11-07T15:43:57+01:00 Set encoding when reading/writing files - - - - - 707f722d by lovetox at 2021-11-07T15:43:57+01:00 Remove unnecessary dict lookups - - - - - efb14b29 by lovetox at 2021-11-07T15:43:57+01:00 Compare function with `is` operator - - - - - a6a54d49 by lovetox at 2021-11-07T15:43:57+01:00 Simplify code - - - - - e2919927 by lovetox at 2021-11-07T15:43:57+01:00 CSSConfig: Specify encoding with open() - - - - - 084daf64 by lovetox at 2021-11-07T15:43:57+01:00 Remove unnecessary dict lookups - - - - - 064f77e9 by lovetox at 2021-11-07T15:43:57+01:00 Update pylint.sh - - - - - 30 changed files: - gajim/application.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/config.py - gajim/common/configpaths.py - gajim/common/contacts.py - gajim/common/events.py - gajim/common/file_props.py - gajim/common/helpers.py - gajim/common/jingle_ftstates.py - gajim/common/jingle_session.py - gajim/common/jingle_xtls.py - gajim/common/logging_helpers.py - gajim/common/settings.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/zeroconf_avahi.py - gajim/conversation_textview.py - gajim/dev/ipython_view.py - gajim/dialogs.py - gajim/gtk/accounts.py - gajim/gtk/add_contact.py - gajim/gtk/advanced_config.py - gajim/gtk/avatar_selector.py - gajim/gtk/css_config.py - gajim/gtk/discovery.py - gajim/gtk/groupchat_invite.py - gajim/gtk/start_chat.py - gajim/gtk/status_change.py - gajim/gtk/statusicon.py - gajim/gtk/util.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/261df4ba77057204b6acd84fffd4250… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/261df4ba77057204b6acd84fffd4250… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 4 commits: Conversation: Use Gtk.TextView on Windows, else Gtk.Label
by Daniel Brötzmann (＠wurstsalat) 07 Nov '21

07 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 7f5ec638 by wurstsalat at 2021-11-07T11:39:00+01:00 Conversation: Use Gtk.TextView on Windows, else Gtk.Label - - - - - ddee44c7 by wurstsalat at 2021-11-07T12:06:20+01:00 PlainWidget: Typing - - - - - e7600d06 by wurstsalat at 2021-11-07T12:06:24+01:00 Add GtkSource4 dependency - - - - - d8cab9ad by wurstsalat at 2021-11-07T12:30:21+01:00 GroupchatControl: Improve Kick/Ban - - - - - 5 changed files: - README.md - gajim/gajim.py - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/plain_widget.py - win/_base.sh Changes: ===================================== README.md ===================================== @@ -1,12 +1,12 @@ # Welcome to Gajim - ### Runtime Requirements - python3.9 or higher - python3-gi - python3-gi-cairo - gir1.2-gtk-3.0 (>=3.22) +- gir1.2-gtksource-4 - python3-nbxmpp (>=2.99.0) - python3-openssl (>=16.2) - python3-css-parser @@ -35,7 +35,6 @@ ### Compile-time Requirements - python3-setuptools - gettext - ### Installation Procedure #### Packages @@ -86,15 +85,12 @@ #### Links - [FAQ](https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq) - [Wiki](https://dev.gajim.org/gajim/gajim/wikis/home) - - That is all, **enjoy**! (C) 2003-2021 The Gajim Team [https://gajim.org](https://gajim.org) - We use original art and parts of sounds and other art from Psi, Gossip, Gnomebaker, Gaim and some icons from various gnome-icons (mostly Dropline Etiquette) we found at art.gnome.org. If you think we're violating a license please inform us. Thank you. ===================================== gajim/gajim.py ===================================== @@ -58,6 +58,7 @@ def _check_required_deps(): gi.require_versions({'GLib': '2.0', 'Gio': '2.0', 'Gtk': '3.0', + 'GtkSource': '4', 'GObject': '2.0', 'Pango': '1.0', 'Soup': '2.4'}) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -570,16 +570,19 @@ def _on_contact_information(self, _action, param): def _on_kick(self, _action, param): nick = param.get_string() self._kick_nick = nick - self.xml.kick_label.set_text(_('Kick %s') % nick) + text = _('Kick %s') % nick + self.xml.kick_label.set_text(text) + self.xml.kick_label.set_tooltip_text(text) self.xml.kick_reason_entry.grab_focus() self.xml.kick_participant_button.grab_default() self._show_page('kick') def _on_ban(self, _action, param): jid = param.get_string() - contact = self._client.get_module('Contacts').get_contact(jid) self._ban_jid = jid - self.xml.ban_label.set_text(_('Ban %s') % contact.name) + text = _('Ban %s') % jid + self.xml.ban_label.set_text(text) + self.xml.ban_label.set_tooltip_text(text) self.xml.ban_reason_entry.grab_focus() self.xml.ban_participant_button.grab_default() self._show_page('ban') ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -12,7 +12,11 @@ # 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 Any +from typing import Dict + import logging +import os from gi.repository import Gtk from gi.repository import Pango @@ -24,6 +28,8 @@ from gajim.common.helpers import open_uri from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import parse_uri +from gajim.common.structs import URI +from gajim.common.styling import PlainBlock from gajim.gui_menu_builder import get_conv_action_context_menu from gajim.gui_menu_builder import get_conv_uri_context_menu @@ -38,26 +44,30 @@ class PlainWidget(Gtk.Box): - def __init__(self, account, selectable): + def __init__(self, account: str, selectable: bool) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) self.set_vexpand(True) self._account = account - # TODO: Window/Linux handling - # self._text_widget = MessageTextview(self._account) - self._text_widget = MessageLabel(self._account, selectable) + # We use a Gtk.Textview on Windows, since there is no support for + # rendering color fonts (Emojis) on Windows yet, see: + # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/244 + if os.name == 'nt': + self._text_widget = MessageTextview(self._account) + else: + self._text_widget = MessageLabel(self._account, selectable) self.add(self._text_widget) - def add_content(self, block): + def add_content(self, block: PlainBlock) -> None: self._text_widget.print_text_with_styling(block) - def update_text_tags(self): + def update_text_tags(self) -> None: self._text_widget.update_text_tags() class MessageLabel(Gtk.Label): - def __init__(self, account, selectable): + def __init__(self, account: str, selectable: bool) -> None: Gtk.Label.__init__(self) self.set_hexpand(True) self.set_selectable(selectable) @@ -72,7 +82,7 @@ def __init__(self, account, selectable): self.connect('populate-popup', self._on_populate_popup) - def _on_populate_popup(self, label, menu): + def _on_populate_popup(self, label: Gtk.Label, menu: Gtk.Menu) -> None: selected, start, end = label.get_selection_bounds() if not selected: menu.show_all() @@ -84,7 +94,7 @@ def _on_populate_popup(self, label, menu): menu.prepend(action_menu_item) menu.show_all() - def print_text_with_styling(self, block): + def print_text_with_styling(self, block: PlainBlock) -> None: text = GLib.markup_escape_text(block.text.strip()) for uri in block.uris: text = text.replace(uri.text, uri.get_markup_string()) @@ -97,12 +107,12 @@ def print_text_with_styling(self, block): self.set_markup(text) self.set_attributes(attr_list) - def update_text_tags(self): + def update_text_tags(self) -> None: pass class MessageTextview(Gtk.TextView): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.TextView.__init__(self) self.set_hexpand(True) self.set_margin_start(0) @@ -115,7 +125,7 @@ def __init__(self, account): self.set_cursor_visible(False) self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) - self._handlers = {} + self._handlers: Dict[str, MessageTextview] = {} id_ = self.connect('query-tooltip', self._query_tooltip) self._handlers[id_] = self @@ -127,10 +137,10 @@ def __init__(self, account): self._account = account # Used for changing the mouse pointer when hovering clickable URIs - self._cursor_changed = False + self._cursor_changed: bool = False # Keeps text selections for quoting and search actions - self._selected_text = '' + self._selected_text: str = '' self.get_style_context().add_class('gajim-conversation-text') @@ -149,7 +159,7 @@ def _on_destroy(self, *args): widget.disconnect(id_) self._handlers.clear() - def _create_url_tags(self): + def _create_url_tags(self) -> None: color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) for name in URI_TAGS: tag = self.get_buffer().create_tag(name, @@ -157,23 +167,23 @@ def _create_url_tags(self): underline=Pango.Underline.SINGLE) tag.connect('event', self._on_uri_clicked, tag) - def update_text_tags(self): + def update_text_tags(self) -> None: tag_table = self.get_buffer().get_tag_table() url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) for tag in URI_TAGS: tag_table.lookup(tag).set_property('foreground', url_color) - def clear(self): + def clear(self) -> None: buffer_ = self.get_buffer() start, end = buffer_.get_bounds() buffer_.delete(start, end) - def get_text(self): + def get_text(self) -> str: buffer_ = self.get_buffer() start, end = buffer_.get_bounds() return buffer_.get_text(start, end, False) - def print_text_with_styling(self, block): + def print_text_with_styling(self, block: PlainBlock) -> None: buffer_ = self.get_buffer() buffer_.insert(buffer_.get_start_iter(), block.text.strip()) @@ -187,7 +197,8 @@ def print_text_with_styling(self, block): end_iter = buffer_.get_iter_at_offset(uri.end) buffer_.apply_tag_by_name(uri.name, start_iter, end_iter) - def _query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): + def _query_tooltip(self, widget: Any, x_pos: int, y_pos: int, + _keyboard_mode: bool, tooltip: Gtk.Tooltip) -> bool: window = widget.get_window(Gtk.TextWindowType.TEXT) x_pos, y_pos = self.window_to_buffer_coords( Gtk.TextWindowType.TEXT, x_pos, y_pos) @@ -214,7 +225,7 @@ def _query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): self._cursor_changed = False return False - def _on_button_press(self, _widget, event): + def _on_button_press(self, _widget: Any, event: Gdk.EventButton) -> bool: ''' We don’t open the standard context menu when receiving a click on tagged text. @@ -263,7 +274,8 @@ def _on_button_press(self, _widget, event): start_sel, finish_sel, True) return False - def _on_populate_popup(self, _textview, menu): + def _on_populate_popup(self, _textview: Gtk.TextView, + menu: Gtk.Menu) -> None: ''' Overrides the default context menu. If text is selected, a submenu with actions on the selection is added. @@ -278,7 +290,9 @@ def _on_populate_popup(self, _textview, menu): menu.prepend(action_menu_item) menu.show_all() - def _on_uri_clicked(self, texttag, _widget, event, iter_, _kind): + def _on_uri_clicked(self, texttag: Gtk.TextTag, _widget: Any, + event: Gdk.Event, iter_: Gtk.TextIter, + _kind: Gtk.TextTag) -> int: if event.type != Gdk.EventType.BUTTON_PRESS: return Gdk.EVENT_PROPAGATE @@ -311,7 +325,7 @@ def _on_uri_clicked(self, texttag, _widget, event, iter_, _kind): open_uri(uri, account=self._account) return Gdk.EVENT_STOP - def _show_uri_context_menu(self, uri): + def _show_uri_context_menu(self, uri: URI) -> None: menu = get_conv_uri_context_menu(self._account, uri) if menu is None: log.warning('No handler for URI type: %s', uri) ===================================== win/_base.sh ===================================== @@ -78,6 +78,7 @@ function create_root { function install_deps { build_pacman --noconfirm -S mingw-w64-"${ARCH}"-python \ mingw-w64-"${ARCH}"-python-gobject \ + mingw-w64-"${ARCH}"-gtksourceview4 \ mingw-w64-"${ARCH}"-python-pip \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ mingw-w64-"${ARCH}"-libwebp \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/06d18602f593edabe24317447742d4a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/06d18602f593edabe24317447742d4a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Jingle: Fix undefined variable
by Philipp Hörist (＠lovetox) 07 Nov '21

07 Nov '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 261df4ba by lovetox at 2021-11-07T12:26:52+01:00 Jingle: Fix undefined variable - - - - - 1 changed file: - gajim/common/jingle_session.py Changes: ===================================== gajim/common/jingle_session.py ===================================== @@ -445,7 +445,7 @@ def __on_session_info(self, stanza, jingle, error, action): raise nbxmpp.NodeProcessed if self.state != JingleStates.ACTIVE: raise OutOfOrder - for child in payload: + for child in jingle.getChildren(): if child.getName() == 'checksum': hash_ = child.getTag('file').getTag(name='hash', namespace=Namespace.HASHES_2) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/261df4ba77057204b6acd84fffd42500… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/261df4ba77057204b6acd84fffd42500… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Annotations: Fix type annotation
by Philipp Hörist (＠lovetox) 07 Nov '21

07 Nov '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4cd78631 by lovetox at 2021-11-07T12:11:07+01:00 Annotations: Fix type annotation - - - - - 1 changed file: - gajim/common/modules/annotations.py Changes: ===================================== gajim/common/modules/annotations.py ===================================== @@ -17,11 +17,13 @@ from typing import Any from typing import Dict from typing import Tuple +from typing import Union from typing import Optional from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError from nbxmpp.structs import AnnotationNote +from nbxmpp.protocol import JID from gajim.common.types import ConnectionT from gajim.common.modules.base import BaseModule @@ -38,7 +40,7 @@ class Annotations(BaseModule): def __init__(self, con: ConnectionT) -> None: BaseModule.__init__(self, con) - self._annotations: Dict[str, AnnotationNote] = {} + self._annotations: Dict[Union[JID, str], AnnotationNote] = {} def request_annotations(self) -> None: self._nbxmpp('Annotations').request_annotations( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4cd78631e8c8f3c75549c0e6de585a6d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4cd78631e8c8f3c75549c0e6de585a6d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Docker: Install nbxmpp
by Philipp Hörist (＠lovetox) 07 Nov '21

07 Nov '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8e01ad49 by lovetox at 2021-11-07T08:10:32+01:00 Docker: Install nbxmpp - - - - - 1 changed file: - docker/requirements.txt Changes: ===================================== docker/requirements.txt ===================================== @@ -1,3 +1,4 @@ +git+https://dev.gajim.org/gajim/python-nbxmpp.git@master PyGObject mypy pylint View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e01ad4980ab78e00bca5e14b09227cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e01ad4980ab78e00bca5e14b09227cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add docker files
by Philipp Hörist (＠lovetox) 07 Nov '21

07 Nov '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: a216b54a by lovetox at 2021-11-07T08:05:06+01:00 Add docker files - - - - - 2 changed files: - + docker/Dockerfile - + docker/requirements.txt Changes: ===================================== docker/Dockerfile ===================================== @@ -0,0 +1,23 @@ +FROM python:3.9 + +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update +RUN apt-get install -y apt-utils +RUN apt-get install -y appstream-util +RUN apt-get install -y libgirepository1.0-dev +RUN apt-get install -y gir1.2-gtk-3.0 +RUN apt-get install -y gir1.2-soup-2.4 +RUN apt-get install -y gettext + +RUN adduser --disabled-password worker +WORKDIR /home/worker +ENV PATH="/home/worker/.local/bin:${PATH}" +USER worker + +RUN pip install --upgrade pip + +COPY --chown=worker:worker requirements.txt requirements.txt +RUN pip install --no-cache-dir --user -r requirements.txt + +CMD bash ===================================== docker/requirements.txt ===================================== @@ -0,0 +1,12 @@ +PyGObject +mypy +pylint +codespell +coverage +css-parser +keyring +packaging +precis-i18n +pyOpenSSL +types-pkg_resources +requests \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a216b54aed82e84ebfd3bb6a8f5c0fe7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a216b54aed82e84ebfd3bb6a8f5c0fe7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] CI: Ignore some pylint errors
by Philipp Hörist (＠lovetox) 06 Nov '21

06 Nov '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 14f22522 by lovetox at 2021-11-07T00:27:27+01:00 CI: Ignore some pylint errors - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -15,7 +15,7 @@ run-test: - pip3 install -I coverage - pip3 install -I idna - pip3 install -I precis-i18n - - python3 -m pylint nbxmpp --disable=C0103,C0201,C0301,C0326,C0330,W0201,W0212,W0221,W0231,W0233,W0621,W0622,R0201,E1101,E1135 + - python3 -m pylint nbxmpp --disable=C0103,C0201,C0209,C0301,C0326,C0330,W0201,W0212,W0221,W0231,W0233,W0621,W0622,W0707,R0201,R0801,E1101,E1135 - coverage run --source=nbxmpp -m unittest discover -v - coverage report -mi - coverage xml -i @@ -28,6 +28,7 @@ run-test: # C0103 invalid-name # C0201 consider-iterating-dictionary +# C0209 consider-using-f-string # C0301 line-too-long # C0326 bad-whitespace # C0330 bad-continuation @@ -38,7 +39,9 @@ run-test: # W0233 non-parent-init-called # W0621 redefined-outer-name # W0622 redefined-builtin +# W0707 raise-missing-from # R0201 no-self-use +# R0801 duplicate-code # E1101 no-member # E1135 unsupported-membership-test View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/14f225223ca2d47fedb92516… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/14f225223ca2d47fedb92516… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Preview Helpers: Typing
by Daniel Brötzmann (＠wurstsalat) 06 Nov '21

06 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 7770cc9c by wurstsalat at 2021-11-06T22:34:46+01:00 Preview Helpers: Typing - - - - - b4fc69f1 by wurstsalat at 2021-11-07T00:21:20+01:00 Preview Helpers: Typing - - - - - 06d18602 by wurstsalat at 2021-11-07T00:21:28+01:00 Preview: Typing - - - - - 2 changed files: - gajim/common/preview.py - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -12,17 +12,26 @@ # 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 Any +from typing import Dict +from typing import Optional +from typing import Tuple + import logging import os from pathlib import Path from urllib.parse import urlparse +from urllib.parse import ParseResult +from gi.repository import GdkPixbuf +from gi.repository import Gio from gi.repository import GLib from gi.repository import Soup from gajim.common import app from gajim.common import configpaths from gajim.common.const import MIME_TYPES +from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import load_file_async from gajim.common.helpers import write_file_async from gajim.common.helpers import get_tls_error_phrase @@ -46,7 +55,13 @@ class Preview: - def __init__(self, uri, urlparts, orig_path, thumb_path, size, widget): + def __init__(self, + uri: str, + urlparts: Optional[ParseResult], + orig_path: Optional[Path], + thumb_path: Optional[Path], + size: int, + widget: Any) -> None: self._uri = uri self._urlparts = urlparts self._filename = filename_from_uri(uri) @@ -57,41 +72,44 @@ def __init__(self, uri, urlparts, orig_path, thumb_path, size, widget): self.thumb_path = thumb_path self.size = size - self.thumbnail = None - self.mime_type = None - self.file_size = 0 + self.thumbnail: Optional[bytes] = None + self.mime_type: str = '' + self.file_size: int = 0 - self.key, self.iv = None, None - if self.is_aes_encrypted: + self.key: Optional[bytes] = None + self.iv: Optional[bytes] = None + if self.is_aes_encrypted and urlparts is not None: self.key, self.iv = parse_fragment(urlparts.fragment) @property - def is_geo_uri(self): + def is_geo_uri(self) -> bool: return self._uri.startswith('geo:') @property - def is_web_uri(self): + def is_web_uri(self) -> bool: return not self.is_geo_uri @property - def is_previewable(self): + def is_previewable(self) -> bool: return self.mime_type in PREVIEWABLE_MIME_TYPES @property - def is_audio(self): + def is_audio(self) -> bool: is_allowed = bool(self.mime_type in ALLOWED_MIME_TYPES) return is_allowed and self.mime_type.startswith('audio/') @property - def uri(self): + def uri(self) -> str: return self._uri @property - def filename(self): + def filename(self) -> str: return self._filename @property - def request_uri(self): + def request_uri(self) -> Optional[str]: + if self._urlparts is None: + return '' if self.is_aes_encrypted: # Remove fragments so we dont transmit it to the server urlparts = self._urlparts._replace(scheme='https', fragment='') @@ -99,31 +117,37 @@ def request_uri(self): return self._urlparts.geturl() @property - def is_aes_encrypted(self): + def is_aes_encrypted(self) -> bool: if self._urlparts is None: return False return self._urlparts.scheme == 'aesgcm' - def thumb_exists(self): + def thumb_exists(self) -> bool: + if self.thumb_path is None: + return False return self.thumb_path.exists() - def orig_exists(self): + def orig_exists(self) -> bool: + if self.orig_path is None: + return False return self.orig_path.exists() - def create_thumbnail(self, data): + def create_thumbnail(self, data: bytes) -> bool: self.thumbnail = create_thumbnail(data, self.size) if self.thumbnail is None: log.warning('Creating thumbnail failed for: %s', self.orig_path) return False return True - def update_widget(self, data=None): + def update_widget(self, data: Optional[GdkPixbuf.Pixbuf] = None) -> None: self._widget.update(self, data) class PreviewManager: - def __init__(self): - self._sessions = {} + def __init__(self) -> None: + self._sessions: Dict[ + str, + Tuple[Soup.Session, Optional[Gio.SimpleProxyResolver]]] = {} self._orig_dir = Path(configpaths.get('MY_DATA')) / 'downloads' self._thumb_dir = Path(configpaths.get('MY_CACHE')) / 'downloads.thumb' @@ -134,13 +158,14 @@ def __init__(self): if GLib.mkdir_with_parents(str(self._thumb_dir), 0o700) != 0: log.error('Failed to create: %s', self._thumb_dir) - def _get_session(self, account): + def _get_session(self, account: str) -> Soup.Session: if account not in self._sessions: self._sessions[account] = self._create_session(account) return self._sessions[account][0] @staticmethod - def _create_session(account): + def _create_session(account: str) -> Tuple[ + Soup.Session, Optional[Gio.SimpleProxyResolver]]: session = Soup.Session() session.add_feature_by_type(Soup.ContentSniffer) session.props.https_aliases = ['aesgcm'] @@ -156,7 +181,9 @@ def _create_session(account): return session, resolver @staticmethod - def _accept_uri(urlparts, uri, additional_data): + def _accept_uri(urlparts: ParseResult, + uri: str, + additional_data: AdditionalDataDict) -> bool: try: oob_url = additional_data['gajim']['oob_url'] except (KeyError, AttributeError): @@ -190,7 +217,9 @@ def _accept_uri(urlparts, uri, additional_data): log.info('Unsupported URI scheme: %s', uri) return False - def get_previewable(self, text, additional_data): + def get_previewable(self, + text: str, + additional_data: AdditionalDataDict) -> bool: if len(text.split(' ')) > 1: # urlparse doesn't recognise spaces as URL delimiter log.debug('Text is not an uri: %s...', text[:15]) @@ -211,7 +240,7 @@ def get_previewable(self, text, additional_data): return True - def create_preview(self, uri, widget, context): + def create_preview(self, uri: str, widget: Any, context: str) -> None: if uri.startswith('geo:'): preview = Preview(uri, None, None, None, 96, widget) preview.update_widget() @@ -238,7 +267,7 @@ def create_preview(self, uri, widget, context): self._on_thumb_load_finished, preview) - def _process_web_uri(self, uri, widget): + def _process_web_uri(self, uri: str, widget: Any) -> Preview: urlparts = urlparse(uri) size = app.settings.get('preview_size') orig_path, thumb_path = get_image_paths(uri, @@ -253,7 +282,13 @@ def _process_web_uri(self, uri, widget): size, widget) - def _on_orig_load_finished(self, data, error, preview): + def _on_orig_load_finished(self, + data: Optional[bytes], + error: Gio.AsyncResult, + preview: Preview) -> None: + if preview.thumb_path is None or preview.orig_path is None: + return + if data is None: log.error('%s: %s', preview.orig_path.name, error) return @@ -270,7 +305,12 @@ def _on_orig_load_finished(self, data, error, preview): preview.update_widget() @staticmethod - def _on_thumb_load_finished(data, error, preview): + def _on_thumb_load_finished(data: Optional[bytes], + error: Gio.AsyncResult, + preview: Preview) -> None: + if preview.thumb_path is None or preview.orig_path is None: + return + if data is None: log.error('%s: %s', preview.thumb_path.name, error) return @@ -288,7 +328,9 @@ def _on_thumb_load_finished(data, error, preview): return preview.update_widget(data=pixbuf) - def download_content(self, preview, force=False): + def download_content(self, + preview: Preview, + force: bool = False) -> None: if preview.account is None: # History Window can be opened without account context # This means we can not apply proxy settings @@ -302,7 +344,9 @@ def download_content(self, preview, force=False): session = self._get_session(preview.account) session.queue_message(message, self._on_finished, preview) - def _check_certificate(self, message, preview): + def _check_certificate(self, + message: Soup.Message, + preview: Preview) -> None: _https_used, _tls_certificate, tls_errors = message.get_https_status() if not app.settings.get('preview_verify_https'): @@ -315,7 +359,12 @@ def _check_certificate(self, message, preview): session.cancel_message(message, Soup.Status.CANCELLED) return - def _on_content_sniffed(self, message, type_, _params, preview, force): + def _on_content_sniffed(self, + message: Soup.Message, + type_: str, + _params: GLib.HashTable, + preview: Preview, + force: bool) -> None: file_size = message.props.response_headers.get_content_length() uri = message.props.uri.to_string(False) session = self._get_session(preview.account) @@ -337,7 +386,10 @@ def _on_content_sniffed(self, message, type_, _params, preview, force): preview.update_widget() - def _on_finished(self, _session, message, preview): + def _on_finished(self, + _session: Soup.Session, + message: Soup.Message, + preview: Preview) -> None: if message.status_code != Soup.Status.OK: log.warning('Download failed: %s', preview.request_uri) log.warning(Soup.Status.get_phrase(message.status_code)) @@ -349,10 +401,12 @@ def _on_finished(self, _session, message, preview): return if preview.is_aes_encrypted: - data = aes_decrypt(preview, data) + if preview.key is not None and preview.iv is not None: + data = aes_decrypt(preview.key, preview.iv, data) if preview.mime_type == 'application/octet-stream': - preview.mime_type = guess_mime_type(preview.orig_path, data) + if preview.orig_path is not None: + preview.mime_type = guess_mime_type(preview.orig_path, data) write_file_async(preview.orig_path, data, @@ -367,7 +421,12 @@ def _on_finished(self, _session, message, preview): preview) @staticmethod - def _on_orig_write_finished(_result, error, preview): + def _on_orig_write_finished(_result: bool, + error: GLib.Error, + preview: Preview) -> None: + if preview.orig_path is None: + return + if error is not None: log.error('%s: %s', preview.orig_path.name, error) return @@ -380,13 +439,21 @@ def _on_orig_write_finished(_result, error, preview): preview.update_widget() @staticmethod - def _on_thumb_write_finished(_result, error, preview): + def _on_thumb_write_finished(_result: bool, + error: GLib.Error, + preview: Preview) -> None: + if preview.thumb_path is None: + return + if error is not None: log.error('%s: %s', preview.thumb_path.name, error) return log.info('Thumbnail stored: %s ', preview.thumb_path.name) + if preview.thumbnail is None: + return + try: pixbuf = pixbuf_from_data(preview.thumbnail) except Exception as err: ===================================== gajim/common/preview_helpers.py ===================================== @@ -12,9 +12,13 @@ # 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 Any +from typing import Dict from typing import List from typing import Tuple from typing import Optional +from typing import Union + import math import logging import binascii @@ -25,6 +29,7 @@ from pathlib import Path from urllib.parse import urlparse from urllib.parse import unquote +from urllib.parse import ParseResult from gi.repository import GdkPixbuf from gi.repository import GLib @@ -45,7 +50,8 @@ Coords = namedtuple('Coords', 'location lat lon') -def resize_gif(image, output_file, resize_to): +def resize_gif(image: Image.Image, output_file: BytesIO, + resize_to: Tuple[int, int]) -> None: frames, result = extract_and_resize_frames(image, resize_to) frames[0].save(output_file, @@ -57,7 +63,7 @@ def resize_gif(image, output_file, resize_to): loop=1000) -def analyse_image(image): +def analyse_image(image: Image.Image) -> Tuple[Image.Image, Dict[str, Any]]: ''' Pre-process pass over the image to determine the mode (full or additive). Necessary as assessing single frames isn't reliable. Need to know the mode @@ -85,7 +91,8 @@ def analyse_image(image): return image, result -def extract_and_resize_frames(image, resize_to): +def extract_and_resize_frames(image: Image.Image, resize_to: Tuple[int, int] + ) -> Tuple[List[Image.Image], Dict[str, Any]]: image, result = analyse_image(image) i = 0 @@ -242,7 +249,7 @@ def pixbuf_from_data(data: bytes) -> GdkPixbuf.Pixbuf: return loader.get_pixbuf().apply_embedded_orientation() -def parse_fragment(fragment): +def parse_fragment(fragment: str) -> Tuple[bytes, bytes]: if not fragment: raise ValueError('Invalid fragment') @@ -263,7 +270,8 @@ def parse_fragment(fragment): return key, iv -def get_image_paths(uri, urlparts, size, orig_dir, thumb_dir): +def get_image_paths(uri: str, urlparts: ParseResult, size: int, orig_dir: Path, + thumb_dir: Path) -> Tuple[Path, Path]: path = Path(unquote(urlparts.path)) web_stem = path.stem extension = path.suffix @@ -327,18 +335,17 @@ def filename_from_uri(uri: str) -> str: return path.name -def aes_decrypt(preview, payload): +def aes_decrypt(key: bytes, iv: bytes, payload: bytes) -> bytes: # Use AES128 GCM with the given key and iv to decrypt the payload data = payload[:-16] tag = payload[-16:] - decryptor = Cipher( - algorithms.AES(preview.key), - GCM(preview.iv, tag=tag), - backend=default_backend()).decryptor() + decryptor = Cipher(algorithms.AES(key), + GCM(iv, tag=tag), + backend=default_backend()).decryptor() return decryptor.update(data) + decryptor.finalize() -def contains_audio_streams(file_path): +def contains_audio_streams(file_path: Path) -> bool: # Check if it is really an audio file has_audio = False discoverer = GstPbutils.Discoverer() @@ -368,14 +375,15 @@ def get_previewable_mime_types(): )) -def guess_mime_type(file_path: str, +def guess_mime_type(file_path: Union[Path, str], data: Optional[bytes] = None ) -> str: - mime_type, _ = mimetypes.MimeTypes().guess_type(str(file_path)) + file_path = str(file_path) + mime_type, _ = mimetypes.MimeTypes().guess_type(file_path) if mime_type is None: # Try to guess MIME type by file name - mime_type, _ = Gio.content_type_guess(str(file_path), data) - log.debug('Guessed MIME type: %s', str(mime_type)) + mime_type, _ = Gio.content_type_guess(file_path, data) + log.debug('Guessed MIME type: %s', mime_type) return mime_type View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f4fde9cefb69a2f5033276449216533… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f4fde9cefb69a2f5033276449216533… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] CI: Use current pylint version
by Philipp Hörist (＠lovetox) 06 Nov '21

06 Nov '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 15e39258 by lovetox at 2021-11-07T00:22:24+01:00 CI: Use current pylint version - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -11,7 +11,7 @@ run-test: - rm -rf civenv-nbxmpp - virtualenv -p python3 --system-site-packages civenv-nbxmpp - . ./civenv-nbxmpp/bin/activate - - pip3 install -I pylint==2.4.4 + - pip3 install -I pylint - pip3 install -I coverage - pip3 install -I idna - pip3 install -I precis-i18n View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/15e39258e584fcc701b751af… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/15e39258e584fcc701b751af… 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