From c582677329956026aef9aeeb973718cae646f22b Mon Sep 17 00:00:00 2001 From: Wiktor Mazur Date: Thu, 21 Oct 2021 21:41:58 +0200 Subject: [PATCH] Version update --- launchers/albion-online-stats.sh | 16 ++++++++++++++++ setup.py | 4 ++-- src/utils/weapon.py | 10 +--------- src/version.py | 2 +- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/launchers/albion-online-stats.sh b/launchers/albion-online-stats.sh index b1740a4..fc181b1 100644 --- a/launchers/albion-online-stats.sh +++ b/launchers/albion-online-stats.sh @@ -1,9 +1,25 @@ #!/bin/bash + +FOUND_PYTHON="none" + +for app in python3 python +do + if [ -x "$(command -v $app)" ]; then + FOUND_PYTHON=$app + break + fi + +done + +echo "Found python: $FOUND_PYTHON" + +echo "Creating python virtual environment" python -m venv python_env source python_env/bin/activate +echo "Installing albion online stats" python -m pip install aostats python -m pip install --upgrade aostats diff --git a/setup.py b/setup.py index d9146e8..ced5117 100644 --- a/setup.py +++ b/setup.py @@ -6,8 +6,8 @@ install_requires = [ "requests==2.26.0", "PySide6==6.2.0", "toml==0.10.2", - "pillow==8.3.2", - "pyaoaddons==0.2.7.dev" + "pillow==8.4.0", + "pyaoaddons==0.2.8" ] this_directory = path.abspath(path.dirname(__file__)) diff --git a/src/utils/weapon.py b/src/utils/weapon.py index aa32d2b..a8c2c66 100644 --- a/src/utils/weapon.py +++ b/src/utils/weapon.py @@ -1,12 +1,8 @@ -import json - try: from pyaoaddons import item_category_mapping except: item_category_mapping = {} -from . import assets - class WeaponType: Arcane = 'arcanestaff' @@ -26,12 +22,8 @@ class WeaponType: Sword = 'sword' -def map_weapon(weapon): - return item_category_mapping[weapon] if weapon in item_category_mapping else None - - def get_weapon_type(items): - weapon = map_weapon(items['weapon']) + weapon = item_category_mapping.get(items.get('weapon', None), None) if weapon == WeaponType.Arcane: return WeaponType.Arcane diff --git a/src/version.py b/src/version.py index 2745891..321b7de 100644 --- a/src/version.py +++ b/src/version.py @@ -1 +1 @@ -version = "1.0.4" \ No newline at end of file +version = "1.0.5" \ No newline at end of file