GameSentenceMiner 2.13.7__tar.gz → 2.13.7.post1__tar.gz

{gamesentenceminer-2.13.7 → gamesentenceminer-2.13.7.post1}/GameSentenceMiner/gsm.py

@@ -9,6 +9,18 @@ import warnings
 os.environ.pop('TCL_LIBRARY', None)
 
 
+def handle_error_in_initialization(e):
+    """Handle errors that occur during initialization."""
+    logger.exception(e, exc_info=True)
+    logger.info(
+        "An error occurred during initialization, Maybe try updating GSM from the menu or if running manually, try installing `pip install --update GameSentenceMiner`")
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        logger.info("Exiting due to initialization error.")
+        sys.exit(1)
+
 try:
     import os.path
     import signal
@@ -45,11 +57,7 @@ try:
     from GameSentenceMiner.web.texthooking_page import run_text_hooker_page
 except Exception as e:
     from GameSentenceMiner.util.configuration import logger, is_linux, is_windows
-    logger.info(
-        "Something bad happened during import/initialization, closing in 5 seconds")
-    logger.exception(e)
-    time.sleep(5)
-    sys.exit(1)
+    handle_error_in_initialization(e)
 
 if is_windows():
     import win32api
@@ -688,11 +696,7 @@ async def async_main(reloading=False):
         except Exception as e:
             logger.error(f"Error stopping observer: {e}")
     except Exception as e:
-        logger.error(f"An error occurred during initialization: {e}", exc_info=True)
-        notification.send_error_notification(
-            "An error occurred during initialization. Check the log for details.")
-        asyncio.sleep(5)
-        raise e
+        handle_error_in_initialization(e)
 
 
 def main():
@@ -701,10 +705,8 @@ def main():
     try:
         asyncio.run(async_main())
     except Exception as e:
-        logger.exception(e, exc_info=True)
-        logger.info(
-            "An error occurred during initialization, closing in 5 seconds")
-        time.sleep(5)
+        handle_error_in_initialization(e)
+
 
 
 if __name__ == "__main__":
@@ -712,7 +714,4 @@ if __name__ == "__main__":
     try:
         asyncio.run(async_main())
     except Exception as e:
-        logger.exception(e, exc_info=True)
-        logger.info(
-            "An error occurred during initialization, closing in 5 seconds")
-        time.sleep(5)
+        handle_error_in_initialization(e)

{gamesentenceminer-2.13.7 → gamesentenceminer-2.13.7.post1}/GameSentenceMiner/util/configuration.py

@@ -865,7 +865,7 @@ def load_config():
 
     if os.path.exists('config.json') and not os.path.exists(config_path):
         shutil.copy('config.json', config_path)
-
+        
     if os.path.exists(config_path):
         try:
             with open(config_path, 'r') as file:
@@ -880,20 +880,21 @@ def load_config():
                     config = ProfileConfig.from_dict(config_file)
                     new_config = Config(configs = {DEFAULT_CONFIG : config}, current_profile=DEFAULT_CONFIG)
 
-                    with open(config_path, 'w') as file:
-                        json.dump(new_config.to_dict(), file, indent=4)
+                    config.save()
                     return new_config
         except json.JSONDecodeError as e:
-            logger.error(f"Error parsing config.json: {e}")
-            return None
+            logger.error(f"Error parsing config.json, saving backup and returning new config: {e}")
+            shutil.copy(config_path, config_path + '.bak')
+            config = Config.new()
+            config.save()
+            return config
     elif os.path.exists('config.toml'):
         config = ProfileConfig().load_from_toml('config.toml')
         new_config = Config({DEFAULT_CONFIG: config}, current_profile=DEFAULT_CONFIG)
         return new_config
     else:
         config = Config.new()
-        with open(config_path, 'w') as file:
-            json.dump(config.to_dict(), file, indent=4)
+        config.save()
         return config
 
 

{gamesentenceminer-2.13.7 → gamesentenceminer-2.13.7.post1}/GameSentenceMiner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.13.7
+Version: 2.13.7.post1
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.13.7 → gamesentenceminer-2.13.7.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.13.7
+Version: 2.13.7.post1
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.13.7 → gamesentenceminer-2.13.7.post1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.13.7"
+version = "2.13.7post1"
 description = "A tool for mining sentences from games. Update: Overlay?"
 readme = "README.md"
 requires-python = ">=3.10"