Commits February 2020

commits@gajim.org

1 participants
7 discussions

[Git][gajim/gajim][master] 2 commits: Add dedicated connection state variable
by Philipp Hörist 03 Feb '20

03 Feb '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f4624e0 by Philipp Hörist at 2020-02-03T21:13:12+01:00 Add dedicated connection state variable - - - - - 46a00a6a by Philipp Hörist at 2020-02-03T21:51:15+01:00 Remove invisible feature - This feature stems from the single device age - Depends on deprecated Privacy Lists (XEP-0016) - No support in other clients makes it in the current multiple device world useless - Hard to maintain, prevents us to use even basic features like MUC because it would leak presence - - - - - 30 changed files: - gajim/chat_control_base.py - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/config.py - gajim/common/connection.py - gajim/common/const.py - gajim/common/contacts.py - gajim/common/dbus/logind.py - gajim/common/helpers.py - gajim/common/jingle_session.py - gajim/common/modules/bookmarks.py - gajim/common/modules/entity_time.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/modules/privacylists.py - gajim/common/modules/vcard_temp.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/data/gui/preferences_window.ui - gajim/data/gui/roster_window.ui - − gajim/data/icons/hicolor/16x16/status/dcraven-invisible.png - − gajim/data/icons/hicolor/16x16/status/gadu-invisible.png - − gajim/data/icons/hicolor/16x16/status/gnome-invisible.png - − gajim/data/icons/hicolor/16x16/status/goojim-invisible.png - − gajim/data/icons/hicolor/16x16/status/gota-invisible.png - − gajim/data/icons/hicolor/16x16/status/jabberbulb-invisible.png - − gajim/data/icons/hicolor/16x16/status/sun-invisible.png - − gajim/data/icons/hicolor/16x16/status/wroop-invisible.png - − gajim/data/icons/hicolor/32x32/status/dcraven-invisible.png - − gajim/data/icons/hicolor/32x32/status/gadu-invisible.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/adef78c5ee7fea63ea5973e63aeb45340… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/adef78c5ee7fea63ea5973e63aeb45340… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Check encryption before sending message
by Philipp Hörist 03 Feb '20

03 Feb '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 011ed972 by Philipp Hörist at 2020-02-02T22:04:43+01:00 Check encryption before sending message Check if encryption is activated for a JID before sending the message - - - - - adef78c5 by Philipp Hörist at 2020-02-02T23:21:44+01:00 Use contact instead of jid for OutgoingMessage - - - - - 12 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/helpers.py - gajim/common/modules/chatstates.py - gajim/common/modules/httpupload.py - gajim/common/modules/message.py - gajim/common/structs.py - gajim/groupchat_control.py - gajim/gtk/single_message.py - gajim/privatechat_control.py - gajim/remote_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -923,8 +923,7 @@ class ChatControl(ChatControlBase): message, xhtml=None, process_commands=True, - attention=False, - is_muc_pm=False): + attention=False): """ Send a message to contact """ @@ -945,8 +944,7 @@ class ChatControl(ChatControlBase): type_='chat', xhtml=xhtml, process_commands=process_commands, - attention=attention, - is_muc_pm=is_muc_pm) + attention=attention) def get_our_nick(self): return app.nicks[self.account] ===================================== gajim/chat_control_base.py ===================================== @@ -981,8 +981,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): resource=None, xhtml=None, process_commands=True, - attention=False, - is_muc_pm=False): + attention=False): """ Send the given message to the active tab. Doesn't return None if error """ @@ -1004,10 +1003,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.contact) message_ = OutgoingMessage(account=self.account, - jid=self.contact.jid, + contact=self.contact, message=message, type_=type_, - is_muc_pm=is_muc_pm, chatstate=chatstate, resource=resource, user_nick=self.user_nick, @@ -1016,7 +1014,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): attention=attention, correct_id=correct_id, automatic_message=False, - encryption=self.encryption, xhtml=xhtml) con.send_message(message_) ===================================== gajim/common/connection.py ===================================== @@ -58,6 +58,7 @@ from gajim.common import modules from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.nec import NetworkEvent +from gajim.common.helpers import get_encryption_method from gajim.common.connection_handlers import ConnectionHandlers from gajim.common.connection_handlers_events import OurShowEvent from gajim.common.connection_handlers_events import InformationEvent @@ -1332,13 +1333,15 @@ class Connection(CommonConnection, ConnectionHandlers): stanza = self.get_module('Message').build_message_stanza(message) message.stanza = stanza - if message.require_encryption: + + method = get_encryption_method(message.account, message.jid) + if method is not None: # TODO: Make extension point return encrypted message extension = 'encrypt' if message.is_groupchat: extension = 'gc_encrypt' - app.plugin_manager.extension_point(extension + message.encryption, + app.plugin_manager.extension_point(extension + method, self, message, self._send_message) @@ -1350,7 +1353,8 @@ class Connection(CommonConnection, ConnectionHandlers): message.set_sent_timestamp() message.message_id = self.connection.send(message.stanza) - app.nec.push_incoming_event(MessageSentEvent(None, **vars(message))) + app.nec.push_incoming_event( + MessageSentEvent(None, jid=message.jid, **vars(message))) if message.is_groupchat: return @@ -1362,13 +1366,9 @@ class Connection(CommonConnection, ConnectionHandlers): log.warning('Trying to send message while offline') return - if message.require_encryption: - raise ValueError('Encryption for multi recipient ' - 'messages not supported') - for jid in jids: message = message.copy() - message.jid = jid + message.contact = app.contacts.create_contact(jid, message.account) stanza = self.get_module('Message').build_message_stanza(message) message.stanza = stanza self._send_message(message) ===================================== gajim/common/helpers.py ===================================== @@ -27,6 +27,7 @@ from typing import Any # pylint: disable=unused-import from typing import Dict # pylint: disable=unused-import +from typing import Optional import sys import re @@ -1748,6 +1749,7 @@ def load_file_async(path, callback, user_data=None): _on_load_finished, (callback, user_data)) + def _on_load_finished(file, result, user_data): callback, user_data = user_data try: @@ -1756,3 +1758,9 @@ def _on_load_finished(file, result, user_data): callback(None, error, user_data) else: callback(contents, None, user_data) + + +def get_encryption_method(account: str, jid: str) -> Optional[str]: + config_key = '%s-%s' % (account, jid) + state = app.config.get_per('encryption', config_key, 'encryption') + return state or None ===================================== gajim/common/modules/chatstates.py ===================================== @@ -313,7 +313,7 @@ class Chatstate(BaseModule): def _send_chatstate(self, contact, chatstate): type_ = 'groupchat' if contact.is_groupchat else 'chat' message = OutgoingMessage(account=self._account, - jid=contact.jid, + contact=contact, message=None, type_=type_, chatstate=chatstate) ===================================== gajim/common/modules/httpupload.py ===================================== @@ -241,11 +241,10 @@ class HTTPUpload(BaseModule): type_ = 'groupchat' message = OutgoingMessage(account=self._account, - jid=transfer.contact.jid, + contact=transfer.contact, message=uri, type_=type_, - oob_url=uri, - encryption=transfer.encryption) + oob_url=uri) self._con.send_message(message) ===================================== gajim/common/modules/message.py ===================================== @@ -331,7 +331,7 @@ class Message(BaseModule): stanza.setReceiptRequest() # Mark Message as MUC PM - if message.is_muc_pm: + if message.contact.is_pm_contact: stanza.setTag('x', namespace=nbxmpp.NS_MUC_USER) # XEP-0085 ===================================== gajim/common/structs.py ===================================== @@ -55,11 +55,10 @@ class MUCData: class OutgoingMessage: def __init__(self, account, - jid, + contact, message, type_, subject=None, - is_muc_pm=False, chatstate=None, resource=None, user_nick=None, @@ -68,7 +67,6 @@ class OutgoingMessage: attention=None, correct_id=None, automatic_message=False, - encryption=None, oob_url=None, xhtml=None): @@ -79,7 +77,7 @@ class OutgoingMessage: raise ValueError('Trying to send message without content') self.account = account - self.jid = jid + self.contact = contact self.message = message self.type_ = type_ @@ -96,7 +94,6 @@ class OutgoingMessage: self.additional_data = AdditionalDataDict() self.subject = subject - self.is_muc_pm = is_muc_pm self.chatstate = chatstate self.resource = resource self.user_nick = user_nick @@ -105,7 +102,6 @@ class OutgoingMessage: self.attention = attention self.correct_id = correct_id self.automatic_message = automatic_message - self.encryption = encryption self.oob_url = oob_url @@ -127,7 +123,7 @@ class OutgoingMessage: def copy(self): message = OutgoingMessage(self.account, - self.jid, + self.contact, self.message, self.type_) for name, value in vars(self).items(): @@ -135,6 +131,10 @@ class OutgoingMessage: message.additional_data = self.additional_data.copy() return message + @property + def jid(self): + return self.contact.jid + @property def is_groupchat(self): return self.type_ == 'groupchat' @@ -156,10 +156,6 @@ class OutgoingMessage: def is_encrypted(self): return bool(self.additional_data.get_value('encrypted', 'name', False)) - @property - def require_encryption(self): - return bool(self.encryption) - @property def msg_iq(self): # Backwards compatibility for plugins ===================================== gajim/groupchat_control.py ===================================== @@ -1586,13 +1586,12 @@ class GroupchatControl(ChatControlBase): # Send the message message_ = OutgoingMessage(account=self.account, - jid=self.room_jid, + contact=self.contact, message=message, type_='groupchat', label=label, chatstate=chatstate, - correct_id=correct_id, - encryption=self.encryption) + correct_id=correct_id) message_.additional_data.set_value('gajim', 'xhtml', xhtml) con.send_message(message_) ===================================== gajim/gtk/single_message.py ===================================== @@ -251,7 +251,7 @@ class SingleMessageWindow(Gtk.ApplicationWindow): recipient_list.append(to_whom_jid) message = OutgoingMessage(account=self.account, - jid=None, + contact=None, message=message, type_='normal', subject=subject) ===================================== gajim/privatechat_control.py ===================================== @@ -206,8 +206,7 @@ class PrivateChatControl(ChatControl): ChatControl.send_message(self, message, xhtml=xhtml, process_commands=process_commands, - attention=attention, - is_muc_pm=True) + attention=attention) def update_ui(self): if self.gc_contact.presence.is_unavailable: ===================================== gajim/remote_control.py ===================================== @@ -509,25 +509,24 @@ class GajimRemote(Server): if not jid or not message: return False - connected_account = self._get_account_and_contact(account, jid)[0] - if connected_account: - connection = app.connections[connected_account] - sessions = connection.get_sessions(jid) - if not sessions: - connection.make_new_session(jid) - ctrl = app.interface.msg_win_mgr.search_control( - jid, connected_account) - if ctrl: - ctrl.send_message(message) - else: - message_ = OutgoingMessage(account=connected_account, - jid=jid, - message=message, - type_=type_, - control=ctrl) - connection.send_message(message_) - return True - return False + connected_account, contact = self._get_account_and_contact(account, jid) + if not connected_account or contact is None: + return False + + connection = app.connections[connected_account] + ctrl = app.interface.msg_win_mgr.search_control( + jid, connected_account) + if ctrl: + ctrl.send_message(message) + else: + message_ = OutgoingMessage(account=connected_account, + contact=contact, + message=message, + type_=type_, + subject=subject, + control=ctrl) + connection.send_message(message_) + return True def send_chat_message(self, jid, message, account): """ @@ -545,20 +544,28 @@ class GajimRemote(Server): def send_groupchat_message(self, room_jid, message, account): """ - Send 'message' to groupchat 'room_jid', using account (optional) 'account' + Send 'message' to groupchat 'room_jid', + using account (optional) 'account' """ if not room_jid or not message: return False connected_account = self._get_account_for_groupchat(account, room_jid) - if connected_account: - message_ = OutgoingMessage(account=connected_account, - jid=room_jid, - message=message, - type_='groupchat') - con = app.connections[connected_account] - con.send_message(message_) - return True - return False + if not connected_account: + return False + + contact = app.contacts.get_groupchat_contact(connected_account, + room_jid) + if contact is None: + return False + + message_ = OutgoingMessage(account=connected_account, + contact=contact, + message=message, + type_='groupchat') + con = app.connections[connected_account] + con.send_message(message_) + return True + def open_chat(self, jid, account, message): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3512e2f9c0ac9fe312695635fa64352f0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3512e2f9c0ac9fe312695635fa64352f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Set encryption attribute on HTTPUpload and Groupchat messages
by Philipp Hörist 02 Feb '20

02 Feb '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3512e2f9 by Philipp Hörist at 2020-02-02T16:58:29+01:00 Set encryption attribute on HTTPUpload and Groupchat messages This fixes an regression from the send message refactor - - - - - 2 changed files: - gajim/common/modules/httpupload.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -244,7 +244,8 @@ class HTTPUpload(BaseModule): jid=transfer.contact.jid, message=uri, type_=type_, - oob_url=uri) + oob_url=uri, + encryption=transfer.encryption) self._con.send_message(message) ===================================== gajim/groupchat_control.py ===================================== @@ -1591,7 +1591,8 @@ class GroupchatControl(ChatControlBase): type_='groupchat', label=label, chatstate=chatstate, - correct_id=correct_id) + correct_id=correct_id, + encryption=self.encryption) message_.additional_data.set_value('gajim', 'xhtml', xhtml) con.send_message(message_) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3512e2f9c0ac9fe312695635fa64352f02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3512e2f9c0ac9fe312695635fa64352f02… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Smacks: Fix parsing error text on failed resume
by Philipp Hörist 02 Feb '20

02 Feb '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 37f5d46a by Philipp Hörist at 2020-02-02T09:02:16+01:00 Smacks: Fix parsing error text on failed resume - - - - - 1 changed file: - nbxmpp/smacks.py Changes: ===================================== nbxmpp/smacks.py ===================================== @@ -270,7 +270,7 @@ class Smacks(PlugIn): stanza.getAttr('h')) self._validate_ack(stanza, self._old_uqueue) else: - for tag in stanza.getTags(): + for tag in stanza.getChildren(): if tag.getName() != 'text': log.info(tag.getName()) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/37f5d46ac7529222f15be29781… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/37f5d46ac7529222f15be29781… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: CI: allow redefinition of variables in mypy tests
by Philipp Hörist 01 Feb '20

