diff --git a/src/lib.rs b/src/lib.rs index 4f62f41..e331754 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -11,7 +11,6 @@ use std::sync::mpsc::{channel, Receiver, Sender}; use std::sync::Mutex; use std::thread; -use cpython::PyClone; use cpython::{PyDict, PyList, PyObject, PyResult, Python, PythonObject, ToPyObject}; use log::*; use simplelog::*; @@ -53,7 +52,6 @@ impl ToPyObject for meter::PlayerStatistics { fn get_zone_session(py: Python) -> PyResult { let meter = &mut METER.lock().unwrap(); meter.get_zone_session().map_or_else( - // meter.get_last_fight_session().map_or_else( || Ok(PyList::new(py, Vec::::new().as_slice())), |v| { Ok(v.into_py_object(py)) } ) @@ -177,7 +175,7 @@ py_module_initializer!(libmeter, initliblibmeter, PyInit_libmeter, |py, m| { #[cfg(test)] mod tests { use super::*; - use cpython::{PyFloat, PyUnicode}; + use cpython::{PyFloat, PyUnicode, PyClone}; use game_protocol::message; use game_protocol::Message; diff --git a/src/meter/mod.rs b/src/meter/mod.rs index 6a4d1cd..fe5c2ad 100644 --- a/src/meter/mod.rs +++ b/src/meter/mod.rs @@ -2,7 +2,6 @@ extern crate chrono; extern crate timer; use std::collections::HashMap; -use std::collections::VecDeque; use log::*; @@ -23,8 +22,6 @@ pub struct Session { players: HashMap, } -type PlayerStatisticsVec = Vec; - impl Session { fn new() -> Self { Self { @@ -79,8 +76,28 @@ impl Session { } } +fn merge_stats(a : &PlayerStatisticsVec, b : &PlayerStatisticsVec) -> PlayerStatisticsVec { + let merged = [&a[..], &b[..]].concat().iter().fold( + HashMap::::new(), + |mut acc, stat| { + acc.entry(stat.player.clone()) + .and_modify(|s| { + s.damage += stat.damage; + s.time_in_combat += stat.time_in_combat; + s.dps = s.dps(); + }) + .or_insert(stat.clone()); + acc + }, + ); + + + return merged.iter().map(|(_, v)| v.clone()).collect() +} + pub struct Meter { - zone_sessions: VecDeque, + zone_history: PlayerStatisticsVec, + zone_session: Option, last_fight_session: Session, main_player_id: Option, } @@ -88,21 +105,47 @@ pub struct Meter { impl Meter { pub fn new() -> Self { Self { - zone_sessions: VecDeque::new(), + zone_history: Vec::new(), + zone_session: None, last_fight_session: Session::new(), main_player_id: None, } } + fn zone_session_mut(&mut self) -> Option<&mut Session> { + match &mut self.zone_session { + Some(s) => Some(s), + None => None + } + } + + fn zone_session(&self) -> Option<&Session> { + match &self.zone_session { + Some(s) => Some(s), + None => None + } + } + + fn sessions_mut(&mut self) -> Option<(&mut Session, &mut Session)> { + match &mut self.zone_session { + Some(s) => Some((s, &mut self.last_fight_session)), + None => None + } + } + fn add_player(&mut self, name: &str, id: usize) -> Option<()> { - let session = self.zone_sessions.back_mut()?; + let session = self.zone_session_mut()?; session.add_player(name, id); self.last_fight_session.add_player(name, id); Some(()) } fn new_session(&mut self) { - self.zone_sessions.push_back(Session::new()); + if let Some(zone) = self.zone_session() { + self.zone_history = merge_stats(&self.zone_history, &zone.stats()); + } + + self.zone_session = Some(Session::new()); self.last_fight_session = Session::new(); } @@ -121,11 +164,12 @@ impl Meter { impl PlayerEvents for Meter { fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option> { - let session = self.zone_sessions.back_mut()?; - let zone_player = session.get_player_by_id(player_id)?; + let (zone, last_fight) = self.sessions_mut()?; + let las_fight_session_player = last_fight.get_player_by_id(player_id)?; + let zone_player = zone.get_player_by_id(player_id)?; Some(vec![ zone_player, - self.last_fight_session.get_player_by_id(player_id)?, + las_fight_session_player, ]) } @@ -133,7 +177,7 @@ impl PlayerEvents for Meter { debug!("Main player {} registerd with id {}", name, id); self.main_player_id = Some(id); - if self.zone_sessions.back().is_none() { + if self.zone_session.is_none() { self.new_session(); } self.add_player(name, id); @@ -143,7 +187,7 @@ impl PlayerEvents for Meter { let main_player_id = self.main_player_id?; if id == main_player_id { debug!("New session, main player left the zone"); - self.zone_sessions.back_mut()?.cleanup_players(); + self.zone_session_mut()?.cleanup_players(); self.new_session(); } @@ -151,7 +195,7 @@ impl PlayerEvents for Meter { } fn register_player(&mut self, name: &str, id: usize) { - if self.zone_sessions.is_empty() { + if self.zone_session.is_none() { debug!("New session"); self.new_session(); } @@ -174,38 +218,28 @@ impl PlayerEvents for Meter { impl ZoneStats for Meter { fn get_zone_session(&self) -> Option> { - let last_session = self.zone_sessions.back()?; + let last_session = self.zone_session()?; Some(last_session.stats()) } fn new_zone_session(&mut self) -> Option<()> { - let last_session = self.zone_sessions.back()?; - let new_session = Session::from(&last_session); - self.zone_sessions.push_back(new_session); + let last_session = self.zone_session_mut()?; + self.zone_session = Some(Session::from(&last_session)); Some(()) } fn get_overall_session(&self) -> Option { - let all_stats = self.zone_sessions.iter().flat_map(|s| s.stats()).fold( - HashMap::::new(), - |mut acc, stat| { - acc.entry(stat.player.clone()) - .and_modify(|s| { - s.damage += stat.damage; - s.time_in_combat += stat.time_in_combat; - s.dps = s.dps(); - }) - .or_insert(stat); - acc - }, - ); + if let Some(zone) = self.zone_session() { + return Some(merge_stats(&self.zone_history, &zone.stats())); + } - Some(all_stats.iter().map(|(_, v)| v.clone()).collect()) + None } fn reset(&mut self) { - self.zone_sessions = VecDeque::new(); + self.zone_history = vec![]; + self.zone_session = None; self.last_fight_session = Session::new(); self.main_player_id = None; } diff --git a/src/meter/player.rs b/src/meter/player.rs index c6f6e7f..20b0a99 100644 --- a/src/meter/player.rs +++ b/src/meter/player.rs @@ -12,6 +12,22 @@ struct Time { _timer: timer::Timer, } +impl Time { + fn with(time_elapsed: Arc>, combat_state: Arc>) -> Time { + let _timer = timer::Timer::new(); + + let _guard = { + _timer.schedule_repeating(chrono::Duration::milliseconds(10), move || { + if *combat_state.lock().unwrap() == CombatState::InCombat { + *time_elapsed.lock().unwrap() += 10.0; + } + }) + }; + + Self { _timer, _guard } + } +} + impl fmt::Debug for Time { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "") @@ -24,36 +40,32 @@ pub struct Player { damage_dealt: f32, time_elapsed: Arc>, combat_state: Arc>, - _time: Time, + _time: Option