diff --git a/src/modules/custom_presets.py b/src/modules/custom_presets.py index 31484ac2..50d69ede 100644 --- a/src/modules/custom_presets.py +++ b/src/modules/custom_presets.py @@ -27,10 +27,12 @@ from .utils import to_slug_case, buglog poolmgr = urllib3.PoolManager() # TODO: Modify functions to be asynchronous + + def fetch_presets(repo) -> [dict, list]: try: http = poolmgr.request("GET", repo) - except urllib3.exceptions.NewConnectionError as e: # offline + except urllib3.exceptions.NewConnectionError as e: # offline buglog(f"Failed to establish a new connection. Exc: {e}") return False, False except urllib3.exceptions.MaxRetryError as e: @@ -39,7 +41,7 @@ def fetch_presets(repo) -> [dict, list]: except urllib3.exceptions.HTTPError as e: buglog(f"Unhandled urllib3.exceptions.HTTPError error code. Exc: {e}") return False, False - + try: raw = json.loads(http.data) except json.JSONDecodeError as e: @@ -64,10 +66,11 @@ def fetch_presets(repo) -> [dict, list]: return preset_dict, url_list + def download_preset(name, repo_name, url) -> None: try: http = poolmgr.request("GET", url) - except urllib3.exceptions.NewConnectionError as e: # offline + except urllib3.exceptions.NewConnectionError as e: # offline buglog(f"Failed to establish a new connection. Exc: {e}") return False, False except urllib3.exceptions.MaxRetryError as e: @@ -89,7 +92,7 @@ def download_preset(name, repo_name, url) -> None: with open( os.path.join( os.environ.get("XDG_CONFIG_HOME", - os.environ["HOME"] + "/.config"), + os.environ["HOME"] + "/.config"), "presets", repo_name, to_slug_case(name) + ".json", diff --git a/src/modules/utils.py b/src/modules/utils.py index 459023ff..42b30546 100644 --- a/src/modules/utils.py +++ b/src/modules/utils.py @@ -24,14 +24,19 @@ from gradience.constants import build_type if build_type == "debug": - logging.basicConfig(level=logging.DEBUG, format="[%(levelname)s] [%(name)s] %(message)s") + logging.basicConfig( + level=logging.DEBUG, format="[%(levelname)s] [%(name)s] %(message)s" + ) else: - logging.basicConfig(level=logging.WARNING, format="[%(levelname)s] [%(name)s] %(message)s") + logging.basicConfig( + level=logging.WARNING, format="[%(levelname)s] [%(name)s] %(message)s" + ) def to_slug_case(non_slug): return re.sub(r"[^0-9a-z]+", "-", anyascii(non_slug).lower()).strip("-") + # Use it instead of print(), so there isn't any output in stdout if # Gradience is build in release mode def buglog(*args): diff --git a/src/presets_manager_window.py b/src/presets_manager_window.py index 85d18625..272a80ed 100644 --- a/src/presets_manager_window.py +++ b/src/presets_manager_window.py @@ -66,7 +66,6 @@ class GradiencePresetWindow(Adw.Window): search_results_list = [] - def __init__(self, parent, **kwargs): super().__init__(**kwargs) @@ -88,7 +87,6 @@ class GradiencePresetWindow(Adw.Window): self.setup_user_presets() self.setup_explore() - def setup(self): self.import_file_chooser.set_transient_for(self) self.import_file_chooser.set_action(Gtk.FileChooserAction.OPEN) @@ -123,7 +121,7 @@ class GradiencePresetWindow(Adw.Window): def setup_explore(self): self.search_results_list.clear() buglog("Preset list cleared") - + offline = False for repo_name, repo in self._repos.items(): @@ -172,7 +170,7 @@ class GradiencePresetWindow(Adw.Window): body_use_markup=True, ) - #TODO: Fix "assertion 'adw_message_dialog_has_response (self, response)' failed" error \ + # TODO: Fix "assertion 'adw_message_dialog_has_response (self, response)' failed" error \ # (don't know if this isn't a bug in libadwaita itself) dialog.add_response("cancel", _("Cancel")) dialog.add_response("add", _("Add")) @@ -193,7 +191,8 @@ class GradiencePresetWindow(Adw.Window): name_entry.connect("changed", on_name_entry_change) - url_entry = Gtk.Entry(placeholder_text="https://website.com/raw/presets.json") + url_entry = Gtk.Entry( + placeholder_text="https://website.com/raw/presets.json") def on_url_entry_change(*_args): if len(url_entry.get_text()) == 0: @@ -405,4 +404,4 @@ class GradiencePresetWindow(Adw.Window): self.repos.add(self.repos_list) - self._repos = {**self.user_repositories, **self.official_repositories} \ No newline at end of file + self._repos = {**self.user_repositories, **self.official_repositories}