TESTING NEXT DAY AND THEN IT'S ON LESGOOO

Author: MF366-Coding

core/database_handler.py

@@ -2,6 +2,7 @@
 from typing import Any
 import requests
 from PIL import Image
+import simple_webbrowser
 import io
 
 # pylint: disable=W0718
@@ -13,7 +14,7 @@ class StatusCodeNot200(Exception): ...
 
 def __get_online_database(url: str, handler: Any) -> dict | int:
     try:
-        response = requests.get(url=url, allow_redirects=False, timeout=1)
+        response = requests.get(url=url, allow_redirects=False, timeout=1.5)
 
         if response.status_code != 200:
             raise StatusCodeNot200(f"status code is {response.status_code} and not 200")
@@ -59,7 +60,7 @@ def get_image(source: str, handler: Any, **kw):
     del _
 
     try:
-        response = requests.get(url=source, allow_redirects=False, timeout=1.3)
+        response = requests.get(url=source, allow_redirects=False, timeout=1.7)
 
         if response.status_code != 200:
             raise StatusCodeNot200(f"status code is {response.status_code} and not 200")
@@ -92,3 +93,52 @@ def get_image(source: str, handler: Any, **kw):
         return handler(28, f"Unknown error when trying to read the chosen image with URL with PIL:\n\n{source}\n\nError Details:\n{e}")
 
     return image
+
+
+def check_for_updates(app_version: str, urls: tuple[str], handlers: Any, warn_if_match: bool = False) -> int | bool:
+    try:
+        response = requests.get(urls[0], allow_redirects=False, timeout=1.2)
+        
+        if response.status_code != 200:
+            raise StatusCodeNot200(f"status code is {response.status_code} and not 200")
+        
+        data = response.json()
+        latest = data['tag_name']
+        body = data['body']
+    
+    except StatusCodeNot200:
+        return handlers[0](31, f"The Status Code of URL...\n\n{urls[0]}\n\n...is not 200, meaning DoomMapGuesser is unable to access the latest release.")
+    
+    except (requests.exceptions.ConnectionError, requests.exceptions.HTTPError):
+        return handlers[0](24, "Unable to connect via HTTP. This might be caused by a bad Internet connection.")
+    
+    except (TimeoutError, requests.exceptions.Timeout):
+        return handlers[0](21, f"The URL...\n\n({urls[0]})\n\n...took too long to respond to the GET request.")
+    
+    except (requests.exceptions.InvalidURL, requests.exceptions.InvalidSchema, requests.exceptions.MissingSchema):
+        return handlers[0](27, f"The URL...\n\n({urls[0]})\n\n...is invalid.")
+    
+    except Exception as e:
+        return handlers[0](28, f"Unknown error when trying to obtain the data on the latest release.\nError Details:\n{e}")
+    
+    if app_version != latest:
+        handlers[2]('info', 'DoomMapGuesser - Update Available', f"A new update for DoomMapGuesser is available!\n\nWhat's new in DoomMapGuesser {latest}?\n{body}", [
+            {
+                'text': "Update",
+                'type': "PRIMARY",
+                'command': lambda: simple_webbrowser.website(urls[1])
+            },
+            {
+                'text': "Don't Update",
+                'type': "DEFAULT",
+                'command': "TYPE_CLOSE"
+            }
+        ])
+        
+        return False
+        
+    if warn_if_match:
+        handlers[1]('sucess', "DoomMapGuesser is up-to-date", f"Congrats!\nDoomMapGuesser {app_version} is up-to-date!")
+        return True
+        
+    

core/settings.py

@@ -228,6 +228,213 @@ def exclude_rule_for_e3m1_e3m9(self, value: str | None):
 
 
 class SettingsObject:
