show everything

This commit is contained in:
Wiktor Mazur
2019-12-15 17:34:34 +01:00
parent 47f64a9834
commit e4963a5a35
11 changed files with 134 additions and 44 deletions
+43
View File
@@ -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
+19 -12
View File
@@ -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)
+9 -8
View File
@@ -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:
+17 -6
View File
@@ -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
+2 -2
View File
@@ -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:
+1 -1
View File
@@ -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'])