mirror of
https://github.com/sxyazi/yazi.git
synced 2024-09-11 10:26:35 +03:00
feat: support ya sub
subcommand for the Ya CLI (#1004)
Co-authored-by: sxyazi <sxyazi@gmail.com>
This commit is contained in:
parent
794694e2d6
commit
2a35d30f38
@ -22,6 +22,8 @@ pub(super) enum Command {
|
|||||||
PubStatic(CommandPubStatic),
|
PubStatic(CommandPubStatic),
|
||||||
/// Manage packages.
|
/// Manage packages.
|
||||||
Pack(CommandPack),
|
Pack(CommandPack),
|
||||||
|
/// Subscribe to messages from all remote instances.
|
||||||
|
Sub(CommandSub),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(clap::Args)]
|
#[derive(clap::Args)]
|
||||||
@ -109,3 +111,10 @@ pub(super) struct CommandPack {
|
|||||||
#[arg(short = 'u', long)]
|
#[arg(short = 'u', long)]
|
||||||
pub(super) upgrade: bool,
|
pub(super) upgrade: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(clap::Args)]
|
||||||
|
pub(super) struct CommandSub {
|
||||||
|
/// The kind of messages to subscribe to, separated by commas if multiple.
|
||||||
|
#[arg(index = 1)]
|
||||||
|
pub(super) kinds: String,
|
||||||
|
}
|
||||||
|
@ -46,6 +46,13 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
package::Package::add_to_config(repo).await?;
|
package::Package::add_to_config(repo).await?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Command::Sub(cmd) => {
|
||||||
|
yazi_dds::init();
|
||||||
|
yazi_dds::Client::draw(cmd.kinds.split(',').collect()).await?;
|
||||||
|
|
||||||
|
tokio::signal::ctrl_c().await?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
@ -29,8 +29,8 @@ ueberzug_offset = [ 0, 0, 0, 0 ]
|
|||||||
[opener]
|
[opener]
|
||||||
edit = [
|
edit = [
|
||||||
{ run = '${EDITOR:=vi} "$@"', desc = "$EDITOR", block = true, for = "unix" },
|
{ run = '${EDITOR:=vi} "$@"', desc = "$EDITOR", block = true, for = "unix" },
|
||||||
{ run = 'code "%*"', orphan = true, desc = "code", for = "windows" },
|
{ run = 'code %*', orphan = true, desc = "code", for = "windows" },
|
||||||
{ run = 'code -w "%*"', block = true, desc = "code (block)", for = "windows" },
|
{ run = 'code -w %*', block = true, desc = "code (block)", for = "windows" },
|
||||||
]
|
]
|
||||||
open = [
|
open = [
|
||||||
{ run = 'xdg-open "$1"', desc = "Open", for = "linux" },
|
{ run = 'xdg-open "$1"', desc = "Open", for = "linux" },
|
||||||
|
@ -5,15 +5,17 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
use super::Body;
|
use super::Body;
|
||||||
|
|
||||||
|
/// The client handshake
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
pub struct BodyHi<'a> {
|
pub struct BodyHi<'a> {
|
||||||
pub abilities: HashSet<Cow<'a, String>>,
|
/// Specifies the kinds of events that the client can handle
|
||||||
|
pub abilities: HashSet<Cow<'a, str>>,
|
||||||
pub version: String,
|
pub version: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> BodyHi<'a> {
|
impl<'a> BodyHi<'a> {
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn borrowed(abilities: HashSet<&'a String>) -> Body<'a> {
|
pub fn borrowed(abilities: HashSet<&'a str>) -> Body<'a> {
|
||||||
Self {
|
Self {
|
||||||
abilities: abilities.into_iter().map(Cow::Borrowed).collect(),
|
abilities: abilities.into_iter().map(Cow::Borrowed).collect(),
|
||||||
version: Self::version(),
|
version: Self::version(),
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use std::{collections::{HashMap, HashSet}, mem, str::FromStr};
|
use std::{collections::{HashMap, HashSet}, mem, str::FromStr};
|
||||||
|
|
||||||
use anyhow::{bail, Result};
|
use anyhow::{bail, Context, Result};
|
||||||
use parking_lot::RwLock;
|
use parking_lot::RwLock;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use tokio::{io::AsyncWriteExt, select, sync::mpsc, task::JoinHandle, time};
|
use tokio::{io::AsyncWriteExt, select, sync::mpsc, task::JoinHandle, time};
|
||||||
@ -27,6 +27,7 @@ pub struct Peer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Client {
|
impl Client {
|
||||||
|
/// Connect to an existing server or start a new one.
|
||||||
pub(super) fn serve() {
|
pub(super) fn serve() {
|
||||||
let mut rx = QUEUE_RX.drop();
|
let mut rx = QUEUE_RX.drop();
|
||||||
while rx.try_recv().is_ok() {}
|
while rx.try_recv().is_ok() {}
|
||||||
@ -52,7 +53,7 @@ impl Client {
|
|||||||
if line.is_empty() {
|
if line.is_empty() {
|
||||||
continue;
|
continue;
|
||||||
} else if line.starts_with("hey,") {
|
} else if line.starts_with("hey,") {
|
||||||
Self::handle_hey(line);
|
Self::handle_hey(&line);
|
||||||
} else {
|
} else {
|
||||||
Payload::from_str(&line).map(|p| p.emit()).ok();
|
Payload::from_str(&line).map(|p| p.emit()).ok();
|
||||||
}
|
}
|
||||||
@ -62,6 +63,7 @@ impl Client {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Connect to an existing server to send a single message.
|
||||||
pub async fn shot(kind: &str, receiver: u64, severity: Option<u16>, body: &str) -> Result<()> {
|
pub async fn shot(kind: &str, receiver: u64, severity: Option<u16>, body: &str) -> Result<()> {
|
||||||
Body::validate(kind)?;
|
Body::validate(kind)?;
|
||||||
|
|
||||||
@ -100,6 +102,40 @@ impl Client {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Connect to an existing server and listen in on the messages that are being
|
||||||
|
/// sent by other yazi instances:
|
||||||
|
/// - If no server is running, fail right away;
|
||||||
|
/// - If a server is closed, attempt to reconnect forever.
|
||||||
|
pub async fn draw(kinds: HashSet<&str>) -> Result<()> {
|
||||||
|
async fn make(kinds: &HashSet<&str>) -> Result<ClientReader> {
|
||||||
|
let (lines, mut writer) = Stream::connect().await?;
|
||||||
|
let hi = Payload::new(BodyHi::borrowed(kinds.clone()));
|
||||||
|
writer.write_all(format!("{hi}\n").as_bytes()).await?;
|
||||||
|
writer.flush().await?;
|
||||||
|
Ok(lines)
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut lines = make(&kinds).await.context("No running Yazi instance found")?;
|
||||||
|
loop {
|
||||||
|
match lines.next_line().await? {
|
||||||
|
Some(s) => {
|
||||||
|
let kind = s.split(',').next();
|
||||||
|
if matches!(kind, Some(kind) if kinds.contains(kind)) {
|
||||||
|
println!("{s}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => loop {
|
||||||
|
if let Ok(new) = make(&kinds).await {
|
||||||
|
lines = new;
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
time::sleep(time::Duration::from_secs(1)).await;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
pub(super) fn push<'a>(payload: impl Into<Payload<'a>>) {
|
pub(super) fn push<'a>(payload: impl Into<Payload<'a>>) {
|
||||||
QUEUE_TX.send(format!("{}\n", payload.into())).ok();
|
QUEUE_TX.send(format!("{}\n", payload.into())).ok();
|
||||||
@ -136,8 +172,8 @@ impl Client {
|
|||||||
Self::connect(server).await
|
Self::connect(server).await
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_hey(s: String) {
|
fn handle_hey(s: &str) {
|
||||||
if let Ok(Body::Hey(mut hey)) = Payload::from_str(&s).map(|p| p.body) {
|
if let Ok(Body::Hey(mut hey)) = Payload::from_str(s).map(|p| p.body) {
|
||||||
hey.peers.retain(|&id, _| id != *ID);
|
hey.peers.retain(|&id, _| id != *ID);
|
||||||
*PEERS.write() = hey.peers;
|
*PEERS.write() = hey.peers;
|
||||||
}
|
}
|
||||||
|
@ -88,7 +88,7 @@ impl Pubsub {
|
|||||||
|
|
||||||
pub fn pub_from_hi() -> bool {
|
pub fn pub_from_hi() -> bool {
|
||||||
let abilities = REMOTE.read().keys().cloned().collect();
|
let abilities = REMOTE.read().keys().cloned().collect();
|
||||||
let abilities = BOOT.remote_events.union(&abilities).collect();
|
let abilities = BOOT.remote_events.union(&abilities).map(|s| s.as_str()).collect();
|
||||||
|
|
||||||
Client::push(BodyHi::borrowed(abilities));
|
Client::push(BodyHi::borrowed(abilities));
|
||||||
true
|
true
|
||||||
|
Loading…
Reference in New Issue
Block a user