hedgewars: comparison rust/hedgewars-server/src/protocol/messages.rs

equal deleted inserted replaced

-:a077aac9df01
+:98ef2913ec73
-use crate::server::coretypes::{
+use crate::server::coretypes::{GameCfg, HedgehogInfo, ServerVar, TeamInfo, VoteType};
-ServerVar, GameCfg, TeamInfo,
+use std::{convert::From, iter::once, ops};
-HedgehogInfo, VoteType
-};
-use std::{ops, convert::From, iter::once};
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub enum HWProtocolMessage {
 // core
 Ping,
 Nick(String),
 Proto(u16),
 ServerAuth(String),
 LobbyLeft(String, String),
 LobbyJoined(Vec<String>),
-ChatMsg {nick: String, msg: String},
+ChatMsg { nick: String, msg: String },
 ClientFlags(String, Vec<String>),
 Rooms(Vec<String>),
 RoomAdd(Vec<String>),
 RoomJoined(Vec<String>),
 RoomLeft(String, String),
 Error(String),
 Connected(u32),
 Unreachable,
 //Deprecated messages
-LegacyReady(bool, Vec<String>)
+LegacyReady(bool, Vec<String>),
 }
-pub fn server_chat(msg: String) -> HWServerMessage  {
+pub fn server_chat(msg: String) -> HWServerMessage {
-HWServerMessage::ChatMsg{ nick: "[server]".to_string(), msg }
+HWServerMessage::ChatMsg {
+nick: "[server]".to_string(),
+msg,
+}
 }
 impl GameCfg {
 pub fn to_protocol(&self) -> (String, Vec<String>) {
 use crate::server::coretypes::GameCfg::*;
 v.extend(s.clone().into_iter());
 v
 }),
 Script(s) => ("SCRIPT".to_string(), vec![s.to_string()]),
 Theme(t) => ("THEME".to_string(), vec![t.to_string()]),
-DrawnMap(m) => ("DRAWNMAP".to_string(), vec![m.to_string()])
+DrawnMap(m) => ("DRAWNMAP".to_string(), vec![m.to_string()]),
 }
 }
 pub fn to_server_msg(&self) -> HWServerMessage {
 use self::HWServerMessage::ConfigEntry;
 HWServerMessage::ConfigEntry(name, args)
 }
 }
 macro_rules! const_braces {
-($e: expr) => { "{}\n" }
+($e: expr) => {
+"{}\n"
+};
 }
 macro_rules! msg {
 [$($part: expr),*] => {
 format!(concat!($(const_braces!($part)),*, "\n"), $($part),*);
 Quit(None) => msg!["QUIT"],
 Quit(Some(msg)) => msg!["QUIT", msg],
 Global(msg) => msg!["CMD", format!("GLOBAL {}", msg)],
 Watch(name) => msg!["CMD", format!("WATCH {}", name)],
 ToggleServerRegisteredOnly => msg!["CMD", "REGISTERED_ONLY"],
-SuperPower =>  msg!["CMD", "SUPER_POWER"],
+SuperPower => msg!["CMD", "SUPER_POWER"],
 Info(info) => msg!["CMD", format!("INFO {}", info)],
 Nick(nick) => msg!("NICK", nick),
 Proto(version) => msg!["PROTO", version],
 Password(p, s) => msg!["PASSWORD", p, s],
 Checker(i, n, p) => msg!["CHECKER", i, n, p],
 List => msg!["LIST"],
 Chat(msg) => msg!["CHAT", msg],
 CreateRoom(name, None) => msg!["CREATE_ROOM", name],
-CreateRoom(name, Some(password)) =>
+CreateRoom(name, Some(password)) => msg!["CREATE_ROOM", name, password],
-msg!["CREATE_ROOM", name, password],
 JoinRoom(name, None) => msg!["JOIN_ROOM", name],
-JoinRoom(name, Some(password)) =>
+JoinRoom(name, Some(password)) => msg!["JOIN_ROOM", name, password],
-msg!["JOIN_ROOM", name, password],
 Follow(name) => msg!["FOLLOW", name],
-Rnd(args) => if args.is_empty() {
+Rnd(args) => {
-msg!["CMD", "RND"]
+if args.is_empty() {
-} else {
+msg!["CMD", "RND"]
-msg!["CMD", format!("RND {}", args.join(" "))]
+} else {
-},
+msg!["CMD", format!("RND {}", args.join(" "))]
+}
+}
 Kick(name) => msg!["KICK", name],
 Ban(name, reason, time) => msg!["BAN", name, reason, time],
 BanIP(ip, reason, time) => msg!["BAN_IP", ip, reason, time],
-BanNick(nick, reason, time) =>
+BanNick(nick, reason, time) => msg!("BAN_NICK", nick, reason, time),
-msg!("BAN_NICK", nick, reason, time),
 BanList => msg!["BANLIST"],
 Unban(name) => msg!["UNBAN", name],
 //SetServerVar(ServerVar), ???
 GetServerVar => msg!["GET_SERVER_VAR"],
 RestartServer => msg!["CMD", "RESTART_SERVER YES"],
 Part(None) => msg!["PART"],
 Part(Some(msg)) => msg!["PART", msg],
 Cfg(config) => {
 let (name, args) = config.to_protocol();
 msg!["CFG", name, args.join("\n")]
-},
+}
-AddTeam(info) =>
+AddTeam(info) => msg![
-msg!["ADD_TEAM", info.name, info.color, info.grave, info.fort,
+"ADD_TEAM",
-info.voice_pack, info.flag, info.difficulty,
+info.name,
-info.hedgehogs.iter()
+info.color,
-.flat_map(|h| several![&h.name[..], &h.hat[..]])
+info.grave,
-.collect::<Vec<_>>().join("\n")],
+info.fort,
+info.voice_pack,
+info.flag,
+info.difficulty,
+info.hedgehogs
+.iter()
+.flat_map(|h| several![&h.name[..], &h.hat[..]])
+.collect::<Vec<_>>()
+.join("\n")
+],
 RemoveTeam(name) => msg!["REMOVE_TEAM", name],
 SetHedgehogsNumber(team, number) => msg!["HH_NUM", team, number],
 SetTeamColor(team, color) => msg!["TEAM_COLOR", team, color],
 ToggleReady => msg!["TOGGLE_READY"],
 StartGame => msg!["START_GAME"],
 ToggleRestrictTeams => msg!["TOGGLE_RESTRICT_TEAMS"],
 ToggleRegisteredOnly => msg!["TOGGLE_REGISTERED_ONLY"],
 RoomName(name) => msg!["ROOM_NAME", name],
 Delegate(name) => msg!["CMD", format!("DELEGATE {}", name)],
 TeamChat(msg) => msg!["TEAMCHAT", msg],
-MaxTeams(count) => msg!["CMD", format!("MAXTEAMS {}", count)] ,
+MaxTeams(count) => msg!["CMD", format!("MAXTEAMS {}", count)],
 Fix => msg!["CMD", "FIX"],
 Unfix => msg!["CMD", "UNFIX"],
 Greeting(msg) => msg!["CMD", format!("GREETING {}", msg)],
 //CallVote(Option<(String, Option<String>)>) =>, ??
-Vote(msg) => msg!["CMD", format!("VOTE {}", if *msg {"YES"} else {"NO"})],
+Vote(msg) => msg!["CMD", format!("VOTE {}", if *msg { "YES" } else { "NO" })],
-ForceVote(msg) => msg!["CMD", format!("FORCE {}", if *msg {"YES"} else {"NO"})],
+ForceVote(msg) => msg!["CMD", format!("FORCE {}", if *msg { "YES" } else { "NO" })],
 Save(name, location) => msg!["CMD", format!("SAVE {} {}", name, location)],
 Delete(name) => msg!["CMD", format!("DELETE {}", name)],
 SaveRoom(name) => msg!["CMD", format!("SAVEROOM {}", name)],
 LoadRoom(name) => msg!["CMD", format!("LOADROOM {}", name)],
 Malformed => msg!["A", "QUICK", "BROWN", "HOG", "JUMPS", "OVER", "THE", "LAZY", "DOG"],
 Empty => msg![""],
-_ => panic!("Protocol message not yet implemented")
+_ => panic!("Protocol message not yet implemented"),
 }
 }
 }
 fn construct_message(header: &[&str], msg: &[String]) -> String {
 Ping => msg!["PING"],
 Pong => msg!["PONG"],
 Connected(protocol_version) => msg![
 "CONNECTED",
 "Hedgewars server https://www.hedgewars.org/",
-protocol_version],
+protocol_version
+],
 Bye(msg) => msg!["BYE", msg],
 Nick(nick) => msg!["NICK", nick],
 Proto(proto) => msg!["PROTO", proto],
 ServerAuth(hash) => msg!["SERVER_AUTH", hash],
 LobbyLeft(nick, msg) => msg!["LOBBY:LEFT", nick, msg],
-LobbyJoined(nicks) =>
+LobbyJoined(nicks) => construct_message(&["LOBBY:JOINED"], &nicks),
-construct_message(&["LOBBY:JOINED"], &nicks),
+ClientFlags(flags, nicks) => construct_message(&["CLIENT_FLAGS", flags], &nicks),
-ClientFlags(flags, nicks) =>
+Rooms(info) => construct_message(&["ROOMS"], &info),
-construct_message(&["CLIENT_FLAGS", flags], &nicks),
+RoomAdd(info) => construct_message(&["ROOM", "ADD"], &info),
-Rooms(info) =>
+RoomJoined(nicks) => construct_message(&["JOINED"], &nicks),
-construct_message(&["ROOMS"], &info),
-RoomAdd(info) =>
-construct_message(&["ROOM", "ADD"], &info),
-RoomJoined(nicks) =>
-construct_message(&["JOINED"], &nicks),
 RoomLeft(nick, msg) => msg!["LEFT", nick, msg],
 RoomRemove(name) => msg!["ROOM", "DEL", name],
-RoomUpdated(name, info) =>
+RoomUpdated(name, info) => construct_message(&["ROOM", "UPD", name], &info),
-construct_message(&["ROOM", "UPD", name], &info),
+TeamAdd(info) => construct_message(&["ADD_TEAM"], &info),
-TeamAdd(info) =>
-construct_message(&["ADD_TEAM"], &info),
 TeamRemove(name) => msg!["REMOVE_TEAM", name],
 TeamAccepted(name) => msg!["TEAM_ACCEPTED", name],
 TeamColor(name, color) => msg!["TEAM_COLOR", name, color],
 HedgehogsNumber(name, number) => msg!["HH_NUM", name, number],
