cleanup: various polish, drop dead settings field, stronger typing

Simplify make_group_key to just path.with_extension(""). Drop
group_associated_files entirely since it never shipped. Introduce
GroupId type alias instead of bare strings. Rename the filter label
to 'Group RAW + JPEG' for clarity. Tighten up comments.

Author: EnTeQuAk

src-tauri/src/file_management.rs

@@ -397,10 +397,6 @@ pub struct AppSettings {
     pub waveform_height: Option<u32>,
     #[serde(default)]
     pub active_waveform_channel: Option<String>,
-    /// Deprecated: grouping is now driven by the rawStatus filter.
-    /// Kept for backward-compatible deserialization of existing settings.
-    #[serde(default, skip_serializing)]
-    pub group_associated_files: Option<bool>,
     #[serde(default)]
     pub group_preferred_type: Option<String>,
 }
@@ -469,7 +465,6 @@ impl Default for AppSettings {
             is_waveform_visible: Some(false),
             waveform_height: Some(220),
             active_waveform_channel: Some("luma".to_string()),
-            group_associated_files: Some(false),
             group_preferred_type: Some("raw".to_string()),
         }
     }
@@ -487,21 +482,16 @@ pub struct ImageFile {
     group_id: Option<String>,
 }
 
-/// Build a grouping key from a source image path: "{parent_dir}/{stem}".
-/// Files sharing this key in the same directory are variants of the same shot.
-/// Stems are compared case-sensitively. On case-insensitive filesystems
-/// (macOS, Windows) this matches OS behavior; on Linux, mixed-case stems
-/// from the same camera are practically nonexistent.
+/// Grouping key from a source image path: the full path with the
+/// extension stripped. Files sharing this key are variants of the
+/// same shot. Case-sensitive.
 fn make_group_key(source_path: &Path) -> String {
-    let parent = source_path.parent().unwrap_or(Path::new(""));
-    let stem = source_path.file_stem().unwrap_or_default();
-    format!("{}/{}", parent.to_string_lossy(), stem.to_string_lossy())
+    source_path.with_extension("").to_string_lossy().into_owned()
 }
 
