leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to upstream trash-rs

Browse source
This commit is contained in:
Jeremy Soller 2024-01-10 08:53:22 -07:00
parent 4c664689c6
commit 69531644ff
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
3 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/tab.rs
View file

@ -296,16 +296,15 @@ pub fn scan_trash() -> Vec<Item> {
let name = entry.name;
//TODO: configurable size
let (icon_handle_grid, icon_handle_list) = if metadata.is_dir {
(
let (icon_handle_grid, icon_handle_list) = match metadata.size {
trash::TrashItemSize::Entries(_) => (
folder_icon(&path, ICON_SIZE_GRID),
folder_icon(&path, ICON_SIZE_LIST),
)
} else {
(
),
trash::TrashItemSize::Bytes(_) => (
mime_icon(&path, ICON_SIZE_GRID),
mime_icon(&path, ICON_SIZE_LIST),
)
),
};
items.push(Item {
@ -364,7 +363,10 @@ impl ItemMetadata {
pub fn is_dir(&self) -> bool {
match self {
Self::Path(metadata, _) => metadata.is_dir(),
Self::Trash(metadata) => metadata.is_dir,
Self::Trash(metadata) => match metadata.size {
trash::TrashItemSize::Entries(_) => true,
trash::TrashItemSize::Bytes(_) => false,
},
}
}
}