Commits December 2021

commits@gajim.org

1 participants
197 discussions

[Git][gajim/gajim][master] Fix pylint errors
by Philipp Hörist (＠lovetox) 15 Dec '21

15 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0f479459 by lovetox at 2021-12-15T23:04:07+01:00 Fix pylint errors - - - - - 2 changed files: - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -62,7 +62,6 @@ def _add_action_phrase(self, text: str, nickname: str): widget = PlainWidget(self._account, self._selectable) widget.add_action_phrase(text, nickname) self.add(widget) - return def add_content(self, content: ContentT) -> None: self.clear() ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -39,7 +39,6 @@ from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string -from gajim.common.styling import ParsingResult from gajim.common.i18n import _ from gajim.common.i18n import Q_ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f479459a66bb2503571a94d6edce842… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f479459a66bb2503571a94d6edce842… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add back styling of /me command
by Philipp Hörist (＠lovetox) 15 Dec '21

15 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: e3fd830a by lovetox at 2021-12-15T22:59:29+01:00 Add back styling of /me command - - - - - 4 changed files: - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -15,6 +15,7 @@ from __future__ import annotations from typing import Any +from typing import Optional from typing import Union from typing import cast @@ -46,10 +47,23 @@ def get_content(self) -> ContentT: def get_text(self) -> str: return self._content.text - def add_with_styling(self, text: str) -> None: + def add_with_styling(self, + text: str, + nickname: Optional[str] = None) -> None: + + if text.startswith('/me') and nickname is not None: + self._add_action_phrase(text, nickname) + return + result = process(text) self.add_content(result) + def _add_action_phrase(self, text: str, nickname: str): + widget = PlainWidget(self._account, self._selectable) + widget.add_action_phrase(text, nickname) + self.add(widget) + return + def add_content(self, content: ContentT) -> None: self.clear() self._content = content ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -62,6 +62,11 @@ def __init__(self, account: str, selectable: bool) -> None: def add_content(self, block: PlainBlock) -> None: self._text_widget.print_text_with_styling(block) + def add_action_phrase(self, text: str, nickname: str) -> None: + text = text.replace('/me', '* %s' % nickname, 1) + text = GLib.markup_escape_text(text) + self._text_widget.add_action_phrase(text) + def update_text_tags(self) -> None: self._text_widget.update_text_tags() @@ -107,6 +112,9 @@ def print_text_with_styling(self, block: PlainBlock) -> None: self.set_markup(text) self.set_attributes(make_pango_attributes(block)) + def add_action_phrase(self, text: str) -> None: + self.set_markup(f'<i>{text}</i>') + def update_text_tags(self) -> None: pass @@ -197,6 +205,14 @@ def print_text_with_styling(self, block: PlainBlock) -> None: end_iter = buffer_.get_iter_at_offset(uri.end) buffer_.apply_tag_by_name(uri.name, start_iter, end_iter) + def add_action_phrase(self, text: str) -> None: + buffer_ = self.get_buffer() + buffer_.insert(buffer_.get_start_iter(), text.strip()) + + start_iter = buffer_.get_start_iter() + end_iter = buffer_.get_end_iter() + buffer_.apply_tag_by_name('emphasis', start_iter, end_iter) + def _query_tooltip(self, widget: Any, x_pos: int, y_pos: int, _keyboard_mode: bool, tooltip: Gtk.Tooltip) -> bool: window = widget.get_window(Gtk.TextWindowType.TEXT) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -110,12 +110,12 @@ def __init__(self, text, self._message_widget, context) else: self._message_widget = MessageWidget(account) - self._message_widget.add_with_styling(text) + self._message_widget.add_with_styling(text, nickname=name) if self._is_groupchat: our_nick = get_group_chat_nick( self._account, self._contact.jid) if name != our_nick: - self._check_for_highlight(self._message_widget.content) + self._check_for_highlight(text) if self._is_groupchat: our_nick = get_group_chat_nick(self._account, self._contact.jid) @@ -211,9 +211,9 @@ def update_text_tags(self) -> None: if isinstance(self._message_widget, MessageWidget): self._message_widget.update_text_tags() - def _check_for_highlight(self, content: ParsingResult) -> None: + def _check_for_highlight(self, text: str) -> None: needs_highlight = message_needs_highlight( - content.text, + text, self._contact.nickname, self._client.get_own_jid().bare) if needs_highlight: ===================================== gajim/gtk/search_view.py ===================================== @@ -360,7 +360,7 @@ def __init__(self, msg: namedtuple, account: str, jid: JID) -> None: self._ui.row_time_label.set_label(date) message_widget = MessageWidget(account, selectable=False) - message_widget.add_with_styling(msg.message_widget) + message_widget.add_with_styling(msg.message, nickname=contact_name) self._ui.result_row_grid.attach(message_widget, 1, 1, 2, 1) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3fd830ab8f2aee912e3894361d303fe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3fd830ab8f2aee912e3894361d303fe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageWidget: Move process code into widget
by Philipp Hörist (＠lovetox) 15 Dec '21

