aleleba/pdfcraft
1
0
Fork 0
mirror of https://github.com/storytold/pdfcraft.git synced 2026-11-03 06:51:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): finish font discovery when its worker panics

Browse Source 
Contain discovery panics and publish the empty result so the font menu leaves its pending state. A synthetic panic regression fails when containment is removed.

Co-Authored-By: Codex GPT-6.1 <noreply@openai.com>
This commit is contained in:
FredApps
2026-11-01 12:54:52 +01:00
co-authored by Codex GPT-6.1
parent 2c6a0fed48
commit 21a48ac735
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/workflows/files.rs
+16 -1
View File
@@ -28,6 +28,13 @@ pub enum FilePurpose {
RedactWords,
}
#[cfg(not(target_arch = "wasm32"))]
fn discover_fonts_safely(
discover: impl FnOnce() -> Vec<pdfcraft_engine::text_fonts::FontFile> + std::panic::UnwindSafe,
) -> Vec<pdfcraft_engine::text_fonts::FontFile> {
std::panic::catch_unwind(discover).unwrap_or_default()
}
/// Discover installed document fonts off the GUI thread, only when the picker is opened.
#[cfg(not(target_arch = "wasm32"))]
pub(crate) fn installed_font_files(ctx: &egui::Context) -> Option<Vec<pdfcraft_engine::text_fonts::FontFile>> {
@@ -41,7 +48,7 @@ pub(crate) fn installed_font_files(ctx: &egui::Context) -> Option<Vec<pdfcraft_e
if std::thread::Builder::new()
.name("document-font-discovery".into())
.spawn(move || {
let fonts = pdfcraft_engine::text_fonts::discover(&pdfcraft_engine::text_fonts::installed_directories());
let fonts = discover_fonts_safely(|| pdfcraft_engine::text_fonts::discover(&pdfcraft_engine::text_fonts::installed_directories()));
if let Ok(mut result) = result.lock() {
*result = Some(fonts);
}
@@ -1177,3 +1184,11 @@ mod stem_tests {
out
}
}
#[cfg(all(test, not(target_arch = "wasm32")))]
mod font_scan_tests {
#[test]
fn a_panicking_font_scan_finishes_with_an_empty_list() {
assert!(super::discover_fonts_safely(|| panic!("synthetic font scan failure")).is_empty());
}
}