Philipp Hörist pushed to branch master at gajim / gajim
Commits:
c3a68259 by Philipp Hörist at 2025-02-21T23:37:02+01:00
cq: Preview: Fix type errors
- - - - -
3 changed files:
- gajim/common/helpers.py
- gajim/common/preview.py
- pyproject.toml
Changes:
=====================================
gajim/common/helpers.py
=====================================
@@ -535,11 +535,10 @@ def _on_file_created(file: Gio.File, result:
Gio.AsyncResult) -> None:
None,
_on_file_created)
-
def load_file_async(path: Path,
callback: Callable[[bytes | None,
GLib.Error | None,
- Any | None], Any],
+ Any], Any],
user_data: Any | None = None) -> None:
def _on_load_finished(file: Gio.File,
=====================================
gajim/common/preview.py
=====================================
@@ -33,7 +33,6 @@
from gajim.common.helpers import write_file_async
from gajim.common.i18n import _
from gajim.common.storage.archive import models as mod
-from gajim.common.types import GdkPixbufType
from gajim.common.util.http import create_http_request
from gajim.common.util.image import create_thumbnail
from gajim.common.util.preview import aes_decrypt
@@ -145,7 +144,7 @@ def filename(self) -> str:
return self._filename
@property
- def request(self) -> HTTPRequest:
+ def request(self) -> HTTPRequest | None:
return self._request
@property
@@ -176,7 +175,7 @@ def orig_exists(self) -> bool:
return False
return self.orig_path.exists()
- def update_widget(self, data: GdkPixbufType | None = None) -> None:
+ def update_widget(self, data: bytes | None = None) -> None:
self._widget.update(self, data)
def update_progress(self, progress: float, request: HTTPRequest) -> None:
@@ -396,7 +395,7 @@ def _process_web_uri(self,
def _on_orig_load_finished(self,
data: bytes | None,
- error: Gio.AsyncResult,
+ error: GLib.Error | None,
preview: Preview) -> None:
if preview.thumb_path is None or preview.orig_path is None:
return
@@ -415,7 +414,7 @@ def _on_orig_load_finished(self,
@staticmethod
def _on_thumb_load_finished(data: bytes | None,
- error: Gio.AsyncResult,
+ error: GLib.Error | None,
preview: Preview) -> None:
if preview.thumb_path is None or preview.orig_path is None:
@@ -485,7 +484,9 @@ def _on_content_sniffed(self,
force: bool
) -> None:
- uri = request.get_uri().to_string()
+ uri = request.get_uri()
+ assert uri is not None
+ uri = uri.to_string()
preview = cast(Preview, request.get_user_data())
preview.mime_type = content_type
preview.file_size = content_length
@@ -604,5 +605,6 @@ def _on_thumb_write_finished(_result: bool,
preview.update_widget(data=preview.thumbnail)
def cancel_download(self, preview: Preview) -> None:
+ assert preview.request is not None
preview.request.cancel()
preview.download_in_progress = False
=====================================
pyproject.toml
=====================================
@@ -142,7 +142,6 @@ exclude = [
"gajim/common/modules/util.py",
"gajim/common/modules/vcard_avatars.py",
"gajim/common/optparser.py",
- "gajim/common/preview.py",
"gajim/common/proxy65_manager.py",
"gajim/common/settings.py",
"gajim/common/socks5.py",
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/c3a68259319e2c74978b97bd244958087e5dcd5b
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/c3a68259319e2c74978b97bd244958087e5dcd5b
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