15 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: e2cf6aa4 by lovetox at 2021-12-15T21:49:14+01:00 MessageWidget: Move process code into widget - - - - - 5 changed files: - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/muc_subject.py - gajim/gtk/conversation/rows/muc_user_status.py - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -12,28 +12,45 @@ # 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 Any +from typing import Union +from typing import cast + from gi.repository import Gtk +from gajim.common.styling import process +from gajim.common.styling import ParsingResult +from gajim.common.styling import QuoteBlock + from .code_widget import CodeWidget from .quote_widget import QuoteWidget from .plain_widget import PlainWidget +ContentT = Union[ParsingResult, QuoteBlock] + + class MessageWidget(Gtk.Box): def __init__(self, account: str, selectable: bool = True) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) self._account = account self._selectable = selectable - self._content = None + self._content = cast(ContentT, None) - def get_content(self): + def get_content(self) -> ContentT: return self._content - def get_text(self): + def get_text(self) -> str: return self._content.text - def add_content(self, content): + def add_with_styling(self, text: str) -> None: + result = process(text) + self.add_content(result) + + def add_content(self, content: ContentT) -> None: self.clear() self._content = content for block in content.blocks: @@ -62,7 +79,7 @@ def add_content(self, content): def clear(self) -> None: self.foreach(self.remove) - def update_text_tags(self, *args): + def update_text_tags(self, *args: Any) -> None: for widget in self.get_children(): if not isinstance(widget, CodeWidget): widget.update_text_tags() ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -39,7 +39,6 @@ from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string -from gajim.common.styling import process from gajim.common.styling import ParsingResult from gajim.common.i18n import _ from gajim.common.i18n import Q_ @@ -110,14 +109,13 @@ def __init__(self, app.interface.preview_manager.create_preview( text, self._message_widget, context) else: - result = process(text) self._message_widget = MessageWidget(account) - self._message_widget.add_content(result) + self._message_widget.add_with_styling(text) if self._is_groupchat: our_nick = get_group_chat_nick( self._account, self._contact.jid) if name != our_nick: - self._check_for_highlight(result) + self._check_for_highlight(self._message_widget.content) if self._is_groupchat: our_nick = get_group_chat_nick(self._account, self._contact.jid) @@ -353,12 +351,11 @@ def set_displayed(self): self._has_displayed = True def set_retracted(self, text: str) -> None: - self._message_widget.add_content(process(text)) + self._message_widget.add_with_styling(text) self.get_style_context().add_class('retracted-message') def set_correction(self, text: str) -> None: - result = process(text) - self._message_widget.add_content(result) + self._message_widget.add_with_styling(text) self._has_receipt = False self._message_icons.set_receipt_icon_visible(False) ===================================== gajim/gtk/conversation/rows/muc_subject.py ===================================== @@ -19,7 +19,6 @@ from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from gajim.common.styling import process from .base import BaseRow from ..message_widget import MessageWidget @@ -57,9 +56,8 @@ def __init__(self, account: str, text: str, nick: str, date: str) -> None: meta.get_style_context().add_class('small-label') subject_box.add(meta) - result = process(text) message_widget = MessageWidget(account) - message_widget.add_content(result) + message_widget.add_with_styling(text) subject_box.add(message_widget) self.grid.attach(subject_box, 1, 0, 1, 1) ===================================== gajim/gtk/conversation/rows/muc_user_status.py ===================================== @@ -21,7 +21,6 @@ from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim.common.helpers import get_uf_show -from gajim.common.styling import process from .widgets import SimpleLabel from .base import BaseRow @@ -60,10 +59,9 @@ def __init__(self, account: str, user_contact: GroupchatParticipant, self.grid.attach(self._label, 2, 0, 1, 1) if user_contact.status is not None: - result = process(user_contact.status) message_widget = MessageWidget(account) message_widget.get_style_context().add_class('gajim-status-message') - message_widget.add_content(result) + message_widget.add_with_styling(user_contact.status) self.grid.attach(message_widget, 2, 1, 1, 1) timestamp_widget = self.create_timestamp_widget(self.timestamp) ===================================== gajim/gtk/search_view.py ===================================== @@ -35,7 +35,6 @@ from gajim.common.const import KindConstant from gajim.common.const import FILE_CATEGORIES from gajim.common.i18n import _ -from gajim.common.styling import process from .conversation.message_widget import MessageWidget from .util import get_builder @@ -361,9 +360,8 @@ def __init__(self, msg: namedtuple, account: str, jid: JID) -> None: self._ui.row_time_label.set_label(date) message_widget = MessageWidget(account, selectable=False) + message_widget.add_with_styling(msg.message_widget) self._ui.result_row_grid.attach(message_widget, 1, 1, 2, 1) - result = process(msg.message) - message_widget.add_content(result) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e2cf6aa4a8b587225b54e93f9d941cef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e2cf6aa4a8b587225b54e93f9d941cef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Websocket: Set max incoming payload size
by Philipp Hörist (＠lovetox) 15 Dec '21

15 Dec '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e85e1f08 by lovetox at 2021-12-15T19:28:33+01:00 Websocket: Set max incoming payload size Currently most servers have a stanza size limit around 256 - 512 kb - - - - - 1 changed file: - nbxmpp/websocket.py Changes: ===================================== nbxmpp/websocket.py ===================================== @@ -77,6 +77,7 @@ class WebsocketConnection(Connection): return self._websocket.set_keepalive_interval(5) + self._websocket.set_max_incoming_payload_size(1048576) self._websocket.connect('message', self._on_websocket_message) self._websocket.connect('closed', self._on_websocket_closed) self._websocket.connect('closing', self._on_websocket_closing) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e85e1f084419d1d40c4eb9f2… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e85e1f084419d1d40c4eb9f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Conversation: Properly check if chat is loaded, improve view reset
by Daniel Brötzmann (＠wurstsalat) 14 Dec '21

