Skip to content

Commit 103bfe7

Browse files
Sturdyfool11Sturdyfool11
committed
fix a bunch of warnings, change to using Default for config #checkpoint
1 parent c57f944 commit 103bfe7

File tree

9 files changed

+152
-166
lines changed

9 files changed

+152
-166
lines changed

‎src/ControlledProgram.rs‎

Lines changed: 90 additions & 88 deletions
Large diffs are not rendered by default.

‎src/configuration.rs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,14 @@ impl Config {
3939
}
4040
}
4141
}
42+
impl Default for Config {
43+
fn default() -> Self {
44+
Self {
45+
interface: "0.0.0.0".to_string(),
46+
port: "80".to_string(),
47+
servers: vec![],
48+
slave: false,
49+
slaveConnections: vec![],
50+
}
51+
}
52+
}

‎src/defaultconfig.json‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/files.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub fn load_json(path: &str) -> Config {
1919
error!(error);
2020
info!("this is likely ok, trying to salvage from error above by creating a default configuration.");
2121
info!("this can happen if it is your first launch");
22-
let str = include_str!("defaultconfig.json").to_owned();
22+
let str = serde_json::to_string_pretty(&Config::default()).unwrap();
2323
let mut f = File::create(path)
2424
.expect(&format!("There was an error creating the file specified: {}", &path)[..]);
2525
f.write_all(str.as_bytes()).expect("Error Writing to File");

‎src/macros.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#[macro_use]
21
#[macro_export]
32
macro_rules! spawn_tasks {
43
($state:expr, $($task:expr),*) => {
@@ -14,7 +13,6 @@ macro_rules! spawn_tasks {
1413
};
1514
}
1615

17-
#[macro_use]
1816
#[macro_export]
1917
macro_rules! async_listener {
2018
($key:expr, $app:expr) => {{

‎src/master.rs‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@ use tokio_tungstenite::{
1515
};
1616
use tracing::{error, info};
1717

18-
use crate::{
19-
configuration::Config,
20-
messages::{serverInfoMessage, stdinInput, ConsoleOutput, SInfoRequestMessage, ServerInfo},
21-
slave,
22-
AppState::AppState,
23-
};
18+
use crate::{configuration::Config, messages::*, slave, AppState::AppState};
2419

2520
#[derive(Clone, Serialize, Deserialize, Debug)]
2621
pub struct SlaveConnectionDescriptor {
@@ -69,9 +64,9 @@ impl SlaveConnection {
6964
let def = serverInfoMessage {
7065
r#type: "".to_string(),
7166
servers: vec![],
72-
config: serde_json::from_str(include_str!("defaultconfig.json")).unwrap(),
67+
config: Config::default(),
7368
};
74-
let mut sinfo: serverInfoMessage = def.clone();
69+
let mut _sinfo: serverInfoMessage = def.clone();
7570
if let Some(stream) = &mut self.stream {
7671
while let Some(message) = stream.next().await {
7772
match message {
@@ -80,66 +75,68 @@ impl SlaveConnection {
8075
if let Message::Text(text) = msg {
8176
let js: Result<Value, _> = serde_json::from_str(&text);
8277
let js2: Value;
83-
if (js.is_ok()) {
78+
if js.is_ok() {
8479
js2 = js.unwrap();
8580
match js2["type"].as_str().unwrap() {
8681
"ServerInfo" => {
87-
let serdeRes = serde_json::from_str(&text);
88-
if let Ok(val) = serdeRes {
89-
sinfo = val;
82+
let serde_res = serde_json::from_str(&text);
83+
if let Ok(val) = serde_res {
84+
_sinfo = val;
9085
let mut slave_servers =
9186
app_state.slave_servers.lock().await;
92-
let sMessage =
93-
serde_json::to_string(&sinfo).unwrap();
94-
let sDef = serde_json::to_string(&def).unwrap();
95-
if (sMessage != sDef && sinfo.servers.len() != 0) {
96-
for serverInfo in sinfo.servers.iter() {
97-
let newInfo = ServerInfo {
98-
name: serverInfo.name.clone(),
99-
output: serverInfo.output.clone(),
100-
active: serverInfo.active,
87+
let s_message =
88+
serde_json::to_string(&_sinfo).unwrap();
89+
let s_def = serde_json::to_string(&def).unwrap();
90+
if s_message != s_def && _sinfo.servers.len() != 0 {
91+
for server_info in _sinfo.servers.iter() {
92+
let new_info = ServerInfo {
93+
name: server_info.name.clone(),
94+
output: server_info.output.clone(),
95+
active: server_info.active,
10196
host: Some(SlaveConnectionDescriptor {
10297
address: self.address.clone(),
10398
port: self.port.clone(),
10499
}),
105-
specialization: serverInfo
100+
specialization: server_info
106101
.specialization
107102
.clone(),
108-
specializedInfo: serverInfo
103+
specializedInfo: server_info
109104
.specializedInfo
110105
.clone(),
111106
};
112-
let mut foundExistingServer = false;
107+
let mut found_existing_server = false;
113108
for existing_server in
114109
slave_servers.iter_mut()
115110
{
116-
if existing_server.name == newInfo.name
111+
if existing_server.name == new_info.name
117112
{
118113
existing_server.output =
119-
newInfo.output.clone();
114+
new_info.output.clone();
120115
existing_server.specialization =
121-
newInfo.specialization.clone();
116+
new_info.specialization.clone();
122117
existing_server.specializedInfo =
123-
newInfo.specializedInfo.clone();
124-
foundExistingServer = true;
118+
new_info
119+
.specializedInfo
120+
.clone();
121+
found_existing_server = true;
125122
}
126123
}
127-
if !foundExistingServer {
128-
slave_servers.push(newInfo);
124+
if !found_existing_server {
125+
slave_servers.push(new_info);
129126
}
130127
}
131128
}
132129
}
133130
}
134131
"ServerOutput" => {
135-
app_state.tx.send(text.clone());
132+
let _ = app_state.tx.send(text.clone());
136133
}
137134
_ => {}
138135
}
139136
}
140137
}
141138
}
142-
Err(e) => {
139+
Err(_e) => {
143140
// Handle error
144141
}
145142
}
@@ -166,7 +163,8 @@ impl SlaveConnection {
166163
if let Some(stream) = &mut self.stream {
167164
let message = Message::Text(message);
168165

169-
tokio::time::timeout(Duration::from_secs_f64(1. / 1000.), stream.send(message)).await;
166+
let _ = tokio::time::timeout(Duration::from_secs_f64(1. / 1000.), stream.send(message))
167+
.await;
170168
}
171169

172170
// You might want to read a response or confirmation from the slave

‎src/servers.rs‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ use tracing::*;
55
#[no_mangle]
66
pub async fn start_servers(_state: AppState) {
77
let mut config = _state.config.lock().await;
8-
for serverDesc in config.servers.iter_mut() {
9-
if (serverDesc.autoStart) {
10-
let newDesc = serverDesc.clone();
8+
for server_desc in config.servers.iter_mut() {
9+
if server_desc.auto_start {
10+
let new_desc = server_desc.clone();
1111
let mut servers = _state.servers.lock().await;
12-
servers.push(newDesc.into_instance());
12+
servers.push(new_desc.into_instance());
1313
drop(servers);
1414
}
1515
}
@@ -35,13 +35,13 @@ pub async fn process_stdout(state: AppState) {
3535
info!("Server ID: {} has crashed, restarting it...", index);
3636
let mut descriptor = ControlledProgramDescriptor::new(
3737
server.name.as_str(),
38-
server.executablePath.as_str(),
39-
server.commandLineArgs.clone(),
38+
server.executable_path.as_str(),
39+
server.command_line_args.clone(),
4040
server.working_dir.clone(),
4141
);
42-
if server.specializedServerType.is_some() {
43-
descriptor.setSpecialization(
44-
server.specializedServerType.clone().unwrap(),
42+
if server.specialized_server_type.is_some() {
43+
descriptor.set_specialization(
44+
server.specialized_server_type.clone().unwrap(),
4545
);
4646
}
4747
new_instances.push(descriptor);
@@ -62,7 +62,7 @@ pub async fn process_stdout(state: AppState) {
6262
for server in servers.iter_mut() {
6363
let str = match tokio::time::timeout(
6464
tokio::time::Duration::from_secs_f64(1. / 10.),
65-
server.readOutput(),
65+
server.read_output(),
6666
)
6767
.await
6868
{
@@ -76,10 +76,9 @@ pub async fn process_stdout(state: AppState) {
7676
r#type: "ServerOutput".to_owned(),
7777
output: val,
7878
server_name: server.name.clone(),
79-
server_type: server.specializedServerType.clone(),
79+
server_type: server.specialized_server_type.clone(),
8080
};
8181
let _ = state.tx.send(serde_json::to_string(&out).unwrap());
82-
8382
}
8483
}
8584

‎src/webserver.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ async fn get_router(_state: AppState) -> Router<AppState> {
3434
.route("/favicon.ico", get(handle_icon));
3535
router
3636
}
37-
async fn handle_icon(State(state): State<AppState>) -> impl IntoResponse {
37+
async fn handle_icon(State(_state): State<AppState>) -> impl IntoResponse {
3838
let ico_bytes: &'static [u8] = include_bytes!("html_src/icon.ico");
3939
let response = Response::builder()
4040
.status(StatusCode::OK)

‎src/websocket.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@ async fn process_message(text: String, state: AppState) {
118118
name: server.name.clone(),
119119
output: "".to_owned(),
120120
active: true,
121-
specialization: server.specializedServerType.clone(),
122-
specializedInfo: server.specializedServerInfo.clone(),
121+
specialization: server.specialized_server_type.clone(),
122+
specializedInfo: server.specialized_server_info.clone(),
123123
host: None,
124124
};
125125
if (val.arguments[0] == true) {
126-
let cl: String = server.currOutputInProgress.clone();
126+
let cl: String = server.curr_output_in_progress.clone();
127127
let split: Vec<&str> = cl.split("\n").into_iter().collect();
128128
let mut inp = split.len();
129129
if (inp < 150) {
@@ -159,8 +159,8 @@ async fn process_message(text: String, state: AppState) {
159159
name: serverConfig.name.clone(),
160160
output: "".to_owned(),
161161
active: false,
162-
specialization: serverConfig.specializedServerType.clone(),
163-
specializedInfo: serverConfig.specializedServerInfo.clone(),
162+
specialization: serverConfig.specialized_server_type.clone(),
163+
specializedInfo: serverConfig.specialized_server_info.clone(),
164164
host: None,
165165
})
166166
}
@@ -250,7 +250,7 @@ async fn process_message(text: String, state: AppState) {
250250
config.change(message.updatedConfig);
251251
config.update_config_file("config.json");
252252
for (index, desc) in config.servers.iter_mut().enumerate() {
253-
if (desc.autoStart) {
253+
if (desc.auto_start) {
254254
let mut descClone = desc.clone();
255255
servers.push(descClone.into_instance());
256256
}
@@ -260,5 +260,4 @@ async fn process_message(text: String, state: AppState) {
260260
}
261261
_ => {}
262262
}
263-
264263
}

0 commit comments

Comments
 (0)