bobwen-dev
/
hunter
mirror of https://github.com/bobwen-dev/hunter
1
0
Fork 0
Code Issues Releases Wiki Activity

fix calculation of the number of shown files in a directory

This commit is contained in:
rabite 2020-02-07 21:49:29 +01:00
parent 13b927d07e
commit 0f7be9e929
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/file_browser.rs
View File

@ -197,10 +197,13 @@ impl Tabbable for TabView<FileBrowser> {
tab.left_async_widget_mut().map(|async_w| { tab.left_async_widget_mut().map(|async_w| {
async_w.widget.on_ready(move |mut w, _| { async_w.widget.on_ready(move |mut w, _| {
w.as_mut() w.as_mut()
.map(|mut w| { .map(|mut w| {
w.content.show_hidden = show_hidden; if w.content.show_hidden != show_hidden {
w.refresh().log(); w.content.show_hidden = show_hidden;
}).ok(); w.content.recalculate_len();
w.refresh().log();
}
}).ok();
Ok(()) Ok(())
}).log(); }).log();
}).log(); }).log();
@ -208,10 +211,13 @@ impl Tabbable for TabView<FileBrowser> {
tab.main_async_widget_mut().map(|async_w| { tab.main_async_widget_mut().map(|async_w| {
async_w.widget.on_ready(move |mut w, _| { async_w.widget.on_ready(move |mut w, _| {
w.as_mut() w.as_mut()
.map(|mut w| { .map(|mut w| {
w.content.show_hidden = show_hidden; if w.content.show_hidden != show_hidden {
w.refresh().log(); w.content.show_hidden = show_hidden;
}).ok(); w.content.recalculate_len();
w.refresh().log();
}
}).ok();
Ok(()) Ok(())
}).log() }).log()
}).log(); }).log();

12
src/files.rs
View File

@ -288,7 +288,7 @@ impl Default for Files {
sort: SortBy::Name, sort: SortBy::Name,
dirs_first: true, dirs_first: true,
reverse: false, reverse: false,
show_hidden: true, show_hidden: false,
filter: None, filter: None,
filter_selected: false, filter_selected: false,
dirty: DirtyBit::new(), dirty: DirtyBit::new(),
@ -350,24 +350,24 @@ impl Files {
})?; })?;
} }
let len = files.len(); let mut files = Files {
let files = Files {
directory: File::new_from_path(&path, None)?, directory: File::new_from_path(&path, None)?,
files: files, files: files,
len: len, len: 0,
pending_events: Arc::new(RwLock::new(vec![])), pending_events: Arc::new(RwLock::new(vec![])),
refresh: None, refresh: None,
meta_upto: None, meta_upto: None,
sort: SortBy::Name, sort: SortBy::Name,
dirs_first: true, dirs_first: true,
reverse: false, reverse: false,
show_hidden: true, show_hidden: false,
filter: None, filter: None,
filter_selected: false, filter_selected: false,
dirty: dirty, dirty: dirty,
}; };
files.recalculate_len();
Ok(files) Ok(files)
} }