3 files changed, 117 insertions, 39 deletions
diff --git a/src/Main.cxx b/src/Main.cxx
index ef5f46ee8..69e148700 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -67,7 +67,7 @@
 
 #ifdef ENABLE_DATABASE
 #include "db/update/Service.hxx"
-#include "db/DatabaseGlue.hxx"
+#include "db/Configured.hxx"
 #include "db/plugins/SimpleDatabasePlugin.hxx"
 #include "storage/Configured.hxx"
 #include "storage/CompositeStorage.hxx"
@@ -168,46 +168,18 @@ InitStorage(Error &error)
 static bool
 glue_db_init_and_load(void)
 {
-	const struct config_param *param = config_get_param(CONF_DATABASE);
-	const struct config_param *path = config_get_param(CONF_DB_FILE);
-
-	if (param != nullptr && path != nullptr)
-		LogWarning(main_domain,
-			   "Found both 'database' and 'db_file' setting - ignoring the latter");
-
-	if (instance->storage == nullptr) {
-		if (param != nullptr)
-			LogDefault(main_domain,
-				   "Found database setting without "
-				   "music_directory - disabling database");
-		if (path != nullptr)
-			LogDefault(main_domain,
-				   "Found db_file setting without "
-				   "music_directory - disabling database");
-		return true;
-	}
-
-	struct config_param *allocated = nullptr;
-
-	if (param == nullptr && path != nullptr) {
-		allocated = new config_param("database", path->line);
-		allocated->AddBlockParam("path", path->value.c_str(),
-					 path->line);
-		param = allocated;
-	}
-
-	if (param == nullptr)
-		return true;
-
 	bool is_simple;
 	Error error;
-	instance->database = DatabaseGlobalInit(*instance->event_loop,
-						*instance, *param,
-						is_simple, error);
-	if (instance->database == nullptr)
-		FatalError(error);
-
-	delete allocated;
+	instance->database =
+		CreateConfiguredDatabase(*instance->event_loop, *instance,
+					 instance->storage != nullptr,
+					 is_simple, error);
+	if (instance->database == nullptr) {
+		if (error.IsDefined())
+			FatalError(error);
+		else
+			return true;
+	}
 
 	if (!instance->database->Open(error))
 		FatalError(error);
diff --git a/src/db/Configured.cxx b/src/db/Configured.cxx
new file mode 100644
index 000000000..0cec7efd0
--- /dev/null
+++ b/src/db/Configured.cxx
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "Configured.hxx"
+#include "DatabaseGlue.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigError.hxx"
+#include "Log.hxx"
+
+Database *
+CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener,
+			 bool have_storage, bool &is_simple_r, Error &error)
+{
+	const struct config_param *param = config_get_param(CONF_DATABASE);
+	const struct config_param *path = config_get_param(CONF_DB_FILE);
+
+	if (param != nullptr && path != nullptr)
+		LogWarning(config_domain,
+			   "Found both 'database' and 'db_file' setting - ignoring the latter");
+
+	if (!have_storage) {
+		if (param != nullptr)
+			LogDefault(config_domain,
+				   "Found database setting without "
+				   "music_directory - disabling database");
+		if (path != nullptr)
+			LogDefault(config_domain,
+				   "Found db_file setting without "
+				   "music_directory - disabling database");
+		return nullptr;
+	}
+
+	struct config_param *allocated = nullptr;
+
+	if (param == nullptr && path != nullptr) {
+		allocated = new config_param("database", path->line);
+		allocated->AddBlockParam("path", path->value.c_str(),
+					 path->line);
+		param = allocated;
+	}
+
+	if (param == nullptr)
+		return nullptr;
+
+	Database *db = DatabaseGlobalInit(loop, listener, *param,
+					  is_simple_r, error);
+	delete allocated;
+	return db;
+}
diff --git a/src/db/Configured.hxx b/src/db/Configured.hxx
new file mode 100644
index 000000000..0cd054b4b
--- /dev/null
+++ b/src/db/Configured.hxx
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_DB_CONFIG_HXX
+#define MPD_DB_CONFIG_HXX
+
+#include "check.h"
+
+class EventLoop;
+class DatabaseListener;
+class Database;
+class Error;
+
+/**
+ * Read database configuration settings and create a #Database
+ * instance from it, but do not open it.  Returns nullptr on error or
+ * if no database is configured (no #Error set in that case).
+ */
+Database *
+CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener,
+			 bool have_storage, bool &is_simple_r, Error &error);
+
+#endif