github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid storing ‘false’ (as value) in bundle items

Browse Source 
Since we treat a missing key as having the value ‘false’ there is no need to write out keys set to false. This was partly motivated by improving cached data since here we store non-strings as binary property lists, and boolean values are non-strings (not that we have that many keys set to false, but it would e.g. happen if user disable an item and later enable it).
This commit is contained in:
Allan Odgaard
2014-02-19 20:48:13 +07:00
parent be2eff9825
commit 1f74cef1bd
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Frameworks/bundles/src/item.cc
View File

@@ -301,6 +301,17 @@ namespace bundles
return match;
}
plist::dictionary_t erase_false_values (plist::dictionary_t const& plist)
{
plist::dictionary_t res;
for(auto const& pair : plist)
{
if(!boost::get<bool>(&pair.second) || boost::get<bool>(pair.second))
res.insert(res.end(), pair);
}
return res;
}
bool item_t::save (bool useDeltaIfNonLocal)
{
static struct path_format_t { kind_t type; char const* format; } const PathFormats[] =
@@ -352,15 +363,11 @@ namespace bundles
}
}
plist::dictionary_t newPlist = plist();
plist::dictionary_t newPlist = erase_false_values(plist());
bool saveAsDelta = useDeltaIfNonLocal && (!_local && !_paths.empty() || _paths.size() > 1);
if(saveAsDelta)
{
plist::dictionary_t oldPlist = plist::load(_paths[_local ? 1 : 0]);
if(!hidden_from_user()) newPlist.erase(kFieldHideFromUser);
if(!disabled()) newPlist.erase(kFieldIsDisabled);
if(!deleted()) newPlist.erase(kFieldIsDeleted);
plist::dictionary_t oldPlist = erase_false_values(plist::load(_paths[_local ? 1 : 0]));
if(oldPlist == newPlist && _kind != kItemTypeBundle)
{
if(unlink(destPath.c_str()) == 0 || errno == ENOENT)