serguzim/teamspeak-query-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions

Add quick action

Browse source
This commit is contained in:
Tobias Reisinger 2023-11-27 20:24:38 +01:00
parent ad58ab9bdd
commit 1f6d175a86
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
2 changed files with 67 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

151
src/wrappers.rs
View file

@ -42,143 +42,108 @@ pub fn login(connection: &mut Telnet) {
} }
pub fn get_channels(connection: &mut Telnet, spacers: bool) -> Result<Vec<Channel>, String> { pub fn get_channels(connection: &mut Telnet, spacers: bool) -> Result<Vec<Channel>, String> {
match commands::channellist(connection) { match commands::channellist(connection)? {
Ok(response) => { Response::DataList(parameter_lists) => {
match response { let channels: Vec<Channel> = parameter_lists.iter()
Response::DataList(parameter_lists) => { .map(|params| Channel::from(params.clone()))
let channels: Vec<Channel> = parameter_lists.iter() .collect();
.map(|params| Channel::from(params.clone())) let mut channels = Channel::sort_list(channels);
.collect(); if !spacers {
let mut channels = Channel::sort_list(channels); channels.retain(|c| !c.is_spacer());
if !spacers {
channels.retain(|c| !c.is_spacer());
}
Ok(channels)
}
_ => Err(String::from("Received unexpected models from Teamspeak."))
} }
Ok(channels)
} }
Err(msg) => Err(msg) _ => Err(String::from("Received unexpected models from Teamspeak."))
} }
} }
pub fn find_channel(connection: &mut Telnet, name: &str, strict: bool) -> Result<Option<Channel>, String> { pub fn find_channel(connection: &mut Telnet, name: &str, strict: bool) -> Result<Option<Channel>, String> {
match commands::channellist(connection) { match commands::channellist(connection)? {
Ok(response) => { Response::DataList(parameter_lists) => {
match response { match parameter::parameter_list_find(&parameter_lists, "channel_name", name, strict) {
Response::DataList(parameter_lists) => { Some(params) => {
match parameter::parameter_list_find(&parameter_lists, "channel_name", name, strict) { Ok(Some(Channel::from(params)))
Some(params) => { }
Ok(Some(Channel::from(params))) None => {
} Ok(None)
None => {
Ok(None)
}
}
} }
_ => Err(String::from("Received unexpected models from Teamspeak."))
} }
} }
Err(msg) => Err(msg) _ => Err(String::from("Received unexpected models from Teamspeak."))
} }
} }
pub fn get_clients(connection: &mut Telnet) -> Result<Vec<Client>, String> { pub fn get_clients(connection: &mut Telnet) -> Result<Vec<Client>, String> {
match commands::clientlist(connection) { match commands::clientlist(connection)? {
Ok(response) => { Response::DataList(parameter_lists) => {
match response { let mut clients: Vec<Client> = parameter_lists.iter()
Response::DataList(parameter_lists) => { .map(|params| Client::from(params.clone()))
let mut clients: Vec<Client> = parameter_lists.iter() .collect();
.map(|params| Client::from(params.clone()))
.collect();
clients.sort_by(|a, b| a.client_nickname.cmp(&b.client_nickname)); clients.sort_by(|a, b| a.client_nickname.cmp(&b.client_nickname));
Ok(clients) Ok(clients)
}
_ => Err(String::from("Received unexpected models from Teamspeak."))
}
} }
Err(msg) => Err(msg) _ => Err(String::from("Received unexpected models from Teamspeak."))
} }
} }
pub fn find_client(connection: &mut Telnet, name: &str, strict: bool) -> Result<Option<Client>, String> { pub fn find_client(connection: &mut Telnet, name: &str, strict: bool) -> Result<Option<Client>, String> {
match commands::clientlist(connection) { match commands::clientlist(connection)? {
Ok(response) => { Response::DataList(parameter_lists) => {
match response { match parameter::parameter_list_find(&parameter_lists, "client_nickname", name, strict) {
Response::DataList(parameter_lists) => { Some(params) => {
match parameter::parameter_list_find(&parameter_lists, "client_nickname", name, strict) { Ok(Some(Client::from(params)))
Some(params) => { }
Ok(Some(Client::from(params))) None => {
} Ok(None)
None => {
Ok(None)
}
}
} }
_ => Err(String::from("Received unexpected models from Teamspeak."))
} }
} }
Err(msg) => Err(msg) _ => Err(String::from("Received unexpected models from Teamspeak."))
} }
} }
pub fn get_channel_clients(connection: &mut Telnet, channel: &Channel) -> Result<Vec<Client>, String> { pub fn get_channel_clients(connection: &mut Telnet, channel: &Channel) -> Result<Vec<Client>, String> {
match commands::clientlist(connection) { match commands::clientlist(connection)? {
Ok(response) => { Response::DataList(parameter_lists) => {
match response { let mut clients: Vec<Client> = Vec::new();
Response::DataList(parameter_lists) => { for client_params in parameter_list_find_all(&parameter_lists, "cid", &channel.cid.to_string(), true) {
let mut clients: Vec<Client> = Vec::new(); clients.push(Client::from(client_params));
for client_params in parameter_list_find_all(&parameter_lists, "cid", &channel.cid.to_string(), true) {
clients.push(Client::from(client_params));
}
Ok(clients)
}
_ => Err(String::from("Received unexpected models from Teamspeak."))
} }
Ok(clients)
} }
Err(msg) => Err(msg) _ => Err(String::from("Received unexpected models from Teamspeak."))
} }
} }
fn get_self_clid(connection: &mut Telnet) -> Result<String, String> { fn get_self_clid(connection: &mut Telnet) -> Result<String, String> {
match commands::whoami(connection) { match commands::whoami(connection)? {
Ok(response) => { Response::Data(params) => {
match response { match parameter::parameter_find(&params, "clid") {
Response::Data(params) => { None => Err(String::from("Could not find clid in models from Teamspeak.")),
match parameter::parameter_find(&params, "clid") { Some(param) => Ok(param.value)
None => Err(String::from("Could not find clid in models from Teamspeak.")),
Some(param) => Ok(param.value)
}
}
_ => Err(String::from("Received unexpected models from Teamspeak for whoami."))
} }
} }
Err(msg) => Err(msg) _ => Err(String::from("Received unexpected models from Teamspeak for whoami."))
} }
} }
pub fn find_self(connection: &mut Telnet) -> Result<Client, String> { pub fn find_self(connection: &mut Telnet) -> Result<Client, String> {
let clid = get_self_clid(connection)?; let clid = get_self_clid(connection)?;
match commands::clientlist(connection) { match commands::clientlist(connection)? {
Ok(response) => { Response::DataList(parameter_lists) => {
match response { match parameter::parameter_list_find(&parameter_lists, "clid", &clid, false) {
Response::DataList(parameter_lists) => { Some(params) => {
match parameter::parameter_list_find(&parameter_lists, "clid", &clid, false) { Ok(Client::from(params))
Some(params) => { }
Ok(Client::from(params)) None => {
} Err(String::from("Could not find self in models from Teamspeak."))
None => {
Err(String::from("Could not find self in models from Teamspeak."))
}
}
} }
_ => Err(String::from("Received unexpected models from Teamspeak for clientlist."))
} }
} }
Err(msg) => Err(msg) _ => Err(String::from("Received unexpected models from Teamspeak for clientlist."))
} }
} }

10
ts-control
View file

@ -1,6 +1,7 @@
#!/usr/bin/env sh #!/usr/bin/env sh
actions="move actions="quick
move
fetch-client fetch-client
fetch-channel fetch-channel
away away
@ -37,6 +38,13 @@ _ts_control_fetch() {
} }
case $action in case $action in
"quick")
action=$($DMENU < "$XDG_CONFIG_HOME/ts-control-quick")
if [ -z "$action" ]; then
exit 1
fi
eval "teamspeak-query-lib $action"
;;
"move") "move")
_ts_control_move_self _ts_control_move_self
;; ;;