You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
xplr/src/explorer.rs

192 lines
5.1 KiB
Rust

use crate::app::{
DirectoryBuffer, ExplorerConfig, ExternalMsg, InternalMsg, MsgIn, Node, Task,
};
use anyhow::{Error, Result};
use std::fs;
use std::path::PathBuf;
use std::sync::mpsc::Sender;
use std::thread;
pub(crate) fn explore_sync(
config: ExplorerConfig,
parent: PathBuf,
focused_path: Option<PathBuf>,
fallback_focus: usize,
) -> Result<DirectoryBuffer> {
let dirs = fs::read_dir(&parent)?;
let mut nodes = dirs
.filter_map(|d| {
d.ok().map(|e| {
e.path()
.file_name()
.map(|n| n.to_string_lossy().to_string())
.unwrap_or_default()
})
})
.map(|name| Node::new(parent.to_string_lossy().to_string(), name))
.filter(|n| config.filter(n))
.collect::<Vec<Node>>();
nodes.sort_by(|a, b| config.sort(a, b));
let focus_index = if let Some(focus) = focused_path {
let focus_str = focus.to_string_lossy().to_string();
nodes
.iter()
.enumerate()
.find(|(_, n)| n.relative_path == focus_str)
.map(|(i, _)| i)
.unwrap_or_else(|| fallback_focus.min(nodes.len().max(1) - 1))
} else {
0
};
Ok(DirectoryBuffer::new(
parent.to_string_lossy().to_string(),
nodes,
focus_index,
))
}
pub(crate) fn explore_async(
config: ExplorerConfig,
parent: PathBuf,
focused_path: Option<PathBuf>,
fallback_focus: usize,
Optimize performance ``` Benchmarking focus next item: Collecting 100 samples in estimated 5.1972 s (126k itera focus next item time: [41.216 us 41.346 us 41.494 us] change: [-28.669% -28.110% -27.551%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 4 (4.00%) high mild 5 (5.00%) high severe Benchmarking focus previous item: Collecting 100 samples in estimated 5.0576 s (116k i focus previous item time: [43.589 us 43.754 us 43.927 us] change: [-29.506% -28.748% -28.039%] (p = 0.00 < 0.05) Performance has improved. Found 3 outliers among 100 measurements (3.00%) 1 (1.00%) high mild 2 (2.00%) high severe Benchmarking focus first item: Collecting 100 samples in estimated 5.1765 s (116k iter focus first item time: [44.071 us 44.340 us 44.634 us] change: [-26.739% -26.314% -25.885%] (p = 0.00 < 0.05) Performance has improved. Found 12 outliers among 100 measurements (12.00%) 8 (8.00%) high mild 4 (4.00%) high severe Benchmarking focus last item: Collecting 100 samples in estimated 5.1522 s (116k itera focus last item time: [43.950 us 44.214 us 44.541 us] change: [-27.571% -26.953% -26.337%] (p = 0.00 < 0.05) Performance has improved. Found 11 outliers among 100 measurements (11.00%) 5 (5.00%) high mild 6 (6.00%) high severe Benchmarking leave and enter directory: Collecting 100 samples in estimated 5.4863 s ( leave and enter directory time: [96.645 us 96.915 us 97.234 us] change: [-28.720% -27.224% -25.666%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 6 (6.00%) high mild 3 (3.00%) high severe ```
3 years ago
tx_msg_in: Sender<Task>,
) {
thread::spawn(move || {
explore_sync(config, parent.clone(), focused_path, fallback_focus)
3 years ago
.and_then(|buf| {
Optimize performance ``` Benchmarking focus next item: Collecting 100 samples in estimated 5.1972 s (126k itera focus next item time: [41.216 us 41.346 us 41.494 us] change: [-28.669% -28.110% -27.551%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 4 (4.00%) high mild 5 (5.00%) high severe Benchmarking focus previous item: Collecting 100 samples in estimated 5.0576 s (116k i focus previous item time: [43.589 us 43.754 us 43.927 us] change: [-29.506% -28.748% -28.039%] (p = 0.00 < 0.05) Performance has improved. Found 3 outliers among 100 measurements (3.00%) 1 (1.00%) high mild 2 (2.00%) high severe Benchmarking focus first item: Collecting 100 samples in estimated 5.1765 s (116k iter focus first item time: [44.071 us 44.340 us 44.634 us] change: [-26.739% -26.314% -25.885%] (p = 0.00 < 0.05) Performance has improved. Found 12 outliers among 100 measurements (12.00%) 8 (8.00%) high mild 4 (4.00%) high severe Benchmarking focus last item: Collecting 100 samples in estimated 5.1522 s (116k itera focus last item time: [43.950 us 44.214 us 44.541 us] change: [-27.571% -26.953% -26.337%] (p = 0.00 < 0.05) Performance has improved. Found 11 outliers among 100 measurements (11.00%) 5 (5.00%) high mild 6 (6.00%) high severe Benchmarking leave and enter directory: Collecting 100 samples in estimated 5.4863 s ( leave and enter directory time: [96.645 us 96.915 us 97.234 us] change: [-28.720% -27.224% -25.666%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 6 (6.00%) high mild 3 (3.00%) high severe ```
3 years ago
tx_msg_in
.send(Task::new(
MsgIn::Internal(InternalMsg::SetDirectory(buf)),
Optimize performance ``` Benchmarking focus next item: Collecting 100 samples in estimated 5.1972 s (126k itera focus next item time: [41.216 us 41.346 us 41.494 us] change: [-28.669% -28.110% -27.551%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 4 (4.00%) high mild 5 (5.00%) high severe Benchmarking focus previous item: Collecting 100 samples in estimated 5.0576 s (116k i focus previous item time: [43.589 us 43.754 us 43.927 us] change: [-29.506% -28.748% -28.039%] (p = 0.00 < 0.05) Performance has improved. Found 3 outliers among 100 measurements (3.00%) 1 (1.00%) high mild 2 (2.00%) high severe Benchmarking focus first item: Collecting 100 samples in estimated 5.1765 s (116k iter focus first item time: [44.071 us 44.340 us 44.634 us] change: [-26.739% -26.314% -25.885%] (p = 0.00 < 0.05) Performance has improved. Found 12 outliers among 100 measurements (12.00%) 8 (8.00%) high mild 4 (4.00%) high severe Benchmarking focus last item: Collecting 100 samples in estimated 5.1522 s (116k itera focus last item time: [43.950 us 44.214 us 44.541 us] change: [-27.571% -26.953% -26.337%] (p = 0.00 < 0.05) Performance has improved. Found 11 outliers among 100 measurements (11.00%) 5 (5.00%) high mild 6 (6.00%) high severe Benchmarking leave and enter directory: Collecting 100 samples in estimated 5.4863 s ( leave and enter directory time: [96.645 us 96.915 us 97.234 us] change: [-28.720% -27.224% -25.666%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 6 (6.00%) high mild 3 (3.00%) high severe ```
3 years ago
None,
))
3 years ago
.map_err(Error::new)
})
.unwrap_or_else(|e| {
Optimize performance ``` Benchmarking focus next item: Collecting 100 samples in estimated 5.1972 s (126k itera focus next item time: [41.216 us 41.346 us 41.494 us] change: [-28.669% -28.110% -27.551%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 4 (4.00%) high mild 5 (5.00%) high severe Benchmarking focus previous item: Collecting 100 samples in estimated 5.0576 s (116k i focus previous item time: [43.589 us 43.754 us 43.927 us] change: [-29.506% -28.748% -28.039%] (p = 0.00 < 0.05) Performance has improved. Found 3 outliers among 100 measurements (3.00%) 1 (1.00%) high mild 2 (2.00%) high severe Benchmarking focus first item: Collecting 100 samples in estimated 5.1765 s (116k iter focus first item time: [44.071 us 44.340 us 44.634 us] change: [-26.739% -26.314% -25.885%] (p = 0.00 < 0.05) Performance has improved. Found 12 outliers among 100 measurements (12.00%) 8 (8.00%) high mild 4 (4.00%) high severe Benchmarking focus last item: Collecting 100 samples in estimated 5.1522 s (116k itera focus last item time: [43.950 us 44.214 us 44.541 us] change: [-27.571% -26.953% -26.337%] (p = 0.00 < 0.05) Performance has improved. Found 11 outliers among 100 measurements (11.00%) 5 (5.00%) high mild 6 (6.00%) high severe Benchmarking leave and enter directory: Collecting 100 samples in estimated 5.4863 s ( leave and enter directory time: [96.645 us 96.915 us 97.234 us] change: [-28.720% -27.224% -25.666%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 6 (6.00%) high mild 3 (3.00%) high severe ```
3 years ago
tx_msg_in
.send(Task::new(
MsgIn::External(ExternalMsg::LogError(e.to_string())),
None,
))
3 years ago
.unwrap_or_default(); // Let's not panic if xplr closes.
})
});
}
pub(crate) fn explore_recursive_async(
config: ExplorerConfig,
parent: PathBuf,
focused_path: Option<PathBuf>,
fallback_focus: usize,
Optimize performance ``` Benchmarking focus next item: Collecting 100 samples in estimated 5.1972 s (126k itera focus next item time: [41.216 us 41.346 us 41.494 us] change: [-28.669% -28.110% -27.551%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 4 (4.00%) high mild 5 (5.00%) high severe Benchmarking focus previous item: Collecting 100 samples in estimated 5.0576 s (116k i focus previous item time: [43.589 us 43.754 us 43.927 us] change: [-29.506% -28.748% -28.039%] (p = 0.00 < 0.05) Performance has improved. Found 3 outliers among 100 measurements (3.00%) 1 (1.00%) high mild 2 (2.00%) high severe Benchmarking focus first item: Collecting 100 samples in estimated 5.1765 s (116k iter focus first item time: [44.071 us 44.340 us 44.634 us] change: [-26.739% -26.314% -25.885%] (p = 0.00 < 0.05) Performance has improved. Found 12 outliers among 100 measurements (12.00%) 8 (8.00%) high mild 4 (4.00%) high severe Benchmarking focus last item: Collecting 100 samples in estimated 5.1522 s (116k itera focus last item time: [43.950 us 44.214 us 44.541 us] change: [-27.571% -26.953% -26.337%] (p = 0.00 < 0.05) Performance has improved. Found 11 outliers among 100 measurements (11.00%) 5 (5.00%) high mild 6 (6.00%) high severe Benchmarking leave and enter directory: Collecting 100 samples in estimated 5.4863 s ( leave and enter directory time: [96.645 us 96.915 us 97.234 us] change: [-28.720% -27.224% -25.666%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 6 (6.00%) high mild 3 (3.00%) high severe ```
3 years ago
tx_msg_in: Sender<Task>,
) {
explore_async(
config.clone(),
parent.clone(),
focused_path,
fallback_focus,
tx_msg_in.clone(),
);
if let Some(grand_parent) = parent.parent() {
explore_recursive_async(
config,
grand_parent.into(),
parent.file_name().map(|p| p.into()),
0,
Optimize performance ``` Benchmarking focus next item: Collecting 100 samples in estimated 5.1972 s (126k itera focus next item time: [41.216 us 41.346 us 41.494 us] change: [-28.669% -28.110% -27.551%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 4 (4.00%) high mild 5 (5.00%) high severe Benchmarking focus previous item: Collecting 100 samples in estimated 5.0576 s (116k i focus previous item time: [43.589 us 43.754 us 43.927 us] change: [-29.506% -28.748% -28.039%] (p = 0.00 < 0.05) Performance has improved. Found 3 outliers among 100 measurements (3.00%) 1 (1.00%) high mild 2 (2.00%) high severe Benchmarking focus first item: Collecting 100 samples in estimated 5.1765 s (116k iter focus first item time: [44.071 us 44.340 us 44.634 us] change: [-26.739% -26.314% -25.885%] (p = 0.00 < 0.05) Performance has improved. Found 12 outliers among 100 measurements (12.00%) 8 (8.00%) high mild 4 (4.00%) high severe Benchmarking focus last item: Collecting 100 samples in estimated 5.1522 s (116k itera focus last item time: [43.950 us 44.214 us 44.541 us] change: [-27.571% -26.953% -26.337%] (p = 0.00 < 0.05) Performance has improved. Found 11 outliers among 100 measurements (11.00%) 5 (5.00%) high mild 6 (6.00%) high severe Benchmarking leave and enter directory: Collecting 100 samples in estimated 5.4863 s ( leave and enter directory time: [96.645 us 96.915 us 97.234 us] change: [-28.720% -27.224% -25.666%] (p = 0.00 < 0.05) Performance has improved. Found 9 outliers among 100 measurements (9.00%) 6 (6.00%) high mild 3 (3.00%) high severe ```
3 years ago
tx_msg_in,
);
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_explore_sync() {
let config = ExplorerConfig::default();
2 years ago
let path = PathBuf::from(".");
let r = explore_sync(config, path, None, 0);
assert!(r.is_ok());
}
#[test]
fn test_failed_explore_sync() {
let config = ExplorerConfig::default();
let path = PathBuf::from("/there/is/no/path");
let r = explore_sync(config, path, None, 0);
assert!(r.is_err());
}
fn extract_dirbuf_from_msg(msg: MsgIn) -> DirectoryBuffer {
assert!(matches!(msg, MsgIn::Internal(_)));
let msgin = match msg {
MsgIn::Internal(m) => m,
_ => panic!(),
};
assert!(matches!(msgin, InternalMsg::SetDirectory(_)));
match msgin {
InternalMsg::SetDirectory(dbuf) => dbuf,
_ => panic!(),
}
}
use std::sync::mpsc;
#[test]
fn test_explore_async() {
let config = ExplorerConfig::default();
2 years ago
let path = PathBuf::from(".");
let (tx_msg_in, rx_msg_in) = mpsc::channel();
explore_async(config, path, None, 0, tx_msg_in.clone());
let task = rx_msg_in.recv().unwrap();
let dbuf = extract_dirbuf_from_msg(task.msg);
2 years ago
assert_eq!(dbuf.parent, ".");
drop(tx_msg_in);
assert!(rx_msg_in.recv().is_err());
}
//XXX: explore_recursive_async() generates messages with random order.
// Discussing on GitHub (https://github.com/sayanarijit/xplr/issues/372)
//#[test]
//fn test_explore_recursive_async() {
// let config = ExplorerConfig::default();
// let path = PathBuf::from("/usr/bin");
// let (tx_msg_in, rx_msg_in) = mpsc::channel();
// explore_recursive_async(config, path, None, 0, tx_msg_in.clone());
// let mut task = rx_msg_in.recv().unwrap();
// let mut dbuf = extract_dirbuf_from_msg(task.msg);
// assert_eq!(dbuf.parent, "/");
// task = rx_msg_in.recv().unwrap();
// dbuf = extract_dirbuf_from_msg(task.msg);
// assert_eq!(dbuf.parent, "/usr");
// task = rx_msg_in.recv().unwrap();
// dbuf = extract_dirbuf_from_msg(task.msg);
// assert_eq!(dbuf.parent, "/usr/bin");
// drop(tx_msg_in);
// assert!(rx_msg_in.recv().is_err());
//}
}