github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-22 05:07:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add settings_t::raw_get

Browse Source 
This allows getting a variable from the global domain without any variable interpolation (for settings that use $variables or \escapes).

This is required to provide a UI for editing preferences values (here we want to edit the unexpanded value, and the version in the global domain).
This commit is contained in:
Allan Odgaard
2012-08-25 00:31:51 +02:00
parent 32be6b4800
commit a134b213eb
2 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Frameworks/settings/src/settings.cc
View File

@@ -15,6 +15,12 @@ OAK_DEBUG_VAR(Settings);
namespace
{
static std::string default_settings_path ()
{
static std::string const res = oak::application_t::path("Contents/Resources/Default.tmProperties");
return res;
}
static std::string global_settings_path ()
{
static std::string const res = path::join(path::home(), "Library/Application Support/TextMate/Global.tmProperties");
@@ -71,7 +77,7 @@ namespace
break;
}
res.push_back(global_settings_path());
res.push_back(oak::application_t::path("Contents/Resources/Default.tmProperties"));
res.push_back(default_settings_path());
std::reverse(res.begin(), res.end());
return res;
}
@@ -198,14 +204,14 @@ std::map<std::string, std::string> variables_for_path (std::string const& path,
return variables;
}
// ===================
// = Saving Settings =
// ===================
// ===================================
// = Helper Funtions for raw get/set =
// ===================================
void settings_t::set (std::string const& key, std::string const& value, std::string const& fileType, std::string const& path)
static std::map<std::string, std::map<std::string, std::string>> read_file (std::string const& path)
{
ini_file_t iniFile(global_settings_path());
std::string content = path::content(global_settings_path());
ini_file_t iniFile(path);
std::string content = path::content(path);
if(content != NULL_STR)
parse_ini(content.data(), content.data() + content.size(), iniFile);
@@ -219,7 +225,32 @@ void settings_t::set (std::string const& key, std::string const& value, std::str
sections[*name].insert(std::make_pair(pair->name, pair->value));
}
}
return sections;
}
// ================================================
// = Get setting without expanding format strings =
// ================================================
std::string settings_t::raw_get (std::string const& key, std::string const& section)
{
auto globalSettings = read_file(global_settings_path())[section];
if(globalSettings.find(key) != globalSettings.end())
return globalSettings[key];
auto defaultSettings = read_file(default_settings_path())[section];
if(defaultSettings.find(key) != defaultSettings.end())
return defaultSettings[key];
return NULL_STR;
}
// ===================
// = Saving Settings =
// ===================
void settings_t::set (std::string const& key, std::string const& value, std::string const& fileType, std::string const& path)
{
std::vector<std::string> sectionNames(1, "");
if(fileType != NULL_STR)
{

2
Frameworks/settings/src/settings.h
View File

@@ -29,6 +29,8 @@ struct PUBLIC settings_t
return get<std::string>(key, defaultValue);
}
static std::string raw_get (std::string const& key, std::string const& section = "");
static void set (std::string const& key, std::string const& value, std::string const& fileType = NULL_STR, std::string const& path = NULL_STR);
static void set (std::string const& key, double decimal, std::string const& fileType = NULL_STR, std::string const& path = NULL_STR) { settings_t::set(key, text::format("%f", decimal), fileType, path); }
static void set (std::string const& key, size_t number, std::string const& fileType = NULL_STR, std::string const& path = NULL_STR) { settings_t::set(key, text::format("%zu", number), fileType, path); }