Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ mozjpeg-rs = "0.9.0"
webp = "0.3"
jxl-oxide = { version = "0.12.5", features = ["image"] }
jxl-encoder = "0.1.3"
filetime = "0.2"
libc = "0.2.183"
rgb = "0.8.53"
imgref = "1.12.0"
Expand Down
23 changes: 23 additions & 0 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use std::sync::{Arc, Mutex};
use std::time::Duration;

use base64::{Engine as _, engine::general_purpose};
use filetime;
use image::codecs::jpeg::JpegEncoder;
use image::{
DynamicImage, GenericImageView, GrayImage, ImageBuffer, ImageFormat, Luma, Rgb, RgbImage, Rgba,
Expand Down Expand Up @@ -234,6 +235,8 @@ struct ExportSettings {
jpeg_quality: u8,
resize: Option<ResizeOptions>,
keep_metadata: bool,
#[serde(default)]
preserve_timestamps: bool,
strip_gps: bool,
filename_template: Option<String>,
watermark: Option<WatermarkSettings>,
Expand Down Expand Up @@ -1784,6 +1787,14 @@ fn process_image_for_export_pipeline(
)
}

fn set_timestamps_from_exif(src: &Path, dst: &Path) {
let capture_dt = exif_processing::get_creation_date_from_path(src);
let ft = filetime::FileTime::from_unix_time(capture_dt.timestamp(), capture_dt.timestamp_subsec_nanos());
if let Err(e) = filetime::set_file_times(dst, ft, ft) {
log::warn!("Could not set timestamps on '{}': {}", dst.display(), e);
}
}

fn save_image_with_metadata(
image: &DynamicImage,
output_path: &std::path::Path,
Expand Down Expand Up @@ -2058,6 +2069,10 @@ fn export_masks_for_image(
export_settings,
)?;

if export_settings.preserve_timestamps {
set_timestamps_from_exif(Path::new(source_path_str), &mask_image_path);
}

let alpha_bytes = encode_grayscale_to_png(&alpha_resized)?;
#[cfg(target_os = "android")]
{
Expand Down Expand Up @@ -2207,6 +2222,10 @@ async fn export_image(
&export_settings,
)?;

if export_settings.preserve_timestamps {
set_timestamps_from_exif(Path::new(&source_path_str), output_path_obj);
}

if export_settings.export_masks {
export_masks_for_image(
&base_image,
Expand Down Expand Up @@ -2471,6 +2490,10 @@ async fn batch_export_images(

save_image_with_metadata(&final_image, &output_path, &source_path_str, &export_settings)?;

if export_settings.preserve_timestamps {
set_timestamps_from_exif(Path::new(&source_path_str), &output_path);
}

if export_settings.export_masks {
export_masks_for_image(
&base_image,
Expand Down
14 changes: 14 additions & 0 deletions src/components/panel/right/ExportPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ export default function ExportPanel({
setDontEnlarge,
keepMetadata,
setKeepMetadata,
preserveTimestamps,
setPreserveTimestamps,
stripGps,
setStripGps,
exportMasks,
Expand Down Expand Up @@ -334,6 +336,7 @@ export default function ExportPanel({
filenameTemplate,
jpegQuality,
keepMetadata,
preserveTimestamps,
resize: enableResize ? { mode: resizeMode, value: resizeValue, dontEnlarge } : null,
stripGps,
watermark:
Expand Down Expand Up @@ -361,6 +364,7 @@ export default function ExportPanel({
resizeValue,
dontEnlarge,
keepMetadata,
preserveTimestamps,
stripGps,
filenameTemplate,
enableWatermark,
Expand Down Expand Up @@ -408,6 +412,7 @@ export default function ExportPanel({
filenameTemplate: finalFilenameTemplate,
jpegQuality: jpegQuality,
keepMetadata,
preserveTimestamps,
resize: enableResize ? { mode: resizeMode, value: resizeValue, dontEnlarge } : null,
stripGps,
exportMasks: isEditorContext ? exportMasks : undefined,
Expand Down Expand Up @@ -639,6 +644,15 @@ export default function ExportPanel({
</>
)}

<Section title="File Timestamps">
<Switch
checked={preserveTimestamps}
disabled={isExporting}
label="Set File Timestamps from EXIF Capture Date"
onChange={setPreserveTimestamps}
/>
</Section>

{isEditorContext && (
<Section title="Masks">
<Switch
Expand Down
14 changes: 14 additions & 0 deletions src/components/panel/right/LibraryExportPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ export default function LibraryExportPanel({
setDontEnlarge,
keepMetadata,
setKeepMetadata,
preserveTimestamps,
setPreserveTimestamps,
stripGps,
setStripGps,
exportMasks,
Expand Down Expand Up @@ -356,6 +358,7 @@ export default function LibraryExportPanel({
filenameTemplate,
jpegQuality,
keepMetadata,
preserveTimestamps,
resize: enableResize ? { mode: resizeMode, value: resizeValue, dontEnlarge } : null,
stripGps,
watermark:
Expand Down Expand Up @@ -384,6 +387,7 @@ export default function LibraryExportPanel({
resizeValue,
dontEnlarge,
keepMetadata,
preserveTimestamps,
stripGps,
filenameTemplate,
enableWatermark,
Expand Down Expand Up @@ -435,6 +439,7 @@ export default function LibraryExportPanel({
filenameTemplate: finalFilenameTemplate,
jpegQuality: jpegQuality,
keepMetadata,
preserveTimestamps,
resize: enableResize ? { mode: resizeMode, value: resizeValue, dontEnlarge } : null,
stripGps,
exportMasks,
Expand Down Expand Up @@ -634,6 +639,15 @@ export default function LibraryExportPanel({
</>
)}

<Section title="File Timestamps">
<Switch
checked={preserveTimestamps}
disabled={isExporting}
label="Set File Timestamps from EXIF Capture Date"
onChange={setPreserveTimestamps}
/>
</Section>

<Section title="Masks">
<Switch
label="Export masks as separate files"
Expand Down
2 changes: 2 additions & 0 deletions src/components/ui/ExportImportProperties.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export interface ExportSettings {
filenameTemplate: string | null;
jpegQuality: number;
keepMetadata: boolean;
preserveTimestamps: boolean;
resize: {
mode: string;
value: number;
Expand Down Expand Up @@ -105,6 +106,7 @@ export interface ExportPreset {
resizeValue: number;
dontEnlarge: boolean;
keepMetadata: boolean;
preserveTimestamps: boolean;
stripGps: boolean;
exportMasks?: boolean;
filenameTemplate: string;
Expand Down
6 changes: 6 additions & 0 deletions src/hooks/useExportSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export function useExportSettings() {
const [resizeValue, setResizeValue] = useState(2048);
const [dontEnlarge, setDontEnlarge] = useState(true);
const [keepMetadata, setKeepMetadata] = useState(true);
const [preserveTimestamps, setPreserveTimestamps] = useState(false);
const [stripGps, setStripGps] = useState(true);
const [exportMasks, setExportMasks] = useState(false);
const [filenameTemplate, setFilenameTemplate] = useState('{original_filename}_edited');
Expand All @@ -27,6 +28,7 @@ export function useExportSettings() {
setResizeValue(preset.resizeValue);
setDontEnlarge(preset.dontEnlarge);
setKeepMetadata(preset.keepMetadata);
setPreserveTimestamps(preset.preserveTimestamps ?? false);
setStripGps(preset.stripGps);
setExportMasks(preset.exportMasks ?? false);
setFilenameTemplate(preset.filenameTemplate);
Expand All @@ -47,6 +49,7 @@ export function useExportSettings() {
resizeValue,
dontEnlarge,
keepMetadata,
preserveTimestamps,
stripGps,
exportMasks,
filenameTemplate,
Expand All @@ -65,6 +68,7 @@ export function useExportSettings() {
resizeValue,
dontEnlarge,
keepMetadata,
preserveTimestamps,
stripGps,
exportMasks,
filenameTemplate,
Expand Down Expand Up @@ -92,6 +96,8 @@ export function useExportSettings() {
setDontEnlarge,
keepMetadata,
setKeepMetadata,
preserveTimestamps,
setPreserveTimestamps,
stripGps,
setStripGps,
exportMasks,
Expand Down
Loading