01 Feb '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f213669 by Philipp Hörist at 2020-02-01T13:25:09+01:00 CI: allow redefinition of variables in mypy tests - - - - - 975f1b3b by Philipp Hörist at 2020-02-01T14:08:34+01:00 Bookmarks: Store bookmarks in dictonary This allows for much faster access than with a list - - - - - 3 changed files: - gajim/common/modules/bookmarks.py - gajim/gui_interface.py - mypy.ini Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -17,9 +17,13 @@ from typing import Any from typing import List from typing import Dict +from typing import Set +from typing import Tuple +from typing import Union from typing import Optional import nbxmpp +from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from nbxmpp.structs import BookmarkData from nbxmpp.const import BookmarkStoreType @@ -46,32 +50,28 @@ class Bookmarks(BaseModule): self._register_pubsub_handler(self._bookmark_2_event_received) self._conversion = False self._conversion_2 = False - self._bookmarks = [] + self._bookmarks = {} self._join_timeouts = [] self._request_in_progress = True @property - def conversion(self): + def conversion(self) -> bool: return self._conversion @property - def conversion_2(self): + def conversion_2(self) -> bool: return self._conversion_2 @property - def bookmarks(self): - return self._bookmarks - - @bookmarks.setter - def bookmarks(self, value): - self._bookmarks = value + def bookmarks(self) -> List[BookmarkData]: + return self._bookmarks.values() @property - def using_bookmark_1(self): + def using_bookmark_1(self) -> bool: return self._pubsub_support() and self.conversion @property - def using_bookmark_2(self): + def using_bookmark_2(self) -> bool: return self._pubsub_support() and self.conversion_2 @event_node(nbxmpp.NS_BOOKMARKS) @@ -91,11 +91,9 @@ class Bookmarks(BaseModule): self._log.info('Ignore update, pubsub request in progress') return - bookmarks = properties.pubsub_event.data - if bookmarks is None: - bookmarks = [] + bookmarks = self._convert_to_dict(properties.pubsub_event.data) - old_bookmarks = self._convert_to_set(self._bookmarks) + old_bookmarks = self._bookmarks.copy() self._bookmarks = bookmarks self._act_on_changed_bookmarks(old_bookmarks) app.nec.push_incoming_event( @@ -115,28 +113,22 @@ class Bookmarks(BaseModule): self._log.info('Ignore update, pubsub request in progress') return - old_bookmarks = self._convert_to_set(self._bookmarks) + old_bookmarks = self._bookmarks.copy() if properties.pubsub_event.deleted or properties.pubsub_event.purged: self._log.info('Bookmark node deleted/purged') - self._bookmarks = [] + self._bookmarks = {} elif properties.pubsub_event.retracted: jid = properties.pubsub_event.id self._log.info('Retract: %s', jid) - bookmark = self.get_bookmark_from_jid(jid) + bookmark = self._bookmarks.get(jid) if bookmark is not None: - try: - self._bookmarks.remove(bookmark) - except KeyError: - pass + self._bookmarks.pop(bookmark, None) else: new_bookmark = properties.pubsub_event.data - old_bookmark = self.get_bookmark_from_jid(new_bookmark.jid) - if old_bookmark is not None: - self._bookmarks.remove(old_bookmark) - self._bookmarks.append(new_bookmark) + self._bookmarks[new_bookmark.jid] = properties.pubsub_event.data self._act_on_changed_bookmarks(old_bookmarks) app.nec.push_incoming_event( @@ -156,8 +148,11 @@ class Bookmarks(BaseModule): self._conversion = True self._log.info('Discovered Bookmarks Conversion: %s', info.jid) - def _act_on_changed_bookmarks(self, old_bookmarks): + def _act_on_changed_bookmarks( + self, old_bookmarks: Dict[str, BookmarkData]) -> None: + new_bookmarks = self._convert_to_set(self._bookmarks) + old_bookmarks = self._convert_to_set(old_bookmarks) changed = new_bookmarks - old_bookmarks if not changed: return @@ -166,7 +161,7 @@ class Bookmarks(BaseModule): bookmarks = [] for jid in join: self._log.info('Schedule autojoin in 10s for: %s', jid) - bookmarks.append(self.get_bookmark_from_jid(jid)) + bookmarks.append(self._bookmarks.get(jid)) # If another client creates a MUC, the MUC is locked until the # configuration is finished. Give the user some time to finish # the configuration. @@ -178,23 +173,32 @@ class Bookmarks(BaseModule): # leave = [jid for jid, autojoin in changed if not autojoin] @staticmethod - def _convert_to_set(bookmarks): + def _convert_to_set( + bookmarks: Dict[str, BookmarkData]) -> Set[Tuple[str, bool]]: + set_ = set() - for bookmark in bookmarks: - set_.add((bookmark.jid, bookmark.autojoin)) + for jid, bookmark in bookmarks.items(): + set_.add((jid, bookmark.autojoin)) return set_ - def get_bookmark_from_jid(self, jid): - for bookmark in self._bookmarks: - if bookmark.jid == jid: - return bookmark - return None + @staticmethod + def _convert_to_dict(bookmarks: List) -> Dict[str, BookmarkData]: + _dict = {} # type: Dict[str, BookmarkData] + if bookmarks is None: + return _dict + + for bookmark in bookmarks: + _dict[bookmark.jid] = bookmark + return _dict + + def get_bookmark(self, jid: Union[str, JID]) -> BookmarkData: + return self._bookmarks.get(jid) def _pubsub_support(self) -> bool: return (self._con.get_module('PEP').supported and self._con.get_module('PubSub').publish_options) - def request_bookmarks(self): + def request_bookmarks(self) -> None: if not app.account_is_connected(self._account): return @@ -209,34 +213,34 @@ class Bookmarks(BaseModule): self._nbxmpp('Bookmarks').request_bookmarks( type_, callback=self._bookmarks_received) - def _bookmarks_received(self, bookmarks): + def _bookmarks_received(self, bookmarks: Any) -> None: if is_error_result(bookmarks): self._log.info(bookmarks) - bookmarks = [] + bookmarks = None self._request_in_progress = False - self._bookmarks = bookmarks + self._bookmarks = self._convert_to_dict(bookmarks) self.auto_join_bookmarks() app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) - def store_difference(self, bookmarks): + def store_difference(self, bookmarks: List) -> None: if self.using_bookmark_2: retract, add_or_modify = self._determine_changed_bookmarks( bookmarks, self._bookmarks) for bookmark in retract: - self.remove(str(bookmark.jid)) + self.remove(bookmark.jid) if add_or_modify: self.store_bookmarks(add_or_modify) - self._bookmarks = bookmarks + self._bookmarks = self._convert_to_dict(bookmarks) else: - self._bookmarks = bookmarks + self._bookmarks = self._convert_to_dict(bookmarks) self.store_bookmarks() - def store_bookmarks(self, bookmarks=None): + def store_bookmarks(self, bookmarks: list = None) -> None: if not app.account_is_connected(self._account): return @@ -247,13 +251,15 @@ class Bookmarks(BaseModule): if self.conversion_2: type_ = BookmarkStoreType.PUBSUB_BOOKMARK_2 - self._nbxmpp('Bookmarks').store_bookmarks(bookmarks or self._bookmarks, - type_) + if bookmarks is None: + bookmarks = self._bookmarks.values() + + self._nbxmpp('Bookmarks').store_bookmarks(bookmarks, type_) app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) - def store_bookmark(self, bookmark): + def store_bookmark(self, bookmark: BookmarkData) -> None: if not app.account_is_connected(self._account): return @@ -276,7 +282,7 @@ class Bookmarks(BaseModule): return if bookmarks is None: - bookmarks = self._bookmarks + bookmarks = self._bookmarks.values() for bookmark in bookmarks: if bookmark.autojoin: @@ -292,7 +298,7 @@ class Bookmarks(BaseModule): minimized=minimize) def modify(self, jid: str, **kwargs: Dict[str, str]) -> None: - bookmark = self.get_bookmark_from_jid(jid) + bookmark = self._bookmarks.get(jid) if bookmark is None: return @@ -301,8 +307,7 @@ class Bookmarks(BaseModule): # No change happened return self._log.info('Modify bookmark: %s %s', jid, kwargs) - self._bookmarks.remove(bookmark) - self._bookmarks.append(new_bookmark) + self._bookmarks[jid] = new_bookmark if self.using_bookmark_2: self.store_bookmark(new_bookmark) @@ -310,13 +315,13 @@ class Bookmarks(BaseModule): self.store_bookmarks() def add_or_modify(self, jid: str, **kwargs: Dict[str, str]) -> None: - bookmark = self.get_bookmark_from_jid(jid) + bookmark = self._bookmarks.get(jid) if bookmark is not None: self.modify(jid, **kwargs) return new_bookmark = BookmarkData(jid=jid, **kwargs) - self._bookmarks.append(new_bookmark) + self._bookmarks[jid] = new_bookmark self._log.info('Add new bookmark: %s', new_bookmark) if self.using_bookmark_2: @@ -324,22 +329,25 @@ class Bookmarks(BaseModule): else: self.store_bookmarks() - def remove(self, jid: str, publish: bool = True) -> None: - bookmark = self.get_bookmark_from_jid(jid) - if bookmark is None: + def remove(self, jid: JID, publish: bool = True) -> None: + removed = self._bookmarks.pop(jid, False) + if not removed: return - self._bookmarks.remove(bookmark) if publish: if self.using_bookmark_2: - self._nbxmpp('Bookmarks').retract_bookmark(jid) + self._nbxmpp('Bookmarks').retract_bookmark(str(jid)) else: self.store_bookmarks() @staticmethod - def _determine_changed_bookmarks(new_bookmarks, old_bookmarks): + def _determine_changed_bookmarks( + new_bookmarks: List[BookmarkData], + old_bookmarks: Dict[str, BookmarkData]) -> Tuple[ + List[BookmarkData], List[BookmarkData]]: + new_jids = [bookmark.jid for bookmark in new_bookmarks] new_bookmarks = set(new_bookmarks) - old_bookmarks = set(old_bookmarks) + old_bookmarks = set(old_bookmarks.values()) retract = [] add_or_modify = [] @@ -353,13 +361,13 @@ class Bookmarks(BaseModule): return retract, add_or_modify def get_name_from_bookmark(self, jid: str) -> str: - bookmark = self.get_bookmark_from_jid(jid) + bookmark = self._bookmarks.get(jid) if bookmark is None: return '' return bookmark.name def is_bookmark(self, jid: str) -> bool: - return self.get_bookmark_from_jid(jid) is not None + return jid in self._bookmarks def purge_pubsub_bookmarks(self) -> None: self._log.info('Purge/Delete Bookmarks on PubSub, ' ===================================== gajim/gui_interface.py ===================================== @@ -1462,7 +1462,7 @@ class Interface: # Fetch data from bookmarks con = app.connections[account] - bookmark = con.get_module('Bookmarks').get_bookmark_from_jid(room_jid) + bookmark = con.get_module('Bookmarks').get_bookmark(room_jid) if bookmark is not None: if bookmark.nick is not None: nick = bookmark.nick ===================================== mypy.ini ===================================== @@ -2,6 +2,7 @@ python_version = 3.5 warn_unused_configs = True disallow_incomplete_defs = True +allow_redefinition = True [mypy-nbxmpp.*] ignore_missing_imports = True View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0d0a31a4f13beedfae78eb27c1aaad7b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0d0a31a4f13beedfae78eb27c1aaad7b9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Logger: Don't time method that does not query the database
by Philipp Hörist 01 Feb '20

