\r
use chrono::{ DateTime, offset::Local };\r
\r
-#[cfg(target_os = "linux")]\r
-use systemd::journal;\r
-\r
#[derive(Clone, Debug)]\r
pub struct MinecraftExe {\r
memory: u64, // [kB].\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_last_backup(&self) -> String {\r
String::from("")\r
}\r
\r
-const MINECRAFT_PROCESS_NAME: &str = "minecraft_server";\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
-\r
-// It doesn't work for the moment, it only scan the connection event and do not treat disconnections.\r
-#[cfg(target_os = "linux")]\r
-fn get_active_players() -> Vec<String> {\r
- let mut journal =\r
- journal::OpenOptions::default().current_user(true).open().unwrap();\r
-\r
- journal.seek_tail().unwrap();\r
-\r
- let mut number_of_connections = -1i32;\r
- let mut players : Vec<String> = Vec::new();\r
-\r
- loop {\r
- match journal.previous_entry() {\r
- Ok(Some(entry)) => {\r
- if let (Some(unit), Some(mess)) = (entry.get("_SYSTEMD_UNIT"), entry.get("MESSAGE")) {\r
- if unit == "minecraft.service" {\r
- if let Some(pos) = mess.find(STRING_BEFORE_CHARACTER_NAME) {\r
- let character_str = mess.get(pos+STRING_BEFORE_CHARACTER_NAME.len()+1..).unwrap();\r
- if let Some(pos_end) = character_str.find(" : ") {\r
- let player_name = String::from(character_str.get(0..pos_end).unwrap());\r
- if !players.contains(&player_name) {\r
- players.push(player_name);\r
- if players.len() as i32 == number_of_connections {\r
- return players;\r
- }\r
- }\r
- }\r
- }\r
- else if let Some(pos) = mess.find(STRING_BEFORE_NB_OF_CONNECTIONS) {\r
- let nb_of_connections_str = mess.get(pos+STRING_BEFORE_NB_OF_CONNECTIONS.len()+1..).unwrap();\r
- if let Some(pos_end) = nb_of_connections_str.find(' ') {\r
- if let Ok(n) = nb_of_connections_str.get(0..pos_end).unwrap().parse::<i32>() {\r
- if number_of_connections == -1 {\r
- number_of_connections = n;\r
-\r
- if players.len() as i32 >= number_of_connections {\r
- return players;\r
- }\r
- }\r
- }\r
- }\r
+const MINECRAFT_PROCESS_NAME: &str = "java";\r
+\r
+struct StatusFromRcon {\r
+ players: Vec<String>,\r
+}\r
+\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 status =\r
+ match client.authenticate(rcon_password.to_string()) {\r
+ Ok(_) => {\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
},\r
- _ => return players\r
- }\r
- }\r
-}\r
+ Err(_e) => {\r
+ println!("Authentication error");\r
+ StatusFromRcon { players: Vec::new() }\r
+ },\r
+ };\r
+\r
+ client.close().unwrap();\r
\r
-#[cfg(target_os = "windows")]\r
-fn get_active_players() -> Vec<String> {\r
- Vec::new()\r
+ status\r
}\r
\r
fn get_last_backup_datetime(backup_path: &str) -> Option<SystemTime> {\r
Some(times.last()?.clone())\r
}\r
\r
-pub fn get_minecraft_executable_information(world_path: &str, backup_path: &str) -> Option<MinecraftExe> {\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
- if processes.len() >= 1 {\r
- let process = processes.first().unwrap();\r
+ // TODO: find the correct process by checking the correct jar name in parameters.\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
+ load_average_5min: system.load_average().five / system.processors().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(),\r
+ active_players: status_from_rcon.players,\r
last_backup: get_last_backup_datetime(backup_path)\r
}\r
)\r
projects / minecraft_web.git / blobdiff