3 files changed, 51 insertions, 0 deletions
diff --git a/src/command.c b/src/command.c
index c1c330765..58e931650 100644
--- a/src/command.c
+++ b/src/command.c
@@ -870,6 +870,30 @@ handle_find(struct client *client, int argc, char *argv[])
 }
 
 static enum command_return
+handle_findadd(struct client *client, int argc, char *argv[])
+{
+    int ret;
+    struct locate_item_list *list =
+	    locate_item_list_parse(argv + 1, argc - 1);
+    if (list == NULL || list->length == 0) {
+	    if (list != NULL)
+		    locate_item_list_free(list);
+
+	    command_error(client, ACK_ERROR_ARG, "incorrect arguments");
+	    return COMMAND_RETURN_ERROR;
+    }
+
+    ret = findAddIn(client, NULL, list);
+    if (ret == -1)
+	    command_error(client, ACK_ERROR_NO_EXIST,
+			  "directory or file not found");
+
+    locate_item_list_free(list);
+
+    return ret;
+}
+
+static enum command_return
 handle_search(struct client *client, int argc, char *argv[])
 {
 	int ret;
@@ -1671,6 +1695,7 @@ static const struct command commands[] = {
 	{ "disableoutput", PERMISSION_ADMIN, 1, 1, handle_disableoutput },
 	{ "enableoutput", PERMISSION_ADMIN, 1, 1, handle_enableoutput },
 	{ "find", PERMISSION_READ, 2, -1, handle_find },
+	{ "findadd", PERMISSION_READ, 2, -1, handle_findadd},
 	{ "idle", PERMISSION_READ, 0, -1, handle_idle },
 	{ "kill", PERMISSION_ADMIN, -1, -1, handle_kill },
 	{ "list", PERMISSION_READ, 1, -1, handle_list },
diff --git a/src/dbUtils.c b/src/dbUtils.c
index 67eb89ebe..88122649e 100644
--- a/src/dbUtils.c
+++ b/src/dbUtils.c
@@ -200,6 +200,28 @@ int addAllInToStoredPlaylist(const char *name, const char *utf8file)
 }
 
 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;
diff --git a/src/dbUtils.h b/src/dbUtils.h
index 1382c243e..914b6fa84 100644
--- a/src/dbUtils.h
+++ b/src/dbUtils.h
@@ -40,6 +40,10 @@ findSongsIn(struct client *client, const char *name,
 	    const struct locate_item_list *criteria);
 
 int
+findAddIn(struct client *client, const char *name,
+	  const struct locate_item_list *criteria);
+
+int
 searchStatsForSongsIn(struct client *client, const char *name,
 		      const struct locate_item_list *criteria);