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

..

Browse source
This commit is contained in:
sxyazi 2023-08-16 15:48:19 +08:00
parent ea2e44c901
commit 6f52057467
No known key found for this signature in database
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/external/file.rs vendored
View file

@ -10,7 +10,7 @@ pub async fn file(files: &[impl AsRef<OsStr>]) -> Result<BTreeMap<PathBuf, Strin
} }
let output = Command::new("file") let output = Command::new("file")
.args(["-bL", "--mime-type"]) .args(["-b", "--mime-type"])
.args(files) .args(files)
.kill_on_drop(true) .kill_on_drop(true)
.output() .output()

25
shared/src/term.rs
View file

@ -1,4 +1,4 @@
use std::{io::{stdout, Stdout, Write}, ops::{Deref, DerefMut}}; use std::{io::{stdout, Stdout, Write}, mem, ops::{Deref, DerefMut}};
use anyhow::Result; use anyhow::Result;
use crossterm::{cursor::{MoveTo, SetCursorStyle}, event::{DisableBracketedPaste, DisableFocusChange, EnableBracketedPaste, EnableFocusChange, KeyboardEnhancementFlags, PopKeyboardEnhancementFlags, PushKeyboardEnhancementFlags}, execute, queue, terminal::{disable_raw_mode, enable_raw_mode, supports_keyboard_enhancement, Clear, ClearType, EnterAlternateScreen, LeaveAlternateScreen, WindowSize}}; use crossterm::{cursor::{MoveTo, SetCursorStyle}, event::{DisableBracketedPaste, DisableFocusChange, EnableBracketedPaste, EnableFocusChange, KeyboardEnhancementFlags, PopKeyboardEnhancementFlags, PushKeyboardEnhancementFlags}, execute, queue, terminal::{disable_raw_mode, enable_raw_mode, supports_keyboard_enhancement, Clear, ClearType, EnterAlternateScreen, LeaveAlternateScreen, WindowSize}};
@ -32,13 +32,26 @@ impl Term {
Ok(term) Ok(term)
} }
#[inline]
pub fn size() -> WindowSize { pub fn size() -> WindowSize {
let mut size = WindowSize { rows: 0, columns: 0, width: 0, height: 0 };
if let Ok(s) = crossterm::terminal::window_size() { if let Ok(s) = crossterm::terminal::window_size() {
return s; let _ = mem::replace(&mut size, s);
}; }
// TODO
WindowSize { rows: 1, columns: 1, width: 0, height: 0 } if size.rows == 0 || size.columns == 0 {
if let Ok(s) = crossterm::terminal::size() {
size.columns = s.0;
size.rows = s.1;
}
}
// TODO: Use `CSI 14 t` to get the actual size of the terminal
if size.width == 0 || size.height == 0 {
size.width = 300;
size.height = 300;
}
size
} }
#[inline] #[inline]