mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
add telemetry for better PDDB CI
This commit is contained in:
parent
3a4f5d07e8
commit
46c53d9612
3 changed files with 49 additions and 3 deletions
|
|
@ -760,7 +760,10 @@ fn wrapped_main() -> ! {
|
||||||
let ret = buf.to_original::<BasisRequestPassword, _>().unwrap();
|
let ret = buf.to_original::<BasisRequestPassword, _>().unwrap();
|
||||||
if let Some(pw) = ret.plaintext_pw {
|
if let Some(pw) = ret.plaintext_pw {
|
||||||
match basis_cache.basis_create(&mut pddb_os, mgmt.name.as_str().expect("name is not valid utf-8"), pw.as_str().expect("password was not valid utf-8")) {
|
match basis_cache.basis_create(&mut pddb_os, mgmt.name.as_str().expect("name is not valid utf-8"), pw.as_str().expect("password was not valid utf-8")) {
|
||||||
Ok(_) => mgmt.code = PddbRequestCode::NoErr,
|
Ok(_) => {
|
||||||
|
log::info!("{}PDDB.CREATEOK,{},{}", xous::BOOKEND_START, mgmt.name.as_str().unwrap(), xous::BOOKEND_END);
|
||||||
|
mgmt.code = PddbRequestCode::NoErr
|
||||||
|
},
|
||||||
_ => mgmt.code = PddbRequestCode::InternalError,
|
_ => mgmt.code = PddbRequestCode::InternalError,
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -794,8 +797,10 @@ fn wrapped_main() -> ! {
|
||||||
) {
|
) {
|
||||||
basis_cache.basis_add(basis);
|
basis_cache.basis_add(basis);
|
||||||
finished = true;
|
finished = true;
|
||||||
|
log::info!("{}PDDB.UNLOCKOK,{},{}", xous::BOOKEND_START, mgmt.name.as_str().unwrap(), xous::BOOKEND_END);
|
||||||
mgmt.code = PddbRequestCode::NoErr;
|
mgmt.code = PddbRequestCode::NoErr;
|
||||||
} else {
|
} else {
|
||||||
|
log::info!("{}PDDB.BADPASS,{},{}", xous::BOOKEND_START, mgmt.name.as_str().unwrap(), xous::BOOKEND_END);
|
||||||
modals.add_list_item(t!("pddb.yes", xous::LANG)).expect("couldn't build radio item list");
|
modals.add_list_item(t!("pddb.yes", xous::LANG)).expect("couldn't build radio item list");
|
||||||
modals.add_list_item(t!("pddb.no", xous::LANG)).expect("couldn't build radio item list");
|
modals.add_list_item(t!("pddb.no", xous::LANG)).expect("couldn't build radio item list");
|
||||||
match modals.get_radiobutton(t!("pddb.badpass", xous::LANG)) {
|
match modals.get_radiobutton(t!("pddb.badpass", xous::LANG)) {
|
||||||
|
|
|
||||||
|
|
@ -107,6 +107,7 @@ pub(crate) fn password_ux_manager(
|
||||||
Some(t!("pddb.password", xous::LANG)), false,
|
Some(t!("pddb.password", xous::LANG)), false,
|
||||||
Some(format!("{}'{}'", t!("pddb.password_for", xous::LANG), db_name.as_str().unwrap()).as_str()), false, None
|
Some(format!("{}'{}'", t!("pddb.password_for", xous::LANG), db_name.as_str().unwrap()).as_str()), false, None
|
||||||
);
|
);
|
||||||
|
log::info!("{}PDDB.REQPW,{},{}", xous::BOOKEND_START, db_name.as_str().unwrap(), xous::BOOKEND_END);
|
||||||
pddb_modal.activate();
|
pddb_modal.activate();
|
||||||
dr = Some(msg);
|
dr = Some(msg);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ use pddb::PDDB_A_LEN;
|
||||||
use xous_ipc::String;
|
use xous_ipc::String;
|
||||||
#[allow(unused_imports)]
|
#[allow(unused_imports)]
|
||||||
use std::io::{Write, Read, Seek, SeekFrom};
|
use std::io::{Write, Read, Seek, SeekFrom};
|
||||||
|
use core::fmt::Write as FmtWrite;
|
||||||
|
|
||||||
pub struct PddbCmd {
|
pub struct PddbCmd {
|
||||||
pddb: pddb::Pddb,
|
pddb: pddb::Pddb,
|
||||||
|
|
@ -20,7 +21,6 @@ impl<'a> ShellCmdApi<'a> for PddbCmd {
|
||||||
cmd_api!(pddb); // inserts boilerplate for command API
|
cmd_api!(pddb); // inserts boilerplate for command API
|
||||||
|
|
||||||
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;
|
|
||||||
let mut ret = String::<1024>::new();
|
let mut ret = String::<1024>::new();
|
||||||
#[cfg(not(feature="pddbtest"))]
|
#[cfg(not(feature="pddbtest"))]
|
||||||
let helpstring = "pddb [basislist] [basiscreate] [basisunlock] [basislock] [basisdelete] [default]\n[dictlist] [keylist] [query] [dictdelete] [keydelete] [churn]";
|
let helpstring = "pddb [basislist] [basiscreate] [basisunlock] [basislock] [basisdelete] [default]\n[dictlist] [keylist] [query] [dictdelete] [keydelete] [churn]";
|
||||||
|
|
@ -126,6 +126,36 @@ impl<'a> ShellCmdApi<'a> for PddbCmd {
|
||||||
write!(ret, "Missing query of form 'dict:key'").unwrap();
|
write!(ret, "Missing query of form 'dict:key'").unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
"write" => {
|
||||||
|
if let Some(descriptor) = tokens.next() {
|
||||||
|
if let Some((dict, keyname)) = descriptor.split_once(':') {
|
||||||
|
match self.pddb.get(dict, keyname, None,
|
||||||
|
true, true, Some(256), None::<fn()>) {
|
||||||
|
Ok(mut key) => {
|
||||||
|
let mut val = String::<1024>::new();
|
||||||
|
join_tokens(&mut val, &mut tokens);
|
||||||
|
if val.len() > 0 {
|
||||||
|
match key.write(&val.as_bytes()[..val.len()]) {
|
||||||
|
Ok(len) => {
|
||||||
|
write!(ret, "Wrote {} bytes to {}:{}", len, dict, keyname).ok();
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
write!(ret, "Error writing {}:{}: {:?}", dict, keyname, e).ok();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
write!(ret, "Created an empty key {}:{}", dict, keyname).ok();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => write!(ret, "{}:{} not found or other error", dict, keyname).unwrap()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
write!(ret, "Query is of form 'dict:key'").unwrap();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
write!(ret, "Missing query of form 'dict:key'").unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
"keydelete" => {
|
"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(':') {
|
||||||
|
|
@ -895,3 +925,13 @@ fn make_vector(basis_number: usize, vtype: VectorType) -> Vec::<u8> {
|
||||||
}
|
}
|
||||||
vector
|
vector
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn join_tokens<'a>(buf: &mut String<1024>, tokens: impl Iterator<Item = &'a str>) {
|
||||||
|
for (i, tok) in tokens.enumerate() {
|
||||||
|
if i == 0 {
|
||||||
|
write!(buf, "{}", tok).unwrap();
|
||||||
|
} else {
|
||||||
|
write!(buf, " {}", tok).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue