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

fix parsing method names with dots

Browse Source
This commit is contained in:
Rokas Puzonas 2023-05-26 12:19:26 +03:00
parent 56296ae57a
commit 026de9f09c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ubus.rs
View File

@ -251,7 +251,7 @@ pub async fn list_verbose(session: &Session, path: Option<&str>) -> Result<Vec<O
let mut objects = vec![]; let mut objects = vec![];
for line in output.lines() { for line in output.lines() {
if let Some((_, name, id)) = regex_captures!(r"^'([\w.-]+)' @([0-9a-zA-Z]{8})$", line) { if let Some((_, name, id)) = regex_captures!(r"^'([\w\.-]+)' @([0-9a-zA-Z]{8})$", line) {
if cur_name.is_some() && cur_id.is_some() { if cur_name.is_some() && cur_id.is_some() {
objects.push(Object { objects.push(Object {
id: cur_id.unwrap(), id: cur_id.unwrap(),
@ -263,9 +263,7 @@ pub async fn list_verbose(session: &Session, path: Option<&str>) -> Result<Vec<O
cur_name = Some(name.into()); cur_name = Some(name.into());
cur_id = Some(parse_hex_id(id)?); cur_id = Some(parse_hex_id(id)?);
} else if let Some((_, name, params_body)) = } else if let Some((_, name, params_body)) = regex_captures!(r#"^\s+"([\w\.-]+)":\{(.*)}$"#, line) {
regex_captures!(r#"^\s+"([\w-]+)":\{(.*)}$"#, line)
{
let mut params = vec![]; let mut params = vec![];
if !params_body.is_empty() { if !params_body.is_empty() {
for param in params_body.split(",") { for param in params_body.split(",") {