Commits April 2023

commits@gajim.org

1 participants
108 discussions

[Git][gajim/gajim][master] imprv: GroupchatDetails: Hide OMEMO page in public MUCs
by Daniel Brötzmann (＠wurstsalat) 16 Apr '23

16 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: dd257eb9 by wurstsalat at 2023-04-16T17:34:13+02:00 imprv: GroupchatDetails: Hide OMEMO page in public MUCs - - - - - 1 changed file: - gajim/gtk/groupchat_details.py Changes: ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -176,6 +176,12 @@ def _add_groupchat_settings(self) -> None: self._ui.settings_box.add(scrolled_window) def _add_groupchat_encryption(self) -> None: + if (self._contact.is_groupchat and + self._contact.muc_context == 'public'): + # OMEMO is not available for public group chats + self._switcher.set_row_visible('encryption-omemo', False) + return + self._ui.encryption_box.add( OMEMOTrustManager(self._contact.account, self._contact)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dd257eb9db85e49f113151915415b66c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dd257eb9db85e49f113151915415b66c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: GroupChatRoster: Make scrollbar the right-most widget
by Daniel Brötzmann (＠wurstsalat) 16 Apr '23

16 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ed3a18b7 by wurstsalat at 2023-04-16T17:19:34+02:00 fix: GroupChatRoster: Make scrollbar the right-most widget Fixes #11290 - - - - - 2 changed files: - gajim/data/gui/groupchat_roster.ui - gajim/data/style/gajim.css Changes: ===================================== gajim/data/gui/groupchat_roster.ui ===================================== @@ -67,6 +67,8 @@ <object class="GtkSearchEntry" id="search_entry"> <property name="visible">True</property> <property name="can-focus">True</property> + <property name="margin-start">18</property> + <property name="margin-end">18</property> <property name="primary-icon-name">edit-find-symbolic</property> <property name="primary-icon-activatable">False</property> <property name="primary-icon-sensitive">False</property> @@ -95,53 +97,56 @@ <property name="can-focus">True</property> <property name="hscrollbar-policy">never</property> <child> - <object class="GtkTreeView" id="roster_treeview"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="headers-visible">False</property> - <property name="expander-column">expander</property> - <property name="enable-search">False</property> - <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/> - <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/> - <signal name="query-tooltip" handler="_query_tooltip" swapped="no"/> - <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> + <property name="can-focus">False</property> <child> - <object class="GtkTreeViewColumn" id="contact_column"> - <property name="sizing">fixed</property> - <property name="fixed-width">210</property> - <property name="title">avatar</property> - <property name="expand">True</property> + <object class="GtkTreeView" id="roster_treeview"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="headers-visible">False</property> + <property name="expander-column">expander</property> + <property name="enable-search">False</property> + <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/> + <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/> + <signal name="query-tooltip" handler="_query_tooltip" swapped="no"/> + <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/> <child> - <object class="GtkCellRendererPixbuf" id="avatar_renderer"> - <property name="width">40</property> - <property name="ypad">3</property> - <property name="xalign">0</property> + <object class="GtkTreeViewColumn" id="contact_column"> + <property name="sizing">fixed</property> + <property name="fixed-width">210</property> + <property name="title">avatar</property> + <property name="expand">True</property> + <child> + <object class="GtkCellRendererPixbuf" id="avatar_renderer"> + <property name="width">40</property> + <property name="ypad">3</property> + <property name="xalign">0</property> + </object> + <attributes> + <attribute name="visible">2</attribute> + <attribute name="surface">0</attribute> + </attributes> + </child> + <child> + <object class="GtkCellRendererText" id="text_renderer"> + <property name="ellipsize">end</property> + </object> + <attributes> + <attribute name="markup">1</attribute> + </attributes> + </child> </object> - <attributes> - <attribute name="visible">2</attribute> - <attribute name="surface">0</attribute> - </attributes> </child> <child> - <object class="GtkCellRendererText" id="text_renderer"> - <property name="ellipsize">end</property> + <object class="GtkTreeViewColumn" id="expander"> + <property name="visible">False</property> + <property name="sizing">fixed</property> + <property name="title">expander</property> </object> - <attributes> - <attribute name="markup">1</attribute> - </attributes> </child> </object> </child> - <child> - <object class="GtkTreeViewColumn" id="expander"> - <property name="visible">False</property> - <property name="sizing">fixed</property> - <property name="title">expander</property> - </object> - </child> </object> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== @@ -989,8 +989,8 @@ .start-chat-row:not(.activatable) label { color: @insensitive_fg_color; } .start-chat-row:focus { outline: none; } /* GroupChatRoster */ +.groupchat-roster viewport { padding: 0 18px 0 18px; } .groupchat-roster treeview { padding-left: 4px; } -.groupchat-roster { padding: 0 18px 0 18px; } /* GroupchatConfig */ #GroupchatConfig stack { border-bottom: 1px solid; border-color: @borders;} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ed3a18b7bd8ddc18801bc170b7337412… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ed3a18b7bd8ddc18801bc170b7337412… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: GroupChatInviter: Don't filter by account name
by Daniel Brötzmann (＠wurstsalat) 16 Apr '23

16 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 77f2b223 by wurstsalat at 2023-04-16T16:45:34+02:00 fix: GroupChatInviter: Don't filter by account name Fixes #11474 - - - - - 1 changed file: - gajim/gtk/groupchat_inviter.py Changes: ===================================== gajim/gtk/groupchat_inviter.py ===================================== @@ -119,8 +119,6 @@ def update_jid(self, jid: str) -> None: def get_search_text(self): if self._contact is None: return str(self.jid) - if self._show_account: - return f'{self._name} {self.jid} {self._account_label}' return f'{self._name} {self.jid}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/77f2b223482b3af5e91125424134beae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/77f2b223482b3af5e91125424134beae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: ChatBanner: Use jid_to_iri for QR code
by Daniel Brötzmann (＠wurstsalat) 16 Apr '23

16 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6e3dec33 by wurstsalat at 2023-04-16T16:33:59+02:00 cfix: ChatBanner: Use jid_to_iri for QR code - - - - - 1 changed file: - gajim/gtk/chat_banner.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -37,6 +37,7 @@ from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant +from gajim.common.util.text import jid_to_iri from gajim.gtk.builder import get_builder from gajim.gtk.groupchat_voice_requests_button import VoiceRequestsButton @@ -334,7 +335,7 @@ def _update_share_box(self) -> None: def _on_share_clicked(self, _button: Gtk.Button) -> None: # Generate QR code on demand (i.e. not when switching chats) assert self._contact is not None - text = f'xmpp:{self._contact.jid}' + text = jid_to_iri(str(self._contact.jid)) if self._contact.is_groupchat: text = f'{text}?join' self._ui.qr_code_image.set_from_pixbuf(generate_qr_code(text)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e3dec332d3ac7b73a69190d1f5b88c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6e3dec332d3ac7b73a69190d1f5b88c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: cfix: OMEMO: Remove obsolete qr code message
by Daniel Brötzmann (＠wurstsalat) 16 Apr '23

