Skip to content

fix(export): write complete, valid EXIF for RAW sources #1897

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CyberTimon merged 2 commits into from
Oct 11, 2026
Merged

fix(export): write complete, valid EXIF for RAW sources #1897

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f090c3f
fix(export): write complete, valid EXIF for RAW sources
lalibertemarc Oct 10, 2026
5814648
refactor(export): read RAW metadata once for EXIF and GPS
lalibertemarc Oct 11, 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
263 changes: 130 additions & 133 deletions src-tauri/src/exif_processing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use little_exif::ifd::ExifTagGroup;
use little_exif::metadata::Metadata;
use little_exif::rational::{iR64, uR64};
use rawler::decoders::RawMetadata;
use rawler::exif::ExifGPS;
use rawler::lens::LensDescription;
use serde::{Deserialize, Serialize};

Expand Down Expand Up @@ -285,15 +286,35 @@ fn to_ir64(val: &exif::SRational) -> iR64 {
}
}

fn rawler_to_ur64(val: rawler::formats::tiff::Rational) -> uR64 {
uR64 {
nominator: val.n,
denominator: val.d,
}
}

fn rawler_to_ir64(val: rawler::formats::tiff::SRational) -> iR64 {
iR64 {
nominator: val.n,
denominator: val.d,
}
}

fn clean_creation_datetime_str(s: &str) -> &str {
s.trim().trim_matches('"').trim_matches('\'').trim()
}

fn fmt_date_str(s: String) -> String {
if let Some(dt) = parse_creation_datetime(&s) {
return dt.format("%Y-%m-%d %H:%M:%S").to_string();
const EXIF_DATETIME_FORMAT: &str = "%Y:%m:%d %H:%M:%S";

fn format_creation_datetime(s: &str, format: &str) -> String {
if let Some(dt) = parse_creation_datetime(s) {
return dt.format(format).to_string();
}
clean_creation_datetime_str(&s).to_string()
clean_creation_datetime_str(s).to_string()
}

fn fmt_date_str(s: String) -> String {
format_creation_datetime(&s, "%Y-%m-%d %H:%M:%S")
}

fn normalize_creation_datetime(s: &str) -> Option<String> {
Expand Down Expand Up @@ -418,10 +439,17 @@ pub fn read_exif(file_bytes: &[u8]) -> Option<Exif> {
}

pub fn read_raw_metadata(file_bytes: &[u8]) -> Option<RawMetadata> {
raw_metadata_from_source(&rawler::rawsource::RawSource::new_from_slice(file_bytes))
}

fn read_raw_metadata_from_path(path_str: &str) -> Option<RawMetadata> {
raw_metadata_from_source(&rawler::rawsource::RawSource::new(Path::new(path_str)).ok()?)
}

fn raw_metadata_from_source(raw_source: &rawler::rawsource::RawSource) -> Option<RawMetadata> {
let loader = rawler::RawLoader::new();
let raw_source = rawler::rawsource::RawSource::new_from_slice(file_bytes);
let decoder = loader.get_decoder(&raw_source).ok()?;
decoder.raw_metadata(&raw_source, &Default::default()).ok()
let decoder = loader.get_decoder(raw_source).ok()?;
decoder.raw_metadata(raw_source, &Default::default()).ok()
}

fn insert_missing_lens_fields(map: &mut HashMap<String, String>, lens: &LensDescription) {
Expand Down Expand Up @@ -1090,6 +1118,72 @@ fn apply_sidecar_field_overrides(metadata: &mut Metadata, map: &HashMap<String,
}
}

fn apply_exif_from_rawler(metadata: &mut Metadata, meta: &RawMetadata) {
if !meta.make.is_empty() {
metadata.set_tag(ExifTag::Make(meta.make.clone()));
}
if !meta.model.is_empty() {
metadata.set_tag(ExifTag::Model(meta.model.clone()));
}
let exif = &meta.exif;
if let Some(artist) = &exif.artist {
metadata.set_tag(ExifTag::Artist(artist.clone()));
}
if let Some(copyright) = &exif.copyright {
metadata.set_tag(ExifTag::Copyright(copyright.clone()));
}
if let Some(dt) = &exif.date_time_original {
metadata.set_tag(ExifTag::DateTimeOriginal(dt.clone()));
}
if let Some(dt) = &exif.create_date {
metadata.set_tag(ExifTag::CreateDate(dt.clone()));
}
if let Some(lens_make) = &exif.lens_make {
metadata.set_tag(ExifTag::LensMake(lens_make.clone()));
}
if let Some(lens_model) = &exif.lens_model {
metadata.set_tag(ExifTag::LensModel(lens_model.clone()));
}
if let Some(lens_spec) = exif.lens_spec {
metadata.set_tag(ExifTag::LensInfo(lens_spec.map(rawler_to_ur64).to_vec()));
}
if let Some(f) = exif.fnumber {
metadata.set_tag(ExifTag::FNumber(vec![rawler_to_ur64(f)]));
}
if let Some(a) = exif.aperture_value {
metadata.set_tag(ExifTag::ApertureValue(vec![rawler_to_ur64(a)]));
}
if let Some(t) = exif.exposure_time {
metadata.set_tag(ExifTag::ExposureTime(vec![rawler_to_ur64(t)]));
}
if let Some(s) = exif.shutter_speed_value {
metadata.set_tag(ExifTag::ShutterSpeedValue(vec![rawler_to_ir64(s)]));
}
if let Some(fl) = exif.focal_length {
metadata.set_tag(ExifTag::FocalLength(vec![rawler_to_ur64(fl)]));
}
if let Some(iso) = exif.iso_speed {
metadata.set_tag(ExifTag::ISO(vec![iso as u16]));
} else if let Some(iso) = exif.iso_speed_ratings {
metadata.set_tag(ExifTag::ISO(vec![iso]));
}
if let Some(ev) = exif.exposure_bias {
metadata.set_tag(ExifTag::ExposureCompensation(vec![rawler_to_ir64(ev)]));
}
if let Some(flash) = exif.flash {
metadata.set_tag(ExifTag::Flash(vec![flash]));
}
if let Some(metering) = exif.metering_mode {
metadata.set_tag(ExifTag::MeteringMode(vec![metering]));
}
if let Some(wb) = exif.white_balance {
metadata.set_tag(ExifTag::WhiteBalance(vec![wb]));
}
if let Some(prog) = exif.exposure_program {
metadata.set_tag(ExifTag::ExposureProgram(vec![prog]));
}
}

fn apply_gps_from_kamadak(metadata: &mut Metadata, original_path: &Path) {
let Ok(file) = std::fs::File::open(original_path) else {
return;
Expand Down Expand Up @@ -1159,63 +1253,21 @@ fn apply_gps_from_kamadak(metadata: &mut Metadata, original_path: &Path) {
}
}

fn apply_gps_from_rawler(metadata: &mut Metadata, original_path_str: &str) {
let loader = rawler::RawLoader::new();
let Ok(raw_source) = rawler::rawsource::RawSource::new(Path::new(original_path_str)) else {
return;
};
let Ok(decoder) = loader.get_decoder(&raw_source) else {
return;
};
let Ok(meta) = decoder.raw_metadata(&raw_source, &Default::default()) else {
return;
};
let Some(gps) = meta.exif.gps else {
return;
};
fn apply_gps_from_rawler(metadata: &mut Metadata, gps: ExifGPS) {
if let Some(lat) = gps.gps_latitude {
metadata.set_tag(ExifTag::GPSLatitude(vec![
uR64 {
nominator: lat[0].n,
denominator: lat[0].d,
},
uR64 {
nominator: lat[1].n,
denominator: lat[1].d,
},
uR64 {
nominator: lat[2].n,
denominator: lat[2].d,
},
]));
metadata.set_tag(ExifTag::GPSLatitude(lat.map(rawler_to_ur64).to_vec()));
}
if let Some(lat_ref) = gps.gps_latitude_ref {
metadata.set_tag(ExifTag::GPSLatitudeRef(lat_ref));
}
if let Some(lon) = gps.gps_longitude {
metadata.set_tag(ExifTag::GPSLongitude(vec![
uR64 {
nominator: lon[0].n,
denominator: lon[0].d,
},
uR64 {
nominator: lon[1].n,
denominator: lon[1].d,
},
uR64 {
nominator: lon[2].n,
denominator: lon[2].d,
},
]));
metadata.set_tag(ExifTag::GPSLongitude(lon.map(rawler_to_ur64).to_vec()));
}
if let Some(lon_ref) = gps.gps_longitude_ref {
metadata.set_tag(ExifTag::GPSLongitudeRef(lon_ref));
}
if let Some(alt) = gps.gps_altitude {
metadata.set_tag(ExifTag::GPSAltitude(vec![uR64 {
nominator: alt.n,
denominator: alt.d,
}]));
metadata.set_tag(ExifTag::GPSAltitude(vec![rawler_to_ur64(alt)]));
}
if let Some(alt_ref) = gps.gps_altitude_ref {
metadata.set_tag(ExifTag::GPSAltitudeRef(vec![alt_ref]));
Expand Down Expand Up @@ -1265,6 +1317,15 @@ pub fn write_image_with_metadata(
&& copy_full_exif_from_source(&mut metadata, original_path, strip_gps);
let mut source_read_success = full_exif_copied;

let raw_metadata = if is_raw_file(original_path_str) {
read_raw_metadata_from_path(original_path_str)
} else {
None
};
if let Some(meta) = &raw_metadata {
apply_exif_from_rawler(&mut metadata, meta);
}

if !source_read_success && let Some(map) = read_rrexif_sidecar(original_path) {
source_read_success = true;

Expand Down Expand Up @@ -1322,10 +1383,16 @@ pub fn write_image_with_metadata(
metadata.set_tag(ExifTag::ImageDescription(clean_s(val)));
}
if let Some(val) = map.get("DateTimeOriginal") {
metadata.set_tag(ExifTag::DateTimeOriginal(clean_s(val)));
metadata.set_tag(ExifTag::DateTimeOriginal(format_creation_datetime(
val,
EXIF_DATETIME_FORMAT,
)));
}
if let Some(val) = map.get("CreateDate") {
metadata.set_tag(ExifTag::CreateDate(clean_s(val)));
metadata.set_tag(ExifTag::CreateDate(format_creation_datetime(
val,
EXIF_DATETIME_FORMAT,
)));
}
if let Some(val) = map.get("FNumber")
&& let Some(ur) = parse_ur64(val)
Expand Down Expand Up @@ -1361,8 +1428,6 @@ pub fn write_image_with_metadata(
let exifreader = exif::Reader::new();

if let Ok(exif_obj) = exifreader.read_from_container(&mut bufreader) {
source_read_success = true;

let get_string_val = |field: &exif::Field| -> String {
match &field.value {
exif::Value::Ascii(vec) => vec
Expand Down Expand Up @@ -1458,84 +1523,11 @@ pub fn write_image_with_metadata(
}
}

if !source_read_success && is_raw_file(original_path_str) {
let loader = rawler::RawLoader::new();
if let Ok(raw_source) = rawler::rawsource::RawSource::new(Path::new(original_path_str))
&& let Ok(decoder) = loader.get_decoder(&raw_source)
&& let Ok(meta) = decoder.raw_metadata(&raw_source, &Default::default())
{
if !meta.make.is_empty() {
metadata.set_tag(ExifTag::Make(meta.make.clone()));
}
if !meta.model.is_empty() {
metadata.set_tag(ExifTag::Model(meta.model.clone()));
}
let exif = meta.exif;
if let Some(artist) = exif.artist {
metadata.set_tag(ExifTag::Artist(artist));
}
if let Some(copyright) = exif.copyright {
metadata.set_tag(ExifTag::Copyright(copyright));
}
if let Some(dt) = exif.date_time_original {
metadata.set_tag(ExifTag::DateTimeOriginal(dt));
}
if let Some(dt) = exif.create_date {
metadata.set_tag(ExifTag::CreateDate(dt));
}
if let Some(lens_make) = exif.lens_make {
metadata.set_tag(ExifTag::LensMake(lens_make));
}
if let Some(lens_model) = exif.lens_model {
metadata.set_tag(ExifTag::LensModel(lens_model));
}
if let Some(f) = exif.fnumber {
metadata.set_tag(ExifTag::FNumber(vec![uR64 {
nominator: f.n,
denominator: f.d,
}]));
}
if let Some(t) = exif.exposure_time {
metadata.set_tag(ExifTag::ExposureTime(vec![uR64 {
nominator: t.n,
denominator: t.d,
}]));
}
if let Some(fl) = exif.focal_length {
metadata.set_tag(ExifTag::FocalLength(vec![uR64 {
nominator: fl.n,
denominator: fl.d,
}]));
}
if let Some(iso) = exif.iso_speed {
metadata.set_tag(ExifTag::ISO(vec![iso as u16]));
} else if let Some(iso) = exif.iso_speed_ratings {
metadata.set_tag(ExifTag::ISO(vec![iso]));
}
if let Some(ev) = exif.exposure_bias {
metadata.set_tag(ExifTag::ExposureCompensation(vec![iR64 {
nominator: ev.n,
denominator: ev.d,
}]));
}
if let Some(flash) = exif.flash {
metadata.set_tag(ExifTag::Flash(vec![flash]));
}
if let Some(metering) = exif.metering_mode {
metadata.set_tag(ExifTag::MeteringMode(vec![metering]));
}
if let Some(wb) = exif.white_balance {
metadata.set_tag(ExifTag::WhiteBalance(vec![wb]));
}
if let Some(prog) = exif.exposure_program {
metadata.set_tag(ExifTag::ExposureProgram(vec![prog]));
}
}
}

if !strip_gps {
if is_raw_file(original_path_str) {
apply_gps_from_rawler(&mut metadata, original_path_str);
if let Some(gps) = raw_metadata.and_then(|meta| meta.exif.gps) {
apply_gps_from_rawler(&mut metadata, gps);
}
} else {
apply_gps_from_kamadak(&mut metadata, original_path);
}
Expand All @@ -1548,6 +1540,11 @@ pub fn write_image_with_metadata(
metadata.set_tag(ExifTag::Software("RapidRAW".to_string()));
metadata.set_tag(ExifTag::Orientation(vec![1u16]));
metadata.set_tag(ExifTag::ColorSpace(vec![1u16]));
metadata.set_tag(ExifTag::ExifVersion(b"0232".to_vec()));
metadata.set_tag(ExifTag::FlashpixVersion(b"0100".to_vec()));
if matches!(file_type, FileExtension::JPEG) {
metadata.set_tag(ExifTag::ComponentsConfiguration(vec![1, 2, 3, 0]));
}

if let Ok(reader) =
image::ImageReader::new(Cursor::new(image_bytes.as_slice())).with_guessed_format()
Expand Down
Loading