VectorCraft: An open-source, vector art tool written by scratch in pure Rust
Merge main into fix/h2473-safe-file-name-leaves-a-windows
Brandon Thomasc5c44e0dfba6
diff --cc crates/engine/src/cmd/fileio/screens.rsindex e4c886e98,ca3dfd13c..ab8a0c432--- a/crates/engine/src/cmd/fileio/screens.rs+++ b/crates/engine/src/cmd/fileio/screens.rs@@@ -1001,15 -1008,16 +1011,26 @@@ pub(super) fn export_settings(s: &mut S#[cfg(test)]mod tests {- use super::safe_file_name;- use super::ScreenSize;++ use super::{ScreenSize, safe_file_name};++ #[test]+ fn size_parse_refuses_signs_and_exponents() {+ for s in ["+2x", "+2", "+100w", "+100h", "+72ppi", "-2x", "1e2", "2e0w"] {+ assert_eq!(ScreenSize::parse(s), None, "{s}");+ }+ assert_eq!(ScreenSize::parse("2x"), Some(ScreenSize::Scale(2.0)));+ assert_eq!(ScreenSize::parse("1.5"), Some(ScreenSize::Scale(1.5)));+ assert_eq!(ScreenSize::parse("100W"), Some(ScreenSize::Width(100.0)));+ assert_eq!(ScreenSize::parse("72ppi"), Some(ScreenSize::Ppi(72.0)));+ }++ #[test]+ fn device_name_with_space_before_extension_is_protected() {+ assert_eq!(safe_file_name("CON.png"), "CON-.png");+ assert_eq!(safe_file_name("CON .png"), "CON-.png");+ assert_eq!(safe_file_name("NUL .png"), "NUL-.png");+ assert_eq!(safe_file_name("COM1 .png"), "COM1-.png");+ assert_eq!(safe_file_name("lpt9 .png"), "lpt9-.png");+ assert_eq!(safe_file_name("My CON .png"), "My CON .png");+ }}