14 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b4c09866 by wurstsalat at 2021-12-14T23:10:45+01:00 Conversation: Properly check if chat is loaded, improve view reset - - - - - 5 changed files: - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/scrolled.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -325,9 +325,8 @@ def get_active_control(self) -> Optional[ControlType]: return None return self.get_control(chat.account, chat.jid) - def is_chat_idle(self, account: str, jid: JID) -> bool: - entry = self._chat_idle_time.get((account, jid)) - return entry is not None + def is_chat_loaded(self, account: str, jid: JID) -> bool: + return self._chat_stack.is_chat_loaded(account, jid) def get_controls(self, account: Optional[str] ) -> Generator[ControlType, None, None]: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -112,6 +112,12 @@ def show_chat(self, account: str, jid: JID) -> None: GLib.idle_add(control.focus) + def is_chat_loaded(self, account, jid) -> bool: + control = self.get_control(account, jid) + if control is None: + return False + return control.is_chat_loaded + def unload_chat(self, account: str, jid: JID) -> None: control = self.get_control(account, jid) if control is None: ===================================== gajim/gtk/controls/base.py ===================================== @@ -225,8 +225,8 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self.xml.hbox.pack_start(self.msg_scrolledwindow, True, True, 0) - # Used for initial message row fetching in ConversationView - self._initial_fetch_finished: bool = False + # Keeps track of whether the ConversationView is populated + self._chat_loaded: bool = False # the following vars are used to keep history of user's messages self.sent_history: List[str] = [] @@ -511,8 +511,7 @@ def _sec_labels_received(self, event): def delegate_action(self, action: str) -> int: if action == 'clear-chat': - self.conversation_view.clear() - self._scrolled_view.reset() + self.reset_view() return Gdk.EVENT_STOP if action == 'delete-line': @@ -1123,10 +1122,10 @@ def save_message(self, message: str, msg_type: str) -> None: self.received_history_pos = pos def _allow_add_message(self) -> bool: + # Only add messages if the view is already populated + chat_loaded = app.window.is_chat_loaded(self.account, self.contact.jid) lower_complete = self._scrolled_view.get_lower_complete() - chat_idle = app.window.is_chat_idle(self.account, self.contact.jid) - chat_selected = bool(app.window.get_active_control() is not None) - return lower_complete and (chat_idle or chat_selected) + return chat_loaded and lower_complete def add_info_message(self, text: str) -> None: self.conversation_view.add_info_message(text) @@ -1315,9 +1314,9 @@ def update_text_tags(self): self.conversation_view.update_text_tags() def set_control_active(self, state: bool) -> None: - if not self._initial_fetch_finished: + if not self._chat_loaded: self.fetch_n_lines_history(self._scrolled_view, True, 20) - self._initial_fetch_finished = True + self._chat_loaded = True if state: self.set_emoticon_popover() @@ -1332,17 +1331,21 @@ def set_control_active(self, state: bool) -> None: self._client.get_module('Chatstate').set_chatstate( self.contact, Chatstate.INACTIVE) + @property + def is_chat_loaded(self) -> bool: + return self._chat_loaded + def reset_view(self) -> None: - self._initial_fetch_finished = False + self._chat_loaded = False self.conversation_view.clear() + self._scrolled_view.reset() def get_autoscroll(self) -> bool: return self._scrolled_view.get_autoscroll() def scroll_to_end(self, force: bool = False) -> None: # Clear view and reload conversation - self.conversation_view.clear() - self._scrolled_view.reset() + self.reset_view() self.conversation_view.scroll_to_end(force) def scroll_to_message(self, log_line_id: str, timestamp: float) -> None: @@ -1350,8 +1353,7 @@ def scroll_to_message(self, log_line_id: str, timestamp: float) -> None: if row is None: # Clear view and reload conversation around timestamp self.conversation_view.lock() - self.conversation_view.clear() - self._scrolled_view.reset() + self.reset_view() before, at_after = app.storage.archive.get_conversation_around( self.account, self.contact.jid, timestamp) self.add_messages(before) ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -111,9 +111,12 @@ def _on_adj_upper_changed(self, if self._requesting == 'before': adj.set_value(adj.get_value() + diff) - self._lower_complete = True - self._autoscroll = True - self.emit('autoscroll-changed', self._autoscroll) + if upper == adj.get_page_size(): + # There is no scrollbar + self.emit('request-history', True) + self._lower_complete = True + self._autoscroll = True + self.emit('autoscroll-changed', self._autoscroll) self._requesting = None ===================================== gajim/gtk/main.py ===================================== @@ -517,8 +517,8 @@ def get_controls(self, account: Optional[str] = None def get_active_control(self) -> Optional[ControlType]: return self._chat_page.get_active_control() - def is_chat_idle(self, account: str, jid: JID) -> bool: - return self._chat_page.is_chat_idle(account, jid) + def is_chat_loaded(self, account: str, jid: JID) -> bool: + return self._chat_page.is_chat_loaded(account, jid) def chat_exists(self, account: str, jid: JID) -> bool: return self._chat_page.chat_exists(account, jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b4c09866890c947f487b97101e5fe6f1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b4c09866890c947f487b97101e5fe6f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Styling: Make it work with labels
by Philipp Hörist (＠lovetox) 14 Dec '21

