Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
694 changes: 171 additions & 523 deletions Cargo.lock

Large diffs are not rendered by default.

57 changes: 29 additions & 28 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@
name = "cosmic-files"
version = "0.1.0"
authors = ["Jeremy Soller <jeremy@system76.com>"]
edition = "2021"
edition = "2024"
license = "GPL-3.0-only"
rust-version = "1.85.0"

[build-dependencies]
vergen = { version = "8", features = ["git", "gitcl"] }
rust-version = "1.85"

[dependencies]
anyhow = "1"
Expand All @@ -17,14 +14,14 @@ icu = { version = "1.5.0", features = [
"compiled_data",
"icu_datetime_experimental",
] }
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "178eb0b", optional = true }
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "6254f50", optional = true }
cosmic-mime-apps = { git = "https://github.com/pop-os/cosmic-mime-apps.git", optional = true }
dirs = "6.0.0"
env_logger = "0.11"
freedesktop_entry_parser = "1.3"
futures = "0.3.31"
gio = { version = "0.20", optional = true }
glib = { version = "0.20", optional = true }
gio = { version = "0.21", optional = true }
glib = { version = "0.21", optional = true }
glob = "0.3"
icu_collator = "1.5"
icu_provider = { version = "1.5", features = ["sync"] }
Expand All @@ -33,9 +30,8 @@ image = "0.25"
libc = "0.2"
log = "0.4"
mime_guess = "2"
notify-debouncer-full = "0.3"
notify-debouncer-full = "0.6"
notify-rust = { version = "4", optional = true }
once_cell = "1.20"
open = "5.3.2"
paste = "1.0"
regex = "1"
Expand All @@ -47,62 +43,67 @@ tokio = { version = "1", features = ["process", "sync"] }
trash = { git = "https://github.com/jackpot51/trash-rs.git", branch = "cosmic" }
url = "2.5"
walkdir = "2.5.0"
wayland-client = { version = "0.31.8", optional = true }
xdg = { version = "2.5.2", optional = true }
wayland-client = { version = "0.31.11", optional = true }
xdg = { version = "3.0", optional = true }
# https://github.com/ebassi/xdg-mime-rs/pull/31
xdg-mime = { git = "https://github.com/ellieplayswow/xdg-mime-rs", branch = "feature/get-same-as" }
# Compression
bzip2 = { version = "0.5", optional = true } #TODO: replace with pure Rust crate
flate2 = "1.0"
tar = "0.4.43"
xz2 = { version = "0.1", optional = true } #TODO: replace with pure Rust crate
ordermap = { version = "0.5.8", features = ["serde"] }
bzip2 = { version = "0.6", optional = true } #TODO: replace with pure Rust crate
flate2 = "1.1"
tar = "0.4.44"
lzma-rust2 = { version = "0.13", optional = true }
ordermap = { version = "0.5.10", features = ["serde"] }
# Internationalization
i18n-embed = { version = "0.15", features = [
i18n-embed = { version = "0.16", features = [
"fluent-system",
"desktop-requester",
] }
i18n-embed-fl = "0.9"
i18n-embed-fl = "0.10"
rust-embed = "8"
slotmap = "1.0.7"
recently-used-xbel = { git = "https://github.com/pop-os/recently-used-xbel.git" }
zip = "2.2.2"
zip = "5.0.0"
uzers = "0.12.1"
md-5 = "0.10.6"
png = "0.17.16"
jxl-oxide = { version = "0.12.2", features = ["image"] }
png = "0.18"
jxl-oxide = { version = "0.12.4", features = ["image"] }
num_cpus = "1.17.0"

# Completion-based IO runtime to enable io_uring / IOCP file IO support.
[dependencies.compio]
version = "0.14.0"
version = "0.16.0"
default-features = false
features = ["io", "macros", "polling", "runtime"]

[dependencies.io-uring]
version = "0.7.6"
version = "0.7.10"
default-features = false
optional = true

[dependencies.libcosmic]
git = "https://github.com/pop-os/libcosmic.git"
default-features = false
#TODO: a11y feature crashes
features = ["autosize","multi-window", "tokio", "winit", "surface-message"]
features = ["autosize", "dbus-config", "multi-window", "tokio", "winit", "surface-message"]

[features]
default = [
"bzip2",
"desktop",
"gvfs",
"io-uring",
"lzma-rust2",
"notify",
"wgpu",
"wayland",
"xz2",
]
dbus-config = ["libcosmic/dbus-config"]
desktop = ["libcosmic/desktop", "dep:cosmic-mime-apps", "dep:xdg"]
desktop = [
"libcosmic/desktop",
"libcosmic/about",
"dep:cosmic-mime-apps",
"dep:xdg",
]
desktop-applet = []
gvfs = ["dep:gio", "dep:glib"]
io-uring = ["compio/io-uring", "dep:io-uring"]
Expand All @@ -123,7 +124,7 @@ debug = true
fork = "0.2"

[target.'cfg(target_os = "linux")'.dependencies]
procfs = "0.17"
procfs = "0.18"

[dev-dependencies]
# cap-std = "3"
Expand Down
17 changes: 0 additions & 17 deletions build.rs

This file was deleted.

3 changes: 1 addition & 2 deletions cosmic-files-applet/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "cosmic-files-applet"
version = "0.1.0"
edition = "2021"
edition = "2024"

[dependencies]
log = "0.4"
Expand All @@ -11,4 +11,3 @@ zbus = "5"
path = ".."
default-features = false
features = ["desktop", "gvfs", "wayland", "wgpu", "desktop-applet"]

2 changes: 1 addition & 1 deletion examples/copy.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use cosmic_files::operation::recursive::Method;
use cosmic_files::operation::{recursive::Context, Controller, ReplaceResult};
use cosmic_files::operation::{Controller, ReplaceResult, recursive::Context};
use std::{error::Error, io, path::PathBuf};

#[compio::main]
Expand Down
5 changes: 3 additions & 2 deletions examples/dialog.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use cosmic::{
Application, Element,
app::{self, Core, Settings, Task},
executor,
iced::{window, Subscription},
widget, Application, Element,
iced::{Subscription, window},
widget,
};
use cosmic_files::dialog::{
Dialog, DialogChoice, DialogChoiceOption, DialogFilter, DialogFilterPattern, DialogKind,
Expand Down
11 changes: 6 additions & 5 deletions i18n/en/cosmic_files.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ size = Size
# Progress footer
details = Details
dismiss = Dismiss message
operations-running = {$running} {$running ->
operations-running = {$running} {$running ->
[one] operation
*[other] operations
*[other] operations
} running ({$percent}%)...
operations-running-finished = {$running} {$running ->
operations-running-finished = {$running} {$running ->
[one] operation
*[other] operations
} running ({$percent}%), {$finished} finished...
Expand Down Expand Up @@ -142,15 +142,16 @@ favorite-path-error = Error opening directory
favorite-path-error-description =
Unable to open "{$path}".
It may not exist or you don't have permission to open it.

Would you like to remove it from the sidebar?
remove = Remove
keep = Keep

# Context Pages

## About
git-description = Git commit {$hash} on {$date}
repository = Repository
support = Support

## Add Network Drive
add-network-drive = Add network drive
Expand Down
Loading