Unpythonized :)

This commit is contained in:
Wiktor Mazur
2019-10-19 19:01:23 +02:00
parent 89d50c38d8
commit a15f7ae92c
4 changed files with 507 additions and 522 deletions
+353 -448
View File
@@ -1,14 +1,8 @@
use std::fs::File; use std::fs::File;
use std::sync::mpsc::{channel, Receiver, Sender}; use std::sync::mpsc::{channel, Receiver, Sender};
use std::sync::Mutex; use std::sync::{Arc, Mutex};
use std::thread; use std::thread;
use cpython::PyList;
use cpython::PyObject;
use cpython::PyResult;
use cpython::Python;
use cpython::ToPyObject;
use log::*; use log::*;
use simplelog::*; use simplelog::*;
@@ -16,12 +10,15 @@ use packet_sniffer::UdpPacket;
use crate::game_protocol; use crate::game_protocol;
use crate::meter; use crate::meter;
use meter::GameStats; pub use meter::GameStats;
use meter::LastFightStats; pub use meter::LastFightStats;
use meter::OverallStats; pub use meter::OverallStats;
use meter::PartyEvents; pub use meter::PartyEvents;
use meter::PlayerEvents; pub use meter::PlayerEvents;
use meter::ZoneStats; pub use meter::ZoneStats;
pub use meter::MeterConfig;
pub use meter::PlayerStatistics;
pub use meter::PlayerStatisticsVec;
pub use meter::StatType; pub use meter::StatType;
@@ -29,30 +26,25 @@ lazy_static! {
static ref METER: Mutex<meter::Meter> = Mutex::new(meter::Meter::new()); static ref METER: Mutex<meter::Meter> = Mutex::new(meter::Meter::new());
} }
pub fn stats(py: Python, stat_type: StatType) -> PyResult<PyList> { pub fn stats(meter: &meter::Meter, stat_type: StatType) -> Vec<meter::PlayerStatistics> {
let meter = &mut METER.lock().unwrap();
match stat_type { match stat_type {
StatType::Zone => meter.zone_stats().map_or_else( StatType::Zone => meter
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())), .zone_stats()
|v| Ok(v.into_py_object(py)), .unwrap_or(meter::PlayerStatisticsVec::new())
), .value(),
StatType::LastFight => meter.last_fight_stats().map_or_else( StatType::LastFight => meter
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())), .last_fight_stats()
|v| Ok(v.into_py_object(py)), .unwrap_or(meter::PlayerStatisticsVec::new())
), .value(),
StatType::Overall => meter.overall_stats().map_or_else( StatType::Overall => meter
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())), .overall_stats()
|v| Ok(v.into_py_object(py)), .unwrap_or(meter::PlayerStatisticsVec::new())
), .value(),
_ => { _ => vec![],
error!("Unexpected stats requested.");
Ok(PyList::new(py, Vec::<PyObject>::new().as_slice()))
}
} }
} }
pub fn reset(_py: Python, stat_type: StatType) -> PyResult<u32> { pub fn reset(meter: &mut meter::Meter, stat_type: StatType) {
let meter = &mut METER.lock().unwrap();
match stat_type { match stat_type {
StatType::Zone => { StatType::Zone => {
meter.reset_zone_stats(); meter.reset_zone_stats();
@@ -65,19 +57,13 @@ pub fn reset(_py: Python, stat_type: StatType) -> PyResult<u32> {
} }
_ => error!("Unexpected stat to reset."), _ => error!("Unexpected stat to reset."),
} }
Ok(0)
} }
pub fn get_players_in_party(py: Python) -> PyResult<PyList> { pub fn get_players_in_party(meter: &meter::Meter) -> Vec<String> {
let meter = &mut METER.lock().unwrap(); meter.get_players_in_party().unwrap_or(vec![])
meter.get_players_in_party().map_or_else(
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())),
|v| Ok(v.into_py_object(py)),
)
} }
pub fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> { pub fn initialize() -> Arc<Mutex<meter::Meter>> {
CombinedLogger::init(vec![WriteLogger::new( CombinedLogger::init(vec![WriteLogger::new(
LevelFilter::Info, LevelFilter::Info,
Config::default(), Config::default(),
@@ -85,14 +71,10 @@ pub fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
)]) )])
.unwrap(); .unwrap();
configure( let meter = meter::Meter::new();
&mut METER.lock().unwrap(),
meter::MeterConfig {
skip_non_party_members,
..Default::default()
},
);
let meter = Arc::new(Mutex::new(meter));
let cloned_meter = meter.clone();
thread::spawn(move || { thread::spawn(move || {
let (tx, rx): (Sender<UdpPacket>, Receiver<UdpPacket>) = channel(); let (tx, rx): (Sender<UdpPacket>, Receiver<UdpPacket>) = channel();
@@ -103,7 +85,7 @@ pub fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
if packet.destination_port != 5056 && packet.source_port != 5056 { if packet.destination_port != 5056 && packet.source_port != 5056 {
continue; continue;
} }
let meter = &mut METER.lock().unwrap(); let meter = &mut cloned_meter.lock().unwrap();
if let Some(messages) = game_protocol::decode(&packet.payload) { if let Some(messages) = game_protocol::decode(&packet.payload) {
register_messages(meter, &messages); register_messages(meter, &messages);
} }
@@ -111,11 +93,7 @@ pub fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
} }
}); });
Ok(0) meter
}
fn configure(meter: &mut meter::Meter, config: meter::MeterConfig) {
meter.configure(config);
} }
fn register_messages(meter: &mut meter::Meter, messages: &Vec<game_protocol::Message>) { fn register_messages(meter: &mut meter::Meter, messages: &Vec<game_protocol::Message>) {
@@ -162,127 +140,20 @@ fn register_message(events: &mut meter::Meter, message: &game_protocol::Message)
mod tests { mod tests {
use super::*; use super::*;
use cpython::{PyClone, PyDict, PyFloat, PyUnicode};
use game_protocol::message; use game_protocol::message;
use game_protocol::Message; use game_protocol::Message;
mod helpers { mod helpers {
use super::*; use super::*;
pub fn init() -> cpython::GILGuard { pub fn init_() -> meter::Meter {
let meter = &mut METER.lock().unwrap(); meter::Meter::new()
meter.reset_stats();
super::configure(meter, Default::default());
Python::acquire_gil()
} }
pub fn sleep(time: u64) { pub fn sleep(time: u64) {
use fake_clock::FakeClock; use fake_clock::FakeClock;
FakeClock::advance_time(time); FakeClock::advance_time(time);
} }
pub fn register(message: Message) {
let meter = &mut METER.lock().unwrap();
r(meter, &message);
}
fn r(meter: &mut meter::Meter, message: &game_protocol::Message) {
register_message(meter, &message);
}
pub fn configure(cfg: meter::MeterConfig) {
let meter = &mut METER.lock().unwrap();
super::configure(meter, cfg);
}
pub fn get_damage_dealer_in_zone_by_index(py: Python, index: usize) -> PyDict {
let zone_session = stats(py, StatType::Zone).unwrap();
let stat = zone_session.get_item(py, index);
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
player
}
pub fn get_damage_dealer_in_zone_by_name(py: Python, name: &str) -> Option<PyDict> {
let zone_session_len = stats(py, StatType::Zone).unwrap().len(py);
for idx in 0..zone_session_len {
let player = get_damage_dealer_in_zone_by_index(py, idx);
if get_string(py, &player, "player") == name {
return Some(player);
}
}
None
}
pub fn get_player_overall_index(py: Python, index: usize) -> PyDict {
let zone_session = stats(py, StatType::Overall).unwrap();
let stat = zone_session.get_item(py, index);
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
player
}
pub fn get_player_overall_by_name(py: Python, name: &str) -> Option<PyDict> {
let zone_session_len = stats(py, StatType::Overall).unwrap().len(py);
for idx in 0..zone_session_len {
let player = get_player_overall_index(py, idx);
if get_string(py, &player, "player") == name {
return Some(player);
}
}
None
}
pub fn get_player_last_fight_index(py: Python, index: usize) -> PyDict {
let zone_session = stats(py, StatType::LastFight).unwrap();
let stat = zone_session.get_item(py, index);
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
player
}
pub fn get_player_last_fight_by_name(py: Python, name: &str) -> Option<PyDict> {
let zone_session_len = stats(py, StatType::LastFight).unwrap().len(py);
for idx in 0..zone_session_len {
let player = get_player_last_fight_index(py, idx);
if get_string(py, &player, "player") == name {
return Some(player);
}
}
None
}
pub fn get_players_in_party() -> Vec<String> {
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)
.unwrap()
.cast_as::<PyUnicode>(py)
.unwrap()
.to_string_lossy(py)
.to_string()
}
pub fn get_float(py: Python, stats: &PyDict, key: &str) -> f64 {
stats
.get_item(py, key)
.unwrap()
.cast_as::<PyFloat>(py)
.unwrap()
.value(py)
}
pub fn get_number(py: Python, stats: &PyDict, key: &str) -> u32 {
stats.get_item(py, key).unwrap().extract(py).unwrap()
}
} }
trait Testing { trait Testing {
@@ -411,221 +282,269 @@ mod tests {
#[test] #[test]
fn test_empty_session() { fn test_empty_session() {
let guard = helpers::init(); let meter = helpers::init_();
let py = guard.python(); assert_eq!(stats(&meter, StatType::Zone).len(), 0);
assert_eq!(stats(py, StatType::Zone).unwrap().len(py), 0);
} }
#[test] #[test]
fn test_new_player_appears() { fn test_new_player_appears() {
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); register_message(
&mut meter,
helpers::register(Message::NewCharacter(message::NewCharacter::new(1))); &Message::NewCharacter(message::NewCharacter::new(1)),
);
let zone_session = stats(py, StatType::Zone).unwrap(); assert_eq!(stats(&meter, StatType::Zone).len(), 1);
assert_eq!(zone_session.len(py), 1);
} }
#[test] #[test]
fn test_new_player_stats() { fn test_new_player_stats() {
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); register_message(
&mut meter,
&Message::NewCharacter(message::NewCharacter::new(1)),
);
assert_eq!(stats(&meter, StatType::Zone).len(), 1);
helpers::register(Message::NewCharacter(message::NewCharacter::new(1))); let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(zone_stats[0].player, "CH1");
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0); assert_eq!(zone_stats[0].damage, 0.0);
assert_eq!(stats.len(py), 8); assert_eq!(zone_stats[0].time_in_combat, 0.0);
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1"); assert_eq!(zone_stats[0].dps, 0.0);
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0); assert_eq!(zone_stats[0].seconds_in_game, 0.0);
assert_eq!(helpers::get_float(py, &stats, "time_in_combat"), 0.0); assert_eq!(zone_stats[0].fame, 0.0);
assert_eq!(helpers::get_float(py, &stats, "dps"), 0.0); assert_eq!(zone_stats[0].fame_per_minute, 0);
assert_eq!(helpers::get_float(py, &stats, "seconds_in_game"), 0.0); assert_eq!(zone_stats[0].fame_per_hour, 0);
assert_eq!(helpers::get_float(py, &stats, "fame"), 0.0);
assert_eq!(helpers::get_number(py, &stats, "fame_per_minute"), 0);
assert_eq!(helpers::get_number(py, &stats, "fame_per_hour"), 0);
} }
#[test] #[test]
fn test_damage_aggregation() { fn test_damage_aggregation() {
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); register_message(
&mut meter,
&Message::NewCharacter(message::NewCharacter::new(1)),
);
helpers::register(Message::NewCharacter(message::NewCharacter::new(1))); let zone_stats = stats(&meter, StatType::Zone);
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0); assert_eq!(zone_stats[0].damage, 0.0);
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
helpers::register(Message::RegenerationHealthChanged( register_message(
message::RegenerationHealthChanged::disabled(1), &mut meter,
)); &Message::RegenerationHealthChanged(message::RegenerationHealthChanged::disabled(1)),
);
let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(zone_stats[0].damage, 0.0);
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1))); register_message(
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0); &mut meter,
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0); &Message::HealthUpdate(message::HealthUpdate::new(1)),
);
let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(zone_stats[0].damage, 10.0);
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1))); register_message(
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0); &mut meter,
assert_eq!(helpers::get_float(py, &stats, "damage"), 20.0); &Message::HealthUpdate(message::HealthUpdate::new(1)),
);
let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(zone_stats[0].damage, 20.0);
} }
#[test] #[test]
fn test_new_player_damage() { fn test_new_player_damage() {
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); register_message(
&mut meter,
&Message::NewCharacter(message::NewCharacter::new(1)),
);
helpers::register(Message::NewCharacter(message::NewCharacter::new(1))); let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(zone_stats[0].damage, 0.0);
assert_eq!(zone_stats[0].player, "CH1");
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0); register_message(
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1"); &mut meter,
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0); &Message::RegenerationHealthChanged(message::RegenerationHealthChanged::disabled(1)),
);
helpers::register(Message::RegenerationHealthChanged( register_message(
message::RegenerationHealthChanged::disabled(1), &mut meter,
)); &Message::HealthUpdate(message::HealthUpdate::new(1)),
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1))); );
let zone_stats = stats(&meter, StatType::Zone);
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0); assert_eq!(zone_stats[0].damage, 10.0);
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
} }
#[test] #[test]
fn test_new_player_damage_reset() { fn test_new_player_damage_reset() {
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); register_message(
&mut meter,
&Message::NewCharacter(message::NewCharacter::new(1)),
);
helpers::register(Message::NewCharacter(message::NewCharacter::new(1))); let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(zone_stats[0].damage, 0.0);
assert_eq!(zone_stats[0].player, "CH1");
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0); register_message(
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1"); &mut meter,
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0); &Message::RegenerationHealthChanged(message::RegenerationHealthChanged::disabled(1)),
);
register_message(
&mut meter,
&Message::HealthUpdate(message::HealthUpdate::new(1)),
);
let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(zone_stats[0].damage, 10.0);
helpers::register(Message::RegenerationHealthChanged( reset(&mut meter, StatType::Zone);
message::RegenerationHealthChanged::disabled(1), let zone_stats = stats(&meter, StatType::Zone);
)); assert_eq!(zone_stats[0].damage, 0.0);
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
reset(py, StatType::Zone).unwrap();
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
} }
#[test] #[test]
fn test_zone_detection() { fn test_zone_detection() {
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); register_message(
&mut meter,
&Message::CharacterStats(message::CharacterStats::new(1)),
);
helpers::register(Message::CharacterStats(message::CharacterStats::new(1))); let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(zone_stats[0].damage, 0.0);
assert_eq!(zone_stats[0].player, "MAIN_CH1");
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0); register_message(
assert_eq!(helpers::get_string(py, &stats, "player"), "MAIN_CH1"); &mut meter,
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0); &Message::RegenerationHealthChanged(message::RegenerationHealthChanged::disabled(1)),
);
register_message(
&mut meter,
&Message::HealthUpdate(message::HealthUpdate::new(1)),
);
let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(zone_stats[0].damage, 10.0);
helpers::register(Message::RegenerationHealthChanged( register_message(&mut meter, &Message::Leave(message::Leave::new(1)));
message::RegenerationHealthChanged::disabled(1), register_message(
)); &mut meter,
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1))); &Message::CharacterStats(message::CharacterStats::new(2)),
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0); );
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
helpers::register(Message::Leave(message::Leave::new(1))); let zone_stats = stats(&meter, StatType::Zone);
helpers::register(Message::CharacterStats(message::CharacterStats::new(2))); assert_eq!(zone_stats[0].damage, 0.0);
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
helpers::register(Message::RegenerationHealthChanged( register_message(
message::RegenerationHealthChanged::disabled(2), &mut meter,
)); &Message::RegenerationHealthChanged(message::RegenerationHealthChanged::disabled(2)),
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(2))); );
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0); register_message(
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0); &mut meter,
&Message::HealthUpdate(message::HealthUpdate::new(2)),
);
let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(zone_stats[0].damage, 10.0);
}
macro_rules! main_character_enters {
($meter:expr, $name:expr, $id:expr) => {
register_message(
&mut $meter,
&Message::CharacterStats(message::CharacterStats::new_named($name, $id)),
);
};
}
macro_rules! character_enters {
($meter:expr, $name:expr, $id:expr) => {
register_message(
&mut $meter,
&Message::NewCharacter(message::NewCharacter::new_named($name, $id)),
);
};
}
macro_rules! attack {
($meter:expr, $id:expr) => {
register_message(
&mut $meter,
&Message::RegenerationHealthChanged(message::RegenerationHealthChanged::disabled($id)),
);
register_message(
&mut $meter,
&Message::HealthUpdate(message::HealthUpdate::new($id)),
);
};
}
macro_rules! combat_leave {
($meter:expr, $id:expr) => {
register_message(
&mut $meter,
&Message::RegenerationHealthChanged(message::RegenerationHealthChanged::enabled($id)),
);
};
} }
#[test] #[test]
fn test_two_players_in_the_zone() { fn test_two_players_in_the_zone() {
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); main_character_enters!(meter, "MAIN_CH1", 1);
helpers::register(Message::CharacterStats(message::CharacterStats::new_named( let zone_stats = stats(&meter, StatType::Zone);
"MAIN_CH1", 1, let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
))); assert_eq!(player_stats.damage, 0.0);
let stats = helpers::get_damage_dealer_in_zone_by_name(py, "MAIN_CH1").unwrap();
assert_eq!(helpers::get_string(py, &stats, "player"), "MAIN_CH1");
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
helpers::register(Message::NewCharacter(message::NewCharacter::new_named( character_enters!(meter, "CH1", 1);
"CH1", 2, let zone_stats = stats(&meter, StatType::Zone);
))); let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap();
let stats = helpers::get_damage_dealer_in_zone_by_name(py, "CH1").unwrap(); assert_eq!(player_stats.damage, 0.0);
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1");
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
helpers::register(Message::Leave(message::Leave::new(1))); register_message(&mut meter, &Message::Leave(message::Leave::new(1)));
let stats = helpers::get_damage_dealer_in_zone_by_name(py, "CH1"); let zone_stats = stats(&meter, StatType::Zone);
assert!(stats.is_none()); assert!(zone_stats.iter().find(|s| s.player == "CH1").is_none());
} }
#[test] #[test]
fn test_overall_damage() { fn test_overall_damage() {
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); main_character_enters!(meter, "MAIN_CH1", 1);
let zone_stats = stats(&meter, StatType::Zone);
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.damage, 0.0);
helpers::register(Message::CharacterStats(message::CharacterStats::new_named(
"MAIN_CH1", 1,
)));
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap();
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
helpers::register(Message::RegenerationHealthChanged( attack!(meter, 1);
message::RegenerationHealthChanged::disabled(1), let zone_stats = stats(&meter, StatType::Zone);
)); let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1))); assert_eq!(player_stats.damage, 10.0);
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap();
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
helpers::register(Message::Leave(message::Leave::new(1))); character_enters!(meter, "CH1", 2);
helpers::register(Message::CharacterStats(message::CharacterStats::new_named( let zone_stats = stats(&meter, StatType::Zone);
"MAIN_CH1", 1, let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap();
))); assert_eq!(player_stats.damage, 0.0);
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap(); let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0); assert_eq!(player_stats.damage, 10.0);
helpers::register(Message::RegenerationHealthChanged( attack!(meter, 1);
message::RegenerationHealthChanged::disabled(1), let zone_stats = stats(&meter, StatType::Zone);
)); let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap();
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1))); assert_eq!(player_stats.damage, 0.0);
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap(); let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(helpers::get_float(py, &stats, "damage"), 20.0); assert_eq!(player_stats.damage, 20.0);
} }
#[test] #[test]
fn test_last_fight_damage() { fn test_last_fight_damage() {
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); main_character_enters!(meter, "MAIN_CH1", 1);
let zone_stats = stats(&meter, StatType::LastFight);
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.damage, 0.0);
helpers::register(Message::CharacterStats(message::CharacterStats::new_named( attack!(meter, 1);
"MAIN_CH1", 1, let zone_stats = stats(&meter, StatType::LastFight);
))); let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
let stats = helpers::get_player_last_fight_by_name(py, "MAIN_CH1").unwrap(); assert_eq!(player_stats.damage, 10.0);
assert_eq!(helpers::get_string(py, &stats, "player"), "MAIN_CH1");
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(1),
));
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
let stats = helpers::get_player_last_fight_by_name(py, "MAIN_CH1").unwrap();
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::enabled(1),
));
helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(1),
));
} }
#[test] #[test]
@@ -633,165 +552,151 @@ mod tests {
// session should be started when first player attacks // session should be started when first player attacks
// damage should be 0 when all players were out of combat and some player attacks // damage should be 0 when all players were out of combat and some player attacks
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); main_character_enters!(meter, "MAIN_CH1", 1);
let zone_stats = stats(&meter, StatType::LastFight);
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.damage, 0.0);
helpers::register(Message::CharacterStats(message::CharacterStats::new_named( attack!(meter, 1);
"1", 1, let zone_stats = stats(&meter, StatType::LastFight);
))); let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
helpers::register(Message::RegenerationHealthChanged( assert_eq!(player_stats.damage, 10.0);
message::RegenerationHealthChanged::disabled(1),
));
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(1),
));
assert!(helpers::get_player_last_fight_by_name(py, "1").is_some()); character_enters!(meter, "CH1", 2);
let zone_stats = stats(&meter, StatType::Zone);
let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap();
assert_eq!(player_stats.damage, 0.0);
helpers::register(Message::NewCharacter(message::NewCharacter::new_named( attack!(meter, 2);
"2", 2, let zone_stats = stats(&meter, StatType::LastFight);
))); let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap();
helpers::register(Message::RegenerationHealthChanged( assert_eq!(player_stats.damage, 10.0);
message::RegenerationHealthChanged::disabled(2),
));
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(2)));
helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(2),
));
helpers::register(Message::NewCharacter(message::NewCharacter::new_named( character_enters!(meter, "CH2", 3);
"3", 3, let zone_stats = stats(&meter, StatType::Zone);
))); let player_stats = zone_stats.iter().find(|s| s.player == "CH2").unwrap();
helpers::register(Message::RegenerationHealthChanged( assert_eq!(player_stats.damage, 0.0);
message::RegenerationHealthChanged::disabled(3),
));
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(3)));
helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(3),
));
helpers::register(Message::RegenerationHealthChanged( attack!(meter, 3);
message::RegenerationHealthChanged::enabled(1), let zone_stats = stats(&meter, StatType::LastFight);
)); let player_stats = zone_stats.iter().find(|s| s.player == "CH2").unwrap();
assert_eq!(player_stats.damage, 10.0);
macro_rules! assert_named_player_dmg { combat_leave!(meter, 1);
($id:expr, $dmg:expr) => { let zone_stats = stats(&meter, StatType::LastFight);
assert_eq!( let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
helpers::get_float( assert_eq!(player_stats.damage, 10.0);
py, let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap();
&helpers::get_player_last_fight_by_name(py, $id).unwrap(), assert_eq!(player_stats.damage, 10.0);
"damage" let player_stats = zone_stats.iter().find(|s| s.player == "CH2").unwrap();
), assert_eq!(player_stats.damage, 10.0);
$dmg
combat_leave!(meter, 2);
let zone_stats = stats(&meter, StatType::LastFight);
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.damage, 10.0);
let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap();
assert_eq!(player_stats.damage, 10.0);
let player_stats = zone_stats.iter().find(|s| s.player == "CH2").unwrap();
assert_eq!(player_stats.damage, 10.0);
combat_leave!(meter, 3);
let zone_stats = stats(&meter, StatType::LastFight);
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.damage, 10.0);
let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap();
assert_eq!(player_stats.damage, 10.0);
let player_stats = zone_stats.iter().find(|s| s.player == "CH2").unwrap();
assert_eq!(player_stats.damage, 10.0);
attack!(meter, 1);
combat_leave!(meter, 3);
let zone_stats = stats(&meter, StatType::LastFight);
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.damage, 10.0);
let player_stats = zone_stats.iter().find(|s| s.player == "CH1").unwrap();
assert_eq!(player_stats.damage, 0.0);
let player_stats = zone_stats.iter().find(|s| s.player == "CH2").unwrap();
assert_eq!(player_stats.damage, 0.0);
}
macro_rules! new_party {
($meter:expr, $members:expr, $party_id:expr) => {
register_message(
&mut $meter,
&Message::PartyNew(message::PartyNew::new_list_of_named($members, $party_id))
); );
}; };
} }
assert_named_player_dmg!("1", 10.0); macro_rules! new_party_member {
assert_named_player_dmg!("2", 10.0); ($meter:expr, $player:expr, $party_id:expr) => {
assert_named_player_dmg!("3", 10.0); register_message(
&mut $meter,
helpers::register(Message::RegenerationHealthChanged( &Message::PartyJoin(message::PartyJoin::new_named($player, $party_id))
message::RegenerationHealthChanged::enabled(2), );
)); };
assert_named_player_dmg!("1", 10.0);
assert_named_player_dmg!("2", 10.0);
assert_named_player_dmg!("3", 10.0);
helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::enabled(3),
));
assert_named_player_dmg!("1", 10.0);
assert_named_player_dmg!("2", 10.0);
assert_named_player_dmg!("3", 10.0);
helpers::register(Message::RegenerationHealthChanged(
message::RegenerationHealthChanged::disabled(1),
));
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
assert_named_player_dmg!("1", 10.0);
assert_named_player_dmg!("2", 0.0);
assert_named_player_dmg!("3", 0.0);
} }
#[test] #[test]
fn test_party_members() { fn test_party_members() {
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); meter.configure(meter::MeterConfig {
helpers::configure(meter::MeterConfig {
skip_non_party_members: true, skip_non_party_members: true,
..Default::default() ..Default::default()
}); });
helpers::register(Message::CharacterStats(message::CharacterStats::new_named( main_character_enters!(meter, "MAIN_CH1", 1);
"main_player", character_enters!(meter, "CH1", 2);
1,
)));
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "main_player").is_some());
helpers::register(Message::NewCharacter(message::NewCharacter::new_named( let zone_stats = stats(&meter, StatType::Zone);
"other_player", assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
2, assert!(zone_stats.iter().find(|s| s.player == "CH1").is_none());
)));
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());
helpers::register(Message::PartyNew(message::PartyNew::new_list_of_named(
&["main_player", "other_player"],
1,
)));
assert_eq!(helpers::get_players_in_party().len(), 2); new_party!(meter, &["MAIN_CH1", "CH1"], 1);
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "main_player").is_some()); let zone_stats = stats(&meter, StatType::Zone);
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "other_player").is_some()); assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_some());
helpers::register(Message::NewCharacter(message::NewCharacter::new_named( character_enters!(meter, "CH2", 3);
"yet_another_other_player", let zone_stats = stats(&meter, StatType::Zone);
2, assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
))); assert!(zone_stats.iter().find(|s| s.player == "CH1").is_some());
assert!( assert!(zone_stats.iter().find(|s| s.player == "CH2").is_none());
helpers::get_damage_dealer_in_zone_by_name(py, "yet_another_other_player").is_none()
);
helpers::register(Message::PartyJoin(message::PartyJoin::new_named( new_party_member!(meter, "CH2", 1);
&"yet_another_other_player", let zone_stats = stats(&meter, StatType::Zone);
1, assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
))); assert!(zone_stats.iter().find(|s| s.player == "CH1").is_some());
assert_eq!(helpers::get_players_in_party().len(), 3); assert!(zone_stats.iter().find(|s| s.player == "CH2").is_some());
assert!(
helpers::get_damage_dealer_in_zone_by_name(py, "yet_another_other_player").is_some()
);
helpers::register(Message::PartyDisbanded(message::PartyDisbanded::new(1))); register_message(&mut meter, &Message::PartyDisbanded(message::PartyDisbanded::new(1)));
let zone_stats = stats(&meter, StatType::Zone);
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "main_player").is_some()); assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "other_player").is_none()); assert!(zone_stats.iter().find(|s| s.player == "CH1").is_none());
assert!( assert!(zone_stats.iter().find(|s| s.player == "CH2").is_none());
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] #[test]
fn test_fame_statistics() { fn test_fame_statistics() {
let guard = helpers::init(); let mut meter = helpers::init_();
let py = guard.python(); main_character_enters!(meter, "MAIN_CH1", 1);
helpers::register(Message::CharacterStats(message::CharacterStats::new_named( let zone_stats = stats(&meter, StatType::Zone);
"MAIN_CH1", 1, let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
))); assert_eq!(player_stats.fame_per_minute, 0);
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap();
assert_eq!(helpers::get_number(py, &stats, "fame_per_minute"), 0);
helpers::sleep(1000 * 60); helpers::sleep(1000 * 60);
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap(); let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(helpers::get_number(py, &stats, "fame_per_minute"), 0); let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.fame_per_minute, 0);
helpers::register(Message::FameUpdate(message::FameUpdate::new(1))); register_message(&mut meter, &Message::FameUpdate(message::FameUpdate::new(1)));
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap(); let zone_stats = stats(&meter, StatType::Zone);
assert_eq!(helpers::get_number(py, &stats, "fame_per_minute"), 100); let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.fame_per_minute, 100);
} }
} }
+150 -4
View File
@@ -9,11 +9,157 @@ mod meter;
mod core; mod core;
use crate::core::get_players_in_party; use std::sync::{Mutex, Arc};
use crate::core::initialize;
use cpython::PyList;
use cpython::PyObject;
use cpython::PyResult;
use cpython::Python;
use cpython::ToPyObject;
use cpython::PythonObject;
use cpython::FromPyObject;
use cpython::PyDict;
use crate::core::StatType; use crate::core::StatType;
use crate::core::stats;
use crate::core::reset;
struct PyMeter
{
value: Option<Arc<Mutex<meter::Meter>>>
}
impl PyMeter
{
fn new() -> Self {
Self{value: None}
}
fn initialize(&mut self, value: Arc<Mutex<meter::Meter>>) {
self.value = Some(value);
}
fn get(&mut self) -> Option<Arc<Mutex<meter::Meter>>> {
self.value.clone()
}
}
lazy_static! {
static ref METER: Mutex<PyMeter> = Mutex::new(PyMeter::new());
}
impl ToPyObject for core::PlayerStatistics {
type ObjectType = PyObject;
fn to_py_object(&self, py: Python) -> Self::ObjectType {
let stats = PyDict::new(py);
stats
.set_item(py, "player", self.player.to_py_object(py))
.unwrap();
stats
.set_item(py, "damage", self.damage.to_py_object(py))
.unwrap();
stats
.set_item(py, "time_in_combat", self.time_in_combat.to_py_object(py))
.unwrap();
stats
.set_item(py, "dps", self.dps.to_py_object(py))
.unwrap();
stats
.set_item(py, "seconds_in_game", self.seconds_in_game.to_py_object(py))
.unwrap();
stats
.set_item(py, "fame", self.fame.to_py_object(py))
.unwrap();
stats
.set_item(py, "fame_per_minute", self.fame_per_minute.to_py_object(py))
.unwrap();
stats
.set_item(py, "fame_per_hour", self.fame_per_hour.to_py_object(py))
.unwrap();
stats.into_object()
}
}
impl ToPyObject for core::PlayerStatisticsVec {
type ObjectType = PyList;
fn into_py_object(self, py: Python) -> Self::ObjectType {
self.value().into_py_object(py)
}
fn to_py_object(&self, py: Python) -> Self::ObjectType {
self.value().into_py_object(py)
}
}
impl <'source> FromPyObject<'source> for StatType {
fn extract(py: Python, obj: &'source PyObject) -> PyResult<Self> {
match obj.extract(py) {
Ok(n) => {
match n {
1 => Ok(StatType::LastFight),
2 => Ok(StatType::Zone),
3 => Ok(StatType::Overall),
_ => Ok(StatType::Unknown)
}
},
Err(e) => Err(e)
}
}
}
pub fn stats(py: Python, stat_type: StatType) -> PyResult<PyList> {
let meter = &mut METER.lock().unwrap();
if let Some(m) = meter.get() {
let meter = &mut *m.lock().unwrap();
return Ok(core::stats(&meter, stat_type).into_py_object(py))
}
Ok(PyList::new(py, Vec::<PyObject>::new().as_slice()))
}
pub fn reset(_py: Python, stat_type: StatType) -> PyResult<u32> {
let meter = &mut METER.lock().unwrap();
if let Some(m) = meter.get() {
let meter = &mut *m.lock().unwrap();
core::reset(meter, stat_type);
}
Ok(0)
}
pub fn get_players_in_party(py: Python) -> PyResult<PyList> {
let meter = &mut METER.lock().unwrap();
if let Some(m) = meter.get() {
let meter = &mut *m.lock().unwrap();
return Ok(core::get_players_in_party(&meter).into_py_object(py))
}
Ok(PyList::new(py, Vec::<PyObject>::new().as_slice()))
}
fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
let meter = &mut METER.lock().unwrap();
meter.initialize(core::initialize());
if let Some(m) = meter.get() {
let meter = &mut *m.lock().unwrap();
meter.configure(core::MeterConfig {
skip_non_party_members,
..Default::default()
})
}
Ok(0)
}
py_module_initializer!(libmeter, initliblibmeter, PyInit_libmeter, |py, m| { py_module_initializer!(libmeter, initliblibmeter, PyInit_libmeter, |py, m| {
m.add(py, "__doc__", "This module is implemented in Rust")?; m.add(py, "__doc__", "This module is implemented in Rust")?;
+1 -1
View File
@@ -179,7 +179,7 @@ impl Meter {
} }
impl PlayerEvents for Meter { impl PlayerEvents for Meter {
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut DamageDealer>> { fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn DamageDealer>> {
let (zone, last_fight) = self.sessions_mut()?; let (zone, last_fight) = self.sessions_mut()?;
let las_fight_session_player = last_fight.get_player_by_id(player_id)?; let las_fight_session_player = last_fight.get_player_by_id(player_id)?;
let zone_player = zone.get_player_by_id(player_id)?; let zone_player = zone.get_player_by_id(player_id)?;
+4 -70
View File
@@ -7,15 +7,6 @@ use fake_clock::FakeClock as Instant;
#[cfg(not(test))] #[cfg(not(test))]
use std::time::Instant; use std::time::Instant;
use cpython::PythonObject;
use cpython::ToPyObject;
use cpython::FromPyObject;
use cpython::Python;
use cpython::PyObject;
use cpython::PyDict;
use cpython::PyList;
use cpython::PyResult;
use super::traits::DamageStats; use super::traits::DamageStats;
use super::traits::FameStats; use super::traits::FameStats;
@@ -80,6 +71,10 @@ impl PlayerStatisticsVec {
} }
} }
pub fn value(&self) -> Vec<PlayerStatistics> {
self._vec.clone()
}
pub fn merged(a: &Self, b: &Self) -> Self { pub fn merged(a: &Self, b: &Self) -> Self {
let merged = [&a._vec[..], &b._vec[..]].concat().iter().fold( let merged = [&a._vec[..], &b._vec[..]].concat().iter().fold(
HashMap::<String, PlayerStatistics>::new(), HashMap::<String, PlayerStatistics>::new(),
@@ -128,64 +123,3 @@ impl FameStats for PlayerStatistics {
} }
} }
impl ToPyObject for PlayerStatistics {
type ObjectType = PyObject;
fn to_py_object(&self, py: Python) -> Self::ObjectType {
let stats = PyDict::new(py);
stats
.set_item(py, "player", self.player.to_py_object(py))
.unwrap();
stats
.set_item(py, "damage", self.damage.to_py_object(py))
.unwrap();
stats
.set_item(py, "time_in_combat", self.time_in_combat.to_py_object(py))
.unwrap();
stats
.set_item(py, "dps", self.dps.to_py_object(py))
.unwrap();
stats
.set_item(py, "seconds_in_game", self.seconds_in_game.to_py_object(py))
.unwrap();
stats
.set_item(py, "fame", self.fame.to_py_object(py))
.unwrap();
stats
.set_item(py, "fame_per_minute", self.fame_per_minute.to_py_object(py))
.unwrap();
stats
.set_item(py, "fame_per_hour", self.fame_per_hour.to_py_object(py))
.unwrap();
stats.into_object()
}
}
impl ToPyObject for PlayerStatisticsVec {
type ObjectType = PyList;
fn into_py_object(self, py: Python) -> Self::ObjectType {
self._vec.into_py_object(py)
}
fn to_py_object(&self, py: Python) -> Self::ObjectType {
self._vec.clone().into_py_object(py)
}
}
impl <'source> FromPyObject<'source> for StatType {
fn extract(py: Python, obj: &'source PyObject) -> PyResult<Self> {
match obj.extract(py) {
Ok(n) => {
match n {
1 => Ok(StatType::LastFight),
2 => Ok(StatType::Zone),
3 => Ok(StatType::Overall),
_ => Ok(StatType::Unknown)
}
},
Err(e) => Err(e)
}
}
}