use MAIN_SEPARATOR instead of hardcoded ':'

This commit is contained in:
Patryk Laurent 2023-01-12 07:20:43 -08:00
parent 8804f7ef17
commit fb5811ddc8

View file

@ -160,8 +160,8 @@ impl<'a> ShellCmdApi<'a> for PddbCmd {
"copy" => { "copy" => {
if let Some(srcdescriptor) = tokens.next() { if let Some(srcdescriptor) = tokens.next() {
if let Some(dstdescriptor) = tokens.next() { if let Some(dstdescriptor) = tokens.next() {
if let Some((_srcdict, _srckeyname)) = srcdescriptor.split_once(':') { if let Some((_srcdict, _srckeyname)) = srcdescriptor.split_once(std::path::MAIN_SEPARATOR) {
if let Some((_dstdict, _dstkeyname)) = dstdescriptor.split_once(':') { if let Some((_dstdict, _dstkeyname)) = dstdescriptor.split_once(std::path::MAIN_SEPARATOR) {
match std::fs::copy(srcdescriptor, dstdescriptor) { match std::fs::copy(srcdescriptor, dstdescriptor) {
Ok(_result) => { Ok(_result) => {
write!(ret, "Copy from {} to {} succeeded", srcdescriptor, dstdescriptor).ok(); write!(ret, "Copy from {} to {} succeeded", srcdescriptor, dstdescriptor).ok();
@ -171,10 +171,10 @@ impl<'a> ShellCmdApi<'a> for PddbCmd {
} }
} }
} else { } else {
write!(ret, "Destination {} is not of required form 'dict:key'", dstdescriptor).unwrap(); write!(ret, "Destination {} is not of required form 'dict{}key'", dstdescriptor, std::path::MAIN_SEPARATOR).unwrap();
} }
} else { } else {
write!(ret, "Source {} is not of required form 'dict:key'", srcdescriptor).unwrap(); write!(ret, "Source {} is not of required form 'dict{}key'", srcdescriptor, std::path::MAIN_SEPARATOR).unwrap();
} }
} else { } else {
write!(ret, "Usage is copy 'dict:key' 'dict:key' (missing destination)").unwrap(); write!(ret, "Usage is copy 'dict:key' 'dict:key' (missing destination)").unwrap();