tag/Config: support incremental "metadata_to_use" setting

With a "+" or "-" prefix, the "metadata_to_use" setting can manipulate
the existing default.  This way, one can enable `TAG_COMMENT` without
having to list all the other tags.

1 files changed, 21 insertions, 4 deletions

diff --git a/src/tag/Config.cxx b/src/tag/Config.cxx
index 94899df14..29967dde9 100644
--- a/src/tag/Config.cxx
+++ b/src/tag/Config.cxx
@@ -34,19 +34,36 @@ TagLoadConfig(const ConfigData &config)
 	if (value == nullptr)
 		return;
 
-	global_tag_mask = TagMask::None();
-
-	if (StringEqualsCaseASCII(value, "none"))
+	if (StringEqualsCaseASCII(value, "none")) {
+		global_tag_mask = TagMask::None();
 		return;
+	}
+
+	bool plus = true;
+
+	if (*value != '+' && *value != '-')
+		/* no "+-": not incremental */
+		global_tag_mask = TagMask::None();
 
 	for (const auto &i : SplitString(value, ',')) {
 		const char *name = i.c_str();
 
+		if (*name == '+') {
+			plus = true;
+			++name;
+		} else if (*name == '-') {
+			plus = false;
+			++name;
+		}
+
 		const auto type = tag_name_parse_i(name);
 		if (type == TAG_NUM_OF_ITEM_TYPES)
 			throw FormatRuntimeError("error parsing metadata item \"%s\"",
 						 name);
 
-		global_tag_mask |= type;
+		if (plus)
+			global_tag_mask.Set(type);
+		else
+			global_tag_mask.Unset(type);
 	}
 }