From a119ab44f4772ffbbc4ab2d66b426b47224c377f Mon Sep 17 00:00:00 2001 From: Ethan Henderson Date: Wed, 1 Nov 2023 07:12:18 -0600 Subject: [PATCH] Move version number to constants Signed-off-by: Ethan Henderson --- hinter/data/constants.py | 3 +++ hinter/settings.py | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/hinter/data/constants.py b/hinter/data/constants.py index f548046..041b318 100644 --- a/hinter/data/constants.py +++ b/hinter/data/constants.py @@ -2,6 +2,7 @@ # Licensed under GPLv3 - Refer to the LICENSE file for the complete text # __all__ = [ + 'VERSION', 'URL_ASSETS_ZIP', 'URL_RANKED_EMBLEMS', 'URL_KERNEL_PROXY_ROUGH', @@ -37,6 +38,8 @@ 'PATH_FRIENDS_FILE', ] +VERSION = '0.0.0' + URL_ASSETS_ZIP = 'https://codeload.github.com/zbee/mobahinted/zip/refs/heads/master' URL_RANKED_EMBLEMS = 'https://static.developer.riotgames.com/docs/lol/ranked-emblems-latest.zip' URL_KERNEL_PROXY_ROUGH = 'mhk.zbee.dev' diff --git a/hinter/settings.py b/hinter/settings.py index 9b89191..3a40080 100644 --- a/hinter/settings.py +++ b/hinter/settings.py @@ -10,17 +10,20 @@ # noinspection PySimplifyBooleanCheck class Settings: - settings_file = hinter.data.constants.PATH_SETTINGS_FILE settings_loaded = False - version = '0.0.0' + + settings_file = hinter.data.constants.PATH_SETTINGS_FILE + version = hinter.data.constants.VERSION + x: int = 10 # Window Position y: int = 10 + default_width: int = 1780 # Default Window Size default_height: int = 670 width: int = 1780 # Window Size height: int = 670 - # Settings Popup settings + # Overlays overlay_milestones: bool = False overlay_cs_tracker: bool = True overlay_objectives: bool = False @@ -34,6 +37,7 @@ class Settings: overlay_trinket: bool = True overlay_counter_items: bool = False + # Behavior launch_on_startup: bool = False automatic_updates: bool = True close_to_tray: bool = False @@ -56,16 +60,14 @@ class Settings: auto_close_builds: bool = True show_postgame_separate: bool = False + # Accounts active_user: str = '' # TODO: What if this was scrapped and only detected the active user? region: str = 'NA' + # Privacy _pipeline_private = 'Private' _pipeline_fast = 'Fast' - pipeline: str = _pipeline_fast - - pipeline_defaulted: bool = False - # TODO: Add actual cassiopeia settings pipelines = { 'Private': { 'description': 'Riot Data > Riot (must use your own key)', @@ -74,6 +76,10 @@ class Settings: 'description': 'Riot Data > MobaHinted Proxy > Riot', }, } + + pipeline_defaulted: bool = False + + pipeline: str = _pipeline_fast telemetry: bool = False def load_settings(self, refresh: bool = False):