diff --git a/src/cli.rs b/src/cli.rs index 9cfdb0d..62898e9 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -1,4 +1,4 @@ -use clap::{Args, Parser, Subcommand}; +use clap::{Args, Parser, Subcommand, ValueEnum}; use telnet::Telnet; use crate::parameter::ParameterList; @@ -79,9 +79,18 @@ pub struct UpdateArgs { speakers: Option, } +#[derive(Clone, ValueEnum)] +pub enum EventArgsFilter { + All, + Mine, + Others, +} + #[derive(Args)] pub struct EventArgs { pub event: Vec, + #[arg(long, short)] + pub filter: Option, } impl FetchArgs { diff --git a/src/command_utils/events.rs b/src/command_utils/events.rs index 9e6f35e..34881fd 100644 --- a/src/command_utils/events.rs +++ b/src/command_utils/events.rs @@ -1,6 +1,7 @@ use telnet::Telnet; use crate::{commands, wrappers}; +use crate::cli::EventArgsFilter; use crate::models::{Client, Event, EventType}; use crate::response::Response; @@ -35,7 +36,7 @@ fn try_get_self_clid(connection: &mut Telnet) -> Option { .unwrap_or(None) } -pub fn loop_response_reader(connection: &mut Telnet) { +pub fn loop_response_reader(connection: &mut Telnet, filter: &EventArgsFilter) { let mut known_clients = wrappers::get_clients(connection).unwrap_or_else(|_| Vec::new()); let mut self_clid: Option = try_get_self_clid(connection); @@ -46,13 +47,11 @@ pub fn loop_response_reader(connection: &mut Telnet) { if let Response::Event(event_type, params) = response { let event = Event::new(connection, event_type, params, &known_clients); - if let Some(client) = &event.client { - if self_clid.is_none() { - self_clid = try_get_self_clid(connection); - } - if Some(client.clid) == self_clid { - continue; - } + if self_clid.is_none() { + self_clid = try_get_self_clid(connection); + } + if !event.should_handle(filter, self_clid) { + continue; } handle_event_response(connection, event, &mut known_clients); diff --git a/src/main.rs b/src/main.rs index ac3fdf4..d82e91b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,7 +2,7 @@ use std::io::{Error, ErrorKind}; use telnet::Telnet; -use crate::cli::Commands; +use crate::cli::{Commands, EventArgsFilter}; mod wrappers; mod commands; @@ -138,11 +138,12 @@ fn main() -> Result<(), Error> { } Commands::Events(args) => { + let filter = args.filter.unwrap_or(EventArgsFilter::All); loop { command_utils::events::register_events(&mut connection, args.event.clone()) .map_err(to_other_error)?; - command_utils::events::loop_response_reader(&mut connection); + command_utils::events::loop_response_reader(&mut connection, &filter); // loop_response_reader failed. Let's try to reconnect after 1 second. std::thread::sleep(std::time::Duration::from_secs(1)); diff --git a/src/models/event.rs b/src/models/event.rs index 50360bd..fbc8b6d 100644 --- a/src/models/event.rs +++ b/src/models/event.rs @@ -4,6 +4,7 @@ use std::str::FromStr; use serde::{Deserialize, Serialize, Serializer}; use serde::ser::SerializeStruct; use telnet::Telnet; +use crate::cli::EventArgsFilter; use crate::models::{Channel, Client}; use crate::parameter::{parameter_find, ParameterList}; @@ -265,6 +266,23 @@ impl Event { _ => String::from(""), } } + + pub fn is_mine(&self, self_clid: Option) -> bool { + if let Some(self_clid) = self_clid { + if let Some(client) = &self.client { + return client.clid == self_clid; + } + } + false + } + + pub fn should_handle(&self, filter: &EventArgsFilter, self_clid: Option) -> bool { + match filter { + EventArgsFilter::All => true, + EventArgsFilter::Mine => self.is_mine(self_clid), + EventArgsFilter::Others => !self.is_mine(self_clid), + } + } } impl Serialize for Event { diff --git a/ts-control b/ts-control index 31adc4e..61cced6 100755 --- a/ts-control +++ b/ts-control @@ -99,7 +99,7 @@ case $action in teamspeak-query-lib message --strict-client --client "$user" "$message" ;; "events") - teamspeak-query-lib events NotifyClientMoved NotifyClientEnterView NotifyClientLeftView NotifyTextMessage NotifyClientPoke \ + teamspeak-query-lib events --filter=others NotifyClientMoved NotifyClientEnterView NotifyClientLeftView NotifyTextMessage NotifyClientPoke \ | jq -r --unbuffered '.message' \ | tee >(xargs -I{} notify-send "TS3 Event" "{}") esac