Commit: f0284c1983f573ee49452abdb912b8e684987953 - textmate (git)

TextMate is a graphical text editor for OS X 10.7+

Commit MetaInfo

• Revision: f0284c1983f573ee49452abdb912b8e684987953 (tree)
• Time: 2012-08-24 05:36:22
• Author: Allan Odgaard <git@abet...>
• Commiter: Allan Odgaard

Log Message

Add code to save Global.tmProperties

Instead of storing things in user defaults we will store them in ~/Library/Application Support/TextMate/Global.tmProperties.

This just makes things a lot easier than having to mix NSUserDefaults with our .tm_properties files, especially since changing a setting in the UI should sometimes be global, sometimes be for the current file’s type, and sometimes just for the current document (e.g. spelling language).

These features are already available with the .tm_properties.

Change Summary

• modified: Frameworks/settings/src/settings.cc
• modified: Frameworks/settings/src/settings.h

Incremental Difference

--- a/Frameworks/settings/src/settings.cc
+++ b/Frameworks/settings/src/settings.cc
@@ -7,6 +7,7 @@
 #include <oak/oak.h>
 #include <regexp/format_string.h>
 #include <regexp/glob.h>
+#include <text/tokenize.h>
 #include <oak/debug.h>
 #include <io/io.h>
 
@@ -14,6 +15,12 @@ OAK_DEBUG_VAR(Settings);
 
 namespace
 {
+	static std::string global_settings_path ()
+	{
+		static std::string const res = path::join(path::home(), "Library/Application Support/TextMate/Global.tmProperties");
+		return res;
+	}
+
 	static std::vector< std::pair<std::string, std::string> > global_variables ()
 	{
 		std::vector< std::pair<std::string, std::string> > res;
@@ -64,6 +71,7 @@ namespace
 				break;
 		}
 		res.push_back(oak::application_t::path("Contents/Resources/Default.tmProperties"));
+		res.push_back(global_settings_path());
 		std::reverse(res.begin(), res.end());
 		return res;
 	}
@@ -189,3 +197,64 @@ std::map<std::string, std::string> variables_for_path (std::string const& path,
 
 	return variables;
 }
+
+// ===================
+// = Saving Settings =
+// ===================
+
+void settings_t::set (std::string const& key, std::string const& value, std::string const& fileType, std::string const& path)
+{
+	ini_file_t iniFile(global_settings_path());
+	std::string content = path::content(global_settings_path());
+	if(content != NULL_STR)
+		parse_ini(content.data(), content.data() + content.size(), iniFile);
+
+	std::map<std::string, std::map<std::string, std::string>> sections;
+	iterate(section, iniFile.sections)
+	{
+		std::vector<std::string> names = section->names.empty() ? std::vector<std::string>(1, "") : section->names;
+		iterate(name, names)
+		{
+			iterate(pair, section->values)
+				sections[*name].insert(std::make_pair(pair->name, pair->value));
+		}
+	}
+
+	std::vector<std::string> sectionNames(1, "");
+	if(fileType != NULL_STR)
+	{
+		std::string sectionName = "";
+		citerate(it, text::tokenize(fileType.begin(), fileType.end(), '.'))
+		{
+			sectionName.append(*it);
+			sectionNames.push_back(sectionName);
+			sectionName.append(".");
+		}
+	}
+
+	if(path != NULL_STR)
+		sectionNames.push_back(path);
+
+	iterate(sectionName, sectionNames)
+	{
+		if(value != NULL_STR)
+				sections[*sectionName][key] = value;
+		else	sections[*sectionName].erase(key);
+	}
+
+	if(FILE* fp = fopen(global_settings_path().c_str(), "w"))
+	{
+		iterate(section, sections)
+		{
+			if(section->second.empty())
+				continue;
+
+			if(!section->first.empty())
+				fprintf(fp, "[ %s ]\n", section->first.c_str());
+
+			iterate(pair, section->second)
+				fprintf(fp, "%s = '%s'\n", pair->first.c_str(), pair->second.c_str());
+		}
+		fclose(fp);
+	}
+}

--- a/Frameworks/settings/src/settings.h
+++ b/Frameworks/settings/src/settings.h
@@ -29,8 +29,13 @@ struct PUBLIC settings_t
 		return get<std::string>(key, defaultValue);
 	}
 
+	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); }
+	static void set (std::string const& key, int32_t number, std::string const& fileType = NULL_STR, std::string const& path = NULL_STR) { settings_t::set(key, text::format("%d", number),           fileType, path); }
+	static void set (std::string const& key, bool flag, std::string const& fileType = NULL_STR, std::string const& path = NULL_STR)      { settings_t::set(key, std::string(flag ? "true" : "false"), fileType, path); }
+
 private:
-	friend settings_t settings_for_path (std::string const& documentPath, std::map<std::string, std::string> const& variables);
 	std::map<std::string, std::string> settings;
 
 	static bool convert (std::string const& value, bool)                             { return value != "0" && value != "false" ? true : false; }