Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] new: OMEMO: Handle failed session build gracefully
by Philipp Hörist (＠lovetox) 20 May '23

20 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: d1c80c84 by Philipp Hörist at 2023-05-20T20:39:26+02:00 new: OMEMO: Handle failed session build gracefully Fixes #11534 - - - - - 1 changed file: - gajim/common/modules/omemo.py Changes: ===================================== gajim/common/modules/omemo.py ===================================== @@ -550,7 +550,12 @@ def request_bundle(self, jid: str, device_id: int): jid, device_id, bundle) return - self.backend.build_session(jid, bundle) + try: + self.backend.build_session(jid, bundle) + except Exception as error: + self._log.error('Building session failed: %s', error) + return + self._log.info('Session created for: %s', jid) # TODO: In MUC we should send a groupchat message self._send_key_transport_message('chat', jid, [device_id]) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d1c80c84f7b55ec1b43aefff56b22fe2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d1c80c84f7b55ec1b43aefff56b22fe2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: refactor: Remove obsolete method
by Philipp Hörist (＠lovetox) 20 May '23

20 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: e1d063f2 by Philipp Hörist at 2023-05-20T20:13:13+02:00 refactor: Remove obsolete method - - - - - cf0c1981 by Philipp Hörist at 2023-05-20T20:13:13+02:00 refactor: Use helper methods to determine lib versions - - - - - c0c723e1 by Philipp Hörist at 2023-05-20T20:13:13+02:00 cfix: Add soup version to exception text - - - - - 4 changed files: - gajim/common/helpers.py - gajim/common/storage/omemo.py - gajim/gtk/about.py - gajim/gtk/exception.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -68,6 +68,7 @@ from gi.repository import Gio from gi.repository import GLib from gi.repository import GObject +from gi.repository import Soup from nbxmpp.const import Affiliation from nbxmpp.const import Chatstate from nbxmpp.const import ConnectionProtocol @@ -1552,6 +1553,12 @@ def get_glib_version() -> str: GLib.MICRO_VERSION])) +def get_soup_version() -> str: + return '.'.join(map(str, [Soup.get_major_version(), + Soup.get_minor_version(), + Soup.get_micro_version()])) + + def package_version(requirement: str) -> bool: req = Requirement(requirement) ===================================== gajim/common/storage/omemo.py ===================================== @@ -37,7 +37,6 @@ from omemo_dr.state.signedprekeyrecord import SignedPreKeyRecord from omemo_dr.state.store import Store from omemo_dr.structs import IdentityInfo -from omemo_dr.util.medium import Medium from gajim.common import app from gajim.common.modules.util import LogAdapter @@ -395,10 +394,6 @@ def remove_signed_pre_key(self, signed_pre_key_id: int) -> None: self._con.execute(query, (signed_pre_key_id,)) self._con.commit() - def get_next_signed_pre_key_id(self) -> int: - result = self.get_current_signed_pre_key_id() - return (result % (Medium.MAX_VALUE - 1)) + 1 - def get_current_signed_pre_key_id(self) -> int: query = 'SELECT MAX(prekey_id) FROM signed_prekeys' result = self._con.execute(query).fetchone() ===================================== gajim/gtk/about.py ===================================== @@ -15,20 +15,22 @@ import cairo import nbxmpp from gi.repository import Gdk -from gi.repository import GLib -from gi.repository import GObject from gi.repository import Gtk from gi.repository import Pango -from gi.repository import Soup from gajim.common import app from gajim.common.const import ARTISTS from gajim.common.const import DEVS_CURRENT from gajim.common.const import DEVS_PAST from gajim.common.const import THANKS +from gajim.common.helpers import get_glib_version +from gajim.common.helpers import get_gobject_version +from gajim.common.helpers import get_soup_version from gajim.common.helpers import open_uri from gajim.common.i18n import _ +from gajim.gtk.util import get_gtk_version + class AboutDialog(Gtk.AboutDialog): def __init__(self): @@ -40,32 +42,20 @@ def __init__(self): self.set_license_type(Gtk.License.GPL_3_0_ONLY) self.set_website('https://gajim.org/') - gtk_ver = '%i.%i.%i' % ( - Gtk.get_major_version(), - Gtk.get_minor_version(), - Gtk.get_micro_version()) - gobject_ver = '.'.join(map(str, GObject.pygobject_version)) - glib_ver = '.'.join(map(str, [GLib.MAJOR_VERSION, - GLib.MINOR_VERSION, - GLib.MICRO_VERSION])) cairo_ver = cairo.cairo_version_string() python_cairo_ver = cairo.version - soup_ver = '.'.join(map(str, [Soup.get_major_version(), - Soup.get_minor_version(), - Soup.get_micro_version()])) - comments: list[str] = [] comments.append(_('A fully-featured XMPP chat client')) comments.append('') - comments.append(_('GTK Version: %s') % gtk_ver) - comments.append(_('GLib Version: %s') % glib_ver) + comments.append(_('GTK Version: %s') % get_gtk_version()) + comments.append(_('GLib Version: %s') % get_glib_version()) comments.append(_('Pango Version: %s') % Pango.version_string()) - comments.append(_('PyGObject Version: %s') % gobject_ver) + comments.append(_('PyGObject Version: %s') % get_gobject_version()) comments.append(_('cairo Version: %s') % cairo_ver) comments.append(_('pycairo Version: %s') % python_cairo_ver) comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) - comments.append(_('libsoup Version: %s') % soup_ver) + comments.append(_('libsoup Version: %s') % get_soup_version()) self.set_comments('\n'.join(comments)) ===================================== gajim/gtk/exception.py ===================================== @@ -43,6 +43,7 @@ from gajim.common.helpers import get_gobject_version from gajim.common.helpers import get_os_name from gajim.common.helpers import get_os_version +from gajim.common.helpers import get_soup_version from gajim.common.i18n import _ from gajim.common.util.http import create_http_request @@ -63,6 +64,7 @@ - GTK Version: {} - PyGObject Version: {} - GLib Version : {} +- libsoup Version: {} - python-nbxmpp Version: {} - Gajim Version: {} @@ -161,6 +163,7 @@ def _get_issue_text(traceback_text: str) -> str: get_gtk_version(), get_gobject_version(), get_glib_version(), + get_soup_version(), nbxmpp.__version__, gajim.__version__, traceback_text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f2d22f6ed5082055c2eab913df0a016… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f2d22f6ed5082055c2eab913df0a016… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: SearchView: Remove overlay
by Philipp Hörist (＠lovetox) 20 May '23

