Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix blocking stat() via is_file in image_upload (#122808)

pull/122814/head
J. Nick Koston 2024-07-29 15:38:58 -05:00 committed by GitHub
parent fdab23c3f9
commit 1c03c83c0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
homeassistant/components/image_upload/__init__.py
View File

@ -220,18 +220,18 @@ class ImageServeView(HomeAssistantView):
hass = request.app[KEY_HASS]
target_file = self.image_folder / image_id / f"{width}x{height}"
if not target_file.is_file():
if not await hass.async_add_executor_job(target_file.is_file):
async with self.transform_lock:
# Another check in case another request already
# finished it while waiting
if not target_file.is_file():
await hass.async_add_executor_job(
_generate_thumbnail,
self.image_folder / image_id / "original",
image_info["content_type"],
target_file,
(width, height),
)
await hass.async_add_executor_job(
_generate_thumbnail_if_file_does_not_exist,
target_file,
self.image_folder / image_id / "original",
image_info["content_type"],
target_file,
(width, height),
)
return web.FileResponse(
target_file,
@ -239,16 +239,18 @@ class ImageServeView(HomeAssistantView):
)
def _generate_thumbnail(
def _generate_thumbnail_if_file_does_not_exist(
target_file: pathlib.Path,
original_path: pathlib.Path,
content_type: str,
target_path: pathlib.Path,
target_size: tuple[int, int],
) -> None:
"""Generate a size."""
image = ImageOps.exif_transpose(Image.open(original_path))
image.thumbnail(target_size)
image.save(target_path, format=content_type.partition("/")[-1])
if not target_file.is_file():
image = ImageOps.exif_transpose(Image.open(original_path))
image.thumbnail(target_size)
image.save(target_path, format=content_type.partition("/")[-1])
def _validate_size_from_filename(filename: str) -> tuple[int, int]: