mirror of
https://github.com/GradienceTeam/Gradience.git
synced 2024-07-07 19:47:49 +00:00
feat: add f.close() in _download_preset
* convert more print() functions to buglog's * remove __repl__ in preset.py
This commit is contained in:
parent
f0aec83c21
commit
78000c73ab
|
@ -18,14 +18,12 @@
|
|||
|
||||
import os
|
||||
import json
|
||||
import asyncio
|
||||
import aiohttp
|
||||
|
||||
from .utils import to_slug_case, buglog
|
||||
|
||||
|
||||
import aiohttp
|
||||
import asyncio
|
||||
|
||||
|
||||
PRESET_DIR = os.path.join(
|
||||
os.environ.get("XDG_CONFIG_HOME", os.environ["HOME"] + "/.config"),
|
||||
"presets",
|
||||
|
@ -64,9 +62,6 @@ async def main(repo):
|
|||
return preset_dict, url_list
|
||||
|
||||
|
||||
# TODO: Modify functions to be asynchronous
|
||||
|
||||
|
||||
def fetch_presets(repo) -> [dict, list]:
|
||||
return asyncio.run(main(repo))
|
||||
|
||||
|
@ -86,14 +81,6 @@ async def _download_preset(name, repo_name, url) -> None:
|
|||
|
||||
data = json.dumps(raw)
|
||||
|
||||
print(
|
||||
os.path.join(
|
||||
PRESET_DIR,
|
||||
repo_name,
|
||||
to_slug_case(name) + ".json",
|
||||
)
|
||||
)
|
||||
|
||||
try:
|
||||
with open(
|
||||
os.path.join(
|
||||
|
@ -105,6 +92,7 @@ async def _download_preset(name, repo_name, url) -> None:
|
|||
encoding="utf-8",
|
||||
) as f:
|
||||
f.write(data)
|
||||
f.close()
|
||||
except OSError as error:
|
||||
buglog(f"Failed to write data to a file. Exc: {error}")
|
||||
|
||||
|
|
|
@ -101,7 +101,7 @@ def global_save_keyfile(toast_overlay, settings, global_keyfile, filename, gtk_v
|
|||
|
||||
def create_gtk_user_override(toast_overlay, settings, gtk_ver):
|
||||
override_dir = GLib.build_filenamev([get_user_flatpak_path(), "overrides"])
|
||||
print(f"override_dir: {override_dir}")
|
||||
buglog(f"override_dir: {override_dir}")
|
||||
|
||||
filename = GLib.build_filenamev([override_dir, "global"])
|
||||
|
||||
|
@ -178,7 +178,7 @@ def create_gtk_user_override(toast_overlay, settings, gtk_ver):
|
|||
|
||||
def remove_gtk_user_override(toast_overlay, settings, gtk_ver):
|
||||
override_dir = GLib.build_filenamev([get_user_flatpak_path(), "overrides"])
|
||||
print(f"override_dir: {override_dir}")
|
||||
buglog(f"override_dir: {override_dir}")
|
||||
|
||||
filename = GLib.build_filenamev([override_dir, "global"])
|
||||
|
||||
|
@ -243,7 +243,7 @@ def remove_gtk_user_override(toast_overlay, settings, gtk_ver):
|
|||
def create_gtk_global_override(toast_overlay, settings, gtk_ver):
|
||||
override_dir = GLib.build_filenamev(
|
||||
[get_system_flatpak_path(), "overrides"])
|
||||
print(f"override_dir: {override_dir}")
|
||||
buglog(f"override_dir: {override_dir}")
|
||||
|
||||
filename = GLib.build_filenamev([override_dir, "global"])
|
||||
|
||||
|
@ -323,7 +323,7 @@ def create_gtk_global_override(toast_overlay, settings, gtk_ver):
|
|||
def remove_gtk_global_override(toast_overlay, settings, gtk_ver):
|
||||
override_dir = GLib.build_filenamev(
|
||||
[get_system_flatpak_path(), "overrides"])
|
||||
print(f"override_dir: {override_dir}")
|
||||
buglog(f"override_dir: {override_dir}")
|
||||
|
||||
filename = GLib.build_filenamev([override_dir, "global"])
|
||||
|
||||
|
|
|
@ -40,9 +40,6 @@ class Preset:
|
|||
self.preset_path = preset_path
|
||||
self.load_preset()
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"Preset <{self.name}> with {self.variables}\n {self.palette}\n {self.custom_css}"
|
||||
|
||||
def load_preset(self, text=None, preset=None):
|
||||
try:
|
||||
if not preset:
|
||||
|
@ -118,5 +115,5 @@ class Preset:
|
|||
|
||||
if __name__ == "__main__":
|
||||
p = Preset("test", "user")
|
||||
print(p.variables)
|
||||
print(p.palette)
|
||||
buglog(p.variables)
|
||||
buglog(p.palette)
|
||||
|
|
Loading…
Reference in a new issue