napcok
/
manjaro-hello
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change way to handle urls

merge-requests/64/head
Hugo Posnic 2016-12-18 00:05:56 +01:00
parent 076d81303b
commit 45e1d47c1c
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/urls.json 100644
View File

@ -0,0 +1,12 @@
{
"build": "https://github.com/manjaro",
"chat": "https://kiwiirc.com/client/irc.freenode.net/?nick=manjaro-web|?#manjaro",
"donate": "https://manjaro.org/donate",
"facebook": "https://www.facebook.com/ManjaroLinux",
"forums": "https://forum.manjaro.org",
"google+": "https://plus.google.com/118244873957924966264",
"mailling": "https://lists.manjaro.org/cgi-bin/mailman/listinfo",
"reddit": "https://www.reddit.com/r/ManjaroLinux",
"twitter": "https://twitter.com/ManjaroLinux",
"wiki": "https://wiki.manjaro.org"
}

32
src/manjaro-hello.py
View File

@ -15,18 +15,6 @@ class ManjaroHello():
def __init__(self): def __init__(self):
# App vars # App vars
self.app = "manjaro-hello" self.app = "manjaro-hello"
self.urls = {
"wiki": "https://wiki.manjaro.org",
"forums": "https://forum.manjaro.org",
"chat": "https://kiwiirc.com/client/irc.freenode.net/?nick=manjaro-web|?#manjaro",
"mailling": "https://lists.manjaro.org/cgi-bin/mailman/listinfo",
"build": "https://github.com/manjaro",
"donate": "https://manjaro.org/donate",
"google+": "https://plus.google.com/118244873957924966264",
"facebook": "https://www.facebook.com/ManjaroLinux",
"twitter": "https://twitter.com/ManjaroLinux",
"reddit": "https://www.reddit.com/r/ManjaroLinux"
}
# Path vars # Path vars
self.current_folder = os.getcwd() + "/" self.current_folder = os.getcwd() + "/"
@ -43,6 +31,7 @@ class ManjaroHello():
self.config_path = os.path.expanduser("~") + "/.config/" self.config_path = os.path.expanduser("~") + "/.config/"
self.preferences_path = self.config_path + self.app + ".json" self.preferences_path = self.config_path + self.app + ".json"
self.urls_path = self.data_path + "urls.json"
self.autostart_path = self.config_path + "autostart/" + self.app + ".desktop" self.autostart_path = self.config_path + "autostart/" + self.app + ".desktop"
self.logo_path = "/usr/share/icons/manjaro.png" self.logo_path = "/usr/share/icons/manjaro.png"
@ -52,6 +41,9 @@ class ManjaroHello():
# Load system infos # Load system infos
self.infos = get_infos() self.infos = get_infos()
# Load data files
self.urls = read_json(self.urls_path)
# Init window # Init window
self.builder = Gtk.Builder() self.builder = Gtk.Builder()
self.builder.add_from_file(self.ui_path + "manjaro-hello.glade") self.builder.add_from_file(self.ui_path + "manjaro-hello.glade")
@ -183,14 +175,13 @@ class ManjaroHello():
def get_preferences(self): def get_preferences(self):
"""Read preferences from config file.""" """Read preferences from config file."""
try: preferences = read_json(self.preferences_path)
with open(self.preferences_path, "r") as f: if not preferences:
return json.load(f) preferences = {
except OSError as e:
return {
"autostart": os.path.isfile(self.autostart_path), "autostart": os.path.isfile(self.autostart_path),
"locale": None "locale": None
} }
return preferences
def read_page(self, name): def read_page(self, name):
"""Read page according to language. """Read page according to language.
@ -277,6 +268,13 @@ def get_lsb_infos():
print(e) print(e)
return lsb return lsb
def read_json(path):
try:
with open(path, "r") as f:
return json.load(f)
except OSError as e:
return None
if __name__ == "__main__": if __name__ == "__main__":
ManjaroHello() ManjaroHello()
Gtk.main() Gtk.main()