Skip to content

Commit f395969

Browse files
authored
[Fixes #13728] Fixes issues of exif extraction and support for png (#13736)
1 parent e817494 commit f395969

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

geonode/documents/exif/utils.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,13 @@ def exif_extract_metadata_doc(doc):
6969
if not doc.files:
7070
return None
7171

72-
_, ext = os.path.splitext(os.path.basename(doc.files[0]))
72+
file_path = doc.files[0]
73+
_, ext = os.path.splitext(os.path.basename(file_path))
7374

74-
if ext[1:] in {"jpg", "jpeg"}:
75+
if ext[1:] in {"jpg", "jpeg", "png"}:
7576
from PIL import Image, ExifTags
7677

77-
img = Image.open(doc.doc_file.path)
78+
img = Image.open(file_path)
7879
exif_data = {ExifTags.TAGS[k]: v for k, v in img._getexif().items() if k in ExifTags.TAGS}
7980

8081
model = None

geonode/documents/views.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ def form_valid(self, form):
199199
except Exception:
200200
logger.debug("Exif extraction failed.")
201201

202+
bbox_poly = BBOXHelper.from_xy(bbox).as_polygon() if bbox else None
202203
resource_manager.update(
203204
self.object.uuid,
204205
instance=self.object,
@@ -208,7 +209,8 @@ def form_valid(self, form):
208209
abstract=abstract,
209210
date=date,
210211
date_type="Creation",
211-
bbox_polygon=BBOXHelper.from_xy(bbox).as_polygon() if bbox else None,
212+
bbox_polygon=bbox_poly,
213+
ll_bbox_polygon=bbox_poly,
212214
),
213215
notify=True,
214216
)

0 commit comments

Comments
 (0)