mirror of
https://github.com/sharkdp/fd.git
synced 2024-11-17 17:35:16 +01:00
Split internals.rs into module and multiple files
This PR splits `internals.rs` into the `internal` module with multiple files, and moves `FdOptions` into `opts.rs`. The main motivation behind this is to move logic for constructing `FdOptions` out of the main function and more readable and easier to understand in the `opts` module. The goal will eventually to be able to write `FdOptions::from(matches)` and have the options constructed.
This commit is contained in:
Josh Leeb-du Toit
David Peter
parent
984f04f142
commit
8543ca645d
10 changed files with 593 additions and 572 deletions
568
src/internal.rs
568
src/internal.rs
|
|
@ -1,568 +0,0 @@
|
||||||
// Copyright (c) 2017 fd developers
|
|
||||||
// Licensed under the Apache License, Version 2.0
|
|
||||||
// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
|
|
||||||
// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
|
|
||||||
// at your option. All files in the project carrying such
|
|
||||||
// notice may not be copied, modified, or distributed except
|
|
||||||
// according to those terms.
|
|
||||||
|
|
||||||
use std::ffi::OsString;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
use std::time::{self, SystemTime};
|
|
||||||
|
|
||||||
use exec::CommandTemplate;
|
|
||||||
use lscolors::LsColors;
|
|
||||||
use regex::{Regex, RegexSet};
|
|
||||||
use regex_syntax::hir::Hir;
|
|
||||||
use regex_syntax::Parser;
|
|
||||||
|
|
||||||
lazy_static! {
|
|
||||||
static ref SIZE_CAPTURES: Regex = { Regex::new(r"(?i)^([+-])(\d+)(b|[kmgt]i?b?)$").unwrap() };
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Whether or not to show
|
|
||||||
pub struct FileTypes {
|
|
||||||
pub files: bool,
|
|
||||||
pub directories: bool,
|
|
||||||
pub symlinks: bool,
|
|
||||||
pub executables_only: bool,
|
|
||||||
pub empty_only: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for FileTypes {
|
|
||||||
fn default() -> FileTypes {
|
|
||||||
FileTypes {
|
|
||||||
files: false,
|
|
||||||
directories: false,
|
|
||||||
symlinks: false,
|
|
||||||
executables_only: false,
|
|
||||||
empty_only: false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
|
||||||
pub enum SizeFilter {
|
|
||||||
Max(u64),
|
|
||||||
Min(u64),
|
|
||||||
}
|
|
||||||
|
|
||||||
// SI prefixes (powers of 10)
|
|
||||||
const KILO: u64 = 1000;
|
|
||||||
const MEGA: u64 = KILO * 1000;
|
|
||||||
const GIGA: u64 = MEGA * 1000;
|
|
||||||
const TERA: u64 = GIGA * 1000;
|
|
||||||
|
|
||||||
// Binary prefixes (powers of 2)
|
|
||||||
const KIBI: u64 = 1024;
|
|
||||||
const MEBI: u64 = KIBI * 1024;
|
|
||||||
const GIBI: u64 = MEBI * 1024;
|
|
||||||
const TEBI: u64 = GIBI * 1024;
|
|
||||||
|
|
||||||
impl SizeFilter {
|
|
||||||
pub fn from_string<'a>(s: &str) -> Option<Self> {
|
|
||||||
if !SIZE_CAPTURES.is_match(s) {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
let captures = SIZE_CAPTURES.captures(s)?;
|
|
||||||
let limit_kind = captures.get(1).map_or("+", |m| m.as_str());
|
|
||||||
let quantity = captures
|
|
||||||
.get(2)
|
|
||||||
.and_then(|v| v.as_str().parse::<u64>().ok())?;
|
|
||||||
|
|
||||||
let multiplier = match &captures.get(3).map_or("b", |m| m.as_str()).to_lowercase()[..] {
|
|
||||||
v if v.starts_with("ki") => KIBI,
|
|
||||||
v if v.starts_with("k") => KILO,
|
|
||||||
v if v.starts_with("mi") => MEBI,
|
|
||||||
v if v.starts_with("m") => MEGA,
|
|
||||||
v if v.starts_with("gi") => GIBI,
|
|
||||||
v if v.starts_with("g") => GIGA,
|
|
||||||
v if v.starts_with("ti") => TEBI,
|
|
||||||
v if v.starts_with("t") => TERA,
|
|
||||||
"b" => 1,
|
|
||||||
_ => return None,
|
|
||||||
};
|
|
||||||
|
|
||||||
let size = quantity * multiplier;
|
|
||||||
Some(match limit_kind {
|
|
||||||
"+" => SizeFilter::Min(size),
|
|
||||||
_ => SizeFilter::Max(size),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn is_within(&self, size: u64) -> bool {
|
|
||||||
match self {
|
|
||||||
&SizeFilter::Max(limit) => size <= limit,
|
|
||||||
&SizeFilter::Min(limit) => size >= limit,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Filter based on time ranges
|
|
||||||
#[derive(Debug, PartialEq)]
|
|
||||||
pub enum TimeFilter {
|
|
||||||
Before(SystemTime),
|
|
||||||
After(SystemTime),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TimeFilter {
|
|
||||||
fn from_str(ref_time: &SystemTime, s: &str) -> Option<SystemTime> {
|
|
||||||
use humantime;
|
|
||||||
humantime::parse_duration(s)
|
|
||||||
.map(|duration| *ref_time - duration)
|
|
||||||
.or_else(|_| humantime::parse_rfc3339_weak(s))
|
|
||||||
.ok()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn before(ref_time: &SystemTime, s: &str) -> Option<TimeFilter> {
|
|
||||||
TimeFilter::from_str(ref_time, s).map(TimeFilter::Before)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn after(ref_time: &SystemTime, s: &str) -> Option<TimeFilter> {
|
|
||||||
TimeFilter::from_str(ref_time, s).map(TimeFilter::After)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn applies_to(&self, t: &SystemTime) -> bool {
|
|
||||||
match self {
|
|
||||||
TimeFilter::Before(limit) => t <= limit,
|
|
||||||
TimeFilter::After(limit) => t >= limit,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Configuration options for *fd*.
|
|
||||||
pub struct FdOptions {
|
|
||||||
/// Whether the search is case-sensitive or case-insensitive.
|
|
||||||
pub case_sensitive: bool,
|
|
||||||
|
|
||||||
/// Whether to search within the full file path or just the base name (filename or directory
|
|
||||||
/// name).
|
|
||||||
pub search_full_path: bool,
|
|
||||||
|
|
||||||
/// Whether to ignore hidden files and directories (or not).
|
|
||||||
pub ignore_hidden: bool,
|
|
||||||
|
|
||||||
/// Whether to respect `.fdignore` files or not.
|
|
||||||
pub read_fdignore: bool,
|
|
||||||
|
|
||||||
/// Whether to respect VCS ignore files (`.gitignore`, ..) or not.
|
|
||||||
pub read_vcsignore: bool,
|
|
||||||
|
|
||||||
/// Whether to follow symlinks or not.
|
|
||||||
pub follow_links: bool,
|
|
||||||
|
|
||||||
/// Whether elements of output should be separated by a null character
|
|
||||||
pub null_separator: bool,
|
|
||||||
|
|
||||||
/// The maximum search depth, or `None` if no maximum search depth should be set.
|
|
||||||
///
|
|
||||||
/// A depth of `1` includes all files under the current directory, a depth of `2` also includes
|
|
||||||
/// all files under subdirectories of the current directory, etc.
|
|
||||||
pub max_depth: Option<usize>,
|
|
||||||
|
|
||||||
/// The number of threads to use.
|
|
||||||
pub threads: usize,
|
|
||||||
|
|
||||||
/// Time to buffer results internally before streaming to the console. This is useful to
|
|
||||||
/// provide a sorted output, in case the total execution time is shorter than
|
|
||||||
/// `max_buffer_time`.
|
|
||||||
pub max_buffer_time: Option<time::Duration>,
|
|
||||||
|
|
||||||
/// `None` if the output should not be colorized. Otherwise, a `LsColors` instance that defines
|
|
||||||
/// how to style different filetypes.
|
|
||||||
pub ls_colors: Option<LsColors>,
|
|
||||||
|
|
||||||
/// The type of file to search for. If set to `None`, all file types are displayed. If
|
|
||||||
/// set to `Some(..)`, only the types that are specified are shown.
|
|
||||||
pub file_types: Option<FileTypes>,
|
|
||||||
|
|
||||||
/// The extension to search for. Only entries matching the extension will be included.
|
|
||||||
///
|
|
||||||
/// The value (if present) will be a lowercase string without leading dots.
|
|
||||||
pub extensions: Option<RegexSet>,
|
|
||||||
|
|
||||||
/// If a value is supplied, each item found will be used to generate and execute commands.
|
|
||||||
pub command: Option<CommandTemplate>,
|
|
||||||
|
|
||||||
/// A list of glob patterns that should be excluded from the search.
|
|
||||||
pub exclude_patterns: Vec<String>,
|
|
||||||
|
|
||||||
/// A list of custom ignore files.
|
|
||||||
pub ignore_files: Vec<PathBuf>,
|
|
||||||
|
|
||||||
/// The given constraints on the size of returned files
|
|
||||||
pub size_constraints: Vec<SizeFilter>,
|
|
||||||
|
|
||||||
/// Constraints on last modification time of files
|
|
||||||
pub time_constraints: Vec<TimeFilter>,
|
|
||||||
}
|
|
||||||
|
|
||||||
macro_rules! print_error {
|
|
||||||
($($arg:tt)*) => (eprintln!($($arg)*))
|
|
||||||
}
|
|
||||||
|
|
||||||
macro_rules! print_error_and_exit {
|
|
||||||
($($arg:tt)*) => {
|
|
||||||
print_error!($($arg)*);
|
|
||||||
::std::process::exit(1);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Determine if a regex pattern contains a literal uppercase character.
|
|
||||||
pub fn pattern_has_uppercase_char(pattern: &str) -> bool {
|
|
||||||
Parser::new()
|
|
||||||
.parse(pattern)
|
|
||||||
.map(|hir| hir_has_uppercase_char(&hir))
|
|
||||||
.unwrap_or(false)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Determine if a regex expression contains a literal uppercase character.
|
|
||||||
fn hir_has_uppercase_char(hir: &Hir) -> bool {
|
|
||||||
use regex_syntax::hir::*;
|
|
||||||
|
|
||||||
match *hir.kind() {
|
|
||||||
HirKind::Literal(Literal::Unicode(c)) => c.is_uppercase(),
|
|
||||||
HirKind::Class(Class::Unicode(ref ranges)) => ranges
|
|
||||||
.iter()
|
|
||||||
.any(|r| r.start().is_uppercase() || r.end().is_uppercase()),
|
|
||||||
HirKind::Group(Group { ref hir, .. }) | HirKind::Repetition(Repetition { ref hir, .. }) => {
|
|
||||||
hir_has_uppercase_char(hir)
|
|
||||||
}
|
|
||||||
HirKind::Concat(ref hirs) | HirKind::Alternation(ref hirs) => {
|
|
||||||
hirs.iter().any(hir_has_uppercase_char)
|
|
||||||
}
|
|
||||||
_ => false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Maximum size of the output buffer before flushing results to the console
|
|
||||||
pub const MAX_BUFFER_LENGTH: usize = 1000;
|
|
||||||
|
|
||||||
/// Traverse args_os, looking for -exec and replacing it with --exec.
|
|
||||||
///
|
|
||||||
/// # Returns
|
|
||||||
///
|
|
||||||
/// * The args, with substitution if required
|
|
||||||
pub fn transform_args_with_exec<I>(original: I) -> Vec<OsString>
|
|
||||||
where
|
|
||||||
I: Iterator<Item = OsString>,
|
|
||||||
{
|
|
||||||
let mut in_exec_opt = false;
|
|
||||||
let target = OsString::from("-exec");
|
|
||||||
let long_start = OsString::from("--exec");
|
|
||||||
let short_start = OsString::from("-x");
|
|
||||||
let exec_end = OsString::from(";");
|
|
||||||
|
|
||||||
original.fold(vec![], |mut args, curr| {
|
|
||||||
if in_exec_opt {
|
|
||||||
if curr == exec_end {
|
|
||||||
in_exec_opt = false;
|
|
||||||
}
|
|
||||||
args.push(curr);
|
|
||||||
return args;
|
|
||||||
}
|
|
||||||
|
|
||||||
if curr == target || curr == long_start || curr == short_start {
|
|
||||||
args.push(if curr == target {
|
|
||||||
OsString::from("--exec")
|
|
||||||
} else {
|
|
||||||
curr
|
|
||||||
});
|
|
||||||
in_exec_opt = true;
|
|
||||||
} else {
|
|
||||||
args.push(curr);
|
|
||||||
}
|
|
||||||
args
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
fn oss(v: &str) -> OsString {
|
|
||||||
OsString::from(v)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Ensure that -exec gets transformed into --exec
|
|
||||||
#[test]
|
|
||||||
fn normal_exec_substitution() {
|
|
||||||
let original = vec![oss("fd"), oss("foo"), oss("-exec"), oss("cmd")];
|
|
||||||
let expected = vec![oss("fd"), oss("foo"), oss("--exec"), oss("cmd")];
|
|
||||||
|
|
||||||
let actual = transform_args_with_exec(original.into_iter());
|
|
||||||
assert_eq!(expected, actual);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Ensure that --exec is not touched
|
|
||||||
#[test]
|
|
||||||
fn passthru_of_original_exec() {
|
|
||||||
let original = vec![oss("fd"), oss("foo"), oss("--exec"), oss("cmd")];
|
|
||||||
let expected = vec![oss("fd"), oss("foo"), oss("--exec"), oss("cmd")];
|
|
||||||
|
|
||||||
let actual = transform_args_with_exec(original.into_iter());
|
|
||||||
assert_eq!(expected, actual);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn temp_check_that_exec_context_observed() {
|
|
||||||
let original = vec![
|
|
||||||
oss("fd"),
|
|
||||||
oss("foo"),
|
|
||||||
oss("-exec"),
|
|
||||||
oss("cmd"),
|
|
||||||
oss("-exec"),
|
|
||||||
oss("ls"),
|
|
||||||
oss(";"),
|
|
||||||
oss("-exec"),
|
|
||||||
oss("rm"),
|
|
||||||
oss(";"),
|
|
||||||
oss("--exec"),
|
|
||||||
oss("find"),
|
|
||||||
oss("-exec"),
|
|
||||||
oss("rm"),
|
|
||||||
oss(";"),
|
|
||||||
oss("-x"),
|
|
||||||
oss("foo"),
|
|
||||||
oss("-exec"),
|
|
||||||
oss("something"),
|
|
||||||
oss(";"),
|
|
||||||
oss("-exec"),
|
|
||||||
];
|
|
||||||
let expected = vec![
|
|
||||||
oss("fd"),
|
|
||||||
oss("foo"),
|
|
||||||
oss("--exec"),
|
|
||||||
oss("cmd"),
|
|
||||||
oss("-exec"),
|
|
||||||
oss("ls"),
|
|
||||||
oss(";"),
|
|
||||||
oss("--exec"),
|
|
||||||
oss("rm"),
|
|
||||||
oss(";"),
|
|
||||||
oss("--exec"),
|
|
||||||
oss("find"),
|
|
||||||
oss("-exec"),
|
|
||||||
oss("rm"),
|
|
||||||
oss(";"),
|
|
||||||
oss("-x"),
|
|
||||||
oss("foo"),
|
|
||||||
oss("-exec"),
|
|
||||||
oss("something"),
|
|
||||||
oss(";"),
|
|
||||||
oss("--exec"),
|
|
||||||
];
|
|
||||||
|
|
||||||
let actual = transform_args_with_exec(original.into_iter());
|
|
||||||
assert_eq!(expected, actual);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parsing and size conversion tests
|
|
||||||
mod size_parsing {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
macro_rules! gen_size_filter_parse_test {
|
|
||||||
($($name: ident: $val: expr,)*) => {
|
|
||||||
$(
|
|
||||||
#[test]
|
|
||||||
fn $name() {
|
|
||||||
let (txt, expected) = $val;
|
|
||||||
let actual = SizeFilter::from_string(txt).unwrap();
|
|
||||||
assert_eq!(actual, expected);
|
|
||||||
}
|
|
||||||
)*
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parsing and size conversion tests data. Ensure that each type gets properly interpreted.
|
|
||||||
/// Call with higher base values to ensure expected multiplication (only need a couple)
|
|
||||||
gen_size_filter_parse_test! {
|
|
||||||
byte_plus: ("+1b", SizeFilter::Min(1)),
|
|
||||||
byte_plus_multiplier: ("+10b", SizeFilter::Min(10)),
|
|
||||||
byte_minus: ("-1b", SizeFilter::Max(1)),
|
|
||||||
kilo_plus: ("+1k", SizeFilter::Min(1000)),
|
|
||||||
kilo_plus_suffix: ("+1kb", SizeFilter::Min(1000)),
|
|
||||||
kilo_minus: ("-1k", SizeFilter::Max(1000)),
|
|
||||||
kilo_minus_multiplier: ("-100k", SizeFilter::Max(100000)),
|
|
||||||
kilo_minus_suffix: ("-1kb", SizeFilter::Max(1000)),
|
|
||||||
kilo_plus_upper: ("+1K", SizeFilter::Min(1000)),
|
|
||||||
kilo_plus_suffix_upper: ("+1KB", SizeFilter::Min(1000)),
|
|
||||||
kilo_minus_upper: ("-1K", SizeFilter::Max(1000)),
|
|
||||||
kilo_minus_suffix_upper: ("-1Kb", SizeFilter::Max(1000)),
|
|
||||||
kibi_plus: ("+1ki", SizeFilter::Min(1024)),
|
|
||||||
kibi_plus_multiplier: ("+10ki", SizeFilter::Min(10240)),
|
|
||||||
kibi_plus_suffix: ("+1kib", SizeFilter::Min(1024)),
|
|
||||||
kibi_minus: ("-1ki", SizeFilter::Max(1024)),
|
|
||||||
kibi_minus_multiplier: ("-100ki", SizeFilter::Max(102400)),
|
|
||||||
kibi_minus_suffix: ("-1kib", SizeFilter::Max(1024)),
|
|
||||||
kibi_plus_upper: ("+1KI", SizeFilter::Min(1024)),
|
|
||||||
kibi_plus_suffix_upper: ("+1KiB", SizeFilter::Min(1024)),
|
|
||||||
kibi_minus_upper: ("-1Ki", SizeFilter::Max(1024)),
|
|
||||||
kibi_minus_suffix_upper: ("-1KIB", SizeFilter::Max(1024)),
|
|
||||||
mega_plus: ("+1m", SizeFilter::Min(1000000)),
|
|
||||||
mega_plus_suffix: ("+1mb", SizeFilter::Min(1000000)),
|
|
||||||
mega_minus: ("-1m", SizeFilter::Max(1000000)),
|
|
||||||
mega_minus_suffix: ("-1mb", SizeFilter::Max(1000000)),
|
|
||||||
mega_plus_upper: ("+1M", SizeFilter::Min(1000000)),
|
|
||||||
mega_plus_suffix_upper: ("+1MB", SizeFilter::Min(1000000)),
|
|
||||||
mega_minus_upper: ("-1M", SizeFilter::Max(1000000)),
|
|
||||||
mega_minus_suffix_upper: ("-1Mb", SizeFilter::Max(1000000)),
|
|
||||||
mebi_plus: ("+1mi", SizeFilter::Min(1048576)),
|
|
||||||
mebi_plus_suffix: ("+1mib", SizeFilter::Min(1048576)),
|
|
||||||
mebi_minus: ("-1mi", SizeFilter::Max(1048576)),
|
|
||||||
mebi_minus_suffix: ("-1mib", SizeFilter::Max(1048576)),
|
|
||||||
mebi_plus_upper: ("+1MI", SizeFilter::Min(1048576)),
|
|
||||||
mebi_plus_suffix_upper: ("+1MiB", SizeFilter::Min(1048576)),
|
|
||||||
mebi_minus_upper: ("-1Mi", SizeFilter::Max(1048576)),
|
|
||||||
mebi_minus_suffix_upper: ("-1MIB", SizeFilter::Max(1048576)),
|
|
||||||
giga_plus: ("+1g", SizeFilter::Min(1000000000)),
|
|
||||||
giga_plus_suffix: ("+1gb", SizeFilter::Min(1000000000)),
|
|
||||||
giga_minus: ("-1g", SizeFilter::Max(1000000000)),
|
|
||||||
giga_minus_suffix: ("-1gb", SizeFilter::Max(1000000000)),
|
|
||||||
giga_plus_upper: ("+1G", SizeFilter::Min(1000000000)),
|
|
||||||
giga_plus_suffix_upper: ("+1GB", SizeFilter::Min(1000000000)),
|
|
||||||
giga_minus_upper: ("-1G", SizeFilter::Max(1000000000)),
|
|
||||||
giga_minus_suffix_upper: ("-1Gb", SizeFilter::Max(1000000000)),
|
|
||||||
gibi_plus: ("+1gi", SizeFilter::Min(1073741824)),
|
|
||||||
gibi_plus_suffix: ("+1gib", SizeFilter::Min(1073741824)),
|
|
||||||
gibi_minus: ("-1gi", SizeFilter::Max(1073741824)),
|
|
||||||
gibi_minus_suffix: ("-1gib", SizeFilter::Max(1073741824)),
|
|
||||||
gibi_plus_upper: ("+1GI", SizeFilter::Min(1073741824)),
|
|
||||||
gibi_plus_suffix_upper: ("+1GiB", SizeFilter::Min(1073741824)),
|
|
||||||
gibi_minus_upper: ("-1Gi", SizeFilter::Max(1073741824)),
|
|
||||||
gibi_minus_suffix_upper: ("-1GIB", SizeFilter::Max(1073741824)),
|
|
||||||
tera_plus: ("+1t", SizeFilter::Min(1000000000000)),
|
|
||||||
tera_plus_suffix: ("+1tb", SizeFilter::Min(1000000000000)),
|
|
||||||
tera_minus: ("-1t", SizeFilter::Max(1000000000000)),
|
|
||||||
tera_minus_suffix: ("-1tb", SizeFilter::Max(1000000000000)),
|
|
||||||
tera_plus_upper: ("+1T", SizeFilter::Min(1000000000000)),
|
|
||||||
tera_plus_suffix_upper: ("+1TB", SizeFilter::Min(1000000000000)),
|
|
||||||
tera_minus_upper: ("-1T", SizeFilter::Max(1000000000000)),
|
|
||||||
tera_minus_suffix_upper: ("-1Tb", SizeFilter::Max(1000000000000)),
|
|
||||||
tebi_plus: ("+1ti", SizeFilter::Min(1099511627776)),
|
|
||||||
tebi_plus_suffix: ("+1tib", SizeFilter::Min(1099511627776)),
|
|
||||||
tebi_minus: ("-1ti", SizeFilter::Max(1099511627776)),
|
|
||||||
tebi_minus_suffix: ("-1tib", SizeFilter::Max(1099511627776)),
|
|
||||||
tebi_plus_upper: ("+1TI", SizeFilter::Min(1099511627776)),
|
|
||||||
tebi_plus_suffix_upper: ("+1TiB", SizeFilter::Min(1099511627776)),
|
|
||||||
tebi_minus_upper: ("-1Ti", SizeFilter::Max(1099511627776)),
|
|
||||||
tebi_minus_suffix_upper: ("-1TIB", SizeFilter::Max(1099511627776)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Invalid parse testing
|
|
||||||
macro_rules! gen_size_filter_failure {
|
|
||||||
($($name:ident: $value:expr,)*) => {
|
|
||||||
$(
|
|
||||||
#[test]
|
|
||||||
fn $name() {
|
|
||||||
let i = SizeFilter::from_string($value);
|
|
||||||
assert!(i.is_none());
|
|
||||||
}
|
|
||||||
)*
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Invalid parse data
|
|
||||||
gen_size_filter_failure! {
|
|
||||||
ensure_missing_symbol_returns_none: "10M",
|
|
||||||
ensure_missing_number_returns_none: "+g",
|
|
||||||
ensure_missing_unit_returns_none: "+18",
|
|
||||||
ensure_bad_format_returns_none_1: "$10M",
|
|
||||||
ensure_bad_format_returns_none_2: "badval",
|
|
||||||
ensure_bad_format_returns_none_3: "9999",
|
|
||||||
ensure_invalid_unit_returns_none_1: "+50a",
|
|
||||||
ensure_invalid_unit_returns_none_2: "-10v",
|
|
||||||
ensure_invalid_unit_returns_none_3: "+1Mv",
|
|
||||||
ensure_bib_format_returns_none: "+1bib",
|
|
||||||
ensure_bb_format_returns_none: "+1bb",
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn is_within_less_than() {
|
|
||||||
let f = SizeFilter::from_string("-1k").unwrap();
|
|
||||||
assert!(f.is_within(999));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn is_within_less_than_equal() {
|
|
||||||
let f = SizeFilter::from_string("-1k").unwrap();
|
|
||||||
assert!(f.is_within(1000));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn is_within_greater_than() {
|
|
||||||
let f = SizeFilter::from_string("+1k").unwrap();
|
|
||||||
assert!(f.is_within(1001));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn is_within_greater_than_equal() {
|
|
||||||
let f = SizeFilter::from_string("+1K").unwrap();
|
|
||||||
assert!(f.is_within(1000));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn is_time_filter_applicable() {
|
|
||||||
use humantime;
|
|
||||||
|
|
||||||
let ref_time = humantime::parse_rfc3339("2010-10-10T10:10:10Z").unwrap();
|
|
||||||
assert!(
|
|
||||||
TimeFilter::after(&ref_time, "1min")
|
|
||||||
.unwrap()
|
|
||||||
.applies_to(&ref_time)
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
!TimeFilter::before(&ref_time, "1min")
|
|
||||||
.unwrap()
|
|
||||||
.applies_to(&ref_time)
|
|
||||||
);
|
|
||||||
|
|
||||||
let t1m_ago = ref_time - time::Duration::from_secs(60);
|
|
||||||
assert!(
|
|
||||||
!TimeFilter::after(&ref_time, "30sec")
|
|
||||||
.unwrap()
|
|
||||||
.applies_to(&t1m_ago)
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
TimeFilter::after(&ref_time, "2min")
|
|
||||||
.unwrap()
|
|
||||||
.applies_to(&t1m_ago)
|
|
||||||
);
|
|
||||||
|
|
||||||
assert!(
|
|
||||||
TimeFilter::before(&ref_time, "30sec")
|
|
||||||
.unwrap()
|
|
||||||
.applies_to(&t1m_ago)
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
!TimeFilter::before(&ref_time, "2min")
|
|
||||||
.unwrap()
|
|
||||||
.applies_to(&t1m_ago)
|
|
||||||
);
|
|
||||||
|
|
||||||
let t10s_before = "2010-10-10 10:10:00";
|
|
||||||
assert!(
|
|
||||||
!TimeFilter::before(&ref_time, t10s_before)
|
|
||||||
.unwrap()
|
|
||||||
.applies_to(&ref_time)
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
TimeFilter::before(&ref_time, t10s_before)
|
|
||||||
.unwrap()
|
|
||||||
.applies_to(&t1m_ago)
|
|
||||||
);
|
|
||||||
|
|
||||||
assert!(
|
|
||||||
TimeFilter::after(&ref_time, t10s_before)
|
|
||||||
.unwrap()
|
|
||||||
.applies_to(&ref_time)
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
!TimeFilter::after(&ref_time, t10s_before)
|
|
||||||
.unwrap()
|
|
||||||
.applies_to(&t1m_ago)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
20
src/internal/file_types.rs
Normal file
20
src/internal/file_types.rs
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
/// Whether or not to show
|
||||||
|
pub struct FileTypes {
|
||||||
|
pub files: bool,
|
||||||
|
pub directories: bool,
|
||||||
|
pub symlinks: bool,
|
||||||
|
pub executables_only: bool,
|
||||||
|
pub empty_only: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for FileTypes {
|
||||||
|
fn default() -> FileTypes {
|
||||||
|
FileTypes {
|
||||||
|
files: false,
|
||||||
|
directories: false,
|
||||||
|
symlinks: false,
|
||||||
|
executables_only: false,
|
||||||
|
empty_only: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
5
src/internal/filter/mod.rs
Normal file
5
src/internal/filter/mod.rs
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
pub use self::size::SizeFilter;
|
||||||
|
pub use self::time::TimeFilter;
|
||||||
|
|
||||||
|
mod size;
|
||||||
|
mod time;
|
||||||
208
src/internal/filter/size.rs
Normal file
208
src/internal/filter/size.rs
Normal file
|
|
@ -0,0 +1,208 @@
|
||||||
|
use regex::Regex;
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
static ref SIZE_CAPTURES: Regex = { Regex::new(r"(?i)^([+-])(\d+)(b|[kmgt]i?b?)$").unwrap() };
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||||
|
pub enum SizeFilter {
|
||||||
|
Max(u64),
|
||||||
|
Min(u64),
|
||||||
|
}
|
||||||
|
|
||||||
|
// SI prefixes (powers of 10)
|
||||||
|
const KILO: u64 = 1000;
|
||||||
|
const MEGA: u64 = KILO * 1000;
|
||||||
|
const GIGA: u64 = MEGA * 1000;
|
||||||
|
const TERA: u64 = GIGA * 1000;
|
||||||
|
|
||||||
|
// Binary prefixes (powers of 2)
|
||||||
|
const KIBI: u64 = 1024;
|
||||||
|
const MEBI: u64 = KIBI * 1024;
|
||||||
|
const GIBI: u64 = MEBI * 1024;
|
||||||
|
const TEBI: u64 = GIBI * 1024;
|
||||||
|
|
||||||
|
impl SizeFilter {
|
||||||
|
pub fn from_string<'a>(s: &str) -> Option<Self> {
|
||||||
|
if !SIZE_CAPTURES.is_match(s) {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let captures = SIZE_CAPTURES.captures(s)?;
|
||||||
|
let limit_kind = captures.get(1).map_or("+", |m| m.as_str());
|
||||||
|
let quantity = captures
|
||||||
|
.get(2)
|
||||||
|
.and_then(|v| v.as_str().parse::<u64>().ok())?;
|
||||||
|
|
||||||
|
let multiplier = match &captures.get(3).map_or("b", |m| m.as_str()).to_lowercase()[..] {
|
||||||
|
v if v.starts_with("ki") => KIBI,
|
||||||
|
v if v.starts_with("k") => KILO,
|
||||||
|
v if v.starts_with("mi") => MEBI,
|
||||||
|
v if v.starts_with("m") => MEGA,
|
||||||
|
v if v.starts_with("gi") => GIBI,
|
||||||
|
v if v.starts_with("g") => GIGA,
|
||||||
|
v if v.starts_with("ti") => TEBI,
|
||||||
|
v if v.starts_with("t") => TERA,
|
||||||
|
"b" => 1,
|
||||||
|
_ => return None,
|
||||||
|
};
|
||||||
|
|
||||||
|
let size = quantity * multiplier;
|
||||||
|
Some(match limit_kind {
|
||||||
|
"+" => SizeFilter::Min(size),
|
||||||
|
_ => SizeFilter::Max(size),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_within(&self, size: u64) -> bool {
|
||||||
|
match self {
|
||||||
|
&SizeFilter::Max(limit) => size <= limit,
|
||||||
|
&SizeFilter::Min(limit) => size >= limit,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
macro_rules! gen_size_filter_parse_test {
|
||||||
|
($($name: ident: $val: expr,)*) => {
|
||||||
|
$(
|
||||||
|
#[test]
|
||||||
|
fn $name() {
|
||||||
|
let (txt, expected) = $val;
|
||||||
|
let actual = SizeFilter::from_string(txt).unwrap();
|
||||||
|
assert_eq!(actual, expected);
|
||||||
|
}
|
||||||
|
)*
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parsing and size conversion tests data. Ensure that each type gets properly interpreted.
|
||||||
|
/// Call with higher base values to ensure expected multiplication (only need a couple)
|
||||||
|
gen_size_filter_parse_test! {
|
||||||
|
byte_plus: ("+1b", SizeFilter::Min(1)),
|
||||||
|
byte_plus_multiplier: ("+10b", SizeFilter::Min(10)),
|
||||||
|
byte_minus: ("-1b", SizeFilter::Max(1)),
|
||||||
|
kilo_plus: ("+1k", SizeFilter::Min(1000)),
|
||||||
|
kilo_plus_suffix: ("+1kb", SizeFilter::Min(1000)),
|
||||||
|
kilo_minus: ("-1k", SizeFilter::Max(1000)),
|
||||||
|
kilo_minus_multiplier: ("-100k", SizeFilter::Max(100000)),
|
||||||
|
kilo_minus_suffix: ("-1kb", SizeFilter::Max(1000)),
|
||||||
|
kilo_plus_upper: ("+1K", SizeFilter::Min(1000)),
|
||||||
|
kilo_plus_suffix_upper: ("+1KB", SizeFilter::Min(1000)),
|
||||||
|
kilo_minus_upper: ("-1K", SizeFilter::Max(1000)),
|
||||||
|
kilo_minus_suffix_upper: ("-1Kb", SizeFilter::Max(1000)),
|
||||||
|
kibi_plus: ("+1ki", SizeFilter::Min(1024)),
|
||||||
|
kibi_plus_multiplier: ("+10ki", SizeFilter::Min(10240)),
|
||||||
|
kibi_plus_suffix: ("+1kib", SizeFilter::Min(1024)),
|
||||||
|
kibi_minus: ("-1ki", SizeFilter::Max(1024)),
|
||||||
|
kibi_minus_multiplier: ("-100ki", SizeFilter::Max(102400)),
|
||||||
|
kibi_minus_suffix: ("-1kib", SizeFilter::Max(1024)),
|
||||||
|
kibi_plus_upper: ("+1KI", SizeFilter::Min(1024)),
|
||||||
|
kibi_plus_suffix_upper: ("+1KiB", SizeFilter::Min(1024)),
|
||||||
|
kibi_minus_upper: ("-1Ki", SizeFilter::Max(1024)),
|
||||||
|
kibi_minus_suffix_upper: ("-1KIB", SizeFilter::Max(1024)),
|
||||||
|
mega_plus: ("+1m", SizeFilter::Min(1000000)),
|
||||||
|
mega_plus_suffix: ("+1mb", SizeFilter::Min(1000000)),
|
||||||
|
mega_minus: ("-1m", SizeFilter::Max(1000000)),
|
||||||
|
mega_minus_suffix: ("-1mb", SizeFilter::Max(1000000)),
|
||||||
|
mega_plus_upper: ("+1M", SizeFilter::Min(1000000)),
|
||||||
|
mega_plus_suffix_upper: ("+1MB", SizeFilter::Min(1000000)),
|
||||||
|
mega_minus_upper: ("-1M", SizeFilter::Max(1000000)),
|
||||||
|
mega_minus_suffix_upper: ("-1Mb", SizeFilter::Max(1000000)),
|
||||||
|
mebi_plus: ("+1mi", SizeFilter::Min(1048576)),
|
||||||
|
mebi_plus_suffix: ("+1mib", SizeFilter::Min(1048576)),
|
||||||
|
mebi_minus: ("-1mi", SizeFilter::Max(1048576)),
|
||||||
|
mebi_minus_suffix: ("-1mib", SizeFilter::Max(1048576)),
|
||||||
|
mebi_plus_upper: ("+1MI", SizeFilter::Min(1048576)),
|
||||||
|
mebi_plus_suffix_upper: ("+1MiB", SizeFilter::Min(1048576)),
|
||||||
|
mebi_minus_upper: ("-1Mi", SizeFilter::Max(1048576)),
|
||||||
|
mebi_minus_suffix_upper: ("-1MIB", SizeFilter::Max(1048576)),
|
||||||
|
giga_plus: ("+1g", SizeFilter::Min(1000000000)),
|
||||||
|
giga_plus_suffix: ("+1gb", SizeFilter::Min(1000000000)),
|
||||||
|
giga_minus: ("-1g", SizeFilter::Max(1000000000)),
|
||||||
|
giga_minus_suffix: ("-1gb", SizeFilter::Max(1000000000)),
|
||||||
|
giga_plus_upper: ("+1G", SizeFilter::Min(1000000000)),
|
||||||
|
giga_plus_suffix_upper: ("+1GB", SizeFilter::Min(1000000000)),
|
||||||
|
giga_minus_upper: ("-1G", SizeFilter::Max(1000000000)),
|
||||||
|
giga_minus_suffix_upper: ("-1Gb", SizeFilter::Max(1000000000)),
|
||||||
|
gibi_plus: ("+1gi", SizeFilter::Min(1073741824)),
|
||||||
|
gibi_plus_suffix: ("+1gib", SizeFilter::Min(1073741824)),
|
||||||
|
gibi_minus: ("-1gi", SizeFilter::Max(1073741824)),
|
||||||
|
gibi_minus_suffix: ("-1gib", SizeFilter::Max(1073741824)),
|
||||||
|
gibi_plus_upper: ("+1GI", SizeFilter::Min(1073741824)),
|
||||||
|
gibi_plus_suffix_upper: ("+1GiB", SizeFilter::Min(1073741824)),
|
||||||
|
gibi_minus_upper: ("-1Gi", SizeFilter::Max(1073741824)),
|
||||||
|
gibi_minus_suffix_upper: ("-1GIB", SizeFilter::Max(1073741824)),
|
||||||
|
tera_plus: ("+1t", SizeFilter::Min(1000000000000)),
|
||||||
|
tera_plus_suffix: ("+1tb", SizeFilter::Min(1000000000000)),
|
||||||
|
tera_minus: ("-1t", SizeFilter::Max(1000000000000)),
|
||||||
|
tera_minus_suffix: ("-1tb", SizeFilter::Max(1000000000000)),
|
||||||
|
tera_plus_upper: ("+1T", SizeFilter::Min(1000000000000)),
|
||||||
|
tera_plus_suffix_upper: ("+1TB", SizeFilter::Min(1000000000000)),
|
||||||
|
tera_minus_upper: ("-1T", SizeFilter::Max(1000000000000)),
|
||||||
|
tera_minus_suffix_upper: ("-1Tb", SizeFilter::Max(1000000000000)),
|
||||||
|
tebi_plus: ("+1ti", SizeFilter::Min(1099511627776)),
|
||||||
|
tebi_plus_suffix: ("+1tib", SizeFilter::Min(1099511627776)),
|
||||||
|
tebi_minus: ("-1ti", SizeFilter::Max(1099511627776)),
|
||||||
|
tebi_minus_suffix: ("-1tib", SizeFilter::Max(1099511627776)),
|
||||||
|
tebi_plus_upper: ("+1TI", SizeFilter::Min(1099511627776)),
|
||||||
|
tebi_plus_suffix_upper: ("+1TiB", SizeFilter::Min(1099511627776)),
|
||||||
|
tebi_minus_upper: ("-1Ti", SizeFilter::Max(1099511627776)),
|
||||||
|
tebi_minus_suffix_upper: ("-1TIB", SizeFilter::Max(1099511627776)),
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Invalid parse testing
|
||||||
|
macro_rules! gen_size_filter_failure {
|
||||||
|
($($name:ident: $value:expr,)*) => {
|
||||||
|
$(
|
||||||
|
#[test]
|
||||||
|
fn $name() {
|
||||||
|
let i = SizeFilter::from_string($value);
|
||||||
|
assert!(i.is_none());
|
||||||
|
}
|
||||||
|
)*
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Invalid parse data
|
||||||
|
gen_size_filter_failure! {
|
||||||
|
ensure_missing_symbol_returns_none: "10M",
|
||||||
|
ensure_missing_number_returns_none: "+g",
|
||||||
|
ensure_missing_unit_returns_none: "+18",
|
||||||
|
ensure_bad_format_returns_none_1: "$10M",
|
||||||
|
ensure_bad_format_returns_none_2: "badval",
|
||||||
|
ensure_bad_format_returns_none_3: "9999",
|
||||||
|
ensure_invalid_unit_returns_none_1: "+50a",
|
||||||
|
ensure_invalid_unit_returns_none_2: "-10v",
|
||||||
|
ensure_invalid_unit_returns_none_3: "+1Mv",
|
||||||
|
ensure_bib_format_returns_none: "+1bib",
|
||||||
|
ensure_bb_format_returns_none: "+1bb",
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn is_within_less_than() {
|
||||||
|
let f = SizeFilter::from_string("-1k").unwrap();
|
||||||
|
assert!(f.is_within(999));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn is_within_less_than_equal() {
|
||||||
|
let f = SizeFilter::from_string("-1k").unwrap();
|
||||||
|
assert!(f.is_within(1000));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn is_within_greater_than() {
|
||||||
|
let f = SizeFilter::from_string("+1k").unwrap();
|
||||||
|
assert!(f.is_within(1001));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn is_within_greater_than_equal() {
|
||||||
|
let f = SizeFilter::from_string("+1K").unwrap();
|
||||||
|
assert!(f.is_within(1000));
|
||||||
|
}
|
||||||
|
}
|
||||||
102
src/internal/filter/time.rs
Normal file
102
src/internal/filter/time.rs
Normal file
|
|
@ -0,0 +1,102 @@
|
||||||
|
use std::time::SystemTime;
|
||||||
|
|
||||||
|
/// Filter based on time ranges.
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub enum TimeFilter {
|
||||||
|
Before(SystemTime),
|
||||||
|
After(SystemTime),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TimeFilter {
|
||||||
|
fn from_str(ref_time: &SystemTime, s: &str) -> Option<SystemTime> {
|
||||||
|
use humantime;
|
||||||
|
humantime::parse_duration(s)
|
||||||
|
.map(|duration| *ref_time - duration)
|
||||||
|
.or_else(|_| humantime::parse_rfc3339_weak(s))
|
||||||
|
.ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn before(ref_time: &SystemTime, s: &str) -> Option<TimeFilter> {
|
||||||
|
TimeFilter::from_str(ref_time, s).map(TimeFilter::Before)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn after(ref_time: &SystemTime, s: &str) -> Option<TimeFilter> {
|
||||||
|
TimeFilter::from_str(ref_time, s).map(TimeFilter::After)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn applies_to(&self, t: &SystemTime) -> bool {
|
||||||
|
match self {
|
||||||
|
TimeFilter::Before(limit) => t <= limit,
|
||||||
|
TimeFilter::After(limit) => t >= limit,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn is_time_filter_applicable() {
|
||||||
|
use humantime;
|
||||||
|
|
||||||
|
let ref_time = humantime::parse_rfc3339("2010-10-10T10:10:10Z").unwrap();
|
||||||
|
assert!(
|
||||||
|
TimeFilter::after(&ref_time, "1min")
|
||||||
|
.unwrap()
|
||||||
|
.applies_to(&ref_time)
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
!TimeFilter::before(&ref_time, "1min")
|
||||||
|
.unwrap()
|
||||||
|
.applies_to(&ref_time)
|
||||||
|
);
|
||||||
|
|
||||||
|
let t1m_ago = ref_time - Duration::from_secs(60);
|
||||||
|
assert!(
|
||||||
|
!TimeFilter::after(&ref_time, "30sec")
|
||||||
|
.unwrap()
|
||||||
|
.applies_to(&t1m_ago)
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
TimeFilter::after(&ref_time, "2min")
|
||||||
|
.unwrap()
|
||||||
|
.applies_to(&t1m_ago)
|
||||||
|
);
|
||||||
|
|
||||||
|
assert!(
|
||||||
|
TimeFilter::before(&ref_time, "30sec")
|
||||||
|
.unwrap()
|
||||||
|
.applies_to(&t1m_ago)
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
!TimeFilter::before(&ref_time, "2min")
|
||||||
|
.unwrap()
|
||||||
|
.applies_to(&t1m_ago)
|
||||||
|
);
|
||||||
|
|
||||||
|
let t10s_before = "2010-10-10 10:10:00";
|
||||||
|
assert!(
|
||||||
|
!TimeFilter::before(&ref_time, t10s_before)
|
||||||
|
.unwrap()
|
||||||
|
.applies_to(&ref_time)
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
TimeFilter::before(&ref_time, t10s_before)
|
||||||
|
.unwrap()
|
||||||
|
.applies_to(&t1m_ago)
|
||||||
|
);
|
||||||
|
|
||||||
|
assert!(
|
||||||
|
TimeFilter::after(&ref_time, t10s_before)
|
||||||
|
.unwrap()
|
||||||
|
.applies_to(&ref_time)
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
!TimeFilter::after(&ref_time, t10s_before)
|
||||||
|
.unwrap()
|
||||||
|
.applies_to(&t1m_ago)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
178
src/internal/mod.rs
Normal file
178
src/internal/mod.rs
Normal file
|
|
@ -0,0 +1,178 @@
|
||||||
|
// Copyright (c) 2017 fd developers
|
||||||
|
// Licensed under the Apache License, Version 2.0
|
||||||
|
// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
|
||||||
|
// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
|
||||||
|
// at your option. All files in the project carrying such
|
||||||
|
// notice may not be copied, modified, or distributed except
|
||||||
|
// according to those terms.
|
||||||
|
|
||||||
|
use regex_syntax::hir::Hir;
|
||||||
|
use regex_syntax::Parser;
|
||||||
|
use std::ffi::OsString;
|
||||||
|
|
||||||
|
pub use self::file_types::FileTypes;
|
||||||
|
|
||||||
|
mod file_types;
|
||||||
|
pub mod filter;
|
||||||
|
pub mod opts;
|
||||||
|
|
||||||
|
macro_rules! print_error {
|
||||||
|
($($arg:tt)*) => (eprintln!($($arg)*))
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! print_error_and_exit {
|
||||||
|
($($arg:tt)*) => {
|
||||||
|
print_error!($($arg)*);
|
||||||
|
::std::process::exit(1);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Determine if a regex pattern contains a literal uppercase character.
|
||||||
|
pub fn pattern_has_uppercase_char(pattern: &str) -> bool {
|
||||||
|
Parser::new()
|
||||||
|
.parse(pattern)
|
||||||
|
.map(|hir| hir_has_uppercase_char(&hir))
|
||||||
|
.unwrap_or(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Determine if a regex expression contains a literal uppercase character.
|
||||||
|
fn hir_has_uppercase_char(hir: &Hir) -> bool {
|
||||||
|
use regex_syntax::hir::*;
|
||||||
|
|
||||||
|
match *hir.kind() {
|
||||||
|
HirKind::Literal(Literal::Unicode(c)) => c.is_uppercase(),
|
||||||
|
HirKind::Class(Class::Unicode(ref ranges)) => ranges
|
||||||
|
.iter()
|
||||||
|
.any(|r| r.start().is_uppercase() || r.end().is_uppercase()),
|
||||||
|
HirKind::Group(Group { ref hir, .. }) | HirKind::Repetition(Repetition { ref hir, .. }) => {
|
||||||
|
hir_has_uppercase_char(hir)
|
||||||
|
}
|
||||||
|
HirKind::Concat(ref hirs) | HirKind::Alternation(ref hirs) => {
|
||||||
|
hirs.iter().any(hir_has_uppercase_char)
|
||||||
|
}
|
||||||
|
_ => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Maximum size of the output buffer before flushing results to the console
|
||||||
|
pub const MAX_BUFFER_LENGTH: usize = 1000;
|
||||||
|
|
||||||
|
/// Traverse args_os, looking for -exec and replacing it with --exec.
|
||||||
|
///
|
||||||
|
/// # Returns
|
||||||
|
///
|
||||||
|
/// * The args, with substitution if required
|
||||||
|
pub fn transform_args_with_exec<I>(original: I) -> Vec<OsString>
|
||||||
|
where
|
||||||
|
I: Iterator<Item = OsString>,
|
||||||
|
{
|
||||||
|
let mut in_exec_opt = false;
|
||||||
|
let target = OsString::from("-exec");
|
||||||
|
let long_start = OsString::from("--exec");
|
||||||
|
let short_start = OsString::from("-x");
|
||||||
|
let exec_end = OsString::from(";");
|
||||||
|
|
||||||
|
original.fold(vec![], |mut args, curr| {
|
||||||
|
if in_exec_opt {
|
||||||
|
if curr == exec_end {
|
||||||
|
in_exec_opt = false;
|
||||||
|
}
|
||||||
|
args.push(curr);
|
||||||
|
return args;
|
||||||
|
}
|
||||||
|
|
||||||
|
if curr == target || curr == long_start || curr == short_start {
|
||||||
|
args.push(if curr == target {
|
||||||
|
OsString::from("--exec")
|
||||||
|
} else {
|
||||||
|
curr
|
||||||
|
});
|
||||||
|
in_exec_opt = true;
|
||||||
|
} else {
|
||||||
|
args.push(curr);
|
||||||
|
}
|
||||||
|
args
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn oss(v: &str) -> OsString {
|
||||||
|
OsString::from(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Ensure that -exec gets transformed into --exec
|
||||||
|
#[test]
|
||||||
|
fn normal_exec_substitution() {
|
||||||
|
let original = vec![oss("fd"), oss("foo"), oss("-exec"), oss("cmd")];
|
||||||
|
let expected = vec![oss("fd"), oss("foo"), oss("--exec"), oss("cmd")];
|
||||||
|
|
||||||
|
let actual = transform_args_with_exec(original.into_iter());
|
||||||
|
assert_eq!(expected, actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Ensure that --exec is not touched
|
||||||
|
#[test]
|
||||||
|
fn passthru_of_original_exec() {
|
||||||
|
let original = vec![oss("fd"), oss("foo"), oss("--exec"), oss("cmd")];
|
||||||
|
let expected = vec![oss("fd"), oss("foo"), oss("--exec"), oss("cmd")];
|
||||||
|
|
||||||
|
let actual = transform_args_with_exec(original.into_iter());
|
||||||
|
assert_eq!(expected, actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn temp_check_that_exec_context_observed() {
|
||||||
|
let original = vec![
|
||||||
|
oss("fd"),
|
||||||
|
oss("foo"),
|
||||||
|
oss("-exec"),
|
||||||
|
oss("cmd"),
|
||||||
|
oss("-exec"),
|
||||||
|
oss("ls"),
|
||||||
|
oss(";"),
|
||||||
|
oss("-exec"),
|
||||||
|
oss("rm"),
|
||||||
|
oss(";"),
|
||||||
|
oss("--exec"),
|
||||||
|
oss("find"),
|
||||||
|
oss("-exec"),
|
||||||
|
oss("rm"),
|
||||||
|
oss(";"),
|
||||||
|
oss("-x"),
|
||||||
|
oss("foo"),
|
||||||
|
oss("-exec"),
|
||||||
|
oss("something"),
|
||||||
|
oss(";"),
|
||||||
|
oss("-exec"),
|
||||||
|
];
|
||||||
|
let expected = vec![
|
||||||
|
oss("fd"),
|
||||||
|
oss("foo"),
|
||||||
|
oss("--exec"),
|
||||||
|
oss("cmd"),
|
||||||
|
oss("-exec"),
|
||||||
|
oss("ls"),
|
||||||
|
oss(";"),
|
||||||
|
oss("--exec"),
|
||||||
|
oss("rm"),
|
||||||
|
oss(";"),
|
||||||
|
oss("--exec"),
|
||||||
|
oss("find"),
|
||||||
|
oss("-exec"),
|
||||||
|
oss("rm"),
|
||||||
|
oss(";"),
|
||||||
|
oss("-x"),
|
||||||
|
oss("foo"),
|
||||||
|
oss("-exec"),
|
||||||
|
oss("something"),
|
||||||
|
oss(";"),
|
||||||
|
oss("--exec"),
|
||||||
|
];
|
||||||
|
|
||||||
|
let actual = transform_args_with_exec(original.into_iter());
|
||||||
|
assert_eq!(expected, actual);
|
||||||
|
}
|
||||||
|
}
|
||||||
75
src/internal/opts.rs
Normal file
75
src/internal/opts.rs
Normal file
|
|
@ -0,0 +1,75 @@
|
||||||
|
use exec::CommandTemplate;
|
||||||
|
use internal::{
|
||||||
|
filter::{SizeFilter, TimeFilter},
|
||||||
|
FileTypes,
|
||||||
|
};
|
||||||
|
use lscolors::LsColors;
|
||||||
|
use regex::RegexSet;
|
||||||
|
use std::{path::PathBuf, time::Duration};
|
||||||
|
|
||||||
|
/// Configuration options for *fd*.
|
||||||
|
pub struct FdOptions {
|
||||||
|
/// Whether the search is case-sensitive or case-insensitive.
|
||||||
|
pub case_sensitive: bool,
|
||||||
|
|
||||||
|
/// Whether to search within the full file path or just the base name (filename or directory
|
||||||
|
/// name).
|
||||||
|
pub search_full_path: bool,
|
||||||
|
|
||||||
|
/// Whether to ignore hidden files and directories (or not).
|
||||||
|
pub ignore_hidden: bool,
|
||||||
|
|
||||||
|
/// Whether to respect `.fdignore` files or not.
|
||||||
|
pub read_fdignore: bool,
|
||||||
|
|
||||||
|
/// Whether to respect VCS ignore files (`.gitignore`, ..) or not.
|
||||||
|
pub read_vcsignore: bool,
|
||||||
|
|
||||||
|
/// Whether to follow symlinks or not.
|
||||||
|
pub follow_links: bool,
|
||||||
|
|
||||||
|
/// Whether elements of output should be separated by a null character
|
||||||
|
pub null_separator: bool,
|
||||||
|
|
||||||
|
/// The maximum search depth, or `None` if no maximum search depth should be set.
|
||||||
|
///
|
||||||
|
/// A depth of `1` includes all files under the current directory, a depth of `2` also includes
|
||||||
|
/// all files under subdirectories of the current directory, etc.
|
||||||
|
pub max_depth: Option<usize>,
|
||||||
|
|
||||||
|
/// The number of threads to use.
|
||||||
|
pub threads: usize,
|
||||||
|
|
||||||
|
/// Time to buffer results internally before streaming to the console. This is useful to
|
||||||
|
/// provide a sorted output, in case the total execution time is shorter than
|
||||||
|
/// `max_buffer_time`.
|
||||||
|
pub max_buffer_time: Option<Duration>,
|
||||||
|
|
||||||
|
/// `None` if the output should not be colorized. Otherwise, a `LsColors` instance that defines
|
||||||
|
/// how to style different filetypes.
|
||||||
|
pub ls_colors: Option<LsColors>,
|
||||||
|
|
||||||
|
/// The type of file to search for. If set to `None`, all file types are displayed. If
|
||||||
|
/// set to `Some(..)`, only the types that are specified are shown.
|
||||||
|
pub file_types: Option<FileTypes>,
|
||||||
|
|
||||||
|
/// The extension to search for. Only entries matching the extension will be included.
|
||||||
|
///
|
||||||
|
/// The value (if present) will be a lowercase string without leading dots.
|
||||||
|
pub extensions: Option<RegexSet>,
|
||||||
|
|
||||||
|
/// If a value is supplied, each item found will be used to generate and execute commands.
|
||||||
|
pub command: Option<CommandTemplate>,
|
||||||
|
|
||||||
|
/// A list of glob patterns that should be excluded from the search.
|
||||||
|
pub exclude_patterns: Vec<String>,
|
||||||
|
|
||||||
|
/// A list of custom ignore files.
|
||||||
|
pub ignore_files: Vec<PathBuf>,
|
||||||
|
|
||||||
|
/// The given constraints on the size of returned files
|
||||||
|
pub size_constraints: Vec<SizeFilter>,
|
||||||
|
|
||||||
|
/// Constraints on last modification time of files
|
||||||
|
pub time_constraints: Vec<TimeFilter>,
|
||||||
|
}
|
||||||
|
|
@ -42,8 +42,9 @@ use regex::{RegexBuilder, RegexSetBuilder};
|
||||||
|
|
||||||
use exec::CommandTemplate;
|
use exec::CommandTemplate;
|
||||||
use internal::{
|
use internal::{
|
||||||
pattern_has_uppercase_char, transform_args_with_exec, FdOptions, FileTypes, SizeFilter,
|
filter::{SizeFilter, TimeFilter},
|
||||||
TimeFilter,
|
opts::FdOptions,
|
||||||
|
pattern_has_uppercase_char, transform_args_with_exec, FileTypes,
|
||||||
};
|
};
|
||||||
use lscolors::LsColors;
|
use lscolors::LsColors;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
use exit_codes::ExitCode;
|
use exit_codes::ExitCode;
|
||||||
use fshelper::is_executable;
|
use fshelper::is_executable;
|
||||||
use internal::FdOptions;
|
use internal::opts::FdOptions;
|
||||||
use lscolors::LsColors;
|
use lscolors::LsColors;
|
||||||
|
|
||||||
use std::io::{self, Write};
|
use std::io::{self, Write};
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ extern crate ctrlc;
|
||||||
use exec;
|
use exec;
|
||||||
use exit_codes::ExitCode;
|
use exit_codes::ExitCode;
|
||||||
use fshelper;
|
use fshelper;
|
||||||
use internal::{FdOptions, MAX_BUFFER_LENGTH};
|
use internal::{opts::FdOptions, MAX_BUFFER_LENGTH};
|
||||||
use output;
|
use output;
|
||||||
|
|
||||||
use std::error::Error;
|
use std::error::Error;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue