Commit 5962b339 authored by Giorgos Korfiatis's avatar Giorgos Korfiatis
Browse files

Read default settings from resources/defaults.conf

parent c70f1e10
...@@ -41,6 +41,7 @@ a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', ' ...@@ -41,6 +41,7 @@ a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', '
a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'nwgui')) a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'nwgui'))
a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'ui_data')) a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'ui_data'))
a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'cacert.pem')) a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'cacert.pem'))
a.datas += extra_datas(os.path.join(HERE, 'agkyra'), os.path.join('resources', 'defaults.conf'))
pyz = PYZ(a.pure) pyz = PYZ(a.pure)
exe = EXE(pyz, exe = EXE(pyz,
......
...@@ -28,6 +28,8 @@ The operations of a sync are similar to the operations of a cloud, as they are ...@@ -28,6 +28,8 @@ The operations of a sync are similar to the operations of a cloud, as they are
implemented in kamaki.cli.config implemented in kamaki.cli.config
""" """
import os import os
import sys
import imp
import stat import stat
from re import match from re import match
from ConfigParser import Error from ConfigParser import Error
...@@ -57,30 +59,24 @@ config.CONFIG_PATH = CONFIG_PATH ...@@ -57,30 +59,24 @@ config.CONFIG_PATH = CONFIG_PATH
config.CONFIG_ENV = '' config.CONFIG_ENV = ''
SYNC_PREFIX = 'sync' SYNC_PREFIX = 'sync'
if getattr(sys, 'frozen', False):
# we are running in a |PyInstaller| bundle
BASEDIR = sys._MEIPASS
else:
# we are running in a normal Python environment
BASEDIR = os.path.dirname(os.path.realpath(__file__))
RESOURCES = os.path.join(BASEDIR, 'resources')
defaults_file = os.path.join(RESOURCES, 'defaults.conf')
imp.load_source('default_settings', defaults_file)
from default_settings import DEFAULT_GLOBAL, DEFAULT_CLOUDS, DEFAULT_SYNCS
DEFAULT_GLOBAL['agkyra_dir'] = AGKYRA_DIR
config.DEFAULTS = { config.DEFAULTS = {
'global': { 'global': DEFAULT_GLOBAL,
'agkyra_dir': AGKYRA_DIR, CLOUD_PREFIX: DEFAULT_CLOUDS,
'sync_on_start': 'on', SYNC_PREFIX: DEFAULT_SYNCS,
'language': 'en'
},
CLOUD_PREFIX: {
# <cloud>: {
# 'url': '',
# 'token': '',
# 'ignore_ssl': True or False overwrites ca_certs,
# 'ca_certs': /path/to/ca/certificate/buddle
# whatever else may be useful in this context
# },
# ... more clouds
},
SYNC_PREFIX: {
# <sync>: {
# 'cloud': '',
# 'container': '',
# 'directory': ''
# },
# ... more syncs
},
} }
......
DEFAULT_GLOBAL = {
"sync_on_start": "on",
"language": "en"
}
DEFAULT_CLOUDS = {
# <cloud>: {
# "url": "",
# "token": "",
# "ignore_ssl": True or False overwrites ca_certs,
# "ca_certs": /path/to/ca/certificate/buddle
# whatever else may be useful in this context
# },
# ... more clouds
}
DEFAULT_SYNCS = {
# <sync>: {
# "cloud": "",
# "container": "",
# "directory": ""
# },
# ... more syncs
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment