autodetect region

Author: colinhartigan

.gitignore

@@ -1,6 +1,8 @@
 data/config.json 
 data/skin_data.json
 valorant-skin-cli.bat
+skin_loader_nocheck.py
+build_nocheck.bat
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

src/cli/completer_generator.py

@@ -1,4 +1,4 @@
-from ..flair_loader.skin_loader import Loader
+from ..flair_loader.skin_loader_withcheck import Loader
 
 
 class Completer:

src/flair_loader/skin_loader.py src/flair_loader/skin_loader_withcheck.py

@@ -8,7 +8,6 @@
 from ..utility.filepath import Filepath
 debug = Logger.debug
 
-
 class Loader:
 
     @staticmethod
@@ -166,9 +165,7 @@ def generate_skin_data(client):
                         if level is not None:
                             debug(
                                 f"{skin['displayName']}/LEVEL: beginning processing of {level['displayName']} ({level['uuid']}) - {level}")
-
-                            level_already_exists = skin_previously_owned and level[
-                                "uuid"] in existing_skin_data[weapon_uuid]["skins"][skin_uuid]["levels"]
+                            level_already_exists = skin_previously_owned and level["uuid"] in existing_skin_data[weapon_uuid]["skins"][skin_uuid]["levels"]
 
                             def process_skin_level():
                                 debug(
@@ -200,8 +197,7 @@ def process_skin_level():
                                 skin, chroma["displayName"], weapon["displayName"])
                             debug(
                                 f"{skin['displayName']}/CHROMA: beginning processing of {sanitized_chroma_name} ({chroma['uuid']}) - {chroma}")
-                            chroma_already_exists = skin_previously_owned and chroma[
-                                "uuid"] in existing_skin_data[weapon_uuid]["skins"][skin_uuid]["chromas"]
+                            chroma_already_exists = skin_previously_owned and chroma["uuid"] in existing_skin_data[weapon_uuid]["skins"][skin_uuid]["chromas"]
 
                             def process_chroma():
                                 debug(

src/flair_management/skin_manager/randomizer.py

@@ -1,5 +1,5 @@
 from InquirerPy.utils import color_print
-from ...flair_loader.skin_loader import Loader
+from ...flair_loader.skin_loader_withcheck import Loader
 import random
 
 class Randomize:

src/flair_management/skin_manager/randomizer_editor.py

@@ -1,7 +1,7 @@
 from InquirerPy import prompt, inquirer
 from InquirerPy.separator import Separator
 
-from ...flair_loader.skin_loader import Loader
+from ...flair_loader.skin_loader_withcheck import Loader
 
 
 class Editor:

src/flair_management/skin_manager/skin_manager.py

@@ -3,7 +3,7 @@
 
 from ...content.skin_content import Skin_Content
 from ...utility.filepath import Filepath
-#from .skin_loader import Loader
+#from .skin_loader_withcheck import Loader
 from .randomizer import Randomize
 
 class Skin_Manager:

src/startup.py

@@ -1,12 +1,13 @@
-import os, threading, ctypes
+import os, threading, ctypes, time
 from valclient.client import Client
 from InquirerPy.utils import color_print
 
 from .utility.config_manager import Config
 from .utility.onboarding import Onboarder
-from .flair_loader.skin_loader import Loader
+from .flair_loader.skin_loader_withcheck import Loader
 from .asynchronous.async_manager import Async_Manager
 from .cli.command_prompt import Prompt
+from .cli.commands.reload import Reload
 from .utility.logging import Logger
 from .utility.filepath import Filepath
 from .utility.version_checker import Checker
@@ -23,6 +24,12 @@ def run():
         Logger.create_logger()
         Config.check_config()
         config = Config.fetch_config()
+
+        if not config["meta"]["onboarding_completed"]:
+            Onboarder()
+            # reset the client if region changed during onboarding
+            Reload()
+
         Checker.check_version(config)
 
         ctypes.windll.kernel32.SetConsoleTitleW(f"valorant-skin-cli {config['version']}") 
@@ -37,13 +44,6 @@ def run():
             input("press enter to exit...")
             os._exit(1)
 
-        if not config["meta"]["onboarding_completed"]:
-            Onboarder(client)
-            # reset the client if region changed during onboarding
-            config = Config.fetch_config()
-            client = Client(region=region)
-            client.activate()
-
         # load skin data
         Loader.generate_skin_data(client)
 

src/utility/config_manager.py

@@ -4,14 +4,15 @@
 from valclient import Client
 
 default_config = {
-    "version": "v1.0.6",
-    "region": ["na",Client.fetch_regions()],
+    "version": "v1.0.7",
+    "region": ["",Client.fetch_regions()],
     "async_refresh_interval": 5,
     "skin_manager": {
         "randomize_after_each_game": True
     },
     "meta": {
-        "onboarding_completed": False
+        "onboarding_completed": False,
+        "surpress_update_notifications": False,
     }
 }
 

src/utility/onboarding.py

@@ -1,24 +1,26 @@
 from InquirerPy.utils import color_print
+from valclient.client import Client
+import time
 
 from .config_manager import Config as app_config
 
-from ..cli.commands.config import Config_Editor
-from ..flair_loader.skin_loader import Loader
+from ..cli.commands.reload import Reload
+from ..flair_loader.skin_loader_withcheck import Loader
 from ..flair_management.skin_manager.randomizer_editor import Editor
 
 
 class Onboarder:
 
-    def __init__(self, client):
-        self.client = client
+    def __init__(self):
         self.config = app_config.fetch_config()
+        self.client = Client(region="na" if self.config['region'][0] == "" else self.config['region'][0])
+        self.client.activate()
 
         self.procedure = [
             {
-                "text": "set region:",
-                "method": Config_Editor.config_set,
-                "args": ("region",self.config["region"]),
-                "callback": self.update_region
+                "text": "autodetecting region",
+                "method": self.autodetect_region,
+                "args": None,
             },
             {
                 "text": "generating fresh skin data file...",
@@ -28,12 +30,12 @@ def __init__(self, client):
             {
                 "text": "loading your skins...",
                 "method": Loader.generate_skin_data,
-                "args": (self.client, ),
+                "args": (self.client,),
             },
             {
                 "text": "set your skin preferences:",
                 "method": Editor.select_weapon_type,
-                "args": (None),
+                "args": None,
             }
         ]
         self.run()
@@ -56,6 +58,21 @@ def run(self):
         app_config.modify_config(self.config)
         color_print([("Lime bold", "onboarding completed!")])
 
-    def update_region(self, region):
-        self.config["region"] = region
-        app_config.modify_config(self.config)
+
+    def autodetect_region(self):
+        if self.config["region"][0] == "":
+            client = Client(region="na")
+            client.activate()
+            sessions = client.riotclient_session_fetch_sessions()
+            for _,session in sessions.items():
+                if session["productId"] == "valorant":
+                    launch_args = session["launchConfiguration"]["arguments"]
+                    for arg in launch_args:
+                        if "-ares-deployment" in arg:
+                            region = arg.replace("-ares-deployment=","")
+                            self.config["region"][0] = region
+                            app_config.modify_config(self.config)
+                            color_print([("LimeGreen",f"autodetected region: {self.config['region'][0]}")])
+                            Reload()
+        else:
+            color_print([("LimeGreen",f"autodetected region: {self.config['region'][0]}")])

src/utility/version_checker.py

@@ -4,8 +4,9 @@
 class Checker:
     @staticmethod 
     def check_version(config):
-        current_version = config["version"]
-        data = requests.get("https://api.github.com/repos/colinhartigan/valorant-skin-cli/releases/latest")
-        latest = data.json()["tag_name"]
-        if latest != current_version:
-            color_print([("Yellow bold",f"an update is available ({current_version} -> {latest})! download it at "),("Cyan underline",f"https://github.com/colinhartigan/valorant-skin-cli/releases/tag/{latest}")])
+        if not config["meta"]["surpress_update_notifications"]:
+            current_version = config["version"]
+            data = requests.get("https://api.github.com/repos/colinhartigan/valorant-skin-cli/releases/latest")
+            latest = data.json()["tag_name"]
+            if latest != current_version:
+                color_print([("Yellow bold",f"an update is available ({current_version} -> {latest})! download it at "),("Cyan underline",f"https://github.com/colinhartigan/valorant-skin-cli/releases/tag/{latest}")])