14 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6690921d by lovetox at 2021-12-14T22:43:04+01:00 Styling: Make it work with labels - Styling: Parse byte position - Tests: Add and adapt tests - PlainWidget: Style URIs correctly - - - - - 4 changed files: - gajim/common/styling.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/util.py - test/no_gui/test_styling.py Changes: ===================================== gajim/common/styling.py ===================================== @@ -1,24 +1,38 @@ +# 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 Union +from typing import Match + import string import re from dataclasses import dataclass from dataclasses import field +from gi.repository import GLib + PRE = '`' STRONG = '*' STRIKE = '~' EMPH = '_' -QUOTE = '> ' -PRE_TEXT = '```' - WHITESPACE = set(string.whitespace) -BLOCK_DIRS = set([QUOTE, PRE_TEXT]) SPAN_DIRS = set([PRE, STRONG, STRIKE, EMPH]) VALID_SPAN_START = WHITESPACE | SPAN_DIRS -SD = 0 -SD_POS = 1 - PRE_RX = r'(?P<pre>^```.+?(^```$(.|\Z)))' PRE_NESTED_RX = r'(?P<pre>^```.+?((^```$(.|\Z))|\Z))' QUOTE_RX = r'(?P<quote>^(?=>).*?(^|\Z)(?!>))' @@ -34,6 +48,10 @@ ADDRESS_RX = re.compile(ADDRESS_RX) +SD = 0 +SD_POS = 1 + + @dataclass class StyleObject: start: int @@ -41,28 +59,34 @@ class StyleObject: text: str -class URIMarkup: - def get_markup_string(self): - return f'<a href="{self.text}">{self.text}</a>' +@dataclass +class BaseUri(StyleObject): + + start_byte: int + end_byte: int + + def get_markup_string(self) -> str: + text = GLib.markup_escape_text(self.text) + return f'<a href="{text}">{text}</a>' @dataclass -class Uri(StyleObject, URIMarkup): +class Uri(BaseUri): name: str = field(default='uri', init=False) @dataclass -class Address(StyleObject, URIMarkup): +class Address(BaseUri): name: str = field(default='address', init=False) @dataclass -class XMPPAddress(StyleObject, URIMarkup): +class XMPPAddress(BaseUri): name: str = field(default='xmppadr', init=False) @dataclass -class MailAddress(StyleObject, URIMarkup): +class MailAddress(BaseUri): name: str = field(default='mailadr', init=False) @@ -70,17 +94,17 @@ class MailAddress(StyleObject, URIMarkup): class Block(StyleObject): @classmethod - def from_match(cls, match): + def from_match(cls, match: Match[str]) -> Block: return cls(start=match.start(), end=match.end(), - text=str(match.group(cls.name))) + text=match.group(cls.name)) @dataclass class PlainBlock(Block): name: str = field(default='plain', init=False) - spans: list = field(default_factory=list) - uris: list = field(default_factory=list) + spans: list[Span] = field(default_factory=list) + uris: list[BaseUri] = field(default_factory=list) @dataclass @@ -91,34 +115,41 @@ class PreBlock(Block): @dataclass class QuoteBlock(Block): name: str = field(default='quote', init=False) - blocks: list = field(default_factory=list) + blocks: list[Block] = field(default_factory=list) - def unquote(self): + def unquote(self) -> str: return UNQUOTE_RX.sub('', self.text) @dataclass -class PlainSpan(StyleObject): +class Span(StyleObject): + start_byte: int + end_byte: int + name: str + + +@dataclass +class PlainSpan(Span): name: str = field(default='plain', init=False) @dataclass -class StrongSpan(StyleObject): +class StrongSpan(Span): name: str = field(default='strong', init=False) @dataclass -class EmphasisSpan(StyleObject): +class EmphasisSpan(Span): name: str = field(default='emphasis', init=False) @dataclass -class PreTextSpan(StyleObject): +class PreTextSpan(Span): name: str = field(default='pre', init=False) @dataclass -class StrikeSpan(StyleObject): +class StrikeSpan(Span): name: str = field(default='strike', init=False) @@ -133,18 +164,33 @@ class StrikeSpan(StyleObject): @dataclass class ParsingResult: text: str - blocks: list + blocks: list[Block] + +def find_byte_index(text: str, index: int): + byte_index = -1 + for index_, c in enumerate(text): + byte_index += len(c.encode()) + if index == index_: + return byte_index + + raise ValueError('index not in string: %s, %s' % (text, index)) + + +def process(text: Union[str, bytes], nested: bool = False) -> ParsingResult: + if isinstance(text, bytes): + text = text.decode() -def process(text, nested=False): blocks = _parse_blocks(text, nested) for block in blocks: if isinstance(block, PlainBlock): offset = 0 + offset_bytes = 0 for line in block.text.splitlines(keepends=True): - block.spans += _parse_line(line, offset) - block.uris += _parse_uris(line, offset) + block.spans += _parse_line(line, offset, offset_bytes) + block.uris += _parse_uris(line, offset, offset_bytes) offset += len(line) + offset_bytes += len(line.encode()) if isinstance(block, QuoteBlock): result = process(block.unquote(), nested=True) @@ -153,8 +199,8 @@ def process(text, nested=False): return ParsingResult(text, blocks) -def _parse_blocks(text, nested): - blocks = [] +def _parse_blocks(text: str, nested: bool) -> list[Block]: + blocks: list[Block] = [] text_len = len(text) last_end_pos = 0 @@ -162,9 +208,10 @@ def _parse_blocks(text, nested): for match in rx.finditer(text): if match.start() != last_end_pos: - blocks.append(PlainBlock(start=last_end_pos, - end=match.start(), - text=text[last_end_pos:match.start()])) + blocks.append(PlainBlock( + start=last_end_pos, + end=match.start(), + text=text[last_end_pos:match.start()])) last_end_pos = match.end() group_dict = match.groupdict() @@ -176,17 +223,19 @@ def _parse_blocks(text, nested): blocks.append(PreBlock.from_match(match)) if last_end_pos != text_len: - blocks.append(PlainBlock(start=last_end_pos, - end=text_len, - text=text[last_end_pos:])) + blocks.append(PlainBlock( + start=last_end_pos, + end=text_len, + text=text[last_end_pos:])) + return blocks -def _parse_line(line, offset): - index = 0 +def _parse_line(line: str, offset: int, offset_bytes: int) -> list[Span]: + index: int = 0 length = len(line) - stack = [] - spans = [] + stack: list[tuple[str, int]] = [] + spans: list[Span] = [] while index < length: sd = line[index] @@ -204,7 +253,11 @@ def _parse_line(line, offset): if is_valid_start: if sd == PRE: - index = _handle_pre_span(line, index, offset, spans) + index = _handle_pre_span(line, + index, + offset, + offset_bytes, + spans) continue stack.append((sd, index)) @@ -222,27 +275,46 @@ def _parse_line(line, offset): continue start_pos = _find_span_start_position(sd, stack) - spans.append(_make_span(line, sd, start_pos, index, offset)) + spans.append(_make_span(line, + sd, + start_pos, + index, + offset, + offset_bytes)) index += 1 return spans -def _parse_uris(line, offset): - uris = [] +def _parse_uris(line: str, offset: int, offset_bytes: int) -> list[BaseUri]: + uris: list[BaseUri] = [] + + def make(match: Match[str], is_address: bool) -> BaseUri: + return _make_link(line, + match.start(), + match.end() - 1, + offset, + offset_bytes, + is_address) + for match in URI_RX.finditer(line): - uri = _make_uri(line, match.start(), match.end(), offset) + uri = make(match, False) uris.append(uri) for match in ADDRESS_RX.finditer(line): - uri = _make_address(line, match.start(), match.end(), offset) + uri = make(match, True) uris.append(uri) return uris -def _handle_pre_span(line, index, offset, spans): +def _handle_pre_span(line: str, + index: int, + offset: int, + offset_bytes: int, + spans: list[Span]) -> int: + # Scan ahead for the end end = line.find(PRE, index + 1) if end == -1: @@ -252,40 +324,69 @@ def _handle_pre_span(line, index, offset, spans): # empty span return index + 1 - spans.append(_make_span(line, PRE, index, end, offset)) + spans.append(_make_span(line, PRE, index, end, offset, offset_bytes)) return end + 1 -def _make_span(line, sd, start, end, offset): +def _make_span(line: str, + sd: str, + start: int, + end: int, + offset: int, + offset_bytes: int) -> Span: + text = line[start:end + 1] + + start_byte = find_byte_index(line, start) + offset_bytes + end_byte = find_byte_index(line, end) + offset_bytes + 1 + start += offset end += offset + 1 span_class = SPAN_CLS_DICT.get(sd) - return span_class(start=start, end=end, text=text) + assert span_class is not None + return span_class(start=start, + start_byte=start_byte, + end=end, + end_byte=end_byte, + text=text) -def _make_uri(line, start, end, offset): - text = line[start:end] - start += offset - end += offset - return Uri(start=start, end=end, text=text) +def _make_link(line: str, + start: int, + end: int, + offset: int, + offset_bytes: int, + is_address: bool) -> BaseUri: + + text = line[start:end + 1] + + start_byte = find_byte_index(line, start) + offset_bytes + end_byte = find_byte_index(line, end) + offset_bytes + 1 -def _make_address(line, start, end, offset): - text = line[start:end] start += offset - end += offset + end += offset + 1 + + if not is_address: + cls_ = Uri + + elif text.startswith('xmpp'): + cls_ = XMPPAddress - if text.startswith('xmpp'): - return XMPPAddress(start=start, end=end, text=text) + elif text.startswith('mailto'): + cls_ = MailAddress - if text.startswith('mailto'): - return MailAddress(start=start, end=end, text=text) + else: + cls_ = Address - return Address(start=start, end=end, text=text) + return cls_(start=start, + start_byte=start_byte, + end=end, + end_byte=end_byte, + text=text) -def _is_span_empty(sd, index, stack): +def _is_span_empty(sd: str, index: int, stack: list[tuple[str, int]]) -> bool: start_sd = stack[-1][SD] if start_sd != sd: return False @@ -294,7 +395,7 @@ def _is_span_empty(sd, index, stack): return pos == index - 1 -def _find_span_start_position(sd, stack): +def _find_span_start_position(sd: str, stack: list[tuple[str, int]]) -> int: while stack: start_sd, pos = stack.pop() if start_sd == sd: @@ -303,7 +404,7 @@ def _find_span_start_position(sd, stack): raise ValueError('Unable to find opening span') -def _is_valid_span_start(line, index): +def _is_valid_span_start(line: str, index: int) -> bool: ''' https://xmpp.org/extensions/xep-0393.html#span @@ -328,7 +429,7 @@ def _is_valid_span_start(line, index): return char in VALID_SPAN_START -def _is_valid_span_end(line, index): +def _is_valid_span_end(line: str, index: int) -> bool: ''' https://xmpp.org/extensions/xep-0393.html#span ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -35,7 +35,7 @@ from gajim.gui_menu_builder import get_conv_uri_context_menu from ..util import get_cursor -from ..util import make_pango_attribute +from ..util import make_pango_attributes log = logging.getLogger('gajim.gui.conversaion.plain_widget') @@ -95,17 +95,17 @@ def _on_populate_popup(self, label: Gtk.Label, menu: Gtk.Menu) -> None: menu.show_all() def print_text_with_styling(self, block: PlainBlock) -> None: - text = GLib.markup_escape_text(block.text.strip()) + text = '' + after = GLib.markup_escape_text(block.text.strip()) for uri in block.uris: - text = text.replace(uri.text, uri.get_markup_string()) - - attr_list = Pango.AttrList() - for span in block.spans: - attr = make_pango_attribute(span.name, span.start, span.end) - attr_list.insert(attr) + uri_escaped = GLib.markup_escape_text(uri.text) + before, _, after = after.partition(uri_escaped) + text += before + text += uri.get_markup_string() + text += after self.set_markup(text) - self.set_attributes(attr_list) + self.set_attributes(make_pango_attributes(block)) def update_text_tags(self) -> None: pass ===================================== gajim/gtk/util.py ===================================== @@ -55,6 +55,7 @@ from gajim.common.const import Display from gajim.common.const import StyleAttr from gajim.common.nec import EventHelper as CommonEventHelper +from gajim.common.styling import PlainBlock from .const import GajimIconSet from .const import WINDOW_MODULES @@ -888,19 +889,27 @@ def refresh(self) -> None: self.set_tooltip_text(_('Account: %s') % label) -def make_pango_attribute(name: str, start: int, end: int) -> Pango.Attribute: +def make_pango_attributes(block: PlainBlock) -> Pango.AttrList: + attrlist = Pango.AttrList() + for span in block.spans: + attr = get_style_attribute_with_name(span.name) + attr.start_index = span.start_byte + attr.end_index = span.end_byte + attrlist.insert(attr) + return attrlist + + +def get_style_attribute_with_name(name: str) -> Pango.Attribute: if name == 'strong': - attr = Pango.attr_weight_new(Pango.Weight.BOLD) + return Pango.attr_weight_new(Pango.Weight.BOLD) + if name == 'strike': - attr = Pango.attr_strikethrough_new(True) + return Pango.attr_strikethrough_new(True) + if name == 'emphasis': - attr = Pango.attr_style_new(Pango.Style.ITALIC) - if name == 'pre': - attr = Pango.attr_family_new('monospace') + return Pango.attr_style_new(Pango.Style.ITALIC) - else: - ValueError('unknown attribute %s', name) + if name == 'pre': + return Pango.attr_family_new('monospace') - attr.start_index = start - attr.end_index = end - return attr + raise ValueError('unknown attribute %s' % name) ===================================== test/no_gui/test_styling.py ===================================== @@ -18,8 +18,8 @@ 'input': '_no pre `with *children*`_', 'tokens': [ PlainBlock(start=0, end=26, text='_no pre `with *children*`_', spans=[ - PreTextSpan(start=8, end=25, text='`with *children*`'), - EmphasisSpan(start=0, end=26, text='_no pre `with *children*`_') + PreTextSpan(start=8, start_byte=8, end=25, end_byte=25, text='`with *children*`'), + EmphasisSpan(start=0, start_byte=0, end=26, end_byte=26, text='_no pre `with *children*`_') ]) ] }, @@ -28,9 +28,9 @@ 'input': '_*~children~*_', 'tokens': [ PlainBlock(start=0, end=14, text='_*~children~*_', spans=[ - StrikeSpan(start=2, end=12, text='~children~'), - StrongSpan(start=1, end=13, text='*~children~*'), - EmphasisSpan(start=0, end=14, text='_*~children~*_'), + StrikeSpan(start=2, start_byte=2, end=12, end_byte=12, text='~children~'), + StrongSpan(start=1, start_byte=1, end=13, end_byte=13, text='*~children~*'), + EmphasisSpan(start=0, start_byte=0, end=14, end_byte=14, text='_*~children~*_'), ]) ] }, @@ -39,10 +39,10 @@ 'input': '*strong* _emph_~strike~ `pre`', 'tokens': [ PlainBlock(start=0, end=30, text='*strong* _emph_~strike~ `pre`', spans=[ - StrongSpan(start=0, end=8, text='*strong*'), - EmphasisSpan(start=9, end=15, text='_emph_'), - StrikeSpan(start=15, end=23, text='~strike~'), - PreTextSpan(start=25, end=30, text='`pre`') + StrongSpan(start=0, start_byte=0, end=8, end_byte=8, text='*strong*'), + EmphasisSpan(start=9, start_byte=9, end=15, end_byte=15, text='_emph_'), + StrikeSpan(start=15, start_byte=15, end=23, end_byte=23, text='~strike~'), + PreTextSpan(start=25, start_byte=25, end=30, end_byte=30, text='`pre`') ]) ] }, @@ -51,7 +51,7 @@ 'input': '*strong*plain*', 'tokens': [ PlainBlock(start=0, end=14, text='*strong*plain*', spans=[ - StrongSpan(start=0, end=8, text='*strong*') + StrongSpan(start=0, start_byte=0, end=8, end_byte=8, text='*strong*') ]) ] }, @@ -63,6 +63,26 @@ ] }, + 'byte pos is different': { + 'input': '*ö* *öö*', + 'tokens': [ + PlainBlock(start=0, end=8, text='*ö* *öö*', spans=[ + StrongSpan(start=0, start_byte=0, end=3, end_byte=4, text='*ö*'), + StrongSpan(start=4, start_byte=5, end=8, end_byte=11, text='*öö*') + ]) + ] + }, + + 'byte pos is different with multiple blocks': { + 'input': '```\npre\n```\n*pláin*', + 'tokens': [ + PreBlock(start=0, end=12, text='```\npre\n```\n'), + PlainBlock(start=12, end=19, text='*pláin*', spans=[ + StrongSpan(start=0, start_byte=0, end=7, end_byte=8, text='*pláin*') + ]) + ] + }, + 'end span only': { 'input': 'not strong*', 'tokens': [ @@ -102,7 +122,7 @@ 'input': '* plain *strong*', 'tokens': [ PlainBlock(start=0, end=16, text='* plain *strong*', spans=[ - StrongSpan(start=8, end=16, text='*strong*') + StrongSpan(start=8, start_byte=8, end=16, end_byte=16, text='*strong*') ]) ] }, @@ -111,7 +131,7 @@ 'input': '*this is *uneven*', 'tokens': [ PlainBlock(start=0, end=17, text='*this is *uneven*', spans=[ - StrongSpan(start=9, end=17, text='*uneven*') + StrongSpan(start=9, start_byte=9, end=17, end_byte=17, text='*uneven*') ]) ] }, @@ -120,7 +140,7 @@ 'input': '*this cannot _overlap*_', 'tokens': [ PlainBlock(start=0, end=23, text='*this cannot _overlap*_', spans=[ - StrongSpan(start=0, end=22, text='*this cannot _overlap*') + StrongSpan(start=0, start_byte=0, end=22, end_byte=22, text='*this cannot _overlap*') ]) ] }, @@ -223,7 +243,7 @@ 'input': 'some kind of link http://foo.com/blah_blah', 'tokens': [ PlainBlock(start=0, end=42, text='some kind of link http://foo.com/blah_blah', spans=[], uris=[ - Uri(start=18, end=42, text='http://foo.com/blah_blah') + Uri(start=18, start_byte=18, end=42, end_byte=42, text='http://foo.com/blah_blah') ]) ] }, @@ -232,7 +252,7 @@ 'input': 'some kind of link http://foo.com/blah_blah,', 'tokens': [ PlainBlock(start=0, end=43, text='some kind of link http://foo.com/blah_blah,', spans=[], uris=[ - Uri(start=18, end=42, text='http://foo.com/blah_blah') + Uri(start=18, start_byte=18, end=42, end_byte=42, text='http://foo.com/blah_blah') ]) ] }, @@ -241,9 +261,19 @@ 'input': 'some *kind* of link http://foo.com/blah_blah', 'tokens': [ PlainBlock(start=0, end=44, text='some *kind* of link http://foo.com/blah_blah', spans=[ - StrongSpan(start=5, end=11, text='*kind*') + StrongSpan(start=5, start_byte=5, end=11, end_byte=11, text='*kind*') ], uris=[ - Uri(start=20, end=44, text='http://foo.com/blah_blah') + Uri(start=20, start_byte=20, end=44, end_byte=44, text='http://foo.com/blah_blah') + ]) + ] + }, + + 'plain with multiple uris': { + 'input': 'some http://foo.com/blah_blah and http://foo.com/blah_blah/123', + 'tokens': [ + PlainBlock(start=0, end=62, text='some http://foo.com/blah_blah and http://foo.com/blah_blah/123', spans=[], uris=[ + Uri(start=5, start_byte=5, end=29, end_byte=29, text='http://foo.com/blah_blah'), + Uri(start=34, start_byte=34, end=62, end_byte=62, text='http://foo.com/blah_blah/123') ]) ] }, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6690921dc0057b98bbc93c6b6247986c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6690921dc0057b98bbc93c6b6247986c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: BaseControl: Reset initial fetch on resetting view
by Daniel Brötzmann (＠wurstsalat) 13 Dec '21