20 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: f2d22f6e by wurstsalat at 2023-05-19T23:50:53+02:00 fix: SearchView: Remove overlay Fixes #11412 - - - - - 3 changed files: - gajim/data/gui/chat_paned.ui - gajim/gtk/builder.pyi - gajim/gtk/chat_page.py Changes: ===================================== gajim/data/gui/chat_paned.ui ===================================== @@ -234,22 +234,8 @@ <object class="GtkGrid" id="right_grid"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> <child> - <object class="GtkOverlay" id="right_grid_overlay"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> + <placeholder/> </child> </object> <packing> ===================================== gajim/gtk/builder.pyi ===================================== @@ -242,7 +242,6 @@ class ChatPanedBuilder(Builder): filter_bar: Gtk.Box chat_list_scrolled: Gtk.ScrolledWindow right_grid: Gtk.Grid - right_grid_overlay: Gtk.Overlay class ContactInfoBuilder(Builder): ===================================== gajim/gtk/chat_page.py ===================================== @@ -60,7 +60,7 @@ def __init__(self): self._ui.connect_signals(self) self._chat_stack = ChatStack() - self._ui.right_grid_overlay.add(self._chat_stack) + self._ui.right_grid.attach(self._chat_stack, 0, 0, 1, 1) self._chat_control = self._chat_stack.get_chat_control() @@ -69,11 +69,12 @@ def __init__(self): self._search_revealer = Gtk.Revealer() self._search_revealer.set_reveal_child(False) + self._search_revealer.set_hexpand(False) + self._search_revealer.set_hexpand_set(True) self._search_revealer.set_transition_type( Gtk.RevealerTransitionType.SLIDE_LEFT) - self._search_revealer.set_halign(Gtk.Align.END) self._search_revealer.add(self._search_view) - self._ui.right_grid_overlay.add_overlay(self._search_revealer) + self._ui.right_grid.attach(self._search_revealer, 1, 0, 1, 1) self._chat_filter = ChatFilter(icons=True) self._ui.filter_bar.add(self._chat_filter) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f2d22f6ed5082055c2eab913df0a0162… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f2d22f6ed5082055c2eab913df0a0162… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] cfix: HTTP: Exit async callbacks early if message is finished
by Philipp Hörist (＠lovetox) 20 May '23

20 May '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 1de40d39 by Philipp Hörist at 2023-05-20T08:41:34+02:00 cfix: HTTP: Exit async callbacks early if message is finished - - - - - 1 changed file: - nbxmpp/http.py Changes: ===================================== nbxmpp/http.py ===================================== @@ -312,6 +312,9 @@ class HTTPRequest(GObject.GObject): result: Gio.AsyncResult ) -> None: + if self._is_finished: + return + self._log.info('Request response received') try: self._input_stream = session.send_finish(result) @@ -347,6 +350,10 @@ class HTTPRequest(GObject.GObject): def _on_bytes_read_result(self, input_stream: Gio.InputStream, result: Gio.AsyncResult) -> None: + + if self._is_finished: + return + try: data = input_stream.read_bytes_finish(result) except GLib.Error as error: @@ -504,6 +511,7 @@ class HTTPRequest(GObject.GObject): self._error = HTTPRequestError.TIMEOUT else: self._error = error + self._close_all_streams() self.emit('finished') self._cleanup() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1de40d394f1d9aa96f47db81… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1de40d394f1d9aa96f47db81… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ChatActionProcessor: Allow to click items with mouse cursor
by Daniel Brötzmann (＠wurstsalat) 19 May '23

19 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e3366360 by wurstsalat at 2023-05-19T22:11:18+02:00 fix: ChatActionProcessor: Allow to click items with mouse cursor Fixes #11445 - - - - - 1 changed file: - gajim/gtk/chat_action_processor.py Changes: ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -107,9 +107,18 @@ def _on_key_press(self, return False def _on_focus_out(self, *args: Any) -> bool: - # Add 100 ms timeout in order to process potential menu item click - # events (which will emit focus-out-event on the message input) - GLib.timeout_add(100, self.popdown) + win = self.get_window() + default_display = Gdk.Display.get_default() + if default_display is not None: + pointer = default_display.get_default_seat().get_pointer() + if win is not None and pointer is not None: + _win, x_pos, y_pos, _mod = win.get_device_position(pointer) + rect = self.get_allocation() + if (x_pos not in range(0, rect.width) or + y_pos not in range(0, rect.height)): + # Only popdown if click is outside of Popover's Rectangle + self.popdown() + return False def _on_popover_closed(self, _popover: Gtk.Popover) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3366360fa6448a54ab2836982829395… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3366360fa6448a54ab2836982829395… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: OMEMOTrustManager: Show correct JIDs for participant's keys
by Daniel Brötzmann (＠wurstsalat) 19 May '23

