3 Commits

Author SHA1 Message Date
1ff158c650 Bump version to v1.2.0 2025-10-02 13:56:48 +02:00
9548c2c167 Fix buffer reading. 2025-10-02 13:52:01 +02:00
a123afd052 Simplify formatting. 2025-10-02 12:57:00 +02:00
3 changed files with 37 additions and 45 deletions

2
Cargo.lock generated
View File

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

View File

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

View File

@@ -27,11 +27,8 @@ use std::fs;
use std::io::Read;
use std::boxed::Box;
// Read 1KiB of the file at a time.
static BLOCK_SIZE:usize = 1024;
pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> Result<(), String> {
let mut in_reader:Box<dyn io::Read> = match in_path {
let in_reader:Box<dyn io::Read> = match in_path {
Some(path) => {
let in_file = fs::File::open(path);
if let Err(e) = in_file {
@@ -57,17 +54,15 @@ pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> Result<(), String>
},
};
let mut read_buf:[u8; BLOCK_SIZE] = [0; BLOCK_SIZE];
let mut last_ch:char = '\0';
let mut last_ch = '\0';
let mut tab_num = 0;
while in_reader.read(&mut read_buf).unwrap() > 0 {
for i in read_buf {
let ch = i as char;
for i in in_reader.bytes() {
let ch = i.unwrap() as char;
match ch {
'[' | '{' => {
tab_num += 1;
out_writer.write(format!("{}\n", ch).as_bytes()).unwrap();
out_writer.write(format!("{ch}\n").as_bytes()).unwrap();
for _ in 0..tab_num {
out_writer.write(b" ").unwrap();
}
@@ -79,11 +74,11 @@ pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> Result<(), String>
for _ in 0..tab_num {
out_writer.write(b" ").unwrap();
}
out_writer.write(format!("{}", ch).as_bytes()).unwrap();
out_writer.write(format!("{ch}").as_bytes()).unwrap();
last_ch = ch;
},
',' => {
out_writer.write(format!("{}", ch).as_bytes()).unwrap();
out_writer.write(format!("{ch}").as_bytes()).unwrap();
if last_ch == '}' || last_ch == ']' {
out_writer.write(b"\n").unwrap();
for _ in 0..tab_num {
@@ -96,15 +91,12 @@ pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> Result<(), String>
},
_ => {
if ch != ' ' || last_ch != ' ' {
out_writer.write(format!("{}", ch).as_bytes()).unwrap();
out_writer.write(format!("{ch}").as_bytes()).unwrap();
last_ch = ch;
}
},
}
}
}
out_writer.flush().unwrap();
Ok(())
}