13 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ceec9f65 by wurstsalat at 2021-12-14T00:14:38+01:00 BaseControl: Reset initial fetch on resetting view - - - - - e32e6295 by wurstsalat at 2021-12-14T00:27:56+01:00 MessageInputTextView: Clear tags before parsing - - - - - 2 changed files: - gajim/gtk/controls/base.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1333,6 +1333,7 @@ def set_control_active(self, state: bool) -> None: self.contact, Chatstate.INACTIVE) def reset_view(self) -> None: + self._initial_fetch_finished = False self.conversation_view.clear() def get_autoscroll(self) -> bool: ===================================== gajim/gtk/message_input.py ===================================== @@ -101,11 +101,17 @@ def _on_focus_out(self, _widget, _event): self.toggle_speller(False) return False - def _on_text_changed(self, buffer_): + def _clear_tags(self) -> None: + _buffer = self.get_buffer() + start, end = _buffer.get_bounds() + _buffer.remove_all_tags(start, end) + + def _on_text_changed(self, buffer_: Gtk.TextBuffer) -> None: text = self.get_text() if not text: return + self._clear_tags() result = process(text) for block in result.blocks: if block.name == 'plain': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/75c572e18ddf2608ae68eff8df089fd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/75c572e18ddf2608ae68eff8df089fd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] BaseControl: Load messages via initial message fetch
by Daniel Brötzmann (＠wurstsalat) 13 Dec '21

