MyFavMirrors
/
moonfire-nvr
mirror of https://github.com/scottlamb/moonfire-nvr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a vector instead of a boxed slice for tab completion results

This commit is contained in:
Skye 2023-07-04 17:54:02 -04:00 committed by Scott Lamb
parent 3d40a39b93
commit 10b61ddc5e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/cmds/config/dirs.rs
View File

@ -219,7 +219,7 @@ pub fn top_dialog(db: &Arc<db::Database>, siv: &mut Cursive) {
);
}
fn tab_completer(content: &str) -> Box<[String]> {
fn tab_completer(content: &str) -> Vec<String> {
let (parent, final_segment) = content.split_at(content.rfind('/').map(|i| i + 1).unwrap_or(0));
Path::new(parent)
.read_dir()
@ -236,7 +236,7 @@ fn tab_completer(content: &str) -> Box<[String]> {
None
}
})
.collect::<Box<[String]>>()
.collect::<Vec<_>>()
.with(|completions| {
// Sort ignoring initial dot
completions.sort_by(|a, b| {

22
server/src/cmds/config/tab_complete.rs
View File

@ -6,10 +6,10 @@ use cursive::{
menu,
view::CannotFocus,
views::{self, EditView, MenuPopup},
Printer, Rect, Vec2, View,
Printer, Rect, Vec2, View, With,
};
type TabCompleteFn = Rc<dyn Fn(&str) -> Box<[String]>>;
type TabCompleteFn = Rc<dyn Fn(&str) -> Vec<String>>;
pub struct TabCompleteEditView {
edit_view: Rc<RefCell<EditView>>,
@ -24,7 +24,7 @@ impl TabCompleteEditView {
}
}
pub fn on_tab_complete(mut self, handler: impl Fn(&str) -> Box<[String]> + 'static) -> Self {
pub fn on_tab_complete(mut self, handler: impl Fn(&str) -> Vec<String> + 'static) -> Self {
self.tab_completer = Some(Rc::new(handler));
self
}
@ -76,14 +76,14 @@ fn tab_complete(
[..] => {
siv.add_layer(TabCompletePopup {
popup: views::MenuPopup::new(Rc::new({
let mut tree = menu::Tree::new();
for completion in Vec::from(completions) {
let edit_view = edit_view.clone();
tree.add_leaf(&completion.clone(), move |siv| {
edit_view.borrow_mut().set_content(&completion)(siv)
})
}
tree
menu::Tree::new().with(|tree| {
for completion in completions {
let edit_view = edit_view.clone();
tree.add_leaf(&completion.clone(), move |siv|
edit_view.borrow_mut().set_content(&completion)(siv)
)
}
})
})),
edit_view,
tab_completer,