Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][gajim_1.2] 33 commits: Remove shttp:// from the protocol list
by Philipp Hörist 20 May '20

20 May '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: 1cc68e64 by Emmanuel Gil Peyrot at 2020-05-20T23:51:39+02:00 Remove shttp:// from the protocol list This protocol never took off as https is much more secure for basically no downside (aside from running on a different port). - - - - - ce381d4c by lovetox at 2020-05-20T23:51:39+02:00 App: Add get_client() - - - - - 5d21a389 by Daniel Brötzmann at 2020-05-20T23:51:39+02:00 Start Chat: Use Start Chat instead of Add Contact - - - - - 2bf4a7e0 by Daniel Brötzmann at 2020-05-20T23:51:39+02:00 Preferences: Reintroduce merge accounts setting - - - - - 389c6b66 by lovetox at 2020-05-20T23:51:39+02:00 Remove obsolete method - - - - - 005ecdd1 by lovetox at 2020-05-20T23:51:39+02:00 RosterTooltip: Show correct account status Fixes #10100 - - - - - 0b7e2d7f by André Apitzsch at 2020-05-20T23:51:39+02:00 Contacts: Don't delete list while reading it - - - - - cfa0bacd by Emmanuel Gil Peyrot at 2020-05-20T23:51:39+02:00 Add a codespell ignore list - - - - - 007ee5d7 by Emmanuel Gil Peyrot at 2020-05-20T23:51:39+02:00 Add a CI pass for codespell This avoids future typos. - - - - - ccee6877 by Emmanuel Gil Peyrot at 2020-05-20T23:51:39+02:00 Remove � characters from emoji data - - - - - d42defc0 by Emmanuel Gil Peyrot at 2020-05-20T23:51:39+02:00 Fix typos Thanks codespell! - - - - - cdfc4da9 by André Apitzsch at 2020-05-20T23:51:39+02:00 Remove legacy cairo code - - - - - 542eb383 by André Apitzsch at 2020-05-20T23:51:39+02:00 Add shortcut for shortcuts window Follow https://gitlab.gnome.org/GNOME/Initiatives/-/issues/14 - - - - - 0465de30 by André Apitzsch at 2020-05-20T23:51:39+02:00 IPython: Simplify code IPython 6.5 is the first version that is Python 3.7 compatible. https://ipython.readthedocs.io/en/stable/whatsnew/version6.html#ipython-6-5… - - - - - b1c5b875 by Daniel Brötzmann at 2020-05-20T23:51:39+02:00 Start Chat: Introduce account badges - - - - - 5796147f by Daniel Brötzmann at 2020-05-20T23:51:39+02:00 Groupchat Invite: Use account badge - - - - - 5c70dd16 by Daniel Brötzmann at 2020-05-20T23:51:39+02:00 ChatControl: Use account badge - - - - - e7a97348 by André Apitzsch at 2020-05-20T23:51:39+02:00 Use PEP-440 compatible version comparison https://www.python.org/dev/peps/pep-0440/ - - - - - 3a092238 by André Apitzsch at 2020-05-20T23:51:39+02:00 Optparser: Support PEP-440 versions - - - - - 29b79778 by André Apitzsch at 2020-05-20T23:51:39+02:00 PluginManager: Use packaging's Version() directly - - - - - 2a7958fb by André Apitzsch at 2020-05-20T23:51:39+02:00 Optparser: Remove unneeded comparison `new_version` passed to `update_config()` corresponds to the currently running version of Gajim, i.e. it's the latest version compared to the other versions mentioned in `update_config()`, that's why the conditions `V('...') <= new_version` are always true and can be removed. - - - - - 7d77e022 by lovetox at 2020-05-20T23:51:39+02:00 Client: Unregister modules when account is disabled - - - - - af40eae7 by lovetox at 2020-05-20T23:51:39+02:00 Client: Don't create nbxmpp.Client() after cleanup() - - - - - 924cb3dd by lovetox at 2020-05-20T23:51:39+02:00 PluginManager: Remove obsolete check on handler registration - - - - - 48891270 by lovetox at 2020-05-20T23:51:39+02:00 MUCData: Add propertys - - - - - f5eb9246 by lovetox at 2020-05-20T23:51:39+02:00 Add TaskManager Adds a queue for executing background tasks For example fetching avatars or disco info - - - - - 764c7323 by lovetox at 2020-05-20T23:51:39+02:00 Caps: Use TaskManager for requesting disco info - - - - - 2a36ddfa by lovetox at 2020-05-20T23:51:39+02:00 TaskManager: Fix mypy errors - - - - - 92fad3da by lovetox at 2020-05-20T23:51:39+02:00 Update mypy.ini - - - - - 9bc2601e by lovetox at 2020-05-20T23:51:39+02:00 Update gitlab-ci.yml - - - - - 42a23852 by lovetox at 2020-05-20T23:51:39+02:00 Roster: Remove reconnect menuitem on groupchats Fixes #10106 - - - - - 926cd0e8 by lovetox at 2020-05-20T23:51:39+02:00 Remove shortcut for Accounts window - - - - - ec050632 by André Apitzsch at 2020-05-20T23:51:39+02:00 Menu: Add access keys Fixes #10074 - - - - - 30 changed files: - .gitlab-ci.yml - + codespell.conf - flatpak/org.gajim.Gajim.yaml - gajim/application.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/client.py - gajim/common/config.py - gajim/common/const.py - gajim/common/contacts.py - gajim/common/exceptions.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py - gajim/common/jingle_xtls.py - gajim/common/logger.py - gajim/common/logging_helpers.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/base.py - gajim/common/modules/bits_of_binary.py - gajim/common/modules/blocking.py - gajim/common/modules/bytestream.py - gajim/common/modules/caps.py - gajim/common/modules/chatstates.py - gajim/common/modules/entity_time.py - gajim/common/modules/httpupload.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e415869f9fecc5586115388fe51e9f7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e415869f9fecc5586115388fe51e9f7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] fix strings. Fixes #10114
by Yann Leboulanger 19 May '20

19 May '20

Yann Leboulanger pushed to branch gajim_1.2 at gajim / gajim Commits: e415869f by Yann Leboulanger at 2020-05-19T14:12:50+02:00 fix strings. Fixes #10114 - - - - - 2 changed files: - gajim/groupchat_control.py - gajim/gui_interface.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -828,8 +828,8 @@ class GroupchatControl(ChatControlBase): NewConfirmationDialog( _('Voice Request'), _('Voice Request'), - _('<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice') % ( - event.voice_request.nick, self.room_name), + _('<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice') % { + 'nick': event.voice_request.nick, 'room_name': self.room_name}, [DialogButton.make('Cancel'), DialogButton.make('Accept', text=_('_Approve'), ===================================== gajim/gui_interface.py ===================================== @@ -352,7 +352,8 @@ class Interface: jid = contact.jid NewConfirmationDialog( _('Subscription Removed'), - _('%(name)s (%(jid)s) has removed subscription from you') % (name, jid), + _('%(name)s (%(jid)s) has removed subscription from you') % { + 'name': name, 'jid': jid}, _('You will always see this contact as offline.\n' 'Do you want to remove them from your contact list?'), [DialogButton.make('Cancel', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e415869f9fecc5586115388fe51e9f78… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e415869f9fecc5586115388fe51e9f78… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix strings. Fixes #10114
by Yann Leboulanger 19 May '20

19 May '20

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 50253f80 by Yann Leboulanger at 2020-05-19T14:11:03+02:00 fix strings. Fixes #10114 - - - - - 2 changed files: - gajim/groupchat_control.py - gajim/gui_interface.py Changes: ===================================== gajim/groupchat_control.py ===================================== @@ -828,8 +828,8 @@ class GroupchatControl(ChatControlBase): NewConfirmationDialog( _('Voice Request'), _('Voice Request'), - _('<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice') % ( - event.voice_request.nick, self.room_name), + _('<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice') % { + 'nick': event.voice_request.nick, 'room_name': self.room_name}, [DialogButton.make('Cancel'), DialogButton.make('Accept', text=_('_Approve'), ===================================== gajim/gui_interface.py ===================================== @@ -352,7 +352,8 @@ class Interface: jid = contact.jid NewConfirmationDialog( _('Subscription Removed'), - _('%(name)s (%(jid)s) has removed subscription from you') % (name, jid), + _('%(name)s (%(jid)s) has removed subscription from you') % { + 'name': name, 'jid': jid}, _('You will always see this contact as offline.\n' 'Do you want to remove them from your contact list?'), [DialogButton.make('Cancel', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/50253f808ad10119538b8049d16a2576… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/50253f808ad10119538b8049d16a2576… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Menu: Add access keys
by Philipp Hörist 17 May '20

