Bump version to v1.2.0

Cargo.lock

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

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dbus-prettifier"
-version = "1.0.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."

src/main.rs

@@ -23,7 +23,6 @@
  */
 
 use std::env;
-use std::io;
 use std::process;
 
 use crate::worker::work;
@@ -52,7 +51,7 @@ fn print_help() {
 		env!("CARGO_PKG_NAME"), env!("CARGO_PKG_NAME"));
 }
 
-fn main() -> io::Result<()> {
+fn main() {
 	let args:Vec<String> = env::args().collect();
 	let mut in_path:Option<&str> = None;
 	let mut out_path:Option<&str> = None;
@@ -63,13 +62,13 @@ fn main() -> io::Result<()> {
 		process::exit(1);
 	}
 
-	for i in &args {
+	for i in &args[1..args.len()] {
 		if i == "-h" {
 			print_help();
-			return Ok(());
+			return;
 		} else if i == "-v" {
 			print_version();
-			return Ok(());
+			return;
 		} else if i.starts_with("-") && i != "-" {
 			eprintln!("Invalid argument '{}'. Use -h for help information.", i);
 			process::exit(1);
@@ -83,5 +82,9 @@ fn main() -> io::Result<()> {
 		out_path = Some(args[2].as_str());
 	}
 
-	work(in_path, out_path)
+	let res = work(in_path, out_path);
+	if let Err(err) = res {
+		eprintln!("{}", err);
+		process::exit(1);
+	}
 }

src/worker.rs

@@ -1,16 +1,40 @@
+/*
+ * Copyright (C) 2025 Nicolás Ortega Froysa <nicolas@ortegas.org> All rights reserved.
+ * Author: Nicolás Ortega Froysa <nicolas@ortegas.org>
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.
+ *
+ * 3. This notice may not be removed or altered from any source
+ *    distribution.
+ */
+
 use std::io;
 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>) -> io::Result<()>  {
-	let mut in_reader:Box<dyn io::Read> = match in_path {
-		Some(x) => {
-			let in_file = fs::File::open(x)?;
-			Box::new(io::BufReader::new(in_file))
+pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> Result<(), String>  {
+	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 {
+				return Err(format!("{path}: {e}"));
+			}
+			Box::new(io::BufReader::new(in_file.unwrap()))
 		},
 		None => {
 			Box::new(io::stdin())
@@ -18,60 +42,61 @@ pub fn work(in_path:Option<&str>, out_path:Option<&str>) -> io::Result<()>  {
 	};
 
 	let mut out_writer:Box<dyn io::Write> = match out_path {
-		Some(x) => {
-			let out_file = fs::File::create(x)?;
-			Box::new(io::BufWriter::new(out_file))
+		Some(path) => {
+			let out_file = fs::File::create(path);
+			if let Err(e) = out_file {
+				return Err(format!("{path}: {e}"));
+			}
+			Box::new(io::BufWriter::new(out_file.unwrap()))
 		},
 		None => {
 			Box::new(io::stdout())
 		},
 	};
 
-	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)? > 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())?;
+				out_writer.write(format!("{ch}\n").as_bytes()).unwrap();
 				for _ in 0..tab_num {
-						out_writer.write(b"  ")?;
+					out_writer.write(b"  ").unwrap();
 				}
 				last_ch = ' ';
 			},
 			']' | '}' => {
 				tab_num -= 1;
-					out_writer.write(b"\n")?;
+				out_writer.write(b"\n").unwrap();
 				for _ in 0..tab_num {
-						out_writer.write(b"  ")?;
+					out_writer.write(b"  ").unwrap();
 				}
-					out_writer.write(format!("{}", ch).as_bytes())?;
+				out_writer.write(format!("{ch}").as_bytes()).unwrap();
 				last_ch = ch;
 			},
 			',' => {
-					out_writer.write(format!("{}\n", ch).as_bytes())?;
+				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"  ")?;
+						out_writer.write(b"  ").unwrap();
 					}
 					last_ch = ' ';
+				} else {
+					last_ch = ch;
+				}
 			},
 			_ => {
-					let ch = ch;
 				if ch != ' ' || last_ch != ' ' {
-						out_writer.write(format!("{}", ch).as_bytes())?;
+					out_writer.write(format!("{ch}").as_bytes()).unwrap();
 					last_ch = ch;
 				}
 			},
 		}
 	}
-	}
-
-	out_writer.flush()?;
 
 	Ok(())
-
 }