Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add basic support for .heic files #519

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies = [
dynamic = ["version"]

[project.optional-dependencies]
all = ["boto", "brotli", "feedgenerator", "zopfli", "cryptography"]
all = ["boto", "brotli", "feedgenerator", "zopfli", "cryptography", "pillow-heif"]
tests = ["pytest", "pytest-cov"]
docs = ["Sphinx>=4.1.0", "furo", "cryptography"]

Expand Down
4 changes: 2 additions & 2 deletions src/sigal/gallery.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def exif(self):
datetime_format = self.settings["datetime_format"]
return (
get_exif_tags(self.raw_exif, datetime_format=datetime_format)
if self.raw_exif and self.src_ext in (".jpg", ".jpeg")
if self.raw_exif and self.src_ext in (".jpg", ".jpeg", ".heic")
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The extension list here and below should also include ".heif" I guess ?
Also, those extensions should be recognized only if pillow-heif is available, so might be better to store this list somewhere where it can be imported (in the image module ?) and reused.

else None
)

Expand All @@ -289,7 +289,7 @@ def _get_markdown_metadata(self):
@cached_property
def raw_exif(self):
"""If not `None`, contains the raw EXIF tags."""
if self.src_ext in (".jpg", ".jpeg"):
if self.src_ext in (".jpg", ".jpeg", ".heic"):
return self.file_metadata["exif"]

@cached_property
Expand Down
13 changes: 11 additions & 2 deletions src/sigal/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
from pilkit.processors import Transpose
from pilkit.utils import save_image

try:
from pillow_heif import HeifImagePlugin
except:
pass

from . import signals, utils

# Force loading of truncated files
Expand Down Expand Up @@ -220,7 +225,11 @@ def get_exif_data(filename):

try:
with warnings.catch_warnings(record=True) as caught_warnings:
exif = img._getexif() or {}
exif = {}
if hasattr(img, "_getexif") and callable(img._getexif):
exif = img._getexif()
elif "exif" in img.info:
exif = img.getexif()._get_merged_dict()
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

img._getexif() is an alias for img.getexif()._get_merged_dict() so we can probably switch to the public methods, which I think are supported since a long time ? (Our min version of pillow is 8.0 currently)

except ZeroDivisionError:
logger.warning("Failed to read EXIF data.")
return None
Expand Down Expand Up @@ -290,7 +299,7 @@ def get_image_metadata(filename):
logger.error("Could not open image %s metadata: %s", filename, e)
else:
try:
if os.path.splitext(filename)[1].lower() in (".jpg", ".jpeg"):
if os.path.splitext(filename)[1].lower() in (".jpg", ".jpeg", ".heic"):
exif = get_exif_data(img)
except Exception as e:
logger.warning("Could not read EXIF data from %s: %s", filename, e)
Expand Down