From 6e64bac7b6954d13f5aa47f068dd149219dfe966 Mon Sep 17 00:00:00 2001 From: "J. Alexander Treuman" Date: Sat, 24 Feb 2007 02:00:03 +0000 Subject: Adding playlistfind and playlistsearch commands for searching the current playlist. git-svn-id: https://svn.musicpd.org/mpd/trunk@5420 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/command.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) (limited to 'src/command.c') diff --git a/src/command.c b/src/command.c index e544a83bc..dc427629f 100644 --- a/src/command.c +++ b/src/command.c @@ -28,7 +28,6 @@ #include "permission.h" #include "buffer2array.h" #include "log.h" -#include "dbUtils.h" #include "tag.h" #include "utils.h" @@ -94,6 +93,8 @@ #define COMMAND_NOTCOMMANDS "notcommands" #define COMMAND_PLAYLISTCLEAR "playlistclear" #define COMMAND_PLAYLISTADD "playlistadd" +#define COMMAND_PLAYLISTFIND "playlistfind" +#define COMMAND_PLAYLISTSEARCH "playlistsearch" #define COMMAND_STATUS_VOLUME "volume" #define COMMAND_STATUS_STATE "state" @@ -510,6 +511,44 @@ static int handleSearch(int fd, int *permission, int argc, char *argv[]) return ret; } +static int handlePlaylistFind(int fd, int *permission, int argc, char *argv[]) +{ + LocateTagItem *items; + int numItems = newLocateTagItemArrayFromArgArray(argv + 1, + argc - 1, + &items); + + if (numItems <= 0) { + commandError(fd, ACK_ERROR_ARG, "incorrect arguments"); + return -1; + } + + findSongsInPlaylist(fd, numItems, items); + + freeLocateTagItemArray(numItems, items); + + return 0; +} + +static int handlePlaylistSearch(int fd, int *permission, int argc, char *argv[]) +{ + LocateTagItem *items; + int numItems = newLocateTagItemArrayFromArgArray(argv + 1, + argc - 1, + &items); + + if (numItems <= 0) { + commandError(fd, ACK_ERROR_ARG, "incorrect arguments"); + return -1; + } + + searchForSongsInPlaylist(fd, numItems, items); + + freeLocateTagItemArray(numItems, items); + + return 0; +} + static int listHandleUpdate(int fd, int *permission, int argc, @@ -1002,6 +1041,8 @@ void initCommands(void) addCommand(COMMAND_NOTCOMMANDS, PERMISSION_NONE, 0, 0, handleNotcommands, NULL); addCommand(COMMAND_PLAYLISTCLEAR, PERMISSION_CONTROL, 1, 1, handlePlaylistClear, NULL); addCommand(COMMAND_PLAYLISTADD, PERMISSION_CONTROL, 2, 2, handlePlaylistAdd, NULL); + addCommand(COMMAND_PLAYLISTFIND, PERMISSION_READ, 2, -1, handlePlaylistFind, NULL); + addCommand(COMMAND_PLAYLISTSEARCH, PERMISSION_READ, 2, -1, handlePlaylistSearch, NULL); sortList(commandList); } -- cgit v1.2.3