Skip to content

serde custom impl compatible with python / depythonize #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rtbo merged 1 commit into from
Jul 5, 2026
Merged

serde custom impl compatible with python / depythonize #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ rand_distr = "0.5.1"
rand_chacha = "0.9.0"
rfd = "0.17.1"
rustybuzz = "0.20.1"
serde = { version = "1.0.228" }
serde = "1.0.228"
serde_json = "1.0.149"
strict-num = "0.2.0"
tiny-skia = "0.11.4"
Expand Down
80 changes: 42 additions & 38 deletions base/src/color.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,23 +237,23 @@ impl PartialEq<Rgba8> for Rgb8 {
/// Parsing error for Rgba8
#[derive(Debug)]
pub enum ParseError {
InvalidFormat,
InvalidComponent,
InvalidAlphaComponent,
InvalidHex,
UnknownName,
IntError,
InvalidFormat(String),
InvalidComponent(String),
InvalidAlphaComponent(String),
InvalidHex(String),
UnknownName(String),
IntError(String),
}

impl fmt::Display for ParseError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
ParseError::InvalidFormat => write!(f, "invalid color format"),
ParseError::InvalidComponent => write!(f, "invalid color component"),
ParseError::InvalidAlphaComponent => write!(f, "invalid alpha component"),
ParseError::InvalidHex => write!(f, "invalid hex color"),
ParseError::UnknownName => write!(f, "unknown color name"),
ParseError::IntError => write!(f, "integer parse error"),
ParseError::InvalidFormat(s) => write!(f, "invalid color format while parsing {}", s),
ParseError::InvalidComponent(s) => write!(f, "invalid color component: {}", s),
ParseError::InvalidAlphaComponent(s) => write!(f, "invalid alpha component: {}", s),
ParseError::InvalidHex(s) => write!(f, "invalid hex color: {}", s),
ParseError::UnknownName(s) => write!(f, "unknown color name: {}", s),
ParseError::IntError(s) => write!(f, "integer parse error: {}", s),
}
}
}
Expand All @@ -266,16 +266,18 @@ fn parse_component_0_255(s: &str) -> Result<u8, ParseError> {
let val = s[..s.len() - 1]
.trim()
.parse::<f32>()
.map_err(|_| ParseError::InvalidComponent)?;
.map_err(|_| ParseError::InvalidComponent(s.to_string()))?;
if !(0.0..=100.0).contains(&val) {
return Err(ParseError::InvalidComponent);
return Err(ParseError::InvalidComponent(s.to_string()));
}
Ok(((val / 100.0) * 255.0).round().clamp(0.0, 255.0) as u8)
} else {
// integer 0-255
let v: i32 = s.parse().map_err(|_| ParseError::InvalidComponent)?;
let v: i32 = s
.parse()
.map_err(|_| ParseError::InvalidComponent(s.to_string()))?;
if !(0..=255).contains(&v) {
return Err(ParseError::InvalidComponent);
return Err(ParseError::InvalidComponent(s.to_string()));
}
Ok(v as u8)
}
Expand All @@ -288,23 +290,25 @@ fn parse_alpha(s: &str) -> Result<u8, ParseError> {
let val = s[..s.len() - 1]
.trim()
.parse::<f32>()
.map_err(|_| ParseError::InvalidAlphaComponent)?;
.map_err(|_| ParseError::InvalidAlphaComponent(s.to_string()))?;
if !(0.0..=100.0).contains(&val) {
return Err(ParseError::InvalidAlphaComponent);
return Err(ParseError::InvalidAlphaComponent(s.to_string()));
}
Ok(((val / 100.0) * 255.0).round().clamp(0.0, 255.0) as u8)
} else {
// try float 0.0-1.0
if let Ok(f) = s.parse::<f32>() {
if !(0.0..=1.0).contains(&f) {
return Err(ParseError::InvalidAlphaComponent);
return Err(ParseError::InvalidAlphaComponent(s.to_string()));
}
return Ok((f * 255.0).round().clamp(0.0, 255.0) as u8);
}
// try integer 0-255
let v: i32 = s.parse().map_err(|_| ParseError::InvalidAlphaComponent)?;
let v: i32 = s
.parse()
.map_err(|_| ParseError::InvalidAlphaComponent(s.to_string()))?;
if !(0..=255).contains(&v) {
return Err(ParseError::InvalidAlphaComponent);
return Err(ParseError::InvalidAlphaComponent(s.to_string()));
}
Ok(v as u8)
}
Expand All @@ -321,7 +325,7 @@ impl FromStr for Rgb8 {
fn from_str(s: &str) -> Result<Self, Self::Err> {
let raw = s.trim();
if raw.is_empty() {
return Err(ParseError::InvalidFormat);
return Err(ParseError::InvalidFormat(raw.to_string()));
}

// HTML hex: starts with '#'
Expand All @@ -333,18 +337,18 @@ impl FromStr for Rgb8 {
if bytes[1..].iter().all(|&c| is_hex_char(c)) {
Ok(Rgb8::from_hex(bytes))
} else {
Err(ParseError::InvalidHex)
Err(ParseError::InvalidHex(raw.to_string()))
}
}
_ => Err(ParseError::InvalidHex),
_ => Err(ParseError::InvalidHex(raw.to_string())),
}
}
// rgb(...)
else if raw.to_ascii_lowercase().starts_with("rgb(") && raw.ends_with(')') {
let inner = &raw[4..raw.len() - 1];
let parts: Vec<&str> = inner.split(',').collect();
if parts.len() != 3 {
return Err(ParseError::InvalidFormat);
return Err(ParseError::InvalidFormat(raw.to_string()));
}
let r = parse_component_0_255(parts[0])?;
let g = parse_component_0_255(parts[1])?;
Expand All @@ -355,11 +359,11 @@ impl FromStr for Rgb8 {
else {
if let Some(col) = names::lookup(raw) {
if col.a() != 255 {
return Err(ParseError::InvalidAlphaComponent);
return Err(ParseError::InvalidAlphaComponent(raw.to_string()));
}
Ok(col.rgb())
} else {
Err(ParseError::UnknownName)
Err(ParseError::UnknownName(raw.to_string()))
}
}
}
Expand All @@ -376,7 +380,7 @@ impl FromStr for Rgba8 {
fn from_str(s: &str) -> Result<Self, Self::Err> {
let raw = s.trim();
if raw.is_empty() {
return Err(ParseError::InvalidFormat);
return Err(ParseError::InvalidFormat(raw.to_string()));
}

// HTML hex: starts with '#'
Expand All @@ -388,18 +392,18 @@ impl FromStr for Rgba8 {
if bytes[1..].iter().all(|&c| is_hex_char(c)) {
Ok(Rgba8::from_hex(bytes))
} else {
Err(ParseError::InvalidHex)
Err(ParseError::InvalidHex(raw.to_string()))
}
}
_ => Err(ParseError::InvalidHex),
_ => Err(ParseError::InvalidHex(raw.to_string())),
}
}
// rgb(...) or rgba(...)
else if raw.to_ascii_lowercase().starts_with("rgb(") && raw.ends_with(')') {
let inner = &raw[4..raw.len() - 1];
let parts: Vec<&str> = inner.split(',').collect();
if parts.len() != 3 {
return Err(ParseError::InvalidFormat);
return Err(ParseError::InvalidFormat(raw.to_string()));
}
let r = parse_component_0_255(parts[0])?;
let g = parse_component_0_255(parts[1])?;
Expand All @@ -409,7 +413,7 @@ impl FromStr for Rgba8 {
let inner = &raw[5..raw.len() - 1];
let parts: Vec<&str> = inner.split(',').collect();
if parts.len() != 4 {
return Err(ParseError::InvalidFormat);
return Err(ParseError::InvalidFormat(raw.to_string()));
}
let r = parse_component_0_255(parts[0])?;
let g = parse_component_0_255(parts[1])?;
Expand All @@ -422,7 +426,7 @@ impl FromStr for Rgba8 {
if let Some(col) = names::lookup(raw) {
Ok(col)
} else {
Err(ParseError::UnknownName)
Err(ParseError::UnknownName(raw.to_string()))
}
}
}
Expand Down Expand Up @@ -866,31 +870,31 @@ mod tests {
// empty
assert!(matches!(
"".parse::<Rgba8>(),
Err(ParseError::InvalidFormat)
Err(ParseError::InvalidFormat(_))
));

// invalid hex length
assert!(matches!(
"#12345".parse::<Rgba8>(),
Err(ParseError::InvalidHex)
Err(ParseError::InvalidHex(_))
));

// invalid rgb component (out of 0-255)
assert!(matches!(
"rgb(300,0,0)".parse::<Rgba8>(),
Err(ParseError::InvalidComponent)
Err(ParseError::InvalidComponent(_))
));

// invalid rgba alpha (float > 1.0)
assert!(matches!(
"rgba(255,0,0,2.0)".parse::<Rgba8>(),
Err(ParseError::InvalidAlphaComponent)
Err(ParseError::InvalidAlphaComponent(_))
));

// unknown name
assert!(matches!(
"notacolor".parse::<Rgba8>(),
Err(ParseError::UnknownName)
Err(ParseError::UnknownName(_))
));
}

Expand Down
Loading
Loading