lynnesbian
/
fif
2
1
Fork 0
Code Releases Activity

rename `dirs` parameter to `dir`

This commit is contained in:
Lynne Megido 2021-05-08 10:10:51 +10:00
parent c3b5dbea35
commit 8341c4aaf7
Signed by: lynnesbian
GPG Key ID: F0A184B5213D9F90
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.rs
View File

@ -76,7 +76,7 @@ fn main() {
trace!("Initialise mimetype database"); trace!("Initialise mimetype database");
init_db(); init_db();
debug!("Iterating directory: {:?}", args.dirs); debug!("Iterating directory: {:?}", args.dir);
let extensions = args.extensions(); let extensions = args.extensions();
let excludes = args.excluded_extensions(); let excludes = args.excluded_extensions();
@ -89,12 +89,7 @@ fn main() {
debug!("Checking files regardless of extensions"); debug!("Checking files regardless of extensions");
} }
let entries = scan_directory( let entries = scan_directory(&args.dir, extensions.as_ref(), excludes.as_ref(), &args.get_scan_opts());
&args.dirs,
extensions.as_ref(),
excludes.as_ref(),
&args.get_scan_opts(),
);
if entries.is_none() { if entries.is_none() {
// no need to log anything for fatal errors - fif will already have printed something obvious like // no need to log anything for fatal errors - fif will already have printed something obvious like

3
src/parameters.rs
View File

@ -115,9 +115,8 @@ pub struct Parameters {
pub quiet: u8, pub quiet: u8,
/// The directory to process. /// The directory to process.
// TODO: right now this can only take a single directory - should this be improved?
#[clap(name = "DIR", default_value = ".", parse(from_os_str))] #[clap(name = "DIR", default_value = ".", parse(from_os_str))]
pub dirs: PathBuf, pub dir: PathBuf,
} }
fn lowercase_exts(exts: &str) -> Result<(), String> { fn lowercase_exts(exts: &str) -> Result<(), String> {

8
src/tests/mod.rs
View File

@ -70,7 +70,9 @@ fn recommend_ext() {
assert!(mime_extension_lookup(IMAGE_JPEG.essence_str().into()) assert!(mime_extension_lookup(IMAGE_JPEG.essence_str().into())
.unwrap() .unwrap()
.contains(&String::from("jpg"))); .contains(&String::from("jpg")));
assert!(mime_extension_lookup(IMAGE_PNG.essence_str().into()).unwrap().contains(&String::from("png"))); assert!(mime_extension_lookup(IMAGE_PNG.essence_str().into())
.unwrap()
.contains(&String::from("png")));
assert!(mime_extension_lookup(APPLICATION_PDF.essence_str().into()) assert!(mime_extension_lookup(APPLICATION_PDF.essence_str().into())
.unwrap() .unwrap()
.contains(&String::from("pdf"))); .contains(&String::from("pdf")));
@ -116,7 +118,7 @@ fn simple_directory() {
follow_symlinks: false, follow_symlinks: false,
}; };
let entries = scan_directory(&dir.path().to_path_buf(), None, None, &scan_opts).expect("Directory scan failed."); let entries = scan_directory(dir.path(), None, None, &scan_opts).expect("Directory scan failed.");
assert_eq!(entries.len(), files.len()); assert_eq!(entries.len(), files.len());
@ -210,7 +212,7 @@ fn argument_parsing() {
fn positional_args() { fn positional_args() {
for flag in &["-x", "-e", "-X", "-E"] { for flag in &["-x", "-e", "-X", "-E"] {
assert_eq!( assert_eq!(
Parameters::parse_from(vec!["fif", flag, "images", "directory"]).dirs, Parameters::parse_from(vec!["fif", flag, "images", "directory"]).dir,
PathBuf::from("directory") PathBuf::from("directory")
) )
} }