+    class __SettingsObjectCopy:
+        def __init__(self, master: Any) -> None:
+            """
+            # __SettingsObjectCopy
+            
+            Serves as a copy of SettingsObject that doesn't allow for as much features.
+
+            :param master: SettingsObject class
+            """
+            
+            self._SETTINGS: dict[str, int | bool | str | float | list[list[str, str, str]] | None] = master._SETTINGS
+            self.error_handler = master.error_handler
+            self._MASTER = master
+            
+        def load(self) -> None:
+            """"""
+            
+            self._MASTER.load()
+            
+            self._SETTINGS = self._MASTER._SETTINGS.copy()
+            
+        def save_settings(self, **kw) -> None:
+            """
+            ## save_settings
+            Automatically save the settings using the default inner settings of the class.
+
+            :param indent: how many spaces as indentation *(int, defaults to 4)*
+            """
+            
+            self._MASTER._SETTINGS = self._SETTINGS
+            self._MASTER.save_settings(**kw)
+            del self
+
+        @property
+        def databases(self) -> list[list[str, str, str]]:
+            return self._SETTINGS['databases']
+        
+        @databases.setter
+        def databases(self, value: list[list[str, str, str]]):
+            value.pop(0)
+            self._SETTINGS['databases'] = value
+        
+        @databases.deleter
+        def databases(self):
+            self._SETTINGS['databases'].clear()
+        
+        @property
+        def theme(self) -> str:
+            match self._SETTINGS['theme']:
+                case 1:
+                    return "light"
+                
+                case 2:
+                    return "dark"
+                
+                case _:
+                    return "auto"
+        
+        @theme.setter
+        def theme(self, value: str | int):
+            if isinstance(value, int):
+                self._SETTINGS['theme'] = value
+                return
+            
+            match value:
+                case 'light':
+                    value = 1
+                    
+                case 'dark':
+                    value = 2
+                    
+                case _:
+                    value = 0
+                    
+            self._SETTINGS['theme'] = value
+        
+        @property
+        def image_ratio(self) -> bool:
+            return self._SETTINGS['imageRatio']
+        
+        @image_ratio.setter
+        def image_ratio(self, value: str):
+            match value:
+                case '16:9' | '1:1':
+                    print('Good image ratio.')
+                    
+                case _:
+                    value = 'detect'
+            
+            self._SETTINGS['imageRatio'] = value
+        
+        @property
+        def image_width(self) -> int:
+            return self._SETTINGS['imageWidth']
+        
+        @image_width.setter
+        def image_width(self, value: int):
+            self._SETTINGS['imageWidth'] = value
+            
+        @property
+        def use_width_as_height(self) -> bool:
+            return self._SETTINGS['widthIsHeight']
+        
+        @use_width_as_height.setter
+        def use_width_as_height(self, value: bool):
+            self._SETTINGS['widthIsHeight'] = value
+            
+        @property
+        def zoom_boost(self) -> float:
+            return self._SETTINGS['zoomBoost']
+        
+        @zoom_boost.setter
+        def zoom_boost(self, value: float):
+            self._SETTINGS['zoomBoost'] = value
+            
+        @property
+        def check_for_updates_on_startup(self) -> bool:
+            return self._SETTINGS['checkUpdates']
+        
+        @check_for_updates_on_startup.setter
+        def check_for_updates_on_startup(self, value: bool):
+            self._SETTINGS['checkUpdates'] = value
+
+        '''
+        @property
+        def autoupdate(self) -> bool:
+            """
+            # Levels of Auto Updating
+            
+            **Key name:** `autoUpdateLevel`
+
+            0. **Always ask** (Default)
+            1. **Always update**
+            2. **Update if the latest is a major**
+            3. **Never update**
+            
+            Auto Updating only works if **Check for Updates on Startup** (key name is `checkUpdates`) is enabled (set to `True`).
+            
+            Both Auto Updates and Check for Updates require a stable Internet connection.
+            """
+            
+            return self._SETTINGS['autoUpdateLevel']
+        
+        @autoupdate.setter
+        def autoupdate(self, value: bool):        
+            if value < 0 or value > 3:
+                value = 0 # [i] set to default
+            
+            self._SETTINGS['autoUpdateLevel'] = value
+        '''
+        
+        @property
+        def small_fonts(self) -> bool:
+            return self._SETTINGS['smallFonts']
+        
+        @small_fonts.setter
+        def small_fonts(self, value: bool):
+            """
+            # small_fonts
+            
+            **Key name:** `smallFonts`
+
+            0. **Disabled**, which allows for the best UI experience
+            1. **Enabled**, which allows for DoomMapGuesser to be played in smaller monitors
+            """
+            
+            self._SETTINGS['smallFonts'] = value
+            
+        @property
+        def exclude_rule_for_e3m1_e3m9(self, **kw) -> str | None:
+            """
+            # exclude_rule_for_e3m1_e3m9
+            
+            Whether to use **Hell Keep** or **Warrens** or both, even!
+            
+            :param obj: the object to save - if not specified, will save itself
+            :param object: same as above but this one does not take priority
+            
+            Returns:
+                str: either 'warrens', 'hellkeep' or 'both' depending on what the user chose *(None if set to show none)*
+            """
+            
+            __obj = kw.get('obj', None)
+            
+            if __obj is None:
+                __obj = kw.get('object', None)
+            
+            a: str | None = self._SETTINGS['excludeRule']
+            
+            if a not in ('warrens', 'hell_keep', 'both'):
+                self._SETTINGS['excludeRule'] = None
+                
+            if __obj is None:
+                self.save_settings()
+                
+            else:
+                self.dump_settings(__obj)
+
+            return self._SETTINGS['excludeRule']
+
+        @exclude_rule_for_e3m1_e3m9.setter
+        def exclude_rule_for_e3m1_e3m9(self, value: str | None):
+            if value not in ('warrens', 'hell_keep', 'both'):
+                value = None
+
+            self._SETTINGS['excludeRule'] = value
+
     def __init__(self, given_path: str, *_, handler: Any, initial_settings: dict[str, int | bool | str | float | list[list[str, str, str]]] | None = None, **kw) -> None:
         """
         # SettingsObject
@@ -482,7 +689,7 @@ def exclude_rule_for_e3m1_e3m9(self, **kw) -> str | None:
         :param object: same as above but this one does not take priority
         
         Returns:
-            str: either 'warrens', 'hellkeep' or 'both' depending on what the user chose *(None if set to show none)*
+            str: either 'warrens', 'hell_keep' or 'both' depending on what the user chose *(None if set to show none)*
         """
 
         __obj = kw.get('obj', None)
@@ -512,7 +719,7 @@ def exclude_rule_for_e3m1_e3m9(self, value: str | None):
 
     @property
     def copy(self):
-        return __SettingsObjectCopy(self)
+        return self.__SettingsObjectCopy(self)
 
     def __getitem__(self, key: str) -> int | bool | str | float | list[str] | None:        
         if self._BE_STRICT:

core/utils_constants.py

@@ -2,6 +2,9 @@
 
 
 DEFAULT_DB_URL = "https://raw.githubusercontent.com/MF366-Coding/DoomMapGuesser/main/.github/ss_db.json"
+REPO_URL = 'https://github.com/MF366-Coding/DoomMapGuesser'
+LATEST_URL = 'https://github.com/MF366-Coding/DoomMapGuesser/releases/latest'
+LATEST_JSON_URL = "https://api.github.com/repos/MF366-Coding/DoomMapGuesser/releases/latest"
 VERSION = 'v2.0.0'
 
 def nullish_operator(value: Any, new_value: Any) -> Any: