Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add loading state to directories #904

Merged
merged 2 commits into from
Apr 13, 2024
Merged

feat: add loading state to directories #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa0db9a
feat: add loading state to directories
sxyazi Apr 13, 2024
2979efb
..
sxyazi Apr 13, 2024
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
85 changes: 36 additions & 49 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion yazi-adaptor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ yazi-config = { path = "../yazi-config", version = "0.2.4" }
yazi-shared = { path = "../yazi-shared", version = "0.2.4" }

# External dependencies
anyhow = "1.0.81"
anyhow = "1.0.82"
arc-swap = "1.7.1"
base64 = "0.22.0"
color_quant = "1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion yazi-boot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ serde = { version = "1.0.197", features = [ "derive" ] }

[build-dependencies]
clap = { version = "4.5.4", features = [ "derive" ] }
clap_complete = "4.5.1"
clap_complete = "4.5.2"
clap_complete_nushell = "4.5.1"
clap_complete_fig = "4.5.0"
vergen = { version = "8.3.1", features = [ "build", "git", "gitcl" ] }
Expand Down
6 changes: 2 additions & 4 deletions yazi-config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@ repository = "https://github.com/sxyazi/yazi"
yazi-shared = { path = "../yazi-shared", version = "0.2.4" }

# External dependencies
anyhow = "1.0.81"
anyhow = "1.0.82"
arc-swap = "1.7.1"
crossterm = "0.27.0"
futures = "0.3.30"
glob = "0.3.1"
indexmap = "2.2.6"
md-5 = "0.10.6"
ratatui = "0.26.1"
serde = { version = "1.0.197", features = [ "derive" ] }
shell-words = "1.1.0"
toml = { version = "0.8.12", features = [ "preserve_order" ] }
validator = { version = "0.17.0", features = [ "derive" ] }
validator = { version = "0.18.1", features = [ "derive" ] }
4 changes: 2 additions & 2 deletions yazi-config/preset/theme.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ find_position = { fg = "magenta", bg = "reset", bold = true, italic = true }
# Marker
marker_copied = { fg = "lightgreen", bg = "lightgreen" }
marker_cut = { fg = "lightred", bg = "lightred" }
marker_marked = { fg = "lightyellow", bg = "lightyellow" }
marker_selected = { fg = "lightblue", bg = "lightblue" }
marker_marked = { fg = "lightcyan", bg = "lightcyan" }
marker_selected = { fg = "lightyellow", bg = "lightyellow" }

# Tab
tab_active = { reversed = true }
Expand Down
3 changes: 1 addition & 2 deletions yazi-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ yazi-scheduler = { path = "../yazi-scheduler", version = "0.2.4" }
yazi-shared = { path = "../yazi-shared", version = "0.2.4" }

# External dependencies
anyhow = "1.0.81"
anyhow = "1.0.82"
base64 = "0.22.0"
bitflags = "2.5.0"
crossterm = "0.27.0"
futures = "0.3.30"
indexmap = "2.2.6"
notify = { version = "6.1.1", default-features = false, features = [ "macos_fsevent" ] }
parking_lot = "0.12.1"
ratatui = "0.26.1"
Expand Down
5 changes: 1 addition & 4 deletions yazi-core/src/clipboard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,9 @@ impl Clipboard {

use crossterm::execute;
use tokio::{io::AsyncWriteExt, process::Command};
use yazi_shared::in_ssh_connection;

s.as_ref().clone_into(&mut self.content.lock());
if in_ssh_connection() {
execute!(BufWriter::new(stderr()), osc52::SetClipboard::new(s.as_ref())).ok();
}
execute!(BufWriter::new(stderr()), osc52::SetClipboard::new(s.as_ref())).ok();

let all = [
("pbcopy", &[][..]),
Expand Down
Loading