mirror of
https://github.com/GradienceTeam/Gradience.git
synced 2024-07-01 08:59:57 +00:00
fix: Typo with jsdelivr being jsdeliver
This commit is contained in:
parent
07b8c5f910
commit
488ad80e00
|
@ -46,7 +46,7 @@
|
||||||
<key name="favourite" type="as">
|
<key name="favourite" type="as">
|
||||||
<default>[]</default>
|
<default>[]</default>
|
||||||
</key>
|
</key>
|
||||||
<key name="use-jsdeliver" type="b">
|
<key name="use-jsdelivr" type="b">
|
||||||
<default>false</default>
|
<default>false</default>
|
||||||
</key>
|
</key>
|
||||||
</schema>
|
</schema>
|
||||||
|
|
|
@ -53,14 +53,14 @@ template GradiencePreferencesWindow : Adw.PreferencesWindow {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Adw.PreferencesGroup jsdeliver_group {
|
Adw.PreferencesGroup jsdelivr_group {
|
||||||
|
|
||||||
title: _("Preset Fetching");
|
title: _("Preset Fetching");
|
||||||
Adw.ActionRow jsdeliver_row {
|
Adw.ActionRow jsdelivr_row {
|
||||||
title: _("Use an alternative server for downloading presets");
|
title: _("Use an alternative server for downloading presets");
|
||||||
subtitle: _("JSDelivr will be used instead of direct preset fetching from GitHub");
|
subtitle: _("JSDelivr will be used instead of direct preset fetching from GitHub");
|
||||||
activatable-widget: jsdeliver_switch;
|
activatable-widget: jsdelivr_switch;
|
||||||
Gtk.Switch jsdeliver_switch {
|
Gtk.Switch jsdelivr_switch {
|
||||||
valign: center;
|
valign: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,7 @@ preset_repos_github = {
|
||||||
"Curated": "https://github.com/GradienceTeam/Community/raw/next/curated.json"
|
"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",
|
"Official": "https://cdn.jsdelivr.net/gh/GradienceTeam/Community@next/official.json",
|
||||||
"Curated": "https://cdn.jsdelivr.net/gh/GradienceTeam/Community@next/curated.json"
|
"Curated": "https://cdn.jsdelivr.net/gh/GradienceTeam/Community@next/curated.json"
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ import json
|
||||||
from gi.repository import GLib, Soup
|
from gi.repository import GLib, Soup
|
||||||
|
|
||||||
from gradience.backend.globals import presets_dir
|
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.utils.common import to_slug_case
|
||||||
|
|
||||||
from gradience.backend.logger import Logger
|
from gradience.backend.logger import Logger
|
||||||
|
@ -31,8 +31,8 @@ logging = Logger()
|
||||||
|
|
||||||
|
|
||||||
class PresetDownloader:
|
class PresetDownloader:
|
||||||
def __init__(self, use_jsdeliver=False):
|
def __init__(self, use_jsdelivr=False):
|
||||||
self.use_jsdeliver = use_jsdeliver
|
self.use_jsdelivr = use_jsdelivr
|
||||||
# Open Soup3 session
|
# Open Soup3 session
|
||||||
self.session = Soup.Session()
|
self.session = Soup.Session()
|
||||||
|
|
||||||
|
@ -69,8 +69,8 @@ class PresetDownloader:
|
||||||
# Convert list back to dict
|
# Convert list back to dict
|
||||||
preset_dict.update(dict(zip(to_dict, to_dict)))
|
preset_dict.update(dict(zip(to_dict, to_dict)))
|
||||||
|
|
||||||
if self.use_jsdeliver:
|
if self.use_jsdelivr:
|
||||||
url = github_to_jsdeliver_url(url)
|
url = github_to_jsdelivr_url(url)
|
||||||
|
|
||||||
url_list.append(url)
|
url_list.append(url)
|
||||||
|
|
||||||
|
|
|
@ -19,22 +19,22 @@
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
|
|
||||||
def get_preset_repos(use_jsdeliver: bool) -> dict:
|
def get_preset_repos(use_jsdelivr: bool) -> dict:
|
||||||
if use_jsdeliver:
|
if use_jsdelivr:
|
||||||
from gradience.backend.globals import preset_repos_jsdeliver
|
from gradience.backend.globals import preset_repos_jsdelivr
|
||||||
preset_repos = preset_repos_jsdeliver
|
preset_repos = preset_repos_jsdelivr
|
||||||
else:
|
else:
|
||||||
from gradience.backend.globals import preset_repos_github
|
from gradience.backend.globals import preset_repos_github
|
||||||
preset_repos = preset_repos_github
|
preset_repos = preset_repos_github
|
||||||
|
|
||||||
return preset_repos
|
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.
|
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://github.com/GradienceTeam/Community/raw/next/official/builder.json =>
|
||||||
# https://cdn.jsdelivr.net/gh/GradienceTeam/Community@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
|
path = urlparse(github_url).path
|
||||||
user, repo, _, branch, *path = path.strip('/').split('/')
|
user, repo, _, branch, *path = path.strip('/').split('/')
|
||||||
path = "/".join(path)
|
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
|
||||||
|
|
|
@ -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("-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")
|
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()
|
self.__parse_args()
|
||||||
|
|
||||||
|
@ -335,7 +335,7 @@ class CLI:
|
||||||
repos_amount = len(self.preset_repos.items())
|
repos_amount = len(self.preset_repos.items())
|
||||||
for repo_name, repo in self.preset_repos.items():
|
for repo_name, repo in self.preset_repos.items():
|
||||||
try:
|
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:
|
except (GLib.GError, json.JSONDecodeError) as e:
|
||||||
logging.error("An error occurred while fetching presets from remote repository.", exc=e)
|
logging.error("An error occurred while fetching presets from remote repository.", exc=e)
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
|
@ -96,7 +96,7 @@ class GradienceApplication(Adw.Application):
|
||||||
|
|
||||||
self.style_manager = Adw.StyleManager.get_default()
|
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):
|
def do_activate(self):
|
||||||
"""Called when the application is activated."""
|
"""Called when the application is activated."""
|
||||||
|
|
|
@ -44,7 +44,7 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow):
|
||||||
gtk3_user_theming_switch = Gtk.Template.Child()
|
gtk3_user_theming_switch = Gtk.Template.Child()
|
||||||
gtk3_global_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()
|
monet_engine_switch = Gtk.Template.Child()
|
||||||
gnome_shell_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_flatpak_group()
|
||||||
self.setup_theme_engines_group()
|
self.setup_theme_engines_group()
|
||||||
self.setup_reset_preset_group()
|
self.setup_reset_preset_group()
|
||||||
self.setup_jsdeliver()
|
self.setup_jsdelivr()
|
||||||
|
|
||||||
def setup_reset_preset_group(self):
|
def setup_reset_preset_group(self):
|
||||||
self.reset_preset_group = GradienceResetPresetGroup(self)
|
self.reset_preset_group = GradienceResetPresetGroup(self)
|
||||||
|
|
||||||
self.theming_page.add(self.reset_preset_group)
|
self.theming_page.add(self.reset_preset_group)
|
||||||
|
|
||||||
def setup_jsdeliver(self):
|
def setup_jsdelivr(self):
|
||||||
self.jsdeliver_switch.set_active(self.app.use_jsdeliver)
|
self.jsdelivr_switch.set_active(self.app.use_jsdelivr)
|
||||||
self.jsdeliver_switch.connect(
|
self.jsdelivr_switch.connect(
|
||||||
"notify::active", self.on_jsdeliver_switch_toggled
|
"notify::active", self.on_jsdelivr_switch_toggled
|
||||||
)
|
)
|
||||||
|
|
||||||
def setup_theme_engines_group(self):
|
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')}"
|
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():
|
if widget.get_active():
|
||||||
self.app.use_jsdeliver = True
|
self.app.use_jsdelivr = True
|
||||||
else:
|
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(
|
logging.debug(
|
||||||
f"use-jsdeliver: {self.settings.get_value('use-jsdeliver')}"
|
f"use-jsdelivr: {self.settings.get_value('use-jsdelivr')}"
|
||||||
)
|
)
|
||||||
|
|
|
@ -84,7 +84,7 @@ class GradiencePresetWindow(Adw.Window):
|
||||||
self.user_repositories = self.settings.get_value("repos").unpack()
|
self.user_repositories = self.settings.get_value("repos").unpack()
|
||||||
self.enabled_repos = self.settings.get_value("enabled-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_signals()
|
||||||
self.setup()
|
self.setup()
|
||||||
|
@ -148,7 +148,7 @@ class GradiencePresetWindow(Adw.Window):
|
||||||
badge = "white"
|
badge = "white"
|
||||||
|
|
||||||
try:
|
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:
|
except GLib.GError as e:
|
||||||
if e.code == 1:
|
if e.code == 1:
|
||||||
self.offline = True
|
self.offline = True
|
||||||
|
|
Loading…
Reference in a new issue