Skip to content

Commit

Permalink
show size of directories (#76)
Browse files Browse the repository at this point in the history
The middle column shows the size of directories in terms of contained
files and sub-directories in the right label for each entry.

Invalid symlinks and hidden files/dirs are included in the count.
  • Loading branch information
DLFW committed Jun 22, 2021
1 parent 26a5ce4 commit a4b4a1b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
12 changes: 9 additions & 3 deletions src/fs/metadata.rs
Expand Up @@ -15,6 +15,7 @@ pub enum LinkType {
#[derive(Clone, Debug)]
pub struct JoshutoMetadata {
_len: u64,
_directory_size: Option<usize>,
_modified: time::SystemTime,
_permissions: fs::Permissions,
_file_type: FileType,
Expand All @@ -38,10 +39,10 @@ impl JoshutoMetadata {
let _len = metadata.len();
let _modified = metadata.modified()?;
let _permissions = metadata.permissions();
let _file_type = if metadata.file_type().is_dir() {
FileType::Directory
let (_file_type, _directory_size) = if metadata.file_type().is_dir() {
(FileType::Directory, Some(fs::read_dir(path)?.count()))
} else {
FileType::File
(FileType::File, None)
};
let _link_type = match symlink_metadata.file_type().is_symlink() {
true => {
Expand All @@ -66,6 +67,7 @@ impl JoshutoMetadata {

Ok(Self {
_len,
_directory_size,
_modified,
_permissions,
_file_type,
Expand All @@ -83,6 +85,10 @@ impl JoshutoMetadata {
self._len
}

pub fn directory_size(&self) -> Option<usize> {
self._directory_size
}

pub fn modified(&self) -> time::SystemTime {
self._modified
}
Expand Down
6 changes: 5 additions & 1 deletion src/ui/widgets/tui_dirlist_detailed.rs
Expand Up @@ -81,7 +81,11 @@ fn print_entry(
drawing_width: usize,
) {
let size_string = match entry.metadata.file_type() {
FileType::Directory => String::from(""),
FileType::Directory => entry
.metadata
.directory_size()
.expect("Directory doesn't have size")
.to_string(),
FileType::File => format::file_size_to_string(entry.metadata.len()),
};
let symlink_string = match entry.metadata.link_type() {
Expand Down

0 comments on commit a4b4a1b

Please sign in to comment.