mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix windows build

Browse source
This commit is contained in:
Nguyen Duc Toan 2023-12-15 02:24:40 +07:00
parent d6ca524c53
commit ec6f9ef165
6 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
yazi-core/src/manager/commands/rename.rs
View file

@ -75,13 +75,13 @@ impl Manager {
}; };
{ {
let s = old.iter().map(|o| o.as_os_str()).collect::<Vec<_>>().join(OsStr::new("\n")); let s = old.iter().map(|o| o.display().to_string()).collect::<Vec<_>>().join("\n");
OpenOptions::new() OpenOptions::new()
.write(true) .write(true)
.create_new(true) .create_new(true)
.open(&tmp) .open(&tmp)
.await? .await?
.write_all(s.as_encoded_bytes()) .write_all(s.as_bytes())
.await?; .await?;
} }

4
yazi-core/src/tab/finder.rs
View file

@ -77,12 +77,12 @@ impl Finder {
} }
#[inline] #[inline]
fn matches(&self, name: &OsStr) -> bool { self.query.is_match(name.as_encoded_bytes()) } fn matches(&self, name: &OsStr) -> bool { self.query.is_match(name.to_string_lossy().as_bytes()) }
/// Explode the name into three parts: head, body, tail. /// Explode the name into three parts: head, body, tail.
#[inline] #[inline]
pub fn highlighted(&self, name: &OsStr) -> Option<Vec<Range<usize>>> { pub fn highlighted(&self, name: &OsStr) -> Option<Vec<Range<usize>>> {
self.query.find(name.as_encoded_bytes()).map(|m| vec![m.range()]) self.query.find(name.to_string_lossy().as_bytes()).map(|m| vec![m.range()])
} }
} }

8
yazi-core/src/tasks/commands/open.rs
View file

@ -30,13 +30,9 @@ impl Tasks {
}; };
if let Some(p) = &BOOT.chooser_file { if let Some(p) = &BOOT.chooser_file {
let paths = opt.targets.into_iter().fold(OsString::new(), |mut s, (p, _)| { let paths = opt.targets.into_iter().map(|(p, _)| p.to_string_lossy().to_string()).collect::<Vec<_>>().join("\n");
s.push(p);
s.push("\n");
s
});
std::fs::write(p, paths.as_encoded_bytes()).ok(); std::fs::write(p, paths.as_bytes()).ok();
emit!(Quit(false)); emit!(Quit(false));
return false; return false;
} }

4
yazi-fm/src/app/app.rs
View file

@ -43,8 +43,8 @@ impl App {
fn dispatch_quit(&mut self, no_cwd_file: bool) { fn dispatch_quit(&mut self, no_cwd_file: bool) {
if let Some(p) = BOOT.cwd_file.as_ref().filter(|_| !no_cwd_file) { if let Some(p) = BOOT.cwd_file.as_ref().filter(|_| !no_cwd_file) {
let cwd = self.cx.manager.cwd().as_os_str(); let cwd = self.cx.manager.cwd();
std::fs::write(p, cwd.as_encoded_bytes()).ok(); std::fs::write(p, cwd.display().to_string().as_bytes()).ok();
} }
Term::goodbye(|| false); Term::goodbye(|| false);
} }

3
yazi-shared/src/fs/path.rs
View file

@ -48,8 +48,7 @@ pub fn expand_path(p: impl AsRef<Path>) -> PathBuf { _expand_path(p.as_ref()) }
#[inline] #[inline]
pub fn ends_with_slash(p: &Path) -> bool { pub fn ends_with_slash(p: &Path) -> bool {
let b = p.as_os_str().as_encoded_bytes(); p.display().to_string().ends_with(MAIN_SEPARATOR)
if let [.., last] = b { *last == MAIN_SEPARATOR as u8 } else { false }
} }
pub async fn unique_path(mut p: Url) -> Url { pub async fn unique_path(mut p: Url) -> Url {

3
yazi-shared/src/fs/url.rs
View file

@ -107,7 +107,8 @@ impl ToString for Url {
UrlScheme::Archive => "archive://", UrlScheme::Archive => "archive://",
}; };
let path = percent_encode(self.path.as_os_str().as_encoded_bytes(), ENCODE_SET); let path_str = self.path.display().to_string();
let path = percent_encode(path_str.as_bytes(), ENCODE_SET);
let frag = self.frag.as_ref().map(|s| format!("#{s}")).unwrap_or_default(); let frag = self.frag.as_ref().map(|s| format!("#{s}")).unwrap_or_default();
format!("{scheme}{path}{frag}") format!("{scheme}{path}{frag}")
} }