Skip to content

Commit c103302

Browse files
Merge pull request #805 from OliverZhaohaibin/main
Enhance video editing, metadata extraction, and CI test stability
2 parents 5c7c3ae + b9840cd commit c103302

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/iPhoto/io/metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def read_image_meta_with_exiftool(
219219
geometry_missing = info["w"] is None or info["h"] is None
220220
need_dt_fallback = info["dt"] is None
221221

222-
if (geometry_missing or need_dt_fallback) and Image is not None and UnidentifiedImageError is not None:
222+
if (geometry_missing or need_dt_fallback) and Image is not None and UnidentifiedImageError is not None and path.exists():
223223
LOGGER.debug("Opening %s with Pillow to backfill metadata", path)
224224
try:
225225
with Image.open(path) as img:

tests/test_info_panel.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def test_info_panel_video_shows_lens_when_available(qapp: QApplication) -> None:
8080

8181
panel.set_asset_metadata(metadata)
8282

83-
assert panel._lens_label.isVisible()
83+
assert not panel._lens_label.isHidden()
8484
assert "iPhone 12 back camera 4.2mm f/1.6" in panel._lens_label.text()
8585
panel.close()
8686

@@ -199,7 +199,7 @@ def test_info_panel_video_shows_lens_spec_string_when_no_model_name(qapp: QAppli
199199

200200
panel.set_asset_metadata(meta)
201201

202-
assert panel._lens_label.isVisible()
202+
assert not panel._lens_label.isHidden()
203203
assert "23mm f/2" in panel._lens_label.text()
204204
panel.close()
205205

@@ -232,7 +232,7 @@ def test_info_panel_lens_spec_string_not_duplicated_when_focal_and_fnumber_also_
232232
panel.set_asset_metadata(meta)
233233

234234
label_text = panel._lens_label.text()
235-
assert panel._lens_label.isVisible()
235+
assert not panel._lens_label.isHidden()
236236
assert label_text == "23mm f/2"
237237
panel.close()
238238

@@ -260,9 +260,9 @@ def test_info_panel_named_lens_model_gets_focal_appended(
260260
panel.set_asset_metadata(meta)
261261

262262
label_text = panel._lens_label.text()
263-
assert panel._lens_label.isVisible()
263+
assert not panel._lens_label.isHidden()
264264
# The named model should be present and enriched with focal + aperture info.
265265
assert "XF23mmF2 R WR" in label_text
266266
assert "23" in label_text # focal length must appear
267-
assert "f/2" in label_text # aperture must appear
267+
assert "ƒ2" in label_text # aperture must appear
268268
panel.close()

0 commit comments

Comments
 (0)