16 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 293127fa by wurstsalat at 2023-04-16T15:10:03+02:00 cfix: OMEMO: Remove obsolete qr code message - - - - - b7235b5a by wurstsalat at 2023-04-16T15:10:03+02:00 cq: Satisfly linter for generated ui types - - - - - 047f5138 by wurstsalat at 2023-04-16T15:10:03+02:00 refactor: Move QR code generation to helpers - - - - - 45219590 by wurstsalat at 2023-04-16T15:10:03+02:00 imprv: ChatBanner: Add QR code for sharing JIDs Fixes #11429 - - - - - 7 changed files: - gajim/common/helpers.py - gajim/data/gui/chat_banner.ui - gajim/data/gui/omemo_trust_manager.ui - gajim/gtk/builder.pyi - gajim/gtk/chat_banner.py - gajim/gtk/omemo_trust_manager.py - scripts/generate_ui_types.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -48,6 +48,7 @@ import socket import string import sys +import tempfile import unicodedata import weakref import webbrowser @@ -61,8 +62,10 @@ from urllib.parse import urlparse import precis_i18n.codec # noqa: F401 +import qrcode from cryptography import x509 from cryptography.hazmat.backends import default_backend +from gi.repository import GdkPixbuf from gi.repository import Gio from gi.repository import GLib from gi.repository import GObject @@ -366,6 +369,22 @@ def get_contact_dict_for_account(account: str) -> dict[str, types.BareContact]: return contacts_dict +def generate_qr_code(content: str) -> GdkPixbuf.Pixbuf | None: + image_path = os.path.join( + tempfile.gettempdir(), + f'{get_random_string()}.png') + qr = qrcode.QRCode(version=None, + error_correction=qrcode.constants.ERROR_CORRECT_L, + box_size=6, + border=4) + qr.add_data(content) + qr.make(fit=True) + + img = qr.make_image(fill_color='black', back_color='white') + img.save(image_path) + return GdkPixbuf.Pixbuf.new_from_file(image_path) + + def play_sound(sound_event: str, account: Optional[str] = None, force: bool = False, ===================================== gajim/data/gui/chat_banner.ui ===================================== @@ -9,7 +9,24 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="qr_code_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="icon_size">6</property> + <style> + <class name="border"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -226,6 +243,7 @@ <property name="tooltip-text" translatable="yes">Share Contact…</property> <property name="valign">center</property> <property name="popover">share_popover</property> + <signal name="clicked" handler="_on_share_clicked" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> ===================================== gajim/data/gui/omemo_trust_manager.ui ===================================== @@ -91,25 +91,6 @@ <property name="position">3</property> </packing> </child> - <child> - <object class="GtkLabel" id="qr_dependency_missing"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">For verification via QR-Code you have to install <tt>python-qrcode</tt>.</property> - <property name="use-markup">True</property> - <property name="wrap">True</property> - <property name="max-width-chars">42</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> <style> <class name="padding-18"/> </style> ===================================== gajim/gtk/builder.pyi ===================================== @@ -187,6 +187,7 @@ class CertificateBuilder(Builder): class ChatBannerBuilder(Builder): share_popover: Gtk.Popover + qr_code_image: Gtk.Image jid_label: Gtk.Label banner_box: Gtk.Box avatar_image: Gtk.Image @@ -602,7 +603,6 @@ class OmemoTrustManagerBuilder(Builder): comparing_instructions: Gtk.Label our_fingerprint_2: Gtk.Label qr_code_image: Gtk.Image - qr_dependency_missing: Gtk.Label stack: Gtk.Stack our_fingerprint_1: Gtk.Label qr_menu_button: Gtk.MenuButton @@ -1050,9 +1050,9 @@ def get_builder(file_name: Literal['manage_sounds.ui'], widgets: list[str] = ... @overload def get_builder(file_name: Literal['message_actions_box.ui'], widgets: list[str] = ...) -> MessageActionsBoxBuilder: ... # noqa @overload -def get_builder(file_name: Literal['password_dialog.ui'], widgets: list[str] = ...) -> PasswordDialogBuilder: ... # noqa +def get_builder(file_name: Literal['omemo_trust_manager.ui'], widgets: list[str] = ...) -> OmemoTrustManagerBuilder: ... # noqa @overload -def get_builder(file_name: Literal['omemo_trust_manager.ui'], widgets: list[str] = ...) -> OmemoTrustManagerBuilder: ... #noqa +def get_builder(file_name: Literal['password_dialog.ui'], widgets: list[str] = ...) -> PasswordDialogBuilder: ... # noqa @overload def get_builder(file_name: Literal['pep_config.ui'], widgets: list[str] = ...) -> PepConfigBuilder: ... # noqa @overload ===================================== gajim/gtk/chat_banner.py ===================================== @@ -32,6 +32,7 @@ from gajim.common.events import MessageReceived from gajim.common.events import MucDiscoUpdate from gajim.common.ged import EventHelper +from gajim.common.helpers import generate_qr_code from gajim.common.i18n import _ from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact @@ -330,6 +331,14 @@ def _update_share_box(self) -> None: self._ui.share_menu_button.set_sensitive(True) self._ui.jid_label.set_text(str(self._contact.jid)) + def _on_share_clicked(self, _button: Gtk.Button) -> None: + # Generate QR code on demand (i.e. not when switching chats) + assert self._contact is not None + text = f'xmpp:{self._contact.jid}' + if self._contact.is_groupchat: + text = f'{text}?join' + self._ui.qr_code_image.set_from_pixbuf(generate_qr_code(text)) + def _on_copy_jid_clicked(self, _button: Gtk.Button) -> None: assert self._contact is not None text = f'xmpp:{self._contact.jid}' ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -23,8 +23,6 @@ import locale import logging -import os -import tempfile import time from gi.repository import GdkPixbuf @@ -38,6 +36,7 @@ from gajim.common.events import AccountConnected from gajim.common.events import AccountDisconnected from gajim.common.ged import EventHelper +from gajim.common.helpers import generate_qr_code from gajim.common.i18n import _ from gajim.common.modules.contacts import BareContact from gajim.common.omemo.util import get_fingerprint @@ -235,41 +234,22 @@ def _load_fingerprints(self, contact: types.ChatContactT) -> None: self._ui.list.add(row) @staticmethod - def _get_qrcode(jid: str, sid: int, identity_key: IdentityKeyPair) -> str: - fingerprint = get_fingerprint(identity_key) - path = os.path.join(tempfile.gettempdir(), - 'omemo_{}.png'.format(jid)) + def _get_qrcode(jid: str, + sid: int, + identity_key: IdentityKeyPair + ) -> GdkPixbuf.Pixbuf | None: + fingerprint = get_fingerprint(identity_key) ver_string = 'xmpp:{}?omemo-sid-{}={}'.format(jid, sid, fingerprint) log.debug('Verification String: %s', ver_string) - - import qrcode - qr = qrcode.QRCode(version=None, - error_correction=qrcode.constants.ERROR_CORRECT_L, - box_size=6, - border=4) - qr.add_data(ver_string) - qr.make(fit=True) - - img = qr.make_image(fill_color='black', back_color='white') - img.save(path) - return path + return generate_qr_code(ver_string) def _load_qrcode(self) -> None: - try: - client = app.get_client(self._account) - path = self._get_qrcode(client.get_own_jid().bare, - self._omemo.backend.own_device, - self._identity_key) - except ImportError: - log.exception('Failed to generate QR code') - self._ui.qr_code_image.hide() - self._ui.qr_dependency_missing.show() - else: - pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) - self._ui.qr_code_image.set_from_pixbuf(pixbuf) - self._ui.qr_code_image.show() - self._ui.qr_dependency_missing.hide() + client = app.get_client(self._account) + pixbuf = self._get_qrcode(client.get_own_jid().bare, + self._omemo.backend.own_device, + self._identity_key) + self._ui.qr_code_image.set_from_pixbuf(pixbuf) def _on_show_inactive(self, switch: Gtk.Switch, _param: Any) -> None: self._ui.list.invalidate_filter() ===================================== scripts/generate_ui_types.py ===================================== @@ -32,7 +32,6 @@ from gi.repository import Gtk from gi.repository import GtkSource - class Builder(Gtk.Builder): ... View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e7da059c9392945a14e8e93340a2714… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e7da059c9392945a14e8e93340a2714… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Scripts: Add URL pointing to additional release information to AppData
by Philipp Hörist (＠lovetox) 16 Apr '23

