LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Merge PR #1132
Brandon Thomas48b9a5e21ff8
diff --cc crates/engine/src/lib.rsindex 475a32cd1,cdd914583..7e05fcffd--- a/crates/engine/src/lib.rs+++ b/crates/engine/src/lib.rs@@@ -29,9 -29,9 +29,10 @@@ pub mod demopub mod denoise;pub mod devices;pub mod display;+ mod errors;pub mod export;pub mod face_download;+pub mod face_tiles;#[cfg(not(target_arch = "wasm32"))]mod faces_index;#[cfg(not(target_arch = "wasm32"))]diff --cc crates/engine/src/lightroom_job.rsindex ffd6fc183,317d81ef1..f95375267--- a/crates/engine/src/lightroom_job.rs+++ b/crates/engine/src/lightroom_job.rs@@@ -232,14 -186,18 +238,16 @@@ impl LightroomJob/// Read/probe/stage all source data off the owner thread.pub fn prepare(&mut self, cancel: &AtomicBool) -> crate::Result<PreparedLightroom> {if cancel.load(Ordering::Relaxed) {- return Err(error("Lightroom import cancelled"));+ return Err(cancelled());}- self.import.total.store(1, Ordering::Relaxed);- self.import.done.store(0, Ordering::Relaxed);+ // (reading stops with a message when `cancel` is set: the flag says it was cancelled)- let mut data = lightroom_catalog::read_with_progress(&self.path, cancel, &self.import.total, &self.import.done)- .map_err(|e| if cancel.load(Ordering::Relaxed) { cancelled() } else { error(e) })?;+ let mut data =- lightroom_catalog::read_with_progress(&self.path, cancel, &self.progress.catalog_total, &self.progress.catalog_done).map_err(error)?;++ lightroom_catalog::read_with_progress(&self.path, cancel, &self.progress.catalog_total, &self.progress.catalog_done)++ .map_err(|e| if cancel.load(Ordering::Relaxed) { cancelled() } else { error(e) })?;lightroom_catalog::validate_for_job(&data).map_err(error)?;if cancel.load(Ordering::Relaxed) {- return Err(error("Lightroom import cancelled"));+ return Err(cancelled());}- self.import.done.fetch_add(1, Ordering::Relaxed);let paths: Vec<String> = data.photos.iter()