-/// Assign `group_id` to files that share a stem with another file in the same
-/// directory. Virtual copies are excluded from counting (so one file + its VC
-/// don't form a false group) but included in assignment (they inherit the
-/// group_id of their source).
+/// Tag files that share a stem with `group_id`. Virtual copies are
+/// excluded from counting (one file + its virtual copy don't form a
+/// group) but still get assigned the group_id of their source.
 fn assign_group_ids(files: &mut Vec<ImageFile>) {
     let mut stem_sources: HashMap<String, HashSet<PathBuf>> = HashMap::new();
 
@@ -2605,12 +2595,9 @@ pub fn delete_files_with_associated(paths: Vec<String>) -> Result<(), String> {
                 let entry_filename_str = entry_filename.to_string_lossy();
 
                 if entry_filename_str.ends_with(".rrdata") {
-                    // Sidecars are named {image_filename}.rrdata or
-                    // {image_filename}.{vc_id}.rrdata. Extract the image
-                    // stem by finding the image filename prefix then
-                    // taking its stem.
+                    // Sidecars: {filename}.rrdata or {filename}.{vc_id}.rrdata
+                    // VC ids are first 6 chars of a UUID v4, see create_virtual_copy()
                     let without_rrdata = entry_filename_str.trim_end_matches(".rrdata");
-                    // Strip optional VC id suffix (6 hex chars after a dot)
                     let image_filename = if let Some(dot_pos) = without_rrdata.rfind('.') {
                         let suffix = &without_rrdata[dot_pos + 1..];
                         if suffix.len() == 6 && suffix.chars().all(|c| c.is_ascii_hexdigit()) {

src/App.tsx

@@ -116,6 +116,7 @@ import {
   ThumbnailSize,
   ThumbnailAspectRatio,
   CullingSuggestions,
+  GroupId,
   GroupPreference,
 } from './components/ui/AppProperties';
 import { buildImageGroups, getVariantLabel, GroupingResult } from './utils/imageGrouping';
@@ -1050,10 +1051,10 @@ function App() {
     return buildImageGroups(imageList, groupPreferredType);
   }, [imageList, isGroupingActive, groupPreferredType]);
 
-  // Badge info for grouped thumbnails: count + label like "RAF+JPG"
-  const groupBadgeInfo: Record<string, { count: number; label: string }> = useMemo(() => {
+  // Per-group badge data for thumbnails (count + extension label like "RAF+JPG")
+  const groupBadgeInfo: Record<GroupId, { count: number; label: string }> = useMemo(() => {
     if (!groupingResult) return {};
-    const info: Record<string, { count: number; label: string }> = {};
+    const info: Record<GroupId, { count: number; label: string }> = {};
     for (const [groupId, group] of groupingResult.groups) {
       const extensions = [...new Set(group.variants.map((v) => getVariantLabel(v.path)))];
       info[groupId] = {
@@ -1064,9 +1065,8 @@ function App() {
     return info;
   }, [groupingResult]);
 
-  // Variant options for the editor toolbar switcher.
-  // Suppress for virtual copies: the pills would point to originals,
-  // silently leaving the VC context.
+  // Variant pills for the editor toolbar. Suppressed for VCs since the
+  // pills point to originals and would silently leave the VC context.
   const variantOptions = useMemo(() => {
     if (!selectedImage || !groupingResult) return [];
     const imageFile = imageList.find((img) => img.path === selectedImage.path);
@@ -1079,7 +1079,7 @@ function App() {
     }));
   }, [selectedImage?.path, groupingResult, imageList]);
 
-  // Filmstrip: when viewing a non-primary variant, highlight the group's primary
+  // Highlight the group primary in the filmstrip even when viewing a non-primary variant
   const filmstripActivePath = useMemo(() => {
     if (!selectedImage) return null;
     if (!groupingResult) return selectedImage.path;
@@ -3933,8 +3933,7 @@ function App() {
 
     const hasAssociatedFiles = finalSelection.some((selectedPath) => {
       const image = imageList.find((img) => img.path === selectedPath);
-      // group_id is always set by Rust when >= 2 files share a stem,
-      // regardless of whether the grouping UI is active.
+      // Rust sets group_id when >= 2 files share a stem, independent of the UI toggle
       return image?.group_id != null;
     });
 

src/components/panel/MainLibrary.tsx

@@ -29,6 +29,7 @@ import { ThemeProps, THEMES, DEFAULT_THEME_ID } from '../../utils/themes';
 import {
   AppSettings,
   FilterCriteria,
+  GroupId,
   GroupPreference,
   ImageFile,
   Invokes,
@@ -115,7 +116,7 @@ interface MainLibraryProps {
   thumbnailSize: ThumbnailSize;
   onNavigateToCommunity(): void;
   groupPreferredType: GroupPreference;
-  groupBadgeInfo?: Record<string, { count: number; label: string }>;
+  groupBadgeInfo?: Record<GroupId, { count: number; label: string }>;
   onGroupPreferredTypeChange(type: GroupPreference): void;
 }
 
@@ -203,7 +204,7 @@ const rawStatusOptions: Array<KeyValueLabel> = [
   { key: RawStatus.All, label: 'All Types' },
   { key: RawStatus.RawOnly, label: 'RAW Only' },
   { key: RawStatus.NonRawOnly, label: 'Non-RAW Only' },
-  { key: RawStatus.GroupVariants, label: 'Group Variants' },
+  { key: RawStatus.GroupVariants, label: 'Group RAW + JPEG' },
 ];
 
 const thumbnailSizeOptions: Array<ThumbnailSizeOption> = [

src/components/ui/AppProperties.tsx

@@ -94,8 +94,7 @@ export enum RawStatus {
   All = 'all',
   NonRawOnly = 'nonRawOnly',
   RawOnly = 'rawOnly',
-  /** @deprecated Use GroupVariants instead. Kept for settings migration. */
-  RawOverNonRaw = 'rawOverNonRaw',
+  RawOverNonRaw = 'rawOverNonRaw', // migration: old saved settings may have this value
   GroupVariants = 'groupVariants',
 }
 
@@ -156,7 +155,6 @@ export interface AppSettings {
   isWaveformVisible?: boolean;
   waveformHeight?: number;
   activeWaveformChannel?: string;
-  groupAssociatedFiles?: boolean;
   groupPreferredType?: GroupPreference;
 }
 
@@ -184,6 +182,9 @@ export interface Folder {
   imageCount?: number;
 }
 
+/** Opaque group identifier: "{parent_dir}/{file_stem}" assigned by the backend. */
+export type GroupId = string;
+
 export interface ImageFile {
   is_edited: boolean;
   is_raw: boolean;
@@ -192,13 +193,13 @@ export interface ImageFile {
   path: string;
   tags: Array<string> | null;
   exif: { [key: string]: string } | null;
-  group_id: string | null;
+  group_id: GroupId | null;
 }
 
 export type GroupPreference = 'jpeg' | 'raw';
 
 export interface ImageGroup {
-  groupId: string;
+  groupId: GroupId;
   primary: ImageFile;
   variants: ImageFile[];
   virtualCopies: ImageFile[];

src/utils/imageGrouping.ts

@@ -1,25 +1,21 @@
-import { GroupPreference, ImageFile, ImageGroup } from '../components/ui/AppProperties';
+import { GroupId, GroupPreference, ImageFile, ImageGroup } from '../components/ui/AppProperties';
 
 export interface GroupingResult {
-  /** Map from group_id to group info. */
-  groups: Map<string, ImageGroup>;
-  /** Image list with non-primary group variants removed. */
+  groups: Map<GroupId, ImageGroup>;
+  /** Image list with non-primary variants filtered out. */
   displayList: ImageFile[];
 }
 
 /**
- * Group images by their Rust-assigned group_id and pick a primary per group
- * based on user preference. Returns both the group map (for lookups) and
- * the collapsed display list (for rendering in the grid/filmstrip).
- *
- * Virtual copies are attached to their source group but always remain visible
- * in the display list (never collapsed).
+ * Bucket images by their backend-assigned group_id, pick a primary per
+ * group, return a collapsed display list. Virtual copies stay visible
+ * (never collapsed).
  */
 export function buildImageGroups(
   images: ImageFile[],
   preference: GroupPreference,
 ): GroupingResult {
-  const buckets = new Map<string, { files: ImageFile[]; vcs: ImageFile[] }>();
+  const buckets = new Map<GroupId, { files: ImageFile[]; vcs: ImageFile[] }>();
 
   for (const image of images) {
     if (!image.group_id) continue;
@@ -37,7 +33,7 @@ export function buildImageGroups(
     }
   }
 
-  const groups = new Map<string, ImageGroup>();
+  const groups = new Map<GroupId, ImageGroup>();
   const groupedPaths = new Set<string>();
 
   for (const [groupId, bucket] of buckets) {
@@ -82,16 +78,16 @@ function pickPrimary(files: ImageFile[], preference: GroupPreference): ImageFile
   }
 }
 
-/** Extract the file extension from a path, lowercased. */
+/** File extension from a path, lowercased. Handles ?vc= suffixes. */
 export function getFileExtension(path: string): string {
-  // Strip any ?vc= suffix before looking for the extension
+  // Strip ?vc= suffix before extracting the extension
   const clean = path.split('?')[0];
   const dot = clean.lastIndexOf('.');
   if (dot === -1) return '';
   return clean.substring(dot + 1).toLowerCase();
 }
 
-/** Get a display label for a variant (e.g., "RAF", "JPG", "DNG"). */
+/** Display label for a variant: uppercase extension (e.g. "RAF", "JPG"). */
 export function getVariantLabel(path: string): string {
   const ext = getFileExtension(path);
   return ext ? ext.toUpperCase() : 'FILE';