From e36a9287cee8fddbc8c7ce7032c7fbb3be9eddb7 Mon Sep 17 00:00:00 2001 From: Patryk Laurent Date: Sat, 14 Jan 2023 15:10:50 -0800 Subject: [PATCH] add pddb edit (types pddb write ) --- services/gam/src/lib.rs | 19 ++++++++++ services/shellchat/src/cmds/pddb_cmd.rs | 50 +++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/services/gam/src/lib.rs b/services/gam/src/lib.rs index 546584b1d..18265b0d4 100644 --- a/services/gam/src/lib.rs +++ b/services/gam/src/lib.rs @@ -278,6 +278,25 @@ impl Gam { } } + pub fn type_keys(&self, s: &str) -> Result { + let mut view = s.chars().peekable(); + + while view.peek().is_some() { + let chunk: std::string::String = view.by_ref().take(4).collect(); + let bytes = chunk.as_bytes(); + send_message(self.conn, + Message::new_scalar(Opcode::KeyboardEvent.to_usize().unwrap(), + bytes[0] as usize, + if bytes.len() > 1 {bytes[1]} else {0} as usize, + if bytes.len() > 2 {bytes[2]} else {0} as usize, + if bytes.len() > 3 {bytes[3]} else {0} as usize + ) + ).expect("Couldn't type keys"); + } + + Ok(true) + } + pub fn claim_token(&self, name: &str) -> Result, xous::Error> { let tokenclaim = TokenClaim { token: None, diff --git a/services/shellchat/src/cmds/pddb_cmd.rs b/services/shellchat/src/cmds/pddb_cmd.rs index 058cdd6b8..0f64a45e5 100644 --- a/services/shellchat/src/cmds/pddb_cmd.rs +++ b/services/shellchat/src/cmds/pddb_cmd.rs @@ -157,6 +157,56 @@ impl<'a> ShellCmdApi<'a> for PddbCmd { 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::) { + 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_keys(&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" => { (|| { let Some(srcdescriptor) = tokens.next() else {