[Refactor] Interface to python cleanup.
This commit is contained in:
@@ -22,4 +22,6 @@ timer = "0.1"
|
|||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
log = { version = "0.4", features = ["std"] }
|
log = { version = "0.4", features = ["std"] }
|
||||||
lazy_static = "1.2"
|
lazy_static = "1.2"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
fake_clock = "0.3.0"
|
fake_clock = "0.3.0"
|
||||||
+19
-12
@@ -6,6 +6,13 @@ from config import config
|
|||||||
TESTING_ENABLED = bool(os.getenv('TESTING'))
|
TESTING_ENABLED = bool(os.getenv('TESTING'))
|
||||||
|
|
||||||
|
|
||||||
|
class StatType:
|
||||||
|
Unknown = 0
|
||||||
|
LastFight = 1
|
||||||
|
Zone = 2
|
||||||
|
Overall = 3
|
||||||
|
|
||||||
|
|
||||||
class DamageStat:
|
class DamageStat:
|
||||||
def __init__(self, name, damage, time_in_combat, dps, precentage):
|
def __init__(self, name, damage, time_in_combat, dps, precentage):
|
||||||
self.name = name
|
self.name = name
|
||||||
@@ -50,7 +57,7 @@ def with_precentage(session):
|
|||||||
|
|
||||||
return session
|
return session
|
||||||
|
|
||||||
def get_zone_session():
|
def zone_stats():
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
session = [
|
session = [
|
||||||
{'player': 'A'*20, 'damage': 1234.02,
|
{'player': 'A'*20, 'damage': 1234.02,
|
||||||
@@ -60,31 +67,31 @@ def get_zone_session():
|
|||||||
{'player': 'D'*20, 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
|
{'player': 'D'*20, 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
|
||||||
]
|
]
|
||||||
else:
|
else:
|
||||||
session = libmeter.get_zone_session()
|
session = libmeter.stats(StatType.Zone)
|
||||||
|
|
||||||
return stats(session)
|
return stats(session)
|
||||||
|
|
||||||
|
|
||||||
def get_overall_session():
|
def overall_stats():
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
session = [
|
session = [
|
||||||
{'player': 'overall', 'damage': 1234.02,
|
{'player': 'overall', 'damage': 1234.02,
|
||||||
'time_in_combat': 12.0, 'dps': 12.4234},
|
'time_in_combat': 12.0, 'dps': 12.4234},
|
||||||
]
|
]
|
||||||
else:
|
else:
|
||||||
session = libmeter.get_overall_session()
|
session = libmeter.stats(StatType.Overall)
|
||||||
|
|
||||||
return stats(session)
|
return stats(session)
|
||||||
|
|
||||||
|
|
||||||
def get_last_fight_session():
|
def last_fight_stats():
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
session = [
|
session = [
|
||||||
{'player': 'last fight', 'damage': 1234.02,
|
{'player': 'last fight', 'damage': 1234.02,
|
||||||
'time_in_combat': 12.0, 'dps': 12.4234},
|
'time_in_combat': 12.0, 'dps': 12.4234},
|
||||||
]
|
]
|
||||||
else:
|
else:
|
||||||
session = libmeter.get_last_fight_session()
|
session = libmeter.stats(StatType.LastFight)
|
||||||
|
|
||||||
return stats(session)
|
return stats(session)
|
||||||
|
|
||||||
@@ -95,14 +102,14 @@ def get_party_members():
|
|||||||
return libmeter.get_players_in_party()
|
return libmeter.get_players_in_party()
|
||||||
|
|
||||||
|
|
||||||
def new_zone_session():
|
def reset_zone_stats():
|
||||||
libmeter.new_zone_session()
|
libmeter.reset_zone_stats()
|
||||||
|
|
||||||
def new_last_fight_session():
|
def reset_last_fight_stats():
|
||||||
libmeter.new_last_fight_session()
|
libmeter.reset_last_fight_stats()
|
||||||
|
|
||||||
def reset_sessions():
|
def reset_stats():
|
||||||
libmeter.reset_sessions()
|
libmeter.reset_stats()
|
||||||
|
|
||||||
def initialize():
|
def initialize():
|
||||||
if TESTING_ENABLED:
|
if TESTING_ENABLED:
|
||||||
|
|||||||
+6
-6
@@ -60,9 +60,9 @@ class BottomButtons(QWidget):
|
|||||||
|
|
||||||
def reset(self):
|
def reset(self):
|
||||||
reset = {
|
reset = {
|
||||||
Mode.CURRENT_ZONE: engine.new_zone_session,
|
Mode.CURRENT_ZONE: engine.reset_zone_stats,
|
||||||
Mode.LAST_FIGHT: engine.new_last_fight_session,
|
Mode.LAST_FIGHT: engine.reset_last_fight_stats,
|
||||||
Mode.OVERALL: engine.reset_sessions
|
Mode.OVERALL: engine.reset_stats
|
||||||
}
|
}
|
||||||
|
|
||||||
reset[self.mode()]()
|
reset[self.mode()]()
|
||||||
@@ -126,9 +126,9 @@ class MainWidget(QWidget):
|
|||||||
|
|
||||||
def session(self):
|
def session(self):
|
||||||
sessions = {
|
sessions = {
|
||||||
Mode.CURRENT_ZONE: engine.get_zone_session,
|
Mode.CURRENT_ZONE: engine.zone_stats,
|
||||||
Mode.LAST_FIGHT: engine.get_last_fight_session,
|
Mode.LAST_FIGHT: engine.last_fight_stats,
|
||||||
Mode.OVERALL: engine.get_overall_session
|
Mode.OVERALL: engine.overall_stats
|
||||||
}
|
}
|
||||||
|
|
||||||
return sessions[self.mode.currentText()]()
|
return sessions[self.mode.currentText()]()
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ pub fn receive(tx: Sender<UdpPacket>) {
|
|||||||
.into_iter()
|
.into_iter()
|
||||||
.filter(|i| !i.is_loopback());
|
.filter(|i| !i.is_loopback());
|
||||||
|
|
||||||
debug!("Found interfaces: {:?}", interfaces);
|
info!("Found interfaces: {:?}", interfaces);
|
||||||
|
|
||||||
for interface in interfaces {
|
for interface in interfaces {
|
||||||
let tx = shared_tx.clone();
|
let tx = shared_tx.clone();
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ class Stat:
|
|||||||
return self.name == other.name and self.damage == other.damage and self.time_in_combat == other.time_in_combat and self.dps == other.dps
|
return self.name == other.name and self.damage == other.damage and self.time_in_combat == other.time_in_combat and self.dps == other.dps
|
||||||
|
|
||||||
|
|
||||||
def get_zone_session():
|
def zone_stats():
|
||||||
session = libmeter.get_zone_session()
|
session = libmeter.zone_stats()
|
||||||
# session = [
|
# session = [
|
||||||
# {'player': 'A', 'damage': 1234.02, 'time_in_combat': 12.0, 'dps': 12.4234},
|
# {'player': 'A', 'damage': 1234.02, 'time_in_combat': 12.0, 'dps': 12.4234},
|
||||||
# {'player': 'B', 'damage': 5435.02, 'time_in_combat': 12.0, 'dps': 12},
|
# {'player': 'B', 'damage': 5435.02, 'time_in_combat': 12.0, 'dps': 12},
|
||||||
@@ -94,12 +94,12 @@ class MyWidget(QWidget):
|
|||||||
self.layout.addWidget(self.refresh_button)
|
self.layout.addWidget(self.refresh_button)
|
||||||
self.setLayout(self.layout)
|
self.setLayout(self.layout)
|
||||||
|
|
||||||
self.table.fill(get_zone_session())
|
self.table.fill(zone_stats())
|
||||||
self.copy_button.clicked.connect(self.copy)
|
self.copy_button.clicked.connect(self.copy)
|
||||||
self.refresh_button.clicked.connect(self.clear)
|
self.refresh_button.clicked.connect(self.clear)
|
||||||
|
|
||||||
timer = QTimer(self)
|
timer = QTimer(self)
|
||||||
timer.timeout.connect(lambda: self.table.fill(get_zone_session()))
|
timer.timeout.connect(lambda: self.table.fill(zone_stats()))
|
||||||
timer.start(5000)
|
timer.start(5000)
|
||||||
|
|
||||||
def copy(self):
|
def copy(self):
|
||||||
|
|||||||
+71
-65
@@ -16,59 +16,55 @@ use packet_sniffer::UdpPacket;
|
|||||||
|
|
||||||
use crate::game_protocol;
|
use crate::game_protocol;
|
||||||
use crate::meter;
|
use crate::meter;
|
||||||
|
use meter::GameStats;
|
||||||
|
use meter::LastFightStats;
|
||||||
|
use meter::OverallStats;
|
||||||
use meter::PartyEvents;
|
use meter::PartyEvents;
|
||||||
use meter::PlayerEvents;
|
use meter::PlayerEvents;
|
||||||
use meter::ZoneStats;
|
use meter::ZoneStats;
|
||||||
|
|
||||||
|
pub use meter::StatType;
|
||||||
|
|
||||||
lazy_static! {
|
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 get_zone_session(py: Python) -> PyResult<PyList> {
|
pub fn stats(py: Python, stat_type: StatType) -> PyResult<PyList> {
|
||||||
let meter = &mut METER.lock().unwrap();
|
let meter = &mut METER.lock().unwrap();
|
||||||
meter.get_zone_session().map_or_else(
|
match stat_type {
|
||||||
|
StatType::Zone => meter.zone_stats().map_or_else(
|
||||||
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())),
|
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())),
|
||||||
|v| Ok(v.into_py_object(py)),
|
|v| Ok(v.into_py_object(py)),
|
||||||
)
|
),
|
||||||
}
|
StatType::LastFight => meter.last_fight_stats().map_or_else(
|
||||||
|
|
||||||
pub fn get_overall_session(py: Python) -> PyResult<PyList> {
|
|
||||||
let meter = &mut METER.lock().unwrap();
|
|
||||||
meter.get_overall_session().map_or_else(
|
|
||||||
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())),
|
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())),
|
||||||
|v| Ok(v.into_py_object(py)),
|
|v| Ok(v.into_py_object(py)),
|
||||||
)
|
),
|
||||||
}
|
StatType::Overall => meter.overall_stats().map_or_else(
|
||||||
|
|
||||||
pub fn get_last_fight_session(py: Python) -> PyResult<PyList> {
|
|
||||||
let meter = &mut METER.lock().unwrap();
|
|
||||||
meter.get_last_fight_session().map_or_else(
|
|
||||||
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())),
|
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())),
|
||||||
|v| Ok(v.into_py_object(py)),
|
|v| Ok(v.into_py_object(py)),
|
||||||
)
|
),
|
||||||
|
_ => {
|
||||||
|
error!("Unexpected stats requested.");
|
||||||
|
Ok(PyList::new(py, Vec::<PyObject>::new().as_slice()))
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn new_zone_session(_py: Python) -> PyResult<u32> {
|
pub fn reset(_py: Python, stat_type: StatType) -> PyResult<u32> {
|
||||||
let meter = &mut METER.lock().unwrap();
|
let meter = &mut METER.lock().unwrap();
|
||||||
|
match stat_type {
|
||||||
meter.new_zone_session();
|
StatType::Zone => {
|
||||||
|
meter.reset_zone_stats();
|
||||||
Ok(0)
|
}
|
||||||
}
|
StatType::LastFight => {
|
||||||
|
meter.reset_last_fight_stats();
|
||||||
pub fn reset_sessions(_py: Python) -> PyResult<u32> {
|
}
|
||||||
let meter = &mut METER.lock().unwrap();
|
StatType::Overall => {
|
||||||
|
meter.reset_stats();
|
||||||
meter.reset();
|
}
|
||||||
|
_ => error!("Unexpected stat to reset."),
|
||||||
Ok(0)
|
}
|
||||||
}
|
|
||||||
|
|
||||||
pub fn new_last_fight_session(_py: Python) -> PyResult<u32> {
|
|
||||||
let meter = &mut METER.lock().unwrap();
|
|
||||||
|
|
||||||
meter.new_last_fight_session();
|
|
||||||
|
|
||||||
Ok(0)
|
Ok(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,16 +79,19 @@ pub fn get_players_in_party(py: Python) -> PyResult<PyList> {
|
|||||||
|
|
||||||
pub fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
|
pub fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
|
||||||
CombinedLogger::init(vec![WriteLogger::new(
|
CombinedLogger::init(vec![WriteLogger::new(
|
||||||
LevelFilter::Trace,
|
LevelFilter::Info,
|
||||||
Config::default(),
|
Config::default(),
|
||||||
File::create("damage-meter.log").unwrap(),
|
File::create("damage-meter.log").unwrap(),
|
||||||
)])
|
)])
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
configure(&mut METER.lock().unwrap(), meter::MeterConfig {
|
configure(
|
||||||
|
&mut METER.lock().unwrap(),
|
||||||
|
meter::MeterConfig {
|
||||||
skip_non_party_members,
|
skip_non_party_members,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
});
|
},
|
||||||
|
);
|
||||||
|
|
||||||
thread::spawn(move || {
|
thread::spawn(move || {
|
||||||
let (tx, rx): (Sender<UdpPacket>, Receiver<UdpPacket>) = channel();
|
let (tx, rx): (Sender<UdpPacket>, Receiver<UdpPacket>) = channel();
|
||||||
@@ -126,7 +125,7 @@ fn register_messages(meter: &mut meter::Meter, messages: &Vec<game_protocol::Mes
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn register_message(events: &mut meter::Meter, message: &game_protocol::Message) {
|
fn register_message(events: &mut meter::Meter, message: &game_protocol::Message) {
|
||||||
debug!("Found message {:?}", message);
|
info!("Found message {:?}", message);
|
||||||
match message {
|
match message {
|
||||||
game_protocol::Message::Leave(msg) => events.register_leave(msg.source).unwrap_or(()),
|
game_protocol::Message::Leave(msg) => events.register_leave(msg.source).unwrap_or(()),
|
||||||
game_protocol::Message::NewCharacter(msg) => {
|
game_protocol::Message::NewCharacter(msg) => {
|
||||||
@@ -152,9 +151,9 @@ fn register_message(events: &mut meter::Meter, message: &game_protocol::Message)
|
|||||||
game_protocol::Message::PartyDisbanded(_) => {
|
game_protocol::Message::PartyDisbanded(_) => {
|
||||||
events.register_party_disbanded().unwrap_or(())
|
events.register_party_disbanded().unwrap_or(())
|
||||||
}
|
}
|
||||||
game_protocol::Message::FameUpdate(msg) => {
|
game_protocol::Message::FameUpdate(msg) => events
|
||||||
events.register_fame_gain(msg.source, msg.fame).unwrap_or(())
|
.register_fame_gain(msg.source, msg.fame)
|
||||||
}
|
.unwrap_or(()),
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -173,7 +172,7 @@ mod tests {
|
|||||||
|
|
||||||
pub fn init() -> cpython::GILGuard {
|
pub fn init() -> cpython::GILGuard {
|
||||||
let meter = &mut METER.lock().unwrap();
|
let meter = &mut METER.lock().unwrap();
|
||||||
meter.reset();
|
meter.reset_stats();
|
||||||
|
|
||||||
super::configure(meter, Default::default());
|
super::configure(meter, Default::default());
|
||||||
|
|
||||||
@@ -200,14 +199,14 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_damage_dealer_in_zone_by_index(py: Python, index: usize) -> PyDict {
|
pub fn get_damage_dealer_in_zone_by_index(py: Python, index: usize) -> PyDict {
|
||||||
let zone_session = get_zone_session(py).unwrap();
|
let zone_session = stats(py, StatType::Zone).unwrap();
|
||||||
let stat = zone_session.get_item(py, index);
|
let stat = zone_session.get_item(py, index);
|
||||||
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
|
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
|
||||||
player
|
player
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_damage_dealer_in_zone_by_name(py: Python, name: &str) -> Option<PyDict> {
|
pub fn get_damage_dealer_in_zone_by_name(py: Python, name: &str) -> Option<PyDict> {
|
||||||
let zone_session_len = get_zone_session(py).unwrap().len(py);
|
let zone_session_len = stats(py, StatType::Zone).unwrap().len(py);
|
||||||
|
|
||||||
for idx in 0..zone_session_len {
|
for idx in 0..zone_session_len {
|
||||||
let player = get_damage_dealer_in_zone_by_index(py, idx);
|
let player = get_damage_dealer_in_zone_by_index(py, idx);
|
||||||
@@ -219,14 +218,14 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_player_overall_index(py: Python, index: usize) -> PyDict {
|
pub fn get_player_overall_index(py: Python, index: usize) -> PyDict {
|
||||||
let zone_session = get_overall_session(py).unwrap();
|
let zone_session = stats(py, StatType::Overall).unwrap();
|
||||||
let stat = zone_session.get_item(py, index);
|
let stat = zone_session.get_item(py, index);
|
||||||
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
|
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
|
||||||
player
|
player
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_player_overall_by_name(py: Python, name: &str) -> Option<PyDict> {
|
pub fn get_player_overall_by_name(py: Python, name: &str) -> Option<PyDict> {
|
||||||
let zone_session_len = get_overall_session(py).unwrap().len(py);
|
let zone_session_len = stats(py, StatType::Overall).unwrap().len(py);
|
||||||
|
|
||||||
for idx in 0..zone_session_len {
|
for idx in 0..zone_session_len {
|
||||||
let player = get_player_overall_index(py, idx);
|
let player = get_player_overall_index(py, idx);
|
||||||
@@ -238,14 +237,14 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_player_last_fight_index(py: Python, index: usize) -> PyDict {
|
pub fn get_player_last_fight_index(py: Python, index: usize) -> PyDict {
|
||||||
let zone_session = get_last_fight_session(py).unwrap();
|
let zone_session = stats(py, StatType::LastFight).unwrap();
|
||||||
let stat = zone_session.get_item(py, index);
|
let stat = zone_session.get_item(py, index);
|
||||||
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
|
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
|
||||||
player
|
player
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_player_last_fight_by_name(py: Python, name: &str) -> Option<PyDict> {
|
pub fn get_player_last_fight_by_name(py: Python, name: &str) -> Option<PyDict> {
|
||||||
let zone_session_len = get_last_fight_session(py).unwrap().len(py);
|
let zone_session_len = stats(py, StatType::LastFight).unwrap().len(py);
|
||||||
|
|
||||||
for idx in 0..zone_session_len {
|
for idx in 0..zone_session_len {
|
||||||
let player = get_player_last_fight_index(py, idx);
|
let player = get_player_last_fight_index(py, idx);
|
||||||
@@ -281,11 +280,7 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_number(py: Python, stats: &PyDict, key: &str) -> u32 {
|
pub fn get_number(py: Python, stats: &PyDict, key: &str) -> u32 {
|
||||||
stats
|
stats.get_item(py, key).unwrap().extract(py).unwrap()
|
||||||
.get_item(py, key)
|
|
||||||
.unwrap()
|
|
||||||
.extract(py)
|
|
||||||
.unwrap()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -419,7 +414,7 @@ mod tests {
|
|||||||
let guard = helpers::init();
|
let guard = helpers::init();
|
||||||
let py = guard.python();
|
let py = guard.python();
|
||||||
|
|
||||||
assert_eq!(get_zone_session(py).unwrap().len(py), 0);
|
assert_eq!(stats(py, StatType::Zone).unwrap().len(py), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -429,7 +424,7 @@ mod tests {
|
|||||||
|
|
||||||
helpers::register(Message::NewCharacter(message::NewCharacter::new(1)));
|
helpers::register(Message::NewCharacter(message::NewCharacter::new(1)));
|
||||||
|
|
||||||
let zone_session = get_zone_session(py).unwrap();
|
let zone_session = stats(py, StatType::Zone).unwrap();
|
||||||
assert_eq!(zone_session.len(py), 1);
|
assert_eq!(zone_session.len(py), 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -513,7 +508,7 @@ mod tests {
|
|||||||
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
||||||
|
|
||||||
new_zone_session(py).unwrap();
|
reset(py, StatType::Zone).unwrap();
|
||||||
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
}
|
}
|
||||||
@@ -732,12 +727,14 @@ mod tests {
|
|||||||
});
|
});
|
||||||
|
|
||||||
helpers::register(Message::CharacterStats(message::CharacterStats::new_named(
|
helpers::register(Message::CharacterStats(message::CharacterStats::new_named(
|
||||||
"main_player", 1,
|
"main_player",
|
||||||
|
1,
|
||||||
)));
|
)));
|
||||||
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "main_player").is_some());
|
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "main_player").is_some());
|
||||||
|
|
||||||
helpers::register(Message::NewCharacter(message::NewCharacter::new_named(
|
helpers::register(Message::NewCharacter(message::NewCharacter::new_named(
|
||||||
"other_player", 2,
|
"other_player",
|
||||||
|
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, "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, "other_player").is_none());
|
||||||
@@ -747,25 +744,34 @@ mod tests {
|
|||||||
1,
|
1,
|
||||||
)));
|
)));
|
||||||
|
|
||||||
|
|
||||||
assert_eq!(helpers::get_players_in_party().len(), 2);
|
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, "main_player").is_some());
|
||||||
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "other_player").is_some());
|
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "other_player").is_some());
|
||||||
|
|
||||||
helpers::register(Message::NewCharacter(message::NewCharacter::new_named(
|
helpers::register(Message::NewCharacter(message::NewCharacter::new_named(
|
||||||
"yet_another_other_player", 2,
|
"yet_another_other_player",
|
||||||
|
2,
|
||||||
)));
|
)));
|
||||||
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "yet_another_other_player").is_none());
|
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)));
|
helpers::register(Message::PartyJoin(message::PartyJoin::new_named(
|
||||||
|
&"yet_another_other_player",
|
||||||
|
1,
|
||||||
|
)));
|
||||||
assert_eq!(helpers::get_players_in_party().len(), 3);
|
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());
|
assert!(
|
||||||
|
helpers::get_damage_dealer_in_zone_by_name(py, "yet_another_other_player").is_some()
|
||||||
|
);
|
||||||
|
|
||||||
helpers::register(Message::PartyDisbanded(message::PartyDisbanded::new(1)));
|
helpers::register(Message::PartyDisbanded(message::PartyDisbanded::new(1)));
|
||||||
|
|
||||||
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "main_player").is_some());
|
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, "other_player").is_none());
|
||||||
assert!(helpers::get_damage_dealer_in_zone_by_name(py, "yet_another_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);
|
assert_eq!(helpers::get_players_in_party().len(), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+6
-21
@@ -9,32 +9,17 @@ mod meter;
|
|||||||
|
|
||||||
mod core;
|
mod core;
|
||||||
|
|
||||||
use crate::core::get_last_fight_session;
|
|
||||||
use crate::core::get_overall_session;
|
|
||||||
use crate::core::get_zone_session;
|
|
||||||
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;
|
use crate::core::get_players_in_party;
|
||||||
|
use crate::core::initialize;
|
||||||
|
use crate::core::StatType;
|
||||||
|
use crate::core::stats;
|
||||||
|
use crate::core::reset;
|
||||||
|
|
||||||
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")?;
|
||||||
m.add(py, "initialize", py_fn!(py, initialize(skip_non_party_members: bool)))?;
|
m.add(py, "initialize", py_fn!(py, initialize(skip_non_party_members: bool)))?;
|
||||||
m.add(py, "new_zone_session", py_fn!(py, new_zone_session()))?;
|
m.add(py, "stats", py_fn!(py, stats(stat_type: StatType)))?;
|
||||||
m.add(py, "get_overall_session", py_fn!(py, get_overall_session()))?;
|
m.add(py, "reset", py_fn!(py, reset(stat_type: StatType)))?;
|
||||||
m.add(
|
|
||||||
py,
|
|
||||||
"get_last_fight_session",
|
|
||||||
py_fn!(py, get_last_fight_session()),
|
|
||||||
)?;
|
|
||||||
m.add(py, "reset_sessions", py_fn!(py, reset_sessions()))?;
|
|
||||||
m.add(
|
|
||||||
py,
|
|
||||||
"new_last_fight_session",
|
|
||||||
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()))?;
|
m.add(py, "get_players_in_party", py_fn!(py, get_players_in_party()))?;
|
||||||
Ok(())
|
Ok(())
|
||||||
});
|
});
|
||||||
|
|||||||
+25
-17
@@ -199,7 +199,7 @@ impl PlayerEvents for Meter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn register_main_player(&mut self, name: &str, id: usize) {
|
fn register_main_player(&mut self, name: &str, id: usize) {
|
||||||
debug!("Main player {} registerd with id {}", name, id);
|
info!("Main player {} registered with id {}", name, id);
|
||||||
self.main_player_id = Some(id);
|
self.main_player_id = Some(id);
|
||||||
|
|
||||||
if self.zone_session.is_none() {
|
if self.zone_session.is_none() {
|
||||||
@@ -211,7 +211,7 @@ impl PlayerEvents for Meter {
|
|||||||
fn register_leave(&mut self, id: usize) -> Option<()> {
|
fn register_leave(&mut self, id: usize) -> Option<()> {
|
||||||
let 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 {
|
||||||
debug!("New session, main player left the zone");
|
info!("Main player ({}) left the zone, Creating new zone session.", id);
|
||||||
self.zone_session_mut()?.cleanup_players();
|
self.zone_session_mut()?.cleanup_players();
|
||||||
self.new_session();
|
self.new_session();
|
||||||
}
|
}
|
||||||
@@ -221,7 +221,7 @@ impl PlayerEvents for Meter {
|
|||||||
|
|
||||||
fn register_player(&mut self, name: &str, id: usize) {
|
fn register_player(&mut self, name: &str, id: usize) {
|
||||||
if self.zone_session.is_none() {
|
if self.zone_session.is_none() {
|
||||||
debug!("New session");
|
info!("New player ({}) registered without session, creating new session", name);
|
||||||
self.new_session();
|
self.new_session();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -240,20 +240,34 @@ impl PlayerEvents for Meter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl LastFightStats for Meter {
|
||||||
|
fn last_fight_stats(&self) -> Option<PlayerStatisticsVec> {
|
||||||
|
let last_session = &self.last_fight_session;
|
||||||
|
Some(last_session.stats(|p| self.stats_filter(p)))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reset_last_fight_stats(&mut self) -> Option<()> {
|
||||||
|
self.last_fight_session = Session::from(&self.last_fight_session);
|
||||||
|
Some(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl ZoneStats for Meter {
|
impl ZoneStats for Meter {
|
||||||
fn get_zone_session(&self) -> Option<PlayerStatisticsVec> {
|
fn zone_stats(&self) -> Option<PlayerStatisticsVec> {
|
||||||
let last_session = self.zone_session()?;
|
let last_session = self.zone_session()?;
|
||||||
Some(last_session.stats(|p| self.stats_filter(p)))
|
Some(last_session.stats(|p| self.stats_filter(p)))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn new_zone_session(&mut self) -> Option<()> {
|
fn reset_zone_stats(&mut self) -> Option<()> {
|
||||||
let last_session = self.zone_session_mut()?;
|
let last_session = self.zone_session_mut()?;
|
||||||
self.zone_session = Some(Session::from(&last_session));
|
self.zone_session = Some(Session::from(&last_session));
|
||||||
|
|
||||||
Some(())
|
Some(())
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn get_overall_session(&self) -> Option<PlayerStatisticsVec> {
|
impl OverallStats for Meter {
|
||||||
|
fn overall_stats(&self) -> Option<PlayerStatisticsVec> {
|
||||||
if let Some(zone) = self.zone_session() {
|
if let Some(zone) = self.zone_session() {
|
||||||
return Some(PlayerStatisticsVec::merged(
|
return Some(PlayerStatisticsVec::merged(
|
||||||
&self.zone_history,
|
&self.zone_history,
|
||||||
@@ -263,21 +277,15 @@ impl ZoneStats for Meter {
|
|||||||
|
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn reset(&mut self) {
|
impl GameStats for Meter {
|
||||||
|
fn reset_stats(&mut self) -> Option<()> {
|
||||||
self.zone_history = PlayerStatisticsVec::new();
|
self.zone_history = PlayerStatisticsVec::new();
|
||||||
self.zone_session = None;
|
self.zone_session = None;
|
||||||
self.last_fight_session = Session::new();
|
self.last_fight_session = Session::new();
|
||||||
self.main_player_id = None;
|
self.main_player_id = None;
|
||||||
}
|
|
||||||
|
|
||||||
fn get_last_fight_session(&self) -> Option<PlayerStatisticsVec> {
|
|
||||||
let last_session = &self.last_fight_session;
|
|
||||||
Some(last_session.stats(|p| self.stats_filter(p)))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn new_last_fight_session(&mut self) -> Option<()> {
|
|
||||||
self.last_fight_session = Session::from(&self.last_fight_session);
|
|
||||||
Some(())
|
Some(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -318,8 +326,8 @@ impl traits::PartyEvents for Meter {
|
|||||||
fn test_meter() {
|
fn test_meter() {
|
||||||
let mut meter = Meter::new();
|
let mut meter = Meter::new();
|
||||||
|
|
||||||
assert_eq!(meter.get_zone_session(), None);
|
assert_eq!(meter.zone_stats(), None);
|
||||||
|
|
||||||
meter.register_main_player("name", 0);
|
meter.register_main_player("name", 0);
|
||||||
assert!(meter.get_zone_session().is_some());
|
assert!(meter.zone_stats().is_some());
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-9
@@ -101,18 +101,23 @@ pub trait PlayerEvents {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub trait LastFightStats {
|
||||||
|
fn last_fight_stats(&self) -> Option<PlayerStatisticsVec>;
|
||||||
|
fn reset_last_fight_stats(&mut self) -> Option<()>;
|
||||||
|
}
|
||||||
|
|
||||||
pub trait ZoneStats {
|
pub trait ZoneStats {
|
||||||
fn reset(&mut self);
|
fn zone_stats(&self) -> Option<PlayerStatisticsVec>;
|
||||||
|
fn reset_zone_stats(&mut self) -> Option<()>;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub trait OverallStats {
|
||||||
|
fn overall_stats(&self) -> Option<PlayerStatisticsVec>;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub trait GameStats {
|
||||||
fn get_players_in_party(&self) -> Option<Vec<String>>;
|
fn get_players_in_party(&self) -> Option<Vec<String>>;
|
||||||
|
fn reset_stats(&mut self) -> Option<()>;
|
||||||
fn get_zone_session(&self) -> Option<PlayerStatisticsVec>;
|
|
||||||
fn new_zone_session(&mut self) -> Option<()>;
|
|
||||||
|
|
||||||
fn get_overall_session(&self) -> Option<PlayerStatisticsVec>;
|
|
||||||
|
|
||||||
fn get_last_fight_session(&self) -> Option<PlayerStatisticsVec>;
|
|
||||||
fn new_last_fight_session(&mut self) -> Option<()>;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait PartyEvents {
|
pub trait PartyEvents {
|
||||||
|
|||||||
@@ -9,10 +9,12 @@ use std::time::Instant;
|
|||||||
|
|
||||||
use cpython::PythonObject;
|
use cpython::PythonObject;
|
||||||
use cpython::ToPyObject;
|
use cpython::ToPyObject;
|
||||||
|
use cpython::FromPyObject;
|
||||||
use cpython::Python;
|
use cpython::Python;
|
||||||
use cpython::PyObject;
|
use cpython::PyObject;
|
||||||
use cpython::PyDict;
|
use cpython::PyDict;
|
||||||
use cpython::PyList;
|
use cpython::PyList;
|
||||||
|
use cpython::PyResult;
|
||||||
|
|
||||||
use super::traits::DamageStats;
|
use super::traits::DamageStats;
|
||||||
use super::traits::FameStats;
|
use super::traits::FameStats;
|
||||||
@@ -57,6 +59,14 @@ pub struct PlayerStatisticsVec {
|
|||||||
_vec: Vec<PlayerStatistics>
|
_vec: Vec<PlayerStatistics>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq, Copy, Clone)]
|
||||||
|
pub enum StatType {
|
||||||
|
LastFight,
|
||||||
|
Zone,
|
||||||
|
Overall,
|
||||||
|
Unknown
|
||||||
|
}
|
||||||
|
|
||||||
impl PlayerStatisticsVec {
|
impl PlayerStatisticsVec {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
Self {
|
Self {
|
||||||
@@ -163,3 +173,19 @@ impl ToPyObject for PlayerStatisticsVec {
|
|||||||
self._vec.clone().into_py_object(py)
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user