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

Merge pull request #1562 from git-f0x/deps

Browse source 
Update dependencies
This commit is contained in:
Jeremy Soller 2026-01-30 17:11:28 -07:00 • committed by GitHub
commit 09eb076372
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 1074 additions and 1146 deletions
Download patch file Download diff file Expand all files Collapse all files

190
Cargo.lock generated
View file

@ -976,9 +976,9 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.2.54" version = "1.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583" checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29"
dependencies = [ dependencies = [
"find-msvc-tools", "find-msvc-tools",
"jobserver", "jobserver",
@ -1457,8 +1457,6 @@ dependencies = [
"fastrand 2.3.0", "fastrand 2.3.0",
"flate2", "flate2",
"fork", "fork",
"freedesktop_entry_parser",
"futures",
"gio", "gio",
"glib", "glib",
"glob", "glob",
@ -1575,8 +1573,8 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-text" name = "cosmic-text"
version = "0.16.0" version = "0.17.0"
source = "git+https://github.com/pop-os/cosmic-text.git#ee702e50901d90cd842dbd88154687bd2512b52c" source = "git+https://github.com/pop-os/cosmic-text.git#bdd6657fd7268dc8882214f540a6150eb78cfae0"
dependencies = [ dependencies = [
"bitflags 2.10.0", "bitflags 2.10.0",
"fontdb 0.23.0", "fontdb 0.23.0",
@ -1584,10 +1582,10 @@ dependencies = [
"linebender_resource_handle", "linebender_resource_handle",
"log", "log",
"rangemap", "rangemap",
"rustc-hash 1.1.0", "rustc-hash 2.1.1",
"self_cell", "self_cell",
"skrifa 0.39.0", "skrifa 0.36.0",
"smol_str", "smol_str 0.3.5",
"swash", "swash",
"sys-locale", "sys-locale",
"unicode-bidi", "unicode-bidi",
@ -1736,38 +1734,14 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "darling"
version = "0.20.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
dependencies = [
"darling_core 0.20.11",
"darling_macro 0.20.11",
]
[[package]] [[package]]
name = "darling" name = "darling"
version = "0.21.3" version = "0.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
dependencies = [ dependencies = [
"darling_core 0.21.3", "darling_core",
"darling_macro 0.21.3", "darling_macro",
]
[[package]]
name = "darling_core"
version = "0.20.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim",
"syn 2.0.114",
] ]
[[package]] [[package]]
@ -1784,24 +1758,13 @@ dependencies = [
"syn 2.0.114", "syn 2.0.114",
] ]
[[package]]
name = "darling_macro"
version = "0.20.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
dependencies = [
"darling_core 0.20.11",
"quote",
"syn 2.0.114",
]
[[package]] [[package]]
name = "darling_macro" name = "darling_macro"
version = "0.21.3" version = "0.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
dependencies = [ dependencies = [
"darling_core 0.21.3", "darling_core",
"quote", "quote",
"syn 2.0.114", "syn 2.0.114",
] ]
@ -1841,11 +1804,11 @@ dependencies = [
[[package]] [[package]]
name = "derive_setters" name = "derive_setters"
version = "0.1.8" version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae5c625eda104c228c06ecaf988d1c60e542176bd7a490e60eeda3493244c0c9" checksum = "b7e6f6fa1f03c14ae082120b84b3c7fbd7b8588d924cf2d7c3daf9afd49df8b9"
dependencies = [ dependencies = [
"darling 0.20.11", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.114", "syn 2.0.114",
@ -2302,9 +2265,9 @@ dependencies = [
[[package]] [[package]]
name = "find-msvc-tools" name = "find-msvc-tools"
version = "0.1.8" version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
[[package]] [[package]]
name = "fixed_decimal" name = "fixed_decimal"
@ -2406,6 +2369,15 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]]
name = "font-types"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02a596f5713680923a2080d86de50fe472fb290693cf0f701187a1c8b36996b7"
dependencies = [
"bytemuck",
]
[[package]] [[package]]
name = "font-types" name = "font-types"
version = "0.10.1" version = "0.10.1"
@ -2527,16 +2499,6 @@ dependencies = [
"xdg", "xdg",
] ]
[[package]]
name = "freedesktop_entry_parser"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db9c27b72f19a99a895f8ca89e2d26e4ef31013376e56fdafef697627306c3e4"
dependencies = [
"nom 7.1.3",
"thiserror 1.0.69",
]
[[package]] [[package]]
name = "fsevent-sys" name = "fsevent-sys"
version = "4.1.0" version = "4.1.0"
@ -2972,14 +2934,14 @@ dependencies = [
[[package]] [[package]]
name = "harfrust" name = "harfrust"
version = "0.4.1" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0caaee032384c10dd597af4579c67dee16650d862a9ccbe1233ff1a379abc07" checksum = "75a4c970f1a00edc1626f1e3cc039492b15b73df28b9fff70f95404a571b4fae"
dependencies = [ dependencies = [
"bitflags 2.10.0", "bitflags 2.10.0",
"bytemuck", "bytemuck",
"core_maths", "core_maths",
"read-fonts 0.36.0", "read-fonts 0.34.0",
"smallvec", "smallvec",
] ]
@ -3200,7 +3162,7 @@ dependencies = [
"raw-window-handle", "raw-window-handle",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
"serde", "serde",
"smol_str", "smol_str 0.2.2",
"thiserror 1.0.69", "thiserror 1.0.69",
"web-time", "web-time",
"window_clipboard", "window_clipboard",
@ -3835,7 +3797,7 @@ dependencies = [
"rgb", "rgb",
"tiff", "tiff",
"zune-core 0.5.1", "zune-core 0.5.1",
"zune-jpeg 0.5.11", "zune-jpeg 0.5.12",
] ]
[[package]] [[package]]
@ -4947,9 +4909,9 @@ dependencies = [
[[package]] [[package]]
name = "notify-debouncer-full" name = "notify-debouncer-full"
version = "0.6.0" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "375bd3a138be7bfeff3480e4a623df4cbfb55b79df617c055cd810ba466fa078" checksum = "c02b49179cfebc9932238d04d6079912d26de0379328872846118a0fa0dbb302"
dependencies = [ dependencies = [
"file-id", "file-id",
"log", "log",
@ -5002,9 +4964,9 @@ dependencies = [
[[package]] [[package]]
name = "num-conv" name = "num-conv"
version = "0.1.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
[[package]] [[package]]
name = "num-derive" name = "num-derive"
@ -6155,6 +6117,17 @@ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]]
name = "read-fonts"
version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8941f8e9d5f8ad3aebea330d01ac68c0167600eb31a86ecd86e97be4d13b51f5"
dependencies = [
"bytemuck",
"core_maths",
"font-types 0.9.0",
]
[[package]] [[package]]
name = "read-fonts" name = "read-fonts"
version = "0.35.0" version = "0.35.0"
@ -6162,18 +6135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358" checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"font-types", "font-types 0.10.1",
]
[[package]]
name = "read-fonts"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eaa2941a4c05443ee3a7b26ab076a553c343ad5995230cc2b1d3e993bdc6345"
dependencies = [
"bytemuck",
"core_maths",
"font-types",
] ]
[[package]] [[package]]
@ -6638,7 +6600,7 @@ version = "3.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c"
dependencies = [ dependencies = [
"darling 0.21.3", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.114", "syn 2.0.114",
@ -6721,6 +6683,16 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
[[package]]
name = "skrifa"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37004372610e83ee2a4c69c7d896b41f33da6a3dc1a4fe07dd9b2629a549b1dc"
dependencies = [
"bytemuck",
"read-fonts 0.34.0",
]
[[package]] [[package]]
name = "skrifa" name = "skrifa"
version = "0.37.0" version = "0.37.0"
@ -6731,16 +6703,6 @@ dependencies = [
"read-fonts 0.35.0", "read-fonts 0.35.0",
] ]
[[package]]
name = "skrifa"
version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c9eb0b904a04d09bd68c65d946617b8ff733009999050f3b851c32fb3cfb60e"
dependencies = [
"bytemuck",
"read-fonts 0.36.0",
]
[[package]] [[package]]
name = "slab" name = "slab"
version = "0.4.11" version = "0.4.11"
@ -6837,6 +6799,12 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "smol_str"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f7a918bd2a9951d18ee6e48f076843e8e73a9a5d22cf05bcd4b7a81bdd04e17"
[[package]] [[package]]
name = "socket2" name = "socket2"
version = "0.4.10" version = "0.4.10"
@ -7211,9 +7179,9 @@ dependencies = [
[[package]] [[package]]
name = "time" name = "time"
version = "0.3.45" version = "0.3.46"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd" checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5"
dependencies = [ dependencies = [
"deranged", "deranged",
"itoa", "itoa",
@ -7227,15 +7195,15 @@ dependencies = [
[[package]] [[package]]
name = "time-core" name = "time-core"
version = "0.1.7" version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca" checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
[[package]] [[package]]
name = "time-macros" name = "time-macros"
version = "0.2.25" version = "0.2.26"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd" checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4"
dependencies = [ dependencies = [
"num-conv", "num-conv",
"time-core", "time-core",
@ -7791,9 +7759,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]] [[package]]
name = "wasip2" name = "wasip2"
version = "1.0.1+wasi-0.2.4" version = "1.0.2+wasi-0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
dependencies = [ dependencies = [
"wit-bindgen", "wit-bindgen",
] ]
@ -8811,7 +8779,7 @@ dependencies = [
"rustix 0.38.44", "rustix 0.38.44",
"sctk-adwaita", "sctk-adwaita",
"smithay-client-toolkit 0.19.2", "smithay-client-toolkit 0.19.2",
"smol_str", "smol_str 0.2.2",
"tracing", "tracing",
"unicode-segmentation", "unicode-segmentation",
"wasm-bindgen", "wasm-bindgen",
@ -8848,9 +8816,9 @@ dependencies = [
[[package]] [[package]]
name = "wit-bindgen" name = "wit-bindgen"
version = "0.46.0" version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
[[package]] [[package]]
name = "write16" name = "write16"
@ -9245,18 +9213,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
[[package]] [[package]]
name = "zerocopy" name = "zerocopy"
version = "0.8.35" version = "0.8.37"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdea86ddd5568519879b8187e1cf04e24fce28f7fe046ceecbce472ff19a2572" checksum = "7456cf00f0685ad319c5b1693f291a650eaf345e941d082fc4e03df8a03996ac"
dependencies = [ dependencies = [
"zerocopy-derive", "zerocopy-derive",
] ]
[[package]] [[package]]
name = "zerocopy-derive" name = "zerocopy-derive"
version = "0.8.35" version = "0.8.37"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c15e1b46eff7c6c91195752e0eeed8ef040e391cdece7c25376957d5f15df22" checksum = "1328722bbf2115db7e19d69ebcc15e795719e2d66b60827c6a69a117365e37a0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -9450,9 +9418,9 @@ dependencies = [
[[package]] [[package]]
name = "zune-jpeg" name = "zune-jpeg"
version = "0.5.11" version = "0.5.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2959ca473aae96a14ecedf501d20b3608d2825ba280d5adb57d651721885b0c2" checksum = "410e9ecef634c709e3831c2cfdb8d9c32164fae1c67496d5b68fff728eec37fe"
dependencies = [ dependencies = [
"zune-core 0.5.1", "zune-core 0.5.1",
] ]

21
Cargo.toml
View file

@ -4,7 +4,7 @@ version = "1.0.4"
authors = ["Jeremy Soller <jeremy@system76.com>"] authors = ["Jeremy Soller <jeremy@system76.com>"]
edition = "2024" edition = "2024"
license = "GPL-3.0-only" license = "GPL-3.0-only"
rust-version = "1.85" rust-version = "1.90"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
@ -14,8 +14,6 @@ cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-c
cosmic-mime-apps = { git = "https://github.com/pop-os/cosmic-mime-apps.git", optional = true } cosmic-mime-apps = { git = "https://github.com/pop-os/cosmic-mime-apps.git", optional = true }
dirs = "6.0.0" dirs = "6.0.0"
env_logger = "0.11" env_logger = "0.11"
freedesktop_entry_parser = "1.3"
futures = "0.3.31"
gio = { version = "0.21", optional = true } gio = { version = "0.21", optional = true }
glib = { version = "0.21", optional = true } glib = { version = "0.21", optional = true }
glob = "0.3" glob = "0.3"
@ -24,9 +22,9 @@ image = "0.25"
libc = "0.2" libc = "0.2"
log = "0.4" log = "0.4"
mime_guess = "2" mime_guess = "2"
notify-debouncer-full = "0.6" notify-debouncer-full = "0.7"
notify-rust = { version = "4", optional = true } notify-rust = { version = "4", optional = true }
open = "5.3.2" open = "5.3.3"
paste = "1.0" paste = "1.0"
regex = "1" regex = "1"
rustc-hash = "2.1" rustc-hash = "2.1"
@ -38,15 +36,15 @@ tokio = { version = "1", features = ["process", "sync"] }
trash = { git = "https://github.com/jackpot51/trash-rs.git", branch = "cosmic" } trash = { git = "https://github.com/jackpot51/trash-rs.git", branch = "cosmic" }
url = "2.5" url = "2.5"
walkdir = "2.5.0" walkdir = "2.5.0"
wayland-client = { version = "0.31.11", optional = true } wayland-client = { version = "0.31.12", optional = true }
xdg = { version = "3.0", optional = true } xdg = { version = "3.0", optional = true }
xdg-mime = { git = "https://github.com/ebassi/xdg-mime-rs" } xdg-mime = { git = "https://github.com/ebassi/xdg-mime-rs" }
# Compression # Compression
bzip2 = { version = "0.6", optional = true } #TODO: replace with pure Rust crate bzip2 = { version = "0.6", optional = true } #TODO: replace with pure Rust crate
flate2 = "1.1" flate2 = "1.1"
tar = "0.4.44" tar = "0.4.44"
lzma-rust2 = { version = "0.15.4", optional = true } lzma-rust2 = { version = "0.15.7", optional = true }
ordermap = { version = "1.0.0", features = ["serde"] } ordermap = { version = "1.1.0", features = ["serde"] }
# Internationalization # Internationalization
i18n-embed = { version = "0.16", features = [ i18n-embed = { version = "0.16", features = [
"fluent-system", "fluent-system",
@ -54,10 +52,10 @@ i18n-embed = { version = "0.16", features = [
] } ] }
i18n-embed-fl = "0.10" i18n-embed-fl = "0.10"
rust-embed = "8" rust-embed = "8"
slotmap = "1.0.7" slotmap = "1.1.1"
recently-used-xbel = { git = "https://github.com/pop-os/recently-used-xbel.git" } recently-used-xbel = { git = "https://github.com/pop-os/recently-used-xbel.git" }
zip = "7" zip = "7"
uzers = "0.12.1" uzers = "0.12.2"
md-5 = "0.10.6" md-5 = "0.10.6"
png = "0.18" png = "0.18"
jxl-oxide = { version = "0.12.5", features = ["image"] } jxl-oxide = { version = "0.12.5", features = ["image"] }
@ -76,6 +74,7 @@ default-features = false
features = [ features = [
"about", "about",
"autosize", "autosize",
"desktop",
"multi-window", "multi-window",
"tokio", "tokio",
"winit", "winit",
@ -107,7 +106,7 @@ default = [
"wayland", "wayland",
] ]
dbus-config = ["libcosmic/dbus-config"] dbus-config = ["libcosmic/dbus-config"]
desktop = ["libcosmic/desktop", "dep:cosmic-mime-apps", "dep:xdg"] desktop = ["dep:cosmic-mime-apps", "dep:xdg"]
desktop-applet = [] desktop-applet = []
gvfs = ["dep:gio", "dep:glib"] gvfs = ["dep:gio", "dep:glib"]
io-uring = ["compio/io-uring"] io-uring = ["compio/io-uring"]

260
src/app.rs
View file

@ -18,7 +18,9 @@ use cosmic::{
Application, ApplicationExt, Element, Application, ApplicationExt, Element,
app::{self, Core, Task, context_drawer}, app::{self, Core, Task, context_drawer},
cosmic_config::{self, ConfigSet}, cosmic_config::{self, ConfigSet},
cosmic_theme, executor, cosmic_theme,
desktop::fde::DesktopEntry,
executor,
iced::{ iced::{
self, Alignment, Event, Length, Rectangle, Size, Subscription, self, Alignment, Event, Length, Rectangle, Size, Subscription,
clipboard::dnd::DndAction, clipboard::dnd::DndAction,
@ -72,10 +74,10 @@ use crate::{
FxOrderMap, FxOrderMap,
clipboard::{ClipboardCopy, ClipboardKind, ClipboardPaste}, clipboard::{ClipboardCopy, ClipboardKind, ClipboardPaste},
config::{ config::{
AppTheme, Config, DesktopConfig, Favorite, IconSizes, TIME_CONFIG_ID, TabConfig, AppTheme, Config, DesktopConfig, Favorite, IconSizes, State, TIME_CONFIG_ID, TabConfig,
TimeConfig, TypeToSearch, TimeConfig, TypeToSearch,
}, },
dialog::{Dialog, DialogKind, DialogMessage, DialogResult}, dialog::{Dialog, DialogKind, DialogMessage, DialogResult, DialogSettings},
fl, home_dir, fl, home_dir,
key_bind::key_binds, key_bind::key_binds,
localize::LANGUAGE_SORTER, localize::LANGUAGE_SORTER,
@ -91,10 +93,6 @@ use crate::{
tab::{ tab::{
self, HOVER_DURATION, HeadingOptions, ItemMetadata, Location, SORT_OPTION_FALLBACK, Tab, self, HOVER_DURATION, HeadingOptions, ItemMetadata, Location, SORT_OPTION_FALLBACK, Tab,
}, },
};
use crate::{
config::State,
dialog::DialogSettings,
zoom::{zoom_in_view, zoom_out_view, zoom_to_default}, zoom::{zoom_in_view, zoom_out_view, zoom_to_default},
}; };
@ -846,8 +844,8 @@ impl App {
fn launch_desktop_entries(paths: &[impl AsRef<Path>]) { fn launch_desktop_entries(paths: &[impl AsRef<Path>]) {
for path in paths.iter().map(AsRef::as_ref) { for path in paths.iter().map(AsRef::as_ref) {
match freedesktop_entry_parser::parse_entry(path) { match DesktopEntry::from_path::<&str>(path, None) {
Ok(entry) => match entry.section("Desktop Entry").attr("Exec") { Ok(entry) => match entry.exec() {
Some(exec) => match mime_app::exec_to_command(exec, &[] as &[&str; 0]) { Some(exec) => match mime_app::exec_to_command(exec, &[] as &[&str; 0]) {
Some(commands) => { Some(commands) => {
for mut command in commands { for mut command in commands {
@ -1230,12 +1228,12 @@ impl App {
}; };
for item in items { for item in items {
if item.selected { if item.selected {
if let Some(path) = item.path_opt() { if let Some(path) = item.path_opt()
if op_sel.selected.contains(path) || op_sel.ignored.contains(path) { && (op_sel.selected.contains(path) || op_sel.ignored.contains(path))
{
// Ignore if path in selected or ignored paths // Ignore if path in selected or ignored paths
continue; continue;
} }
}
// Return if there is a previous selection not matching // Return if there is a previous selection not matching
return Task::none(); return Task::none();
@ -1891,13 +1889,13 @@ impl App {
children.push(item.preview_view(Some(&self.mime_app_cache), military_time)); children.push(item.preview_view(Some(&self.mime_app_cache), military_time));
} }
PreviewKind::Location(location) => { PreviewKind::Location(location) => {
if let Some(tab) = self.tab_model.data::<Tab>(entity) { if let Some(tab) = self.tab_model.data::<Tab>(entity)
if let Some(items) = tab.items_opt() { && let Some(items) = tab.items_opt()
{
for item in items { for item in items {
if item.location_opt.as_ref() == Some(location) { if item.location_opt.as_ref() == Some(location) {
children.push( children
item.preview_view(Some(&self.mime_app_cache), military_time), .push(item.preview_view(Some(&self.mime_app_cache), military_time));
);
// Only show one property view to avoid issues like hangs when generating // Only show one property view to avoid issues like hangs when generating
// preview images on thousands of files // preview images on thousands of files
break; break;
@ -1905,10 +1903,10 @@ impl App {
} }
} }
} }
}
PreviewKind::Selected => { PreviewKind::Selected => {
if let Some(tab) = self.tab_model.data::<Tab>(entity) { if let Some(tab) = self.tab_model.data::<Tab>(entity)
if let Some(items) = tab.items_opt() { && let Some(items) = tab.items_opt()
{
let preview_opt = { let preview_opt = {
let mut selected = items.iter().filter(|item| item.selected); let mut selected = items.iter().filter(|item| item.selected);
@ -1916,9 +1914,9 @@ impl App {
// At least two selected items // At least two selected items
(Some(_), Some(_)) => Some(tab.multi_preview_view()), (Some(_), Some(_)) => Some(tab.multi_preview_view()),
// Exactly one selected item // Exactly one selected item
(Some(item), None) => Some( (Some(item), None) => {
item.preview_view(Some(&self.mime_app_cache), military_time), Some(item.preview_view(Some(&self.mime_app_cache), military_time))
), }
// No selected items // No selected items
_ => None, _ => None,
} }
@ -1928,13 +1926,10 @@ impl App {
children.push(preview); children.push(preview);
} }
if children.is_empty() { if children.is_empty()
if let Some(item) = &tab.parent_item_opt { && let Some(item) = &tab.parent_item_opt
children.push( {
item.preview_view(Some(&self.mime_app_cache), military_time), children.push(item.preview_view(Some(&self.mime_app_cache), military_time));
);
}
}
} }
} }
} }
@ -2062,14 +2057,14 @@ impl App {
.map(|favorite| { .map(|favorite| {
if let Favorite::Path(path) = favorite { if let Favorite::Path(path) = favorite {
for (from, to) in path_changes.iter().map(|(f, t)| (f.as_ref(), t.as_ref())) { for (from, to) in path_changes.iter().map(|(f, t)| (f.as_ref(), t.as_ref())) {
if path.starts_with(from) { if path.starts_with(from)
if let Ok(relative) = path.strip_prefix(from) { && let Ok(relative) = path.strip_prefix(from)
{
favorites_changed = true; favorites_changed = true;
return Favorite::from_path(to.join(relative)); return Favorite::from_path(to.join(relative));
} }
} }
} }
}
favorite.clone() favorite.clone()
}) })
.collect(); .collect();
@ -2235,9 +2230,10 @@ impl Application for App {
let mut commands = vec![app.update_config()]; let mut commands = vec![app.update_config()];
for location in flags.locations { for location in flags.locations {
if let Some(path) = location.path_opt() { if let Some(path) = location.path_opt()
if path.is_file() { && path.is_file()
if let Some(parent) = path.parent() { && let Some(parent) = path.parent()
{
commands.push(app.open_tab( commands.push(app.open_tab(
Location::Path(parent.to_path_buf()), Location::Path(parent.to_path_buf()),
true, true,
@ -2245,8 +2241,6 @@ impl Application for App {
)); ));
continue; continue;
} }
}
}
commands.push(app.open_tab(location, true, None)); commands.push(app.open_tab(location, true, None));
} }
for location in flags.uris { for location in flags.uris {
@ -2405,15 +2399,14 @@ impl Application for App {
// TODO do we need to choose the correct mounter? // TODO do we need to choose the correct mounter?
self.mounter_items.keys().copied().next() self.mounter_items.keys().copied().next()
}) })
&& let Some(mounter) = MOUNTERS.get(&key)
{ {
if let Some(mounter) = MOUNTERS.get(&key) {
return mounter.network_drive(uri.clone()).map(move |()| { return mounter.network_drive(uri.clone()).map(move |()| {
cosmic::Action::App(Message::NetworkDriveOpenEntityAfterMount { cosmic::Action::App(Message::NetworkDriveOpenEntityAfterMount {
entity, entity,
}) })
}); });
} }
}
log::warn!( log::warn!(
"failed to open favorite, path does not exist: {}", "failed to open favorite, path does not exist: {}",
@ -2468,13 +2461,13 @@ impl Application for App {
return self.update(message); return self.update(message);
} }
} }
if let Some(data) = self.nav_model.data::<MounterData>(entity) { if let Some(data) = self.nav_model.data::<MounterData>(entity)
if let Some(mounter) = MOUNTERS.get(&data.0) { && let Some(mounter) = MOUNTERS.get(&data.0)
{
return mounter return mounter
.mount(data.1.clone()) .mount(data.1.clone())
.map(|()| cosmic::action::none()); .map(|()| cosmic::action::none());
} }
}
Task::none() Task::none()
} }
@ -2505,12 +2498,12 @@ impl Application for App {
} }
// Close gallery mode if open // Close gallery mode if open
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity)
if tab.gallery { && tab.gallery
{
tab.gallery = false; tab.gallery = false;
return Task::none(); return Task::none();
} }
}
// Close menus and context panes in order per message // Close menus and context panes in order per message
// Why: It'd be weird to close everything all at once // Why: It'd be weird to close everything all at once
@ -2635,8 +2628,9 @@ impl Application for App {
} }
Message::Compress(entity_opt) => { Message::Compress(entity_opt) => {
let paths: Box<[_]> = self.selected_paths(entity_opt).collect(); let paths: Box<[_]> = self.selected_paths(entity_opt).collect();
if let Some(current_path) = paths.first() { if let Some(current_path) = paths.first()
if let Some(destination) = current_path.parent().zip(current_path.file_stem()) { && let Some(destination) = current_path.parent().zip(current_path.file_stem())
{
let to = destination.0.to_path_buf(); let to = destination.0.to_path_buf();
let name = destination.1.to_str().unwrap_or_default().to_string(); let name = destination.1.to_str().unwrap_or_default().to_string();
let archive_type = ArchiveType::default(); let archive_type = ArchiveType::default();
@ -2652,7 +2646,6 @@ impl Application for App {
); );
} }
} }
}
Message::Config(config) => { Message::Config(config) => {
if config != self.config { if config != self.config {
log::info!("update config"); log::info!("update config");
@ -2664,11 +2657,11 @@ impl Application for App {
} }
} }
Message::Copy(entity_opt) => { Message::Copy(entity_opt) => {
if let Some(entity) = entity_opt { if let Some(entity) = entity_opt
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { && let Some(tab) = self.tab_model.data_mut::<Tab>(entity)
{
tab.refresh_cut(&[]); tab.refresh_cut(&[]);
} }
}
let paths = self.selected_paths(entity_opt); let paths = self.selected_paths(entity_opt);
let contents = ClipboardCopy::new(ClipboardKind::Copy, paths); let contents = ClipboardCopy::new(ClipboardKind::Copy, paths);
return clipboard::write_data(contents); return clipboard::write_data(contents);
@ -2975,15 +2968,15 @@ impl Application for App {
DialogResult::Cancel => {} DialogResult::Cancel => {}
DialogResult::Open(selected_paths) => { DialogResult::Open(selected_paths) => {
let mut archive_paths = None; let mut archive_paths = None;
if let Some(file_dialog) = &self.file_dialog_opt { if let Some(file_dialog) = &self.file_dialog_opt
if let Some(window) = self.windows.remove(&file_dialog.window_id()) { && let Some(window) = self.windows.remove(&file_dialog.window_id())
if let WindowKind::FileDialog(paths) = window.kind { && let WindowKind::FileDialog(paths) = window.kind
{
archive_paths = paths; archive_paths = paths;
} }
} if let Some(archive_paths) = archive_paths
} && !selected_paths.is_empty()
if let Some(archive_paths) = archive_paths { {
if !selected_paths.is_empty() {
self.file_dialog_opt = None; self.file_dialog_opt = None;
return self.operation(Operation::Extract { return self.operation(Operation::Extract {
paths: archive_paths, paths: archive_paths,
@ -2993,7 +2986,6 @@ impl Application for App {
} }
} }
} }
}
self.file_dialog_opt = None; self.file_dialog_opt = None;
} }
Message::FileDialogMessage(dialog_message) => { Message::FileDialogMessage(dialog_message) => {
@ -3020,12 +3012,11 @@ impl Application for App {
&& !modifiers.control() && !modifiers.control()
&& !modifiers.alt() && !modifiers.alt()
&& matches!(key, Key::Character(_)) && matches!(key, Key::Character(_))
&& let Some(text) = text
{ {
if let Some(text) = text {
match self.config.type_to_search { match self.config.type_to_search {
TypeToSearch::Recursive => { TypeToSearch::Recursive => {
let mut term = let mut term = self.search_get().unwrap_or_default().to_string();
self.search_get().unwrap_or_default().to_string();
term.push_str(&text); term.push_str(&text);
return self.search_set_active(Some(term)); return self.search_set_active(Some(term));
} }
@ -3042,8 +3033,7 @@ impl Application for App {
tab.edit_location = tab.edit_location =
Some(location.with_uri(uri_string).into()); Some(location.with_uri(uri_string).into());
} else if let Some(path) = location.path_opt() { } else if let Some(path) = location.path_opt() {
let mut path_string = let mut path_string = path.to_string_lossy().into_owned();
path.to_string_lossy().into_owned();
path_string.push_str(&text); path_string.push_str(&text);
tab.edit_location = tab.edit_location =
Some(location.with_path(path_string.into()).into()); Some(location.with_path(path_string.into()).into());
@ -3052,11 +3042,11 @@ impl Application for App {
} }
TypeToSearch::SelectByPrefix => { TypeToSearch::SelectByPrefix => {
// Reset buffer if timeout elapsed // Reset buffer if timeout elapsed
if let Some(last_key) = self.type_select_last_key { if let Some(last_key) = self.type_select_last_key
if last_key.elapsed() >= tab::TYPE_SELECT_TIMEOUT { && last_key.elapsed() >= tab::TYPE_SELECT_TIMEOUT
{
self.type_select_prefix.clear(); self.type_select_prefix.clear();
} }
}
// Accumulate character and select // Accumulate character and select
self.type_select_prefix.push_str(&text.to_lowercase()); self.type_select_prefix.push_str(&text.to_lowercase());
@ -3076,7 +3066,6 @@ impl Application for App {
} }
} }
} }
}
Message::MaybeExit => { Message::MaybeExit => {
if self.core.main_window_id().is_none() && self.pending_operations.is_empty() { if self.core.main_window_id().is_none() && self.pending_operations.is_empty() {
// Exit if window is closed and there are no pending operations // Exit if window is closed and there are no pending operations
@ -3106,24 +3095,25 @@ impl Application for App {
let mut unmounted = Vec::new(); let mut unmounted = Vec::new();
if let Some(old_items) = self.mounter_items.get(&mounter_key) { if let Some(old_items) = self.mounter_items.get(&mounter_key) {
for old_item in old_items { for old_item in old_items {
if let Some(old_path) = old_item.path() { if let Some(old_path) = old_item.path()
if old_item.is_mounted() { && old_item.is_mounted()
{
let mut still_mounted = false; let mut still_mounted = false;
for item in &mounter_items { for item in &mounter_items {
if let Some(path) = item.path() { if let Some(path) = item.path()
if path == old_path && item.is_mounted() { && path == old_path
&& item.is_mounted()
{
still_mounted = true; still_mounted = true;
break; break;
} }
} }
}
if !still_mounted { if !still_mounted {
unmounted.push(old_path); unmounted.push(old_path);
} }
} }
} }
} }
}
// Go back to home in any tabs that were unmounted // Go back to home in any tabs that were unmounted
let mut commands = Vec::new(); let mut commands = Vec::new();
@ -3254,8 +3244,9 @@ impl Application for App {
} }
Message::NewItem(entity_opt, dir) => { Message::NewItem(entity_opt, dir) => {
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity)
if let Some(path) = tab.location.path_opt() { && let Some(path) = tab.location.path_opt()
{
return Task::batch([ return Task::batch([
self.dialog_pages.push_back(DialogPage::NewItem { self.dialog_pages.push_back(DialogPage::NewItem {
parent: path.clone(), parent: path.clone(),
@ -3266,7 +3257,6 @@ impl Application for App {
]); ]);
} }
} }
}
#[cfg(feature = "notify")] #[cfg(feature = "notify")]
Message::Notification(notification) => { Message::Notification(notification) => {
self.notification_opt = Some(notification); self.notification_opt = Some(notification);
@ -3277,8 +3267,9 @@ impl Application for App {
let mut needs_reload = Vec::new(); let mut needs_reload = Vec::new();
let entities: Box<[_]> = self.tab_model.iter().collect(); let entities: Box<[_]> = self.tab_model.iter().collect();
for entity in entities { for entity in entities {
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity)
if let Some(path) = tab.location.path_opt() { && let Some(path) = tab.location.path_opt()
{
let mut contains_change = false; let mut contains_change = false;
for event in &events { for event in &events {
for event_path in &event.paths { for event_path in &event.paths {
@ -3330,7 +3321,6 @@ impl Application for App {
} }
} }
} }
}
let commands = needs_reload let commands = needs_reload
.into_iter() .into_iter()
@ -3351,22 +3341,23 @@ impl Application for App {
if let Some(terminal) = self.mime_app_cache.terminal() { if let Some(terminal) = self.mime_app_cache.terminal() {
let mut paths = Box::from([]); let mut paths = Box::from([]);
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity)
if let Some(path) = tab.location.path_opt() { && let Some(path) = tab.location.path_opt()
{
if let Some(items) = tab.items_opt() { if let Some(items) = tab.items_opt() {
paths = paths = items
items
.iter() .iter()
.filter_map(|item| { .filter_map(
|item| {
if item.selected { item.path_opt() } else { None } if item.selected { item.path_opt() } else { None }
}) },
)
.collect(); .collect();
} }
if paths.is_empty() { if paths.is_empty() {
paths = Box::from([path]); paths = Box::from([path]);
} }
} }
}
for path in paths { for path in paths {
if let Some(mut command) = terminal if let Some(mut command) = terminal
.command::<&str>(&[]) .command::<&str>(&[])
@ -3454,8 +3445,9 @@ impl Application for App {
}, },
Message::OpenWithDialog(entity_opt) => { Message::OpenWithDialog(entity_opt) => {
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
if let Some(tab) = self.tab_model.data::<Tab>(entity) { if let Some(tab) = self.tab_model.data::<Tab>(entity)
if let Some(items) = tab.items_opt() { && let Some(items) = tab.items_opt()
{
for item in items { for item in items {
if !item.selected { if !item.selected {
continue; continue;
@ -3480,7 +3472,6 @@ impl Application for App {
} }
} }
} }
}
Message::OpenWithSelection(index) => { Message::OpenWithSelection(index) => {
if let Some(DialogPage::OpenWith { selected, .. }) = self.dialog_pages.front_mut() { if let Some(DialogPage::OpenWith { selected, .. }) = self.dialog_pages.front_mut() {
*selected = index; *selected = index;
@ -3488,21 +3479,20 @@ impl Application for App {
} }
Message::Paste(entity_opt) => { Message::Paste(entity_opt) => {
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity)
if let Some(path) = tab.location.path_opt() { && let Some(path) = tab.location.path_opt()
{
let to = path.clone(); let to = path.clone();
return clipboard::read_data::<ClipboardPaste>().map(move |contents_opt| { return clipboard::read_data::<ClipboardPaste>().map(move |contents_opt| {
match contents_opt { match contents_opt {
Some(contents) => cosmic::action::app(Message::PasteContents( Some(contents) => {
to.clone(), cosmic::action::app(Message::PasteContents(to.clone(), contents))
contents, }
)),
None => cosmic::action::none(), None => cosmic::action::none(),
} }
}); });
} }
} }
}
Message::PasteContents(to, mut contents) => { Message::PasteContents(to, mut contents) => {
contents.paths.retain(|p| *p != to); contents.paths.retain(|p| *p != to);
if !contents.paths.is_empty() { if !contents.paths.is_empty() {
@ -3733,8 +3723,9 @@ impl Application for App {
} }
Message::Rename(entity_opt) => { Message::Rename(entity_opt) => {
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity)
if let Some(items) = tab.items_opt() { && let Some(items) = tab.items_opt()
{
let selected: Box<[_]> = items let selected: Box<[_]> = items
.iter() .iter()
.filter_map(|item| { .filter_map(|item| {
@ -3767,7 +3758,6 @@ impl Application for App {
} }
} }
} }
}
Message::ReplaceResult(replace_result) => { Message::ReplaceResult(replace_result) => {
if let Some((dialog_page, task)) = self.dialog_pages.pop_front() { if let Some((dialog_page, task)) = self.dialog_pages.pop_front() {
match dialog_page { match dialog_page {
@ -3787,8 +3777,9 @@ impl Application for App {
Message::RestoreFromTrash(entity_opt) => { Message::RestoreFromTrash(entity_opt) => {
let mut trash_items = Vec::new(); let mut trash_items = Vec::new();
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity)
if let Some(items) = tab.items_opt() { && let Some(items) = tab.items_opt()
{
for item in items { for item in items {
if item.selected { if item.selected {
if let ItemMetadata::Trash { entry, .. } = &item.metadata { if let ItemMetadata::Trash { entry, .. } = &item.metadata {
@ -3799,7 +3790,6 @@ impl Application for App {
} }
} }
} }
}
if !trash_items.is_empty() { if !trash_items.is_empty() {
return self.operation(Operation::Restore { items: trash_items }); return self.operation(Operation::Restore { items: trash_items });
} }
@ -3840,14 +3830,14 @@ impl Application for App {
// Close old context menu // Close old context menu
let active = self.tab_model.active(); let active = self.tab_model.active();
if let Some(tab) = self.tab_model.data_mut::<Tab>(active) { if let Some(tab) = self.tab_model.data_mut::<Tab>(active)
if tab.context_menu.is_some() { && tab.context_menu.is_some()
{
tasks.push(self.update(Message::TabMessage( tasks.push(self.update(Message::TabMessage(
Some(active), Some(active),
tab::Message::ContextMenu(None, None), tab::Message::ContextMenu(None, None),
))); )));
} }
}
// Activate new tab // Activate new tab
self.tab_model.activate(entity); self.tab_model.activate(entity);
@ -4042,12 +4032,12 @@ impl Application for App {
// Destroy previous popup // Destroy previous popup
let mut window_ids = Vec::new(); let mut window_ids = Vec::new();
for (window_id, window) in &self.windows { for (window_id, window) in &self.windows {
if let WindowKind::ContextMenu(e, _) = &window.kind { if let WindowKind::ContextMenu(e, _) = &window.kind
if *e == entity { && *e == entity
{
window_ids.push(*window_id); window_ids.push(*window_id);
} }
} }
}
for window_id in window_ids { for window_id in window_ids {
commands.push(self.update(Message::Surface( commands.push(self.update(Message::Surface(
cosmic::surface::action::destroy_popup(window_id), cosmic::surface::action::destroy_popup(window_id),
@ -4453,14 +4443,14 @@ impl Application for App {
} }
} }
Message::NavBarClose(entity) => { Message::NavBarClose(entity) => {
if let Some(data) = self.nav_model.data::<MounterData>(entity) { if let Some(data) = self.nav_model.data::<MounterData>(entity)
if let Some(mounter) = MOUNTERS.get(&data.0) { && let Some(mounter) = MOUNTERS.get(&data.0)
{
return mounter return mounter
.unmount(data.1.clone()) .unmount(data.1.clone())
.map(|()| cosmic::action::none()); .map(|()| cosmic::action::none());
} }
} }
}
Message::NavBarContext(entity) => { Message::NavBarContext(entity) => {
self.nav_bar_context_id = entity; self.nav_bar_context_id = entity;
@ -4755,8 +4745,8 @@ impl Application for App {
if let Some(p) = paths.next() { if let Some(p) = paths.next() {
{ {
for (k, mounter_items) in &self.mounter_items { for (k, mounter_items) in &self.mounter_items {
if let Some(mounter) = MOUNTERS.get(k) { if let Some(mounter) = MOUNTERS.get(k)
if let Some(item) = mounter_items && let Some(item) = mounter_items
.iter() .iter()
.find(|&item| item.path().is_some_and(|path| path == p)) .find(|&item| item.path().is_some_and(|path| path == p))
{ {
@ -4769,7 +4759,6 @@ impl Application for App {
} }
} }
} }
}
#[cfg(all(feature = "wayland", feature = "desktop-applet"))] #[cfg(all(feature = "wayland", feature = "desktop-applet"))]
Message::Focused(id) => { Message::Focused(id) => {
if let Some(w) = self.windows.get(&id) { if let Some(w) = self.windows.get(&id) {
@ -4786,8 +4775,8 @@ impl Application for App {
} }
Message::SaveSortNames => { Message::SaveSortNames => {
self.must_save_sort_names = false; self.must_save_sort_names = false;
if let Some(state_handler) = self.state_handler.as_ref() { if let Some(state_handler) = self.state_handler.as_ref()
if let Err(err) = state_handler && let Err(err) = state_handler
.set::<&FxOrderMap<String, (HeadingOptions, bool)>>( .set::<&FxOrderMap<String, (HeadingOptions, bool)>>(
"sort_names", "sort_names",
&self.state.sort_names, &self.state.sort_names,
@ -4796,7 +4785,6 @@ impl Application for App {
log::warn!("Failed to save sort names: {err:?}"); log::warn!("Failed to save sort names: {err:?}");
} }
} }
}
Message::NetworkDriveOpenEntityAfterMount { entity } => { Message::NetworkDriveOpenEntityAfterMount { entity } => {
return self.on_nav_select(entity); return self.on_nav_select(entity);
} }
@ -4890,14 +4878,14 @@ impl Application for App {
fn dialog(&self) -> Option<Element<'_, Message>> { fn dialog(&self) -> Option<Element<'_, Message>> {
//TODO: should gallery view just be a dialog? //TODO: should gallery view just be a dialog?
let entity = self.tab_model.active(); let entity = self.tab_model.active();
if let Some(tab) = self.tab_model.data::<Tab>(entity) { if let Some(tab) = self.tab_model.data::<Tab>(entity)
if tab.gallery { && tab.gallery
{
return Some( return Some(
tab.gallery_view() tab.gallery_view()
.map(move |x| Message::TabMessage(Some(entity), x)), .map(move |x| Message::TabMessage(Some(entity), x)),
); );
} }
}
let dialog_page = self.dialog_pages.front()?; let dialog_page = self.dialog_pages.front()?;
let cosmic_theme::Spacing { let cosmic_theme::Spacing {
@ -5778,8 +5766,9 @@ impl Application for App {
let mut tab_column = widget::column::with_capacity(4); let mut tab_column = widget::column::with_capacity(4);
if self.core.is_condensed() { if self.core.is_condensed()
if let Some(term) = self.search_get() { && let Some(term) = self.search_get()
{
tab_column = tab_column.push( tab_column = tab_column.push(
widget::container( widget::container(
widget::text_input::search_input("", term) widget::text_input::search_input("", term)
@ -5791,7 +5780,6 @@ impl Application for App {
.padding(space_xxs), .padding(space_xxs),
); );
} }
}
if self.tab_model.len() > 1 { if self.tab_model.len() > 1 {
tab_column = tab_column.push( tab_column = tab_column.push(
@ -6088,16 +6076,16 @@ impl Application for App {
let should_rescan = let should_rescan =
events.iter().any(|event| !event.kind.is_access()); events.iter().any(|event| !event.kind.is_access());
if should_rescan { if should_rescan
if let Err(e) = futures::executor::block_on(async { && let Err(e) = futures::executor::block_on(async {
output.send(Message::RescanTrash).await output.send(Message::RescanTrash).await
}) { })
{
log::warn!( log::warn!(
"trash needs to be rescanned but sending message failed: {e:?}" "trash needs to be rescanned but sending message failed: {e:?}"
); );
} }
} }
}
Err(e) => { Err(e) => {
log::warn!("failed to watch trash bin for changes: {e:?}"); log::warn!("failed to watch trash bin for changes: {e:?}");
} }
@ -6173,8 +6161,7 @@ impl Application for App {
|| kind.is_modify() || kind.is_modify()
|| kind.is_remove() || kind.is_remove()
|| kind.is_other() || kind.is_other()
}) { }) && let Err(e) = futures::executor::block_on(async {
if let Err(e) = futures::executor::block_on(async {
output.send(Message::RescanRecents).await output.send(Message::RescanRecents).await
}) { }) {
log::warn!( log::warn!(
@ -6182,7 +6169,6 @@ impl Application for App {
); );
} }
} }
}
Err(e) => { Err(e) => {
log::warn!("failed to watch recents file for changes: {e:?}") log::warn!("failed to watch recents file for changes: {e:?}")
} }
@ -6297,17 +6283,16 @@ impl Application for App {
let mut selected_previews = Vec::new(); let mut selected_previews = Vec::new();
match self.mode { match self.mode {
Mode::App => { Mode::App => {
if self.core.window.show_context { if self.core.window.show_context
if let ContextPage::Preview(entity_opt, PreviewKind::Selected) = && let ContextPage::Preview(entity_opt, PreviewKind::Selected) =
self.context_page self.context_page
{ {
selected_previews selected_previews
.push(Some(entity_opt.unwrap_or_else(|| self.tab_model.active()))); .push(Some(entity_opt.unwrap_or_else(|| self.tab_model.active())));
} }
} }
}
Mode::Desktop => { Mode::Desktop => {
for window_kind in self.windows.iter().map(|(_, window)| &window.kind) { for window_kind in self.windows.values().map(|window| &window.kind) {
if let WindowKind::Preview(entity_opt, _) = window_kind { if let WindowKind::Preview(entity_opt, _) = window_kind {
selected_previews selected_previews
.push(Some(entity_opt.unwrap_or_else(|| self.tab_model.active()))); .push(Some(entity_opt.unwrap_or_else(|| self.tab_model.active())));
@ -6322,8 +6307,7 @@ impl Application for App {
tab.subscription( tab.subscription(
selected_previews selected_previews
.iter() .iter()
.find(|preview| preview.as_ref() == Some(entity).as_ref()) .any(|preview| preview.as_ref() == Some(entity).as_ref()),
.is_some(),
) )
.with(entity) .with(entity)
.map(|(entity, tab_msg)| Message::TabMessage(Some(entity), tab_msg)), .map(|(entity, tab_msg)| Message::TabMessage(Some(entity), tab_msg)),

1
src/archive.rs
View file

@ -2,6 +2,7 @@ use crate::{
mime_icon::mime_for_path, mime_icon::mime_for_path,
operation::{Controller, OpReader, OperationError, OperationErrorType, sync_to_disk}, operation::{Controller, OpReader, OperationError, OperationErrorType, sync_to_disk},
}; };
use cosmic::iced::futures;
use std::{ use std::{
collections::HashSet, collections::HashSet,
fs, fs,

106
src/dialog.rs
View file

@ -179,12 +179,12 @@ impl<T: AsRef<str>> From<T> for DialogLabel {
}); });
} }
if let Some(span) = spans.last_mut() { if let Some(span) = spans.last_mut()
if underline == span.underline { && underline == span.underline
{
span.text.push(c); span.text.push(c);
continue; continue;
} }
}
spans.push(DialogLabelSpan { spans.push(DialogLabelSpan {
text: String::from(c), text: String::from(c),
@ -718,14 +718,14 @@ impl App {
children.push(preview); children.push(preview);
} }
if children.is_empty() { if children.is_empty()
if let Some(item) = &self.tab.parent_item_opt { && let Some(item) = &self.tab.parent_item_opt
{
children.push(item.preview_view(None, military_time)); children.push(item.preview_view(None, military_time));
} }
} }
} }
} }
}
widget::column::with_children(children).into() widget::column::with_children(children).into()
} }
@ -1279,13 +1279,13 @@ impl Application for App {
return self.update(message); return self.update(message);
} }
if let Some(data) = self.nav_model.data::<MounterData>(entity) { if let Some(data) = self.nav_model.data::<MounterData>(entity)
if let Some(mounter) = MOUNTERS.get(&data.0) { && let Some(mounter) = MOUNTERS.get(&data.0)
{
return mounter return mounter
.mount(data.1.clone()) .mount(data.1.clone())
.map(|()| cosmic::action::none()); .map(|()| cosmic::action::none());
} }
}
Task::none() Task::none()
} }
@ -1322,11 +1322,11 @@ impl Application for App {
// Close the dialog if the focused widget is the dialog's main text input instead of // Close the dialog if the focused widget is the dialog's main text input instead of
// unfocussing the widget. // unfocussing the widget.
if let operation::Outcome::Some(focused) = operation::focusable::find_focused().finish() { if let operation::Outcome::Some(focused) = operation::focusable::find_focused().finish()
if self.dialog_text_input == focused { && self.dialog_text_input == focused
{
return self.update(Message::Cancel); return self.update(Message::Cancel);
} }
}
self.update(Message::Cancel) self.update(Message::Cancel)
} }
@ -1419,23 +1419,23 @@ impl Application for App {
} }
// Check key binds from accept label // Check key binds from accept label
if let Some(key_bind) = &self.accept_label.key_bind_opt { if let Some(key_bind) = &self.accept_label.key_bind_opt
if key_bind.matches(modifiers, &key) { && key_bind.matches(modifiers, &key)
{
return self.update(if self.flags.kind.save() { return self.update(if self.flags.kind.save() {
Message::Save(false) Message::Save(false)
} else { } else {
Message::Open Message::Open
}); });
} }
}
// Uncaptured keys with only shift modifiers go to the search or location box // Uncaptured keys with only shift modifiers go to the search or location box
if !modifiers.logo() if !modifiers.logo()
&& !modifiers.control() && !modifiers.control()
&& !modifiers.alt() && !modifiers.alt()
&& matches!(key, Key::Character(_)) && matches!(key, Key::Character(_))
&& let Some(text) = text
{ {
if let Some(text) = text {
match self.flags.config.type_to_search { match self.flags.config.type_to_search {
TypeToSearch::Recursive => { TypeToSearch::Recursive => {
let mut term = self.search_get().unwrap_or_default().to_string(); let mut term = self.search_get().unwrap_or_default().to_string();
@ -1456,11 +1456,11 @@ impl Application for App {
} }
TypeToSearch::SelectByPrefix => { TypeToSearch::SelectByPrefix => {
// Reset buffer if timeout elapsed // Reset buffer if timeout elapsed
if let Some(last_key) = self.type_select_last_key { if let Some(last_key) = self.type_select_last_key
if last_key.elapsed() >= tab::TYPE_SELECT_TIMEOUT { && last_key.elapsed() >= tab::TYPE_SELECT_TIMEOUT
{
self.type_select_prefix.clear(); self.type_select_prefix.clear();
} }
}
// Accumulate character and select // Accumulate character and select
self.type_select_prefix.push_str(&text.to_lowercase()); self.type_select_prefix.push_str(&text.to_lowercase());
@ -1477,7 +1477,6 @@ impl Application for App {
} }
} }
} }
}
Message::ModifiersChanged(modifiers) => { Message::ModifiersChanged(modifiers) => {
self.modifiers = modifiers; self.modifiers = modifiers;
} }
@ -1486,24 +1485,25 @@ impl Application for App {
let mut unmounted = Vec::new(); let mut unmounted = Vec::new();
if let Some(old_items) = self.mounter_items.get(&mounter_key) { if let Some(old_items) = self.mounter_items.get(&mounter_key) {
for old_item in old_items { for old_item in old_items {
if let Some(old_path) = old_item.path() { if let Some(old_path) = old_item.path()
if old_item.is_mounted() { && old_item.is_mounted()
{
let mut still_mounted = false; let mut still_mounted = false;
for item in &mounter_items { for item in &mounter_items {
if let Some(path) = item.path() { if let Some(path) = item.path()
if path == old_path && item.is_mounted() { && path == old_path
&& item.is_mounted()
{
still_mounted = true; still_mounted = true;
break; break;
} }
} }
}
if !still_mounted { if !still_mounted {
unmounted.push(Location::Path(old_path)); unmounted.push(Location::Path(old_path));
} }
} }
} }
} }
}
// Go back to home in any tabs that were unmounted // Go back to home in any tabs that were unmounted
let mut commands = Vec::new(); let mut commands = Vec::new();
@ -1601,8 +1601,9 @@ impl Application for App {
let mut paths = Vec::new(); let mut paths = Vec::new();
if let Some(items) = self.tab.items_opt() { if let Some(items) = self.tab.items_opt() {
for item in items { for item in items {
if item.selected { if item.selected
if let Some(path) = item.path_opt() { && let Some(path) = item.path_opt()
{
paths.push(path.clone()); paths.push(path.clone());
let _ = update_recently_used( let _ = update_recently_used(
path, path,
@ -1613,7 +1614,6 @@ impl Application for App {
} }
} }
} }
}
// Ensure selection is allowed // Ensure selection is allowed
//TODO: improve tab logic so this doesn't block the open button so often //TODO: improve tab logic so this doesn't block the open button so often
@ -1640,13 +1640,13 @@ impl Application for App {
} }
// If we are in directory mode, return the current directory // If we are in directory mode, return the current directory
if self.flags.kind.is_dir() { if self.flags.kind.is_dir()
if let Location::Path(tab_path) = &self.tab.location { && let Location::Path(tab_path) = &self.tab.location
{
self.result_opt = Some(DialogResult::Open(vec![tab_path.clone()])); self.result_opt = Some(DialogResult::Open(vec![tab_path.clone()]));
return window::close(self.flags.window_id); return window::close(self.flags.window_id);
} }
} }
}
Message::Preview => { Message::Preview => {
self.context_page = ContextPage::Preview(None, PreviewKind::Selected); self.context_page = ContextPage::Preview(None, PreviewKind::Selected);
return self.with_dialog_config(|config| { return self.with_dialog_config(|config| {
@ -1654,15 +1654,15 @@ impl Application for App {
}); });
} }
Message::Save(replace) => { Message::Save(replace) => {
if let DialogKind::SaveFile { filename } = &self.flags.kind { if let DialogKind::SaveFile { filename } = &self.flags.kind
if !filename.is_empty() { && !filename.is_empty()
if let Some(tab_path) = self.tab.location.path_opt() { && let Some(tab_path) = self.tab.location.path_opt()
{
let path = tab_path.join(filename); let path = tab_path.join(filename);
if path.is_dir() { if path.is_dir() {
// cd to directory // cd to directory
let message = Message::TabMessage(tab::Message::Location( let message =
Location::Path(path), Message::TabMessage(tab::Message::Location(Location::Path(path)));
));
return self.update(message); return self.update(message);
} else if !replace && path.exists() { } else if !replace && path.exists() {
self.dialog_pages.push_back(DialogPage::Replace { self.dialog_pages.push_back(DialogPage::Replace {
@ -1674,8 +1674,6 @@ impl Application for App {
return window::close(self.flags.window_id); return window::close(self.flags.window_id);
} }
} }
}
}
Message::ScrollTab(scroll_speed) => { Message::ScrollTab(scroll_speed) => {
return self.update(Message::TabMessage(tab::Message::ScrollTab( return self.update(Message::TabMessage(tab::Message::ScrollTab(
f32::from(scroll_speed) / 10.0, f32::from(scroll_speed) / 10.0,
@ -1703,17 +1701,15 @@ impl Application for App {
let tab_commands = self.tab.update(tab_message, self.modifiers); let tab_commands = self.tab.update(tab_message, self.modifiers);
// Update filename box when anything is selected // Update filename box when anything is selected
if let DialogKind::SaveFile { filename } = &mut self.flags.kind { if let DialogKind::SaveFile { filename } = &mut self.flags.kind
if let Some(click_i) = click_i_opt { && let Some(click_i) = click_i_opt
if let Some(items) = self.tab.items_opt() { && let Some(items) = self.tab.items_opt()
if let Some(item) = items.get(click_i) { && let Some(item) = items.get(click_i)
if item.selected && !item.metadata.is_dir() { && item.selected
&& !item.metadata.is_dir()
{
filename.clone_from(&item.name); filename.clone_from(&item.name);
} }
}
}
}
}
let mut commands = Vec::new(); let mut commands = Vec::new();
for tab_command in tab_commands { for tab_command in tab_commands {
@ -1840,8 +1836,9 @@ impl Application for App {
Message::TabRescan(location, parent_item_opt, mut items, selection_paths) => { Message::TabRescan(location, parent_item_opt, mut items, selection_paths) => {
if location == self.tab.location { if location == self.tab.location {
// Filter // Filter
if let Some(filter_i) = self.filter_selected { if let Some(filter_i) = self.filter_selected
if let Some(filter) = self.filters.get(filter_i) { && let Some(filter) = self.filters.get(filter_i)
{
// Parse globs (Mime implements PartialEq with &str, so no need to parse) // Parse globs (Mime implements PartialEq with &str, so no need to parse)
let mut parsed_globs = Vec::new(); let mut parsed_globs = Vec::new();
let mut mimes = Vec::new(); let mut mimes = Vec::new();
@ -1868,7 +1865,6 @@ impl Application for App {
|| parsed_globs.iter().any(|glob| glob.matches(&item.name)) || parsed_globs.iter().any(|glob| glob.matches(&item.name))
}); });
} }
}
// Select based on filename // Select based on filename
if let DialogKind::SaveFile { filename } = &self.flags.kind { if let DialogKind::SaveFile { filename } = &self.flags.kind {
@ -1944,8 +1940,9 @@ impl Application for App {
let mut col = widget::column::with_capacity(2); let mut col = widget::column::with_capacity(2);
if self.core.is_condensed() { if self.core.is_condensed()
if let Some(term) = self.search_get() { && let Some(term) = self.search_get()
{
col = col.push( col = col.push(
widget::container( widget::container(
widget::text_input::search_input("", term) widget::text_input::search_input("", term)
@ -1957,7 +1954,6 @@ impl Application for App {
.padding(space_xxs), .padding(space_xxs),
); );
} }
}
col = col.push( col = col.push(
self.tab self.tab

12
src/large_image.rs
View file

@ -392,8 +392,9 @@ impl LargeImageManager {
generation: u64, generation: u64,
) -> bool { ) -> bool {
// Check if this decode is still current (not superseded by a newer one) // Check if this decode is still current (not superseded by a newer one)
if let Some(&current_gen) = self.decode_generations.get(&path) { if let Some(&current_gen) = self.decode_generations.get(&path)
if generation != current_gen { && generation != current_gen
{
log::info!( log::info!(
"Discarding outdated decode for {} (generation {} != current {})", "Discarding outdated decode for {} (generation {} != current {})",
path.display(), path.display(),
@ -402,7 +403,6 @@ impl LargeImageManager {
); );
return false; return false;
} }
}
log::info!( log::info!(
"Storing decoded image for {} (generation {})", "Storing decoded image for {} (generation {})",
@ -556,7 +556,7 @@ impl LargeImageManager {
/// Check if sufficient memory is available, clearing cache if needed. /// Check if sufficient memory is available, clearing cache if needed.
/// Returns true if memory is available, false otherwise. /// Returns true if memory is available, false otherwise.
fn ensure_memory_available(&mut self, path: &PathBuf, width: u32, height: u32) -> bool { fn ensure_memory_available(&mut self, path: &Path, width: u32, height: u32) -> bool {
let (has_memory, error_opt) = check_memory_available(width, height); let (has_memory, error_opt) = check_memory_available(width, height);
if has_memory { if has_memory {
@ -565,7 +565,7 @@ impl LargeImageManager {
if self.cache_is_empty() { if self.cache_is_empty() {
if let Some(error_msg) = error_opt { if let Some(error_msg) = error_opt {
self.store_error(path.clone(), error_msg); self.store_error(path.to_path_buf(), error_msg);
log::warn!( log::warn!(
"Cannot load {}: insufficient memory and cache is empty", "Cannot load {}: insufficient memory and cache is empty",
path.display() path.display()
@ -588,7 +588,7 @@ impl LargeImageManager {
} }
if let Some(error_msg) = error_opt_after { if let Some(error_msg) = error_opt_after {
self.store_error(path.clone(), error_msg); self.store_error(path.to_path_buf(), error_msg);
log::warn!( log::warn!(
"Cannot load {}: insufficient memory even after cache clear", "Cannot load {}: insufficient memory even after cache clear",
path.display() path.display()

6
src/localize.rs
View file

@ -62,13 +62,13 @@ pub static LOCALE: LazyLock<Locale> = LazyLock::new(|| {
} }
// Try language-only fallback (e.g., "en" from "en-US") // Try language-only fallback (e.g., "en" from "en-US")
if let Some(lang) = cleaned_locale.split('-').next() { if let Some(lang) = cleaned_locale.split('-').next()
if let Ok(locale) = Locale::try_from_str(lang) { && let Ok(locale) = Locale::try_from_str(lang)
{
return locale; return locale;
} }
} }
} }
}
log::warn!("No valid locale found in environment, using fallback"); log::warn!("No valid locale found in environment, using fallback");
Locale::try_from_str("en-US").expect("Failed to parse fallback locale 'en-US'") Locale::try_from_str("en-US").expect("Failed to parse fallback locale 'en-US'")
}); });

4
src/mime_app.rs
View file

@ -310,7 +310,7 @@ impl MimeAppCache {
for (mime, filenames) in list.removed_associations.iter() { for (mime, filenames) in list.removed_associations.iter() {
for filename in filenames { for filename in filenames {
log::trace!("remove {mime}={filename}"); log::trace!("remove {mime}={filename}");
if let Some(apps) = self.cache.get_mut(&mime) { if let Some(apps) = self.cache.get_mut(mime) {
apps.retain(|x| !filename_eq(&x.path, filename)); apps.retain(|x| !filename_eq(&x.path, filename));
} }
} }
@ -319,7 +319,7 @@ impl MimeAppCache {
for (mime, filenames) in list.default_apps.iter() { for (mime, filenames) in list.default_apps.iter() {
for filename in filenames { for filename in filenames {
log::trace!("default {mime}={filename}"); log::trace!("default {mime}={filename}");
if let Some(apps) = self.cache.get_mut(&mime) { if let Some(apps) = self.cache.get_mut(mime) {
let mut found = false; let mut found = false;
for app in apps.iter_mut() { for app in apps.iter_mut() {
if filename_eq(&app.path, filename) { if filename_eq(&app.path, filename) {

20
src/mounter/gvfs.rs
View file

@ -23,13 +23,12 @@ fn resolve_uri(uri: &str) -> (String, gio::File) {
TARGET_URI_ATTRIBUTE, TARGET_URI_ATTRIBUTE,
gio::FileQueryInfoFlags::NONE, gio::FileQueryInfoFlags::NONE,
gio::Cancellable::NONE, gio::Cancellable::NONE,
) { ) && let Some(resolved_uri) = file_info.attribute_as_string(TARGET_URI_ATTRIBUTE)
if let Some(resolved_uri) = file_info.attribute_as_string(TARGET_URI_ATTRIBUTE) { {
let resolved_uri = String::from(resolved_uri); let resolved_uri = String::from(resolved_uri);
let file = gio::File::for_uri(&resolved_uri); let file = gio::File::for_uri(&resolved_uri);
return (resolved_uri, file); return (resolved_uri, file);
} }
}
(uri.to_string(), file) (uri.to_string(), file)
} }
@ -60,7 +59,7 @@ fn items(monitor: &gio::VolumeMonitor, sizes: IconSizes) -> MounterItems {
gio::Cancellable::NONE, gio::Cancellable::NONE,
) )
.ok() .ok()
.and_then(|info| Some(info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE))) .map(|info| info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE))
.unwrap_or(true); // Default to remote if query fails .unwrap_or(true); // Default to remote if query fails
MounterItem::Gvfs(Item { MounterItem::Gvfs(Item {
@ -457,9 +456,9 @@ impl Gvfs {
log::info!("mount {name}: result {res:?}"); log::info!("mount {name}: result {res:?}");
// Update the mounter_item with mount information after successful mount // Update the mounter_item with mount information after successful mount
let mut updated_item = mounter_item.clone(); let mut updated_item = mounter_item.clone();
if res.is_ok() { if res.is_ok()
if let MounterItem::Gvfs(ref mut item) = updated_item { && let MounterItem::Gvfs(ref mut item) = updated_item
if let Some(mount) = volume_for_callback.get_mount() { && let Some(mount) = volume_for_callback.get_mount() {
let root = MountExt::root(&mount); let root = MountExt::root(&mount);
item.path_opt = root.path(); item.path_opt = root.path();
item.is_mounted = true; item.is_mounted = true;
@ -469,14 +468,9 @@ impl Gvfs {
gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE, gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE,
gio::Cancellable::NONE, gio::Cancellable::NONE,
) )
.ok() .ok().map(|info| info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE))
.and_then(|info| {
Some(info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE))
})
.unwrap_or(true); .unwrap_or(true);
} }
}
}
event_tx.send(Event::MountResult(updated_item, match res { event_tx.send(Event::MountResult(updated_item, match res {
Ok(()) => { Ok(()) => {
_ = complete_tx.send(Ok(())); _ = complete_tx.send(Ok(()));

90
src/mouse_area.rs
View file

@ -246,9 +246,10 @@ struct State {
impl State { impl State {
fn drag_rect(&self, cursor: mouse::Cursor) -> Option<Rectangle> { fn drag_rect(&self, cursor: mouse::Cursor) -> Option<Rectangle> {
if let Some(drag_source) = self.drag_initiated { if let Some(drag_source) = self.drag_initiated
if let Some(position) = cursor.position().or(self.last_virtual_position) { && let Some(position) = cursor.position().or(self.last_virtual_position)
if position.distance(drag_source) > 1.0 { && position.distance(drag_source) > 1.0
{
let min_x = drag_source.x.min(position.x); let min_x = drag_source.x.min(position.x);
let max_x = drag_source.x.max(position.x); let max_x = drag_source.x.max(position.x);
let min_y = drag_source.y.min(position.y); let min_y = drag_source.y.min(position.y);
@ -258,8 +259,6 @@ impl State {
Size::new(max_x - min_x, max_y - min_y), Size::new(max_x - min_x, max_y - min_y),
)); ));
} }
}
}
None None
} }
@ -527,13 +526,13 @@ fn update<Message: Clone>(
let offset = layout.virtual_offset(); let offset = layout.virtual_offset();
let layout_bounds = layout.bounds(); let layout_bounds = layout.bounds();
let viewport_changed = state.viewport.map_or(true, |v| v != *viewport); let viewport_changed = state.viewport != Some(*viewport);
if let Some(message) = widget.on_resize.as_ref() { if let Some(message) = widget.on_resize.as_ref()
if viewport_changed { && viewport_changed
{
shell.publish(message(*viewport)); shell.publish(message(*viewport));
} }
}
state.viewport = Some(*viewport); state.viewport = Some(*viewport);
@ -664,11 +663,12 @@ fn update<Message: Clone>(
} }
} }
if let Some(message) = widget.on_right_press.as_ref() { if let Some(message) = widget.on_right_press.as_ref()
if matches!( && matches!(
event, event,
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Right)) Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Right))
) { )
{
let point_opt = if widget.on_right_press_window_position { let point_opt = if widget.on_right_press_window_position {
cursor.position_over(layout_bounds).map(|mut p| { cursor.position_over(layout_bounds).map(|mut p| {
p.x -= offset.x; p.x -= offset.x;
@ -685,93 +685,91 @@ fn update<Message: Clone>(
} }
return event::Status::Captured; return event::Status::Captured;
} }
}
if let Some(message) = widget.on_right_release.as_ref() { if let Some(message) = widget.on_right_release.as_ref()
if matches!( && matches!(
event, event,
Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Right)) Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Right))
) { )
{
shell.publish(message(cursor.position_in(layout_bounds))); shell.publish(message(cursor.position_in(layout_bounds)));
return event::Status::Captured; return event::Status::Captured;
} }
}
if let Some(message) = widget.on_middle_press.as_ref() { if let Some(message) = widget.on_middle_press.as_ref()
if matches!( && matches!(
event, event,
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Middle)) Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Middle))
) { )
{
shell.publish(message(cursor.position_in(layout_bounds))); shell.publish(message(cursor.position_in(layout_bounds)));
return event::Status::Captured; return event::Status::Captured;
} }
}
if let Some(message) = widget.on_middle_release.as_ref() { if let Some(message) = widget.on_middle_release.as_ref()
if matches!( && matches!(
event, event,
Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Middle)) Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Middle))
) { )
{
shell.publish(message(cursor.position_in(layout_bounds))); shell.publish(message(cursor.position_in(layout_bounds)));
return event::Status::Captured; return event::Status::Captured;
} }
}
if let Some(message) = widget.on_back_press.as_ref() { if let Some(message) = widget.on_back_press.as_ref()
if matches!( && matches!(
event, event,
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Back)) Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Back))
) { )
{
shell.publish(message(cursor.position_in(layout_bounds))); shell.publish(message(cursor.position_in(layout_bounds)));
return event::Status::Captured; return event::Status::Captured;
} }
}
if let Some(message) = widget.on_back_release.as_ref() { if let Some(message) = widget.on_back_release.as_ref()
if matches!( && matches!(
event, event,
Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Back)) Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Back))
) { )
{
shell.publish(message(cursor.position_in(layout_bounds))); shell.publish(message(cursor.position_in(layout_bounds)));
return event::Status::Captured; return event::Status::Captured;
} }
}
if let Some(message) = widget.on_forward_press.as_ref() { if let Some(message) = widget.on_forward_press.as_ref()
if matches!( && matches!(
event, event,
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Forward)) Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Forward))
) { )
{
shell.publish(message(cursor.position_in(layout_bounds))); shell.publish(message(cursor.position_in(layout_bounds)));
return event::Status::Captured; return event::Status::Captured;
} }
}
if let Some(message) = widget.on_forward_release.as_ref() { if let Some(message) = widget.on_forward_release.as_ref()
if matches!( && matches!(
event, event,
Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Forward)) Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Forward))
) { )
{
shell.publish(message(cursor.position_in(layout_bounds))); shell.publish(message(cursor.position_in(layout_bounds)));
return event::Status::Captured; return event::Status::Captured;
} }
}
if let Some(on_scroll) = widget.on_scroll.as_ref() { if let Some(on_scroll) = widget.on_scroll.as_ref()
if let Event::Mouse(mouse::Event::WheelScrolled { delta }) = event { && let Event::Mouse(mouse::Event::WheelScrolled { delta }) = event
if let Some(message) = on_scroll(*delta) { && let Some(message) = on_scroll(*delta)
{
shell.publish(message); shell.publish(message);
return event::Status::Captured; return event::Status::Captured;
} }
}
}
if let Some((message, drag_rect)) = widget.on_drag.as_ref().zip(state.drag_rect(cursor)) { if let Some((message, drag_rect)) = widget.on_drag.as_ref().zip(state.drag_rect(cursor)) {
shell.publish(message(drag_rect.intersection(&layout_bounds).map( shell.publish(message(drag_rect.intersection(&layout_bounds).map(

30
src/operation/mod.rs
View file

@ -5,7 +5,7 @@ use crate::{
spawn_detached::spawn_detached, spawn_detached::spawn_detached,
tab, tab,
}; };
use cosmic::iced::futures::{SinkExt, channel::mpsc::Sender}; use cosmic::iced::futures::{self, SinkExt, StreamExt, channel::mpsc::Sender, stream};
use std::{ use std::{
borrow::Cow, borrow::Cow,
fmt::Formatter, fmt::Formatter,
@ -200,23 +200,25 @@ pub async fn sync_to_disk(
written_files: Vec<PathBuf>, written_files: Vec<PathBuf>,
target_dirs: std::collections::HashSet<PathBuf>, target_dirs: std::collections::HashSet<PathBuf>,
) { ) {
use futures::{StreamExt, stream};
// Sync files to disk // Sync files to disk
let file_stream = stream::iter(written_files.into_iter().map(|path| async move { stream::iter(written_files.into_iter().map(|path| async move {
if let Ok(file) = compio::fs::OpenOptions::new().write(true).open(&path).await { if let Ok(file) = compio::fs::OpenOptions::new().write(true).open(&path).await {
let _ = file.sync_all().await; let _ = file.sync_all().await;
} }
})); }))
file_stream.buffer_unordered(32).collect::<Vec<_>>().await; .buffer_unordered(32)
.collect::<Vec<_>>()
.await;
// Sync directories to disk // Sync directories to disk
let dir_stream = stream::iter(target_dirs.into_iter().map(|path| async move { stream::iter(target_dirs.into_iter().map(|path| async move {
if let Ok(dir) = compio::fs::OpenOptions::new().read(true).open(&path).await { if let Ok(dir) = compio::fs::OpenOptions::new().read(true).open(&path).await {
let _ = dir.sync_all().await; let _ = dir.sync_all().await;
} }
})); }))
dir_stream.buffer_unordered(16).collect::<Vec<_>>().await; .buffer_unordered(16)
.collect::<Vec<_>>()
.await;
} }
fn copy_unique_path(from: &Path, to: &Path) -> PathBuf { fn copy_unique_path(from: &Path, to: &Path) -> PathBuf {
@ -957,11 +959,11 @@ impl Operation {
let dir_name = get_directory_name(file_name); let dir_name = get_directory_name(file_name);
let mut new_dir = to.join(dir_name); let mut new_dir = to.join(dir_name);
if new_dir.exists() { if new_dir.exists()
if let Some(new_dir_parent) = new_dir.parent() { && let Some(new_dir_parent) = new_dir.parent()
{
new_dir = copy_unique_path(&new_dir, new_dir_parent); new_dir = copy_unique_path(&new_dir, new_dir_parent);
} }
}
op_sel.ignored.push(path.clone()); op_sel.ignored.push(path.clone());
op_sel.selected.push(new_dir.clone()); op_sel.selected.push(new_dir.clone());
@ -1208,7 +1210,7 @@ mod tests {
path::PathBuf, path::PathBuf,
}; };
use cosmic::iced::futures::{StreamExt, channel::mpsc}; use cosmic::iced::futures::{StreamExt, channel::mpsc, future};
use log::debug; use log::debug;
use test_log::test; use test_log::test;
use tokio::sync; use tokio::sync;
@ -1262,7 +1264,7 @@ mod tests {
} }
}; };
futures::future::join(handle_messages, handle_copy).await.1 future::join(handle_messages, handle_copy).await.1
} }
#[test(compio::test)] #[test(compio::test)]

2
src/operation/reader.rs
View file

@ -27,7 +27,7 @@ impl OpReader {
impl io::Read for OpReader { impl io::Read for OpReader {
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
futures::executor::block_on(async { cosmic::iced::futures::executor::block_on(async {
self.controller self.controller
.check() .check()
.await .await

8
src/operation/recursive.rs
View file

@ -138,11 +138,11 @@ impl Context {
}), }),
is_cleanup: false, is_cleanup: false,
}; };
if matches!(method, Method::Move { .. }) { if matches!(method, Method::Move { .. })
if let Some(cleanup_op) = op.move_cleanup_op() { && let Some(cleanup_op) = op.move_cleanup_op()
{
cleanup_ops.push(cleanup_op); cleanup_ops.push(cleanup_op);
} }
}
if let Some(parent) = op.to.parent() { if let Some(parent) = op.to.parent() {
target_dirs.insert(parent.to_path_buf()); target_dirs.insert(parent.to_path_buf());
} }
@ -322,7 +322,7 @@ impl Op {
} }
} }
let (from_file, metadata, mut to_file) = futures::try_join!( let (from_file, metadata, mut to_file) = cosmic::iced::futures::try_join!(
async { async {
compio::fs::OpenOptions::new() compio::fs::OpenOptions::new()
.read(true) .read(true)

245
src/tab.rs
View file

@ -1,5 +1,8 @@
use chrono::{Datelike, Timelike, Utc};
use cosmic::{ use cosmic::{
Apply, Element, cosmic_theme, font, Apply, Element, cosmic_theme,
desktop::fde::{DesktopEntry, get_languages_from_env},
font,
iced::{ iced::{
Alignment, Alignment,
Border, Border,
@ -37,8 +40,6 @@ use cosmic::{
menu::{action::MenuAction, key_bind::KeyBind}, menu::{action::MenuAction, key_bind::KeyBind},
}, },
}; };
use chrono::{Datelike, Timelike, Utc};
use i18n_embed::LanguageLoader; use i18n_embed::LanguageLoader;
use icu::{ use icu::{
datetime::{ datetime::{
@ -615,7 +616,8 @@ pub fn fs_kind(_metadata: &Metadata) -> FsKind {
} }
fn get_desktop_file_display_name(path: &Path) -> Option<String> { fn get_desktop_file_display_name(path: &Path) -> Option<String> {
let entry = match freedesktop_entry_parser::parse_entry(path) { let locales = get_languages_from_env();
let entry = match DesktopEntry::from_path(path, Some(&locales)) {
Ok(ok) => ok, Ok(ok) => ok,
Err(err) => { Err(err) => {
log::warn!("failed to parse {}: {}", path.display(), err); log::warn!("failed to parse {}: {}", path.display(), err);
@ -623,14 +625,11 @@ fn get_desktop_file_display_name(path: &Path) -> Option<String> {
} }
}; };
entry entry.name(&locales).map(|s| s.into_owned())
.section("Desktop Entry")
.attr("Name")
.map(str::to_string)
} }
fn get_desktop_file_icon(path: &Path) -> Option<String> { fn get_desktop_file_icon(path: &Path) -> Option<String> {
let entry = match freedesktop_entry_parser::parse_entry(path) { let entry = match DesktopEntry::from_path::<&str>(path, None) {
Ok(ok) => ok, Ok(ok) => ok,
Err(err) => { Err(err) => {
log::warn!("failed to parse {}: {}", path.display(), err); log::warn!("failed to parse {}: {}", path.display(), err);
@ -638,10 +637,7 @@ fn get_desktop_file_icon(path: &Path) -> Option<String> {
} }
}; };
entry entry.icon().map(str::to_string)
.section("Desktop Entry")
.attr("Icon")
.map(str::to_string)
} }
/// Creates an icon handle from a desktop file's Icon field value. /// Creates an icon handle from a desktop file's Icon field value.
@ -656,17 +652,17 @@ fn desktop_icon_handle(icon: &str, size: u16) -> widget::icon::Handle {
} }
pub fn parse_desktop_file(path: &Path) -> (Option<String>, Option<String>) { pub fn parse_desktop_file(path: &Path) -> (Option<String>, Option<String>) {
let entry = match freedesktop_entry_parser::parse_entry(path) { let locales = get_languages_from_env();
let entry = match DesktopEntry::from_path(path, Some(&locales)) {
Ok(ok) => ok, Ok(ok) => ok,
Err(err) => { Err(err) => {
log::warn!("failed to parse {}: {}", path.display(), err); log::warn!("failed to parse {}: {}", path.display(), err);
return (None, None); return (None, None);
} }
}; };
let section = entry.section("Desktop Entry");
( (
section.attr("Name").map(str::to_string), entry.name(&locales).map(|s| s.into_owned()),
section.attr("Icon").map(str::to_string), entry.icon().map(str::to_string),
) )
} }
@ -934,8 +930,9 @@ pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec<Item> {
#[cfg(feature = "gvfs")] #[cfg(feature = "gvfs")]
{ {
if let Ok(path_meta) = fs::metadata(tab_path) { if let Ok(path_meta) = fs::metadata(tab_path)
if fs_kind(&path_meta) == FsKind::Gvfs { && fs_kind(&path_meta) == FsKind::Gvfs
{
let file = gio::File::for_path(tab_path); let file = gio::File::for_path(tab_path);
// gio crate expects a comma delimited string // gio crate expects a comma delimited string
@ -974,7 +971,6 @@ pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec<Item> {
} }
} }
} }
}
if !remote_scannable { if !remote_scannable {
match fs::read_dir(tab_path) { match fs::read_dir(tab_path) {
@ -1410,13 +1406,13 @@ impl EditLocation {
self.selected = Some(selected); self.selected = Some(selected);
// Automatically resolve if there is only one completion // Automatically resolve if there is only one completion
if completions.len() == 1 { if completions.len() == 1
if let Some(resolved) = self.resolve() { && let Some(resolved) = self.resolve()
{
self.location = resolved; self.location = resolved;
self.selected = None; self.selected = None;
} }
} }
}
} else { } else {
self.selected = None; self.selected = None;
} }
@ -2033,11 +2029,11 @@ impl ItemThumbnail {
if let Some((item_thumbnail, temp_file)) = if let Some((item_thumbnail, temp_file)) =
Self::generate_thumbnail_external(path, &mime, thumbnail_size, thumbnail_dir) Self::generate_thumbnail_external(path, &mime, thumbnail_size, thumbnail_dir)
{ {
if let Ok(cache) = thumbnail_cacher { if let Ok(cache) = thumbnail_cacher
if let Err(err) = cache.update_with_temp_file(temp_file) { && let Err(err) = cache.update_with_temp_file(temp_file)
{
log::warn!("failed to update cache for {}: {}", path.display(), err); log::warn!("failed to update cache for {}: {}", path.display(), err);
} }
}
return item_thumbnail; return item_thumbnail;
} }
@ -2076,17 +2072,16 @@ impl ItemThumbnail {
// If we weren't able to create a thumbnail, but we should have // If we weren't able to create a thumbnail, but we should have
// been able to, create a fail marker so that it isn't tried the // been able to, create a fail marker so that it isn't tried the
// next time. // next time.
if let Ok(cacher) = thumbnail_cacher { if let Ok(cacher) = thumbnail_cacher
if tried_supported_file { && tried_supported_file
if let Err(err) = cacher.create_fail_marker() { && let Err(err) = cacher.create_fail_marker()
{
log::warn!( log::warn!(
"failed to create thumbnail fail marker for {}: {}", "failed to create thumbnail fail marker for {}: {}",
path.display(), path.display(),
err err
); );
} }
}
}
Self::NotImage Self::NotImage
} }
@ -2273,14 +2268,14 @@ impl Item {
widget::button::icon(widget::icon::from_name("go-next-symbolic")) widget::button::icon(widget::icon::from_name("go-next-symbolic"))
.on_press(Message::ItemRight), .on_press(Message::ItemRight),
); );
if self.can_gallery() { if self.can_gallery()
if let Some(_path) = self.path_opt() { && let Some(_path) = self.path_opt()
{
row = row.push( row = row.push(
widget::button::icon(widget::icon::from_name("view-fullscreen-symbolic")) widget::button::icon(widget::icon::from_name("view-fullscreen-symbolic"))
.on_press(Message::Gallery(true)), .on_press(Message::Gallery(true)),
); );
} }
}
row.into() row.into()
} }
@ -2445,12 +2440,12 @@ impl Item {
} }
} }
if let Some(path) = self.path_opt() { if let Some(path) = self.path_opt()
if let Ok(img) = image::image_dimensions(path) { && let Ok(img) = image::image_dimensions(path)
{
let (width, height) = img; let (width, height) = img;
details = details.push(widget::text::body(format!("{width}x{height}"))); details = details.push(widget::text::body(format!("{width}x{height}")));
} }
}
column = column.push(details); column = column.push(details);
if let Some(path) = self.path_opt() { if let Some(path) = self.path_opt() {
@ -2637,13 +2632,12 @@ async fn calculate_dir_size(path: &Path, controller: Controller) -> Result<u64,
.map_err(|s| OperationError::from_state(s, &controller))?; .map_err(|s| OperationError::from_state(s, &controller))?;
//TODO: report more errors? //TODO: report more errors?
if let Ok(entry) = entry_res { if let Ok(entry) = entry_res
if let Ok(metadata) = entry.metadata() { && let Ok(metadata) = entry.metadata()
if metadata.is_file() { && metadata.is_file()
{
total += metadata.len(); total += metadata.len();
} }
}
}
// Yield in case this process takes a while. // Yield in case this process takes a while.
tokio::task::yield_now().await; tokio::task::yield_now().await;
@ -2768,12 +2762,12 @@ impl Tab {
let selected = self.selected_locations(); let selected = self.selected_locations();
for item in &mut items { for item in &mut items {
item.selected = false; item.selected = false;
if let Some(location) = &item.location_opt { if let Some(location) = &item.location_opt
if selected.contains(location) { && selected.contains(location)
{
item.selected = true; item.selected = true;
} }
} }
}
self.items_opt = Some(items); self.items_opt = Some(items);
} }
@ -2790,14 +2784,13 @@ impl Tab {
for item in items.iter_mut() { for item in items.iter_mut() {
item.cut = false; item.cut = false;
if let Some(location_path) = item.location_opt.as_ref().and_then(Location::path_opt) if let Some(location_path) = item.location_opt.as_ref().and_then(Location::path_opt)
&& locations.contains(location_path)
{ {
if locations.contains(location_path) {
item.cut = true; item.cut = true;
} }
} }
} }
} }
}
pub fn selected_locations(&self) -> Vec<Location> { pub fn selected_locations(&self) -> Vec<Location> {
if let Some(ref items) = self.items_opt { if let Some(ref items) = self.items_opt {
@ -2883,15 +2876,15 @@ impl Tab {
if let Some(ref mut items) = self.items_opt { if let Some(ref mut items) = self.items_opt {
for (i, item) in items.iter_mut().enumerate() { for (i, item) in items.iter_mut().enumerate() {
item.selected = false; item.selected = false;
if let Some(path) = item.path_opt() { if let Some(path) = item.path_opt()
if paths.contains(path) { && paths.contains(path)
{
item.selected = true; item.selected = true;
self.select_focus = Some(i); self.select_focus = Some(i);
} }
} }
} }
} }
}
fn select_position(&mut self, row: usize, col: usize, mod_shift: bool) -> bool { fn select_position(&mut self, row: usize, col: usize, mod_shift: bool) -> bool {
let mut start = (row, col); let mut start = (row, col);
@ -3087,11 +3080,11 @@ impl Tab {
return Vec::new(); return Vec::new();
}; };
if let Some((w, h)) = original_dims { if let Some((w, h)) = original_dims
if !should_use_tiling(*w, *h) { && !should_use_tiling(*w, *h)
{
return Vec::new(); return Vec::new();
} }
}
let Some(path) = item.path_opt() else { let Some(path) = item.path_opt() else {
return Vec::new(); return Vec::new();
@ -3391,8 +3384,7 @@ impl Tab {
self.date_time_formatter = date_time_formatter(self.config.military_time); self.date_time_formatter = date_time_formatter(self.config.military_time);
self.time_formatter = time_formatter(self.config.military_time); self.time_formatter = time_formatter(self.config.military_time);
} }
if show_hidden_changed { if show_hidden_changed && let Location::Search(path, term, ..) = &self.location {
if let Location::Search(path, term, ..) = &self.location {
cd = Some(Location::Search( cd = Some(Location::Search(
path.clone(), path.clone(),
term.clone(), term.clone(),
@ -3400,7 +3392,6 @@ impl Tab {
Instant::now(), Instant::now(),
)); ));
} }
}
// Unhighlight all items when config changes // Unhighlight all items when config changes
if let Some(ref mut items) = self.items_opt { if let Some(ref mut items) = self.items_opt {
for item in items.iter_mut() { for item in items.iter_mut() {
@ -3420,14 +3411,15 @@ impl Tab {
self.location_context_menu_index = None; self.location_context_menu_index = None;
//TODO: hack for clearing selecting when right clicking empty space //TODO: hack for clearing selecting when right clicking empty space
if self.context_menu.is_some() && self.last_right_click.take().is_none() { if self.context_menu.is_some()
if let Some(ref mut items) = self.items_opt { && self.last_right_click.take().is_none()
&& let Some(ref mut items) = self.items_opt
{
for item in items.iter_mut() { for item in items.iter_mut() {
item.selected = false; item.selected = false;
} }
} }
} }
}
Message::LocationContextMenuPoint(point_opt) => { Message::LocationContextMenuPoint(point_opt) => {
self.context_menu = None; self.context_menu = None;
self.location_context_menu_point = point_opt; self.location_context_menu_point = point_opt;
@ -3512,13 +3504,13 @@ impl Tab {
} }
} }
Message::EditLocationComplete(selected) => { Message::EditLocationComplete(selected) => {
if let Some(mut edit_location) = self.edit_location.take() { if let Some(mut edit_location) = self.edit_location.take()
if !matches!(edit_location.location, Location::Network(..)) { && !matches!(edit_location.location, Location::Network(..))
{
edit_location.selected = Some(selected); edit_location.selected = Some(selected);
cd = edit_location.resolve(); cd = edit_location.resolve();
} }
} }
}
Message::EditLocationEnable => { Message::EditLocationEnable => {
commands.push(Command::Iced( commands.push(Command::Iced(
widget::text_input::focus(self.edit_location_id.clone()).into(), widget::text_input::focus(self.edit_location_id.clone()).into(),
@ -3532,11 +3524,11 @@ impl Tab {
&& edit_location && edit_location
.completions .completions
.as_ref() .as_ref()
.map_or(false, |completions| !completions.is_empty()) .is_some_and(|completions| !completions.is_empty())
&& edit_location && edit_location
.location .location
.path_opt() .path_opt()
.map_or(false, |path| !path.exists()) .is_some_and(|path| !path.exists())
{ {
edit_location.selected = Some(0); edit_location.selected = Some(0);
} }
@ -3634,21 +3626,21 @@ impl Tab {
} }
} }
Message::GoNext => { Message::GoNext => {
if let Some(history_i) = self.history_i.checked_add(1) { if let Some(history_i) = self.history_i.checked_add(1)
if let Some(location) = self.history.get(history_i) { && let Some(location) = self.history.get(history_i)
{
cd = Some(location.clone()); cd = Some(location.clone());
history_i_opt = Some(history_i); history_i_opt = Some(history_i);
} }
} }
}
Message::GoPrevious => { Message::GoPrevious => {
if let Some(history_i) = self.history_i.checked_sub(1) { if let Some(history_i) = self.history_i.checked_sub(1)
if let Some(location) = self.history.get(history_i) { && let Some(location) = self.history.get(history_i)
{
cd = Some(location.clone()); cd = Some(location.clone());
history_i_opt = Some(history_i); history_i_opt = Some(history_i);
} }
} }
}
Message::ItemDown => { Message::ItemDown => {
if let Some(edit_location) = &mut self.edit_location { if let Some(edit_location) = &mut self.edit_location {
edit_location.select(true); edit_location.select(true);
@ -3825,12 +3817,12 @@ impl Tab {
Message::LocationUp => { Message::LocationUp => {
// Sets location to the path's parent // Sets location to the path's parent
// Does nothing if path is root or location is Trash // Does nothing if path is root or location is Trash
if let Location::Path(ref path) = self.location { if let Location::Path(ref path) = self.location
if let Some(parent) = path.parent() { && let Some(parent) = path.parent()
{
cd = Some(Location::Path(parent.to_owned())); cd = Some(Location::Path(parent.to_owned()));
} }
} }
}
Message::Open(path_opt) => { Message::Open(path_opt) => {
match path_opt { match path_opt {
Some(path) => { Some(path) => {
@ -3870,27 +3862,25 @@ impl Tab {
match mode { match mode {
Mode::App => { Mode::App => {
if is_only_one_selected { if is_only_one_selected {
return ResolveResult::Cd(location.clone()); ResolveResult::Cd(location.clone())
} else { } else {
return ResolveResult::OpenInTab(path_opt.cloned()); ResolveResult::OpenInTab(path_opt.cloned())
} }
} }
Mode::Desktop => { Mode::Desktop => match location {
return match location {
Location::Trash => ResolveResult::OpenTrash, Location::Trash => ResolveResult::OpenTrash,
_ => ResolveResult::Open(path_opt.cloned()), _ => ResolveResult::Open(path_opt.cloned()),
}; },
}
Mode::Dialog(_) => { Mode::Dialog(_) => {
if is_only_one_selected { if is_only_one_selected {
return ResolveResult::Cd(location.clone()); ResolveResult::Cd(location.clone())
} else { } else {
return ResolveResult::Skip; ResolveResult::Skip
} }
} }
} }
} else { } else {
return ResolveResult::Open(path_opt.cloned()); ResolveResult::Open(path_opt.cloned())
} }
} }
let mut open_files = Vec::new(); let mut open_files = Vec::new();
@ -3935,8 +3925,8 @@ impl Tab {
if mod_ctrl || mod_shift { if mod_ctrl || mod_shift {
self.update(Message::Click(click_i_opt), modifiers); self.update(Message::Click(click_i_opt), modifiers);
} }
if let Some(ref mut items) = self.items_opt { if let Some(ref mut items) = self.items_opt
if !click_i_opt && !click_i_opt
.is_some_and(|click_i| items.get(click_i).is_some_and(|x| x.selected)) .is_some_and(|click_i| items.get(click_i).is_some_and(|x| x.selected))
{ {
// If item not selected, clear selection on other items // If item not selected, clear selection on other items
@ -3944,7 +3934,6 @@ impl Tab {
item.selected = Some(i) == click_i_opt; item.selected = Some(i) == click_i_opt;
} }
} }
}
//TODO: hack for clearing selecting when right clicking empty space //TODO: hack for clearing selecting when right clicking empty space
self.last_right_click = click_i_opt; self.last_right_click = click_i_opt;
} }
@ -3990,13 +3979,13 @@ impl Tab {
} }
Message::Resize(viewport) => { Message::Resize(viewport) => {
// Scroll to ensure focused item still in view // Scroll to ensure focused item still in view
if self.viewport_opt.map(|v| v.size()) != Some(viewport.size()) { if self.viewport_opt.map(|v| v.size()) != Some(viewport.size())
if let Some(offset) = self.select_focus_scroll() { && let Some(offset) = self.select_focus_scroll()
{
commands.push(Command::Iced( commands.push(Command::Iced(
scrollable::scroll_to(self.scrollable_id.clone(), offset).into(), scrollable::scroll_to(self.scrollable_id.clone(), offset).into(),
)); ));
} }
}
self.viewport_opt = Some(viewport); self.viewport_opt = Some(viewport);
} }
@ -4099,14 +4088,13 @@ impl Tab {
} }
} }
Message::SelectLast => { Message::SelectLast => {
if let Some(ref items) = self.items_opt { if let Some(ref items) = self.items_opt
if let Some(last_pos) = items.iter().filter_map(|item| item.pos_opt.get()).max() && let Some(last_pos) = items.iter().filter_map(|item| item.pos_opt.get()).max()
&& self.select_position(last_pos.0, last_pos.1, mod_shift)
{ {
if self.select_position(last_pos.0, last_pos.1, mod_shift) {
if let Some(offset) = self.select_focus_scroll() { if let Some(offset) = self.select_focus_scroll() {
commands.push(Command::Iced( commands.push(Command::Iced(
scrollable::scroll_to(self.scrollable_id.clone(), offset) scrollable::scroll_to(self.scrollable_id.clone(), offset).into(),
.into(),
)); ));
} }
if let Some(id) = self.select_focus_id() { if let Some(id) = self.select_focus_id() {
@ -4114,8 +4102,6 @@ impl Tab {
} }
} }
} }
}
}
Message::SetOpenWith(mime, id) => { Message::SetOpenWith(mime, id) => {
commands.push(Command::SetOpenWith(mime, id)); commands.push(Command::SetOpenWith(mime, id));
} }
@ -4136,15 +4122,15 @@ impl Tab {
} }
} }
Message::TabComplete(path, completions) => { Message::TabComplete(path, completions) => {
if let Some(edit_location) = &mut self.edit_location { if let Some(edit_location) = &mut self.edit_location
if edit_location.location.path_opt() == Some(&path) { && edit_location.location.path_opt() == Some(&path)
{
edit_location.completions = Some(completions); edit_location.completions = Some(completions);
commands.push(Command::Iced( commands.push(Command::Iced(
widget::text_input::focus(self.edit_location_id.clone()).into(), widget::text_input::focus(self.edit_location_id.clone()).into(),
)); ));
} }
} }
}
Message::Thumbnail(path, thumbnail) => { Message::Thumbnail(path, thumbnail) => {
if let Some(ref mut items) = self.items_opt { if let Some(ref mut items) = self.items_opt {
let location = Location::Path(path); let location = Location::Path(path);
@ -4276,11 +4262,11 @@ impl Tab {
} }
Message::DirectorySize(path, dir_size) => { Message::DirectorySize(path, dir_size) => {
let location = Location::Path(path); let location = Location::Path(path);
if let Some(ref mut item) = self.parent_item_opt { if let Some(ref mut item) = self.parent_item_opt
if item.location_opt.as_ref() == Some(&location) { && item.location_opt.as_ref() == Some(&location)
{
item.dir_size.clone_from(&dir_size); item.dir_size.clone_from(&dir_size);
} }
}
if let Some(ref mut items) = self.items_opt { if let Some(ref mut items) = self.items_opt {
for item in items.iter_mut() { for item in items.iter_mut() {
if item.location_opt.as_ref() == Some(&location) { if item.location_opt.as_ref() == Some(&location) {
@ -4317,14 +4303,13 @@ impl Tab {
} else { } else {
// Select parent if location is not directory // Select parent if location is not directory
let mut selected_paths = None; let mut selected_paths = None;
if let Some(path) = location.path_opt() { if let Some(path) = location.path_opt()
if !path.is_dir() { && !path.is_dir()
if let Some(parent) = path.parent() { && let Some(parent) = path.parent()
{
selected_paths = Some(vec![path.clone()]); selected_paths = Some(vec![path.clone()]);
location = location.with_path(parent.to_path_buf()); location = location.with_path(parent.to_path_buf());
} }
}
}
if location != self.location || selected_paths.is_some() { if location != self.location || selected_paths.is_some() {
if location.path_opt().is_none_or(|path| path.is_dir()) { if location.path_opt().is_none_or(|path| path.is_dir()) {
if selected_paths.is_none() { if selected_paths.is_none() {
@ -4531,9 +4516,10 @@ impl Tab {
//TODO: display error messages when image not found? //TODO: display error messages when image not found?
let mut name_opt = None; let mut name_opt = None;
let mut element_opt: Option<Element<Message>> = None; let mut element_opt: Option<Element<Message>> = None;
if let Some(index) = self.select_focus { if let Some(index) = self.select_focus
if let Some(items) = &self.items_opt { && let Some(items) = &self.items_opt
if let Some(item) = items.get(index) { && let Some(item) = items.get(index)
{
name_opt = Some(widget::text::heading(&item.display_name)); name_opt = Some(widget::text::heading(&item.display_name));
match item match item
.thumbnail_opt .thumbnail_opt
@ -4599,8 +4585,7 @@ impl Tab {
widget::image(image_handle).into() widget::image(image_handle).into()
}; };
element_opt = element_opt = Some(widget::container(content).center(Length::Fill).into());
Some(widget::container(content).center(Length::Fill).into());
} }
ItemThumbnail::Svg(handle) => { ItemThumbnail::Svg(handle) => {
element_opt = Some( element_opt = Some(
@ -4612,21 +4597,15 @@ impl Tab {
} }
ItemThumbnail::Text(text) => { ItemThumbnail::Text(text) => {
element_opt = Some( element_opt = Some(
widget::container( widget::container(widget::text_editor(text).padding(space_xxs).class(
widget::text_editor(text).padding(space_xxs).class( cosmic::theme::iced::TextEditor::Custom(Box::new(text_editor_class)),
cosmic::theme::iced::TextEditor::Custom(Box::new( ))
text_editor_class,
)),
),
)
.center(Length::Fill) .center(Length::Fill)
.into(), .into(),
); );
} }
} }
} }
}
}
let mut column = widget::column::with_capacity(2); let mut column = widget::column::with_capacity(2);
column = column.push(widget::Space::with_height(Length::Fixed(space_m.into()))); column = column.push(widget::Space::with_height(Length::Fixed(space_m.into())));
@ -4862,8 +4841,9 @@ impl Tab {
); );
let mut popover = let mut popover =
widget::popover(text_input).position(widget::popover::Position::Bottom); widget::popover(text_input).position(widget::popover::Position::Bottom);
if let Some(completions) = &edit_location.completions { if let Some(completions) = &edit_location.completions
if !completions.is_empty() { && !completions.is_empty()
{
let mut column = let mut column =
widget::column::with_capacity(completions.len()).padding(space_xxs); widget::column::with_capacity(completions.len()).padding(space_xxs);
for (i, (name, _path)) in completions.iter().enumerate() { for (i, (name, _path)) in completions.iter().enumerate() {
@ -4888,7 +4868,6 @@ impl Tab {
.max_width(size.width - 140.0), .max_width(size.width - 140.0),
); );
} }
}
row = row.push(popover); row = row.push(popover);
let mut column = widget::column::with_capacity(4).padding([0, space_s]); let mut column = widget::column::with_capacity(4).padding([0, space_s]);
column = column.push(row); column = column.push(row);
@ -5913,14 +5892,14 @@ impl Tab {
.wayland_on_right_press_window_position(); .wayland_on_right_press_window_position();
let mut popover = widget::popover(mouse_area); let mut popover = widget::popover(mouse_area);
if let Some(point) = self.context_menu { if let Some(point) = self.context_menu
if !cfg!(feature = "wayland") || !crate::is_wayland() { && (!cfg!(feature = "wayland") || !crate::is_wayland())
let context_menu = menu::context_menu(self, key_binds, &modifiers); {
let context_menu = menu::context_menu(self, key_binds, modifiers);
popover = popover popover = popover
.popup(context_menu) .popup(context_menu)
.position(widget::popover::Position::Point(point)); .position(widget::popover::Position::Point(point));
} }
}
let mut tab_column = widget::column::with_capacity(3); let mut tab_column = widget::column::with_capacity(3);
if let Some(location_view) = location_view_opt { if let Some(location_view) = location_view_opt {
@ -5939,8 +5918,9 @@ impl Tab {
} }
match &self.location { match &self.location {
Location::Trash => { Location::Trash => {
if let Some(items) = self.items_opt() { if let Some(items) = self.items_opt()
if !items.is_empty() { && !items.is_empty()
{
tab_column = tab_column.push( tab_column = tab_column.push(
widget::layer_container(widget::row::with_children([ widget::layer_container(widget::row::with_children([
widget::horizontal_space().into(), widget::horizontal_space().into(),
@ -5955,7 +5935,6 @@ impl Tab {
); );
} }
} }
}
Location::Network(uri, _display_name, _path) if uri == "network:///" => { Location::Network(uri, _display_name, _path) if uri == "network:///" => {
tab_column = tab_column.push( tab_column = tab_column.push(
widget::layer_container(widget::row::with_children([ widget::layer_container(widget::row::with_children([
@ -6250,11 +6229,11 @@ impl Tab {
let mut selected_items: Vec<&Item> = let mut selected_items: Vec<&Item> =
items.iter().filter(|item| item.selected).collect(); items.iter().filter(|item| item.selected).collect();
if selected_items.is_empty() { if selected_items.is_empty()
if let Some(p) = self.parent_item_opt.as_ref() { && let Some(p) = self.parent_item_opt.as_ref()
{
selected_items.push(p) selected_items.push(p)
} }
}
for item in selected_items { for item in selected_items {
// Item must have a path // Item must have a path
if let Some(path) = item.path_opt().cloned() { if let Some(path) = item.path_opt().cloned() {

6
src/thumbnail_cacher.rs
View file

@ -66,11 +66,11 @@ impl ThumbnailCacher {
if let (Some(cache_base_dir), Ok(metadata)) = ( if let (Some(cache_base_dir), Ok(metadata)) = (
THUMBNAIL_CACHE_BASE_DIR.as_ref(), THUMBNAIL_CACHE_BASE_DIR.as_ref(),
std::fs::metadata(&self.file_path), std::fs::metadata(&self.file_path),
) { ) && metadata.is_file()
if metadata.is_file() && self.file_path.starts_with(cache_base_dir) { && self.file_path.starts_with(cache_base_dir)
{
return CachedThumbnail::Valid((self.file_path.clone(), None)); return CachedThumbnail::Valid((self.file_path.clone(), None));
} }
}
// Use cached thumbnail if it is valid. // Use cached thumbnail if it is valid.
if self.is_thumbnail_valid(&self.thumbnail_path) { if self.is_thumbnail_valid(&self.thumbnail_path) {

15
src/thumbnailer.rs
View file

@ -1,6 +1,7 @@
// Copyright 2023 System76 <info@system76.com> // Copyright 2023 System76 <info@system76.com>
// SPDX-License-Identifier: GPL-3.0-only // SPDX-License-Identifier: GPL-3.0-only
use cosmic::desktop::fde::GenericEntry;
use mime_guess::Mime; use mime_guess::Mime;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use std::{ use std::{
@ -115,7 +116,7 @@ impl ThumbnailerCache {
//TODO: handle directory specific behavior //TODO: handle directory specific behavior
for path in thumbnailer_paths { for path in thumbnailer_paths {
let entry = match freedesktop_entry_parser::parse_entry(&path) { let entry = match GenericEntry::from_path(&path) {
Ok(ok) => ok, Ok(ok) => ok,
Err(err) => { Err(err) => {
log::warn!("failed to parse {}: {}", path.display(), err); log::warn!("failed to parse {}: {}", path.display(), err);
@ -124,12 +125,18 @@ impl ThumbnailerCache {
}; };
//TODO: use TryExec? //TODO: use TryExec?
let section = entry.section("Thumbnailer Entry"); let Some(section) = entry.group("Thumbnailer Entry") else {
let Some(exec) = section.attr("Exec") else { log::warn!(
"missing Thumbnailer Entry section for thumbnailer {}",
path.display()
);
continue;
};
let Some(exec) = section.entry("Exec") else {
log::warn!("missing Exec attribute for thumbnailer {}", path.display()); log::warn!("missing Exec attribute for thumbnailer {}", path.display());
continue; continue;
}; };
let Some(mime_types) = section.attr("MimeType") else { let Some(mime_types) = section.entry("MimeType") else {
log::warn!( log::warn!(
"missing MimeType attribute for thumbnailer {}", "missing MimeType attribute for thumbnailer {}",
path.display() path.display()