mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
fix delete commands to sync and also make keyword ordering parallel
This commit is contained in:
parent
ae0b1f1288
commit
91ed8193a7
1 changed files with 17 additions and 7 deletions
|
|
@ -18,7 +18,7 @@ impl<'a> ShellCmdApi<'a> for PddbCmd {
|
||||||
fn process(&mut self, args: String::<1024>, _env: &mut CommonEnv) -> Result<Option<String::<1024>>, xous::Error> {
|
fn process(&mut self, args: String::<1024>, _env: &mut CommonEnv) -> Result<Option<String::<1024>>, xous::Error> {
|
||||||
use core::fmt::Write;
|
use core::fmt::Write;
|
||||||
let mut ret = String::<1024>::new();
|
let mut ret = String::<1024>::new();
|
||||||
let helpstring = "pddb [basislist] [dictlist] [keylist] [query] [delete]";
|
let helpstring = "pddb [basislist] [dictlist] [keylist] [query] [dictdelete] [keydelete]";
|
||||||
|
|
||||||
let mut tokens = args.as_str().unwrap().split(' ');
|
let mut tokens = args.as_str().unwrap().split(' ');
|
||||||
if let Some(sub_cmd) = tokens.next() {
|
if let Some(sub_cmd) = tokens.next() {
|
||||||
|
|
@ -74,14 +74,19 @@ impl<'a> ShellCmdApi<'a> for PddbCmd {
|
||||||
write!(ret, "Missing query of form 'dict:key'").unwrap();
|
write!(ret, "Missing query of form 'dict:key'").unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"deletekey" => {
|
"keydelete" => {
|
||||||
if let Some(descriptor) = tokens.next() {
|
if let Some(descriptor) = tokens.next() {
|
||||||
if let Some((dict, keyname)) = descriptor.split_once(':') {
|
if let Some((dict, keyname)) = descriptor.split_once(':') {
|
||||||
match self.pddb.delete_key(dict, keyname, None) {
|
match self.pddb.delete_key(dict, keyname, None) {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
write!(ret, "Deleted {}:{}", dict, keyname).unwrap()
|
write!(ret, "Deleted {}:{}\n", dict, keyname).unwrap();
|
||||||
|
// you must call sync after all deletions are done
|
||||||
|
write!(ret, "Sync: {}",
|
||||||
|
self.pddb.sync()
|
||||||
|
.map_or_else(|e| e.to_string(), |_| "Ok".to_string())
|
||||||
|
).unwrap();
|
||||||
}
|
}
|
||||||
_ => write!(ret, "{}:{} not found or other error", dict, keyname).unwrap()
|
Err(e) => write!(ret, "{}:{} not found or other error: {:?}", dict, keyname, e).unwrap(),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
write!(ret, "Specify key with form 'dict:key'").unwrap();
|
write!(ret, "Specify key with form 'dict:key'").unwrap();
|
||||||
|
|
@ -90,13 +95,18 @@ impl<'a> ShellCmdApi<'a> for PddbCmd {
|
||||||
write!(ret, "Missing spec of form 'dict:key'").unwrap();
|
write!(ret, "Missing spec of form 'dict:key'").unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"deletedict" => {
|
"dictdelete" => {
|
||||||
if let Some(dict) = tokens.next() {
|
if let Some(dict) = tokens.next() {
|
||||||
match self.pddb.delete_dict(dict, None) {
|
match self.pddb.delete_dict(dict, None) {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
write!(ret, "Deleted dictionary {}", dict).unwrap()
|
write!(ret, "Deleted dictionary {}\n", dict).unwrap();
|
||||||
|
// you must call sync after all deletions are done
|
||||||
|
write!(ret, "Sync: {}",
|
||||||
|
self.pddb.sync()
|
||||||
|
.map_or_else(|e| e.to_string(), |_| "Ok".to_string())
|
||||||
|
).unwrap();
|
||||||
}
|
}
|
||||||
_ => write!(ret, "{} not found or other error", dict).unwrap()
|
Err(e) => write!(ret, "{} not found or other error: {:?}", dict, e).unwrap()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
write!(ret, "Missing dictionary name").unwrap();
|
write!(ret, "Missing dictionary name").unwrap();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue