cassdlcm/vmc_rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use custom errors in VmcExtRvc

Browse Source
This commit is contained in:
Cassandra de la Cruz-Munoz 2023-12-31 12:07:15 -05:00
parent 86a1d0a605
commit 577c1aa872
Signed by: cassdlcm
GPG Key ID: BFEBACEA812DDA70
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib.rs
View File

@ -826,9 +826,9 @@ impl MessageBehavior for VmcExtRvc {
args, args,
}; };
} }
fn from_osc_message(msg: OscMessage) -> Result<Self, String> { fn from_osc_message(msg: OscMessage) -> Result<Self, FromMessageErr> {
if msg.args.len() < 2 || msg.args.len() > 3 { if msg.args.len() < 2 || msg.args.len() > 3 {
return Err(String::from("arg count invalid")); return Err(FromMessageErr::ArgCount(ArgCountErr { expected_in: vec![2, 3], actual: msg.args.len(), addr: msg.addr}));
} }
let enable: bool; let enable: bool;
let port: u16; let port: u16;
@ -840,25 +840,25 @@ impl MessageBehavior for VmcExtRvc {
} else if i == 1 { } else if i == 1 {
enable = true; enable = true;
} else { } else {
return Err(String::from("arg value invalid")); return Err(FromMessageErr::IntRange(IntRangeErr { expected_lower: 0, expected_upper: 1, actual: i, addr: msg.addr, arg_count: 0}));
} }
} }
_ => return Err(String::from("arg type invalid")), _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Int(0), actual: msg.args[0], addr: msg.addr, arg_count: 0})),
} }
match msg.args[1] { match msg.args[1] {
OscType::Int(i) => { OscType::Int(i) => {
if i >= 0 && i <= 65535 { if i >= 0 && i <= 65535 {
port = i as u16; port = i as u16;
} else { } else {
return Err(String::from("arg value invalid")); return Err(FromMessageErr::IntRange(IntRangeErr { expected_lower: 0, expected_upper: 65535, actual: i, addr: msg.addr, arg_count: 1}));
} }
} }
_ => return Err(String::from("arg type invalid")), _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Int(0), actual: msg.args[1], addr: msg.addr, arg_count: 1})),
} }
if msg.args.len() == 3 { if msg.args.len() == 3 {
match &msg.args[2] { match &msg.args[2] {
OscType::String(s) => ip_addr = Some(s.to_owned()), OscType::String(s) => ip_addr = Some(s.to_owned()),
_ => return Err(String::from("arg type invalid")), _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::String(String::new()), actual: msg.args[2], addr: msg.addr, arg_count: 2})),
} }
} }
return Ok(VmcExtRvc { return Ok(VmcExtRvc {