19 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2ecf8d46 by wurstsalat at 2023-05-19T19:33:37+02:00 fix: OMEMOTrustManager: Show correct JIDs for participant's keys Fixes #11530 - - - - - 1 changed file: - gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -234,7 +234,7 @@ def __init__(self, self.set_activatable(False) self._contact = contact - self._address = str(self._contact.jid) + self._address = identity_info.address self._identity_info = identity_info self._trust = identity_info.trust View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2ecf8d46f5f3e20f1d1a3ce637cde06f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2ecf8d46f5f3e20f1d1a3ce637cde06f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: MessageWidget: Don't return truncated text for message actions
by Daniel Brötzmann (＠wurstsalat) 19 May '23

19 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: cfddd3a1 by wurstsalat at 2023-05-19T19:11:06+02:00 fix: MessageWidget: Don't return truncated text for message actions Fixes #11526 - - - - - 1 changed file: - gajim/gtk/conversation/message_widget.py Changes: ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -42,6 +42,7 @@ def __init__(self, account: str, selectable: bool = True) -> None: self._selectable = selectable self._content: ContentT | None = None + self._original_text = '' self._action_phrase_text = '' def get_content(self) -> ContentT | None: @@ -49,7 +50,7 @@ def get_content(self) -> ContentT | None: def get_text(self) -> str: if self._content is not None: - return self._content.text + return self._original_text return self._action_phrase_text def set_selectable(self, selectable: bool) -> None: @@ -61,20 +62,20 @@ def add_with_styling(self, text: str, nickname: Optional[str] = None) -> None: - original_text = text + self._original_text = text if len(text) > MAX_MESSAGE_LENGTH: text = text[:MAX_MESSAGE_LENGTH] if text.startswith('/me') and nickname is not None: self._add_action_phrase(text, nickname) - if len(original_text) > MAX_MESSAGE_LENGTH: - self._add_read_more_button(original_text) + if len(self._original_text) > MAX_MESSAGE_LENGTH: + self._add_read_more_button(self._original_text) return result = process(text) self.add_content(result) - if len(original_text) > MAX_MESSAGE_LENGTH: - self._add_read_more_button(original_text) + if len(self._original_text) > MAX_MESSAGE_LENGTH: + self._add_read_more_button(self._original_text) def _add_action_phrase(self, text: str, nickname: str): self.clear() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cfddd3a1386227913d4228d3b015fb49… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cfddd3a1386227913d4228d3b015fb49… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] imprv: Use got-body-data for determining progress
by Philipp Hörist (＠lovetox) 19 May '23

