From 1f495efb469158cb652dd6cc0fd8eb58fab8b7b5 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Thu, 7 Sep 2023 09:53:34 +0200
Subject: [PATCH] test/LoadDatabase: ignore tag/charset mismatches

This program shouldn't fail just because the configuration doesn't
match - it has no configuration, it's just a dumb test program.
---
 src/db/plugins/simple/DatabaseSave.cxx | 18 +++++++++++++-----
 src/db/plugins/simple/DatabaseSave.hxx |  6 +++++-
 test/LoadDatabase.cxx                  |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/db/plugins/simple/DatabaseSave.cxx b/src/db/plugins/simple/DatabaseSave.cxx
index dfac8997a..db44cf6ae 100644
--- a/src/db/plugins/simple/DatabaseSave.cxx
+++ b/src/db/plugins/simple/DatabaseSave.cxx
@@ -52,7 +52,8 @@ db_save_internal(BufferedOutputStream &os, const Directory &music_root)
 }
 
 void
-db_load_internal(LineReader &file, Directory &music_root)
+db_load_internal(LineReader &file, Directory &music_root,
+		 bool ignore_config_mismatches)
 {
 	char *line;
 	unsigned format = 0;
@@ -81,6 +82,9 @@ db_load_internal(LineReader &file, Directory &music_root)
 
 			found_charset = true;
 
+			if (ignore_config_mismatches)
+				continue;
+
 			const char *new_charset = p;
 			const char *const old_charset = GetFSCharset();
 			if (*old_charset != 0
@@ -90,6 +94,9 @@ db_load_internal(LineReader &file, Directory &music_root)
 						      "discarding database file",
 						      new_charset, old_charset);
 		} else if ((p = StringAfterPrefix(line, DB_TAG_PREFIX))) {
+			if (ignore_config_mismatches)
+				continue;
+
 			const char *name = p;
 			TagType tag = tag_name_parse(name);
 			if (tag == TAG_NUM_OF_ITEM_TYPES)
@@ -107,10 +114,11 @@ db_load_internal(LineReader &file, Directory &music_root)
 		throw std::runtime_error("Database format mismatch, "
 					 "discarding database file");
 
-	for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
-		if (IsTagEnabled(i) && !tags[i])
-			throw std::runtime_error("Tag list mismatch, "
-						 "discarding database file");
+	if (!ignore_config_mismatches)
+		for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
+			if (IsTagEnabled(i) && !tags[i])
+				throw std::runtime_error("Tag list mismatch, "
+							 "discarding database file");
 
 	const ScopeDatabaseLock protect;
 	directory_load(file, music_root);
diff --git a/src/db/plugins/simple/DatabaseSave.hxx b/src/db/plugins/simple/DatabaseSave.hxx
index 67482e2de..d66982870 100644
--- a/src/db/plugins/simple/DatabaseSave.hxx
+++ b/src/db/plugins/simple/DatabaseSave.hxx
@@ -13,8 +13,12 @@ db_save_internal(BufferedOutputStream &os, const Directory &root);
 
 /**
  * Throws #std::runtime_error on error.
+ *
+ * @param ignore_config_mismatches if true, then configuration
+ * mismatches (e.g. enabled tags or filesystem charset) are ignored
  */
 void
-db_load_internal(LineReader &file, Directory &root);
+db_load_internal(LineReader &file, Directory &root,
+		 bool ignore_config_mismatches=false);
 
 #endif
diff --git a/test/LoadDatabase.cxx b/test/LoadDatabase.cxx
index e6882118e..ce5436b5c 100644
--- a/test/LoadDatabase.cxx
+++ b/test/LoadDatabase.cxx
@@ -21,7 +21,7 @@ try {
 
 	Directory root{{}, nullptr};
 	TextFile line_reader{db_path};
-	db_load_internal(line_reader, root);
+	db_load_internal(line_reader, root, true);
 
 	return EXIT_SUCCESS;
 } catch (...) {