RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 19:47:45 +00:00
Code Issues Activity

Merge pull request #1265 from simonvandel/uniq-delimiter-enum

Browse source 
uniq: refactor delimiters strings into enums
This commit is contained in:
Alex Lyon 2018-07-21 15:03:16 -07:00 • committed by GitHub
commit 32ec6646a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/uniq/uniq.rs
View file

@ -24,11 +24,18 @@ use std::str::FromStr;
static NAME: &'static str = "uniq"; static NAME: &'static str = "uniq";
static VERSION: &'static str = env!("CARGO_PKG_VERSION"); static VERSION: &'static str = env!("CARGO_PKG_VERSION");
#[derive(PartialEq)]
enum Delimiters {
Prepend,
Separate,
None,
}
struct Uniq { struct Uniq {
repeats_only: bool, repeats_only: bool,
uniques_only: bool, uniques_only: bool,
all_repeated: bool, all_repeated: bool,
delimiters: String, delimiters: Delimiters,
show_counts: bool, show_counts: bool,
skip_fields: Option<usize>, skip_fields: Option<usize>,
slice_start: Option<usize>, slice_start: Option<usize>,
@ -45,22 +52,22 @@ impl Uniq {
) { ) {
let mut lines: Vec<String> = vec![]; let mut lines: Vec<String> = vec![];
let mut first_line_printed = false; let mut first_line_printed = false;
let delimiters = &self.delimiters[..]; let delimiters = &self.delimiters;
let line_terminator = self.get_line_terminator(); let line_terminator = self.get_line_terminator();
for io_line in reader.split(line_terminator) { for io_line in reader.split(line_terminator) {
let line = String::from_utf8(crash_if_err!(1, io_line)).unwrap(); let line = String::from_utf8(crash_if_err!(1, io_line)).unwrap();
if !lines.is_empty() && self.cmp_key(&lines[0]) != self.cmp_key(&line) { if !lines.is_empty() && self.cmp_key(&lines[0]) != self.cmp_key(&line) {
let print_delimiter = let print_delimiter = delimiters == &Delimiters::Prepend
delimiters == "prepend" || (delimiters == "separate" && first_line_printed); || (delimiters == &Delimiters::Separate && first_line_printed);
first_line_printed |= self.print_lines(writer, &lines, print_delimiter); first_line_printed |= self.print_lines(writer, &lines, print_delimiter);
lines.truncate(0); lines.truncate(0);
} }
lines.push(line); lines.push(line);
} }
if !lines.is_empty() { if !lines.is_empty() {
let print_delimiter = let print_delimiter = delimiters == &Delimiters::Prepend
delimiters == "prepend" || (delimiters == "separate" && first_line_printed); || (delimiters == &Delimiters::Separate && first_line_printed);
self.print_lines(writer, &lines, print_delimiter); self.print_lines(writer, &lines, print_delimiter);
} }
} }
@ -248,18 +255,12 @@ pub fn uumain(args: Vec<String>) -> i32 {
uniques_only: matches.opt_present("unique"), uniques_only: matches.opt_present("unique"),
all_repeated: matches.opt_present("all-repeated"), all_repeated: matches.opt_present("all-repeated"),
delimiters: match matches.opt_default("all-repeated", "none") { delimiters: match matches.opt_default("all-repeated", "none") {
Some(ref opt_arg) if opt_arg != "none" => { Some(ref opt_arg) if opt_arg != "none" => match &(*opt_arg.as_str()) {
let rep_args = ["prepend".to_owned(), "separate".to_owned()]; "prepend" => Delimiters::Prepend,
if !rep_args.contains(opt_arg) { "separate" => Delimiters::Separate,
crash!( _ => crash!(1, "Incorrect argument for all-repeated: {}", opt_arg),
1, },
"Incorrect argument for all-repeated: {}", _ => Delimiters::None,
opt_arg.clone()
);
}
opt_arg.clone()
}
_ => "".to_owned(),
}, },
show_counts: matches.opt_present("count"), show_counts: matches.opt_present("count"),
skip_fields: opt_parsed("skip-fields", &matches), skip_fields: opt_parsed("skip-fields", &matches),