01 Feb '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 76090cdf by Philipp Hörist at 2020-02-01T11:28:56+01:00 Logger: Don't time method that does not query the database - - - - - 0d0a31a4 by Philipp Hörist at 2020-02-01T11:49:29+01:00 Logger: Preload avatar sha for MUCs Otherwise this becomes a bottleneck if we load many MUCs, e.g. StartChat dialog - - - - - 1 changed file: - gajim/common/logger.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -229,12 +229,14 @@ class Logger: self._cache_db_path = configpaths.get('CACHE_DB') self._disco_info_cache = {} + self._muc_avatar_sha_cache = {} self._create_databases() self._migrate_databases() self._connect_databases() self._get_jid_ids_from_db() self._fill_disco_info_cache() + self._fill_muc_avatar_sha_cache() def _create_databases(self): if os.path.isdir(self._log_db_path): @@ -1555,6 +1557,14 @@ class Logger: self._con.execute(sql, (state, account_id, jid_id, message_id)) self._timeout_commit() + @timeit + def _fill_muc_avatar_sha_cache(self): + sql = '''SELECT jid, avatar_sha FROM muc_avatars''' + rows = self._con.execute(sql).fetchall() + for row in rows: + self._muc_avatar_sha_cache[row.jid] = row.avatar_sha + log.info('%s Avatar SHA entrys loaded', len(rows)) + @timeit def set_avatar_sha(self, account_jid, jid, sha=None): """ @@ -1598,9 +1608,10 @@ class Logger: sql = 'UPDATE muc_avatars SET avatar_sha = ? WHERE jid = ?' self._con.execute(sql, (sha, jid)) + self._muc_avatar_sha_cache[jid] = sha + self._timeout_commit() - @timeit def get_muc_avatar_sha(self, jid): """ Get the avatar sha of a MUC @@ -1609,10 +1620,7 @@ class Logger: """ - sql = '''SELECT avatar_sha FROM muc_avatars WHERE jid = ?''' - row = self._con.execute(sql, (jid,)).fetchone() - if row is not None: - return row.avatar_sha + return self._muc_avatar_sha_cache.get(jid) @timeit def get_archive_infos(self, jid): @@ -1682,7 +1690,6 @@ class Logger: self._disco_info_cache[row.jid] = disco_info log.info('%s DiscoInfo entrys loaded', len(rows)) - @timeit def get_last_disco_info(self, jid, max_age=0): """ Get last disco info from jid View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e0bc8c9284f441039aa7aa2b6a0849b88… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e0bc8c9284f441039aa7aa2b6a0849b88… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Logger: Preload DiscoInfo
by Philipp Hörist 01 Feb '20

