refactor create_writer

This commit is contained in:
132nd-Professor
2022-08-12 22:06:37 +02:00
parent d944942d62
commit 2bf2352c67
+5 -5
View File
@@ -12,14 +12,14 @@ pub fn create_writer(
coalition: &Coalition, coalition: &Coalition,
) -> Result<Box<dyn Write>, Box<dyn ErrTrait>> { ) -> Result<Box<dyn Write>, Box<dyn ErrTrait>> {
let base_name = remove_extension(filename, is_zip); let base_name = remove_extension(filename, is_zip);
let txt_name = format!("{base_name}_{coalition}{EXTENSION_TXT}");
println!("writing {coalition}"); println!("writing {coalition}");
if is_zip { if is_zip {
Ok(Box::new(create_zipwriter( let zip_name = format!("{base_name}_{coalition}{EXTENSION_ZIP}");
&format!("{base_name}_{coalition}{EXTENSION_ZIP}"), Ok(Box::new(create_zipwriter(&zip_name, &txt_name)?))
&format!("{base_name}_{coalition}{EXTENSION_TXT}"),
)?))
} else { } else {
Ok(Box::new(create_textwriter(base_name)?)) Ok(Box::new(create_textwriter(&txt_name)?))
} }
} }