From 2bf2352c678800b5cf4f61d5e567f05466dde1dc Mon Sep 17 00:00:00 2001
From: 132nd-Professor <132nd-Professor>
Date: Fri, 12 Aug 2022 22:06:37 +0200
Subject: [PATCH] refactor create_writer

---
 src/writer.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/writer.rs b/src/writer.rs
index f531170..1e3e533 100644
--- a/src/writer.rs
+++ b/src/writer.rs
@@ -12,14 +12,14 @@ pub fn create_writer(
     coalition: &Coalition,
 ) -> Result<Box<dyn Write>, Box<dyn ErrTrait>> {
     let base_name = remove_extension(filename, is_zip);
+    let txt_name = format!("{base_name}_{coalition}{EXTENSION_TXT}");
+
     println!("writing {coalition}");
     if is_zip {
-        Ok(Box::new(create_zipwriter(
-            &format!("{base_name}_{coalition}{EXTENSION_ZIP}"),
-            &format!("{base_name}_{coalition}{EXTENSION_TXT}"),
-        )?))
+        let zip_name = format!("{base_name}_{coalition}{EXTENSION_ZIP}");
+        Ok(Box::new(create_zipwriter(&zip_name, &txt_name)?))
     } else {
-        Ok(Box::new(create_textwriter(base_name)?))
+        Ok(Box::new(create_textwriter(&txt_name)?))
     }
 }