19 May '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 293480a8 by Philipp Hörist at 2023-05-19T07:16:25+00:00 imprv: Use got-body-data for determining progress Fixes #143 - - - - - 2 changed files: - nbxmpp/http.py - test/unit/test_http.py Changes: ===================================== nbxmpp/http.py ===================================== @@ -50,7 +50,7 @@ HTTP_METHODS_T = Literal[ CHUNK_SIZE = 32768 DEFAULT_USER_AGENT = f'nbxmpp/{nbxmpp.__version__}' SIGNAL_ACTIONS = GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION - +MIN_SOUP_3_4 = Soup.check_version(3, 4, 0) class HTTPLogAdapter(logging.LoggerAdapter): def process(self, msg: str, kwargs: Any) -> tuple[str, Any]: @@ -278,6 +278,10 @@ class HTTPRequest(GObject.GObject): self._message.connect('got-body', self._on_got_body) self._message.connect('restarted', self._on_restarted) self._message.connect('finished', self._on_finished) + self._message.connect('got-headers', self._on_got_headers) + + if MIN_SOUP_3_4: + self._message.connect('got-body-data', self._on_got_body_data) soup_session = self._session.get_soup_session() soup_session.send_async(self._message, @@ -360,11 +364,9 @@ class HTTPRequest(GObject.GObject): self._finish_read() return - length = len(bytes_) - self._received_size += length - if self._received_size > self._response_content_length: - self._finish_read(HTTPRequestError.CONTENT_OVERFLOW) - return + if not MIN_SOUP_3_4: + self._received_size += len(bytes_) + self._check_content_overflow() if self._output_stream is None: self._response_body_data += bytes_ @@ -383,11 +385,8 @@ class HTTPRequest(GObject.GObject): self._read_async() - if (self._emit_response_progress and - self._message.get_method() == 'GET'): - self.emit('response-progress', - self._received_size / self._response_content_length) - + if not MIN_SOUP_3_4: + self._emit_progress() def _finish_read(self, error: Optional[HTTPRequestError] = None) -> None: self._log.info('Finished reading') @@ -404,11 +403,7 @@ class HTTPRequest(GObject.GObject): ) -> None: # Signal is only raised when there is content in the response - headers = message.get_response_headers() - - self._response_content_length = headers.get_content_length() - if content_type is None: # According to the docs, content_type is None when the sniffer # decides to trust the content-type sent by the server. @@ -416,14 +411,19 @@ class HTTPRequest(GObject.GObject): self._response_content_type = content_type or '' - self._log.info('Sniffed: content-type: %s, content-length: %s', - self._response_content_type, - self._response_content_length) + self._log.info('Sniffed: content-type: %s', + self._response_content_type) self.emit('content-sniffed', self._response_content_length, self._response_content_type) + def _on_got_headers(self, message: Soup.Message) -> None: + headers = message.get_response_headers() + self._response_content_length = headers.get_content_length() + self._log.info('Got Headers: content-length: %s', + self._response_content_length) + def _on_got_body(self, _message: Soup.Message) -> None: # This signal tells us that the full body was received. # The `finished` signal is not a sure indicator if the message body @@ -432,11 +432,38 @@ class HTTPRequest(GObject.GObject): self._log.info('Body received') self._body_received = True + def _on_got_body_data(self, + _message: Soup.Message, + chunk_size: int + ) -> None: + + self._received_size += chunk_size + self._check_content_overflow() + + status = self._message.get_status() + if status in (Soup.Status.OK, Soup.Status.CREATED): + self._emit_progress() + + def _emit_progress(self) -> None: + if not self._emit_response_progress: + return + + if not self._message.get_method() == 'GET': + return + + self.emit('response-progress', + self._received_size / self._response_content_length) + + def _check_content_overflow(self) -> None: + if self._received_size > self._response_content_length: + self._finish_read(HTTPRequestError.CONTENT_OVERFLOW) + def _on_restarted(self, _message: Soup.Message) -> None: self._log.info('Restarted') self._body_received = False self._response_content_type = '' self._response_content_length = 0 + self._received_size = 0 def _on_finished(self, _message: Soup.Message) -> None: self._log.info('Message finished') ===================================== test/unit/test_http.py ===================================== @@ -1,9 +1,6 @@ -from time import time import tempfile import unittest -from unittest.mock import call from unittest.mock import Mock -from unittest.mock import patch import os from pathlib import Path @@ -124,13 +121,11 @@ class HTTP(unittest.TestCase): session = HTTPSession() request = session.create_request() - def _on_progress(req, progress): - self.assertIsInstance(progress, float) + def _on_start(req): req.cancel() callback_mock = Mock() - request.connect('starting-response-body', callback_mock.starting) - request.connect('response-progress', _on_progress) + request.connect('starting-response-body', _on_start) request.connect('finished', callback_mock.finished) request.connect('destroy', lambda *args: mainloop.quit()) request.send('GET', LARGE_FILE_URL, timeout=10) @@ -141,7 +136,6 @@ class HTTP(unittest.TestCase): self.assertTrue(request.is_finished()) self.assertEqual(request.get_error(), HTTPRequestError.CANCELLED) - callback_mock.starting.assert_called() callback_mock.finished.assert_called() def test_download_failed_404(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/293480a8fb62edacea81b632… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/293480a8fb62edacea81b632… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: AboutDialog: Show libsoup version
by Philipp Hörist (＠lovetox) 19 May '23

19 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: d88f7092 by Philipp Hörist at 2023-05-19T11:23:26+02:00 imprv: AboutDialog: Show libsoup version - - - - - 1 changed file: - gajim/gtk/about.py Changes: ===================================== gajim/gtk/about.py ===================================== @@ -19,6 +19,7 @@ from gi.repository import GObject from gi.repository import Gtk from gi.repository import Pango +from gi.repository import Soup from gajim.common import app from gajim.common.const import ARTISTS @@ -50,6 +51,10 @@ def __init__(self): cairo_ver = cairo.cairo_version_string() python_cairo_ver = cairo.version + soup_ver = '.'.join(map(str, [Soup.get_major_version(), + Soup.get_minor_version(), + Soup.get_micro_version()])) + comments: list[str] = [] comments.append(_('A fully-featured XMPP chat client')) comments.append('') @@ -60,6 +65,7 @@ def __init__(self): comments.append(_('cairo Version: %s') % cairo_ver) comments.append(_('pycairo Version: %s') % python_cairo_ver) comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) + comments.append(_('libsoup Version: %s') % soup_ver) self.set_comments('\n'.join(comments)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d88f709212db12889b103f19a58a6910… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d88f709212db12889b103f19a58a6910… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][http] 3 commits: ci: Add release publish step
by Philipp Hörist (＠lovetox) 19 May '23

19 May '23

