syndicate-lang
/
syndicate-rs
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Sort directory entries in config scan

This commit is contained in:
Tony Garnock-Jones 2022-02-04 16:59:29 +01:00
parent b09fbdceec
commit 4f0145e161
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
syndicate-server/src/services/config_watcher.rs
View File

@ -145,13 +145,20 @@ fn initial_scan(
scan_file(t, path_state, env);
} else {
match fs::read_dir(&env.path) {
Ok(entries) => for er in entries {
match er {
Ok(e) =>
initial_scan(t, path_state, config_ds, env.clone_with_path(e.path())),
Err(e) =>
tracing::warn!(
"initial_scan: transient during scan of {:?}: {:?}", &env.path, e),
Ok(unsorted_entries) => {
let mut entries: Vec<fs::DirEntry> = Vec::new();
for er in unsorted_entries {
match er {
Ok(e) =>
entries.push(e),
Err(e) =>
tracing::warn!(
"initial_scan: transient during scan of {:?}: {:?}", &env.path, e),
}
}
entries.sort_by_key(|e| e.file_name());
for e in entries {
initial_scan(t, path_state, config_ds, env.clone_with_path(e.path()));
}
}
Err(e) => tracing::warn!("initial_scan: enumerating {:?}: {:?}", &env.path, e),