aboutsummaryrefslogtreecommitdiffstats
path: root/src/db/Configured.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-17 21:47:15 +0100
committerMax Kellermann <max@duempel.org>2014-02-17 22:13:53 +0100
commitde160bb2d1c04977fba2c0910bb98f9f602b5c73 (patch)
treed0b160a06f08e93b34f0fb8100ce05c810978d38 /src/db/Configured.cxx
parentff62b6742ba989dd06faa135650371900b327e93 (diff)
downloadmpd-de160bb2d1c04977fba2c0910bb98f9f602b5c73.tar.gz
mpd-de160bb2d1c04977fba2c0910bb98f9f602b5c73.tar.xz
mpd-de160bb2d1c04977fba2c0910bb98f9f602b5c73.zip
Main: move code to db/Configured.cxx
Diffstat (limited to 'src/db/Configured.cxx')
-rw-r--r--src/db/Configured.cxx67
1 files changed, 67 insertions, 0 deletions
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;
+}