mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-21 23:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: choose a more conservative macro_workers value to ensure concurrency safety with certain USB flash drives (#2040)

Browse source
This commit is contained in:
三咲雅 · Misaki Masa 2024-12-14 08:02:24 +08:00 • committed by GitHub
parent c78f39b50f
commit 196a46cc5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
yazi-config/preset/yazi-default.toml
View file

@ -80,8 +80,8 @@ rules = [
[tasks]
micro_workers = 10
macro_workers = 25
bizarre_retry = 5
macro_workers = 10
bizarre_retry = 3
image_alloc = 536870912 # 512MB
image_bound = [ 0, 0 ]
suppress_preload = false

10
yazi-fs/src/path.rs
View file

@ -65,6 +65,16 @@ fn _expand_path(p: &Path) -> PathBuf {
}
}
pub fn skip_path(p: &Path, u: usize) -> &Path {
let mut it = p.components();
for _ in 0..u {
if it.next().is_none() {
return Path::new("");
}
}
it.as_path()
}
pub async fn unique_name<F>(u: Url, append: F) -> io::Result<Url>
where
F: Future<Output = bool>,

8
yazi-scheduler/src/file/file.rs
View file

@ -1,10 +1,10 @@
use std::{borrow::Cow, collections::VecDeque, path::{Path, PathBuf}};
use std::{borrow::Cow, collections::VecDeque, path::Path};
use anyhow::{Result, anyhow};
use tokio::{fs::{self, DirEntry}, io::{self, ErrorKind::{AlreadyExists, NotFound}}, sync::mpsc};
use tracing::warn;
use yazi_config::TASKS;
use yazi_fs::{Cha, calculate_size, copy_with_progress, maybe_exists, ok_or_not_found, path_relative_to};
use yazi_fs::{Cha, calculate_size, copy_with_progress, maybe_exists, ok_or_not_found, path_relative_to, skip_path};
use yazi_shared::url::Url;
use super::{FileOp, FileOpDelete, FileOpHardlink, FileOpLink, FileOpPaste, FileOpTrash};
@ -190,7 +190,7 @@ impl File {
let mut dirs = VecDeque::from([task.from.clone()]);
while let Some(src) = dirs.pop_front() {
let dest = root.join(src.components().skip(skip).collect::<PathBuf>());
let dest = root.join(skip_path(&src, skip));
continue_unless_ok!(match fs::create_dir(&dest).await {
Err(e) if e.kind() != AlreadyExists => Err(e),
_ => Ok(()),
@ -261,7 +261,7 @@ impl File {
let mut dirs = VecDeque::from([task.from.clone()]);
while let Some(src) = dirs.pop_front() {
let dest = root.join(src.components().skip(skip).collect::<PathBuf>());
let dest = root.join(skip_path(&src, skip));
continue_unless_ok!(match fs::create_dir(&dest).await {
Err(e) if e.kind() != AlreadyExists => Err(e),
_ => Ok(()),