libervia-backend: sat/core/constants.py comparison

core (config): if flatpak is detected, config is also looked after in /app

comparison

equal deleted inserted replaced

-:17c61d09a85b
+:121c4a2a567c
 "/data/data/org.salutatoi.cagou/files/app/android/"
 + APP_NAME_FILE
 + ".conf"
 ]
 else:
+import os
+CONFIG_PATHS = (
+["/etc/", "~/", "~/.", "", "."]
++ [
+"%s/" % path
+for path in list(BaseDirectory.load_config_paths(APP_NAME_FILE))
+]
+)
+if os.getenv('FLATPAK_ID'):
+# for Flatpak, the conf can't be set in /etc or $HOME, so we have
+# to add /app
+CONFIG_PATHS.append('/app')
 ## Configuration ##
 DEFAULT_CONFIG = {
 "media_dir": "/usr/share/" + APP_NAME_FILE + "/media",
 "local_dir": BaseDirectory.save_data_path(APP_NAME_FILE),
 }
 # List of the configuration filenames sorted by ascending priority
 CONFIG_FILES = [
 realpath(expanduser(path) + APP_NAME_FILE + ".conf")
-for path in ["/etc/", "~/", "~/.", "", "."]
+for path in CONFIG_PATHS
-+ [
-"%s/" % path
-for path in list(BaseDirectory.load_config_paths(APP_NAME_FILE))
-]
 ]
 ## Templates ##
 TEMPLATE_TPL_DIR = u"templates"
 TEMPLATE_THEME_DEFAULT = u"default"

Mercurial > libervia-backend