3 Commits

Author SHA1 Message Date
1000e3b0e8 Bump version to v1.2.1 2025-10-03 09:19:17 +02:00
87b316fb20 Do not use newline if within parenthesis.
This is useful for some arguments.
2025-10-03 09:13:27 +02:00
8b125ac5e7 Simplify writing with a write buffer. 2025-10-03 09:07:44 +02:00
4 changed files with 41 additions and 15 deletions

2
Cargo.lock generated
View File

@@ -4,4 +4,4 @@ version = 4
[[package]] [[package]]
name = "dbus-prettifier" name = "dbus-prettifier"
version = "1.2.0" version = "1.2.1"

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "dbus-prettifier" name = "dbus-prettifier"
version = "1.2.0" version = "1.2.1"
edition = "2024" edition = "2024"
authors = [ "Nicolás A. Ortega Froysa <nicolas@ortegas.org>" ] authors = [ "Nicolás A. Ortega Froysa <nicolas@ortegas.org>" ]
description = "A tool to prettify the output of qdbus." description = "A tool to prettify the output of qdbus."

View File

@@ -1,4 +1,4 @@
.TH dbus-prettifier "1" "October 2025" "dbus-prettifier 1.2.0" "User Commands" .TH dbus-prettifier "1" "October 2025" "dbus-prettifier 1.2.1" "User Commands"
.SH "NAME" .SH "NAME"
dbus-prettifier - A tool to prettify the output of qdbus. dbus-prettifier - A tool to prettify the output of qdbus.
.SH "SYNOPSIS" .SH "SYNOPSIS"

View File

@@ -27,6 +27,8 @@ use std::fs;
use std::io::Read; use std::io::Read;
use std::boxed::Box; use std::boxed::Box;
static MAX_WRITE_BUF_SIZE:usize = 1024;
pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> Result<(), String> { pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> Result<(), String> {
let in_reader:Box<dyn io::Read> = match in_path { let in_reader:Box<dyn io::Read> = match in_path {
Some(path) => { Some(path) => {
@@ -56,33 +58,43 @@ pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> Result<(), String>
let mut last_ch = '\0'; let mut last_ch = '\0';
let mut tab_num = 0; let mut tab_num = 0;
let mut in_paren = false;
let mut write_buf = String::new();
for i in in_reader.bytes() { for i in in_reader.bytes() {
let ch = i.unwrap() as char; let ch = i.unwrap() as char;
match ch { match ch {
'[' | '{' => { '[' | '{' => {
tab_num += 1; tab_num += 1;
out_writer.write(format!("{ch}\n").as_bytes()).unwrap(); //write_buf += format!("{ch}\n").as_str();
for _ in 0..tab_num { write_buf.push(ch);
out_writer.write(b" ").unwrap(); if !in_paren {
write_buf.push('\n');
for _ in 0..tab_num {
write_buf += " ";
}
last_ch = ' ';
} else {
last_ch = ch;
} }
last_ch = ' ';
}, },
']' | '}' => { ']' | '}' => {
tab_num -= 1; tab_num -= 1;
out_writer.write(b"\n").unwrap(); if !in_paren {
for _ in 0..tab_num { write_buf += "\n";
out_writer.write(b" ").unwrap(); for _ in 0..tab_num {
write_buf += " ";
}
} }
out_writer.write(format!("{ch}").as_bytes()).unwrap(); write_buf.push(ch);
last_ch = ch; last_ch = ch;
}, },
',' => { ',' => {
out_writer.write(format!("{ch}").as_bytes()).unwrap(); write_buf.push(ch);
if last_ch == '}' || last_ch == ']' { if last_ch == '}' || last_ch == ']' {
out_writer.write(b"\n").unwrap(); write_buf.push('\n');
for _ in 0..tab_num { for _ in 0..tab_num {
out_writer.write(b" ").unwrap(); write_buf += " ";
} }
last_ch = ' '; last_ch = ' ';
} else { } else {
@@ -91,11 +103,25 @@ pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> Result<(), String>
}, },
_ => { _ => {
if ch != ' ' || last_ch != ' ' { if ch != ' ' || last_ch != ' ' {
out_writer.write(format!("{ch}").as_bytes()).unwrap(); if ch == '(' {
in_paren = true;
} else if ch == ')' {
in_paren = false;
}
write_buf.push(ch);
last_ch = ch; last_ch = ch;
} }
}, },
} }
if write_buf.len() >= MAX_WRITE_BUF_SIZE {
out_writer.write_all(write_buf.as_bytes()).unwrap();
write_buf.clear();
}
}
if write_buf.len() > 0 {
out_writer.write_all(write_buf.as_bytes()).unwrap();
} }
Ok(()) Ok(())