diff --git a/gui/src/engine.py b/gui/src/engine.py index 2fe8ee6..edf3b5c 100644 --- a/gui/src/engine.py +++ b/gui/src/engine.py @@ -88,6 +88,12 @@ def get_last_fight_session(): return stats(session) +def get_party_members(): + if TESTING_ENABLED: + return ['a', 'b', 'c'] + else: + return libmeter.get_players_in_party() + def new_zone_session(): libmeter.new_zone_session() diff --git a/gui/src/main.py b/gui/src/main.py index 2c369b1..554f18b 100644 --- a/gui/src/main.py +++ b/gui/src/main.py @@ -103,7 +103,8 @@ class MainWidget(QWidget): def refresh(self): damage_session, fame_stat = self.session() self.table.fill(damage_session) - self.fame_label.setText("Fame {}, Fame per minute {}".format(fame_stat.fame, 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()))) def mousePressEvent(self, event): self.mouse_pos = event.pos() diff --git a/src/core.rs b/src/core.rs index df73587..68a0d14 100644 --- a/src/core.rs +++ b/src/core.rs @@ -72,6 +72,15 @@ pub fn new_last_fight_session(_py: Python) -> PyResult { Ok(0) } +pub fn get_players_in_party(py: Python) -> PyResult { + let meter = &mut METER.lock().unwrap(); + + meter.get_players_in_party().map_or_else( + || Ok(PyList::new(py, Vec::::new().as_slice())), + |v| Ok(v.into_py_object(py)), + ) +} + pub fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult { CombinedLogger::init(vec![WriteLogger::new( LevelFilter::Trace, @@ -247,6 +256,11 @@ mod tests { None } + pub fn get_players_in_party() -> Vec { + let meter = &mut METER.lock().unwrap(); + meter.get_players_in_party().unwrap_or(vec![]) + } + pub fn get_string(py: Python, stats: &PyDict, key: &str) -> String { stats .get_item(py, key) @@ -708,7 +722,7 @@ mod tests { } #[test] - fn test_party_member_filter() { + fn test_party_members() { let guard = helpers::init(); let py = guard.python(); @@ -733,6 +747,8 @@ mod tests { 1, ))); + + assert_eq!(helpers::get_players_in_party().len(), 2); assert!(helpers::get_damage_dealer_in_zone_by_name(py, "main_player").is_some()); assert!(helpers::get_damage_dealer_in_zone_by_name(py, "other_player").is_some()); @@ -742,6 +758,7 @@ mod tests { assert!(helpers::get_damage_dealer_in_zone_by_name(py, "yet_another_other_player").is_none()); helpers::register(Message::PartyJoin(message::PartyJoin::new_named(&"yet_another_other_player", 1))); + assert_eq!(helpers::get_players_in_party().len(), 3); assert!(helpers::get_damage_dealer_in_zone_by_name(py, "yet_another_other_player").is_some()); helpers::register(Message::PartyDisbanded(message::PartyDisbanded::new(1))); @@ -749,6 +766,7 @@ mod tests { assert!(helpers::get_damage_dealer_in_zone_by_name(py, "main_player").is_some()); assert!(helpers::get_damage_dealer_in_zone_by_name(py, "other_player").is_none()); assert!(helpers::get_damage_dealer_in_zone_by_name(py, "yet_another_other_player").is_none()); + assert_eq!(helpers::get_players_in_party().len(), 0); } #[test] diff --git a/src/lib.rs b/src/lib.rs index 840c145..e47a210 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,7 +16,7 @@ use crate::core::initialize; use crate::core::new_last_fight_session; use crate::core::new_zone_session; use crate::core::reset_sessions; - +use crate::core::get_players_in_party; py_module_initializer!(libmeter, initliblibmeter, PyInit_libmeter, |py, m| { m.add(py, "__doc__", "This module is implemented in Rust")?; @@ -35,5 +35,6 @@ py_module_initializer!(libmeter, initliblibmeter, PyInit_libmeter, |py, m| { py_fn!(py, new_last_fight_session()), )?; m.add(py, "get_zone_session", py_fn!(py, get_zone_session()))?; + m.add(py, "get_players_in_party", py_fn!(py, get_players_in_party()))?; Ok(()) }); diff --git a/src/meter/mod.rs b/src/meter/mod.rs index c5163bb..dee7e72 100644 --- a/src/meter/mod.rs +++ b/src/meter/mod.rs @@ -280,6 +280,14 @@ impl ZoneStats for Meter { self.last_fight_session = Session::from(&self.last_fight_session); Some(()) } + + fn get_players_in_party(&self) -> Option> { + if let Some(party) = &self.party { + let members = party.clone().members; + return Some(members.into_iter().collect()) + } + None + } } impl traits::PartyEvents for Meter { diff --git a/src/meter/traits.rs b/src/meter/traits.rs index 45d7f41..56cbadd 100644 --- a/src/meter/traits.rs +++ b/src/meter/traits.rs @@ -104,6 +104,8 @@ pub trait PlayerEvents { pub trait ZoneStats { fn reset(&mut self); + fn get_players_in_party(&self) -> Option>; + fn get_zone_session(&self) -> Option; fn new_zone_session(&mut self) -> Option<()>;