daan/fortune-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use chaining instead loops for find_fortune_files

Browse source
This commit is contained in:
runebaas 2019-10-31 14:01:02 +01:00
parent 2ef42d31e2
commit b0d889ce37
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/utils/fortunes_reader.rs
View file

@ -16,25 +16,18 @@ pub fn get_random_cookie() -> Option<Cookie> {
}
fn find_fortune_files() -> Vec<String> {
let locations = get_paths();
let mut all_files: Vec<String> = vec![];
for loc in locations {
let full_path = path::Path::new(&loc);
if full_path.exists() {
if let Ok(files) = fs::read_dir(full_path.canonicalize().unwrap()) {
for file in files {
if let Ok(f) = file {
if is_fortfile(&f.path().to_str().unwrap()) {
all_files.push(f.path().to_str().unwrap().to_owned());
}
}
}
}
}
}
all_files
get_paths()
.into_iter()
.map(|loc| path::Path::new(&loc).to_owned())
.filter(|loc| loc.exists())
.filter_map(|full_path| fs::read_dir(full_path.canonicalize().unwrap()).ok())
.flat_map(|files| {
files
.filter_map(|file| file.ok())
.map(|file| file.path().to_str().unwrap().to_owned())
})
.filter(|file_path| is_fortfile(file_path))
.collect::<Vec<_>>()
}
fn is_fortfile(path: &str) -> bool {