support for zipped file extensions

Author: pacman82

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "di-csv2xml"
-version = "1.0.14"
+version = "1.0.16"
 authors = ["Markus Klein <[email protected]>"]
 license = "MIT"
 publish = false
@@ -18,6 +18,7 @@ strum = "0.17.1"
 strum_macros = "0.17.1"
 structopt = "0.3.7"
 quick-xml = "0.17.2"
+libflate = "0.1.27"
 
 [dev-dependencies]
 assert_cli = "0.6.3"

Cargo.toml

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.0.16
+------
+
+* Support for zipped file extensions
+
 1.0.15
 ------
 

Changelog.md

@@ -4,8 +4,9 @@ mod record_type;
 
 use crate::{generate_xml::generate_xml, read_csv::CsvSource, record_type::RecordType};
 use indicatif::{ProgressBar, ProgressStyle};
+use libflate::gzip;
 use quicli::prelude::*;
-use std::{fs::File, io};
+use std::{fs::File, io, path::Path};
 use structopt::StructOpt;
 use strum;
 
@@ -55,21 +56,46 @@ fn main() -> CliResult {
                     .template(fmt)
                     .progress_chars("#>-"),
             );
-            Box::new(progress_bar.wrap_read(file))
+            let file_with_pbar = progress_bar.wrap_read(file);
+
+            if has_gz_extension(&input) {
+                Box::new(gzip::Decoder::new(file_with_pbar)?)
+            } else {
+                Box::new(file_with_pbar)
+            }
         } else {
-            Box::new(file)
+            // Repeat if to avoid extra Box.
+            if has_gz_extension(&input) {
+                Box::new(gzip::Decoder::new(file)?)
+            } else {
+                Box::new(file)
+            }
         }
     } else {
         // just use stdin
         Box::new(io::stdin())
     };
+
     let reader = CsvSource::new(input, args.delimiter as u8)?;
 
     let mut out: Box<dyn io::Write> = if let Some(output) = args.output {
-        Box::new(io::BufWriter::new(File::create(&output)?))
+        let writer = io::BufWriter::new(File::create(&output)?);
+
+        if has_gz_extension(&output) {
+            Box::new(gzip::Encoder::new(writer)?)
+        } else {
+            Box::new(writer)
+        }
     } else {
         Box::new(io::stdout())
     };
     generate_xml(&mut out, reader, &args.category, args.record_type)?;
     Ok(())
 }
+
+fn has_gz_extension(path: &Path) -> bool {
+    match path.extension() {
+        Some(ext) if ext == "gz" => true,
+        _ => false,
+    }
+}

input.xml.gz

@@ -10,6 +10,16 @@ fn simple() {
         .unwrap();
 }
 
+#[test]
+fn input_gz() {
+    assert_cli::Assert::main_binary()
+        .with_args(&["Category", "--input", "tests/input.csv.gz"])
+        .succeeds()
+        .stdout()
+        .is(include_str!("output.xml").replace("\r\n", "\n").as_str())
+        .unwrap();
+}
+
 #[test]
 fn mask_text() {
     assert_cli::Assert::main_binary()