From 1002782e8fb15a30f567a2d4c5fbae72b1363eb5 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Fri, 17 Nov 2023 17:43:29 +0100 Subject: [PATCH] Auto-reformat code --- src/cli.rs | 3 ++- src/commands.rs | 5 +++-- src/main.rs | 15 ++++++++------- src/parameter.rs | 2 ++ src/response.rs | 40 ++++++++++++++++++++-------------------- src/response/channel.rs | 1 + src/response/client.rs | 1 + src/utils.rs | 7 ++++--- 8 files changed, 41 insertions(+), 33 deletions(-) diff --git a/src/cli.rs b/src/cli.rs index 1dd3606..1f80abc 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -1,5 +1,6 @@ -use clap::{Parser, Subcommand, Args}; +use clap::{Args, Parser, Subcommand}; use telnet::Telnet; + use crate::parameter::{Parameter, ParameterList}; use crate::response::channel::ResponseChannel; use crate::response::client::ResponseClient; diff --git a/src/commands.rs b/src/commands.rs index 39630a2..9990344 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -1,7 +1,7 @@ -use telnet::Telnet; use telnet::Event::Data; -use crate::parameter::ParameterList; +use telnet::Telnet; +use crate::parameter::ParameterList; use crate::response::Response; fn to_single_response(resp: Response) -> Response { @@ -45,6 +45,7 @@ fn send_command(connection: &mut Telnet, command: &str, skip_ok: bool) -> Result read_response(connection, skip_ok, String::new()) } + fn read_response(connection: &mut Telnet, skip_ok: bool, mut buffer: String) -> Result { let (response_str, buffer) = read_response_buffer(connection, &mut buffer)?; diff --git a/src/main.rs b/src/main.rs index e4a40d5..3550aed 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,15 +1,17 @@ +use std::process::exit; + +use telnet::Telnet; + +use crate::cli::Commands; +use crate::response::channel::ResponseChannel; +use crate::response::client::ResponseClient; + mod response; mod utils; mod commands; mod parameter; mod cli; -use std::process::exit; -use telnet::Telnet; -use crate::cli::Commands; -use crate::response::channel::ResponseChannel; -use crate::response::client::ResponseClient; - fn channel_or_exit(channel_res: Result, String>) -> ResponseChannel { channel_res.unwrap_or_else(|err| { println!("Failed to find channel: {}", err); @@ -33,7 +35,6 @@ fn client_or_exit(client_res: Result, String>) -> Respons } fn main() { - let cli = cli::init(); let connection = Telnet::connect(("127.0.0.1", 25639), 512 * 1024); diff --git a/src/parameter.rs b/src/parameter.rs index 8890aa9..2ec73e2 100644 --- a/src/parameter.rs +++ b/src/parameter.rs @@ -16,6 +16,7 @@ pub fn parameter_find(params: &Vec, name: &str) -> Option } None } + pub fn parameter_list_find(param_lists: &Vec, name: &str, value: &str, strict: bool) -> Option { for params in param_lists { if params.iter().any(|param| param.is(name, value, strict)) { @@ -24,6 +25,7 @@ pub fn parameter_list_find(param_lists: &Vec, name: &str, value: } None } + pub fn parameter_list_find_all(param_lists: &Vec, name: &str, value: &str, strict: bool) -> Vec { let mut found = Vec::new(); for params in param_lists { diff --git a/src/response.rs b/src/response.rs index 6dab5ba..0c74615 100644 --- a/src/response.rs +++ b/src/response.rs @@ -1,9 +1,10 @@ +use std::fmt::{Debug, Display, Formatter}; + +use crate::parameter::*; + pub mod channel; pub mod client; -use std::fmt::{Debug, Display, Formatter}; -use crate::parameter::*; - pub enum Response { Ok, Data(ParameterList), @@ -25,8 +26,7 @@ impl TryFrom for Response { response_str = response_str.trim_start_matches("error "); let response_params = parameter_parse(response_str); Err(ResponseError::create_error(&response_params)) - } - else { + } else { let mut parameter_lists: Vec = Vec::new(); for response_entry in response_str.split('|') { let response_params = parameter_parse(response_entry); @@ -39,23 +39,23 @@ impl TryFrom for Response { impl Debug for Response { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - match self { - Response::Ok => { - write!(f, "Ok") - } - Response::Data(params) => { - write!(f, "Data:")?; + match self { + Response::Ok => { + write!(f, "Ok") + } + Response::Data(params) => { + write!(f, "Data:")?; + write!(f, "{:?};", params)?; + Ok(()) + } + Response::DataList(params_list) => { + write!(f, "DataList:")?; + for params in params_list { write!(f, "{:?};", params)?; - Ok(()) } - Response::DataList(params_list) => { - write!(f, "DataList:")?; - for params in params_list { - write!(f, "{:?};", params)?; - } - Ok(()) - } - } + Ok(()) + } + } } } diff --git a/src/response/channel.rs b/src/response/channel.rs index ab5d0fe..88be17c 100644 --- a/src/response/channel.rs +++ b/src/response/channel.rs @@ -1,4 +1,5 @@ use std::fmt::{Display, Formatter}; + use crate::parameter::{parameter_find, ParameterList}; #[derive(Debug)] diff --git a/src/response/client.rs b/src/response/client.rs index 4a59d07..93fd50c 100644 --- a/src/response/client.rs +++ b/src/response/client.rs @@ -1,4 +1,5 @@ use std::fmt::{Display, Formatter}; + use crate::parameter::{parameter_find, ParameterList}; #[derive(Debug)] diff --git a/src/utils.rs b/src/utils.rs index 1252c8f..b2f8e95 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,13 +1,14 @@ use std::process::exit; -use telnet::Telnet; use std::time::Duration; + use telnet::Event::TimedOut; +use telnet::Telnet; use crate::{commands, parameter}; use crate::parameter::{parameter_list_find_all, ParameterList}; -use crate::response::Response; use crate::response::channel::ResponseChannel; use crate::response::client::ResponseClient; +use crate::response::Response; pub fn skip_welcome(connection: &mut Telnet) { loop { @@ -31,7 +32,7 @@ pub fn login(connection: &mut Telnet) { }); match commands::login(connection, &apikey) { - Ok(_) => {}, + Ok(_) => {} Err(msg) => { println!("Failed to authenticate with Teamspeak: {}", msg); exit(1);