-ConfigEntry(name, values) =>
+ConfigEntry(name, values) => construct_message(&["CFG", name], &values),
-construct_message(&["CFG", name], &values),
 Kicked => msg!["KICKED"],
 RunGame => msg!["RUN_GAME"],
-ForwardEngineMessage(em) =>
+ForwardEngineMessage(em) => construct_message(&["EM"], &em),
-construct_message(&["EM"], &em),
 RoundFinished => msg!["ROUND_FINISHED"],
-ChatMsg {nick, msg} => msg!["CHAT", nick, msg],
+ChatMsg { nick, msg } => msg!["CHAT", nick, msg],
 ServerMessage(msg) => msg!["SERVER_MESSAGE", msg],
 Notice(msg) => msg!["NOTICE", msg],
 Warning(msg) => msg!["WARNING", msg],
 Error(msg) => msg!["ERROR", msg],
-LegacyReady(is_ready, nicks) =>
+LegacyReady(is_ready, nicks) => {
-construct_message(&[if *is_ready {"READY"} else {"NOT_READY"}], &nicks),
+construct_message(&[if *is_ready { "READY" } else { "NOT_READY" }], &nicks)
+}
 _ => msg!["ERROR", "UNIMPLEMENTED"],
 }
 }
 }

changeset 14457	98ef2913ec73
parent 14415	06672690d71b
child 14697	f64e21f164a5