Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clarify upload data type, guess_mime seek on end

Browse Source
This commit is contained in:
miruka 2019-11-12 09:37:21 -04:00
parent 47bfad1d72
commit 37f5f5973c
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/python/matrix_client.py
View File

@ -11,7 +11,8 @@ from datetime import datetime
from functools import partial from functools import partial
from pathlib import Path from pathlib import Path
from typing import ( from typing import (
Any, BinaryIO, DefaultDict, Dict, Optional, Set, Tuple, Type, Union, Any, AsyncIterable, BinaryIO, DefaultDict, Dict, Optional, Set, Tuple,
Type, Union,
) )
from urllib.parse import urlparse from urllib.parse import urlparse
from uuid import uuid4 from uuid import uuid4
@ -34,6 +35,7 @@ from .models.items import (
from .models.model_store import ModelStore from .models.model_store import ModelStore
from .pyotherside_events import AlertRequested from .pyotherside_events import AlertRequested
UploadData = Union[bytes, BinaryIO, AsyncIterable[bytes]]
CryptDict = Dict[str, Any] CryptDict = Dict[str, Any]
@ -225,7 +227,7 @@ class MatrixClient(nio.AsyncClient):
content["msgtype"] = "m.image" content["msgtype"] = "m.image"
content["info"]["w"], content["info"]["h"] = ( content["info"]["w"], content["info"]["h"] = (
utils.svg_dimensions(str(path)) if is_svg else utils.svg_dimensions(path) if is_svg else
PILImage.open(path).size PILImage.open(path).size
) )
@ -508,7 +510,7 @@ class MatrixClient(nio.AsyncClient):
try: try:
if is_svg: if is_svg:
svg_width, svg_height = utils.svg_dimensions(str(path)) svg_width, svg_height = utils.svg_dimensions(path)
thumb = PILImage.open(io.BytesIO( thumb = PILImage.open(io.BytesIO(
cairosvg.svg2png( cairosvg.svg2png(
@ -581,7 +583,6 @@ class MatrixClient(nio.AsyncClient):
with open(path, "rb") as file: with open(path, "rb") as file:
mime = utils.guess_mime(file) mime = utils.guess_mime(file)
file.seek(0, 0)
data: Union[BinaryIO, bytes] data: Union[BinaryIO, bytes]
@ -604,7 +605,8 @@ class MatrixClient(nio.AsyncClient):
) )
async def upload(self, data, mime: str, filename: Optional[str] = None, async def upload(
self, data: UploadData, mime: str, filename: Optional[str] = None,
) -> str: ) -> str:
response = await super().upload(data, mime, filename) response = await super().upload(data, mime, filename)

4
src/python/utils.py
View File

@ -96,7 +96,11 @@ def guess_mime(file: File) -> str:
elif isinstance(file, io.IOBase): elif isinstance(file, io.IOBase):
file.seek(0, 0) file.seek(0, 0)
try:
return filetype.guess_mime(file) or "application/octet-stream" return filetype.guess_mime(file) or "application/octet-stream"
finally:
if isinstance(file, io.IOBase):
file.seek(0, 0)
def plain2html(text: str) -> str: def plain2html(text: str) -> str: