Philipp Hörist pushed to branch master at gajim / gajim
Commits:
3d27187f by Philipp Hörist at 2022-12-29T17:26:11+01:00
refactor: Adapt to nbxmpp http changes
- - - - -
2 changed files:
- gajim/common/preview.py
- gajim/common/util/http.py
Changes:
=====================================
gajim/common/preview.py
=====================================
@@ -449,7 +449,7 @@ def download_content(self,
return
log.info('Start downloading: %s', preview.request_uri)
- request = create_http_request(preview.account, sniffer=True)
+ request = create_http_request(preview.account)
request.set_user_data(preview)
request.connect('accept-certificate', self._accept_certificate)
request.connect('content-sniffed', self._on_content_sniffed, force)
@@ -478,33 +478,25 @@ def _accept_certificate(self,
def _on_content_sniffed(self,
request: HTTPRequest,
+ content_length: int,
content_type: str,
- _params: GLib.HashTable,
force: bool
) -> None:
- file_size = request.get_response_headers().get_content_length()
uri = request.get_uri().to_string()
-
-
preview = cast(Preview, request.get_user_data())
preview.mime_type = content_type
- preview.file_size = file_size
+ preview.file_size = content_length
if content_type not in ALLOWED_MIME_TYPES and not force:
log.info('Not an allowed content type: %s, %s', content_type, uri)
request.cancel()
return
- if file_size == 0:
- log.info('File size is unknown (zero) for URL: "%s"', uri)
- request.cancel()
- return
-
- if file_size > int(app.settings.get('preview_max_file_size')):
+ if content_length > int(app.settings.get('preview_max_file_size')):
log.info(
'File size (%s) too big for URL: "%s"',
- file_size, uri)
+ content_length, uri)
if force:
preview.info_message = None
else:
=====================================
gajim/common/util/http.py
=====================================
@@ -22,12 +22,8 @@
from gajim.common.helpers import get_account_proxy
-def create_http_session(account: Optional[str] = None,
- sniffer: bool = False
- ) -> HTTPSession:
-
- session = HTTPSession(user_agent=f'Gajim {app.version}',
- sniffer=sniffer)
+def create_http_session(account: Optional[str] = None) -> HTTPSession:
+ session = HTTPSession(user_agent=f'Gajim {app.version}')
if account is None:
proxy = determine_proxy()
@@ -40,9 +36,6 @@ def create_http_session(account: Optional[str] = None,
return session
-def create_http_request(account: Optional[str] = None,
- sniffer: bool = False
- ) -> HTTPRequest:
-
- session = create_http_session(account, sniffer)
+def create_http_request(account: Optional[str] = None) -> HTTPRequest:
+ session = create_http_session(account)
return session.create_request()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/3d27187fd85a35b52b17388453a1f699fa860d51
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/3d27187fd85a35b52b17388453a1f699fa860d51
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