17 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ed48c0f by André Apitzsch at 2020-05-17T21:01:25+02:00 Menu: Add access keys Fixes #10074 - - - - - 1 changed file: - gajim/data/gui/application_menu.ui Changes: ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -2,95 +2,95 @@ <interface> <menu id="menubar"> <submenu> - <attribute name="label">Gajim</attribute> + <attribute name="label">_Gajim</attribute> <section> <item> - <attribute name="label" translatable="yes">Start Chat…</attribute> + <attribute name="label" translatable="yes">_Start Chat…</attribute> <attribute name="action">app.start-chat</attribute> <attribute name="target"></attribute> </item> <item> - <attribute name="label" translatable="yes">Create Group Chat…</attribute> + <attribute name="label" translatable="yes">Create _Group Chat…</attribute> <attribute name="action">app.create-groupchat</attribute> <attribute name="target"></attribute> </item> <item> - <attribute name="label" translatable="yes">History Manager</attribute> + <attribute name="label" translatable="yes">_History Manager</attribute> <attribute name="action">app.history-manager</attribute> </item> <item> - <attribute name="label" translatable="yes">Plugins</attribute> + <attribute name="label" translatable="yes">Pl_ugins</attribute> <attribute name="action">app.plugins</attribute> </item> <item> - <attribute name="label" translatable="yes">Preferences</attribute> + <attribute name="label" translatable="yes">_Preferences</attribute> <attribute name="action">app.preferences</attribute> </item> <item> - <attribute name="label" translatable="yes">Quit</attribute> + <attribute name="label" translatable="yes">_Quit</attribute> <attribute name="action">app.quit</attribute> </item> </section> </submenu> <submenu> - <attribute name="label" translatable="yes">Accounts</attribute> + <attribute name="label" translatable="yes">_Accounts</attribute> </submenu> <submenu> - <attribute name="label" translatable="yes">View</attribute> + <attribute name="label" translatable="yes">_View</attribute> <section> <item> - <attribute name="label" translatable="yes">Show Contact List</attribute> + <attribute name="label" translatable="yes">Show _Contact List</attribute> <attribute name="action">win.show-roster</attribute> </item> <item> - <attribute name="label" translatable="yes">Show Offline Contacts</attribute> + <attribute name="label" translatable="yes">Show _Offline Contacts</attribute> <attribute name="action">win.show-offline</attribute> </item> <item> - <attribute name="label" translatable="yes">Show Active Contacts</attribute> + <attribute name="label" translatable="yes">Show _Active Contacts</attribute> <attribute name="action">win.show-active</attribute> </item> <item> - <attribute name="label" translatable="yes">Show Transports</attribute> + <attribute name="label" translatable="yes">Show _Transports</attribute> <attribute name="action">win.show-transports</attribute> </item> </section> <section> <item> - <attribute name="label" translatable="yes">XML Console</attribute> + <attribute name="label" translatable="yes">_XML Console</attribute> <attribute name="action">app.xml-console</attribute> </item> <item> - <attribute name="label" translatable="yes">File Transfer</attribute> + <attribute name="label" translatable="yes">_File Transfer</attribute> <attribute name="action">app.file-transfer</attribute> </item> <item> - <attribute name="label" translatable="yes">History</attribute> + <attribute name="label" translatable="yes">_History</attribute> <attribute name="action">app.history</attribute> </item> </section> </submenu> <submenu> - <attribute name="label" translatable="yes">Help</attribute> + <attribute name="label" translatable="yes">_Help</attribute> <section> <item> - <attribute name="label" translatable="yes">Wiki (Online)</attribute> + <attribute name="label" translatable="yes">_Wiki (Online)</attribute> <attribute name="action">app.content</attribute> </item> <item> - <attribute name="label" translatable="yes">FAQ (Online)</attribute> + <attribute name="label" translatable="yes">FA_Q (Online)</attribute> <attribute name="action">app.faq</attribute> </item> <item> - <attribute name="label" translatable="yes">Keyboard Shortcuts</attribute> + <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute> <attribute name="action">app.shortcuts</attribute> </item> <item> - <attribute name="label" translatable="yes">Features</attribute> + <attribute name="label" translatable="yes">_Features</attribute> <attribute name="action">app.features</attribute> </item> <item> - <attribute name="label" translatable="yes">About</attribute> + <attribute name="label" translatable="yes">_About</attribute> <attribute name="action">app.about</attribute> </item> </section> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7ed48c0f737f72006b6a19395dee0c3f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7ed48c0f737f72006b6a19395dee0c3f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Roster: Remove reconnect menuitem on groupchats
by Philipp Hörist 17 May '20

