rpuzonas/ubusman
1
0
Fork 0
Code Pull Requests Releases Activity

fix minor bugs

Browse Source
This commit is contained in:
Rokas Puzonas 2023-05-08 11:04:09 +03:00
parent 8b7f592099
commit 6506256dc2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app.rs
View File

@ -100,7 +100,7 @@ impl Default for App {
username: "root".to_owned(), username: "root".to_owned(),
password: "admin01".to_owned(), password: "admin01".to_owned(),
show_object_ids: false, show_object_ids: false,
connect_on_start: true connect_on_start: false
}, },
session: None, session: None,
ubus_call_handle: None, ubus_call_handle: None,
@ -167,6 +167,8 @@ fn json_layouter(ui: &egui::Ui, string: &str, wrap_width: f32) -> Arc<egui::Gall
impl App { impl App {
pub fn init(&mut self, cc: &CreationContext) { pub fn init(&mut self, cc: &CreationContext) {
self.load_config();
if self.settings.connect_on_start { if self.settings.connect_on_start {
let username = &self.settings.username; let username = &self.settings.username;
let password = &self.settings.password; let password = &self.settings.password;
@ -190,8 +192,6 @@ impl App {
COPY_ICON.clone(), COPY_ICON.clone(),
Default::default() Default::default()
)); ));
self.load_config();
} }
fn load_config(&mut self) -> Result<()> { fn load_config(&mut self) -> Result<()> {

2
src/ubus.rs
View File

@ -270,7 +270,7 @@ pub async fn list_verbose(session: &Session, path: Option<&str>) -> Result<Vec<O
if !params_body.is_empty() { if !params_body.is_empty() {
for param in params_body.split(",") { for param in params_body.split(",") {
let (_, name, param_type_name) = let (_, name, param_type_name) =
regex_captures!(r#"^"([\w-]+)":"(\w+)"$"#, param).ok_or(anyhow!( regex_captures!(r#"^"([\w-]+)":"([\w\(\)]+)"$"#, param).ok_or(anyhow!(
"Failed to parse parameter '{}' in line '{}'", "Failed to parse parameter '{}' in line '{}'",
param, param,
line line