1 files changed, 97 insertions, 0 deletions
diff --git a/src/playlist/PlaylistMapper.cxx b/src/playlist/PlaylistMapper.cxx
new file mode 100644
index 000000000..042a39d34
--- /dev/null
+++ b/src/playlist/PlaylistMapper.cxx
@@ -0,0 +1,97 @@
+/*
+ * 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 "PlaylistMapper.hxx"
+#include "PlaylistFile.hxx"
+#include "PlaylistStream.hxx"
+#include "PlaylistRegistry.hxx"
+#include "Mapper.hxx"
+#include "fs/AllocatedPath.hxx"
+#include "storage/StorageInterface.hxx"
+#include "util/UriUtil.hxx"
+
+#include <assert.h>
+
+/**
+ * Load a playlist from the configured playlist directory.
+ */
+static SongEnumerator *
+playlist_open_in_playlist_dir(const char *uri, Mutex &mutex, Cond &cond)
+{
+	assert(spl_valid_name(uri));
+
+	const auto path_fs = map_spl_utf8_to_fs(uri);
+	if (path_fs.IsNull())
+		return nullptr;
+
+	return playlist_open_path(path_fs, mutex, cond);
+}
+
+#ifdef ENABLE_DATABASE
+
+/**
+ * Load a playlist from the configured music directory.
+ */
+static SongEnumerator *
+playlist_open_in_storage(const char *uri, const Storage *storage,
+			 Mutex &mutex, Cond &cond)
+{
+	assert(uri_safe_local(uri));
+
+	if (storage == nullptr)
+		return nullptr;
+
+	{
+		const auto path = storage->MapFS(uri);
+		if (!path.IsNull())
+			return playlist_open_path(path, mutex, cond);
+	}
+
+	const auto uri2 = storage->MapUTF8(uri);
+	return playlist_open_remote(uri2.c_str(), mutex, cond);
+}
+
+#endif
+
+SongEnumerator *
+playlist_mapper_open(const char *uri,
+#ifdef ENABLE_DATABASE
+		     const Storage *storage,
+#endif
+		     Mutex &mutex, Cond &cond)
+{
+	if (spl_valid_name(uri)) {
+		auto playlist = playlist_open_in_playlist_dir(uri,
+							      mutex, cond);
+		if (playlist != nullptr)
+			return playlist;
+	}
+
+#ifdef ENABLE_DATABASE
+	if (uri_safe_local(uri)) {
+		auto playlist = playlist_open_in_storage(uri, storage,
+							 mutex, cond);
+		if (playlist != nullptr)
+			return playlist;
+	}
+#endif
+
+	return nullptr;
+}