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 2024-06-20 17:55:27 +08:00
parent 5816d81f1b
commit 9ef7d27daa
No known key found for this signature in database
3 changed files with 3 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
yazi-cli/src/args.rs
View file

@ -18,8 +18,6 @@ pub(super) struct Args {
pub(super) enum Command { pub(super) enum Command {
/// Publish a message to remote instance(s). /// Publish a message to remote instance(s).
Pub(CommandPub), Pub(CommandPub),
/// Publish a static message to all remote instances.
PubStatic(CommandPubStatic),
/// Manage packages. /// Manage packages.
Pack(CommandPack), Pack(CommandPack),
/// Subscribe to messages from all remote instances. /// Subscribe to messages from all remote instances.
@ -66,35 +64,6 @@ impl CommandPub {
} }
} }
#[derive(clap::Args)]
pub(super) struct CommandPubStatic {
/// The kind of message.
#[arg(index = 1)]
pub(super) kind: String,
/// The severity of the message.
#[arg(index = 2)]
pub(super) severity: u16,
/// Send the message with a string body.
#[arg(long)]
pub(super) str: Option<String>,
/// Send the message with a JSON body.
#[arg(long)]
pub(super) json: Option<String>,
}
impl CommandPubStatic {
#[allow(dead_code)]
pub(super) fn body(&self) -> Result<Cow<str>> {
if let Some(json) = &self.json {
Ok(json.into())
} else if let Some(str) = &self.str {
Ok(serde_json::to_string(str)?.into())
} else {
Ok("".into())
}
}
}
#[derive(clap::Args)] #[derive(clap::Args)]
#[command(arg_required_else_help = true)] #[command(arg_required_else_help = true)]
pub(super) struct CommandPack { pub(super) struct CommandPack {

9
yazi-cli/src/main.rs
View file

@ -19,14 +19,7 @@ async fn main() -> anyhow::Result<()> {
match Args::parse().command { match Args::parse().command {
Command::Pub(cmd) => { Command::Pub(cmd) => {
yazi_dds::init(); yazi_dds::init();
if let Err(e) = yazi_dds::Client::shot(&cmd.kind, cmd.receiver()?, None, &cmd.body()?).await { if let Err(e) = yazi_dds::Client::shot(&cmd.kind, cmd.receiver()?, &cmd.body()?).await {
eprintln!("Cannot send message: {e}");
std::process::exit(1);
}
}
Command::PubStatic(cmd) => {
yazi_dds::init();
if let Err(e) = yazi_dds::Client::shot(&cmd.kind, 0, Some(cmd.severity), &cmd.body()?).await {
eprintln!("Cannot send message: {e}"); eprintln!("Cannot send message: {e}");
std::process::exit(1); std::process::exit(1);
} }

5
yazi-dds/src/client.rs
View file

@ -64,12 +64,11 @@ impl Client {
} }
/// Connect to an existing server to send a single message. /// 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, body: &str) -> Result<()> {
Body::validate(kind)?; Body::validate(kind)?;
let sender = severity.map(Into::into).unwrap_or(*ID);
let payload = format!( let payload = format!(
"{}\n{kind},{receiver},{sender},{body}\n{}\n", "{}\n{kind},{receiver},{ID},{body}\n{}\n",
Payload::new(BodyHi::borrowed(Default::default())), Payload::new(BodyHi::borrowed(Default::default())),
Payload::new(BodyBye::owned()) Payload::new(BodyBye::owned())
); );