16 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: d11283a8 by André Apitzsch at 2023-04-16T12:42:49+00:00 chore: Scripts: Add URL pointing to additional release information to AppData - - - - - e7da059c by André Apitzsch at 2023-04-16T12:42:49+00:00 other: AppData: Add URLs to this year's releases - - - - - 2 changed files: - data/org.gajim.Gajim.appdata.xml.in - scripts/bump_version.py Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -74,12 +74,24 @@ <control>pointing</control> </recommends> <releases> - <release version="1.7.3" date="2023-04-04" /> - <release version="1.7.2" date="2023-03-11" /> - <release version="1.7.1" date="2023-02-08" /> - <release version="1.7.0" date="2023-02-03" /> - <release version="1.6.1" date="2023-01-14" /> - <release version="1.6.0" date="2023-01-07" /> + <release version="1.7.3" date="2023-04-04"> + <url>https://dev.gajim.org/gajim/gajim/-/releases/1.7.3</url> + </release> + <release version="1.7.2" date="2023-03-11"> + <url>https://dev.gajim.org/gajim/gajim/-/releases/1.7.2</url> + </release> + <release version="1.7.1" date="2023-02-08"> + <url>https://dev.gajim.org/gajim/gajim/-/releases/1.7.1</url> + </release> + <release version="1.7.0" date="2023-02-03"> + <url>https://dev.gajim.org/gajim/gajim/-/releases/1.7.0</url> + </release> + <release version="1.6.1" date="2023-01-14"> + <url>https://dev.gajim.org/gajim/gajim/-/releases/1.6.1</url> + </release> + <release version="1.6.0" date="2023-01-07"> + <url>https://dev.gajim.org/gajim/gajim/-/releases/1.6.0</url> + </release> <release version="1.5.4" date="2022-12-03" /> <release version="1.5.3" date="2022-10-31" /> <release version="1.5.2" date="2022-10-08" /> ===================================== scripts/bump_version.py ===================================== @@ -54,7 +54,10 @@ def bump_appdata(new_version: str) -> None: lines = f.readlines() date = datetime.today().strftime('%Y-%m-%d') - release_string = f' <release version="{new_version}" date="{date}" />' + release_url = 'https://dev.gajim.org/gajim/gajim/-/releases' + release_string = (f' <release version="{new_version}" date="{date}">\n' + f' <url>{release_url}/{new_version}</url>\n' + ' </release>') with APPDATA.open('w', encoding='utf8') as f: for line in lines: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fd1aa01cf56cd63f646673ed924c10d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fd1aa01cf56cd63f646673ed924c10d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Windows: Package pixbuf loaders for avif and webp
by Philipp Hörist (＠lovetox) 16 Apr '23

