fix: antergos-welcome preferences loading and stable API usage
- data/preferences.json: fix paths for subdirectory layout
- src/antergos_welcome.py: fallback to data/preferences.json;
get_lsb_infos() uses .get("CODENAME", "unknown") to avoid KeyError;
remove stale "rescue" label
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"autostart_path": "~/.config/autostart/antergos-welcome.desktop",
|
"autostart_path": "~/.config/autostart/antergos-welcome.desktop",
|
||||||
"data_path": "/usr/share/antergos-next/antergos-welcome",
|
"data_path": "/usr/share/antergos-next/antergos-welcome/data",
|
||||||
"default_locale": "en",
|
"default_locale": "en",
|
||||||
"desktop_path": "/usr/share/applications/antergos-welcome.desktop",
|
"desktop_path": "/usr/share/applications/antergos-welcome.desktop",
|
||||||
"gnometour_path": "/usr/bin/gnome-tour",
|
"gnometour_path": "/usr/bin/gnome-tour",
|
||||||
@@ -11,8 +11,8 @@
|
|||||||
"plasmawelcome_path": "/usr/bin/plasma-welcome",
|
"plasmawelcome_path": "/usr/bin/plasma-welcome",
|
||||||
"rescue_path": "",
|
"rescue_path": "",
|
||||||
"save_path": "~/.config/antergos-welcome.json",
|
"save_path": "~/.config/antergos-welcome.json",
|
||||||
"style_path": "/usr/share/antergos-next/antergos-welcome/style.css",
|
"style_path": "/usr/share/antergos-next/antergos-welcome/ui/style.css",
|
||||||
"ui_path": "/usr/share/antergos-next/antergos-welcome/antergos-welcome.glade",
|
"ui_path": "/usr/share/antergos-next/antergos-welcome/ui/antergos-welcome.glade",
|
||||||
"urls": {
|
"urls": {
|
||||||
"development": "https://github.com/Antergos-NeXT",
|
"development": "https://github.com/Antergos-NeXT",
|
||||||
"donate": "",
|
"donate": "",
|
||||||
|
|||||||
@@ -146,8 +146,14 @@ class Hello(Gtk.Window):
|
|||||||
logging.debug(f"Using dev preferences: {self.preferences}")
|
logging.debug(f"Using dev preferences: {self.preferences}")
|
||||||
else:
|
else:
|
||||||
self.preferences = read_json(f"{_HELLO_PREF_FILE}")
|
self.preferences = read_json(f"{_HELLO_PREF_FILE}")
|
||||||
|
if not self.preferences:
|
||||||
|
self.preferences = read_json(f"{_HELLO_DATA_DIR}/data/preferences.json")
|
||||||
logging.debug(f"Using system preferences: {self.preferences}")
|
logging.debug(f"Using system preferences: {self.preferences}")
|
||||||
|
|
||||||
|
if not self.preferences:
|
||||||
|
logging.critical("Cannot find preferences.json — aborting")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
# Get saved infos
|
# Get saved infos
|
||||||
self.usr_prefs = read_json(self.preferences["save_path"])
|
self.usr_prefs = read_json(self.preferences["save_path"])
|
||||||
if not self.usr_prefs:
|
if not self.usr_prefs:
|
||||||
@@ -521,7 +527,7 @@ def get_lsb_infos():
|
|||||||
except (OSError, KeyError) as error:
|
except (OSError, KeyError) as error:
|
||||||
print(error)
|
print(error)
|
||||||
return 'not Antergos NeXT', '0.0'
|
return 'not Antergos NeXT', '0.0'
|
||||||
return lsb["CODENAME"], lsb["RELEASE"]
|
return lsb.get("CODENAME", "unknown"), lsb.get("RELEASE", "0.0")
|
||||||
|
|
||||||
def get_icon_image(icon_name, icon_size):
|
def get_icon_image(icon_name, icon_size):
|
||||||
icon_theme = Gtk.IconTheme.get_default()
|
icon_theme = Gtk.IconTheme.get_default()
|
||||||
|
|||||||
Reference in New Issue
Block a user