13 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 75c572e1 by wurstsalat at 2021-12-13T23:56:41+01:00 BaseControl: Load messages via initial message fetch ScrolledView adjustment changes are not reliable for initial message fetching. Instead, we do an initial message fetch when activating the Control. - - - - - 2 changed files: - gajim/gtk/controls/base.py - gajim/gtk/conversation/scrolled.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -225,6 +225,9 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self.xml.hbox.pack_start(self.msg_scrolledwindow, True, True, 0) + # Used for initial message row fetching in ConversationView + self._initial_fetch_finished: bool = False + # the following vars are used to keep history of user's messages self.sent_history: List[str] = [] self.sent_history_pos: int = 0 @@ -1312,6 +1315,10 @@ def update_text_tags(self): self.conversation_view.update_text_tags() def set_control_active(self, state: bool) -> None: + if not self._initial_fetch_finished: + self.fetch_n_lines_history(self._scrolled_view, True, 20) + self._initial_fetch_finished = True + if state: self.set_emoticon_popover() ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -111,12 +111,10 @@ def _on_adj_upper_changed(self, if self._requesting == 'before': adj.set_value(adj.get_value() + diff) - if upper == adj.get_page_size(): - # There is no scrollbar, request history until there is - self.emit('request-history', True) - self._lower_complete = True - self._autoscroll = True - self.emit('autoscroll-changed', self._autoscroll) + self._lower_complete = True + self._autoscroll = True + self.emit('autoscroll-changed', self._autoscroll) + self._requesting = None def _on_adj_value_changed(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75c572e18ddf2608ae68eff8df089fd1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75c572e18ddf2608ae68eff8df089fd1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ActionSetting: Disconnect handler on destroy
by Daniel Brötzmann (＠wurstsalat) 13 Dec '21

