1 files changed, 64 insertions, 44 deletions

diff --git a/src/database.c b/src/DatabaseGlue.cxx
index 8c903bb45..b980ded83 100644
--- a/src/database.c
+++ b/src/DatabaseGlue.cxx
@@ -18,17 +18,22 @@
  */
 
 #include "config.h"
+#include "DatabaseGlue.hxx"
+#include "DatabaseRegistry.hxx"
+
+extern "C" {
 #include "database.h"
 #include "db_error.h"
 #include "db_save.h"
-#include "db_selection.h"
-#include "db_visitor.h"
-#include "db_plugin.h"
-#include "db/simple_db_plugin.h"
-#include "directory.h"
 #include "stats.h"
 #include "conf.h"
 #include "glib_compat.h"
+}
+
+#include "directory.h"
+
+#include "DatabasePlugin.hxx"
+#include "db/SimpleDatabasePlugin.hxx"
 
 #include <glib.h>
 
@@ -42,25 +47,25 @@
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "database"
 
-static struct db *db;
+static Database *db;
 static bool db_is_open;
 
 bool
-db_init(const struct config_param *path, GError **error_r)
+db_init(const struct config_param *param, GError **error_r)
 {
 	assert(db == NULL);
 	assert(!db_is_open);
 
-	if (path == NULL)
-		return true;
-
-	struct config_param *param = config_new_param("database", path->line);
-	config_add_block_param(param, "path", path->value, path->line);
-
-	db = db_plugin_new(&simple_db_plugin, param, error_r);
-
-	config_param_free(param);
+	const char *plugin_name =
+		config_get_block_string(param, "plugin", "simple");
+	const DatabasePlugin *plugin = GetDatabasePluginByName(plugin_name);
+	if (plugin == NULL) {
+		g_set_error(error_r, db_quark(), 0,
+			    "No such database plugin: %s", plugin_name);
+		return false;
+	}
 
+	db = plugin->create(param, error_r);
 	return db != NULL;
 }
 
@@ -68,18 +73,47 @@ void
 db_finish(void)
 {
 	if (db_is_open)
-		db_plugin_close(db);
+		db->Close();
 
 	if (db != NULL)
-		db_plugin_free(db);
+		delete db;
+}
+
+const Database *
+GetDatabase()
+{
+	assert(db == NULL || db_is_open);
+
+	return db;
+}
+
+const Database *
+GetDatabase(GError **error_r)
+{
+	assert(db == nullptr || db_is_open);
+
+	if (db == nullptr)
+		g_set_error_literal(error_r, db_quark(), DB_DISABLED,
+				    "No database");
+
+	return db;
+}
+
+bool
+db_is_simple(void)
+{
+	assert(db == NULL || db_is_open);
+
+	return dynamic_cast<SimpleDatabase *>(db) != nullptr;
 }
 
 struct directory *
 db_get_root(void)
 {
 	assert(db != NULL);
+	assert(db_is_simple());
 
-	return simple_db_get_root(db);
+	return ((SimpleDatabase *)db)->GetRoot();
 }
 
 struct directory *
@@ -107,32 +141,16 @@ db_get_song(const char *file)
 	if (db == NULL)
 		return NULL;
 
-	return db_plugin_get_song(db, file, NULL);
+	return db->GetSong(file, NULL);
 }
 
-bool
-db_visit(const struct db_selection *selection,
-	 const struct db_visitor *visitor, void *ctx,
-	 GError **error_r)
-{
-	if (db == NULL) {
-		g_set_error_literal(error_r, db_quark(), DB_DISABLED,
-				    "No database");
-		return false;
-	}
-
-	return db_plugin_visit(db, selection, visitor, ctx, error_r);
-}
-
-bool
-db_walk(const char *uri,
-	const struct db_visitor *visitor, void *ctx,
-	GError **error_r)
+void
+db_return_song(struct song *song)
 {
-	struct db_selection selection;
-	db_selection_init(&selection, uri, true);
+	assert(db != nullptr);
+	assert(song != nullptr);
 
-	return db_visit(&selection, visitor, ctx, error_r);
+	db->ReturnSong(song);
 }
 
 bool
@@ -140,8 +158,9 @@ db_save(GError **error_r)
 {
 	assert(db != NULL);
 	assert(db_is_open);
+	assert(db_is_simple());
 
-	return simple_db_save(db, error_r);
+	return ((SimpleDatabase *)db)->Save(error_r);
 }
 
 bool
@@ -150,7 +169,7 @@ db_load(GError **error)
 	assert(db != NULL);
 	assert(!db_is_open);
 
-	if (!db_plugin_open(db, error))
+	if (!db->Open(error))
 		return false;
 
 	db_is_open = true;
@@ -165,6 +184,7 @@ db_get_mtime(void)
 {
 	assert(db != NULL);
 	assert(db_is_open);
+	assert(db_is_simple());
 
-	return simple_db_get_mtime(db);
+	return ((SimpleDatabase *)db)->GetLastModified();
 }