diff --git a/.gitignore b/.gitignore index 9bf4fde..d5a1854 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ env *.egg __pycache__ albion-online-stats.cfg +.mypy_cache diff --git a/application/src/backend_proxy.py b/application/src/backend_proxy.py index 0e6630e..82a3556 100644 --- a/application/src/backend_proxy.py +++ b/application/src/backend_proxy.py @@ -1,7 +1,7 @@ try: - import aostats + import aostats # type: ignore except: - class aostats: + class aostats: # type: ignore @staticmethod def initialize(_): return InitializationResult.NetworkInterfaceListMissing diff --git a/application/src/engine.py b/application/src/engine.py index 91e9a83..49a73e0 100644 --- a/application/src/engine.py +++ b/application/src/engine.py @@ -127,7 +127,7 @@ class GameStats(): game_stats = GameStats() -event_queue = Queue() +event_queue : Queue = Queue() class FameStat: diff --git a/application/src/environment.py b/application/src/environment.py index 69d125c..0b253b2 100644 --- a/application/src/environment.py +++ b/application/src/environment.py @@ -20,4 +20,4 @@ if TEST_ENV_ENABLED: raise Exception('Unavailable GUI test type, avaliable values: {}'.format( ','.join(_test_types.keys()))) - TEST_TYPE = _test_types[os.getenv('TESTING').lower()] + TEST_TYPE = _test_types[test_type.lower()] diff --git a/application/src/gui/app.py b/application/src/gui/app.py index 436e877..4cc9fc3 100644 --- a/application/src/gui/app.py +++ b/application/src/gui/app.py @@ -1,3 +1,10 @@ +import os +import sys + +from PySide2.QtCore import Qt # type: ignore +from PySide2.QtWidgets import QApplication # type: ignore +from PySide2.QtWidgets import QMessageBox # type: ignore + from ..engine import InitializationResult from ..engine import initialize from ..utils.config import config @@ -7,12 +14,6 @@ from .styling import style from ..utils.version import current_version as get_current_version from ..utils.version import latest_url from ..utils.version import latest_version as get_latest_version -from PySide2.QtCore import Qt -from PySide2.QtWidgets import QApplication -from PySide2.QtWidgets import QMessageBox - -import os -import sys sys.path.append(os.path.dirname(os.path.abspath('__file__'))) diff --git a/application/src/gui/modules/about.py b/application/src/gui/modules/about.py index d605e1e..47c5dc1 100644 --- a/application/src/gui/modules/about.py +++ b/application/src/gui/modules/about.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QMessageBox +from PySide2.QtWidgets import QMessageBox # type: ignore text = """ diff --git a/application/src/gui/modules/main.py b/application/src/gui/modules/main.py index cf7944a..4a1e530 100644 --- a/application/src/gui/modules/main.py +++ b/application/src/gui/modules/main.py @@ -1,14 +1,14 @@ import sys import functools -from PySide2 import QtGui -from PySide2.QtCore import Qt -from PySide2.QtCore import QTimer -from PySide2.QtWidgets import QComboBox -from PySide2.QtWidgets import QHBoxLayout -from PySide2.QtWidgets import QPushButton -from PySide2.QtWidgets import QVBoxLayout -from PySide2.QtWidgets import QWidget +from PySide2 import QtGui # type: ignore +from PySide2.QtCore import Qt # type: ignore +from PySide2.QtCore import QTimer # type: ignore +from PySide2.QtWidgets import QComboBox # type: ignore +from PySide2.QtWidgets import QHBoxLayout # type: ignore +from PySide2.QtWidgets import QPushButton # type: ignore +from PySide2.QtWidgets import QVBoxLayout # type: ignore +from PySide2.QtWidgets import QWidget # type: ignore from ... import engine diff --git a/application/src/gui/modules/views/copy_button.py b/application/src/gui/modules/views/copy_button.py index 047d6a1..36055e5 100644 --- a/application/src/gui/modules/views/copy_button.py +++ b/application/src/gui/modules/views/copy_button.py @@ -1,6 +1,6 @@ -from PySide2.QtWidgets import QPushButton -from PySide2 import QtGui +from PySide2.QtWidgets import QPushButton # type: ignore +from PySide2 import QtGui # type: ignore from ....utils import assets from ....stats.list_item import PlayerListItem diff --git a/application/src/gui/modules/views/list_view/__init__.py b/application/src/gui/modules/views/list_view/__init__.py index 5b4622b..0159dcc 100644 --- a/application/src/gui/modules/views/list_view/__init__.py +++ b/application/src/gui/modules/views/list_view/__init__.py @@ -1 +1 @@ -from .list import List as List \ No newline at end of file +from .list import ListItemView \ No newline at end of file diff --git a/application/src/gui/modules/views/list_view/list.py b/application/src/gui/modules/views/list_view/list.py index 97dbaa0..035dc7b 100644 --- a/application/src/gui/modules/views/list_view/list.py +++ b/application/src/gui/modules/views/list_view/list.py @@ -3,22 +3,22 @@ import collections import functools import re from typing import List -from PIL import Image, ImageQt +from PIL import Image, ImageQt # type: ignore -from PySide2 import QtCore -from PySide2 import QtGui -from PySide2.QtCore import Qt -from PySide2.QtGui import QStandardItem -from PySide2.QtGui import QStandardItemModel -from PySide2.QtWidgets import QApplication -from PySide2.QtWidgets import QComboBox -from PySide2.QtWidgets import QHBoxLayout -from PySide2.QtWidgets import QLabel -from PySide2.QtWidgets import QListView -from PySide2.QtWidgets import QMessageBox -from PySide2.QtWidgets import QProgressBar -from PySide2.QtWidgets import QPushButton -from PySide2.QtWidgets import QVBoxLayout +from PySide2 import QtCore # type: ignore +from PySide2 import QtGui # type: ignore +from PySide2.QtCore import Qt # type: ignore +from PySide2.QtGui import QStandardItem # type: ignore +from PySide2.QtGui import QStandardItemModel # type: ignore +from PySide2.QtWidgets import QApplication # type: ignore +from PySide2.QtWidgets import QComboBox # type: ignore +from PySide2.QtWidgets import QHBoxLayout # type: ignore +from PySide2.QtWidgets import QLabel # type: ignore +from PySide2.QtWidgets import QListView # type: ignore +from PySide2.QtWidgets import QMessageBox # type: ignore +from PySide2.QtWidgets import QProgressBar # type: ignore +from PySide2.QtWidgets import QPushButton # type: ignore +from PySide2.QtWidgets import QVBoxLayout # type: ignore from .....stats.list_item import PlayerListItem from .....utils import assets @@ -91,7 +91,7 @@ def player_icon(weapon): return None -class List(QListView): +class ListItemView(QListView): class Item(QtGui.QStandardItem): def __init__(self, player, parent): QtGui.QStandardItem .__init__(self) diff --git a/application/src/gui/modules/views/mode_based_list_view.py b/application/src/gui/modules/views/mode_based_list_view.py index bd5b2c8..eba967e 100644 --- a/application/src/gui/modules/views/mode_based_list_view.py +++ b/application/src/gui/modules/views/mode_based_list_view.py @@ -3,22 +3,14 @@ from typing import Callable -from PySide2.QtWidgets import QHBoxLayout -# from PySide2.QtWidgets import QPushButton -from PySide2.QtWidgets import QVBoxLayout - -# from PySide2.QtWidgets import QLabel - - -# from PySide2 import QtGui -# from PySide2 import QtCore - -from PySide2.QtWidgets import QComboBox -from PySide2.QtWidgets import QWidget +from PySide2.QtWidgets import QHBoxLayout # type: ignore +from PySide2.QtWidgets import QVBoxLayout # type: ignore +from PySide2.QtWidgets import QComboBox # type: ignore +from PySide2.QtWidgets import QWidget # type: ignore from ....stats.list_item import PlayerListItem -from .list_view import List +from .list_view import ListItemView from .stats_type import StatsType from .player_stats import PlayerStats from .copy_button import CopyButton @@ -68,7 +60,7 @@ class ModeBasedListView(QWidget): self.session_bar = SessionBar(clipboard) self.layout.addWidget(self.session_bar) - self.list_view = List() + self.list_view = ListItemView() self.layout.addWidget(self.list_view) self.setLayout(self.layout) diff --git a/application/src/gui/modules/views/player_stats.py b/application/src/gui/modules/views/player_stats.py index 46d8a74..16bb115 100644 --- a/application/src/gui/modules/views/player_stats.py +++ b/application/src/gui/modules/views/player_stats.py @@ -1,8 +1,8 @@ import datetime -from PySide2.QtWidgets import QLabel -from PySide2 import QtGui -from PySide2 import QtCore +from PySide2.QtWidgets import QLabel # type: ignore +from PySide2 import QtGui # type: ignore +from PySide2 import QtCore # type: ignore from src.utils import assets, number from src.stats.list_item import PlayerListItem diff --git a/application/src/gui/modules/views/reset_button.py b/application/src/gui/modules/views/reset_button.py index 86942ca..c924fcc 100644 --- a/application/src/gui/modules/views/reset_button.py +++ b/application/src/gui/modules/views/reset_button.py @@ -1,8 +1,8 @@ from typing import Callable -from PySide2.QtWidgets import QPushButton -from PySide2 import QtGui +from PySide2.QtWidgets import QPushButton # type: ignore +from PySide2 import QtGui # type: ignore from ....utils import assets from ....stats.list_item import PlayerListItem diff --git a/application/src/stats/damage_stats.py b/application/src/stats/damage_stats.py index 8f1deae..8ecf1e4 100644 --- a/application/src/stats/damage_stats.py +++ b/application/src/stats/damage_stats.py @@ -30,7 +30,7 @@ class Player(Stats): items: dict = field(default_factory=lambda: {'weapon': None}) damage_done: float = 0.0 combat_time: CombatTime = field(default_factory=lambda: CombatTime()) - combat_state: CombatState = CombatState.OutOfCombat + combat_state: int = CombatState.OutOfCombat @staticmethod def new(self): diff --git a/application/src/stats/fame_stats.py b/application/src/stats/fame_stats.py index eefd3d7..8cc2d71 100644 --- a/application/src/stats/fame_stats.py +++ b/application/src/stats/fame_stats.py @@ -13,11 +13,11 @@ class FameStats(FameEventReceiver, Stats): return FameStats() @classmethod - def from_other(other: Stats): - return FameStats(fame=other.fame) + def from_other(other: Stats): # type: ignore + return FameStats(fame=other.fame) # type: ignore - def update(self, other: Stats): - self.fame += other.fame + 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/application/src/utils/async_request.py b/application/src/utils/async_request.py index f7dfb91..998bec4 100644 --- a/application/src/utils/async_request.py +++ b/application/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() _requests = {} -_requests_threads = {} +_requests_threads : dict = {} def update_loop():