ascendforever/find-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added file metadata caching for speed

Browse source
This commit is contained in:
George 2023-10-27 12:01:12 -04:00
parent 243df232c3
commit ade02bfe22
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
prebuilt-x86-64-linux/find-images
View file

Binary file not shown.

38
src/main.rs
View file

@ -49,19 +49,23 @@ fn main() -> Result<(), Box<dyn std::error::Error>>{
args.extensions.iter().map(|s| s.as_str()).collect() args.extensions.iter().map(|s| s.as_str()).collect()
}; };
let mut registry: Vec<PathBuf> = Vec::new(); let mut registry: Vec<(std::fs::Metadata,PathBuf)> = Vec::new();
args.targets.into_iter().map(|target| Path::new(&target).to_path_buf() ).for_each( args.targets.into_iter().map(|target| Path::new(&target).to_path_buf() ).for_each(
|path| if path.is_file() { |path| {
register_file_if_image(&mut registry, path, &valid_extensions); if path.is_file() {
} else if path.is_dir() { if let Ok(metadata) = std::fs::metadata(&path) { // intentionally not symlink_metadata
register_dir(&mut registry, path, &valid_extensions, args.dohidden); register_file(&mut registry, path, metadata, &valid_extensions);
}
} else if path.is_dir() {
register_dir(&mut registry, path, &valid_extensions, args.dohidden);
}
} }
); );
if !args.no_sort { if !args.no_sort {
registry.sort_by_key(|entry| { registry.sort_by_key(|(meta,_)| {
entry.metadata().ok().and_then(|meta| meta.modified().ok()).unwrap_or_else( meta.modified().ok().unwrap_or_else(
|| std::time::SystemTime::UNIX_EPOCH, || std::time::SystemTime::UNIX_EPOCH,
) )
}); });
@ -71,22 +75,22 @@ fn main() -> Result<(), Box<dyn std::error::Error>>{
let mut stdout_buffer = std::io::BufWriter::new(stdout.lock()); let mut stdout_buffer = std::io::BufWriter::new(stdout.lock());
if args.null { if args.null {
if args.quote { for file in registry { write!(stdout_buffer, "{}\0", shlex::quote(&file.to_string_lossy()))?; } } if args.quote { for (_,file) in registry { write!(stdout_buffer, "{}\0", shlex::quote(&file.to_string_lossy()))?; } }
else { for file in registry { write!(stdout_buffer, "{}\0", &file.to_string_lossy() )?; } } else { for (_,file) in registry { write!(stdout_buffer, "{}\0", &file.to_string_lossy() )?; } }
} else { } else {
if args.quote { for file in registry { writeln!(stdout_buffer, "{}", shlex::quote(&file.to_string_lossy()))?; } } if args.quote { for (_,file) in registry { writeln!(stdout_buffer, "{}", shlex::quote(&file.to_string_lossy()))?; } }
else { for file in registry { writeln!(stdout_buffer, "{}", &file.to_string_lossy() )?; } } else { for (_,file) in registry { writeln!(stdout_buffer, "{}", &file.to_string_lossy() )?; } }
} }
Ok(()) Ok(())
} }
fn register_file_if_image(registry: &mut Vec<PathBuf>, path: PathBuf, valid_extensions: &HashSet<&str>) { fn register_file(registry: &mut Vec<(std::fs::Metadata,PathBuf)>, path: PathBuf, metadata: std::fs::Metadata, valid_extensions: &HashSet<&str>) {
if let Some(osstr_ext) = path.extension() { if let Some(osstr_ext) = path.extension() {
match osstr_ext.to_str() { match osstr_ext.to_str() {
Some(ext) => { Some(ext) => {
if valid_extensions.contains(ext) { if valid_extensions.contains(ext) {
registry.push(path); registry.push((metadata,path));
} }
}, },
None => eprintln!( None => eprintln!(
@ -98,10 +102,10 @@ fn register_file_if_image(registry: &mut Vec<PathBuf>, path: PathBuf, valid_exte
} }
} }
fn register_dir(registry: &mut Vec<PathBuf>, path: PathBuf, valid_extensions: &HashSet<&str>, dohidden: bool) { fn register_dir(registry: &mut Vec<(std::fs::Metadata,PathBuf)>, path: PathBuf, valid_extensions: &HashSet<&str>, dohidden: bool) {
if let Ok(entries) = std::fs::read_dir(path) { if let Ok(entries) = std::fs::read_dir(path) {
for path in entries.filter_map(|e| e.ok() ).map(|e| e.path() ) { for path in entries.filter_map(|e| e.ok() ).map(|e| e.path() ) {
if !dohidden && path.file_name().map(|name| name.to_string_lossy().starts_with('.')).unwrap_or(false) { if !dohidden && path.file_name().map(|name| name.to_string_lossy().starts_with('.')).unwrap_or(true) { // this unwraps to None if the file_name is .. or is root / (neither of which would happen in this scenario)
continue continue
} }
if let Ok(metadata) = std::fs::symlink_metadata(&path) { if let Ok(metadata) = std::fs::symlink_metadata(&path) {
@ -109,9 +113,9 @@ fn register_dir(registry: &mut Vec<PathBuf>, path: PathBuf, valid_extensions: &H
continue continue
} }
if path.is_file() { if path.is_file() {
register_file_if_image(registry, path, valid_extensions); register_file(registry, path, metadata, &valid_extensions)
} else if path.is_dir() { } else if path.is_dir() {
register_dir(registry, path, valid_extensions, dohidden); register_dir(registry, path, &valid_extensions, dohidden);
} }
} }
} }