slightly refactored

This commit is contained in:
Wiktor Mazur
2019-08-14 12:03:10 +02:00
parent b24bbd0b56
commit 7f812c5ec9
3 changed files with 72 additions and 79 deletions
+4 -13
View File
@@ -8,7 +8,6 @@ use std::sync::mpsc;
use simplelog::*; use simplelog::*;
use log::*; use log::*;
use std::time::Instant;
use packet_sniffer::UdpPacket; use packet_sniffer::UdpPacket;
@@ -31,7 +30,6 @@ fn main() {
packet_sniffer::receive(tx); packet_sniffer::receive(tx);
let mut meter = meter::Meter::new(); let mut meter = meter::Meter::new();
let now = Instant::now();
loop { loop {
if let Ok(packet) = rx.recv() { if let Ok(packet) = rx.recv() {
if packet.destination_port != 5056 && packet.source_port != 5056 { if packet.destination_port != 5056 && packet.source_port != 5056 {
@@ -43,26 +41,19 @@ fn main() {
debug!("Found message {:?}", msg); debug!("Found message {:?}", msg);
match msg { match msg {
game_protocol::Message::Leave(msg) => meter.register_leave(msg.source), game_protocol::Message::Leave(msg) => meter.register_leave(msg.source).unwrap_or(()),
game_protocol::Message::NewCharacter(msg) => meter.register_player(&msg.character_name, msg.source), game_protocol::Message::NewCharacter(msg) => meter.register_player(&msg.character_name, msg.source),
game_protocol::Message::CharacterStats(msg) => meter.register_main_player(&msg.character_name, msg.source), game_protocol::Message::CharacterStats(msg) => meter.register_main_player(&msg.character_name, msg.source),
game_protocol::Message::HealthUpdate(msg) => meter.register_damage_dealt(msg.source, msg.value), game_protocol::Message::HealthUpdate(msg) => meter.register_damage_dealt(msg.source, msg.value).unwrap_or(()),
game_protocol::Message::RegenerationHealthChanged(msg) => { game_protocol::Message::RegenerationHealthChanged(msg) => {
match msg.regeneration_rate { match msg.regeneration_rate {
Some(_) => meter.register_combat_leave(msg.source), Some(_) => meter.register_combat_leave(msg.source).unwrap_or(()),
None => meter.register_combat_enter(msg.source) // TODO: handle death None => meter.register_combat_enter(msg.source).unwrap_or(()) // TODO: handle death
} }
} }
_ => {} _ => {}
} }
} }
if now.elapsed().as_millis() % 10 == 0 {
print!("{}[2J", 27 as char);
println!("{:?}", meter.get_instance_session());
}
} }
} }
} }
+56 -35
View File
@@ -10,6 +10,15 @@ mod player;
use player::Player; use player::Player;
#[derive(Debug, Copy, Clone, PartialEq)]
struct DPS(f32);
impl DPS {
fn new(damage: f32, time: f32) -> Self {
Self(damage / time * 1000.0)
}
}
#[derive(Hash, Eq, PartialEq)] #[derive(Hash, Eq, PartialEq)]
struct PlayerName(String); struct PlayerName(String);
@@ -17,12 +26,12 @@ pub struct Session {
players: HashMap<PlayerName, Player>, players: HashMap<PlayerName, Player>,
} }
#[derive(Debug)] #[derive(Debug, PartialEq)]
pub struct PlayerStatistics { pub struct PlayerStatistics {
player: String, player: String,
damage: f32, damage: f32,
time_in_combat: f32, time_in_combat: f32,
dps: f32 dps: DPS
} }
impl Session { impl Session {
@@ -39,15 +48,11 @@ impl Session {
player: name.0.to_owned(), player: name.0.to_owned(),
damage: player.get_damage_dealt(), damage: player.get_damage_dealt(),
time_in_combat: player.get_time_elapsed(), time_in_combat: player.get_time_elapsed(),
dps: player.get_damage_dealt() / player.get_time_elapsed() * 1000.0 dps: DPS::new(player.get_damage_dealt(), player.get_time_elapsed())
}) })
.collect() .collect()
} }
fn get_player_by_name(&self, player_name: &str) -> Option<&Player> {
self.players.get(&PlayerName(player_name.to_owned()))
}
fn get_player_by_id(&mut self, player_id: usize) -> Option<&mut Player> { fn get_player_by_id(&mut self, player_id: usize) -> Option<&mut Player> {
self.players.values_mut().find(|p| p.id == player_id) self.players.values_mut().find(|p| p.id == player_id)
} }
@@ -55,7 +60,7 @@ impl Session {
fn add_player(&mut self, player_name: &str, player_id: usize) { fn add_player(&mut self, player_name: &str, player_id: usize) {
self.players.insert( self.players.insert(
PlayerName(player_name.to_owned()), PlayerName(player_name.to_owned()),
Player::new(player_id, player_name), Player::new(player_id),
); );
} }
} }
@@ -74,7 +79,7 @@ impl Meter {
} }
pub fn register_main_player(&mut self, name: &str, id: usize) { pub fn register_main_player(&mut self, name: &str, id: usize) {
error!("Main player {} registerd with id {}", name, id); debug!("Main player {} registerd with id {}", name, id);
self.main_player_id = Some(id); self.main_player_id = Some(id);
match self.instance_sessions.back_mut() { match self.instance_sessions.back_mut() {
Some(session) => session.add_player(name, id), Some(session) => session.add_player(name, id),
@@ -86,18 +91,19 @@ impl Meter {
} }
} }
pub fn register_leave(&mut self, id: usize) { pub fn register_leave(&mut self, id: usize) -> Option<()> {
if let Some(main_player_id) = self.main_player_id { let main_player_id = self.main_player_id?;
if id == main_player_id { if id == main_player_id {
error!("New session, main player left the instance"); debug!("New session, main player left the instance");
self.instance_sessions.push_back(Session::new()); self.instance_sessions.push_back(Session::new());
}
} }
Some(())
} }
pub fn register_player(&mut self, name: &str, id: usize) { pub fn register_player(&mut self, name: &str, id: usize) {
if self.instance_sessions.is_empty() { if self.instance_sessions.is_empty() {
error!("New session"); debug!("New session");
self.instance_sessions.push_back(Session::new()); self.instance_sessions.push_back(Session::new());
} }
@@ -105,30 +111,32 @@ impl Meter {
session.add_player(name, id); session.add_player(name, id);
} }
pub fn register_damage_dealt(&mut self, player_id: usize, damage: f32) { pub fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> {
if let Some(session) = self.instance_sessions.back_mut() { let session = self.instance_sessions.back_mut()?;
if let Some(player) = session.get_player_by_id(player_id) { let player = session.get_player_by_id(player_id)?;
if damage < 0.0 { if damage < 0.0 {
player.register_damage_dealt(f32::abs(damage)); player.register_damage_dealt(f32::abs(damage));
}
}
} }
Some(())
} }
pub fn register_combat_enter(&mut self, player_id: usize) { pub fn register_combat_enter(&mut self, player_id: usize) -> Option<()> {
if let Some(session) = self.instance_sessions.back_mut() { let session = self.instance_sessions.back_mut()?;
if let Some(player) = session.get_player_by_id(player_id) { let player = session.get_player_by_id(player_id)?;
player.enter_combat();
} player.enter_combat();
}
Some(())
} }
pub fn register_combat_leave(&mut self, player_id: usize) { pub fn register_combat_leave(&mut self, player_id: usize) -> Option<()> {
if let Some(session) = self.instance_sessions.back_mut() { let session = self.instance_sessions.back_mut()?;
if let Some(player) = session.get_player_by_id(player_id) { let player = session.get_player_by_id(player_id)?;
player.leave_combat();
} player.leave_combat();
}
Some(())
} }
pub fn get_instance_session(&self) -> Option<Vec<PlayerStatistics>> { pub fn get_instance_session(&self) -> Option<Vec<PlayerStatistics>> {
@@ -136,3 +144,16 @@ impl Meter {
Some(last_session.stats()) Some(last_session.stats())
} }
} }
#[test]
fn test_meter() {
let mut meter = Meter::new();
assert_eq!(meter.get_instance_session(), None);
meter.register_main_player("name", 0);
assert!(meter.get_instance_session().is_some());
assert_eq!(meter.get_instance_session().unwrap()[0].player, "name".to_owned());
}
+11 -30
View File
@@ -1,6 +1,4 @@
use std::thread;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use std::borrow::Cow;
use timer; use timer;
@@ -13,30 +11,29 @@ enum CombatState
struct Time struct Time
{ {
guard: timer::Guard, _guard: timer::Guard,
timer: timer::Timer _timer: timer::Timer
} }
pub struct Player pub struct Player
{ {
pub id: usize, pub id: usize,
name: String,
damage_dealt: f32, damage_dealt: f32,
time_elapsed: Arc<Mutex<f32>>, time_elapsed: Arc<Mutex<f32>>,
combat_state: Arc<Mutex<CombatState>>, combat_state: Arc<Mutex<CombatState>>,
time: Time _time: Time
} }
impl Player impl Player
{ {
pub fn new(id: usize, name: &str) -> Self { pub fn new(id: usize) -> Self {
let timer = timer::Timer::new(); let _timer = timer::Timer::new();
let time_elapsed = Arc::new(Mutex::new(0.0)); let time_elapsed = Arc::new(Mutex::new(0.0));
let combat_state = Arc::new(Mutex::new(CombatState::OutOfCombat)); let combat_state = Arc::new(Mutex::new(CombatState::OutOfCombat));
let guard = { let _guard = {
let time_elapsed = time_elapsed.clone(); let time_elapsed = time_elapsed.clone();
let combat_state = combat_state.clone(); let combat_state = combat_state.clone();
timer.schedule_repeating(chrono::Duration::milliseconds(10), move || { _timer.schedule_repeating(chrono::Duration::milliseconds(10), move || {
if *combat_state.lock().unwrap() == CombatState::InCombat { if *combat_state.lock().unwrap() == CombatState::InCombat {
*time_elapsed.lock().unwrap() += 10.0; *time_elapsed.lock().unwrap() += 10.0;
} }
@@ -46,11 +43,10 @@ impl Player
Self { Self {
id, id,
name: name.to_owned(),
damage_dealt: 0.0, damage_dealt: 0.0,
time_elapsed, time_elapsed,
combat_state, combat_state,
time: Time{timer, guard} _time: Time{_timer, _guard}
} }
} }
@@ -70,41 +66,27 @@ impl Player
*self.combat_state.lock().unwrap() = CombatState::OutOfCombat; *self.combat_state.lock().unwrap() = CombatState::OutOfCombat;
} }
pub fn get_name(&self) -> std::borrow::Cow<str> {
std::borrow::Cow::Borrowed(&self.name)
}
pub fn get_damage_dealt(&self) -> f32 { self.damage_dealt } pub fn get_damage_dealt(&self) -> f32 { self.damage_dealt }
pub fn get_time_elapsed(&self) -> f32 { pub fn get_time_elapsed(&self) -> f32 {
*self.time_elapsed.lock().unwrap() *self.time_elapsed.lock().unwrap()
} }
pub fn get_dps(&self) -> f32 {
let elapsed = *self.time_elapsed.lock().unwrap();
if elapsed == 0.0 {
return 0.0;
}
(self.damage_dealt / *self.time_elapsed.lock().unwrap()) * 1000.0
}
} }
mod test mod test
{ {
use super::*; use super::*;
use std::thread;
#[allow(unused)] #[allow(unused)]
fn get_test_player() -> Player { fn get_test_player() -> Player {
Player::new(1, "test_player") Player::new(1)
} }
#[test] #[test]
fn test_player_initial_stats() { fn test_player_initial_stats() {
let player = Player::new(1, "test_player"); let player = Player::new(1);
assert_eq!(player.name, "test_player");
assert_eq!(player.get_damage_dealt(), 0.0); assert_eq!(player.get_damage_dealt(), 0.0);
} }
@@ -127,6 +109,5 @@ mod test
thread::sleep(std::time::Duration::from_millis(100)); thread::sleep(std::time::Duration::from_millis(100));
assert_eq!(player.get_damage_dealt(), 1000.0); assert_eq!(player.get_damage_dealt(), 1000.0);
assert!(player.get_dps() < 1000.0);
} }
} }