diff --git a/Makefile.toml b/Makefile.toml deleted file mode 100644 index b0777cd..0000000 --- a/Makefile.toml +++ /dev/null @@ -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" diff --git a/README.md b/README.md index b42e523..5adb353 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/appveyor.yml b/appveyor.yml index 902776f..575203c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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 diff --git a/src/game_protocol/message.rs b/src/game_protocol/message.rs index a1e53c2..364f31e 100644 --- a/src/game_protocol/message.rs +++ b/src/game_protocol/message.rs @@ -14,7 +14,7 @@ macro_rules! deserialize_number { _ => { error!("Failed to deserialize {}", $name); None - } + } } } else { error!("Index {} not found in {}", $index, $name); @@ -31,7 +31,7 @@ macro_rules! deserialize_string { _ => { error!("Failed to deserialize {}", $name); None - } + } } } else { None @@ -52,11 +52,11 @@ macro_rules! deserialize_string_vec { } Some(ret) - } + }, _ => { error!("Failed to deserialize {}", $name); None - } + } } } else { 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) { @@ -72,7 +73,7 @@ macro_rules! deserialize_float { _ => { error!("Failed to deserialize {}", $name); None - } + } } } else { None @@ -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 { 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 { 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 { diff --git a/src/game_protocol/mod.rs b/src/game_protocol/mod.rs index db42315..8dfdbeb 100644 --- a/src/game_protocol/mod.rs +++ b/src/game_protocol/mod.rs @@ -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; diff --git a/src/game_protocol/packet.rs b/src/game_protocol/packet.rs index 095734e..b8f4bd4 100644 --- a/src/game_protocol/packet.rs +++ b/src/game_protocol/packet.rs @@ -3,5 +3,5 @@ use photon_protocol::Parameters; #[derive(Debug)] pub struct Packet { pub code: usize, - pub parameters: Parameters, -} + pub parameters: Parameters +} \ No newline at end of file diff --git a/src/game_protocol/protocol.rs b/src/game_protocol/protocol.rs index c709fcc..d8c6f86 100644 --- a/src/game_protocol/protocol.rs +++ b/src/game_protocol/protocol.rs @@ -1,5 +1,5 @@ -use bytes::Buf; use std::io::Cursor; +use bytes::Buf; use log::*; @@ -20,12 +20,13 @@ static MSG_TYPE_EVENT: u8 = 4; use super::message::Message; use super::packet::Packet; -pub fn decode(payload: &[u8]) -> Option> { +pub fn decode(payload: &[u8]) -> Option> +{ let mut messages = vec![]; let mut cursor = Cursor::new(payload); cursor.advance(3); - + let cmd_cnt = photon_protocol::deserialize_byte(&mut cursor)?; cursor.advance(8); @@ -46,6 +47,7 @@ pub fn decode(payload: &[u8]) -> Option> { 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> { Some(messages) } -fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option { +fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option { let mut message = None; let init = cursor.bytes().len(); @@ -69,10 +71,7 @@ fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option { 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 { } 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 { } 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(); @@ -107,4 +100,4 @@ fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option { assert!(init - last == msg_len as usize - CMD_HEADER_LENGTH as usize); message -} +} \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index b111f0d..ada7a8f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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(()) }); diff --git a/src/meter/mod.rs b/src/meter/mod.rs index 58d6e80..4700c36 100644 --- a/src/meter/mod.rs +++ b/src/meter/mod.rs @@ -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> { + fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option> { 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,9 +292,9 @@ impl GameStats for Meter { fn get_players_in_party(&self) -> Option> { if let Some(party) = &self.party { let members = party.clone().members; - return Some(members.into_iter().collect()); + return Some(members.into_iter().collect()) } - None + None } } diff --git a/src/meter/player.rs b/src/meter/player.rs index f3a039b..acfbde5 100644 --- a/src/meter/player.rs +++ b/src/meter/player.rs @@ -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>, _time: Option