17 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e722ac2b by lovetox at 2020-05-17T08:40:25+02:00 Roster: Remove reconnect menuitem on groupchats Fixes #10106 - - - - - 29f7b897 by lovetox at 2020-05-17T20:50:08+02:00 Remove shortcut for Accounts window - - - - - 3 changed files: - gajim/application.py - gajim/data/gui/shortcuts_window.ui - gajim/roster_window.py Changes: ===================================== gajim/application.py ===================================== @@ -554,7 +554,6 @@ class GajimApplication(Gtk.Application): 'app.file-transfer': ['<Primary>T'], 'app.ipython': ['<Primary><Alt>I'], 'app.start-chat::': ['<Primary>N'], - 'app.accounts::': ['<Alt>A'], 'app.create-groupchat::': ['<Primary>G'], 'win.show-roster': ['<Primary>R'], 'win.show-offline': ['<Primary>O'], ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -196,13 +196,6 @@ <property name="title" translatable="yes">Create new group chat</property> </object> </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><alt>a</property> - <property name="title" translatable="yes">Accounts</property> - </object> - </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> ===================================== gajim/roster_window.py ===================================== @@ -2973,15 +2973,6 @@ class RosterWindow: ctrl.leave() self.remove_groupchat(jid, account) - def on_reconnect(self, widget, jid, account): - """ - When reconnect menuitem is activated: join the room - """ - if jid in app.interface.minimized_controls[account]: - ctrl = app.interface.minimized_controls[account][jid] - app.interface.join_gc_room(account, jid, ctrl.nick, - app.gc_passwords.get(jid, '')) - def on_send_single_message_menuitem_activate(self, widget, account, contact=None): if contact is None: @@ -5121,12 +5112,6 @@ class RosterWindow: account) menu.append(rename_menuitem) - if not app.gc_connected[account].get(jid, False): - connect_menuitem = Gtk.MenuItem.new_with_mnemonic(_( - '_Reconnect')) - connect_menuitem.connect('activate', self.on_reconnect, jid, - account) - menu.append(connect_menuitem) disconnect_menuitem = Gtk.MenuItem.new_with_mnemonic(_( '_Leave')) disconnect_menuitem.connect('activate', self.on_disconnect, jid, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9b3497de13ba056dacbbbb18cc5a978… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9b3497de13ba056dacbbbb18cc5a978… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update gitlab-ci.yml
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9b3497de by lovetox at 2020-05-16T23:16:51+02:00 Update gitlab-ci.yml - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -20,7 +20,7 @@ run-tests: - mypy gajim - scripts/dev/pylint-ci.sh --jobs=2 gajim - python3 -m unittest discover -s test/no_gui -v - - codespell -I codespell.conf gajim + - codespell -I codespell.conf --skip="*__pycache__*,gajim/data/icons,gajim/data/sounds,gajim/data/emoticons" gajim - deactivate - rm -rf civenv-master View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9b3497de13ba056dacbbbb18cc5a978a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9b3497de13ba056dacbbbb18cc5a978a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: TaskManager: Fix mypy errors
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2ed2dad5 by lovetox at 2020-05-16T23:06:15+02:00 TaskManager: Fix mypy errors - - - - - fa92c548 by lovetox at 2020-05-16T23:06:22+02:00 Update mypy.ini - - - - - 2 changed files: - gajim/common/task_manager.py - mypy.ini Changes: ===================================== gajim/common/task_manager.py ===================================== @@ -30,10 +30,10 @@ class TaskManager: self._timeout = None self._queue = queue.PriorityQueue() - def _start_worker(self): + def _start_worker(self) -> None: self._timeout = GLib.timeout_add_seconds(2, self._process_queue) - def _process_queue(self): + def _process_queue(self) -> bool: log.info('%s tasks queued', self._queue.qsize()) requeue = [] while not self._queue.empty(): @@ -63,7 +63,7 @@ class TaskManager: self._timeout = None return False - def _requeue_tasks(self, tasks: List[Task]): + def _requeue_tasks(self, tasks: List[Task]) -> bool: if not tasks: return False @@ -72,7 +72,7 @@ class TaskManager: self._queue.put_nowait(task) return True - def add_task(self, task: Task): + def add_task(self, task: Task) -> None: log.info('Adding task: %r', task) self._queue.put_nowait(task) if self._timeout is None: @@ -85,20 +85,24 @@ class Task: self.priority = priority self._obsolete = False - def is_obsolete(self): + def is_obsolete(self) -> bool: return self._obsolete - def set_obsolete(self): + def set_obsolete(self) -> None: self._obsolete = True - def __lt__(self, task: Task): - return self.priority < task.priority + def __lt__(self, other: object) -> bool: + if not isinstance(other, Task): + raise NotImplementedError + return self.priority < other.priority - def __eq__(self, task: Task): - return task.priority == self.priority + def __eq__(self, other: object) -> bool: + if not isinstance(other, Task): + raise NotImplementedError + return other.priority == self.priority - def execute(self): + def execute(self) -> None: raise NotImplementedError - def preconditions_met(self): + def preconditions_met(self) -> bool: raise NotImplementedError ===================================== mypy.ini ===================================== @@ -69,3 +69,6 @@ ignore_missing_imports = True [mypy-cairo.*] ignore_missing_imports = True + +[mypy-packaging.version.*] +ignore_missing_imports = True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/afef11e81c7e31359a05440d80d9893… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/afef11e81c7e31359a05440d80d9893… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: MUCData: Add propertys
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8d5474af by lovetox at 2020-05-16T22:56:04+02:00 MUCData: Add propertys - - - - - 07a89305 by lovetox at 2020-05-16T22:56:04+02:00 Add TaskManager Adds a queue for executing background tasks For example fetching avatars or disco info - - - - - afef11e8 by lovetox at 2020-05-16T22:56:04+02:00 Caps: Use TaskManager for requesting disco info - - - - - 5 changed files: - gajim/application.py - gajim/common/app.py - gajim/common/const.py - gajim/common/modules/caps.py - + gajim/common/task_manager.py Changes: ===================================== gajim/application.py ===================================== @@ -55,6 +55,7 @@ from gajim.common import exceptions from gajim.common import logger from gajim.common.i18n import _ from gajim.common.contacts import LegacyContactsAPI +from gajim.common.task_manager import TaskManager class GajimApplication(Gtk.Application): @@ -218,6 +219,7 @@ class GajimApplication(Gtk.Application): from gajim.common.cert_store import CertificateStore app.cert_store = CertificateStore() + app.task_manager = TaskManager() # Set Application Menu app.app = self ===================================== gajim/common/app.py ===================================== @@ -131,6 +131,8 @@ proxy65_manager = None cert_store = None +task_manager = None + # zeroconf account name ZEROCONF_ACC_NAME = 'Local' ===================================== gajim/common/const.py ===================================== @@ -11,6 +11,8 @@ from gajim.common.i18n import Q_ EncryptionData = namedtuple('EncryptionData', 'additional_data') EncryptionData.__new__.__defaults__ = (None,) # type: ignore +Entity = namedtuple('Entity', 'jid node hash method') + class AvatarSize(IntEnum): TAB = 16 @@ -216,6 +218,30 @@ class MUCJoinedState(Enum): def __str__(self): return self.name + @property + def is_joined(self): + return self == MUCJoinedState.JOINED + + @property + def is_not_joined(self): + return self == MUCJoinedState.NOT_JOINED + + @property + def is_joining(self): + return self == MUCJoinedState.JOINING + + @property + def is_creating(self): + return self == MUCJoinedState.CREATING + + @property + def is_captcha_request(self): + return self == MUCJoinedState.CAPTCHA_REQUEST + + @property + def is_captcha_failed(self): + return self == MUCJoinedState.CAPTCHA_FAILED + class ClientState(IntEnum): DISCONNECTING = 0 ===================================== gajim/common/modules/caps.py ===================================== @@ -17,6 +17,9 @@ # XEP-0115: Entity Capabilities +import weakref +from collections import defaultdict + from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler from nbxmpp.structs import DiscoIdentity @@ -25,8 +28,10 @@ from nbxmpp.util import compute_caps_hash from gajim.common import app from gajim.common.const import COMMON_FEATURES +from gajim.common.const import Entity from gajim.common.helpers import get_optional_features from gajim.common.nec import NetworkEvent +from gajim.common.task_manager import Task from gajim.common.modules.base import BaseModule @@ -52,6 +57,36 @@ class Caps(BaseModule): DiscoIdentity(category='client', type='pc', name='Gajim') ] + self._queued_tasks_by_hash = defaultdict(set) + self._queued_tasks_by_jid = {} + + def _queue_task(self, task): + old_task = self._get_task(task.entity.jid) + if old_task is not None: + self._remove_task(old_task) + + self._log.info('Queue query for hash %s', task.entity.hash) + self._queued_tasks_by_hash[task.entity.hash].add(task) + self._queued_tasks_by_jid[task.entity.jid] = task + app.task_manager.add_task(task) + + def _get_task(self, jid): + return self._queued_tasks_by_jid.get(jid) + + def _get_similar_tasks(self, task): + return self._queued_tasks_by_hash.pop(task.entity.hash) + + def _remove_task(self, task): + task.set_obsolete() + del self._queued_tasks_by_jid[task.entity.jid] + self._queued_tasks_by_hash[task.entity.hash].discard(task) + + def _remove_all_tasks(self): + for task in self._queued_tasks_by_jid.values(): + task.set_obsolete() + self._queued_tasks_by_jid.clear() + self._queued_tasks_by_hash.clear() + def _entity_caps(self, _con, _stanza, properties): if properties.type.is_error or properties.type.is_unavailable: return @@ -62,57 +97,70 @@ class Caps(BaseModule): if properties.entity_caps is None: return - jid = str(properties.jid) + task = EntityCapsTask(self._account, properties, self._execute_task) - hash_method = properties.entity_caps.hash - node = properties.entity_caps.node - caps_hash = properties.entity_caps.ver + self._log.info('Received %s', task.entity) - self._log.info( - 'Received from %s, type: %s, method: %s, node: %s, hash: %s', - jid, properties.type, hash_method, node, caps_hash) - - disco_info = app.logger.get_caps_entry(hash_method, caps_hash) + disco_info = app.logger.get_caps_entry(task.entity.method, + task.entity.hash) if disco_info is None: - self._con.get_module('Discovery').disco_info( - jid, - '%s#%s' % (node, caps_hash), - callback=self._on_disco_info, - user_data=hash_method) - - else: - app.logger.set_last_disco_info(jid, disco_info, cache_only=True) - app.nec.push_incoming_event( - NetworkEvent('caps-update', - account=self._account, - fjid=jid, - jid=properties.jid.getBare())) + self._queue_task(task) + return + + jid = str(properties.jid) + app.logger.set_last_disco_info(jid, disco_info, cache_only=True) + app.nec.push_incoming_event( + NetworkEvent('caps-update', + account=self._account, + fjid=jid, + jid=properties.jid.getBare())) + + def _execute_task(self, task): + self._log.info('Request %s from %s', task.entity.hash, task.entity.jid) + self._con.get_module('Discovery').disco_info( + task.entity.jid, + node=f'{task.entity.node}#{task.entity.hash}', + callback=self._on_disco_info) + + def _on_disco_info(self, disco_info): + task = self._get_task(disco_info.jid) + if task is None: + self._log.info('Task not found for %s', disco_info.jid) + return - def _on_disco_info(self, disco_info, hash_method): if is_error_result(disco_info): + self._remove_task(task) self._log.info(disco_info) return - bare_jid = disco_info.jid.getBare() + self._log.info('Disco Info received: %s', disco_info.jid) try: compute_caps_hash(disco_info) except Exception as error: + self._remove_task(task) self._log.warning('Disco info malformed: %s %s', disco_info.jid, error) return app.logger.add_caps_entry( str(disco_info.jid), - hash_method, + task.entity.method, disco_info.get_caps_hash(), disco_info) - app.nec.push_incoming_event( - NetworkEvent('caps-update', - account=self._account, - fjid=str(disco_info.jid), - jid=bare_jid)) + self._log.info('Finished query for %s', task.entity.hash) + + tasks = self._get_similar_tasks(task) + + for task in tasks: + self._remove_task(task) + self._log.info('Update %s', task.entity.jid) + app.nec.push_incoming_event( + NetworkEvent('caps-update', + account=self._account, + fjid=str(task.entity.jid), + jid=task.entity.jid.getBare())) def update_caps(self): if not app.account_is_connected(self._account): @@ -130,6 +178,52 @@ class Caps(BaseModule): app.connections[self._account].status, app.connections[self._account].status_message) + def cleanup(self): + self._remove_all_tasks() + BaseModule.cleanup(self) + + +class EntityCapsTask(Task): + def __init__(self, account, properties, callback): + Task.__init__(self) + self._account = account + self._callback = weakref.WeakMethod(callback) + + self.entity = Entity(jid=properties.jid, + node=properties.entity_caps.node, + hash=properties.entity_caps.ver, + method=properties.entity_caps.hash) + + self._from_muc = properties.from_muc + + def execute(self): + callback = self._callback() + if callback is not None: + callback(self) + + def preconditions_met(self): + try: + client = app.get_client(self._account) + except Exception: + return False + + if self._from_muc: + muc = client.get_module('MUC').get_manager().get( + self.entity.jid.getBare()) + + if muc is None or not muc.state.is_joined: + self.set_obsolete() + return False + return True + + return client.state.is_available + + def __repr__(self): + return f'Entity Caps ({self.entity.jid} {self.entity.hash})' + + def __hash__(self): + return hash(self.entity) + def get_instance(*args, **kwargs): return Caps(*args, **kwargs), 'Caps' ===================================== gajim/common/task_manager.py ===================================== @@ -0,0 +1,104 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import List + +import functools +import queue +import logging + +from gi.repository import GLib + +log = logging.getLogger('gajim.c.m.task_manager') + + +class TaskManager: + def __init__(self): + self._timeout = None + self._queue = queue.PriorityQueue() + + def _start_worker(self): + self._timeout = GLib.timeout_add_seconds(2, self._process_queue) + + def _process_queue(self): + log.info('%s tasks queued', self._queue.qsize()) + requeue = [] + while not self._queue.empty(): + task = self._queue.get_nowait() + if task.is_obsolete(): + log.info('Task obsolete: %r', task) + continue + + if not task.preconditions_met(): + if task.is_obsolete(): + log.info('Task obsolete: %r', task) + else: + requeue.append(task) + continue + + log.info('Execute task %r', task) + task.execute() + self._requeue_tasks(requeue) + return True + + if self._requeue_tasks(requeue): + # Queue is empty, but there are tasks to requeue + # don't stop worker + return True + + # Queue is empty, stop worker + self._timeout = None + return False + + def _requeue_tasks(self, tasks: List[Task]): + if not tasks: + return False + + for task in tasks: + log.info('Requeue task (preconditions not met): %r', task) + self._queue.put_nowait(task) + return True + + def add_task(self, task: Task): + log.info('Adding task: %r', task) + self._queue.put_nowait(task) + if self._timeout is None: + self._start_worker() + + +(a)functools.total_ordering +class Task: + def __init__(self, priority: int = 0): + self.priority = priority + self._obsolete = False + + def is_obsolete(self): + return self._obsolete + + def set_obsolete(self): + self._obsolete = True + + def __lt__(self, task: Task): + return self.priority < task.priority + + def __eq__(self, task: Task): + return task.priority == self.priority + + def execute(self): + raise NotImplementedError + + def preconditions_met(self): + raise NotImplementedError View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fdfb0864ffc169712d9a8bd5d63e4e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fdfb0864ffc169712d9a8bd5d63e4e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Client: Unregister modules when account is disabled
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: dce40846 by lovetox at 2020-05-16T17:50:30+02:00 Client: Unregister modules when account is disabled - - - - - fbd65d79 by lovetox at 2020-05-16T17:50:30+02:00 Client: Don't create nbxmpp.Client() after cleanup() - - - - - fdfb0864 by lovetox at 2020-05-16T17:50:30+02:00 PluginManager: Remove obsolete check on handler registration - - - - - 2 changed files: - gajim/common/client.py - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/common/client.py ===================================== @@ -57,7 +57,6 @@ class Client(ConnectionHandlers): self.password = None self._priority = 0 - self.handlers_registered = False self._connect_machine_calls = 0 self.avatar_conversion = False self.addressing_supported = False @@ -77,9 +76,10 @@ class Client(ConnectionHandlers): self._ssl_errors = set() + self._destroyed = False + self.available_transports = {} - # Register all modules modules.register_modules(self) self._create_client() @@ -121,6 +121,16 @@ class Client(ConnectionHandlers): self._remove_account = value def _create_client(self): + if self._destroyed: + # If we disable an account cleanup() is called and all + # modules are unregistered. Because disable_account() does not wait + # for the client to properly disconnect, handlers of the + # nbxmpp.Client() are emitted after we called cleanup(). + # After nbxmpp.Client() disconnects and is destroyed we create a + # new instance with this method but modules.get_handlers() fails + # because modules are already unregistered. + # TODO: Make this nicer + return log.info('Create new nbxmpp client') self._client = NBXMPPClient(log_context=self._account) self.connection = self._client @@ -162,7 +172,8 @@ class Client(ConnectionHandlers): self._client.subscribe('stanza-sent', self._on_stanza_sent) self._client.subscribe('stanza-received', self._on_stanza_received) - self._register_new_handlers() + for handler in modules.get_handlers(self): + self._client.register_handler(handler) def process_ssl_errors(self): if not self._ssl_errors: @@ -372,11 +383,6 @@ class Client(ConnectionHandlers): app.nec.push_incoming_event( OurShowEvent(None, conn=self, show=show)) - def _register_new_handlers(self): - for handler in modules.get_handlers(self): - self._client.register_handler(handler) - self.handlers_registered = True - def get_module(self, name): return modules.get(self._account, name) @@ -522,7 +528,8 @@ class Client(ConnectionHandlers): self._reconnect_timer_source = None def cleanup(self): - pass + self._destroyed = True + modules.unregister_modules(self) def quit(self, kill_core): if kill_core and self._state in (ClientState.CONNECTING, ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -406,13 +406,8 @@ class PluginManager(metaclass=Singleton): instance, name = module.get_instance(con) modules.register_single_module(con, instance, name) - # If handlers have been registered, register the - # plugin handlers. Otherwise this will be done - # automatically on connecting - # in connection_handlers._register_handlers() - if con.handlers_registered: - for handler in instance.handlers: - con.connection.register_handler(handler) + for handler in instance.handlers: + con.connection.register_handler(handler) def _unregister_modules_with_handlers(self, plugin): if not hasattr(plugin, 'modules'): @@ -422,11 +417,8 @@ class PluginManager(metaclass=Singleton): instance = con.get_module(module.name) modules.unregister_single_module(con, module.name) - # Account is still connected and handlers are registered - # So just unregister the plugin handlers - if con.handlers_registered: - for handler in instance.handlers: - con.connection.unregister_handler(handler) + for handler in instance.handlers: + con.connection.unregister_handler(handler) def activate_plugin(self, plugin): ''' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fe82e8874b5f904a5fcdc7780156e34… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fe82e8874b5f904a5fcdc7780156e34… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Use PEP-440 compatible version comparison
by Philipp Hörist 16 May '20

