nortega/dbus-prettifier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix buffer reading.

Browse Source
This commit is contained in:
Nicolás A. Ortega Froysa
2025-10-02 13:44:05 +02:00
parent a123afd052
commit 9548c2c167
1 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/worker.rs
View File

@@ -27,11 +27,8 @@ use std::fs;
use std::io::Read; use std::io::Read;
use std::boxed::Box; 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> { 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) => { Some(path) => {
let in_file = fs::File::open(path); let in_file = fs::File::open(path);
if let Err(e) = in_file { if let Err(e) = in_file {
@@ -57,54 +54,49 @@ 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 = '\0';
let mut last_ch:char = '\0';
let mut tab_num = 0; let mut tab_num = 0;
while in_reader.read(&mut read_buf).unwrap() > 0 { for i in in_reader.bytes() {
for i in read_buf { let ch = i.unwrap() as char;
let ch = i as char; match ch {
match ch { '[' | '{' => {
'[' | '{' => { tab_num += 1;
tab_num += 1; out_writer.write(format!("{ch}\n").as_bytes()).unwrap();
out_writer.write(format!("{ch}\n").as_bytes()).unwrap(); for _ in 0..tab_num {
for _ in 0..tab_num { out_writer.write(b" ").unwrap();
out_writer.write(b" ").unwrap(); }
} last_ch = ' ';
last_ch = ' '; },
}, ']' | '}' => {
']' | '}' => { tab_num -= 1;
tab_num -= 1; out_writer.write(b"\n").unwrap();
for _ in 0..tab_num {
out_writer.write(b" ").unwrap();
}
out_writer.write(format!("{ch}").as_bytes()).unwrap();
last_ch = ch;
},
',' => {
out_writer.write(format!("{ch}").as_bytes()).unwrap();
if last_ch == '}' || last_ch == ']' {
out_writer.write(b"\n").unwrap(); out_writer.write(b"\n").unwrap();
for _ in 0..tab_num { for _ in 0..tab_num {
out_writer.write(b" ").unwrap(); out_writer.write(b" ").unwrap();
} }
last_ch = ' ';
} else {
last_ch = ch;
}
},
_ => {
if ch != ' ' || last_ch != ' ' {
out_writer.write(format!("{ch}").as_bytes()).unwrap(); out_writer.write(format!("{ch}").as_bytes()).unwrap();
last_ch = ch; last_ch = ch;
}, }
',' => { },
out_writer.write(format!("{ch}").as_bytes()).unwrap();
if last_ch == '}' || last_ch == ']' {
out_writer.write(b"\n").unwrap();
for _ in 0..tab_num {
out_writer.write(b" ").unwrap();
}
last_ch = ' ';
} else {
last_ch = ch;
}
},
_ => {
if ch != ' ' || last_ch != ' ' {
out_writer.write(format!("{ch}").as_bytes()).unwrap();
last_ch = ch;
}
},
}
} }
} }
out_writer.flush().unwrap();
Ok(()) Ok(())
} }