Merge branch 'master' of https://github.com/jqnatividad/qsv

dathere · Mar 8, 2022 · a43c5b0 · a43c5b0
2 parents 10ea881 + dcf8ea1
commit a43c5b0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -56,6 +56,7 @@ csv = "1.1"
 csv-index = "0.1"
 dateparser = "0.1"
 docopt = "1"
+encoding_rs_io = "0.1"
 eudex = { version = "0.1", optional = true }
 filetime = "0.2"
 flexi_logger = { version = "0.22", features = ["compress"] }

diff --git a/src/config.rs b/src/config.rs
@@ -5,6 +5,7 @@ use std::io::{self, Read};
 use std::ops::Deref;
 use std::path::PathBuf;
 
+use encoding_rs_io::DecodeReaderBytes;
 use serde::de::{Deserialize, Deserializer, Error};
 
 use crate::index::Indexed;
@@ -298,7 +299,10 @@ impl Config {
         Ok(match self.path {
             None => Box::new(io::stdin()),
             Some(ref p) => match fs::File::open(p) {
-                Ok(x) => Box::new(x),
+                Ok(x) => {
+                    let transcoded = DecodeReaderBytes::new(x);
+                    Box::new(transcoded)
+                }
                 Err(err) => {
                     let msg = format!("failed to open {}: {}", p.display(), err);
                     return Err(io::Error::new(io::ErrorKind::NotFound, msg));