+ reset functionallity
This commit is contained in:
+10
-7
@@ -12,16 +12,19 @@ class Stat:
|
||||
|
||||
|
||||
def get_instance_session():
|
||||
# session = libmeter.get_instance_session()
|
||||
session = [
|
||||
{'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': 'C', 'damage': 23.02, 'time_in_combat': 12.0, 'dps': 13},
|
||||
{'player': 'D', 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
|
||||
]
|
||||
session = libmeter.get_instance_session()
|
||||
# session = [
|
||||
# {'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': 'C', 'damage': 23.02, 'time_in_combat': 12.0, 'dps': 13},
|
||||
# {'player': 'D', 'damage': 0, 'time_in_combat': 12.0, 'dps': 0}
|
||||
# ]
|
||||
|
||||
return [Stat(s['player'], s['damage'], s['time_in_combat'], s['dps']) for s in session]
|
||||
|
||||
def reset_instance_session():
|
||||
libmeter.reset_instance_session()
|
||||
|
||||
def initialize():
|
||||
try:
|
||||
libmeter.initialize()
|
||||
|
||||
+2
-1
@@ -13,6 +13,7 @@ import clipboard
|
||||
|
||||
from table import Table
|
||||
from engine import get_instance_session
|
||||
from engine import reset_instance_session
|
||||
|
||||
class BottomButtons(QWidget):
|
||||
def __init__(self, table):
|
||||
@@ -47,7 +48,7 @@ class BottomButtons(QWidget):
|
||||
clipboard.copy(clip)
|
||||
|
||||
def reset(self):
|
||||
self.table.fill([])
|
||||
reset_instance_session()
|
||||
|
||||
def close(self):
|
||||
sys.exit(0)
|
||||
|
||||
+66
@@ -65,6 +65,14 @@ fn get_instance_session(py: Python) -> PyResult<PyList> {
|
||||
)
|
||||
}
|
||||
|
||||
fn reset_instance_session(_py: Python) -> PyResult<u32> {
|
||||
let meter = &mut METER.lock().unwrap();
|
||||
|
||||
meter.reset_instance_session();
|
||||
|
||||
Ok(0)
|
||||
}
|
||||
|
||||
fn initialize(_py: Python) -> PyResult<u32> {
|
||||
CombinedLogger::init(vec![WriteLogger::new(
|
||||
LevelFilter::Trace,
|
||||
@@ -124,6 +132,7 @@ fn register_message(meter: &mut meter::Meter, message: &game_protocol::Message)
|
||||
py_module_initializer!(libmeter, initliblibmeter, PyInit_libmeter, |py, m| {
|
||||
m.add(py, "__doc__", "This module is implemented in Rust")?;
|
||||
m.add(py, "initialize", py_fn!(py, initialize()))?;
|
||||
m.add(py, "reset_instance_session", py_fn!(py, reset_instance_session()))?;
|
||||
m.add(
|
||||
py,
|
||||
"get_instance_session",
|
||||
@@ -291,4 +300,61 @@ mod tests {
|
||||
10.0
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_new_player_damage_reset() {
|
||||
let guard = Python::acquire_gil();
|
||||
let py = guard.python();
|
||||
|
||||
helpers::register(Message::NewCharacter(message::NewCharacter::new()));
|
||||
|
||||
let instance_session = get_instance_session(py).unwrap();
|
||||
let stat = instance_session.get_item(py, 0);
|
||||
let dict = stat.cast_as::<PyDict>(py).unwrap();
|
||||
assert_eq!(
|
||||
dict.get_item(py, &"player")
|
||||
.unwrap()
|
||||
.cast_as::<PyUnicode>(py)
|
||||
.unwrap()
|
||||
.to_string_lossy(py),
|
||||
"CH1"
|
||||
);
|
||||
assert_eq!(
|
||||
dict.get_item(py, &"damage")
|
||||
.unwrap()
|
||||
.cast_as::<PyFloat>(py)
|
||||
.unwrap()
|
||||
.value(py),
|
||||
0.0
|
||||
);
|
||||
|
||||
helpers::register(Message::HealthUpdate(message::HealthUpdate::new()));
|
||||
|
||||
let instance_session = get_instance_session(py).unwrap();
|
||||
let stat = instance_session.get_item(py, 0);
|
||||
let dict = stat.cast_as::<PyDict>(py).unwrap();
|
||||
assert_eq!(
|
||||
dict.get_item(py, &"damage")
|
||||
.unwrap()
|
||||
.cast_as::<PyFloat>(py)
|
||||
.unwrap()
|
||||
.value(py),
|
||||
10.0
|
||||
);
|
||||
|
||||
|
||||
reset_instance_session(py).unwrap();
|
||||
let instance_session = get_instance_session(py).unwrap();
|
||||
let stat = instance_session.get_item(py, 0);
|
||||
let dict = stat.cast_as::<PyDict>(py).unwrap();
|
||||
assert_eq!(
|
||||
dict.get_item(py, &"damage")
|
||||
.unwrap()
|
||||
.cast_as::<PyFloat>(py)
|
||||
.unwrap()
|
||||
.value(py),
|
||||
0.0
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+20
-1
@@ -27,7 +27,7 @@ impl DPS {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Hash, Eq, PartialEq)]
|
||||
#[derive(Hash, Eq, PartialEq, Clone)]
|
||||
struct PlayerName(String);
|
||||
|
||||
pub struct Session {
|
||||
@@ -49,6 +49,17 @@ impl Session {
|
||||
}
|
||||
}
|
||||
|
||||
fn from(session: &Self) -> Self {
|
||||
let mut players = HashMap::new();
|
||||
for (player_name, player) in &session.players {
|
||||
players.insert(player_name.clone(), Player::new(player.id));
|
||||
}
|
||||
|
||||
Self {
|
||||
players
|
||||
}
|
||||
}
|
||||
|
||||
pub fn stats(&self) -> Vec<PlayerStatistics> {
|
||||
self.players
|
||||
.iter()
|
||||
@@ -151,6 +162,14 @@ impl Meter {
|
||||
let last_session = self.instance_sessions.back()?;
|
||||
Some(last_session.stats())
|
||||
}
|
||||
|
||||
pub fn reset_instance_session(&mut self) -> Option<()> {
|
||||
let last_session = self.instance_sessions.back()?;
|
||||
let new_session = Session::from(&last_session);
|
||||
self.instance_sessions.push_back(new_session);
|
||||
|
||||
Some(())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user