🐛 zx: open file only once

dbus2 · Jan 20, 2024 · b89f7db · b89f7db
1 parent 3468d59
commit b89f7db
Showing 1 changed file with 29 additions and 23 deletions.
diff --git a/zbus_xmlgen/src/main.rs b/zbus_xmlgen/src/main.rs
@@ -20,6 +20,12 @@ use zvariant::ObjectPath;
 
 mod cli;
 
+enum OutputTarget {
+    SingleFile(File),
+    Stdout,
+    MultipleFiles,
+}
+
 fn main() -> Result<(), Box<dyn Error>> {
     let args = cli::Args::parse();
 
@@ -54,6 +60,15 @@ fn main() -> Result<(), Box<dyn Error>> {
         .iter()
         .partition(|&i| i.name().starts_with(fdo_iface_prefix));
 
+    let mut output_target = match args.output.as_deref() {
+        Some("-") => OutputTarget::Stdout,
+        Some(path) => {
+            let file = OpenOptions::new().create(true).write(true).open(path)?;
+            OutputTarget::SingleFile(file)
+        }
+        _ => OutputTarget::MultipleFiles,
+    };
+
     for interface in needed_ifaces {
         let output = write_interfaces(
             &[&interface],
@@ -62,29 +77,20 @@ fn main() -> Result<(), Box<dyn Error>> {
             path.clone(),
             &input_src,
         )?;
-        match args.output.as_deref() {
-            Some("-") => println!("{}", output),
-            Some(path) => {
-                let mut file = OpenOptions::new()
-                    .create(true)
-                    .append(true)
-                    .open(path)
-                    .expect("Failed to open file");
-                file.write_all(output.as_bytes())?;
-            }
-            _ => {
-                std::fs::write(
-                    format!(
-                        "{}.rs",
-                        interface
-                            .name()
-                            .split('.')
-                            .last()
-                            .expect("Failed to split name")
-                    ),
-                    output,
-                )?;
-            }
+        match output_target {
+            OutputTarget::Stdout => println!("{}", output),
+            OutputTarget::SingleFile(ref mut file) => file.write_all(output.as_bytes())?,
+            OutputTarget::MultipleFiles => std::fs::write(
+                format!(
+                    "{}.rs",
+                    interface
+                        .name()
+                        .split('.')
+                        .last()
+                        .expect("Failed to split name")
+                ),
+                output,
+            )?,
         };
     }