nicole/cellar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Bottle::load_config now checks ~/.local/share/cellar.json and compiled defaults

Browse Source
This commit is contained in:
Nicholas O'Connor 2017-07-05 14:35:41 -07:00
parent 96ccab40f7
commit e2400b2908
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/config/save_load.cpp
View File

@ -19,6 +19,7 @@ namespace fs = boost::filesystem;
using json = nlohmann::json; using json = nlohmann::json;
json cellar::global_config; json cellar::global_config;
json cellar::compiled_config;
bool Bottle::load_config() { bool Bottle::load_config() {
bool globalconfig = false; bool globalconfig = false;
@ -49,6 +50,9 @@ bool Bottle::load_config() {
} }
sstr_globalpath << "/cellar.json"; sstr_globalpath << "/cellar.json";
// see src/config/defaults.cpp.cog
compiled_config = cellar::config::get_default_config();
string globaljsonpath = sstr_globalpath.str(); string globaljsonpath = sstr_globalpath.str();
if (fs::exists(globaljsonpath)) { if (fs::exists(globaljsonpath)) {
ifstream configstream(globaljsonpath); ifstream configstream(globaljsonpath);
@ -89,6 +93,10 @@ bool Bottle::save_config() {
string Bottle::get_config(string key) { string Bottle::get_config(string key) {
if (this->config.find(key) != this->config.end()) { if (this->config.find(key) != this->config.end()) {
return this->config[key]; return this->config[key];
} else if (cellar::global_config.find(key) != cellar::global_config.end()) {
return cellar::global_config[key];
} else if (cellar::compiled_config.find(key) != cellar::compiled_config.end()) {
return cellar::compiled_config[key];
} else { } else {
return ""; return "";
} }