DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Fonts: the Document Fonts folder is found whatever its case (#287)
aiongg54a4a8d4aed5
diff --git a/crates/engine/src/cmd/file.rs b/crates/engine/src/cmd/file.rsindex 767c62280..267ea5d88 100644--- a/crates/engine/src/cmd/file.rs+++ b/crates/engine/src/cmd/file.rs@@ -185,7 +185,7 @@ pub(crate) fn load_document_fonts(d: &mut Document, path: &str) -> (Option<Arc<c#[cfg(not(target_arch = "wasm32"))]{use designcraft_fonts::DOCUMENT_FONTS_FOLDER;- let Some(folder) = std::path::Path::new(path).parent().map(|d| d.join(DOCUMENT_FONTS_FOLDER)) else { return (None, 0, Vec::new()) };+ let Some(folder) = std::path::Path::new(path).parent().map(document_fonts_folder) else { return (None, 0, Vec::new()) };let r = designcraft_fonts::FontDb::global().load_document_fonts(&folder);d.font_scope = r.scope;let scope = (r.scope != 0).then(|| Arc::new(crate::FontScope(r.scope)));@@ -198,6 +198,23 @@ pub(crate) fn load_document_fonts(d: &mut Document, path: &str) -> (Option<Arc<c}}+/// The `Document Fonts` folder in `dir`, matched without regard to case: packages name it+/// `Document fonts`, and file systems on Linux are case-sensitive. The exact name wins.+#[cfg(not(target_arch = "wasm32"))]+fn document_fonts_folder(dir: &std::path::Path) -> std::path::PathBuf {+ use designcraft_fonts::DOCUMENT_FONTS_FOLDER;+ let exact = dir.join(DOCUMENT_FONTS_FOLDER);+ if exact.is_dir() {+ return exact;+ }+ std::fs::read_dir(dir)+ .into_iter()+ .flatten()+ .flatten()+ .find(|e| e.file_name().to_str().is_some_and(|n| n.eq_ignore_ascii_case(DOCUMENT_FONTS_FOLDER)) && e.path().is_dir())+ .map_or(exact, |e| e.path())+}+fn file_open_bytes(s: &mut Session, p: &Value) -> Result<Value> {let b = base64_decode(str_param(p, "base64").unwrap_or(""));// IDML packages are recognised by their stored `mimetype` first entry.@@ -795,6 +812,24 @@ mod document_fonts_tests {let _ = std::fs::remove_dir_all(&dir);}+ #[test]+ fn the_document_fonts_folder_is_found_whatever_its_case() {+ const FAMILY: &str = "DocFont Case Test";+ let dir = std::env::temp_dir().join(format!("dc-open-docfonts-case-{}", std::process::id()));+ let _ = std::fs::remove_dir_all(&dir);+ let fonts = dir.join("Document fonts");+ std::fs::create_dir_all(&fonts).unwrap();+ std::fs::write(fonts.join("case.ttf"), font_with(FAMILY, &['H']).unwrap()).unwrap();+ let path = dir.join("Brochure.idml");+ write_document(&path, FAMILY);++ let mut s = Session::new();+ let r = open(&mut s, &path);+ assert_eq!(r["documentFonts"], 1, "{r}");+ assert_eq!(font_entry(&mut s, FAMILY)["missing"], false);+ let _ = std::fs::remove_dir_all(&dir);+ }+#[test]fn a_document_without_the_folder_opens_as_before() {let dir = std::env::temp_dir().join(format!("dc-open-docfonts-none-{}", std::process::id()));