Skip to content

Commit

Permalink
Only do input utf8-encoding check for commands that need it
Browse files Browse the repository at this point in the history
  • Loading branch information
jqnatividad committed Aug 4, 2022
1 parent 959a469 commit cb202ae
Show file tree
Hide file tree
Showing 25 changed files with 30 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/cmd/behead.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ struct Args {
pub fn run(argv: &[&str]) -> CliResult<()> {
let args: Args = util::get_args(USAGE, argv)?;
let conf = Config::new(&args.arg_input)
.checkutf8(false)
.delimiter(args.flag_delimiter)
.no_headers(false);

Expand Down
1 change: 1 addition & 0 deletions src/cmd/count.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ struct Args {
pub fn run(argv: &[&str]) -> CliResult<()> {
let args: Args = util::get_args(USAGE, argv)?;
let conf = Config::new(&args.arg_input)
.checkutf8(false)
.delimiter(args.flag_delimiter)
.no_headers(args.flag_no_headers);

Expand Down
1 change: 1 addition & 0 deletions src/cmd/enumerate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let args: Args = util::get_args(USAGE, argv)?;
let mut rconfig = Config::new(&args.arg_input)
.delimiter(args.flag_delimiter)
.checkutf8(false)
.no_headers(args.flag_no_headers);

let mut rdr = rconfig.reader()?;
Expand Down
1 change: 1 addition & 0 deletions src/cmd/excel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let num_sheets = sheet_names.len();

let mut wtr = Config::new(&args.flag_output)
.checkutf8(false)
.flexible(args.flag_flexible)
.writer()?;
let mut record = csv::StringRecord::new();
Expand Down
1 change: 1 addition & 0 deletions src/cmd/fill.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let rconfig = Config::new(&args.arg_input)
.delimiter(args.flag_delimiter)
.no_headers(args.flag_no_headers)
.checkutf8(false)
.select(args.arg_selection);

let wconfig = Config::new(&args.flag_output);
Expand Down
1 change: 1 addition & 0 deletions src/cmd/fixlengths.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ struct Args {
pub fn run(argv: &[&str]) -> CliResult<()> {
let args: Args = util::get_args(USAGE, argv)?;
let config = Config::new(&args.arg_input)
.checkutf8(false)
.delimiter(args.flag_delimiter)
.no_headers(true)
.flexible(true);
Expand Down
1 change: 1 addition & 0 deletions src/cmd/flatten.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let args: Args = util::get_args(USAGE, argv)?;
let rconfig = Config::new(&args.arg_input)
.delimiter(args.flag_delimiter)
.checkutf8(false)
.no_headers(args.flag_no_headers);
let mut rdr = rconfig.reader()?;
let headers = rdr.byte_headers()?.clone();
Expand Down
1 change: 1 addition & 0 deletions src/cmd/fmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let args: Args = util::get_args(USAGE, argv)?;

let rconfig = Config::new(&args.arg_input)
.checkutf8(false)
.delimiter(args.flag_delimiter)
.no_headers(true);
let mut wconfig = Config::new(&args.flag_output)
Expand Down
1 change: 1 addition & 0 deletions src/cmd/foreach.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let rconfig = Config::new(&args.arg_input)
.delimiter(args.flag_delimiter)
.no_headers(args.flag_no_headers)
.checkutf8(false)
.select(args.arg_column);

let mut rdr = rconfig.reader()?;
Expand Down
4 changes: 3 additions & 1 deletion src/cmd/generate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ struct Args {

pub fn run(argv: &[&str]) -> CliResult<()> {
let args: Args = util::get_args(USAGE, argv)?;
let conf = Config::new(&args.arg_input).delimiter(args.flag_delimiter);
let conf = Config::new(&args.arg_input)
.checkutf8(false)
.delimiter(args.flag_delimiter);

let tdir = temp_dir();
let mut dsp = DataSampleParser::new();
Expand Down
4 changes: 3 additions & 1 deletion src/cmd/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
Some(p) => PathBuf::from(&p),
};

let rconfig = Config::new(&Some(args.arg_input)).delimiter(args.flag_delimiter);
let rconfig = Config::new(&Some(args.arg_input))
.checkutf8(false)
.delimiter(args.flag_delimiter);
let mut rdr = rconfig.reader_file()?;
let mut wtr = io::BufWriter::new(fs::File::create(&pidx)?);
RandomAccessSimple::create(&mut rdr, &mut wtr)?;
Expand Down
4 changes: 2 additions & 2 deletions src/cmd/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
std::env::set_var("QSV_SNIFF_PREAMBLE", "1");
}
let mut rconfig = Config::new(&args.arg_input)
.checkutf8(false)
.delimiter(args.flag_delimiter)
.no_headers(true)
.quote(args.flag_quote.as_byte())
.trim(trim_setting)
.checkutf8(false);
.trim(trim_setting);
if args.flag_auto_skip {
std::env::remove_var("QSV_SNIFF_PREAMBLE");
}
Expand Down
1 change: 1 addition & 0 deletions src/cmd/partition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ impl Args {
Config::new(&self.arg_input)
.delimiter(self.flag_delimiter)
.no_headers(self.flag_no_headers)
.checkutf8(false)
.select(self.arg_column.clone())
}

Expand Down
1 change: 1 addition & 0 deletions src/cmd/rename.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let args: Args = util::get_args(USAGE, argv)?;

let rconfig = Config::new(&args.arg_input)
.checkutf8(false)
.delimiter(args.flag_delimiter)
.no_headers(args.flag_no_headers);

Expand Down
1 change: 1 addition & 0 deletions src/cmd/replace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let rconfig = Config::new(&args.arg_input)
.delimiter(args.flag_delimiter)
.no_headers(args.flag_no_headers)
.checkutf8(false)
.select(args.flag_select);

let mut rdr = rconfig.reader()?;
Expand Down
1 change: 1 addition & 0 deletions src/cmd/reverse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ struct Args {
pub fn run(argv: &[&str]) -> CliResult<()> {
let args: Args = util::get_args(USAGE, argv)?;
let rconfig = Config::new(&args.arg_input)
.checkutf8(false)
.delimiter(args.flag_delimiter)
.no_headers(args.flag_no_headers);

Expand Down
1 change: 1 addition & 0 deletions src/cmd/sample.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let args: Args = util::get_args(USAGE, argv)?;
let rconfig = Config::new(&args.arg_input)
.delimiter(args.flag_delimiter)
.checkutf8(false)
.no_headers(args.flag_no_headers);
let mut sample_size = args.arg_sample_size;

Expand Down
1 change: 1 addition & 0 deletions src/cmd/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,7 @@ fn generate_string_patterns(
// standard boiler-plate for reading CSV

let rconfig = Config::new(&args.arg_input)
.checkutf8(false)
.delimiter(args.flag_delimiter)
.no_headers(args.flag_no_headers)
.select(args.flag_pattern_columns.clone());
Expand Down
1 change: 1 addition & 0 deletions src/cmd/search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let rconfig = Config::new(&args.arg_input)
.delimiter(args.flag_delimiter)
.no_headers(args.flag_no_headers)
.checkutf8(false)
.select(args.flag_select);

let mut rdr = rconfig.reader()?;
Expand Down
1 change: 1 addition & 0 deletions src/cmd/searchset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
.unicode(regex_unicode)
.build()?;
let rconfig = Config::new(&args.arg_input)
.checkutf8(false)
.delimiter(args.flag_delimiter)
.no_headers(args.flag_no_headers)
.select(args.flag_select);
Expand Down
1 change: 1 addition & 0 deletions src/cmd/select.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let rconfig = Config::new(&args.arg_input)
.delimiter(args.flag_delimiter)
.no_headers(args.flag_no_headers)
.checkutf8(false)
.select(args.arg_selection);

let mut rdr = rconfig.reader()?;
Expand Down
1 change: 1 addition & 0 deletions src/cmd/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ impl Args {

fn rconfig(&self) -> Config {
Config::new(&self.arg_input)
.checkutf8(false)
.delimiter(self.flag_delimiter)
.no_headers(self.flag_no_headers)
}
Expand Down
1 change: 1 addition & 0 deletions src/cmd/split.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ impl Args {

fn rconfig(&self) -> Config {
Config::new(&self.arg_input)
.checkutf8(false)
.delimiter(self.flag_delimiter)
.no_headers(self.flag_no_headers)
}
Expand Down
1 change: 1 addition & 0 deletions src/cmd/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
let rconfig = Config::new(&args.arg_input)
.delimiter(args.flag_delimiter)
.no_headers(true)
.checkutf8(false)
.flexible(true);
let wconfig = Config::new(&args.flag_output).delimiter(Some(Delimiter(b'\t')));

Expand Down
1 change: 1 addition & 0 deletions src/cmd/transpose.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ impl Args {

fn rconfig(&self) -> Config {
Config::new(&self.arg_input)
.checkutf8(false)
.delimiter(self.flag_delimiter)
.no_headers(true)
}
Expand Down

0 comments on commit cb202ae

Please sign in to comment.