1 files changed, 59 insertions, 265 deletions

diff --git a/src/dbUtils.c b/src/dbUtils.c
index f950d42cc..827d0a0c1 100644
--- a/src/dbUtils.c
+++ b/src/dbUtils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,311 +20,105 @@
 #include "config.h"
 #include "dbUtils.h"
 #include "locate.h"
-#include "directory.h"
 #include "database.h"
-#include "client.h"
+#include "db_visitor.h"
 #include "playlist.h"
-#include "song.h"
-#include "song_print.h"
-#include "tag.h"
-#include "strset.h"
 #include "stored_playlist.h"
 
 #include <glib.h>
 
-#include <stdlib.h>
-
-typedef struct _ListCommandItem {
-	int8_t tagType;
-	const struct locate_item_list *criteria;
-} ListCommandItem;
-
-typedef struct _SearchStats {
-	const struct locate_item_list *criteria;
-	int numberOfSongs;
-	unsigned long playTime;
-} SearchStats;
-
-static int
-printDirectoryInDirectory(struct directory *directory, void *data)
-{
-	struct client *client = data;
-
-	if (!directory_is_root(directory))
-		client_printf(client, "directory: %s\n", directory_get_path(directory));
-
-	return 0;
-}
-
-static int
-printSongInDirectory(struct song *song, G_GNUC_UNUSED void *data)
-{
-	struct client *client = data;
-	song_print_uri(client, song);
-	return 0;
-}
-
-struct search_data {
-	struct client *client;
-	const struct locate_item_list *criteria;
-};
-
-static int
-searchInDirectory(struct song *song, void *_data)
-{
-	struct search_data *data = _data;
-
-	if (locate_song_search(song, data->criteria))
-		song_print_info(data->client, song);
-
-	return 0;
-}
-
-int
-searchForSongsIn(struct client *client, const char *name,
-		 const struct locate_item_list *criteria)
-{
-	int ret;
-	struct locate_item_list *new_list
-		= locate_item_list_casefold(criteria);
-	struct search_data data;
-
-	data.client = client;
-	data.criteria = new_list;
-
-	ret = db_walk(name, searchInDirectory, NULL, &data);
-
-	locate_item_list_free(new_list);
-
-	return ret;
-}
-
-static int
-findInDirectory(struct song *song, void *_data)
+static bool
+add_to_queue_song(struct song *song, void *ctx, GError **error_r)
 {
-	struct search_data *data = _data;
-
-	if (locate_song_match(song, data->criteria))
-		song_print_info(data->client, song);
+	struct player_control *pc = ctx;
 
-	return 0;
-}
-
-int
-findSongsIn(struct client *client, const char *name,
-	    const struct locate_item_list *criteria)
-{
-	struct search_data data;
-
-	data.client = client;
-	data.criteria = criteria;
-
-	return db_walk(name, findInDirectory, NULL, &data);
-}
-
-static void printSearchStats(struct client *client, SearchStats *stats)
-{
-	client_printf(client, "songs: %i\n", stats->numberOfSongs);
-	client_printf(client, "playtime: %li\n", stats->playTime);
-}
-
-static int
-searchStatsInDirectory(struct song *song, void *data)
-{
-	SearchStats *stats = data;
-
-	if (locate_song_match(song, stats->criteria)) {
-		stats->numberOfSongs++;
-		stats->playTime += song_get_duration(song);
+	enum playlist_result result =
+		playlist_append_song(&g_playlist, pc, song, NULL);
+	if (result != PLAYLIST_RESULT_SUCCESS) {
+		g_set_error(error_r, playlist_quark(), result,
+			    "Playlist error");
+		return false;
 	}
 
-	return 0;
-}
-
-int
-searchStatsForSongsIn(struct client *client, const char *name,
-		      const struct locate_item_list *criteria)
-{
-	SearchStats stats;
-	int ret;
-
-	stats.criteria = criteria;
-	stats.numberOfSongs = 0;
-	stats.playTime = 0;
-
-	ret = db_walk(name, searchStatsInDirectory, NULL, &stats);
-	if (ret == 0)
-		printSearchStats(client, &stats);
-
-	return ret;
+	return true;
 }
 
-int printAllIn(struct client *client, const char *name)
-{
-	return db_walk(name, printSongInDirectory,
-		       printDirectoryInDirectory, client);
-}
+static const struct db_visitor add_to_queue_visitor = {
+	.song = add_to_queue_song,
+};
 
-static int
-directoryAddSongToPlaylist(struct song *song, G_GNUC_UNUSED void *data)
+bool
+addAllIn(struct player_control *pc, const char *uri, GError **error_r)
 {
-	return playlist_append_song(&g_playlist, song, NULL);
+	return db_walk(uri, &add_to_queue_visitor, pc, error_r);
 }
 
 struct add_data {
 	const char *path;
 };
 
-static int
-directoryAddSongToStoredPlaylist(struct song *song, void *_data)
+static bool
+add_to_spl_song(struct song *song, void *ctx, GError **error_r)
 {
-	struct add_data *data = _data;
+	struct add_data *data = ctx;
 
-	if (spl_append_song(data->path, song) != 0)
-		return -1;
-	return 0;
-}
+	if (!spl_append_song(data->path, song, error_r))
+		return false;
 
-int addAllIn(const char *name)
-{
-	return db_walk(name, directoryAddSongToPlaylist, NULL, NULL);
+	return true;
 }
 
-int addAllInToStoredPlaylist(const char *name, const char *utf8file)
+static const struct db_visitor add_to_spl_visitor = {
+	.song = add_to_spl_song,
+};
+
+bool
+addAllInToStoredPlaylist(const char *uri_utf8, const char *path_utf8,
+			 GError **error_r)
 {
 	struct add_data data = {
-		.path = utf8file,
+		.path = path_utf8,
 	};
 
-	return db_walk(name, directoryAddSongToStoredPlaylist, NULL, &data);
+	return db_walk(uri_utf8, &add_to_spl_visitor, &data, error_r);
 }
 
-static int
-findAddInDirectory(struct song *song, void *_data)
-{
-	struct search_data *data = _data;
-
-	if (locate_song_match(song, data->criteria))
-		return directoryAddSongToPlaylist(song, data);
-
-	return 0;
-}
-
-int findAddIn(struct client *client, const char *name,
-	      const struct locate_item_list *criteria)
-{
-	struct search_data data;
-
-	data.client   = client;
-	data.criteria = criteria;
-
-	return db_walk(name, findAddInDirectory, NULL, &data);
-}
-
-static int
-directoryPrintSongInfo(struct song *song, void *data)
-{
-	struct client *client = data;
-	song_print_info(client, song);
-	return 0;
-}
-
-int printInfoForAllIn(struct client *client, const char *name)
-{
-	return db_walk(name, directoryPrintSongInfo,
-			     printDirectoryInDirectory, client);
-}
-
-static ListCommandItem *
-newListCommandItem(int tagType, const struct locate_item_list *criteria)
-{
-	ListCommandItem *item = g_new(ListCommandItem, 1);
-
-	item->tagType = tagType;
-	item->criteria = criteria;
-
-	return item;
-}
-
-static void freeListCommandItem(ListCommandItem * item)
-{
-	g_free(item);
-}
+struct find_add_data {
+	struct player_control *pc;
+	const struct locate_item_list *criteria;
+};
 
-static void
-visitTag(struct client *client, struct strset *set,
-	 struct song *song, enum tag_type tagType)
+static bool
+find_add_song(struct song *song, void *ctx, GError **error_r)
 {
-	struct tag *tag = song->tag;
-	bool found = false;
+	struct find_add_data *data = ctx;
 
-	if (tagType == LOCATE_TAG_FILE_TYPE) {
-		song_print_uri(client, song);
-		return;
-	}
-
-	if (!tag)
-		return;
+	if (!locate_song_match(song, data->criteria))
+		return true;
 
-	for (unsigned i = 0; i < tag->num_items; i++) {
-		if (tag->items[i]->type == tagType) {
-			strset_add(set, tag->items[i]->value);
-			found = true;
-		}
+	enum playlist_result result =
+		playlist_append_song(&g_playlist, data->pc,
+				     song, NULL);
+	if (result != PLAYLIST_RESULT_SUCCESS) {
+		g_set_error(error_r, playlist_quark(), result,
+			    "Playlist error");
+		return false;
 	}
 
-	if (!found)
-		strset_add(set, "");
+	return true;
 }
 
-struct list_tags_data {
-	struct client *client;
-	ListCommandItem *item;
-	struct strset *set;
+static const struct db_visitor find_add_visitor = {
+	.song = find_add_song,
 };
 
-static int
-listUniqueTagsInDirectory(struct song *song, void *_data)
-{
-	struct list_tags_data *data = _data;
-	ListCommandItem *item = data->item;
-
-	if (locate_song_match(song, item->criteria))
-		visitTag(data->client, data->set, song, item->tagType);
-
-	return 0;
-}
-
-int listAllUniqueTags(struct client *client, int type,
-		      const struct locate_item_list *criteria)
+bool
+findAddIn(struct player_control *pc, const char *name,
+	  const struct locate_item_list *criteria, GError **error_r)
 {
-	int ret;
-	ListCommandItem *item = newListCommandItem(type, criteria);
-	struct list_tags_data data = {
-		.client = client,
-		.item = item,
-	};
-
-	if (type >= 0 && type <= TAG_NUM_OF_ITEM_TYPES) {
-		data.set = strset_new();
-	}
-
-	ret = db_walk(NULL, listUniqueTagsInDirectory, NULL, &data);
-
-	if (type >= 0 && type <= TAG_NUM_OF_ITEM_TYPES) {
-		const char *value;
-
-		strset_rewind(data.set);
-
-		while ((value = strset_next(data.set)) != NULL)
-			client_printf(client, "%s: %s\n",
-				      tag_item_names[type],
-				      value);
-
-		strset_free(data.set);
-	}
-
-	freeListCommandItem(item);
+	struct find_add_data data;
+	data.pc = pc;
+	data.criteria = criteria;
 
-	return ret;
+	return db_walk(name, &find_add_visitor, &data, error_r);
 }