Compare commits

...

2 commits

Author SHA1 Message Date
d9528d5895
fix compilation 2024-10-22 11:39:28 +02:00
6f57b25133
bump dependencies 2024-10-22 11:28:51 +02:00
3 changed files with 445 additions and 512 deletions

874
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -21,12 +21,12 @@ serde_json = "1.0"
minify-html = "0.15" minify-html = "0.15"
minify-js = "0.6" minify-js = "0.6"
glob = "0.3" glob = "0.3"
comrak = "0.28" comrak = "0.29"
reqwest = { version = "0.12", features = ["json"] } reqwest = { version = "0.12", features = ["json"] }
chrono = { version = "0.4.38", default-features = false, features = ["clock"]} chrono = { version = "0.4.38", default-features = false, features = ["clock"]}
chrono-tz = "0.10" chrono-tz = "0.10"
rss = { version = "2.0", features = ["atom"] } rss = { version = "2.0", features = ["atom"] }
lol_html = "1.2" lol_html = "2.0"
base64 = "0.22" base64 = "0.22"
mime_guess = "2.0" mime_guess = "2.0"
urlencoding = "2.1" urlencoding = "2.1"

View file

@ -230,8 +230,10 @@ fn fix_images_and_integration(path: &str, html: &str) -> (String, Metadata) {
mail_obfsucated: false, mail_obfsucated: false,
}; };
( // Collection of any additional metadata
rewrite_str( let mut additional_metadata = Vec::new();
let result = rewrite_str(
html, html,
RewriteStrSettings { RewriteStrSettings {
element_content_handlers: vec![element!("img", |el| { element_content_handlers: vec![element!("img", |el| {
@ -252,24 +254,29 @@ fn fix_images_and_integration(path: &str, html: &str) -> (String, Metadata) {
Some(options), Some(options),
); );
el.replace(&data.content, ContentType::Html); el.replace(&data.content, ContentType::Html);
metadata.merge(&data.metadata);
// Store the metadata for later merging
additional_metadata.push(data.metadata);
} else { } else {
let image = general_purpose::STANDARD.encode(file); let image = general_purpose::STANDARD.encode(file);
el.set_attribute("src", &format!("data:{mime};base64,{image}")) el.set_attribute("src", &format!("data:{mime};base64,{image}"))
.unwrap(); .unwrap();
} }
} }
} }
Ok(()) Ok(())
})], })],
..RewriteStrSettings::default() ..RewriteStrSettings::default()
}, },
) )
.unwrap(), .unwrap();
metadata,
) // Merge all collected metadata
for additional in additional_metadata {
metadata.merge(&additional);
}
(result, metadata)
} }
/// Transform markdown string to File structure /// Transform markdown string to File structure