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

chore: make yazi-plugin as default feature ...

Browse source 
... `LuaJIT` does not support `riscv64`, this commit to allow riscv64 compile without `plugin` feature
This commit is contained in:
eatradish 2023-12-07 18:29:18 +08:00
parent 1d1a512710
commit 0427ce3b6d
4 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
yazi-fm/Cargo.toml
View file

@ -12,7 +12,7 @@ repository = "https://github.com/sxyazi/yazi"
yazi-adaptor = { path = "../yazi-adaptor", version = "0.1.5" } yazi-adaptor = { path = "../yazi-adaptor", version = "0.1.5" }
yazi-config = { path = "../yazi-config", version = "0.1.5" } yazi-config = { path = "../yazi-config", version = "0.1.5" }
yazi-core = { path = "../yazi-core", version = "0.1.5" } yazi-core = { path = "../yazi-core", version = "0.1.5" }
yazi-plugin = { path = "../yazi-plugin", version = "0.1.5" } yazi-plugin = { path = "../yazi-plugin", version = "0.1.5", optional = true }
yazi-shared = { path = "../yazi-shared", version = "0.1.5" } yazi-shared = { path = "../yazi-shared", version = "0.1.5" }
# External dependencies # External dependencies
@ -38,3 +38,7 @@ signal-hook-tokio = { version = "^0", features = [ "futures-v0_3" ] }
[[bin]] [[bin]]
name = "yazi" name = "yazi"
path = "src/main.rs" path = "src/main.rs"
[features]
plugin = ["dep:yazi-plugin"]
default = ["plugin"]

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

@ -7,7 +7,7 @@ use yazi_config::{keymap::Key, BOOT};
use yazi_core::{input::InputMode, preview::COLLISION, Ctx}; use yazi_core::{input::InputMode, preview::COLLISION, Ctx};
use yazi_shared::{emit, event::{Event, Exec}, fs::FilesOp, term::Term, Layer}; use yazi_shared::{emit, event::{Event, Exec}, fs::FilesOp, term::Term, Layer};
use crate::{Executor, Logs, Panic, Root, Signals}; use crate::{Executor, Logs, Panic, Signals};
pub(crate) struct App { pub(crate) struct App {
pub(crate) cx: Ctx, pub(crate) cx: Ctx,
@ -72,9 +72,13 @@ impl App {
let collision = COLLISION.swap(false, Ordering::Relaxed); let collision = COLLISION.swap(false, Ordering::Relaxed);
let frame = term.draw(|f| { let frame = term.draw(|f| {
yazi_plugin::scope(&self.cx, |_| { #[cfg(feature = "plugin")]
f.render_widget(Root::new(&self.cx), f.size()); {
}); use crate::Root;
yazi_plugin::scope(&self.cx, |_| {
f.render_widget(Root::new(&self.cx), f.size());
});
}
if let Some((x, y)) = self.cx.cursor() { if let Some((x, y)) = self.cx.cursor() {
f.set_cursor(x, y); f.set_cursor(x, y);

2
yazi-fm/src/main.rs
View file

@ -17,6 +17,7 @@ mod widgets;
use executor::*; use executor::*;
use logs::*; use logs::*;
use panic::*; use panic::*;
#[cfg(feature = "plugin")]
use root::*; use root::*;
use signals::*; use signals::*;
@ -29,6 +30,7 @@ async fn main() -> anyhow::Result<()> {
yazi_core::init(); yazi_core::init();
#[cfg(feature = "plugin")]
yazi_plugin::init(); yazi_plugin::init();
yazi_adaptor::init(); yazi_adaptor::init();

22
yazi-fm/src/root.rs
View file

@ -1,5 +1,6 @@
use ratatui::{buffer::Buffer, layout::{Constraint, Direction, Layout, Rect}, widgets::Widget}; use ratatui::{buffer::Buffer, layout::Rect, widgets::Widget};
use yazi_core::Ctx; use yazi_core::Ctx;
#[cfg(feature = "plugin")]
use yazi_plugin::components; use yazi_plugin::components;
use super::{completion, input, select, tasks, which}; use super::{completion, input, select, tasks, which};
@ -9,20 +10,25 @@ pub(super) struct Root<'a> {
cx: &'a Ctx, cx: &'a Ctx,
} }
#[cfg(feature = "plugin")]
impl<'a> Root<'a> { impl<'a> Root<'a> {
pub(super) fn new(cx: &'a Ctx) -> Self { Self { cx } } pub(super) fn new(cx: &'a Ctx) -> Self { Self { cx } }
} }
impl<'a> Widget for Root<'a> { impl<'a> Widget for Root<'a> {
fn render(self, area: Rect, buf: &mut Buffer) { fn render(self, area: Rect, buf: &mut Buffer) {
let chunks = Layout::new() #[cfg(feature = "plugin")]
.direction(Direction::Vertical) {
.constraints([Constraint::Length(1), Constraint::Min(0), Constraint::Length(1)]) use ratatui::layout::{Constraint, Direction, Layout};
.split(area); let chunks = Layout::new()
.direction(Direction::Vertical)
.constraints([Constraint::Length(1), Constraint::Min(0), Constraint::Length(1)])
.split(area);
components::Header::new(self.cx).render(chunks[0], buf); components::Header::new(self.cx).render(chunks[0], buf);
components::Manager::new(self.cx).render(chunks[1], buf); components::Manager::new(self.cx).render(chunks[1], buf);
components::Status::new(self.cx).render(chunks[2], buf); components::Status::new(self.cx).render(chunks[2], buf);
}
if self.cx.tasks.visible { if self.cx.tasks.visible {
tasks::Layout::new(self.cx).render(area, buf); tasks::Layout::new(self.cx).render(area, buf);