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-12-29 02:16:30 +08:00
parent 2fad9bcd16
commit 09ee8dc2b7
No known key found for this signature in database
3 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
yazi-scheduler/src/plugin/plugin.rs
View file

@ -2,26 +2,16 @@ use anyhow::Result;
use tokio::sync::mpsc;
use super::{PluginOp, PluginOpEntry};
use crate::TaskProg;
use crate::{TaskOp, TaskProg};
pub struct Plugin {
tx: async_channel::Sender<PluginOp>,
rx: async_channel::Receiver<PluginOp>,
prog: mpsc::UnboundedSender<TaskProg>,
macro_: async_channel::Sender<TaskOp>,
prog: mpsc::UnboundedSender<TaskProg>,
}
impl Plugin {
pub fn new(prog: mpsc::UnboundedSender<TaskProg>) -> Self {
let (tx, rx) = async_channel::unbounded();
Self { tx, rx, prog }
}
#[inline]
pub async fn recv(&self) -> Result<(usize, PluginOp)> {
Ok(match self.rx.recv().await? {
PluginOp::Entry(t) => (t.id, PluginOp::Entry(t)),
})
pub fn new(macro_: async_channel::Sender<TaskOp>, prog: mpsc::UnboundedSender<TaskProg>) -> Self {
Self { macro_, prog }
}
pub async fn work(&self, op: &mut PluginOp) -> Result<()> {
@ -49,7 +39,7 @@ impl Plugin {
let id = task.id;
self.prog.send(TaskProg::New(id, 0))?;
self.tx.send_blocking(PluginOp::Entry(task))?;
self.macro_.send_blocking(PluginOp::Entry(task).into())?;
self.succ(id)
}
}

23
yazi-scheduler/src/preload/preload.rs
View file

@ -6,19 +6,32 @@ use tokio::sync::mpsc;
use tracing::error;
use yazi_shared::fs::{calculate_size, FilesOp, Url};
use super::{PreloadOpRule, PreloadOpSize};
use crate::TaskProg;
use super::{PreloadOp, PreloadOpRule, PreloadOpSize};
use crate::{TaskOp, TaskProg};
pub struct Preload {
prog: mpsc::UnboundedSender<TaskProg>,
macro_: async_channel::Sender<TaskOp>,
prog: mpsc::UnboundedSender<TaskProg>,
pub rule_loaded: RwLock<HashMap<Url, u32>>,
pub size_loading: RwLock<BTreeSet<Url>>,
}
impl Preload {
pub fn new(prog: mpsc::UnboundedSender<TaskProg>) -> Self {
Self { prog, rule_loaded: Default::default(), size_loading: Default::default() }
pub fn new(macro_: async_channel::Sender<TaskOp>, prog: mpsc::UnboundedSender<TaskProg>) -> Self {
Self { macro_, prog, rule_loaded: Default::default(), size_loading: Default::default() }
}
pub async fn work(&self, op: &mut PreloadOp) -> Result<()> {
match op {
PreloadOp::Rule(task) => {
todo!()
}
PreloadOp::Size(task) => {
todo!()
}
}
Ok(())
}
pub async fn rule(&self, task: PreloadOpRule) -> Result<()> {

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

@ -16,7 +16,6 @@ pub struct Scheduler {
pub process: Arc<Process>,
micro: async_channel::Sender<BoxFuture<'static, ()>>,
macro_: async_channel::Sender<TaskOp>,
prog: mpsc::UnboundedSender<TaskProg>,
pub running: Arc<RwLock<Running>>,
}
@ -29,12 +28,11 @@ impl Scheduler {
let scheduler = Self {
file: Arc::new(File::new(macro_tx.clone(), prog_tx.clone())),
plugin: Arc::new(Plugin::new(prog_tx.clone())),
preload: Arc::new(Preload::new(prog_tx.clone())),
plugin: Arc::new(Plugin::new(macro_tx.clone(), prog_tx.clone())),
preload: Arc::new(Preload::new(macro_tx.clone(), prog_tx.clone())),
process: Arc::new(Process::new(prog_tx.clone())),
micro: micro_tx,
macro_: macro_tx,
prog: prog_tx,
running: Default::default(),
};
@ -66,6 +64,7 @@ impl Scheduler {
) {
let file = self.file.clone();
let plugin = self.plugin.clone();
let preload = self.preload.clone();
let prog = self.prog.clone();
let running = self.running.clone();
@ -84,8 +83,8 @@ impl Scheduler {
let result = match op {
TaskOp::File(mut op) => file.work(&mut op).await,
TaskOp::Plugin(mut op) => todo!(),
TaskOp::Preload(mut op) => todo!(),
TaskOp::Plugin(mut op) => plugin.work(&mut op).await,
TaskOp::Preload(mut op) => preload.work(&mut op).await,
};
if let Err(e) = result {