mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
Merge pull request #296 from plaurent/feat/shellchat-pddb-edit
add pddb edit (types pddb write <k> <v>)
This commit is contained in:
commit
3bbe868e18
2 changed files with 68 additions and 0 deletions
|
|
@ -278,6 +278,24 @@ impl Gam {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn type_chars(&self, s: &str) -> Result<bool, xous::Error> {
|
||||||
|
let mut view = s.chars().peekable();
|
||||||
|
|
||||||
|
while view.peek().is_some() {
|
||||||
|
let chunk: std::string::String = view.by_ref().take(4).collect();
|
||||||
|
send_message(self.conn,
|
||||||
|
Message::new_scalar(Opcode::KeyboardEvent.to_usize().unwrap(),
|
||||||
|
chunk.chars().nth(0).unwrap() as usize,
|
||||||
|
if chunk.len() > 1 {chunk.chars().nth(1).unwrap()} else {'\u{0000}'} as usize,
|
||||||
|
if chunk.len() > 2 {chunk.chars().nth(2).unwrap()} else {'\u{0000}'} as usize,
|
||||||
|
if chunk.len() > 3 {chunk.chars().nth(3).unwrap()} else {'\u{0000}'} as usize
|
||||||
|
)
|
||||||
|
).expect("Couldn't type chars");
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn claim_token(&self, name: &str) -> Result<Option<[u32; 4]>, xous::Error> {
|
pub fn claim_token(&self, name: &str) -> Result<Option<[u32; 4]>, xous::Error> {
|
||||||
let tokenclaim = TokenClaim {
|
let tokenclaim = TokenClaim {
|
||||||
token: None,
|
token: None,
|
||||||
|
|
|
||||||
|
|
@ -157,6 +157,56 @@ impl<'a> ShellCmdApi<'a> for PddbCmd {
|
||||||
write!(ret, "Missing query of form 'dict:key'").unwrap();
|
write!(ret, "Missing query of form 'dict:key'").unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
"edit" => {
|
||||||
|
( || {
|
||||||
|
let Some(descriptor) = tokens.next() else {
|
||||||
|
write!(ret, "Missing query of form 'dict:key'").unwrap();
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
let Some((dict, keyname)) = descriptor.split_once(':') else {
|
||||||
|
write!(ret, "Query is of form 'dict:key'").unwrap();
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
match self.pddb.get(dict, keyname, None,
|
||||||
|
false, false, None, None::<fn()>) {
|
||||||
|
Ok(mut key) => {
|
||||||
|
let mut readbuf = [0u8; 512]; // up to the first 512 chars of the key
|
||||||
|
match key.read(&mut readbuf) {
|
||||||
|
Ok(len) => {
|
||||||
|
match std::string::String::from_utf8(readbuf[..len].to_vec()) {
|
||||||
|
Ok(s) => {
|
||||||
|
let mut editcmd = "pddb write ".to_string();
|
||||||
|
editcmd.push_str(&descriptor);
|
||||||
|
editcmd.push_str(" ");
|
||||||
|
editcmd.push_str(&s);
|
||||||
|
|
||||||
|
match _env.gam.type_chars(&editcmd) {
|
||||||
|
Ok(_) => {
|
||||||
|
write!(ret, "Edit the value and press enter:").unwrap()
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
write!(ret, "Couldn't type out write command.").unwrap()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
for &b in readbuf[..len].iter() {
|
||||||
|
match write!(ret, "Not editing non-string: {:02x} ", b) {
|
||||||
|
Ok(_) => (),
|
||||||
|
Err(_) => break, // we can overflow our return buffer returning hex chars
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => write!(ret, "Error encountered reading {}:{}", dict, keyname).unwrap()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => write!(ret, "{}:{} not found or other error", dict, keyname).unwrap()
|
||||||
|
}
|
||||||
|
})()
|
||||||
|
}
|
||||||
"copy" => {
|
"copy" => {
|
||||||
(|| {
|
(|| {
|
||||||
let Some(srcdescriptor) = tokens.next() else {
|
let Some(srcdescriptor) = tokens.next() else {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue