Bug fixes/variable refactors.

---

- Fixed bug causing program to not exit when starting Valheim.
- Refactored `__version__` variable to "./appglobals/appglobals.py".

Signed-off-by: schlopp96 <[email protected]>

Author: schlopp96

VBPatcher/appglobals/appglobals.py

@@ -72,6 +72,8 @@ def get_dev_assets(url: str, mode: int):
         return dl_link[73:80]  # Return patch version.
 
 
+__version__: str = '0.8.0'
+
 p_stable: str = r'.\patch-files\stable'  # Stable patch file location
 
 url_stable = get_stable_assets(

VBPatcher/applogger/applogger.py

@@ -89,7 +89,7 @@ def __init__(
         self.logger.setLevel(level)
         self.stream = stream
 
-        if stream:  # if stream is True, then toggle logging to stdout
+        if stream:  # if stream is True, then toggle logging stream to stdout
             self.logger.addHandler(logging.StreamHandler())
 
     def debug(self, msg) -> None:

VBPatcher/main.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 
-__version__: str = '0.8.0'
-
 import sys
 from os import chdir
 from os.path import dirname
@@ -39,15 +37,15 @@ def main() -> None | NoReturn:
     """
 
     logger.info(
-        f'Welcome to the Valheim Bepinex Patcher v{__version__}!\n>> Session Start: {VBPatcher.appglobals.appglobals._datefmt}\n\n'
+        f'Welcome to the Valheim Bepinex Patcher v{VBPatcher.appglobals.appglobals.__version__}!\n>> Session Start: {VBPatcher.appglobals.appglobals._datefmt}\n\n'
     )
 
     Validations._start_checks()  # Ensure presence of patch files.
 
     while True:
         logger.info('Display user menu...\n')
         choosePatch: str = input(
-            f"Welcome to the Valheim Bepinex Patcher!\n\nPlease Choose an Option by Entering its Corresponding Number:\n\n{VBPatcher.appglobals.appglobals._textborder}\n>> [1] Patch BepInEx to latest stable release: {VBPatcher.appglobals.appglobals.b_stable}\n>> [2] Patch BepInEx to latest development/bleeding-edge build: {VBPatcher.appglobals.appglobals.b_dev}\n>> [3] Apply both patches to BepInEx in chronological order of release ({VBPatcher.appglobals.appglobals.b_stable} then {VBPatcher.appglobals.appglobals.b_dev})\n>> [4] Check for/update to newest patch versions\n>> [5] Open Valheim\n>> [6] Exit Program\n\n> "
+            f"Welcome to the Valheim Bepinex Patcher v{VBPatcher.appglobals.appglobals.__version__}!\n\nPlease Choose an Option by Entering its Corresponding Number:\n\n{VBPatcher.appglobals.appglobals._textborder}\n>> [1] Patch BepInEx to latest stable release: {VBPatcher.appglobals.appglobals.b_stable}\n>> [2] Patch BepInEx to latest development/bleeding-edge build: {VBPatcher.appglobals.appglobals.b_dev}\n>> [3] Apply both patches to BepInEx in chronological order of release ({VBPatcher.appglobals.appglobals.b_stable} then {VBPatcher.appglobals.appglobals.b_dev})\n>> [4] Check for/update to newest patch versions\n>> [5] Open Valheim\n>> [6] Exit Program\n\n> "
         )
 
         if choosePatch == '1':  # Patch BepInEx to latest stable release.
@@ -74,7 +72,6 @@ def main() -> None | NoReturn:
         elif choosePatch == '5':  # Open Valheim.
             logger.info('Chose option [5] to start Valheim...')
             _openValheim()
-            break
 
         elif choosePatch == '6':  # Exit Program.
             logger.info('Chose option [6] to close patcher...')

VBPatcher/subprocessing/subprocessing.py

@@ -26,17 +26,18 @@ def _exitPatcher() -> None | NoReturn:
     return ex()
 
 
-def _openValheim() -> int | None:
+def _openValheim() -> None:
     """Calls command to open "Valheim" within Steam client.
+
     - Will raise exception :class:`TimeoutExpired` if executable doesn't start within 10 seconds.
         - Prevents program from freezing due to any errors encountered during launch process.
 
     - Steam must be running to properly initialize launch process.
 
     ---
 
-    :return: Start game client.
-    :rtype: :class:`int` | None
+    :return: Start Valheim game client.
+    :rtype: `None`
     """
 
     try:
@@ -45,16 +46,17 @@ def _openValheim() -> int | None:
                         ">> Opening Valheim...\n",
                         iter_total=3,
                         txt_seq_speed=0.25)
-        return call(
-            r"C:\Program Files (x86)\Steam\Steam.exe -applaunch 892970",
-            timeout=15,
-            stdout=sys.stdout,
-            stderr=sys.stderr)  # Start Valheim
+        call(r"C:\Program Files (x86)\Steam\Steam.exe -applaunch 892970",
+             timeout=15,
+             stdout=sys.stdout,
+             stderr=sys.stderr)  # Start Valheim
 
     except TimeoutExpired as exp:
         logger_stream.error(
             f'Something went wrong while starting Valheim...\n\n>> Exception:\n{exp}\n>> Make sure Steam is running!\n'
         )
+
+    finally:
         return _exitPatcher()
 
 
@@ -77,7 +79,7 @@ def _startPrompt() -> NoReturn | None:
 
         elif startPrompt.lower() in {'n', 'no'}:
             logger.info(
-                'Patching process successfully completed!\n>> Preparing to exit...\n'
+                'Patching process successfully completed!\n>> Returning to menu...\n'
             )
             return start_seq.start(
                 '>> Patching process successfully completed',