summaryrefslogtreecommitdiffstats
path: root/src/fs
diff options
context:
space:
mode:
authorJiayi Zhao <jeff.no.zhao@gmail.com>2020-12-14 21:39:10 -0500
committerJiayi Zhao <jeff.no.zhao@gmail.com>2020-12-14 21:39:10 -0500
commit2b29f8485e95fd3cda434ed472992fff2ee8e7a0 (patch)
treeb5adc9ab32c74597a163cf3efc49f6522932c5f8 /src/fs
parentcfaff5760fbf4f5d5d2261e2c02bd06d7e4dc824 (diff)
selected item now highlights entire row instead of just filename
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/dirlist.rs12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/fs/dirlist.rs b/src/fs/dirlist.rs
index df40c9d..0733f0f 100644
--- a/src/fs/dirlist.rs
+++ b/src/fs/dirlist.rs
@@ -1,4 +1,4 @@
-use std::slice::{Iter, IterMut};
+use std::slice::Iter;
use std::{fs, path};
use crate::fs::{JoshutoDirEntry, JoshutoMetadata};
@@ -36,12 +36,8 @@ impl JoshutoDirList {
self.contents.iter()
}
- pub fn iter_mut(&mut self) -> IterMut<JoshutoDirEntry> {
- self.contents.iter_mut()
- }
-
pub fn modified(&self) -> bool {
- let metadata = std::fs::symlink_metadata(self.path.as_path());
+ let metadata = std::fs::symlink_metadata(self.file_path());
match metadata {
Ok(m) => match m.modified() {
Ok(s) => s > self.metadata.modified,
@@ -65,7 +61,7 @@ impl JoshutoDirList {
pub fn reload_contents(&mut self, sort_option: &SortOption) -> std::io::Result<()> {
let filter_func = sort_option.filter_func();
- let mut contents = read_dir_list(&self.path, filter_func, sort_option.show_icons)?;
+ let mut contents = read_dir_list(self.file_path(), filter_func, sort_option.show_icons)?;
contents.sort_by(|f1, f2| sort_option.compare(f1, f2));
let contents_len = contents.len();
@@ -87,7 +83,7 @@ impl JoshutoDirList {
}
};
- let metadata = JoshutoMetadata::from(&self.path)?;
+ let metadata = JoshutoMetadata::from(self.file_path())?;
self.metadata = metadata;
self.contents = contents;
self.index = index;