diff options
author | Maxim Devaev <[email protected]> | 2022-01-17 13:54:52 +0300 |
---|---|---|
committer | Maxim Devaev <[email protected]> | 2022-01-17 13:54:52 +0300 |
commit | 3ee1948f19ca3e1a3d396e29dc902aeec4402479 (patch) | |
tree | 422e942bd341440339c6fbd4b960729a93fdce27 | |
parent | 902fc38778404e3729324a8bccc724b7d977acdf (diff) |
refactoring
-rw-r--r-- | kvmd/apps/kvmd/api/streamer.py | 6 | ||||
-rw-r--r-- | kvmd/apps/vnc/render.py | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/kvmd/apps/kvmd/api/streamer.py b/kvmd/apps/kvmd/api/streamer.py index abd3df55..c24a04b7 100644 --- a/kvmd/apps/kvmd/api/streamer.py +++ b/kvmd/apps/kvmd/api/streamer.py @@ -26,7 +26,7 @@ import functools from aiohttp.web import Request from aiohttp.web import Response -from PIL import Image +from PIL import Image as PilImage from ....validators.basic import valid_bool from ....validators.basic import valid_int_f0 @@ -104,7 +104,7 @@ class StreamerApi: assert not (max_width == snapshot.width and max_height == snapshot.height) with io.BytesIO(snapshot.data) as snapshot_bio: with io.BytesIO() as preview_bio: - with Image.open(snapshot_bio) as image: - image.thumbnail((max_width, max_height), Image.ANTIALIAS) + with PilImage.open(snapshot_bio) as image: + image.thumbnail((max_width, max_height), PilImage.ANTIALIAS) image.save(preview_bio, format="jpeg", quality=quality) return preview_bio.getvalue() diff --git a/kvmd/apps/vnc/render.py b/kvmd/apps/vnc/render.py index fc07a2a9..a443e34e 100644 --- a/kvmd/apps/vnc/render.py +++ b/kvmd/apps/vnc/render.py @@ -25,9 +25,9 @@ import os import io import functools -from PIL import Image -from PIL import ImageDraw -from PIL import ImageFont +from PIL import Image as PilImage +from PIL import ImageDraw as PilImageDraw +from PIL import ImageFont as PilImageFont from ... import aiotools @@ -39,8 +39,8 @@ async def make_text_jpeg(width: int, height: int, quality: int, text: str) -> by @functools.lru_cache(maxsize=10) def _inner_make_text_jpeg(width: int, height: int, quality: int, text: str) -> bytes: - image = Image.new("RGB", (width, height), color=(0, 0, 0)) - draw = ImageDraw.Draw(image) + image = PilImage.new("RGB", (width, height), color=(0, 0, 0)) + draw = PilImageDraw.Draw(image) draw.multiline_text((20, 20), text, font=_get_font(), fill=(255, 255, 255)) with io.BytesIO() as bio: image.save(bio, format="jpeg", quality=quality) @@ -48,8 +48,8 @@ def _inner_make_text_jpeg(width: int, height: int, quality: int, text: str) -> b @functools.lru_cache() -def _get_font() -> ImageFont.FreeTypeFont: +def _get_font() -> PilImageFont.FreeTypeFont: module_path = sys.modules[__name__].__file__ assert module_path is not None path = os.path.join(os.path.dirname(module_path), "fonts", "Azbuka04.ttf") - return ImageFont.truetype(path, size=20) + return PilImageFont.truetype(path, size=20) |