diff --git a/albion-online-stats.py b/albion-online-stats.py index ec408f2..4fc801f 100644 --- a/albion-online-stats.py +++ b/albion-online-stats.py @@ -1,3 +1,3 @@ if __name__ == "__main__": from src import run - run() \ No newline at end of file + run() diff --git a/src/__main__.py b/src/__main__.py index f6dbefe..33d4d89 100644 --- a/src/__main__.py +++ b/src/__main__.py @@ -1,4 +1,4 @@ from .gui.app import run if __name__ == '__main__': - run() \ No newline at end of file + run() diff --git a/src/backend_proxy.py b/src/backend_proxy.py index cb60cd2..41757ed 100644 --- a/src/backend_proxy.py +++ b/src/backend_proxy.py @@ -1,5 +1,5 @@ try: - import pyaoaddons # type: ignore + import pyaoaddons # type: ignore except: class pyaoaddons: # type: ignore @staticmethod @@ -129,9 +129,12 @@ def _testing_call_sequence(callback): *add_player(1, 'Fire', 'T5_MAIN_FIRESTAFF@1'), {'name': 'EnterCombat', 'value': {'id': 0, 'name': 'Arcane'}}, {'name': 'UpdateParty', 'value': {'player_names': ['Arcane', 'Fire']}}, - {'name': 'HealthReceived', 'value': {'source': 0, 'target': 1, 'value': 100.0}}, - {'name': 'HealthReceived', 'value': {'source': 0, 'target': 0, 'value': 100.0}}, - {'name': 'HealthReceived', 'value': {'source': 1, 'target': 0, 'value': 100.0}}, + {'name': 'HealthReceived', 'value': { + 'source': 0, 'target': 1, 'value': 100.0}}, + {'name': 'HealthReceived', 'value': { + 'source': 0, 'target': 0, 'value': 100.0}}, + {'name': 'HealthReceived', 'value': { + 'source': 1, 'target': 0, 'value': 100.0}}, ] def run_sequence(): diff --git a/src/consts/events.py b/src/consts/events.py index e4144d3..f19d982 100644 --- a/src/consts/events.py +++ b/src/consts/events.py @@ -1,17 +1,17 @@ -EvNameMainPlayerAppeared : str = 'MainPlayerAppeared' -EvNamePlayerAppeared : str = 'PlayerAppeared' -EvNameDamageDone : str = 'DamageDone' -EvNameHealthReceived : str = 'HealthReceived' -EvNameZoneChange : str = 'ZoneChange' -EvNameEnterCombat : str = 'EnterCombat' -EvNameLeaveCombat : str = 'LeaveCombat' -EvNameUpdateFame : str = 'UpdateFame' -EvNameUpdateItems : str = 'UpdateItems' -EvNameUpdateParty : str = 'UpdateParty' +EvNameMainPlayerAppeared: str = 'MainPlayerAppeared' +EvNamePlayerAppeared: str = 'PlayerAppeared' +EvNameDamageDone: str = 'DamageDone' +EvNameHealthReceived: str = 'HealthReceived' +EvNameZoneChange: str = 'ZoneChange' +EvNameEnterCombat: str = 'EnterCombat' +EvNameLeaveCombat: str = 'LeaveCombat' +EvNameUpdateFame: str = 'UpdateFame' +EvNameUpdateItems: str = 'UpdateItems' +EvNameUpdateParty: str = 'UpdateParty' -EvKeyName : str = 'name' -EvKeyValue : str = 'value' -EvKeySource : str = 'source' -EvKeyTarget : str = 'target' -EvKeyId : str = 'id' -EvKeyPlayerNames : str = 'player_names' \ No newline at end of file +EvKeyName: str = 'name' +EvKeyValue: str = 'value' +EvKeySource: str = 'source' +EvKeyTarget: str = 'target' +EvKeyId: str = 'id' +EvKeyPlayerNames: str = 'player_names' diff --git a/src/engine.py b/src/engine.py index f3bf6b5..d380bb8 100644 --- a/src/engine.py +++ b/src/engine.py @@ -60,7 +60,8 @@ class GameStats(): self._construct_new_stats([VisibilityType.LastFight]) elif event[ev_consts.EvKeyName] == ev_consts.EvNameZoneChange: - self.history[StatType.Combat].update_non_idle(self.zone[StatType.Combat]) + self.history[StatType.Combat].update_non_idle( + self.zone[StatType.Combat]) self.history[StatType.Fame].update(self.zone[StatType.Fame]) self.history[StatType.Time].update(self.zone[StatType.Time]) @@ -155,6 +156,7 @@ cached_players = () # do not compute values if there is nothing in queue cached_stat_type = None cached_combat_stat_type = None + def get_stats(stat_type: str, combat_stat_type: str): global cached_players, cached_stat_type, cached_combat_stat_type new_events = False @@ -172,8 +174,9 @@ def get_stats(stat_type: str, combat_stat_type: str): return (cached_players, fame, time) cached_players = { - CombatStatType.Damage: lambda stat_type : game_stats.get_damage_stats(stat_type), - CombatStatType.Healing: lambda stat_type : game_stats.get_healing_stats(stat_type) + CombatStatType.Damage: lambda stat_type: game_stats.get_damage_stats(stat_type), + CombatStatType.Healing: lambda stat_type: game_stats.get_healing_stats( + stat_type) }[combat_stat_type](stat_type) cached_stat_type = stat_type diff --git a/src/event_receiver.py b/src/event_receiver.py index 63a7ab0..db6d983 100644 --- a/src/event_receiver.py +++ b/src/event_receiver.py @@ -23,15 +23,16 @@ class VisibilityEventReceiver(EventReceiver): self.on_player_appeared(value[consts.EvKeyName]) elif event_name == consts.EvNameUpdateParty: self.on_visible_players_changed(value[consts.EvKeyPlayerNames]) - + @abc.abstractmethod def on_player_appeared(self, main_player_name: str): pass @abc.abstractmethod - def on_visible_players_changed(self, visible_players : List[str]): + def on_visible_players_changed(self, visible_players: List[str]): pass + class FameEventReceiver(EventReceiver): def on_event(self, event_name: str, value: dict): diff --git a/src/gui/modules/about.py b/src/gui/modules/about.py index 47c5dc1..cd051b0 100644 --- a/src/gui/modules/about.py +++ b/src/gui/modules/about.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QMessageBox # type: ignore +from PySide2.QtWidgets import QMessageBox # type: ignore text = """ @@ -13,6 +13,7 @@ Quick contact - catch me on discord JaWiktor#1717 See you in game, WedrowyczJakub """ + class About(QMessageBox): def __init__(self): QMessageBox.__init__(self) @@ -24,7 +25,5 @@ class About(QMessageBox): "https://github.com/mazurwiktor/albion-online-stats", "https://github.com/mazurwiktor/albion-online-stats/releases/latest", "https://www.patreon.com/wiktormazur", - )) + )) self.setStandardButtons(QMessageBox.Ok) - - diff --git a/src/gui/modules/views/list_view/__init__.py b/src/gui/modules/views/list_view/__init__.py index 0159dcc..9bcdf3b 100644 --- a/src/gui/modules/views/list_view/__init__.py +++ b/src/gui/modules/views/list_view/__init__.py @@ -1 +1 @@ -from .list import ListItemView \ No newline at end of file +from .list import ListItemView diff --git a/src/gui/modules/views/list_view/list.py b/src/gui/modules/views/list_view/list.py index 390e1a9..86fd878 100644 --- a/src/gui/modules/views/list_view/list.py +++ b/src/gui/modules/views/list_view/list.py @@ -25,7 +25,7 @@ from .....utils import weapon from .icon import get_weapon_icon as player_icon -Style = collections.namedtuple('Style', ['bg','fg']) +Style = collections.namedtuple('Style', ['bg', 'fg']) enchant_re = re.compile(r"(.*)@(\d+)") @@ -110,10 +110,10 @@ class ListItemView(QListView): self.setBackground(brush) - brush_fg = QtGui.QBrush(QtGui.QColor(player_style(self.player.items).fg)) + brush_fg = QtGui.QBrush(QtGui.QColor( + player_style(self.player.items).fg)) self.setForeground(brush_fg) - icon = player_icon(self.player.items['weapon']) self.setToolTip('\n'.join( [f'{k}: {map_name(v)}' for (k, v) in self.player.items.items() if v])) @@ -137,7 +137,6 @@ class ListItemView(QListView): self.proxy = self.SortProxyModel() self.proxy.setSourceModel(self.model) - self.setModel(self.proxy) def update(self, players: List[PlayerListItem]): diff --git a/src/gui/modules/views/mode_based_list_view.py b/src/gui/modules/views/mode_based_list_view.py index eba967e..3426c24 100644 --- a/src/gui/modules/views/mode_based_list_view.py +++ b/src/gui/modules/views/mode_based_list_view.py @@ -67,9 +67,10 @@ class ModeBasedListView(QWidget): def update(self, prefix, elapsed, fame, fame_per_hour, players: PlayerListItem): self.session_bar.player_stats.update(elapsed, fame, fame_per_hour) - self.session_bar.copy_button.update(prefix, self.list_view.get_player_list_items(), self.session_bar.mode.get_mode(), fame) + self.session_bar.copy_button.update( + prefix, self.list_view.get_player_list_items(), self.session_bar.mode.get_mode(), fame) self.list_view.update(players) self.session_bar.update() def get_mode(self) -> str: - return self.session_bar.mode.get_mode() \ No newline at end of file + return self.session_bar.mode.get_mode() diff --git a/src/gui/modules/views/reset_button.py b/src/gui/modules/views/reset_button.py index c924fcc..0c1a987 100644 --- a/src/gui/modules/views/reset_button.py +++ b/src/gui/modules/views/reset_button.py @@ -10,6 +10,7 @@ from .... import engine from .stats_type import StatsType + class ResetButton(QPushButton): def __init__(self): QPushButton.__init__(self) @@ -28,6 +29,6 @@ class ResetButton(QPushButton): } reset[self.stat_type]() - + def update(self, stat_type: str): self.stat_type = stat_type diff --git a/src/stats/combat_state.py b/src/stats/combat_state.py index 3c8a814..89f88e9 100644 --- a/src/stats/combat_state.py +++ b/src/stats/combat_state.py @@ -1,3 +1,3 @@ class CombatState: InCombat = 1 - OutOfCombat = 2 \ No newline at end of file + OutOfCombat = 2 diff --git a/src/stats/combat_stats.py b/src/stats/combat_stats.py index ee60322..24a6e93 100644 --- a/src/stats/combat_stats.py +++ b/src/stats/combat_stats.py @@ -52,11 +52,11 @@ class Player(Stats): healing_done: float = 0.0 combat_time: CombatTime = field(default_factory=lambda: CombatTime()) combat_state: int = CombatState.OutOfCombat - active: bool = False + active: bool = False def activate(self): self.active = True - + def is_active(self) -> bool: return self.active @@ -167,7 +167,8 @@ class CombatStats(CombatEventReceiver, Stats): def update_non_idle(self, other): self.update(other) - self.players = dict(filter(lambda elem: elem[1].has_stats(), self.players.items())) + self.players = dict( + filter(lambda elem: elem[1].has_stats(), self.players.items())) for player in self.players.values(): player.activate() diff --git a/src/stats/fame_stats.py b/src/stats/fame_stats.py index 8cc2d71..97a208a 100644 --- a/src/stats/fame_stats.py +++ b/src/stats/fame_stats.py @@ -14,10 +14,10 @@ class FameStats(FameEventReceiver, Stats): @classmethod def from_other(other: Stats): # type: ignore - return FameStats(fame=other.fame) # type: ignore + return FameStats(fame=other.fame) # type: ignore - def update(self, other: Stats): # type: ignore - self.fame += other.fame # type: ignore + def update(self, other: Stats): # type: ignore + self.fame += other.fame # type: ignore def on_fame_update(self, value: float): self.fame += value diff --git a/src/stats/list_item.py b/src/stats/list_item.py index a0706e0..19e6c04 100644 --- a/src/stats/list_item.py +++ b/src/stats/list_item.py @@ -4,6 +4,7 @@ from typing import List from ..utils.number import Number from .combat_state import CombatState + @dataclass class StandalonePlayerListItem: name: str diff --git a/src/utils/__init__.py b/src/utils/__init__.py index 94c255b..afe4380 100644 --- a/src/utils/__init__.py +++ b/src/utils/__init__.py @@ -1,2 +1,4 @@ +from . import config from . import number -from . import config \ No newline at end of file + +__all__ = ['number', 'config'] diff --git a/src/utils/async_request.py b/src/utils/async_request.py index 998bec4..cad008b 100644 --- a/src/utils/async_request.py +++ b/src/utils/async_request.py @@ -7,9 +7,9 @@ import collections Item = collections.namedtuple('Item', 'key value') -_queue : queue.Queue = queue.Queue() +_queue: queue.Queue = queue.Queue() _requests = {} -_requests_threads : dict = {} +_requests_threads: dict = {} def update_loop(): diff --git a/src/utils/config.py b/src/utils/config.py index 6923b26..3007a53 100644 --- a/src/utils/config.py +++ b/src/utils/config.py @@ -59,4 +59,4 @@ def config(): cfg_file.write(default) _config = toml.loads(default) - return _config \ No newline at end of file + return _config diff --git a/src/utils/names.py b/src/utils/names.py index e33e246..bf5927a 100644 --- a/src/utils/names.py +++ b/src/utils/names.py @@ -8,5 +8,6 @@ except: from . import assets + def map_name(name): return localization_mapping[name] if name in localization_mapping else name