Philipp Hörist pushed to branch http at gajim / python-nbxmpp Commits: 3c4d594d by Philipp Hörist at 2023-05-18T19:54:10+02:00 ci: Add release publish step - - - - - 6ce7136b by Philipp Hörist at 2023-05-19T08:54:20+02:00 ci: Add missing job - - - - - 293480a8 by Philipp Hörist at 2023-05-19T07:16:25+00:00 imprv: Use got-body-data for determining progress Fixes #143 - - - - - 3 changed files: - .gitlab-ci.yml - nbxmpp/http.py - test/unit/test_http.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -4,6 +4,7 @@ stages: - test - build - deploy + - publish test-pylint: stage: test @@ -70,3 +71,17 @@ deploy-debian-nightly: --password=$FTP_PASS \ --directory=debian/nbxmpp/"$(date +'%Y%m%d')" \ debian_build + +publish-release: + image: nbxmpp-publish:latest + stage: publish + dependencies: [] + rules: + - if: '$CI_COMMIT_TAG' + script: + - > + release-helper create-release \ + $CI_PROJECT_ID \ + '$CI_JOB_TOKEN' \ + --version=$CI_COMMIT_TAG \ + --tag=$CI_COMMIT_TAG ===================================== nbxmpp/http.py ===================================== @@ -50,7 +50,7 @@ HTTP_METHODS_T = Literal[ CHUNK_SIZE = 32768 DEFAULT_USER_AGENT = f'nbxmpp/{nbxmpp.__version__}' SIGNAL_ACTIONS = GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION - +MIN_SOUP_3_4 = Soup.check_version(3, 4, 0) class HTTPLogAdapter(logging.LoggerAdapter): def process(self, msg: str, kwargs: Any) -> tuple[str, Any]: @@ -278,6 +278,10 @@ class HTTPRequest(GObject.GObject): self._message.connect('got-body', self._on_got_body) self._message.connect('restarted', self._on_restarted) self._message.connect('finished', self._on_finished) + self._message.connect('got-headers', self._on_got_headers) + + if MIN_SOUP_3_4: + self._message.connect('got-body-data', self._on_got_body_data) soup_session = self._session.get_soup_session() soup_session.send_async(self._message, @@ -360,11 +364,9 @@ class HTTPRequest(GObject.GObject): self._finish_read() return - length = len(bytes_) - self._received_size += length - if self._received_size > self._response_content_length: - self._finish_read(HTTPRequestError.CONTENT_OVERFLOW) - return + if not MIN_SOUP_3_4: + self._received_size += len(bytes_) + self._check_content_overflow() if self._output_stream is None: self._response_body_data += bytes_ @@ -383,11 +385,8 @@ class HTTPRequest(GObject.GObject): self._read_async() - if (self._emit_response_progress and - self._message.get_method() == 'GET'): - self.emit('response-progress', - self._received_size / self._response_content_length) - + if not MIN_SOUP_3_4: + self._emit_progress() def _finish_read(self, error: Optional[HTTPRequestError] = None) -> None: self._log.info('Finished reading') @@ -404,11 +403,7 @@ class HTTPRequest(GObject.GObject): ) -> None: # Signal is only raised when there is content in the response - headers = message.get_response_headers() - - self._response_content_length = headers.get_content_length() - if content_type is None: # According to the docs, content_type is None when the sniffer # decides to trust the content-type sent by the server. @@ -416,14 +411,19 @@ class HTTPRequest(GObject.GObject): self._response_content_type = content_type or '' - self._log.info('Sniffed: content-type: %s, content-length: %s', - self._response_content_type, - self._response_content_length) + self._log.info('Sniffed: content-type: %s', + self._response_content_type) self.emit('content-sniffed', self._response_content_length, self._response_content_type) + def _on_got_headers(self, message: Soup.Message) -> None: + headers = message.get_response_headers() + self._response_content_length = headers.get_content_length() + self._log.info('Got Headers: content-length: %s', + self._response_content_length) + def _on_got_body(self, _message: Soup.Message) -> None: # This signal tells us that the full body was received. # The `finished` signal is not a sure indicator if the message body @@ -432,11 +432,38 @@ class HTTPRequest(GObject.GObject): self._log.info('Body received') self._body_received = True + def _on_got_body_data(self, + _message: Soup.Message, + chunk_size: int + ) -> None: + + self._received_size += chunk_size + self._check_content_overflow() + + status = self._message.get_status() + if status in (Soup.Status.OK, Soup.Status.CREATED): + self._emit_progress() + + def _emit_progress(self) -> None: + if not self._emit_response_progress: + return + + if not self._message.get_method() == 'GET': + return + + self.emit('response-progress', + self._received_size / self._response_content_length) + + def _check_content_overflow(self) -> None: + if self._received_size > self._response_content_length: + self._finish_read(HTTPRequestError.CONTENT_OVERFLOW) + def _on_restarted(self, _message: Soup.Message) -> None: self._log.info('Restarted') self._body_received = False self._response_content_type = '' self._response_content_length = 0 + self._received_size = 0 def _on_finished(self, _message: Soup.Message) -> None: self._log.info('Message finished') ===================================== test/unit/test_http.py ===================================== @@ -1,9 +1,6 @@ -from time import time import tempfile import unittest -from unittest.mock import call from unittest.mock import Mock -from unittest.mock import patch import os from pathlib import Path @@ -124,13 +121,11 @@ class HTTP(unittest.TestCase): session = HTTPSession() request = session.create_request() - def _on_progress(req, progress): - self.assertIsInstance(progress, float) + def _on_start(req): req.cancel() callback_mock = Mock() - request.connect('starting-response-body', callback_mock.starting) - request.connect('response-progress', _on_progress) + request.connect('starting-response-body', _on_start) request.connect('finished', callback_mock.finished) request.connect('destroy', lambda *args: mainloop.quit()) request.send('GET', LARGE_FILE_URL, timeout=10) @@ -141,7 +136,6 @@ class HTTP(unittest.TestCase): self.assertTrue(request.is_finished()) self.assertEqual(request.get_error(), HTTPRequestError.CANCELLED) - callback_mock.starting.assert_called() callback_mock.finished.assert_called() def test_download_failed_404(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/59d215d6d9a1adf9b6698b4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/59d215d6d9a1adf9b6698b4… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
1764
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