01 Feb '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e0bc8c92 by Philipp Hörist at 2020-02-01T10:30:20+01:00 Logger: Preload DiscoInfo There are times for example when we open the StartChat Dialog, where we need potentially hundreads of DiscoInfo entrys instantly. If we execute a database query for each one of them this becomes a bottleneck - - - - - 1 changed file: - gajim/common/logger.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -234,6 +234,7 @@ class Logger: self._migrate_databases() self._connect_databases() self._get_jid_ids_from_db() + self._fill_disco_info_cache() def _create_databases(self): if os.path.isdir(self._log_db_path): @@ -1670,6 +1671,17 @@ class Logger: log.info('Set message archive info: %s %s', jid, kwargs) self._timeout_commit() + @timeit + def _fill_disco_info_cache(self): + sql = '''SELECT disco_info as "disco_info [disco_info]", + jid, last_seen FROM + last_seen_disco_info''' + rows = self._con.execute(sql).fetchall() + for row in rows: + disco_info = row.disco_info._replace(timestamp=row.last_seen) + self._disco_info_cache[row.jid] = disco_info + log.info('%s DiscoInfo entrys loaded', len(rows)) + @timeit def get_last_disco_info(self, jid, max_age=0): """ @@ -1681,28 +1693,11 @@ class Logger: """ - max_timestamp = time.time() - max_age if max_age else 0 - - # Try the cache disco_info = self._disco_info_cache.get(jid) if disco_info is not None: + max_timestamp = time.time() - max_age if max_age else 0 if max_timestamp > disco_info.timestamp: return None - return disco_info - - # Try the database - sql = '''SELECT disco_info as "disco_info [disco_info]", last_seen FROM - last_seen_disco_info - WHERE jid = ?''' - row = self._con.execute(sql, (str(jid),)).fetchone() - if row is None: - return None - - if max_timestamp > row.last_seen: - return None - - disco_info = row.disco_info._replace(timestamp=row.last_seen) - self._disco_info_cache[jid] = disco_info return disco_info @timeit View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e0bc8c9284f441039aa7aa2b6a0849b88f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e0bc8c9284f441039aa7aa2b6a0849b88f… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2020