Skip to content

Merge changes from PR54 + some fixes to PR54 #57

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.

Sign up for GitHub

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

Merged
AlanRockefeller merged 9 commits into from
Mar 24, 2026
Merged

Merge changes from PR54 + some fixes to PR54 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c34d0bd
Fix sidecar metadata lookup to use stable image path keys
Dj-Shortcut Mar 17, 2026
c5a5abb
Fix-sidecar-dotted-key-migration-and-logging-fallbacks
Dj-Shortcut Mar 18, 2026
bc52c39
Fix-logging-fallback-to-console-only
Dj-Shortcut Mar 18, 2026
3261487
Add-tempdir-warning-and-empty-Path-tests
Dj-Shortcut Mar 18, 2026
3eef803
Fix sidecar key handling and hot-path metadata lookups
AlanRockefeller Mar 20, 2026
1467442
Fix issues identified by coderabbit
AlanRockefeller Mar 20, 2026
234ed9b
Fix bulk metadata access to use get_metadata and ensure migration of …
AlanRockefeller Mar 24, 2026
6cd43bf
Merge branch 'pr-54' into test
AlanRockefeller Mar 24, 2026
437efb1
fix issues identified by coderabbit
AlanRockefeller Mar 24, 2026
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
87 changes: 42 additions & 45 deletions faststack/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ def __init__(
get_metadata_callback=self._get_metadata_dict,
get_batch_indices_callback=self._get_batch_indices,
get_current_index_callback=self._get_current_loupe_index,
metadata_key_fn=lambda p: self.sidecar.metadata_key_for_path(p),
thumbnail_size=200,
parent=self, # Ensure proper Qt ownership to prevent GC issues
)
Expand Down Expand Up @@ -1040,13 +1041,9 @@ def _apply_filter_to_cached_list(self):
# Apply flag-based filtering (AND logic: image must have ALL checked flags)
if self._filter_enabled and self._filter_flags:
flags = self._filter_flags
# Optimize: access sidecar entries directly to avoid get_metadata overhead
entries = self.sidecar.data.entries
result = []
for img in filtered:
# Direct dict lookup is faster than get_metadata() which might create objects
stem = img.path.stem
meta = entries.get(stem)
meta = self.sidecar.get_metadata(img.path, create=False)
if not meta:
continue

Expand Down Expand Up @@ -1810,7 +1807,7 @@ def jump_to_last_uploaded(self):
for idx in range(len(self.image_files) - 1, -1, -1):
img = self.image_files[idx]
# Dynamic look-up of self.sidecar as requested (important for mocks in tests)
meta = self.sidecar.get_metadata(img.path.stem, create=False)
meta = self.sidecar.get_metadata(img.path, create=False)

uploaded = meta.uploaded if meta else False

Expand Down Expand Up @@ -2126,10 +2123,10 @@ def _on_thumbnail_ready_gui(self, thumbnail_id: str):
if self._thumbnail_model:
self._thumbnail_model.thumbnailReady.emit(thumbnail_id)