16 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: fd1aa01c by mjk at 2023-04-16T12:41:04+00:00 imprv: Windows: Package pixbuf loaders for avif and webp - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -92,10 +92,12 @@ function install_deps { "${MINGW_PACKAGE_PREFIX}"-farstream \ "${MINGW_PACKAGE_PREFIX}"-gspell \ "${MINGW_PACKAGE_PREFIX}"-hunspell \ + "${MINGW_PACKAGE_PREFIX}"-libavif \ "${MINGW_PACKAGE_PREFIX}"-libheif \ "${MINGW_PACKAGE_PREFIX}"-libnice \ "${MINGW_PACKAGE_PREFIX}"-libsoup3 \ "${MINGW_PACKAGE_PREFIX}"-libwebp \ + "${MINGW_PACKAGE_PREFIX}"-webp-pixbuf-loader \ "${MINGW_PACKAGE_PREFIX}"-sqlite3 PIP_REQUIREMENTS="\ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fd1aa01cf56cd63f646673ed924c10d8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fd1aa01cf56cd63f646673ed924c10d8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Display webp and avif images on Windows correctly
by Philipp Hörist (＠lovetox) 16 Apr '23

16 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5e2011fe by Philipp Hörist at 2023-04-16T13:05:47+02:00 fix: Preview: Display webp and avif images on Windows correctly - Gio.content_type_guess() returns a file extension, use Gio.content_type_get_mime_type() to get the mime type - - - - - 1 changed file: - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -450,12 +450,24 @@ def guess_mime_type(file_path: Union[Path, str], data: Optional[bytes] = None ) -> str: file_path = str(file_path) + + if not mimetypes.inited: + # On Windows both mime types are only available + # with python 3.11, so this can be removed once + # the Windows build uses python 3.11 + mimetypes.add_type('image/webp', '.webp') + mimetypes.add_type('image/avif', '.avif') + + # The mimetypes module maps extensions to mime types + # it does no guessing based on file content mime_type, _ = mimetypes.guess_type(file_path) if mime_type is None: - # Try to guess MIME type by file name - mime_type, _ = Gio.content_type_guess(file_path, data) + # Gio does also guess based on file content + extension, _ = Gio.content_type_guess(file_path, data) + mime_type = Gio.content_type_get_mime_type(extension) + log.debug('Guessed MIME type: %s', mime_type) - return mime_type + return mime_type or '' def guess_simple_file_type(file_path: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5e2011fee11237264b643e338da1b34b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5e2011fee11237264b643e338da1b34b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Remove unnecessary list() call
by Philipp Hörist (＠lovetox) 15 Apr '23

15 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 60be989f by Philipp Hörist at 2023-04-15T21:23:25+02:00 cq: Remove unnecessary list() call - - - - - 1 changed file: - gajim/common/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -226,7 +226,7 @@ def __init__(self) -> None: self._audio_stop_functions: dict[int, Callable[..., None]] = {} log.info('Supported mime types for preview') - log.info(sorted(list(PREVIEWABLE_MIME_TYPES))) + log.info(sorted(PREVIEWABLE_MIME_TYPES)) def get_preview(self, preview_id: str) -> Optional[Preview]: return self._previews.get(preview_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/60be989f5ac21fbf02e938e7f989d322… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/60be989f5ac21fbf02e938e7f989d322… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Return mime types as Set
by Philipp Hörist (＠lovetox) 15 Apr '23

15 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: e3c64a20 by Philipp Hörist at 2023-04-15T20:52:16+02:00 refactor: Return mime types as Set - - - - - 40928818 by Philipp Hörist at 2023-04-15T20:55:49+02:00 new: Preview: Add more logging - - - - - 2 changed files: - gajim/common/preview.py - gajim/common/preview_helpers.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -225,6 +225,9 @@ def __init__(self) -> None: # to stop previews by preview_id, see stop_audio_except(preview_id) self._audio_stop_functions: dict[int, Callable[..., None]] = {} + log.info('Supported mime types for preview') + log.info(sorted(list(PREVIEWABLE_MIME_TYPES))) + def get_preview(self, preview_id: str) -> Optional[Preview]: return self._previews.get(preview_id) @@ -280,6 +283,7 @@ def _accept_uri(urlparts: ParseResult, if app.settings.get('preview_allow_all_images'): mime_type = guess_mime_type(uri) if mime_type not in MIME_TYPES: + log.info('%s not in allowed mime types', mime_type) return False if mime_type == 'application/octet-stream' and uri != oob_url: ===================================== gajim/common/preview_helpers.py ===================================== @@ -430,7 +430,7 @@ def contains_audio_streams(file_path: Path) -> bool: return has_audio -def get_previewable_mime_types() -> tuple[str, ...]: +def get_previewable_mime_types() -> set[str]: previewable_mime_types: set[str] = set() for fmt in GdkPixbuf.Pixbuf.get_formats(): for mime_type in fmt.get_mime_types(): @@ -440,7 +440,7 @@ def get_previewable_mime_types() -> tuple[str, ...]: for mime_type in Image.MIME.values(): previewable_mime_types.add(mime_type.lower()) - return tuple(filter( + return set(filter( lambda mime_type: mime_type.startswith('image'), previewable_mime_types )) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/810b48a89d5644c554eff9a640b1605… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/810b48a89d5644c554eff9a640b1605… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2023