Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2025-04-03 22:31:49 +00:00
Code Issues Projects Releases Wiki Activity

fix bug where a failed stat would cause the consumer thread to hang

Browse Source
This commit is contained in:
bp 2015-03-03 22:41:30 -05:00
parent 53a723b4ba
commit d9a0458a39
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@ -69,7 +69,8 @@ impl<'a> Exa<'a> {
// Communication between consumer thread and producer threads // Communication between consumer thread and producer threads
enum StatResult<'a> { enum StatResult<'a> {
File(File<'a>), File(File<'a>),
Path(Path) Path(Path),
Error
} }
let (results_tx, results_rx) = channel(); let (results_tx, results_rx) = channel();
@ -84,7 +85,8 @@ impl<'a> Exa<'a> {
match results_rx.recv() { match results_rx.recv() {
Ok(result) => match result { Ok(result) => match result {
StatResult::File(file) => self.files.push(file), StatResult::File(file) => self.files.push(file),
StatResult::Path(path) => self.dirs.push(path) StatResult::Path(path) => self.dirs.push(path),
StatResult::Error => ()
}, },
Err(_) => unreachable!() Err(_) => unreachable!()
} }
@ -116,7 +118,10 @@ impl<'a> Exa<'a> {
let _ = results_tx.send(StatResult::File(File::with_stat(stat, &path, None, false))); let _ = results_tx.send(StatResult::File(File::with_stat(stat, &path, None, false)));
} }
} }
Err(e) => println!("{}: {}", file, e), Err(e) => {
println!("{}: {}", file, e);
let _ = results_tx.send(StatResult::Error);
}
} }
}); });
} }