playlist_queue: moved code to playlist_mapper.c

4 files changed, 139 insertions, 70 deletions

diff --git a/Makefile.am b/Makefile.am
index c96e86add..22b465c37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -156,6 +156,7 @@ mpd_headers = \
 	src/playlist_state.h \
 	src/playlist_plugin.h \
 	src/playlist_list.h \
+	src/playlist_mapper.h \
 	src/playlist_song.h \
 	src/playlist_queue.h \
 	src/playlist/extm3u_playlist_plugin.h \
@@ -296,6 +297,7 @@ src_mpd_SOURCES = \
 	src/playlist_edit.c \
 	src/playlist_print.c \
 	src/playlist_save.c \
+	src/playlist_mapper.c \
 	src/playlist_song.c \
 	src/playlist_state.c \
 	src/playlist_queue.c \
diff --git a/src/playlist_mapper.c b/src/playlist_mapper.c
new file mode 100644
index 000000000..3933ec194
--- /dev/null
+++ b/src/playlist_mapper.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2003-2010 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 "playlist_mapper.h"
+#include "playlist_list.h"
+#include "stored_playlist.h"
+#include "mapper.h"
+#include "uri.h"
+
+#include <assert.h>
+
+static struct playlist_provider *
+playlist_open_path(const char *path_fs)
+{
+	struct playlist_provider *playlist;
+
+	playlist = playlist_list_open_uri(path_fs);
+	if (playlist == NULL)
+		playlist = playlist_list_open_path(path_fs);
+
+	return playlist;
+}
+
+/**
+ * Load a playlist from the configured playlist directory.
+ */
+static struct playlist_provider *
+playlist_open_in_playlist_dir(const char *uri)
+{
+	char *path_fs;
+
+	assert(spl_valid_name(uri));
+
+	const char *playlist_directory_fs = map_spl_path();
+	if (playlist_directory_fs == NULL)
+		return NULL;
+
+	path_fs = g_build_filename(playlist_directory_fs, uri, NULL);
+
+	struct playlist_provider *playlist = playlist_open_path(path_fs);
+	g_free(path_fs);
+
+	return playlist;
+}
+
+/**
+ * Load a playlist from the configured music directory.
+ */
+static struct playlist_provider *
+playlist_open_in_music_dir(const char *uri)
+{
+	char *path_fs;
+
+	assert(uri_safe_local(uri));
+
+	path_fs = map_uri_fs(uri);
+	if (path_fs == NULL)
+		return NULL;
+
+	struct playlist_provider *playlist = playlist_open_path(path_fs);
+	g_free(path_fs);
+
+	return playlist;
+}
+
+struct playlist_provider *
+playlist_mapper_open(const char *uri)
+{
+	struct playlist_provider *playlist;
+
+	if (spl_valid_name(uri)) {
+		playlist = playlist_open_in_playlist_dir(uri);
+		if (playlist != NULL)
+			return playlist;
+	}
+
+	if (uri_safe_local(uri)) {
+		playlist = playlist_open_in_music_dir(uri);
+		if (playlist != NULL)
+			return playlist;
+	}
+
+	return NULL;
+}
diff --git a/src/playlist_mapper.h b/src/playlist_mapper.h
new file mode 100644
index 000000000..045c4b0d7
--- /dev/null
+++ b/src/playlist_mapper.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2003-2010 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_PLAYLIST_MAPPER_H
+#define MPD_PLAYLIST_MAPPER_H
+
+/**
+ * Opens a playlist from an URI relative to the playlist or music
+ * directory.
+ */
+struct playlist_provider *
+playlist_mapper_open(const char *uri);
+
+#endif
diff --git a/src/playlist_queue.c b/src/playlist_queue.c
index b19921da3..4bda90c76 100644
--- a/src/playlist_queue.c
+++ b/src/playlist_queue.c
@@ -21,6 +21,7 @@
 #include "playlist_queue.h"
 #include "playlist_list.h"
 #include "playlist_plugin.h"
+#include "playlist_mapper.h"
 #include "playlist_song.h"
 #include "stored_playlist.h"
 #include "mapper.h"
@@ -94,84 +95,19 @@ playlist_open_remote_into_queue(const char *uri, struct playlist *dest)
 	return result;
 }
 
-static enum playlist_result
-playlist_open_path_into_queue(const char *path_fs, const char *uri,
-			      struct playlist *dest)
-{
-	struct playlist_provider *playlist;
-	enum playlist_result result;
-
-	if ((playlist = playlist_list_open_uri(path_fs)) != NULL)
-		result = playlist_load_into_queue(uri, playlist, dest);
-	else if ((playlist = playlist_list_open_path(path_fs)) != NULL)
-		result = playlist_load_into_queue(uri, playlist, dest);
-	else
-		return PLAYLIST_RESULT_NO_SUCH_LIST;
-
-	playlist_plugin_close(playlist);
-
-	return result;
-}
-
-/**
- * Load a playlist from the configured playlist directory.
- */
-static enum playlist_result
-playlist_open_local_into_queue(const char *uri, struct playlist *dest)
-{
-	const char *playlist_directory_fs;
-	char *path_fs;
-	enum playlist_result result;
-
-	assert(spl_valid_name(uri));
-
-	playlist_directory_fs = map_spl_path();
-	if (playlist_directory_fs == NULL)
-		return PLAYLIST_RESULT_DISABLED;
-
-	path_fs = g_build_filename(playlist_directory_fs, uri, NULL);
-	result = playlist_open_path_into_queue(path_fs, NULL, dest);
-	g_free(path_fs);
-
-	return result;
-}
-
-/**
- * Load a playlist from the configured music directory.
- */
-static enum playlist_result
-playlist_open_local_into_queue2(const char *uri, struct playlist *dest)
-{
-	char *path_fs;
-	enum playlist_result result;
-
-	assert(uri_safe_local(uri));
-
-	path_fs = map_uri_fs(uri);
-	if (path_fs == NULL)
-		return PLAYLIST_RESULT_NO_SUCH_LIST;
-
-	result = playlist_open_path_into_queue(path_fs, uri, dest);
-	g_free(path_fs);
-
-	return result;
-}
-
 enum playlist_result
 playlist_open_into_queue(const char *uri, struct playlist *dest)
 {
 	if (uri_has_scheme(uri))
 		return playlist_open_remote_into_queue(uri, dest);
 
-	if (spl_valid_name(uri)) {
+	struct playlist_provider *playlist = playlist_mapper_open(uri);
+	if (playlist != NULL) {
 		enum playlist_result result =
-			playlist_open_local_into_queue(uri, dest);
-		if (result != PLAYLIST_RESULT_NO_SUCH_LIST)
-			return result;
+			playlist_load_into_queue(uri, playlist, dest);
+		playlist_plugin_close(playlist);
+		return result;
 	}
 
-	if (uri_safe_local(uri))
-		return playlist_open_local_into_queue2(uri, dest);
-
 	return PLAYLIST_RESULT_NO_SUCH_LIST;
 }