Skip to content
Closed
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
3 changes: 2 additions & 1 deletion src/parsers/audio/ape.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ fn parse_mac_audio_header(
let samples = u64::from(total_frames - 1) * u64::from(blocks_per_frame)
+ u64::from(final_frame_blocks);
metadata.insert(
"APE:Duration".to_string(),
"Composite:Duration".to_string(),
TagValue::new_string(convert_duration(samples as f64 / f64::from(sample_rate))),
);
}
Expand Down Expand Up @@ -429,6 +429,7 @@ mod tests {
metadata.get("APE:SampleRate").unwrap().as_integer(),
Some(44100)
);
assert_eq!(text(&metadata, "Composite:Duration"), "2.64 s");
}

#[test]
Expand Down
3 changes: 2 additions & 1 deletion src/parsers/image/djvu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ fn metadata_from_expression(expression: Expression, metadata: &mut MetadataMap)
"DjVu:Trapped".to_string(),
TagValue::new_string(value.trim_start_matches('/').to_string()),
),
"note" | "Subject" | "Keywords" | "Creator" | "Producer" => {
"note" => metadata.insert("DjVu:Note".to_string(), TagValue::new_string(value.clone())),
"Subject" | "Keywords" | "Creator" | "Producer" => {
metadata.insert(format!("DjVu:{name}"), TagValue::new_string(value.clone()))
}
_ => None,
Expand Down
12 changes: 9 additions & 3 deletions src/parsers/image/embedded.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::core::{MetadataMap, TagValue};
use crate::io::buffered_reader::BufferedReader;
use crate::io::{ByteOrder as IoByteOrder, EndianReader};
use crate::parsers::tiff::ifd_parser::{ByteOrder, parse_ifd};
use crate::parsers::xmp::rdf_parser::parse_xmp;
use crate::parsers::xmp::rdf_parser::{XmpValue, parse_xmp_typed};
use crate::tag_db::lookup_tag_name;

/// EXIF sub-IFD pointer (`ExifOffset`).
Expand Down Expand Up @@ -127,11 +127,17 @@ pub fn parse_embedded_xmp(xmp_data: &[u8], metadata: &mut MetadataMap) -> bool {
if std::str::from_utf8(xmp_data).is_err() {
return false;
}
match parse_xmp(xmp_data) {
match parse_xmp_typed(xmp_data) {
Ok(tags) => {
let found = !tags.is_empty();
for (name, value) in tags {
metadata.insert(name, TagValue::new_string(value));
let value = match value {
XmpValue::Scalar(value) => TagValue::new_string(value),
XmpValue::List(values) => {
TagValue::Array(values.into_iter().map(TagValue::new_string).collect())
}
};
metadata.insert(name, value);
}
found
}
Expand Down
Loading