16 May '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: cc5ed8e2 by André Apitzsch at 2020-05-16T12:30:34+02:00 Use PEP-440 compatible version comparison https://www.python.org/dev/peps/pep-0440/ - - - - - d63a796a by André Apitzsch at 2020-05-16T12:30:34+02:00 Optparser: Support PEP-440 versions - - - - - 62ecb9ca by André Apitzsch at 2020-05-16T12:30:34+02:00 PluginManager: Use packaging's Version() directly - - - - - fe82e887 by André Apitzsch at 2020-05-16T12:57:00+02:00 Optparser: Remove unneeded comparison `new_version` passed to `update_config()` corresponds to the currently running version of Gajim, i.e. it's the latest version compared to the other versions mentioned in `update_config()`, that's why the conditions `V('...') <= new_version` are always true and can be removed. - - - - - 6 changed files: - flatpak/org.gajim.Gajim.yaml - gajim/common/helpers.py - gajim/common/optparser.py - gajim/gajim.py - gajim/plugins/pluginmanager.py - setup.cfg Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -49,6 +49,24 @@ cleanup: - '*.la' modules: + - name: python3-pyparsing + buildsystem: simple + build-commands: + - pip3 install --prefix=/app pyparsing-2.4.7-py2.py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/8a/bb/488841f56197b13700afd5658fc27… + sha256: ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b + + - name: python3-packaging + buildsystem: simple + build-commands: + - pip3 install --prefix=/app packaging-20.3-py2.py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/62/0a/34641d2bf5c917c96db0ded85ae4d… + sha256: 82f77b9bee21c1bafbf35a84905d604d5d1223801d639cf3ed140bd651c08752 + - name: python3-pycparser buildsystem: simple build-commands: ===================================== gajim/common/helpers.py ===================================== @@ -56,9 +56,9 @@ import urllib from urllib.parse import unquote from io import StringIO from datetime import datetime, timedelta -from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode from functools import wraps +from packaging.version import Version as V from nbxmpp.namespaces import Namespace from nbxmpp.const import Role ===================================== gajim/common/optparser.py ===================================== @@ -28,6 +28,7 @@ import sys import re import logging from pathlib import Path +from packaging.version import Version as V from gi.repository import Gdk from nbxmpp.util import text_to_color @@ -126,32 +127,25 @@ class OptionsParser: return True def update_config(self, old_version, new_version): - old_version_list = old_version.split('.') # convert '0.x.y' to (0, x, y) - old = [] - while old_version_list: - old.append(int(old_version_list.pop(0))) - new_version_list = new_version.split('.') - new = [] - while new_version_list: - new.append(int(new_version_list.pop(0))) - - if old < [0, 16, 4, 1] and new >= [0, 16, 4, 1]: + old = V(old_version) + + if old < V('0.16.4.1'): self.update_config_to_01641() - if old < [0, 16, 10, 1] and new >= [0, 16, 10, 1]: + if old < V('0.16.10.1'): self.update_config_to_016101() - if old < [0, 16, 10, 2] and new >= [0, 16, 10, 2]: + if old < V('0.16.10.2'): self.update_config_to_016102() - if old < [0, 16, 10, 4] and new >= [0, 16, 10, 4]: + if old < V('0.16.10.4'): self.update_config_to_016104() - if old < [0, 16, 10, 5] and new >= [0, 16, 10, 5]: + if old < V('0.16.10.5'): self.update_config_to_016105() - if old < [0, 98, 3] and new >= [0, 98, 3]: + if old < V('0.98.3'): self.update_config_to_0983() - if old < [1, 1, 93] and new >= [1, 1, 93]: + if old < V('1.1.93'): self.update_config_to_1193() - if old < [1, 1, 94] and new >= [1, 1, 94]: + if old < V('1.1.94'): self.update_config_to_1194() - if old < [1, 1, 95] and new >= [1, 1, 95]: + if old < V('1.1.95'): self.update_config_to_1195() app.config.set('version', new_version) ===================================== gajim/gajim.py ===================================== @@ -22,7 +22,7 @@ import signal import platform from ctypes import CDLL, byref, create_string_buffer from ctypes.util import find_library -from distutils.version import LooseVersion as V +from packaging.version import Version as V from gajim.common import i18n ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -29,7 +29,7 @@ import fnmatch import zipfile from shutil import rmtree, move import configparser -from pkg_resources import parse_version +from packaging.version import Version as V import gajim from gajim.common import app @@ -645,14 +645,14 @@ class PluginManager(metaclass=Singleton): continue gajim_v = gajim.__version__.split('+', 1)[0] - gajim_v_cmp = parse_version(gajim_v) + gajim_v_cmp = V(gajim_v) - if min_v and gajim_v_cmp < parse_version(min_v): + if min_v and gajim_v_cmp < V(min_v): log.warning('Plugin %s not loaded, newer version of' 'gajim required: %s < %s', elem_name, gajim_v, min_v) continue - if max_v and gajim_v_cmp > parse_version(max_v): + if max_v and gajim_v_cmp > V(max_v): log.warning('Plugin %s not loaded, plugin incompatible ' 'with current version of gajim: ' '%s > %s', elem_name, gajim_v, max_v) ===================================== setup.cfg ===================================== @@ -23,6 +23,7 @@ install_requires = css-parser keyring nbxmpp>=0.9.94 + packaging precis-i18n>=1.0.0 pyOpenSSL>=16.2 pycairo>=1.16.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59f0403f553655c4de9ba3e764019ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59f0403f553655c4de9ba3e764019ef… 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