-use sysinfo::{ ProcessExt, SystemExt };\r
-\r
use std::{ fs, time::SystemTime };\r
-\r
+use sysinfo::{ ProcessExt, SystemExt };\r
use chrono::{ DateTime, offset::Local };\r
\r
#[derive(Clone, Debug)]\r
pub struct MinecraftExe {\r
- memory: u64, // [kB].\r
+ memory: u64, // [B].\r
load_average_5min: f64, // [%].\r
uptime: u64, // [s].\r
world_size: u64, // [B].\r
active_players: Vec<String>,\r
+ version: String,\r
last_backup: Option<SystemTime>,\r
}\r
\r
impl MinecraftExe {\r
pub fn format_memory(&self) -> String {\r
- format_byte_size(self.memory * 1024, 2)\r
+ format_byte_size(self.memory, 2)\r
}\r
\r
pub fn format_load_average(&self) -> String {\r
}\r
\r
pub fn format_active_players(&self) -> String {\r
- /* Commented because the player list isn't correct (the number is).\r
if self.active_players.len() == 0 {\r
String::from("<none>")\r
} else {\r
self.active_players.join(", ")\r
- }*/\r
- self.active_players.len().to_string()\r
+ }\r
+ }\r
+\r
+ pub fn format_version(&self) -> String {\r
+ self.version.clone()\r
}\r
\r
pub fn format_last_backup(&self) -> String {\r
\r
const MINECRAFT_PROCESS_NAME: &str = "java";\r
\r
-#[cfg(target_os = "linux")]\r
-const STRING_BEFORE_CHARACTER_NAME: &str = "Got character ZDOID from";\r
-\r
-#[cfg(target_os = "linux")]\r
-const STRING_BEFORE_NB_OF_CONNECTIONS: &str = "Connections";\r
+struct StatusFromRcon {\r
+ players: Vec<String>\r
+}\r
\r
-// It doesn't work for the moment, it only scan the connection event and do not treat disconnections.\r
-fn get_active_players(rcon_password: &str) -> Vec<String> {\r
+fn get_status_from_rcon(rcon_password: &str) -> StatusFromRcon {\r
let mut client = minecraft_client_rs::Client::new("127.0.0.1:25575".to_string()).unwrap();\r
\r
- let players =\r
+ let status =\r
match client.authenticate(rcon_password.to_string()) {\r
Ok(_) => {\r
- match client.send_command("list".to_string()) {\r
- Ok(resp) => {\r
- println!("{}", resp.body);\r
- Vec::new()\r
- },\r
- Err(_e) => {\r
- println!("Error asking seed");\r
- Vec::new()\r
- },\r
+ StatusFromRcon {\r
+ players:\r
+ match client.send_command("list".to_string()) {\r
+ Ok(resp) =>\r
+ match resp.body.find(':') {\r
+ Some(i) if i < resp.body.len() -1 =>\r
+ resp.body[i + 1..resp.body.len()]\r
+ .split(',')\r
+ .map(|nick| nick.trim().to_string())\r
+ .filter(|nick| !nick.is_empty())\r
+ .collect(),\r
+ _ => Vec::new()\r
+ },\r
+ Err(_e) => {\r
+ println!("Error from 'list' command");\r
+ Vec::new()\r
+ },\r
+ }\r
}\r
},\r
Err(_e) => {\r
println!("Authentication error");\r
- Vec::new()\r
+ StatusFromRcon { players: Vec::new() }\r
},\r
};\r
\r
client.close().unwrap();\r
\r
- players\r
+ status\r
}\r
\r
fn get_last_backup_datetime(backup_path: &str) -> Option<SystemTime> {\r
pub fn get_minecraft_executable_information(world_path: &str, backup_path: &str, rcon_password: &str) -> Option<MinecraftExe> {\r
let mut system = sysinfo::System::new_all();\r
system.refresh_system();\r
- let processes = system.get_process_by_name(MINECRAFT_PROCESS_NAME);\r
+ let mut processes = system.processes_by_name(MINECRAFT_PROCESS_NAME);\r
\r
// TODO: find the correct process by checking the correct jar name in parameters.\r
- if processes.len() >= 1 {\r
- let process = processes.first().unwrap();\r
+ if let Some(process) = processes.next() {\r
+ let world_size = match fs_extra::dir::get_size(world_path) { Ok(l) => l, Err(_) => 0u64 };\r
\r
- let world_size = match std::fs::metadata(world_path) { Ok(f) => f.len(), Err(_) => 0u64 };\r
+ let status_from_rcon = get_status_from_rcon(rcon_password);\r
\r
Some(\r
MinecraftExe {\r
- memory: process.memory(),\r
- load_average_5min: system.get_load_average().five / system.get_processors().len() as f64 * 100.,\r
+ memory: process.memory(), // Because the Java garbage collector ZGC reports three times more the real memory usage: https://stackoverflow.com/a/62934057/212675\r
+ load_average_5min: system.load_average().five / system.cpus().len() as f64 * 100.,\r
uptime: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - process.start_time(),\r
world_size,\r
- active_players: get_active_players(rcon_password),\r
+ active_players: status_from_rcon.players,\r
+ version: process.cmd()[process.cmd().len() - 2].clone(), // TODO: Extract the version from the .jar filename.\r
last_backup: get_last_backup_datetime(backup_path)\r
}\r
)\r