LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Merge PR #1549
Brandon Thomas2fd769963ee6
diff --cc crates/engine/src/tests_merge.rsindex 366e72476,8cb85120f..aaa59acb1--- a/crates/engine/src/tests_merge.rs+++ b/crates/engine/src/tests_merge.rs@@@ -169,33 -177,21 +177,52 @@@ fn panorama_command_with_auto_crop()let _ = std::fs::remove_dir_all(&dir);}+/// HDR for Each Bracket Set: two stacks of brackets → two merged DNGs, each next to its first photo; photos that form+/// no set are refused.+#[test]+fn hdr_batch_merges_each_stack() {+ let dir = temp_dir("hdr-batch");+ let mut paths = Vec::new();+ // different exposures, or the import would take set B for duplicates of set A+ for (set, evs) in [("A", [-2.0, 0.0, 2.0]), ("B", [-1.5, 0.5, 2.5])] {+ for (i, b) in lightcraft_merge::synth::bracket_dngs(240, 160, &evs).unwrap().into_iter().enumerate() {+ let p = dir.join(format!("{set}_{i}.dng"));+ std::fs::write(&p, b).unwrap();+ paths.push(p.to_string_lossy().to_string());+ }+ }+ let mut s = Session::new().with_fs();+ let ids = import(&mut s, paths);+ assert_eq!(ids.len(), 6);+ let err = s.execute("merge.hdrBatch", &json!({"ids": [ids[0]]})).unwrap_err().to_string();+ assert!(err.contains("no bracket sets"), "{err}");+ s.execute("stack.group", &json!({"ids": ids[..3]})).unwrap();+ s.execute("stack.group", &json!({"ids": ids[3..]})).unwrap();+ let r = s.execute("merge.hdrBatch", &json!({"ids": [ids[0], ids[3]], "autoSettings": false})).unwrap();+ let merged = r["merged"].as_array().unwrap();+ assert_eq!(merged.len(), 2, "{r}");+ assert!(r["failed"].as_array().unwrap().is_empty(), "{r}");+ let names: Vec<&str> = merged.iter().map(|m| m["path"].as_str().unwrap()).collect();+ assert!(names[0].ends_with("A_0-HDR.dng") && names[1].ends_with("B_0-HDR.dng"), "{names:?}");+ assert_eq!(s.catalog.photos().count(), 8);+ let _ = std::fs::remove_dir_all(&dir);+}+++ /// Issue #1455: a panorama keeps its photos' resolution, held to what fits in memory beside them+ /// (never below the 40 MP every panorama used to have), and never above a size asked for.+ #[test]+ fn panorama_size_is_held_to_memory() {+ use crate::merge::{MIN_FITTED_MEGAPIXELS, fit_in_memory};+ let full = lightcraft_merge::PanoOptions::default();+ let gb = |g: usize| Some(g << 30);+ let photos = 5.0 * 51e6; // five 51 MP photos+ let mp = |o: lightcraft_merge::PanoOptions| o.max_megapixels;+ assert_eq!(mp(fit_in_memory(&full, photos, gb(512))), lightcraft_merge::pano::MAX_MEGAPIXELS, "plenty of memory: the full size");+ let m16 = mp(fit_in_memory(&full, photos, gb(16)));+ assert!(m16 > MIN_FITTED_MEGAPIXELS && m16 < 512.0, "16 GB: {m16} MP");+ assert!(mp(fit_in_memory(&full, photos, gb(32))) > m16, "more memory, more pixels");+ assert_eq!(mp(fit_in_memory(&full, photos, gb(4))), MIN_FITTED_MEGAPIXELS, "never below 40 MP");+ let asked = lightcraft_merge::PanoOptions { max_megapixels: 20.0, ..full.clone() };+ assert_eq!(mp(fit_in_memory(&asked, photos, gb(16))), 20.0, "a size asked for is kept when it fits");+ assert_eq!(fit_in_memory(&full, 1e6, None), fit_in_memory(&full, 1e6, gb(8)), "memory unknown: taken as 8 GB");+ }diff --cc crates/ui-egui/locales/de-formats.jsonindex ce601ae33,4424af1b2..f198457bb--- a/crates/ui-egui/locales/de-formats.json+++ b/crates/ui-egui/locales/de-formats.json@@@ -265,27 -248,6 +265,29 @@@"{name} opened in the other editor": "{name} im anderen Editor geöffnet","{n} originals opened in the other editor": "{n} Originale im anderen Editor geöffnet","· {in_source} identical copies": "· {in_source} identische Kopien",+ "{count} more warnings.": "{count} weitere Warnungen.",+ "{photos} catalog records processed; {collections} collections.": "{photos} Katalogeinträge verarbeitet; {collections} Sammlungen.",+ "{missing} originals are missing. Their catalog records are available; use Find Missing Photos to relink them.": "{missing} Originale fehlen. Ihre Katalogeinträge sind verfügbar; verwende „Fehlende Fotos suchen“, um sie neu zu verknüpfen.",+ "Applied {name}": "{name} angewendet",+ "Delete “{name}”?": "„{name}“ löschen?",+ "Updated {name}": "{name} aktualisiert",+ "Exported to {path}": "Exportiert nach {path}",+ "Saved template {name}": "Vorlage {name} gespeichert",+ "Imported {name}": "{name} importiert",+ "Skipped {problem}": "Übersprungen: {problem}",+ "…and {more} more": "…und {more} weitere",+ "Template preview: {name}": "Vorlagenvorschau: {name}",+ "{n} photos in view · {slides} slides · {time}": "{n} Fotos in der Ansicht · {slides} Folien · {time}",+ "{n} pages": "{n} Seiten",+ "{n} JPEG files": "{n} JPEG-Dateien",+ "{s} s of AV1 video": "{s} s AV1-Video",+ "Slideshow exported: {what}": "Diashow exportiert: {what}",+ " · {n} skipped (could not be rendered)": " · {n} übersprungen (nicht darstellbar)",+ "{n} raws can now be developed from their raw data": "{n} RAW-Dateien können jetzt aus ihren Rohdaten entwickelt werden",+ "LightCraft stopped unexpectedly: {e}\n\nThe log file has the details: {path}": "LightCraft wurde unerwartet beendet: {e}\n\nEinzelheiten stehen in der Protokolldatei: {path}",+ "LightCraft stopped unexpectedly: {e}": "LightCraft wurde unerwartet beendet: {e}",+ "Renames {n} face{} across the library. The files are not changed.": "Benennt {n} Gesichter in der Bibliothek um. Die Dateien werden nicht geändert.{:.0}",- "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "„{to}“ ist bereits eine Person. Zusammenführen ergibt eine Person; Rückgängig trennt sie wieder."++ "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "„{to}“ ist bereits eine Person. Zusammenführen ergibt eine Person; Rückgängig trennt sie wieder.",+ "{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "{what}-Zusammenfügung mit {mp} hinzugefügt: die volle Größe, {full}, braucht mehr Arbeitsspeicher, als dieser Computer hat",+ "{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "{what}-Zusammenfügung mit {mp} hinzugefügt, der größten möglichen Panoramagröße (volle Größe: {full})"}diff --cc crates/ui-egui/locales/es-formats.jsonindex fb2c80100,403762642..8274ed8be--- a/crates/ui-egui/locales/es-formats.json+++ b/crates/ui-egui/locales/es-formats.json@@@ -265,27 -248,6 +265,29 @@@"{name} opened in the other editor": "{name} abierto en el otro editor","{n} originals opened in the other editor": "{n} originales abiertos en el otro editor","· {in_source} identical copies": "· {in_source} copias idénticas",+ "{count} more warnings.": "{count} advertencias más.",+ "{photos} catalog records processed; {collections} collections.": "{photos} registros del catálogo procesados; {collections} colecciones.",+ "{missing} originals are missing. Their catalog records are available; use Find Missing Photos to relink them.": "Faltan {missing} originales. Sus registros del catálogo están disponibles; usa Buscar fotos que faltan para volver a vincularlos.",+ "Applied {name}": "Se aplicó {name}",+ "Delete “{name}”?": "¿Eliminar «{name}»?",+ "Updated {name}": "Se actualizó {name}",+ "Exported to {path}": "Exportado a {path}",+ "Saved template {name}": "Plantilla {name} guardada",+ "Imported {name}": "Se importó {name}",+ "Skipped {problem}": "Omitido: {problem}",+ "…and {more} more": "…y {more} más",+ "Template preview: {name}": "Vista previa de la plantilla: {name}",+ "{n} photos in view · {slides} slides · {time}": "{n} fotos en la vista · {slides} diapositivas · {time}",+ "{n} pages": "{n} páginas",+ "{n} JPEG files": "{n} archivos JPEG",+ "{s} s of AV1 video": "{s} s de vídeo AV1",+ "Slideshow exported: {what}": "Presentación exportada: {what}",+ " · {n} skipped (could not be rendered)": " · {n} omitidas (no se pudieron representar)",+ "{n} raws can now be developed from their raw data": "{n} RAW ya se pueden revelar a partir de sus datos RAW",+ "LightCraft stopped unexpectedly: {e}\n\nThe log file has the details: {path}": "LightCraft se detuvo inesperadamente: {e}\n\nLos detalles están en el archivo de registro: {path}",+ "LightCraft stopped unexpectedly: {e}": "LightCraft se detuvo inesperadamente: {e}",+ "Renames {n} face{} across the library. The files are not changed.": "Cambia el nombre de {n} cara{} en toda la biblioteca. Los archivos no se modifican.",- "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "“{to}” ya es una persona. Combinarlas deja una sola; Deshacer las separa de nuevo."++ "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "“{to}” ya es una persona. Combinarlas deja una sola; Deshacer las separa de nuevo.",+ "{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "Combinación {what} añadida a {mp}: el tamaño completo, {full}, necesita más memoria de la que tiene este ordenador",+ "{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "Combinación {what} añadida a {mp}, el tamaño máximo de una panorámica (tamaño completo: {full})"}diff --cc crates/ui-egui/locales/fr-formats.jsonindex 45f40081a,2fd99dc91..4a5716b0c--- a/crates/ui-egui/locales/fr-formats.json+++ b/crates/ui-egui/locales/fr-formats.json@@@ -265,27 -248,6 +265,29 @@@"{name} opened in the other editor": "{name} ouvert dans l’autre éditeur","{n} originals opened in the other editor": "{n} originaux ouverts dans l’autre éditeur","· {in_source} identical copies": "· {in_source} copies identiques",+ "{count} more warnings.": "{count} avertissements supplémentaires.",+ "{photos} catalog records processed; {collections} collections.": "{photos} entrées du catalogue traitées ; {collections} collections.",+ "{missing} originals are missing. Their catalog records are available; use Find Missing Photos to relink them.": "{missing} originaux sont manquants. Leurs entrées de catalogue sont disponibles ; utilisez Rechercher les photos manquantes pour rétablir les liens.",+ "Applied {name}": "{name} appliqué",+ "Delete “{name}”?": "Supprimer « {name} » ?",+ "Updated {name}": "{name} mis à jour",+ "Exported to {path}": "Exporté vers {path}",+ "Saved template {name}": "Modèle {name} enregistré",+ "Imported {name}": "{name} importé",+ "Skipped {problem}": "Ignoré : {problem}",+ "…and {more} more": "…et {more} de plus",+ "Template preview: {name}": "Aperçu du modèle : {name}",+ "{n} photos in view · {slides} slides · {time}": "{n} photos affichées · {slides} diapositives · {time}",+ "{n} pages": "{n} pages",+ "{n} JPEG files": "{n} fichiers JPEG",+ "{s} s of AV1 video": "{s} s de vidéo AV1",+ "Slideshow exported: {what}": "Diaporama exporté : {what}",+ " · {n} skipped (could not be rendered)": " · {n} ignorées (rendu impossible)",+ "{n} raws can now be developed from their raw data": "{n} fichiers RAW peuvent désormais être développés à partir de leurs données RAW",+ "LightCraft stopped unexpectedly: {e}\n\nThe log file has the details: {path}": "LightCraft s’est arrêté de façon inattendue : {e}\n\nConsultez le fichier journal pour plus de détails : {path}",+ "LightCraft stopped unexpectedly: {e}": "LightCraft s’est arrêté de façon inattendue : {e}",+ "Renames {n} face{} across the library. The files are not changed.": "Renomme {n} visage{} dans la bibliothèque. Les fichiers ne sont pas modifiés.",- "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "« {to} » est déjà une personne. Les combiner n’en fait qu’une ; Annuler les sépare de nouveau."++ "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "« {to} » est déjà une personne. Les combiner n’en fait qu’une ; Annuler les sépare de nouveau.",+ "{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "Fusion de {what} ajoutée en {mp} : la taille complète, {full}, demande plus de mémoire que n’en a cet ordinateur",+ "{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "Fusion de {what} ajoutée en {mp}, la plus grande taille possible pour un panorama (taille complète : {full})"}diff --cc crates/ui-egui/locales/ja-formats.jsonindex d38dfdc48,4d3504f22..2df9f2b82--- a/crates/ui-egui/locales/ja-formats.json+++ b/crates/ui-egui/locales/ja-formats.json@@@ -265,27 -248,6 +265,29 @@@"{name} opened in the other editor": "{name}を別のエディタで開きました","{n} originals opened in the other editor": "{n}個の元ファイルを別のエディタで開きました","· {in_source} identical copies": "・同一のコピー {in_source} 件",+ "{count} more warnings.": "ほかに{count}件の警告があります。",+ "{photos} catalog records processed; {collections} collections.": "カタログの{photos}件のレコードを処理しました。コレクションは{collections}件です。",+ "{missing} originals are missing. Their catalog records are available; use Find Missing Photos to relink them.": "{missing}件のオリジナルが見つかりません。カタログのレコードは利用できます。「見つからない写真を検索」で再リンクしてください。",+ "Applied {name}": "{name} を適用しました",+ "Delete “{name}”?": "「{name}」を削除しますか?",+ "Updated {name}": "{name} を更新しました",+ "Exported to {path}": "{path} に書き出しました",+ "Saved template {name}": "テンプレート {name} を保存しました",+ "Imported {name}": "{name} を読み込みました",+ "Skipped {problem}": "スキップ: {problem}",+ "…and {more} more": "…ほか {more} 件",+ "Template preview: {name}": "テンプレートのプレビュー: {name}",+ "{n} photos in view · {slides} slides · {time}": "表示中の写真 {n} 枚 · スライド {slides} 枚 · {time}",+ "{n} pages": "{n} ページ",+ "{n} JPEG files": "JPEG ファイル {n} 個",+ "{s} s of AV1 video": "AV1 ビデオ {s} 秒",+ "Slideshow exported: {what}": "スライドショーを書き出しました:{what}",+ " · {n} skipped (could not be rendered)": " · {n} 枚をスキップ(レンダリングできません)",+ "{n} raws can now be developed from their raw data": "{n}枚のRAWをRAWデータから現像できるようになりました",+ "LightCraft stopped unexpectedly: {e}\n\nThe log file has the details: {path}": "LightCraftが予期せず終了しました: {e}\n\n詳しくはログファイルをご覧ください: {path}",+ "LightCraft stopped unexpectedly: {e}": "LightCraftが予期せず終了しました: {e}",+ "Renames {n} face{} across the library. The files are not changed.": "ライブラリ全体で{n}件の顔の名前を変更します。ファイルは変更されません。{:.0}",- "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "「{to}」はすでに別の人物です。まとめると1人になり、元に戻すと再び分かれます。"++ "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "「{to}」はすでに別の人物です。まとめると1人になり、元に戻すと再び分かれます。",+ "{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "{what}合成を{mp}で追加しました:フルサイズ({full})にはこのコンピューターのメモリが足りません",+ "{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "{what}合成を{mp}で追加しました。パノラマの最大サイズです(フルサイズ:{full})"}diff --cc crates/ui-egui/locales/pt-br-formats.jsonindex 2b6e1f046,2e6f73223..1969dd262--- a/crates/ui-egui/locales/pt-br-formats.json+++ b/crates/ui-egui/locales/pt-br-formats.json@@@ -265,27 -248,6 +265,29 @@@"{name} opened in the other editor": "{name} aberto no outro editor","{n} originals opened in the other editor": "{n} originais abertos no outro editor","· {in_source} identical copies": "· {in_source} cópias idênticas",+ "{count} more warnings.": "Mais {count} avisos.",+ "{photos} catalog records processed; {collections} collections.": "{photos} registros do catálogo processados; {collections} coleções.",+ "{missing} originals are missing. Their catalog records are available; use Find Missing Photos to relink them.": "{missing} originais estão ausentes. Seus registros no catálogo estão disponíveis; use Encontrar fotos ausentes para vinculá-los novamente.",+ "Applied {name}": "{name} aplicado",+ "Delete “{name}”?": "Excluir “{name}”?",+ "Updated {name}": "{name} atualizado",+ "Exported to {path}": "Exportado para {path}",+ "Saved template {name}": "Modelo {name} salvo",+ "Imported {name}": "{name} importado",+ "Skipped {problem}": "Ignorado: {problem}",+ "…and {more} more": "…e mais {more}",+ "Template preview: {name}": "Prévia do modelo: {name}",+ "{n} photos in view · {slides} slides · {time}": "{n} fotos na visualização · {slides} slides · {time}",+ "{n} pages": "{n} páginas",+ "{n} JPEG files": "{n} arquivos JPEG",+ "{s} s of AV1 video": "{s} s de vídeo AV1",+ "Slideshow exported: {what}": "Apresentação exportada: {what}",+ " · {n} skipped (could not be rendered)": " · {n} ignoradas (não foi possível renderizar)",+ "{n} raws can now be developed from their raw data": "{n} RAW agora podem ser revelados a partir dos dados RAW",+ "LightCraft stopped unexpectedly: {e}\n\nThe log file has the details: {path}": "O LightCraft parou inesperadamente: {e}\n\nO arquivo de log tem os detalhes: {path}",+ "LightCraft stopped unexpectedly: {e}": "O LightCraft parou inesperadamente: {e}",+ "Renames {n} face{} across the library. The files are not changed.": "Renomeia {n} rosto{} na biblioteca. Os arquivos não são alterados.",- "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "“{to}” já é uma pessoa. Combiná-las deixa uma só; Desfazer as separa de novo."++ "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "“{to}” já é uma pessoa. Combiná-las deixa uma só; Desfazer as separa de novo.",+ "{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "{what} mesclagem adicionada em {mp}: o tamanho completo, {full}, precisa de mais memória do que este computador tem",+ "{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "{what} mesclagem adicionada em {mp}, o maior tamanho possível para um panorama (tamanho completo: {full})"}diff --cc crates/ui-egui/locales/ru-formats.jsonindex 0cc9dd881,c8b848f12..11d899c38--- a/crates/ui-egui/locales/ru-formats.json+++ b/crates/ui-egui/locales/ru-formats.json@@@ -265,27 -248,6 +265,29 @@@"{name} opened in the other editor": "{name} открыт в другом редакторе","{n} originals opened in the other editor": "Открыто оригиналов в другом редакторе: {n}","· {in_source} identical copies": "· идентичных копий: {in_source}",+ "{count} more warnings.": "Других предупреждений: {count}.",+ "{photos} catalog records processed; {collections} collections.": "Обработано записей каталога: {photos}; коллекций: {collections}.",+ "{missing} originals are missing. Their catalog records are available; use Find Missing Photos to relink them.": "Не найдены оригиналы: {missing}. Их записи каталога доступны; используйте поиск отсутствующих фотографий, чтобы восстановить ссылки.",+ "Applied {name}": "Применено: {name}",+ "Delete “{name}”?": "Удалить «{name}»?",+ "Updated {name}": "Обновлено: {name}",+ "Exported to {path}": "Экспортировано в {path}",+ "Saved template {name}": "Шаблон {name} сохранён",+ "Imported {name}": "Импортировано: {name}",+ "Skipped {problem}": "Пропущено: {problem}",+ "…and {more} more": "…и ещё {more}",+ "Template preview: {name}": "Просмотр шаблона: {name}",+ "{n} photos in view · {slides} slides · {time}": "Фото в просмотре: {n} · слайдов: {slides} · {time}",+ "{n} pages": "Страниц: {n}",+ "{n} JPEG files": "Файлов JPEG: {n}",+ "{s} s of AV1 video": "{s} с видео AV1",+ "Slideshow exported: {what}": "Слайд-шоу экспортировано: {what}",+ " · {n} skipped (could not be rendered)": " · пропущено: {n} (не удалось отрисовать)",+ "{n} raws can now be developed from their raw data": "RAW-файлов, которые теперь можно проявлять из RAW-данных: {n}",+ "LightCraft stopped unexpectedly: {e}\n\nThe log file has the details: {path}": "LightCraft неожиданно остановился: {e}\n\nПодробности в файле журнала: {path}",+ "LightCraft stopped unexpectedly: {e}": "LightCraft неожиданно остановился: {e}",+ "Renames {n} face{} across the library. The files are not changed.": "Переименовывает {n} лиц в библиотеке. Файлы не изменяются.{:.0}",- "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "«{to}» уже есть среди людей. Объединение оставляет одного человека; отмена снова разделяет их."++ "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "«{to}» уже есть среди людей. Объединение оставляет одного человека; отмена снова разделяет их.",+ "{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "{what}: слияние добавлено в размере {mp}: для полного размера ({full}) не хватает памяти этого компьютера",+ "{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "{what}: слияние добавлено в размере {mp} — это наибольший размер панорамы (полный размер: {full})"}diff --cc crates/ui-egui/locales/uk-formats.jsonindex 42675238c,d9e04c0bb..2040873ca--- a/crates/ui-egui/locales/uk-formats.json+++ b/crates/ui-egui/locales/uk-formats.json@@@ -265,27 -248,6 +265,29 @@@"{name} opened in the other editor": "{name} відкрито в іншому редакторі","{n} originals opened in the other editor": "Відкрито оригіналів в іншому редакторі: {n}","· {in_source} identical copies": "· ідентичних копій: {in_source}",+ "{count} more warnings.": "Інших попереджень: {count}.",+ "{photos} catalog records processed; {collections} collections.": "Оброблено записів каталогу: {photos}; колекцій: {collections}.",+ "{missing} originals are missing. Their catalog records are available; use Find Missing Photos to relink them.": "Не знайдено оригінали: {missing}. Їхні записи каталогу доступні; скористайтеся пошуком відсутніх фотографій, щоб відновити посилання.",+ "Applied {name}": "Застосовано: {name}",+ "Delete “{name}”?": "Видалити «{name}»?",+ "Updated {name}": "Оновлено: {name}",+ "Exported to {path}": "Експортовано до {path}",+ "Saved template {name}": "Шаблон {name} збережено",+ "Imported {name}": "Імпортовано: {name}",+ "Skipped {problem}": "Пропущено: {problem}",+ "…and {more} more": "…і ще {more}",+ "Template preview: {name}": "Перегляд шаблону: {name}",+ "{n} photos in view · {slides} slides · {time}": "Фото в перегляді: {n} · слайдів: {slides} · {time}",+ "{n} pages": "Сторінок: {n}",+ "{n} JPEG files": "Файлів JPEG: {n}",+ "{s} s of AV1 video": "{s} с відео AV1",+ "Slideshow exported: {what}": "Слайд-шоу експортовано: {what}",+ " · {n} skipped (could not be rendered)": " · пропущено: {n} (не вдалося відтворити)",+ "{n} raws can now be developed from their raw data": "RAW-файлів, які тепер можна проявляти з RAW-даних: {n}",+ "LightCraft stopped unexpectedly: {e}\n\nThe log file has the details: {path}": "LightCraft несподівано зупинився: {e}\n\nПодробиці у файлі журналу: {path}",+ "LightCraft stopped unexpectedly: {e}": "LightCraft несподівано зупинився: {e}",+ "Renames {n} face{} across the library. The files are not changed.": "Перейменовує {n} облич у бібліотеці. Файли не змінюються.{:.0}",- "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "«{to}» уже є серед людей. Об’єднання лишає одну людину; скасування знову розділяє їх."++ "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "«{to}» уже є серед людей. Об’єднання лишає одну людину; скасування знову розділяє їх.",+ "{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "{what}: об’єднання додано в розмірі {mp}: для повного розміру ({full}) бракує пам’яті цього комп’ютера",+ "{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "{what}: об’єднання додано в розмірі {mp} — це найбільший розмір панорами (повний розмір: {full})"}diff --cc crates/ui-egui/locales/zh-hans-formats.jsonindex 6af55c88d,65ba929b7..f93aaf809--- a/crates/ui-egui/locales/zh-hans-formats.json+++ b/crates/ui-egui/locales/zh-hans-formats.json@@@ -265,27 -248,6 +265,29 @@@"{name} opened in the other editor": "已在其他编辑器中打开 {name}","{n} originals opened in the other editor": "已在其他编辑器中打开 {n} 个原始文件","· {in_source} identical copies": "· {in_source} 个相同副本",+ "{count} more warnings.": "另有 {count} 条警告。",+ "{photos} catalog records processed; {collections} collections.": "已处理 {photos} 条目录记录;{collections} 个收藏集。",+ "{missing} originals are missing. Their catalog records are available; use Find Missing Photos to relink them.": "有 {missing} 个原始文件缺失。其目录记录可用;请使用“查找缺失照片”重新链接文件。",+ "Applied {name}": "已应用 {name}",+ "Delete “{name}”?": "删除“{name}”?",+ "Updated {name}": "已更新 {name}",+ "Exported to {path}": "已导出到 {path}",+ "Saved template {name}": "已保存模板 {name}",+ "Imported {name}": "已导入 {name}",+ "Skipped {problem}": "已跳过:{problem}",+ "…and {more} more": "…还有 {more} 个",+ "Template preview: {name}": "模板预览:{name}",+ "{n} photos in view · {slides} slides · {time}": "视图中 {n} 张照片 · {slides} 张幻灯片 · {time}",+ "{n} pages": "{n} 页",+ "{n} JPEG files": "{n} 个 JPEG 文件",+ "{s} s of AV1 video": "{s} 秒 AV1 视频",+ "Slideshow exported: {what}": "幻灯片放映已导出:{what}",+ " · {n} skipped (could not be rendered)": " · 已跳过 {n} 张(无法渲染)",+ "{n} raws can now be developed from their raw data": "{n} 个 RAW 现在可以从 RAW 数据冲印",+ "LightCraft stopped unexpectedly: {e}\n\nThe log file has the details: {path}": "LightCraft 意外停止:{e}\n\n详细信息见日志文件:{path}",+ "LightCraft stopped unexpectedly: {e}": "LightCraft 意外停止:{e}",+ "Renames {n} face{} across the library. The files are not changed.": "在整个图库中重命名 {n} 张面孔。不会改动文件。{:.0}",- "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "“{to}”已经是另一个人。合并后成为一个人;撤销会再把他们分开。"++ "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "“{to}”已经是另一个人。合并后成为一个人;撤销会再把他们分开。",+ "{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "已添加 {what} 合并({mp}):完整尺寸({full})所需的内存超出了这台电脑的内存",+ "{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "已添加 {what} 合并({mp}),这是全景图的最大尺寸(完整尺寸:{full})"}diff --cc crates/ui-egui/locales/zh-hant-formats.jsonindex 1517e885d,e7efa5bb2..f3bd24b20--- a/crates/ui-egui/locales/zh-hant-formats.json+++ b/crates/ui-egui/locales/zh-hant-formats.json@@@ -265,27 -248,6 +265,29 @@@"{name} opened in the other editor": "已在其他編輯器中開啟 {name}","{n} originals opened in the other editor": "已在其他編輯器中開啟 {n} 個原始檔案","· {in_source} identical copies": "· {in_source} 個相同副本",+ "{count} more warnings.": "另有 {count} 則警告。",+ "{photos} catalog records processed; {collections} collections.": "已處理 {photos} 筆目錄記錄;{collections} 個收藏集。",+ "{missing} originals are missing. Their catalog records are available; use Find Missing Photos to relink them.": "有 {missing} 個原始檔案遺失。其目錄記錄可用;請使用「尋找遺失相片」重新連結檔案。",+ "Applied {name}": "已套用 {name}",+ "Delete “{name}”?": "刪除「{name}」?",+ "Updated {name}": "已更新 {name}",+ "Exported to {path}": "已匯出到 {path}",+ "Saved template {name}": "已儲存範本 {name}",+ "Imported {name}": "已匯入 {name}",+ "Skipped {problem}": "已略過:{problem}",+ "…and {more} more": "…還有 {more} 個",+ "Template preview: {name}": "範本預覽:{name}",+ "{n} photos in view · {slides} slides · {time}": "檢視中 {n} 張照片 · {slides} 張幻燈片 · {time}",+ "{n} pages": "{n} 頁",+ "{n} JPEG files": "{n} 個 JPEG 檔案",+ "{s} s of AV1 video": "{s} 秒 AV1 視訊",+ "Slideshow exported: {what}": "幻燈片播放已匯出:{what}",+ " · {n} skipped (could not be rendered)": " · 已略過 {n} 張(無法算繪)",+ "{n} raws can now be developed from their raw data": "{n} 個 RAW 現在可以從 RAW 資料沖印",+ "LightCraft stopped unexpectedly: {e}\n\nThe log file has the details: {path}": "LightCraft 意外停止:{e}\n\n詳細資訊請見記錄檔:{path}",+ "LightCraft stopped unexpectedly: {e}": "LightCraft 意外停止:{e}",+ "Renames {n} face{} across the library. The files are not changed.": "在整個圖庫中重新命名 {n} 張面孔。不會改動檔案。{:.0}",- "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "「{to}」已經是另一個人。合併後成為一個人;還原會再把他們分開。"++ "“{to}” is already a person. Combining them makes one person; Undo separates them again.": "「{to}」已經是另一個人。合併後成為一個人;還原會再把他們分開。",+ "{what} merge added at {mp}: its full size, {full}, needs more memory than this computer has": "已新增{what}合併照片({mp}):完整尺寸({full})所需的記憶體超過這台電腦的記憶體",+ "{what} merge added at {mp}, the largest a panorama can be (its full size is {full})": "已新增{what}合併照片({mp}),這是全景圖的最大尺寸(完整尺寸:{full})"}diff --cc crates/ui-egui/src/merge.rsindex 4374ac591,ee0262ef0..02e4ddec2--- a/crates/ui-egui/src/merge.rs+++ b/crates/ui-egui/src/merge.rs@@@ -296,14 -269,11 +296,15 @@@ pub fn poll(app: &mut LightcraftApp, ct});match r.map_err(lightcraft_engine::EngineError::Other).and_then(|out| app.session.finish_merge(&t.job, out)) {Ok(v) => {+ let message = added_message(what, &v);app.merge.last_result = Some(v);- app.toast(ctx, crate::i18n::tr_format!("{what} merge added", what = what));+ app.toast(ctx, message);}- Err(_) if t.cancel.load(Ordering::Relaxed) => app.toast(ctx, crate::i18n::tr_format!("{what} merge cancelled", what = what)),+ Err(_) if t.cancel.load(Ordering::Relaxed) => {+ // cancelling one merge of a batch stops the batch+ app.merge.batch.clear();+ app.toast(ctx, crate::i18n::tr_format!("{what} merge cancelled", what = what))+ }Err(e) => {app.ui.status = e.to_string();app.toast(ctx, crate::i18n::tr_format!("{what} merge failed: {e}", e = e, what = what));diff --cc docs/merge.mdindex 3485e02d1,03c7bae57..50dd8e0af--- a/docs/merge.md+++ b/docs/merge.md@@@ -10,17 -10,12 +10,17 @@@ All algorithms are our own implementati*HDR Panorama…* from the photo context menu (or the `dialog.merge*` commands). The dialog previewsthe merge at ≤ 1024 px and re-runs the preview when an option changes; *Merge* runs the full mergein the background (a row in the activity stack shows its progress, with ✕ to stop it). The result is written next to the first photo as- `<name>-HDR.dng`, `-Pano.dng` or `-HDR-Pano.dng`, imported and selected.+ `<name>-HDR.dng`, `-Pano.dng` or `-HDR-Pano.dng`, imported and selected. *Photo Merge ▸ HDR for Each Bracket Set*+ merges many brackets in one go with the last HDR options: one HDR per stack among the selected photos, then per+ bracket (photos taken less than a second apart, after the shutter time, at exposures at least ½ EV apart; a burst at+ one exposure is skipped), one after the other in the activity stack.- **Commands** (CLI, MCP, control channel):- `merge.hdr {ids?, align=true, deghost=none|low|medium|high, autoSettings=true, stack=false, preview=false, showOverlay=false, previewPath?}`- - `merge.panorama {ids?, projection=auto|spherical|cylindrical|perspective, boundaryWarp=0..100, autoCrop=false, fillEdges=false, autoSettings=true, maxMegapixels=40, preview, previewPath?}`+ - `merge.panorama {ids?, projection=auto|spherical|cylindrical|perspective, boundaryWarp=0..100, autoCrop=false, fillEdges=false, autoSettings=true, maxMegapixels (default: the photos' own resolution), preview, previewPath?}`- `merge.hdrPanorama {ids?, bracket=0 (from EXIF), …both sets of options}`-- **CLI:** `lightcraft-cli merge hdr|panorama|hdr-panorama [options] FILES…`;+ - `merge.hdrBatch {ids?, align, deghost, autoSettings, stack}` → `{merged: [{id, path, …}], failed: [{photos, error}]}`+- **CLI:** `lightcraft-cli merge hdr|panorama|hdr-panorama|hdr-batch [options] FILES…` (`hdr-batch` finds the brackets+ among the files, e.g. a whole folder);`lightcraft-cli synth-merge hdr|panorama -o DIR` writes synthetic inputs (procedural scene).## What it doesdiff --cc docs/parity-checklist.mdindex 757a4ec4b,e21508b7f..ac14ed41a--- a/docs/parity-checklist.md+++ b/docs/parity-checklist.md@@@ -836,19 -812,10 +836,20 @@@ Latin stays upright. Advanced Japanese| 2026-10-12 | minor | LR-IMP-FORMATS: the Hasselblad Lunar (a Sony NEX-7 ARW under Make HASSELBLAD) decodes from sensor data instead of opening as its preview; an uncompressed Leaf MOS imports as a preview-only raw instead of a greyscale image of its mosaic (#1275); status unchanged (🟡) || 2026-10-12 | minor | LR-HDR-EXPORT, LR-EXP-HDR: HLG AVIF export (`hdrTransfer`); LR-VIEW-HDR-DISPLAY: tested SDR/HDR display decision || 2026-10-12 | minor | LR-EXP-PSD, MENU-FILE-PHOTOSHOP: Photo ▸ Edit In ▸ Open Original in Other Editor (RAW, no copy) hands the original files (the raws themselves) to the other editor in one start; statuses unchanged |+| 2026-10-12 | minor | LR-MASK-BRUSH: pen pressure scales brush size and flow || 2026-10-13 | patch | LR-BEHAV-AUTOSAVE: a damaged snapshot that still parses is repaired on open (ids, stacks, folder loops, id counters) instead of panicking or hanging; status unchanged || 2026-10-13 | minor | LR-EDIT-OPTICS-PROFILE: Nikon Z 6II / Z 8 / Z f NEFs use the camera's in-file distortion correction (NikonNEFInfo); status unchanged (🟡) |+| 2026-10-12 | minor | LR-IMP-FORMATS and LR-IMP-CAMERA-COVERAGE: 22 more CR3 bodies verified on one CC0 file each (all 110 CC0 CR3s decode); EOS R6 Mark III `ColorData` 66 white balance; status unchanged (🟡: CRX variants without public samples remain refused) || 2026-10-11 | minor | Model setup folder action, opener error and retry (LR-MASK-OBJECTS). |+| 2026-10-12 | minor | LR-VIEW-ZOOM: slider-drag drafts are timed with the frame that shows them, drop to 0.6 mid-drag when far over budget, stay 0.6 under a zoom window; workers convert texture pixels (issue #330); status unchanged |+| 2026-10-11 | minor | LR-VIEW-ZOOM: a slider drag keeps the loupe's full resolution where the GPU draws the view and keeps up (0.6 drafts on the CPU, with soft proofing or the HDR range, or after over-budget drags; issue #330); status unchanged |+| 2026-10-11 | minor | LR-EXP-LOCATION: Export to "Same folder as original photo" (`destinationMode`), issue #956; status unchanged (✅) |+| 2026-10-12 | minor | LR-IMP-CAMERA-COVERAGE: 117 Nikon and Fujifilm Adobe models verified on one CC0 file each; COOLPIX 5700 / 8400 / 8800 found decoding wrongly; status unchanged (🟡) |+| 2026-10-13 | patch | LR-EXP-QUALITY: JPEG exports use Huffman tables made for each image (same pixels, 12–14 % smaller files, issue #1373); status unchanged |+| 2026-10-13 | patch | LR-BEHAV-GPU: a GPU lost while LightCraft runs (driver reset) is reported as a stop, not a failed start, and the next start renders on the CPU and says why (issue #1337); status unchanged |+| 2026-10-13 | minor | LR-META-INFO: Nikon DSLR raws show their lens from the maker note; status unchanged (✅) |+| 2026-10-13 | patch | LR-IMP-LOCAL: browsing a Local folder again forgets the untouched records of files deleted or moved by another app (issue #1392); status unchanged |+ | 2026-10-13 | minor | LR-MERGE-PANO: a panorama keeps its photos' resolution (up to 512 MP / 65,000 px) instead of a fixed 40 MP, held to what fits in memory (issue #1455); status unchanged || 2026-10-11 | minor | KEY-SLIDER-TYPE: honor immediate Return/Escape and keep typed keys in the value editor; add regression references || 2026-10-11 | minor | LR-PROF-CAMERACOLOR: raws with a black-and-white camera JPEG take its tone curve (issue #577) || 2026-10-11 | minor | LR-VIEW-ZOOM and LR-VIEW-COMPARE: Compare and Reference are sharp at 1:1 (zoom windows per pane, two originals kept decoded while they are open); statuses unchanged |diff --cc docs/whats-new.mdindex d42148617,4f321c1c7..1419d4148--- a/docs/whats-new.md+++ b/docs/whats-new.md@@@ -1,96 -1,14 +1,103 @@@# What's new in LightCraft+## 2026-10-15++### Lightroom radial masks on the right side+- Radial masks brought over from Lightroom Classic (catalog import, XMP sidecars, edits inside DNGs and presets) now+ apply their effect inside the circle, as Lightroom does, instead of outside it (issue #1815). A mask inverted in+ Lightroom stays inverted, and older Radial Filters keep their Effect Outside / Invert Mask setting. Photos imported+ before this keep the masks they got: Photo ▸ Read Metadata from File reads a sidecar's again.++## 2026-10-15++### Delete in an album removes from the album only+- In an album, the Delete key now takes the selected photos out of the album, as in Lightroom. It used to move them+ to Recently Deleted, so they also left their folder's view (issue #1805). They stay in the library and in their+ folder; Edit ▸ Undo puts them back in the album. Photo ▸ Remove from Album does the same and now shows the key.+ To delete photos from the library from an album, use Photo ▸ Delete Photo or right-click ▸ Delete Photo. In a smart+ album, Delete changes nothing: its rules decide what it shows.+## 2026-10-14+### HDR merges of moving lights, and many brackets at once+- A star, the moon or a light that moves between the photos of a bracket (a night bracket on a tripod) no longer+ leaves a black hole where the middle photo had it clipped. With Deghost, the brightest photo's copy of it in a+ dark sky is now removed too.+- Photo ▸ Photo Merge ▸ HDR for Each Bracket Set merges every bracket among the selected photos with the last HDR+ settings, one after the other: each stack, and photos taken less than a second apart at different exposures.+ From the command line: `lightcraft-cli merge hdr-batch FOLDER`.+- Merging uses about a quarter less memory: three 67 MP raws need 3.8 GB instead of 4.8 GB.++### XMP sidecars catch up after a network share comes back+- With automatic XMP writing on, an edit to a photo whose folder can't be written (a network share that dropped+ out, a folder that went read-only) used to be written only to the library, with a line in the log, so the sidecar+ stayed behind the edit. LightCraft now says once that the sidecars are waiting, tries again every few seconds once+ the files are reachable, and says when they're written. `library.retrySidecars` does it on request.++### Reliability+- A damaged or crafted raw can no longer make LightCraft set aside gigabytes of memory before finding out the file is+ bad (issue #1512): a compressed PEF whose data is too short for the size it declares, an uncompressed TIFF-based+ raw whose tile claims far more samples than it holds, and an ARW6 with a broken tile are refused first. All 74+ files in the test corpus still decode.++### Reliability+- Thumbnails and previews are written to the cache on disk by one background writer instead of a new thread for+ each image (issue #1522). When renders come in faster than the disk takes them, at most 128 MB of images wait;+ past that a write is skipped (the image stays in memory and is written by a later render), so a slow disk can't+ pile up threads and memory.++### Reliability+- Saving the catalog and resuming a model download no longer write through a link left at the temporary file's+ name (`catalog.snap.tmp`, `model.onnx.part`): the link is removed and a new file made in its place, so the file it+ pointed to is never changed (issue #1502).++### Reliability+- A photo whose file was replaced (Reload Changed Files after an outside edit) no longer keeps the faces recognition+ made from the old pixels: they are made again from the new file, and a scan still busy with the old file when it+ changed doesn't put its faces on the new one (issue #1524).++### Settings stays put when you change tabs+- The Settings window keeps its top edge and width when you switch tabs, so the tab row no longer jumps around+ under the pointer. It used to be centred, so every tab of a different height moved it.++### Layout image over the loupe+- View ▸ Loupe Overlay ▸ Choose Layout Image… draws a PNG with transparency over the photo in the loupe, such as+ a magazine cover's masthead and cover lines, so you can frame a shot for the page it is made for. It fits inside+ the photo, follows zoom and pan, and ⌥⌘O shows or hides it. The same menu sets its opacity and a matte that+ darkens the photo outside it. The layout stays chosen across launches.++### Smaller JPEG exports+- JPEG exports are 12–14 % smaller at the same quality, with exactly the same pixels (issue #1373): each file now+ carries Huffman tables made for its own picture instead of the standard example tables. Every viewer opens them+ as before.++### Reliability+- A photo whose Defringe amount was stored far past the sliders' 20 (in a damaged catalog or sidecar) no longer+ crashes LightCraft each time it renders: the amount acts as 20.++### Lens names for Nikon DSLR raws+- Photos from Nikon DSLRs like the D700, D750, D80 or D5300 now show which lens they were taken with, for example+ "24.0-70.0 mm f/2.8". Those cameras don't write a lens name, so the lens field was empty and you couldn't filter or+ search by lens. LightCraft now reads the lens range Nikon keeps in its own maker note, the way Lightroom shows a+ lens it doesn't have a name for. Newly imported photos show it.++### Import when a card is connected+- Settings → Import → Cameras and Cards has an option to open the import review as soon as a camera or memory card+ is connected, the same review File → Import from Device opens. It's off by default. A card that's already in when+ LightCraft starts doesn't ask, and if a dialog is open or an import is running it waits until that's done.++### Local folders+- Photos deleted (or moved) by another app no longer stay in a Local folder, failing to load and logging an error+ each time you look (issue #1392): the next time you browse the folder, in a later session, they're left out. A photo you had rated, flagged or+ edited stays, marked missing, so its changes aren't lost; photos in My Photos are unchanged.++ ### Full-resolution panoramas+ - Panorama and HDR Panorama merges keep the resolution of their photos instead of stopping at 40 megapixels+ (issue #1455), up to 512 MP and 65,000 pixels on the long edge, as in Lightroom. When the full size needs more+ memory than the computer has, the panorama is made as large as fits (five 51 MP photos: up to 166 MP with+ 16 GB, 355 MP with 32 GB) and the message says so. The merge also frees each photo's pixels once they are+ projected, so it needs less memory than before at any size (an 81 MP stitch: 4.4 GB instead of 6.2 GB).+### Hard-edged Heal and Clone spots- A spot with Feather at 0 no longer draws black pixels exactly on its radius. This also fixes spots at 0% Opacitychanging pixels along their edge. The hard edge now leaves pixels on the radius unchanged.