13 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f5b8a2f6 by wurstsalat at 2021-12-13T23:30:18+01:00 ActionSetting: Disconnect handler on destroy - - - - - 1 changed file: - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/settings.py ===================================== @@ -610,7 +610,12 @@ def __init__(self, *args, account): self.on_enable() self.show_all() - self.action.connect('notify::enabled', self.on_enable) + self._handler_id = self.action.connect( + 'notify::enabled', self.on_enable) + self.connect('destroy', self._on_destroy) + + def _on_destroy(self, *args): + self.action.disconnect(self._handler_id) def on_enable(self, *args): self.set_sensitive(self.action.get_enabled()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5b8a2f6d1a5bc817506c144b937ae37… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5b8a2f6d1a5bc817506c144b937ae37… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: StatusIcon: Make lost connection more obvious
by Daniel Brötzmann (＠wurstsalat) 13 Dec '21

13 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3dadbaa5 by wurstsalat at 2021-12-13T23:05:48+01:00 StatusIcon: Make lost connection more obvious Fixes #10249 - - - - - 3040608c by wurstsalat at 2021-12-13T23:14:42+01:00 SearchView: Fix comparing rows in header_func - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gtk/search_view.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -561,6 +561,8 @@ def play_sound_file(path_to_soundfile): log.error('Could not play sound: %s', error.message) def get_connection_status(account: str) -> str: + if not app.account_is_available(account): + return 'error' con = app.connections[account] if con.state.is_reconnect_scheduled: return 'error' ===================================== gajim/gtk/search_view.py ===================================== @@ -302,8 +302,9 @@ def __init__(self, account: str, jid: JID, timestamp: float) -> None: class CounterRow(Gtk.ListBoxRow): def __init__(self, count: int) -> None: Gtk.ListBoxRow.__init__(self) + self.set_activatable(False) self.type: str = 'counter' - self.jid = None + self.jid: str = '' # Has to be there for header_func self.time: float = 0.0 self.get_style_context().add_class('search-view-counter') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fc68a80408826e89a9af8225a084224… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fc68a80408826e89a9af8225a084224… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
20
Older →

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 December 2021