Revert "+ cargo make"

This reverts commit f8e1dd0ec3.
This commit is contained in:
Wiktor Mazur
2019-10-06 17:16:51 +02:00
parent f8e1dd0ec3
commit 803af69a69
12 changed files with 98 additions and 146 deletions
-21
View File
@@ -1,21 +0,0 @@
[tasks.test]
command = "cargo"
args = ["test", "--", "--test-threads", "1"]
dependencies = ["build"]
[tasks.build]
command = "cargo"
args = ["build", "--release"]
dependencies = ["format"]
[tasks.copy-windows]
command = "cp"
args = ["target/release/meter.dll", "gui/src/libmeter.pyd"]
[tasks.copy-linux]
command = "cp"
args = ["target/release/libmeter.so", "gui/src"]
[tasks.post-build]
linux_alias = "copy-linux"
windows_alias = "copy-windows"
+15 -2
View File
@@ -37,7 +37,6 @@ After first execution the app is going to create default configuration file name
- Rust installed (https://www.rust-lang.org/tools/install)
- Python installed
- cargo make installed https://github.com/sagiegurari/cargo-make#installation
- *Windows only prerequisites* https://github.com/libpnet/libpnet#windows
## All platforms
@@ -52,7 +51,21 @@ After first execution the app is going to create default configuration file name
```
3. Run GUI
3. Copy library to GUI directory
3.1 on Linux
```shell
cp target/release/libmeter.so gui/
```
3.1 on Windows
```shell
cp target/release/meter.dll gui/libmeter.pyd
```
4. Run GUI
3.1 on Linux
+2 -2
View File
@@ -22,16 +22,16 @@ install:
- choco install winpcap
- rustc -V
- cargo -V
- cargo install --force cargo-make
test: false
build_script:
- cargo make
- cargo build --release --verbose
after_build:
- ps: cd ${env:APPVEYOR_BUILD_FOLDER}/gui
- python -m venv env
- ps: .\env\Scripts\activate.ps1
- pip install -r requirements.txt
- ps: cd src
- ps: cp ${env:APPVEYOR_BUILD_FOLDER}\target\release\meter.dll libmeter.pyd
- pyinstaller -F -w -i ..\..\assets\albion-stats-icon.ico meter.py
- ps: deactivate
- ps: mv dist\meter.exe ..\..\albion-online-stats.exe
+17 -21
View File
@@ -52,7 +52,7 @@ macro_rules! deserialize_string_vec {
}
Some(ret)
}
},
_ => {
error!("Failed to deserialize {}", $name);
None
@@ -64,6 +64,7 @@ macro_rules! deserialize_string_vec {
};
}
macro_rules! deserialize_float {
($val:expr, $index:expr, $name:expr) => {
if let Some(p) = $val.get(&$index) {
@@ -80,6 +81,7 @@ macro_rules! deserialize_float {
};
}
#[derive(Debug)]
pub struct ChatSay {
pub source: usize,
@@ -167,8 +169,7 @@ impl RegenerationHealthChanged {
let source = deserialize_number!(val, 0, "RegenerationHealthChanged::source")?;
let health = deserialize_float!(val, 2, "RegenerationHealthChanged::health")?;
let max_health = deserialize_float!(val, 3, "RegenerationHealthChanged::max_health")?;
let regeneration_rate =
deserialize_float!(val, 4, "RegenerationHealthChanged::regeneration_rate");
let regeneration_rate = deserialize_float!(val, 4, "RegenerationHealthChanged::regeneration_rate");
Some(Message::RegenerationHealthChanged(Self {
source,
@@ -205,6 +206,7 @@ impl CharacterStats {
let energy = deserialize_float!(val, 15, "CharacterStats::energy")?;
let max_energy = deserialize_float!(val, 16, "CharacterStats::max_energy")?;
Some(Message::CharacterStats(Self {
source,
character_name,
@@ -218,14 +220,14 @@ impl CharacterStats {
#[derive(Debug)]
pub struct Leave {
pub source: usize,
pub source: usize
}
impl Leave {
fn encode(val: Parameters) -> Option<Message> {
let source = deserialize_number!(val, 0, "Leave::source")?;
Some(Message::Leave(Leave { source }))
Some(Message::Leave(Leave{source}))
}
}
@@ -233,7 +235,7 @@ impl Leave {
pub struct Died {
pub source: usize,
pub target: usize,
pub target_name: String,
pub target_name: String
}
impl Died {
@@ -242,11 +244,7 @@ impl Died {
let target = deserialize_number!(val, 1, "Died::target")?;
let target_name = deserialize_string!(val, 3, "Died::target_name")?;
Some(Message::Died(Died {
source,
target,
target_name,
}))
Some(Message::Died(Died{source, target, target_name}))
}
}
@@ -261,14 +259,14 @@ impl PartyNew {
let source = deserialize_number!(val, 0, "PartyNew::source")?;
let players = deserialize_string_vec!(val, 5, "PartyNew::players")?;
Some(Message::PartyNew(PartyNew { source, players }))
Some(Message::PartyNew(PartyNew{source, players}))
}
}
#[derive(Debug)]
pub struct PartyJoin {
pub source: usize,
pub target_name: String,
pub target_name: String
}
impl PartyJoin {
@@ -276,10 +274,7 @@ impl PartyJoin {
let source = deserialize_number!(val, 0, "PartyJoin::source")?;
let target_name = deserialize_string!(val, 2, "PartyJoin::target_name")?;
Some(Message::PartyJoin(PartyJoin {
source,
target_name,
}))
Some(Message::PartyJoin(PartyJoin{source, target_name}))
}
}
@@ -292,14 +287,14 @@ impl PartyDisbanded {
fn encode(val: Parameters) -> Option<Message> {
let source = deserialize_number!(val, 1, "PartyDisbanded::source")?;
Some(Message::PartyDisbanded(PartyDisbanded { source }))
Some(Message::PartyDisbanded(PartyDisbanded{source}))
}
}
#[derive(Debug)]
pub struct FameUpdate {
pub source: usize,
pub fame: f32,
pub fame: f32
}
impl FameUpdate {
@@ -308,10 +303,11 @@ impl FameUpdate {
let raw_fame = deserialize_number!(val, 2, "FameUpdate::fame")?;
let fame = raw_fame as f32 / 10000.0;
Some(Message::FameUpdate(FameUpdate { source, fame }))
Some(Message::FameUpdate(FameUpdate{source, fame}))
}
}
#[derive(Debug)]
pub enum Message {
FameUpdate(FameUpdate),
@@ -324,7 +320,7 @@ pub enum Message {
Died(Died),
PartyNew(PartyNew),
PartyJoin(PartyJoin),
PartyDisbanded(PartyDisbanded),
PartyDisbanded(PartyDisbanded)
}
impl Packet {
+2 -2
View File
@@ -1,6 +1,6 @@
pub mod message;
mod packet;
mod protocol;
pub mod message;
pub use message::Message;
pub use protocol::decode;
pub use message::Message;
+1 -1
View File
@@ -3,5 +3,5 @@ use photon_protocol::Parameters;
#[derive(Debug)]
pub struct Packet {
pub code: usize,
pub parameters: Parameters,
pub parameters: Parameters
}
+8 -15
View File
@@ -1,5 +1,5 @@
use bytes::Buf;
use std::io::Cursor;
use bytes::Buf;
use log::*;
@@ -20,7 +20,8 @@ static MSG_TYPE_EVENT: u8 = 4;
use super::message::Message;
use super::packet::Packet;
pub fn decode(payload: &[u8]) -> Option<Vec<Message>> {
pub fn decode(payload: &[u8]) -> Option<Vec<Message>>
{
let mut messages = vec![];
let mut cursor = Cursor::new(payload);
@@ -46,6 +47,7 @@ pub fn decode(payload: &[u8]) -> Option<Vec<Message>> {
if let Some(msg) = on_message(&mut cursor, cmd_length) {
messages.push(msg);
}
} else {
cursor.advance((cmd_length - CMD_HEADER_LENGTH) as usize);
}
@@ -54,7 +56,7 @@ pub fn decode(payload: &[u8]) -> Option<Vec<Message>> {
Some(messages)
}
fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option<Message> {
fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option<Message> {
let mut message = None;
let init = cursor.bytes().len();
@@ -69,10 +71,7 @@ fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option<Message> {
if let Some(event_data) = photon_protocol::deserialize_event_data(&mut payload) {
if event_data.code != 2 && event_data.parameters.get(&252u8).is_some() {
if let photon_protocol::Value::Short(code) = event_data.parameters.get(&252u8)? {
let packet = Packet {
code: *code as usize,
parameters: event_data.parameters,
};
let packet = Packet{code: *code as usize, parameters: event_data.parameters};
debug!("EVENT: [{}] {:?}", packet.code, packet);
message = packet.decode();
}
@@ -81,10 +80,7 @@ fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option<Message> {
} else if msg_type == MSG_TYPE_REQUEST {
if let Some(request) = photon_protocol::deserialize_operation_request(&mut payload) {
let code = request.code as usize + REQUEST_CONSTANT;
let packet = Packet {
code,
parameters: request.parameters,
};
let packet = Packet{code, parameters: request.parameters};
debug!("REQUEST: [{}] {:?}", packet.code, packet);
message = packet.decode();
@@ -92,10 +88,7 @@ fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option<Message> {
} else if msg_type == MSG_TYPE_RESPONSE {
if let Some(response) = photon_protocol::deserialize_operation_response(&mut payload) {
let code = response.code as usize + RESPONSE_CONSTANT;
let packet = Packet {
code,
parameters: response.parameters,
};
let packet = Packet{code, parameters: response.parameters};
debug!("RESPONSE: [{}] {:?}", packet.code, packet);
message = packet.decode();
+4 -12
View File
@@ -11,23 +11,15 @@ mod core;
use crate::core::get_players_in_party;
use crate::core::initialize;
use crate::core::reset;
use crate::core::stats;
use crate::core::StatType;
use crate::core::stats;
use crate::core::reset;
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(skip_non_party_members: bool)),
)?;
m.add(py, "initialize", py_fn!(py, initialize(skip_non_party_members: bool)))?;
m.add(py, "stats", py_fn!(py, stats(stat_type: StatType)))?;
m.add(py, "reset", py_fn!(py, reset(stat_type: StatType)))?;
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(())
});
+6 -23
View File
@@ -115,16 +115,8 @@ impl Meter {
fn stats_filter(&self, player: &(&String, &Player)) -> bool {
if self.config.skip_non_party_members {
let is_main_player = if let Some(id) = &self.main_player_id {
*id == player.1.id
} else {
false
};
let is_in_party = if let Some(party) = &self.party {
party.includes(&player.0)
} else {
false
};
let is_main_player = if let Some(id) = &self.main_player_id { *id == player.1.id } else { false };
let is_in_party = if let Some(party) = &self.party { party.includes(&player.0) } else { false };
return is_main_player || is_in_party;
}
@@ -194,10 +186,7 @@ impl PlayerEvents for Meter {
Some(vec![zone_player, las_fight_session_player])
}
fn get_fame_gatherers_in_zone(
&mut self,
player_id: usize,
) -> Option<Vec<&mut dyn FameGatherer>> {
fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>> {
let main_player_id = self.main_player_id?;
let (zone, last_fight) = self.sessions_mut()?;
if player_id != main_player_id {
@@ -222,10 +211,7 @@ impl PlayerEvents for Meter {
fn register_leave(&mut self, id: usize) -> Option<()> {
let main_player_id = self.main_player_id?;
if id == main_player_id {
info!(
"Main player ({}) left the zone, Creating new zone session.",
id
);
info!("Main player ({}) left the zone, Creating new zone session.", id);
self.zone_session_mut()?.cleanup_players();
self.new_session();
}
@@ -235,10 +221,7 @@ impl PlayerEvents for Meter {
fn register_player(&mut self, name: &str, id: usize) {
if self.zone_session.is_none() {
info!(
"New player ({}) registered without session, creating new session",
name
);
info!("New player ({}) registered without session, creating new session", name);
self.new_session();
}
@@ -309,7 +292,7 @@ impl GameStats for Meter {
fn get_players_in_party(&self) -> Option<Vec<String>> {
if let Some(party) = &self.party {
let members = party.clone().members;
return Some(members.into_iter().collect());
return Some(members.into_iter().collect())
}
None
}
+6 -4
View File
@@ -11,8 +11,8 @@ use timer;
use super::traits::CombatState;
use super::traits::DamageDealer;
use super::traits::DamageStats;
use super::traits::FameGatherer;
use super::traits::FameStats;
use super::traits::FameGatherer;
struct Time {
_guard: timer::Guard,
@@ -49,9 +49,10 @@ pub struct Player {
combat_state: Arc<Mutex<CombatState>>,
_time: Option<Time>,
time_started: Instant,
fame: f32,
fame: f32
}
impl Player {
pub fn new(id: usize) -> Self {
let time_elapsed = Arc::new(Mutex::new(0.0));
@@ -64,7 +65,7 @@ impl Player {
combat_state,
_time: None,
time_started: Instant::now(),
fame: 0.0,
fame: 0.0
}
}
}
@@ -77,7 +78,7 @@ impl DamageDealer for Player {
self._time = Some(Time::with(elapsed, state));
}
if *self.combat_state.lock().unwrap() == CombatState::OutOfCombat {
return;
return
}
self.damage_dealt += damage_dealt
@@ -147,3 +148,4 @@ mod test {
assert_eq!(player.fame_per_hour(), 100);
}
}
+3 -13
View File
@@ -56,15 +56,9 @@ pub trait DamageDealer {
}
pub trait PlayerEvents {
fn get_damage_dealers_in_zone(
&mut self,
player_id: usize,
) -> Option<Vec<&mut dyn DamageDealer>>;
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn DamageDealer>>;
fn get_fame_gatherers_in_zone(
&mut self,
player_id: usize,
) -> Option<Vec<&mut dyn FameGatherer>>;
fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>>;
fn register_main_player(&mut self, name: &str, id: usize);
@@ -127,11 +121,7 @@ pub trait GameStats {
}
pub trait PartyEvents {
fn register_new_party(
&mut self,
player_names: &std::vec::Vec<std::string::String>,
id: usize,
) -> Option<()>;
fn register_new_party(&mut self, player_names: &std::vec::Vec<std::string::String>, id: usize) -> Option<()>;
fn register_new_member(&mut self, player_name: &str) -> Option<()>;
fn register_party_disbanded(&mut self) -> Option<()>;
}
+25 -21
View File
@@ -1,5 +1,5 @@
use std::collections::HashMap;
use std::collections::HashSet;
use std::collections::HashMap;
use std::iter::FromIterator;
#[cfg(test)]
@@ -7,14 +7,14 @@ use fake_clock::FakeClock as Instant;
#[cfg(not(test))]
use std::time::Instant;
use cpython::FromPyObject;
use cpython::PyDict;
use cpython::PyList;
use cpython::PyObject;
use cpython::PyResult;
use cpython::Python;
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::FameStats;
@@ -22,7 +22,7 @@ use super::traits::FameStats;
#[derive(Debug, PartialEq, Clone)]
pub struct Party {
pub id: usize,
pub members: HashSet<String>,
pub members: HashSet<String>
}
impl Party {
@@ -51,12 +51,12 @@ pub struct PlayerStatistics {
pub seconds_in_game: f32,
pub fame: f32,
pub fame_per_minute: u32,
pub fame_per_hour: u32,
pub fame_per_hour: u32
}
#[derive(Debug, PartialEq, Clone)]
pub struct PlayerStatisticsVec {
_vec: Vec<PlayerStatistics>,
_vec: Vec<PlayerStatistics>
}
#[derive(Debug, PartialEq, Copy, Clone)]
@@ -64,17 +64,19 @@ pub enum StatType {
LastFight,
Zone,
Overall,
Unknown,
Unknown
}
impl PlayerStatisticsVec {
pub fn new() -> Self {
Self { _vec: vec![] }
Self {
_vec: vec![]
}
}
pub fn from(player_statistics_vec: Vec<PlayerStatistics>) -> Self {
Self {
_vec: player_statistics_vec,
_vec: player_statistics_vec
}
}
@@ -98,7 +100,7 @@ impl PlayerStatisticsVec {
);
Self {
_vec: merged.iter().map(|(_, v)| v.clone()).collect(),
_vec: merged.iter().map(|(_, v)| v.clone()).collect()
}
}
}
@@ -172,16 +174,18 @@ impl ToPyObject for PlayerStatisticsVec {
}
}
impl<'source> FromPyObject<'source> for StatType {
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),
Ok(n) => {
match n {
1 => Ok(StatType::LastFight),
2 => Ok(StatType::Zone),
3 => Ok(StatType::Overall),
_ => Ok(StatType::Unknown)
}
},
Err(e) => Err(e),
Err(e) => Err(e)
}
}
}