def _get_metadata_dict(self, stem: str) -> dict:
"""Get metadata for a file stem as a dict for thumbnail model."""
def _get_metadata_dict(self, image_path: Path | str) -> dict:
"""Get metadata for an image path as a dict for thumbnail model."""
try:
meta = self.sidecar.get_metadata(stem, create=False)
meta = self.sidecar.get_metadata(image_path, create=False)
if meta is None:
return {
"stacked": False,
Expand All @@ -2148,7 +2145,7 @@ def _get_metadata_dict(self, stem: str) -> dict:
"todo": meta.todo,
}
except Exception as e: # Broad catch for UI plumbing - don't crash grid view
log.debug("Failed to get metadata for %s: %s", stem, e)
log.debug("Failed to get metadata for %s: %s", image_path, e)
return {
"stacked": False,
"uploaded": False,
Expand All @@ -2162,9 +2159,12 @@ def _get_bulk_metadata_map(self) -> Dict[str, dict]:
"""Get flattened metadata map for all images (for efficient grid refresh)."""
bulk_map = {}
try:
# sidecar.data.entries is a dict of stem -> EntryMetadata
for stem, meta in self.sidecar.data.entries.items():
bulk_map[stem] = {
for img in self.image_files:
key = self.sidecar.metadata_key_for_path(img.path)
meta = self.sidecar.get_metadata(img.path, create=False)
if meta is None:
continue
bulk_map[key] = {
"stacked": getattr(meta, "stacked", False),
"uploaded": getattr(meta, "uploaded", False),
"edited": getattr(meta, "edited", False),
Expand Down Expand Up @@ -2214,8 +2214,8 @@ def toggle_uploaded(self):
return

today = datetime.now().strftime("%Y-%m-%d")
stem = self.image_files[self.current_index].path.stem
meta = self.sidecar.get_metadata(stem)
image_path = self.image_files[self.current_index].path
meta = self.sidecar.get_metadata(image_path)

meta.uploaded = not meta.uploaded
if meta.uploaded:
Expand All @@ -2229,16 +2229,16 @@ def toggle_uploaded(self):
self.sync_ui_state()
status = "uploaded" if meta.uploaded else "not uploaded"
self.update_status_message(f"Marked as {status}")
log.info("Toggled uploaded flag to %s for %s", meta.uploaded, stem)
log.info("Toggled uploaded flag to %s for %s", meta.uploaded, image_path)

def toggle_todo(self):
"""Toggle todo flag for current image."""
if not self.image_files or self.current_index >= len(self.image_files):
return

today = datetime.now().strftime("%Y-%m-%d")
stem = self.image_files[self.current_index].path.stem
meta = self.sidecar.get_metadata(stem)
image_path = self.image_files[self.current_index].path
meta = self.sidecar.get_metadata(image_path)

meta.todo = not getattr(meta, "todo", False)
if meta.todo:
Expand All @@ -2252,16 +2252,16 @@ def toggle_todo(self):
self.sync_ui_state()
status = "todo" if meta.todo else "not todo"
self.update_status_message(f"Marked as {status}")
log.info("Toggled todo flag to %s for %s", meta.todo, stem)
log.info("Toggled todo flag to %s for %s", meta.todo, image_path)

def toggle_edited(self):
"""Toggle edited flag for current image."""
if not self.image_files or self.current_index >= len(self.image_files):
return

today = datetime.now().strftime("%Y-%m-%d")
stem = self.image_files[self.current_index].path.stem
meta = self.sidecar.get_metadata(stem)
image_path = self.image_files[self.current_index].path
meta = self.sidecar.get_metadata(image_path)

meta.edited = not meta.edited
if meta.edited:
Expand All @@ -2275,16 +2275,16 @@ def toggle_edited(self):
self.sync_ui_state()
status = "edited" if meta.edited else "not edited"
self.update_status_message(f"Marked as {status}")
log.info("Toggled edited flag to %s for %s", meta.edited, stem)
log.info("Toggled edited flag to %s for %s", meta.edited, image_path)

def toggle_restacked(self):
"""Toggle restacked flag for current image."""
if not self.image_files or self.current_index >= len(self.image_files):
return

today = datetime.now().strftime("%Y-%m-%d")
stem = self.image_files[self.current_index].path.stem
meta = self.sidecar.get_metadata(stem)
image_path = self.image_files[self.current_index].path
meta = self.sidecar.get_metadata(image_path)

meta.restacked = not meta.restacked
if meta.restacked:
Expand All @@ -2298,15 +2298,15 @@ def toggle_restacked(self):
self.sync_ui_state()
status = "restacked" if meta.restacked else "not restacked"
self.update_status_message(f"Marked as {status}")
log.info("Toggled restacked flag to %s for %s", meta.restacked, stem)
log.info("Toggled restacked flag to %s for %s", meta.restacked, image_path)

def toggle_favorite(self):
"""Toggle favorite flag for current image."""
if not self.image_files or self.current_index >= len(self.image_files):
return

stem = self.image_files[self.current_index].path.stem
meta = self.sidecar.get_metadata(stem)
image_path = self.image_files[self.current_index].path
meta = self.sidecar.get_metadata(image_path)

meta.favorite = not meta.favorite

Expand All @@ -2316,16 +2316,16 @@ def toggle_favorite(self):
self.sync_ui_state()
status = "Favorited" if meta.favorite else "Unfavorited"
self.update_status_message(status)
log.info("Toggled favorite flag to %s for %s", meta.favorite, stem)
log.info("Toggled favorite flag to %s for %s", meta.favorite, image_path)

def toggle_stacked(self):
"""Toggle stacked flag for current image."""
if not self.image_files or self.current_index >= len(self.image_files):
return

today = datetime.now().strftime("%Y-%m-%d")
stem = self.image_files[self.current_index].path.stem
meta = self.sidecar.get_metadata(stem)
image_path = self.image_files[self.current_index].path
meta = self.sidecar.get_metadata(image_path)

meta.stacked = not meta.stacked
if meta.stacked:
Expand All @@ -2339,7 +2339,7 @@ def toggle_stacked(self):
self.sync_ui_state()
status = "stacked" if meta.stacked else "not stacked"
self.update_status_message(f"Marked as {status}")
log.info("Toggled stacked flag to %s for %s", meta.stacked, stem)
log.info("Toggled stacked flag to %s for %s", meta.stacked, image_path)

def get_current_metadata(self) -> Dict:
if not self.image_files or self.current_index >= len(self.image_files):
Expand All @@ -2357,8 +2357,8 @@ def get_current_metadata(self) -> Dict:
return self._metadata_cache

# Compute and cache
stem = self.image_files[self.current_index].path.stem
meta = self.sidecar.get_metadata(stem, create=False)
image_path = self.image_files[self.current_index].path
meta = self.sidecar.get_metadata(image_path, create=False)
stack_info = self._get_stack_info(self.current_index)
batch_info = self._get_batch_info(self.current_index)

Expand Down Expand Up @@ -2619,7 +2619,7 @@ def add_favorites_to_batch(self):
# Find indices of all favorited images
indices_to_add = []
for i, img in enumerate(self.image_files):
meta = self.sidecar.get_metadata(img.path.stem, create=False)
meta = self.sidecar.get_metadata(img.path, create=False)
if meta and meta.favorite:
indices_to_add.append(i)

Expand Down Expand Up @@ -2674,7 +2674,7 @@ def add_uploaded_to_batch(self):
# Find indices of all uploaded images
indices_to_add = []
for i, img in enumerate(self.image_files):
meta = self.sidecar.get_metadata(img.path.stem, create=False)
meta = self.sidecar.get_metadata(img.path, create=False)
if meta and meta.uploaded:
indices_to_add.append(i)

Expand Down Expand Up @@ -3099,8 +3099,7 @@ def _launch_helicon_with_files(self, files: List[Path]) -> bool:
for img_file in self.image_files:
# Match by either RAW pair or JPG path
if img_file.raw_pair == file_path or img_file.path == file_path:
stem = img_file.path.stem
meta = self.sidecar.get_metadata(stem)
meta = self.sidecar.get_metadata(img_file.path)
meta.stacked = True
meta.stacked_date = today
break
Expand Down Expand Up @@ -5448,8 +5447,7 @@ def edit_in_photoshop(self):

# Mark as edited on successful launch
today = datetime.now().strftime("%Y-%m-%d")
stem = image_file.path.stem
meta = self.sidecar.get_metadata(stem)
meta = self.sidecar.get_metadata(image_file.path)
meta.edited = True
meta.edited_date = today
self.sidecar.save()
Expand Down Expand Up @@ -5583,8 +5581,7 @@ def start_drag_current_image(self):
today = datetime.now().strftime("%Y-%m-%d")

for idx in existing_indices:
stem = self.image_files[idx].path.stem
meta = self.sidecar.get_metadata(stem)
meta = self.sidecar.get_metadata(self.image_files[idx].path)
meta.uploaded = True
meta.uploaded_date = today

Expand Down Expand Up @@ -6456,8 +6453,7 @@ def stack_source_raws(self):
if success:
# Mark as restacked on success
today = datetime.now().strftime("%Y-%m-%d")
stem = self.image_files[self.current_index].path.stem
meta = self.sidecar.get_metadata(stem)
meta = self.sidecar.get_metadata(self.image_files[self.current_index].path)
meta.restacked = True
meta.restacked_date = today
self.sidecar.save()
Expand Down Expand Up @@ -7363,8 +7359,9 @@ def get_stack_summary(self) -> str:
def is_stacked(self) -> bool:
if not self.image_files or self.current_index >= len(self.image_files):
return False
stem = self.image_files[self.current_index].path.stem
meta = self.sidecar.get_metadata(stem, create=False)
meta = self.sidecar.get_metadata(
self.image_files[self.current_index].path, create=False
)
return meta.stacked if meta else False

def _update_cache_stats(self):
Expand Down
Loading
Loading