Add Events filter

Don't crash without self_clid
Improve functions in main.rs

Makefile

@@ -2,11 +2,13 @@
 
 INSTALL_DIR = $(HOME)/.local/bin
 
+export PATH := target/debug:$(PATH)
+
 build:
 	@cargo build
 
 run: build
-	@PATH=$(PWD)/target/debug:$(PATH) ./ts-control
+	./ts-control
 
 install:
 	mkdir -p "$(INSTALL_DIR)"

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<bool>,
 }
 
+#[derive(Clone, ValueEnum)]
+pub enum EventArgsFilter {
+    All,
+    Mine,
+    Others,
+}
+
 #[derive(Args)]
 pub struct EventArgs {
     pub event: Vec<EventType>,
+    #[arg(long, short)]
+    pub filter: Option<EventArgsFilter>,
 }
 
 impl FetchArgs {

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;
 
@@ -27,19 +28,30 @@ pub fn handle_event_response(connection: &mut Telnet, event: Event, known_client
     }
 }
 
-pub fn loop_response_reader(connection: &mut Telnet, self_clid: i32) {
+fn try_get_self_clid(connection: &mut Telnet) -> Option<i32> {
+    wrappers::get_self_clid(connection)
+        .unwrap_or_default()
+        .parse()
+        .map(Some)
+        .unwrap_or(None)
+}
+
+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<i32> = try_get_self_clid(connection);
+
     loop {
         match commands::read_response(connection, true, String::new()) {
             Ok(response) => {
                 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() {
-                        if client.clid == self_clid {
+                        self_clid = try_get_self_clid(connection);
-                            continue;
+                    }
-                        }
+                    if !event.should_handle(filter, self_clid) {
+                        continue;
                     }
 
                     handle_event_response(connection, event, &mut known_clients);

src/main.rs

@@ -1,11 +1,8 @@
 use std::io::{Error, ErrorKind};
-use std::num::ParseIntError;
 
 use telnet::Telnet;
 
-use crate::cli::Commands;
+use crate::cli::{Commands, EventArgsFilter};
-use crate::models::Channel;
-use crate::models::Client;
 
 mod wrappers;
 mod commands;
@@ -16,14 +13,10 @@ mod models;
 mod response;
 mod command_utils;
 
-fn channel_or_error(channel_res: Result<Option<Channel>, String>) -> Result<Channel, Error> {
+fn result_or_error<T>(res: Result<Option<T>, String>, result_type: &str) -> Result<T, Error> {
-    channel_res.map_err(|err| make_action_error("find channel", err))?
+    let error_action = format!("find {}", result_type);
-        .ok_or_else(|| make_action_error("find channel", String::from("Not Found.")))
+    res.map_err(|err| make_action_error(&error_action, err))?
-}
+        .ok_or_else(|| make_action_error(&error_action, String::from("Not Found.")))
-
-fn client_or_error(client_res: Result<Option<Client>, String>) -> Result<Client, Error> {
-    client_res.map_err(|err| make_action_error("find client", err))?
-        .ok_or_else(|| make_action_error("find client", String::from("Not Found.")))
 }
 
 fn connect() -> Result<Telnet, Error> {
@@ -89,7 +82,7 @@ fn main() -> Result<(), Error> {
             }
 
             if args.want_client() {
-                let client = client_or_error(args.client(&mut connection))?;
+                let client = result_or_error(args.client(&mut connection), "client")?;
 
                 match wrappers::fetch_client(&mut connection, &[client]) {
                     Ok(_) => println!("Successfully fetched client."),
@@ -100,7 +93,7 @@ fn main() -> Result<(), Error> {
             }
 
             if args.want_channel() {
-                let channel = channel_or_error(args.channel(&mut connection))?;
+                let channel = result_or_error(args.channel(&mut connection), "channel")?;
 
                 match wrappers::fetch_channel(&mut connection, channel) {
                     Ok(_) => println!("Successfully fetched channel."),
@@ -124,8 +117,8 @@ fn main() -> Result<(), Error> {
         }
 
         Commands::Move(args) => {
-            let channel = channel_or_error(args.channel(&mut connection))?;
+            let channel = result_or_error(args.channel(&mut connection), "channel")?;
-            let client = client_or_error(args.client(&mut connection))?;
+            let client = result_or_error(args.client(&mut connection), "client")?;
 
             match wrappers::move_client(&mut connection, &channel, &[client]) {
                 Ok(resp) => println!("Successfully moved client: {}", resp),
@@ -145,16 +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)?;
 
-                let self_clid: i32 = wrappers::get_self_clid(&mut connection)
+                command_utils::events::loop_response_reader(&mut connection, &filter);
-                    .map_err(|msg| make_action_error("get self clid", msg))?
-                    .parse()
-                    .map_err(|err: ParseIntError| make_action_error("parse clid", err.to_string()))?;
-
-                command_utils::events::loop_response_reader(&mut connection, self_clid);
 
                 // loop_response_reader failed. Let's try to reconnect after 1 second.
                 std::thread::sleep(std::time::Duration::from_secs(1));

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<i32>) -> 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<i32>) -> bool {
+        match filter {
+            EventArgsFilter::All => true,
+            EventArgsFilter::Mine => self.is_mine(self_clid),
+            EventArgsFilter::Others => !self.is_mine(self_clid),
+        }
+    }
 }
 
 impl Serialize for Event {

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