diff --git a/backend/src/lib.rs b/backend/src/lib.rs index 03046f8..a47b93b 100644 --- a/backend/src/lib.rs +++ b/backend/src/lib.rs @@ -131,21 +131,30 @@ impl <'source> FromPyObject<'source> for StatType { } -pub fn stats(py: Python, stat_type: StatType) -> PyResult { +pub fn stats(py: Python, stat_type: StatType) -> PyResult { + let stats = PyDict::new(py); if let Ok(ref mut py_meter) = METER.lock() { if let Some(m) = py_meter.get() { if let Ok(ref mut meter) = m.lock() { - return Ok(core::stats(&meter, stat_type) + let mut main : Option = None; + stats.set_item(py, "players", core::stats(&meter, stat_type) .into_iter() + .inspect(|s| { + if s.main_player_stats { + main = Some(s.clone()); + } + }) .filter(|s| !s.idle || s.fame != 0.0) .collect::>() - .into_py_object(py)) + .into_py_object(py)).ok(); + stats.set_item(py, "main", main.into_py_object(py)).ok(); + return Ok(stats); } } } error!("Failed to acquire locks on meter"); - Ok(PyList::new(py, Vec::::new().as_slice())) + Ok(stats) } pub fn reset(_py: Python, stat_type: StatType) -> PyResult { diff --git a/backend/src/meter/mod.rs b/backend/src/meter/mod.rs index 5f962c8..71b3f29 100644 --- a/backend/src/meter/mod.rs +++ b/backend/src/meter/mod.rs @@ -30,11 +30,11 @@ impl Session { fn from(session: &Self) -> Self { let mut players = HashMap::new(); for (player_name, player) in &session.players { - let mut new_player = Player::new(player.id); + let mut new_player = Player::new(player.id, player.main); if let CombatState::InCombat = player.combat_state() { new_player.enter_combat(); } - players.insert(player_name.clone(), Player::new(player.id)); + players.insert(player_name.clone(), new_player); } Self { players } @@ -59,6 +59,7 @@ impl Session { fame_per_hour: player.fame_per_hour(), items: player.items(), idle: player.idle(), + main_player_stats: player.main, }) .collect(), ) @@ -68,7 +69,7 @@ impl Session { let without_dmg = self .players .iter() - .filter(|(_, player)| player.damage() == 0.0 && player.fame() == 0.0) + .filter(|(_, player)| !player.main && player.damage() == 0.0 && player.fame() == 0.0) .map(|(name, _)| name.clone()) .collect::>(); for w in without_dmg { @@ -84,9 +85,9 @@ impl Session { self.players.values_mut().find(|p| p.id == player_id) } - fn add_player(&mut self, player_name: &str, player_id: usize) { + fn add_player(&mut self, player_name: &str, player_id: usize, main: bool) { self.players - .insert(player_name.to_owned(), Player::new(player_id)); + .insert(player_name.to_owned(), Player::new(player_id, main)); } } @@ -154,10 +155,10 @@ impl Meter { } } - fn add_player(&mut self, name: &str, id: usize) -> Option<()> { + fn add_player(&mut self, name: &str, id: usize, main: bool) -> Option<()> { let session = self.zone_session_mut()?; - session.add_player(name, id); - self.last_fight_session.add_player(name, id); + session.add_player(name, id, main); + self.last_fight_session.add_player(name, id, main); Some(()) } @@ -237,7 +238,7 @@ impl PlayerEvents for Meter { if self.zone_session.is_none() { self.new_session(); } - self.add_player(name, id); + self.add_player(name, id, true); if let Some(items) = self.unconsumed_items.get(&id) { let i = items.clone(); self.register_item_update(id, &i); @@ -263,7 +264,7 @@ impl PlayerEvents for Meter { } if self.get_damage_dealers_in_zone(id).unwrap_or(vec![]).is_empty() { - self.add_player(name, id); + self.add_player(name, id, false); } } diff --git a/backend/src/meter/player.rs b/backend/src/meter/player.rs index a88eba4..53ab855 100644 --- a/backend/src/meter/player.rs +++ b/backend/src/meter/player.rs @@ -38,11 +38,12 @@ pub struct Player { fame: f32, items: Items, idle: bool, + pub main: bool } impl Player { - pub fn new(id: usize) -> Self { + pub fn new(id: usize, main: bool) -> Self { Self { id, damage_dealt: 0.0, @@ -51,7 +52,8 @@ impl Player { time_started: Instant::now(), fame: 0.0, items: Default::default(), - idle: true + idle: true, + main } } @@ -147,7 +149,7 @@ mod test { #[test] fn test_player_fame_stats() { - let mut player = Player::new(1); + let mut player = Player::new(1, true); sleep(1000 * 60); player.register_fame_gain(100.0); diff --git a/backend/src/meter/types.rs b/backend/src/meter/types.rs index 084d7f7..ee4fe97 100644 --- a/backend/src/meter/types.rs +++ b/backend/src/meter/types.rs @@ -45,7 +45,8 @@ pub struct PlayerStatistics { pub fame_per_minute: u32, pub fame_per_hour: u32, pub items: Items, - pub idle: bool + pub idle: bool, + pub main_player_stats: bool, } #[derive(Debug, PartialEq, Clone)] @@ -91,6 +92,7 @@ impl PlayerStatisticsVec { s.fame += stat.fame; s.fame_per_minute = s.fame_per_minute(); s.fame_per_hour = s.fame_per_hour(); + s.main_player_stats = stat.main_player_stats; }) .or_insert(stat.clone()); acc diff --git a/frontend/src/engine.py b/frontend/src/engine.py index 1228234..7364037 100644 --- a/frontend/src/engine.py +++ b/frontend/src/engine.py @@ -9,7 +9,10 @@ except: return InitializationResult.NetworkInterfaceListMissing @staticmethod def stats(_): - return [] + return { + 'players': [], + 'main': None + } @staticmethod def get_players_in_party(): return [] @@ -61,7 +64,10 @@ class FameStat: def stats(session, with_dmg=False): - with_damage = [s for s in session if s['damage'] != 0.0] if with_dmg else session + players = session['players'] + main_player = session['main'] + + with_damage = [s for s in players if s['damage'] != 0.0] if with_dmg else players extended_session = with_percentage(with_damage) statistics = [DamageStat( s['player'], @@ -71,18 +77,16 @@ def stats(session, with_dmg=False): s['dps'], s['dmg_percentage'], s['best_damage']) for s in extended_session] - stats_with_fame = [p for p in session if 'fame' in p and p['fame'] != 0.0] - if len(stats_with_fame) > 0: - stat_with_fame = stats_with_fame[0] - fame = FameStat( - Number(stat_with_fame['fame']), - Number(stat_with_fame['fame_per_minute']) - ) - else: - fame = FameStat(Number(0.0), Number(0.0)) + elapsed = 0 + fame = FameStat(Number(0.0), Number(0.0)) + if main_player: + if 'fame' in main_player: + fame = FameStat(Number(main_player['fame']), Number(main_player['fame_per_minute'])) + if 'seconds_in_game' in main_player: + elapsed = main_player['seconds_in_game'] - return statistics, fame + return statistics, fame, elapsed def with_percentage(session): @@ -102,7 +106,8 @@ def with_percentage(session): def zone_stats(with_damage=False): if TESTING_ENABLED: - session = [ + session = { + 'players': [ {'player': 'Arcane', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30, 'items': { 'weapon': 'T3_MAIN_ARCANESTAFF' }}, @@ -148,7 +153,11 @@ def zone_stats(with_damage=False): {'player': 'Crossbow', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { 'weapon': 'T8_2H_CROSSBOWLARGE@3' }}, - ] + ], + 'main': {'player': 'Crossbow', 'damage': 250.0, 'time_in_combat': 12.0, 'dps': 13, 'items': { + 'weapon': 'T8_2H_CROSSBOWLARGE@3' + }, 'fame': 20000, 'fame_per_minute': 200 } + } else: session = aostats.stats(StatType.Zone) diff --git a/frontend/src/main.py b/frontend/src/main.py index 18437bc..4a71287 100644 --- a/frontend/src/main.py +++ b/frontend/src/main.py @@ -1,5 +1,6 @@ import sys import functools +import datetime from PySide2.QtCore import QTimer from PySide2.QtCore import Qt @@ -67,7 +68,7 @@ class InteractiveBar(QWidget): [model.item(i) for i in range(model.rowCount())], key=lambda i: i.damage, reverse=True) - clip = "{}, Fame/min: {}\nDMG: \n".format(self.mode.currentText(), self.fame_per_minute) + clip = "{}, FPM: {}\nDMG: \n".format(self.mode.currentText(), self.fame_per_minute) for index, i in enumerate(items[:3]): clip += '{}. {}-{}-{}%'.format(index+1, i.name, i.damage, i.percentage) clip += "\n" @@ -128,11 +129,11 @@ class MainWidget(QWidget): timer.start(500) def refresh(self): - damage_session, fame_stat = self.session() + damage_session, fame_stat, elapsed = self.session() self.table.update(damage_session) self.bar.set_fame_per_minute(fame_stat.fame_per_minute) - self.fame_label.setText("Fame {} | Fame per minute {} | Party members {}".format( - fame_stat.fame, fame_stat.fame_per_minute, len(engine.get_party_members()))) + self.fame_label.setText("{} | Fame {} | FPM {} | Party members {}".format( + datetime.timedelta(seconds=elapsed), fame_stat.fame, fame_stat.fame_per_minute, len(engine.get_party_members()))) def mousePressEvent(self, event): self.mouse_pos = event.pos()