From e4963a5a3545ad492ef27b3588cc163eee7e1ea2 Mon Sep 17 00:00:00 2001 From: Wiktor Mazur Date: Sun, 15 Dec 2019 17:34:34 +0100 Subject: [PATCH] show everything --- backend/src/lib.rs | 2 +- backend/src/meter/mod.rs | 30 +++++++++++++++++++++--- backend/src/meter/player.rs | 13 +++++++++-- backend/src/meter/traits.rs | 10 ++------ backend/src/meter/types.rs | 3 ++- frontend/src/async_request.py | 43 +++++++++++++++++++++++++++++++++++ frontend/src/dmg_list.py | 31 +++++++++++++++---------- frontend/src/engine.py | 17 +++++++------- frontend/src/main.py | 23 ++++++++++++++----- frontend/src/number.py | 4 ++-- frontend/src/weapon.py | 2 +- 11 files changed, 134 insertions(+), 44 deletions(-) create mode 100644 frontend/src/async_request.py diff --git a/backend/src/lib.rs b/backend/src/lib.rs index ccf9e8c..03046f8 100644 --- a/backend/src/lib.rs +++ b/backend/src/lib.rs @@ -137,7 +137,7 @@ pub fn stats(py: Python, stat_type: StatType) -> PyResult { if let Ok(ref mut meter) = m.lock() { return Ok(core::stats(&meter, stat_type) .into_iter() - // .filter(|s| s.damage != 0.0 || s.fame != 0.0) + .filter(|s| !s.idle || s.fame != 0.0) .collect::>() .into_py_object(py)) } diff --git a/backend/src/meter/mod.rs b/backend/src/meter/mod.rs index 2502e70..f625a7f 100644 --- a/backend/src/meter/mod.rs +++ b/backend/src/meter/mod.rs @@ -57,7 +57,8 @@ impl Session { fame: player.fame(), fame_per_minute: player.fame_per_minute(), fame_per_hour: player.fame_per_hour(), - items: player.items() + items: player.items(), + idle: player.idle(), }) .collect(), ) @@ -100,6 +101,7 @@ pub struct Meter { last_fight_session: Session, main_player_id: Option, party: Option, + unconsumed_items: HashMap, config: MeterConfig, } @@ -111,6 +113,7 @@ impl Meter { last_fight_session: Session::new(), main_player_id: None, party: None, + unconsumed_items: HashMap::new(), config: Default::default(), } } @@ -211,6 +214,21 @@ impl PlayerEvents for Meter { Some(vec![zone_player, las_fight_session_player]) } + fn register_item_update(&mut self, player_id: usize, items: &game_protocol::Items) -> Option<()> { + let mut consumed = false; + for player in self.get_item_carriers_in_zone(player_id).unwrap_or(vec![]) { + player.items_update(items); + consumed = true; + } + + if !consumed { + info!("Storing not consumed items for player id: {}", player_id); + self.unconsumed_items.insert(player_id, items.clone()); + } + + Some(()) + } + fn register_main_player(&mut self, name: &str, id: usize) { info!("Main player {} registered with id {}", name, id); self.main_player_id = Some(id); @@ -219,6 +237,11 @@ impl PlayerEvents for Meter { self.new_session(); } self.add_player(name, id); + if let Some(items) = self.unconsumed_items.get(&id) { + let i = items.clone(); + self.register_item_update(id, &i); + self.unconsumed_items.remove(&id); + } } fn register_leave(&mut self, id: usize) -> Option<()> { @@ -261,6 +284,7 @@ impl LastFightStats for Meter { fn reset_last_fight_stats(&mut self) -> Option<()> { self.last_fight_session = Session::from(&self.last_fight_session); + info!("Reset: last fight"); Some(()) } } @@ -274,7 +298,7 @@ impl ZoneStats for Meter { fn reset_zone_stats(&mut self) -> Option<()> { let last_session = self.zone_session_mut()?; self.zone_session = Some(Session::from(&last_session)); - + info!("Reset: zone"); Some(()) } } @@ -298,7 +322,7 @@ impl GameStats for Meter { let last_session = self.zone_session_mut()?; self.zone_session = Some(Session::from(&last_session)); self.last_fight_session = Session::from(&self.last_fight_session); - + info!("Reset: overall"); Some(()) } diff --git a/backend/src/meter/player.rs b/backend/src/meter/player.rs index 8777fd5..a88eba4 100644 --- a/backend/src/meter/player.rs +++ b/backend/src/meter/player.rs @@ -36,7 +36,8 @@ pub struct Player { combat_state: CombatState, time_started: Instant, fame: f32, - items: Items + items: Items, + idle: bool, } @@ -50,8 +51,13 @@ impl Player { time_started: Instant::now(), fame: 0.0, items: Default::default(), + idle: true } } + + pub fn idle(&self) -> bool { + self.idle + } } impl DamageDealer for Player { @@ -59,11 +65,12 @@ impl DamageDealer for Player { if self.combat_state == CombatState::OutOfCombat { return } - + self.idle = false; self.damage_dealt += damage_dealt } fn enter_combat(&mut self) { + self.idle = false; self.combat_time.entered_combat = Some(Instant::now()); self.combat_state = CombatState::InCombat; } @@ -103,12 +110,14 @@ impl DamageStats for Player { impl FameGatherer for Player { fn register_fame_gain(&mut self, fame: f32) { self.fame += fame; + self.idle = false; } } impl ItemCarrier for Player { fn items_update(&mut self, items: &Items) { self.items = items.clone(); + self.idle = false; } fn items(&self) -> Items { diff --git a/backend/src/meter/traits.rs b/backend/src/meter/traits.rs index 94c8b4d..3f802d1 100644 --- a/backend/src/meter/traits.rs +++ b/backend/src/meter/traits.rs @@ -74,6 +74,8 @@ pub trait PlayerEvents { fn register_player(&mut self, name: &str, id: usize); + fn register_item_update(&mut self, player_id: usize, items: &Items) -> Option<()>; + fn register_fame_gain(&mut self, player_id: usize, fame: f32) -> Option<()> { for player in self.get_fame_gatherers_in_zone(player_id)? { player.register_fame_gain(fame); @@ -82,14 +84,6 @@ pub trait PlayerEvents { Some(()) } - fn register_item_update(&mut self, player_id: usize, items: &Items) -> Option<()> { - for player in self.get_item_carriers_in_zone(player_id)? { - player.items_update(items); - } - - Some(()) - } - fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> { for player in self.get_damage_dealers_in_zone(player_id)? { if damage < 0.0 { diff --git a/backend/src/meter/types.rs b/backend/src/meter/types.rs index 35cb1ce..084d7f7 100644 --- a/backend/src/meter/types.rs +++ b/backend/src/meter/types.rs @@ -44,7 +44,8 @@ pub struct PlayerStatistics { pub fame: f32, pub fame_per_minute: u32, pub fame_per_hour: u32, - pub items: Items + pub items: Items, + pub idle: bool } #[derive(Debug, PartialEq, Clone)] diff --git a/frontend/src/async_request.py b/frontend/src/async_request.py new file mode 100644 index 0000000..0bab9bc --- /dev/null +++ b/frontend/src/async_request.py @@ -0,0 +1,43 @@ +import threading +import queue +import requests +import collections + + +Item = collections.namedtuple('Item', 'key value') + + +_queue = queue.Queue() +_requests = {} +_requests_threads = {} + + +def update_loop(): + while True: + item = _queue.get() + + _requests[item.key] = item.value + _requests_threads[item.key].join() + del _requests_threads[item.key] + +_update_thread = threading.Thread(target=update_loop, daemon=True) +_update_thread.start() + +def _async_req(url): + req = requests.get(url) + + _queue.put(Item(key=url, value=req)) + +def get(url): + + if url in _requests: + return _requests[url] + + if url in _requests_threads: + return None + + rt = threading.Thread(target=_async_req, args=(url,)) + _requests_threads[url] = rt + rt.start() + + return None \ No newline at end of file diff --git a/frontend/src/dmg_list.py b/frontend/src/dmg_list.py index b390139..83e8751 100644 --- a/frontend/src/dmg_list.py +++ b/frontend/src/dmg_list.py @@ -1,6 +1,5 @@ import collections import functools -import requests from PIL import Image, ImageQt from io import BytesIO @@ -23,6 +22,7 @@ from PySide2 import QtCore from . import weapon from . import assets +from . import async_request Style = collections.namedtuple('Style', 'bg') @@ -62,17 +62,19 @@ def player_style(items): else: return Style(bg = '#42413c') -@functools.lru_cache(maxsize=None) +# @functools.lru_cache(maxsize=None) def player_icon(weapon): url = f'https://albiononline2d.ams3.cdn.digitaloceanspaces.com/thumbnails/orig/{weapon}' + try: + r = async_request.get(url) + img = Image.open(BytesIO(r.content)) - r = requests.get(url) - img = Image.open(BytesIO(r.content)) + img_qt = ImageQt.ImageQt(img) + pix = QtGui.QPixmap.fromImage(img_qt) - img_qt = ImageQt.ImageQt(img) - pix = QtGui.QPixmap.fromImage(img_qt) - - return QtGui.QIcon(pix) + return QtGui.QIcon(pix) + except Exception: + return None class DmgList(QListView): class DmgItem(QtGui.QStandardItem): @@ -83,7 +85,7 @@ class DmgList(QListView): self.player_style = player_style(player.items) self.update(player) - self.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter) + self.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter | QtCore.Qt.AlignmentFlag.AlignVCenter) def update(self, player): self.player = player @@ -103,8 +105,9 @@ class DmgList(QListView): brush = QtGui.QBrush(gradient) self.setBackground(brush) - - self.setIcon(player_icon(self.player.items['weapon'])) + icon = player_icon(self.player.items['weapon']) + if icon: + self.setIcon(icon) class SortProxyModel(QtCore.QSortFilterProxyModel): def lessThan(self, left, right): @@ -126,6 +129,10 @@ class DmgList(QListView): self.setModel(self.proxy) def update(self, players): + if not players: + self.model.clear() + return + visible_names = [] for player in players: items = (self.model.item(i) for i in range(self.model.rowCount())) @@ -137,7 +144,7 @@ class DmgList(QListView): visible_names.append(player.name) for i in range(self.model.rowCount()): item = self.model.item(i) - if hasattr(item, 'name') and item.name not in visible_names: + if hasattr(item.player, 'name') and item.player.name not in visible_names: self.model.removeRow(i) self.proxy.sort(0, QtCore.Qt.DescendingOrder) diff --git a/frontend/src/engine.py b/frontend/src/engine.py index 7560f68..1228234 100644 --- a/frontend/src/engine.py +++ b/frontend/src/engine.py @@ -60,8 +60,9 @@ class FameStat: self.fame_per_minute = fame_per_minute -def stats(session): - extended_session = with_percentage(session) +def stats(session, with_dmg=False): + with_damage = [s for s in session if s['damage'] != 0.0] if with_dmg else session + extended_session = with_percentage(with_damage) statistics = [DamageStat( s['player'], s['items'], @@ -99,7 +100,7 @@ def with_percentage(session): return session -def zone_stats(): +def zone_stats(with_damage=False): if TESTING_ENABLED: session = [ {'player': 'Arcane', 'damage': 1000.0, 'time_in_combat': 12.0, 'dps': 12.4234, 'fame': 20.0, 'fame_per_minute': 30, 'items': { @@ -151,10 +152,10 @@ def zone_stats(): else: session = aostats.stats(StatType.Zone) - return stats(session) + return stats(session, with_damage) -def overall_stats(): +def overall_stats(with_damage=False): if TESTING_ENABLED: session = [ {'player': 'overall', 'damage': 1000.0, @@ -163,10 +164,10 @@ def overall_stats(): else: session = aostats.stats(StatType.Overall) - return stats(session) + return stats(session, with_damage) -def last_fight_stats(): +def last_fight_stats(with_damage=False): if TESTING_ENABLED: session = [ {'player': 'last fight', 'damage': 1000.0, @@ -175,7 +176,7 @@ def last_fight_stats(): else: session = aostats.stats(StatType.LastFight) - return stats(session) + return stats(session, with_damage) def get_party_members(): if TESTING_ENABLED: diff --git a/frontend/src/main.py b/frontend/src/main.py index b09c563..18437bc 100644 --- a/frontend/src/main.py +++ b/frontend/src/main.py @@ -1,4 +1,5 @@ import sys +import functools from PySide2.QtCore import QTimer from PySide2.QtCore import Qt @@ -19,10 +20,12 @@ from . import engine from . import assets class Mode: - CURRENT_ZONE = 'Statistics: Current zone' - OVERALL = 'Statistics: Overall' - LAST_FIGHT = 'Statistics: Last fight' - + DMG_CURRENT_ZONE = 'Stats (dmg): Current zone' + DMG_OVERALL = 'Stats (dmg): Overall' + DMG_LAST_FIGHT = 'Stats (dmg): Last fight' + CURRENT_ZONE = 'Stats (all): Current zone' + OVERALL = 'Stats (all): Overall' + LAST_FIGHT = 'Stats (all): Last fight' class InteractiveBar(QWidget): def __init__(self, table, clipboard): @@ -78,9 +81,12 @@ class InteractiveBar(QWidget): def reset(self): reset = { + Mode.DMG_CURRENT_ZONE: engine.reset_zone_stats, + Mode.DMG_LAST_FIGHT: engine.reset_last_fight_stats, + Mode.DMG_OVERALL: engine.reset_stats, Mode.CURRENT_ZONE: engine.reset_zone_stats, Mode.LAST_FIGHT: engine.reset_last_fight_stats, - Mode.OVERALL: engine.reset_stats + Mode.OVERALL: engine.reset_stats, } reset[self.mode.currentText()]() @@ -91,7 +97,9 @@ class InteractiveBar(QWidget): class ModeWidget(QComboBox): def __init__(self): QComboBox.__init__(self) - + self.addItem(Mode.DMG_CURRENT_ZONE) + self.addItem(Mode.DMG_OVERALL) + self.addItem(Mode.DMG_LAST_FIGHT) self.addItem(Mode.CURRENT_ZONE) self.addItem(Mode.OVERALL) self.addItem(Mode.LAST_FIGHT) @@ -143,6 +151,9 @@ class MainWidget(QWidget): def session(self): sessions = { + Mode.DMG_CURRENT_ZONE: functools.partial(engine.zone_stats, with_damage=True), + Mode.DMG_LAST_FIGHT: functools.partial(engine.last_fight_stats, with_damage=True), + Mode.DMG_OVERALL: functools.partial(engine.overall_stats, with_damage=True), Mode.CURRENT_ZONE: engine.zone_stats, Mode.LAST_FIGHT: engine.last_fight_stats, Mode.OVERALL: engine.overall_stats diff --git a/frontend/src/number.py b/frontend/src/number.py index da57329..dbd9030 100644 --- a/frontend/src/number.py +++ b/frontend/src/number.py @@ -12,8 +12,8 @@ class Number: def __truediv__(self, other): if isinstance(other, Number): - return self.number / other.number - return self.number / other + return self.number / other.number if other.number else other.number + return self.number / other if other else other def __str__(self): if self.number / 1000 < 1: diff --git a/frontend/src/weapon.py b/frontend/src/weapon.py index 5b23c63..04f180b 100644 --- a/frontend/src/weapon.py +++ b/frontend/src/weapon.py @@ -28,7 +28,7 @@ def map_weapon(weapon): with open(assets.path('item_category_map.json')) as m: _mappings = json.loads(m.read()) - return _mappings[weapon] + return _mappings[weapon] if weapon in _mappings else None def get_weapon_type(items): weapon = map_weapon(items['weapon'])