use custom errors and fix bug in VmcExtConfig

This commit is contained in:
Cassandra de la Cruz-Munoz 2023-12-31 12:19:00 -05:00
parent 15503575e5
commit 3fab3f9a2e
Signed by: cassdlcm
GPG Key ID: BFEBACEA812DDA70

View File

@ -1187,13 +1187,13 @@ impl MessageBehavior for VmcExtConfig {
args: vec![OscType::from(self.path.to_owned())], args: vec![OscType::from(self.path.to_owned())],
}; };
} }
fn from_osc_message(msg: OscMessage) -> Result<Self, String> { fn from_osc_message(msg: OscMessage) -> Result<Self, FromMessageErr> {
if msg.addr.len() != 1 { if msg.args.len() != 1 {
return Err(String::from("arg count invalid")); return Err(FromMessageErr::ArgCount(ArgCountErr { expected_in: vec![1], actual: msg.args.len(), addr: msg.addr }));
} }
match &msg.args[0] { match &msg.args[0] {
OscType::String(s) => return Ok(VmcExtConfig { path: s.to_owned() }), OscType::String(s) => return Ok(VmcExtConfig { path: s.to_owned() }),
_ => return Err(String::from("arg type invalid")), _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::String(String::new()), actual: msg.args[0], addr: msg.addr, arg_count: 0})),
} }
} }
} }