0xmrtt/Gradience
1
0
Fork 0
mirror of https://github.com/GradienceTeam/Gradience.git synced 2024-06-29 07:59:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Typo with jsdelivr being jsdeliver

Browse source
This commit is contained in:
David Lapshin 2023-06-27 15:57:30 +03:00
parent 07b8c5f910
commit 488ad80e00
Signed by untrusted user: daudix
GPG key ID: 93ECF15D3053D81C
9 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/com.github.GradienceTeam.Gradience.gschema.xml.in
View file

@ -46,7 +46,7 @@
<key name="favourite" type="as">
<default>[]</default>
</key>
<key name="use-jsdeliver" type="b">
<key name="use-jsdelivr" type="b">
<default>false</default>
</key>
</schema>

8
data/ui/preferences_window.blp
View file

@ -53,14 +53,14 @@ template GradiencePreferencesWindow : Adw.PreferencesWindow {
}
}
Adw.PreferencesGroup jsdeliver_group {
Adw.PreferencesGroup jsdelivr_group {
title: _("Preset Fetching");
Adw.ActionRow jsdeliver_row {
Adw.ActionRow jsdelivr_row {
title: _("Use an alternative server for downloading presets");
subtitle: _("JSDelivr will be used instead of direct preset fetching from GitHub");
activatable-widget: jsdeliver_switch;
Gtk.Switch jsdeliver_switch {
activatable-widget: jsdelivr_switch;
Gtk.Switch jsdelivr_switch {
valign: center;
}
}

2
gradience/backend/globals.py
View file

@ -45,7 +45,7 @@ preset_repos_github = {
"Curated": "https://github.com/GradienceTeam/Community/raw/next/curated.json"
}
preset_repos_jsdeliver = {
preset_repos_jsdelivr = {
"Official": "https://cdn.jsdelivr.net/gh/GradienceTeam/Community@next/official.json",
"Curated": "https://cdn.jsdelivr.net/gh/GradienceTeam/Community@next/curated.json"
}

10
gradience/backend/preset_downloader.py
View file

@ -22,7 +22,7 @@ import json
from gi.repository import GLib, Soup
from gradience.backend.globals import presets_dir
from gradience.backend.utils.networking import github_to_jsdeliver_url
from gradience.backend.utils.networking import github_to_jsdelivr_url
from gradience.backend.utils.common import to_slug_case
from gradience.backend.logger import Logger
@ -31,8 +31,8 @@ logging = Logger()
class PresetDownloader:
def __init__(self, use_jsdeliver=False):
self.use_jsdeliver = use_jsdeliver
def __init__(self, use_jsdelivr=False):
self.use_jsdelivr = use_jsdelivr
# Open Soup3 session
self.session = Soup.Session()
@ -69,8 +69,8 @@ class PresetDownloader:
# Convert list back to dict
preset_dict.update(dict(zip(to_dict, to_dict)))
if self.use_jsdeliver:
url = github_to_jsdeliver_url(url)
if self.use_jsdelivr:
url = github_to_jsdelivr_url(url)
url_list.append(url)

16
gradience/backend/utils/networking.py
View file

@ -19,22 +19,22 @@
from urllib.parse import urlparse
def get_preset_repos(use_jsdeliver: bool) -> dict:
if use_jsdeliver:
from gradience.backend.globals import preset_repos_jsdeliver
preset_repos = preset_repos_jsdeliver
def get_preset_repos(use_jsdelivr: bool) -> dict:
if use_jsdelivr:
from gradience.backend.globals import preset_repos_jsdelivr
preset_repos = preset_repos_jsdelivr
else:
from gradience.backend.globals import preset_repos_github
preset_repos = preset_repos_github
return preset_repos
def github_to_jsdeliver_url(github_url: str) -> str:
def github_to_jsdelivr_url(github_url: str) -> str:
"""
Converts Github raw data URL link to JSDelivr CDN link.
"""
jsdeliver_url = None
jsdelivr_url = None
# https://github.com/GradienceTeam/Community/raw/next/official/builder.json =>
# https://cdn.jsdelivr.net/gh/GradienceTeam/Community@next/official/builder.json
@ -43,6 +43,6 @@ def github_to_jsdeliver_url(github_url: str) -> str:
path = urlparse(github_url).path
user, repo, _, branch, *path = path.strip('/').split('/')
path = "/".join(path)
jsdeliver_url = JSDELIVER_FORMAT.format(user=user, repo=repo, branch=branch, path=path)
jsdelivr_url = JSDELIVER_FORMAT.format(user=user, repo=repo, branch=branch, path=path)
return jsdeliver_url
return jsdelivr_url

4
gradience/frontend/cli/cli.in
View file

@ -136,7 +136,7 @@ class CLI:
overrides_group.add_argument("-e", "--enable-theming", choices=["gtk4", "gtk3", "both"], help="enable overrides for Flatpak theming")
overrides_group.add_argument("-d", "--disable-theming", choices=["gtk4", "gtk3", "both"], help="disable overrides for Flatpak theming")
self.preset_repos = get_preset_repos(self.settings.get_boolean("use-jsdeliver"))
self.preset_repos = get_preset_repos(self.settings.get_boolean("use-jsdelivr"))
self.__parse_args()
@ -335,7 +335,7 @@ class CLI:
repos_amount = len(self.preset_repos.items())
for repo_name, repo in self.preset_repos.items():
try:
explore_presets, urls = PresetDownloader(self.settings.get_boolean("use-jsdeliver")).fetch_presets(repo)
explore_presets, urls = PresetDownloader(self.settings.get_boolean("use-jsdelivr")).fetch_presets(repo)
except (GLib.GError, json.JSONDecodeError) as e:
logging.error("An error occurred while fetching presets from remote repository.", exc=e)
exit(1)

2
gradience/frontend/main.py
View file

@ -96,7 +96,7 @@ class GradienceApplication(Adw.Application):
self.style_manager = Adw.StyleManager.get_default()
self.use_jsdeliver = self.settings.get_boolean("use-jsdeliver")
self.use_jsdelivr = self.settings.get_boolean("use-jsdelivr")
def do_activate(self):
"""Called when the application is activated."""

24
gradience/frontend/views/preferences_window.py
View file

@ -44,7 +44,7 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow):
gtk3_user_theming_switch = Gtk.Template.Child()
gtk3_global_theming_switch = Gtk.Template.Child()
jsdeliver_switch = Gtk.Template.Child()
jsdelivr_switch = Gtk.Template.Child()
monet_engine_switch = Gtk.Template.Child()
gnome_shell_engine_switch = Gtk.Template.Child()
@ -66,17 +66,17 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow):
self.setup_flatpak_group()
self.setup_theme_engines_group()
self.setup_reset_preset_group()
self.setup_jsdeliver()
self.setup_jsdelivr()
def setup_reset_preset_group(self):
self.reset_preset_group = GradienceResetPresetGroup(self)
self.theming_page.add(self.reset_preset_group)
def setup_jsdeliver(self):
self.jsdeliver_switch.set_active(self.app.use_jsdeliver)
self.jsdeliver_switch.connect(
"notify::active", self.on_jsdeliver_switch_toggled
def setup_jsdelivr(self):
self.jsdelivr_switch.set_active(self.app.use_jsdelivr)
self.jsdelivr_switch.connect(
"notify::active", self.on_jsdelivr_switch_toggled
)
def setup_theme_engines_group(self):
@ -190,14 +190,14 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow):
f"enabled-theme-engines: {self.settings.get_value('enabled-theme-engines')}"
)
def on_jsdeliver_switch_toggled(self, widget, *args):
def on_jsdelivr_switch_toggled(self, widget, *args):
if widget.get_active():
self.app.use_jsdeliver = True
self.app.use_jsdelivr = True
else:
self.app.use_jsdeliver = False
self.app.use_jsdelivr = False
self.settings.set_boolean("use-jsdeliver", self.app.use_jsdeliver)
self.settings.set_boolean("use-jsdelivr", self.app.use_jsdelivr)
logging.debug(
f"use-jsdeliver: {self.settings.get_value('use-jsdeliver')}"
)
f"use-jsdelivr: {self.settings.get_value('use-jsdelivr')}"
)

4
gradience/frontend/views/presets_manager_window.py
View file

@ -84,7 +84,7 @@ class GradiencePresetWindow(Adw.Window):
self.user_repositories = self.settings.get_value("repos").unpack()
self.enabled_repos = self.settings.get_value("enabled-repos").unpack()
self.preset_repos = get_preset_repos(self.settings.get_boolean("use-jsdeliver"))
self.preset_repos = get_preset_repos(self.settings.get_boolean("use-jsdelivr"))
self.setup_signals()
self.setup()
@ -148,7 +148,7 @@ class GradiencePresetWindow(Adw.Window):
badge = "white"
try:
explore_presets, urls = PresetDownloader(self.settings.get_boolean("use-jsdeliver")).fetch_presets(repo)
explore_presets, urls = PresetDownloader(self.settings.get_boolean("use-jsdelivr")).fetch_presets(repo)
except GLib.GError as e:
if e.code == 1:
self.offline = True