2004-02-24 00:41:20 +01:00
|
|
|
/* the Music Player Daemon (MPD)
|
2007-04-05 05:22:33 +02:00
|
|
|
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
|
2004-02-24 00:41:20 +01:00
|
|
|
* This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "command.h"
|
2008-08-26 08:44:38 +02:00
|
|
|
#include "player_control.h"
|
2004-02-24 00:41:20 +01:00
|
|
|
#include "playlist.h"
|
|
|
|
#include "ls.h"
|
|
|
|
#include "directory.h"
|
2008-10-09 15:23:37 +02:00
|
|
|
#include "directory_print.h"
|
2008-10-08 11:07:35 +02:00
|
|
|
#include "database.h"
|
2008-10-08 10:48:48 +02:00
|
|
|
#include "update.h"
|
2004-02-24 00:41:20 +01:00
|
|
|
#include "volume.h"
|
|
|
|
#include "stats.h"
|
|
|
|
#include "permission.h"
|
2004-04-11 19:37:47 +02:00
|
|
|
#include "buffer2array.h"
|
2004-04-12 03:44:52 +02:00
|
|
|
#include "log.h"
|
2006-08-26 08:25:57 +02:00
|
|
|
#include "utils.h"
|
2008-10-22 17:21:57 +02:00
|
|
|
#include "stored_playlist.h"
|
2008-04-12 06:19:26 +02:00
|
|
|
#include "sllist.h"
|
|
|
|
#include "ack.h"
|
2008-08-26 08:27:06 +02:00
|
|
|
#include "audio.h"
|
2008-08-28 20:01:08 +02:00
|
|
|
#include "dbUtils.h"
|
2008-09-06 20:28:31 +02:00
|
|
|
#include "tag.h"
|
2008-08-29 09:36:42 +02:00
|
|
|
#include "client.h"
|
2008-09-07 13:28:01 +02:00
|
|
|
#include "tag_print.h"
|
2008-10-06 18:32:27 +02:00
|
|
|
#include "path.h"
|
2008-01-03 08:29:49 +01:00
|
|
|
#include "os_compat.h"
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
#define COMMAND_STATUS_VOLUME "volume"
|
|
|
|
#define COMMAND_STATUS_STATE "state"
|
|
|
|
#define COMMAND_STATUS_REPEAT "repeat"
|
|
|
|
#define COMMAND_STATUS_RANDOM "random"
|
|
|
|
#define COMMAND_STATUS_PLAYLIST "playlist"
|
|
|
|
#define COMMAND_STATUS_PLAYLIST_LENGTH "playlistlength"
|
|
|
|
#define COMMAND_STATUS_SONG "song"
|
2004-06-09 04:50:44 +02:00
|
|
|
#define COMMAND_STATUS_SONGID "songid"
|
2004-02-24 00:41:20 +01:00
|
|
|
#define COMMAND_STATUS_TIME "time"
|
|
|
|
#define COMMAND_STATUS_BITRATE "bitrate"
|
|
|
|
#define COMMAND_STATUS_ERROR "error"
|
2004-02-27 02:35:23 +01:00
|
|
|
#define COMMAND_STATUS_CROSSFADE "xfade"
|
|
|
|
#define COMMAND_STATUS_AUDIO "audio"
|
2004-04-11 04:34:26 +02:00
|
|
|
#define COMMAND_STATUS_UPDATING_DB "updating_db"
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-10-06 12:33:27 +02:00
|
|
|
/*
|
|
|
|
* The most we ever use is for search/find, and that limits it to the
|
|
|
|
* number of tags we can have. Add one for the command, and one extra
|
|
|
|
* to catch errors clients may send us
|
|
|
|
*/
|
|
|
|
#define COMMAND_ARGV_MAX (2+(TAG_NUM_OF_ITEM_TYPES*2))
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
typedef int (*CommandHandlerFunction) (struct client *, int, char **);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
/* if min: -1 don't check args *
|
|
|
|
* if max: -1 no max args */
|
2008-10-22 09:58:13 +02:00
|
|
|
struct command {
|
2008-02-05 11:17:33 +01:00
|
|
|
const char *cmd;
|
2008-10-22 10:08:14 +02:00
|
|
|
unsigned reqPermission;
|
2006-07-20 18:02:40 +02:00
|
|
|
int min;
|
|
|
|
int max;
|
|
|
|
CommandHandlerFunction handler;
|
2004-04-11 19:37:47 +02:00
|
|
|
};
|
|
|
|
|
2008-01-26 13:46:53 +01:00
|
|
|
/* this should really be "need a non-negative integer": */
|
|
|
|
static const char need_positive[] = "need a positive integer"; /* no-op */
|
|
|
|
|
|
|
|
/* FIXME: redundant error messages */
|
|
|
|
static const char check_integer[] = "\"%s\" is not a integer";
|
|
|
|
static const char need_integer[] = "need an integer";
|
|
|
|
static const char check_boolean[] = "\"%s\" is not 0 or 1";
|
|
|
|
static const char check_non_negative[] = "\"%s\" is not an integer >= 0";
|
|
|
|
|
2008-02-05 11:17:33 +01:00
|
|
|
static const char *current_command;
|
2007-01-14 04:07:53 +01:00
|
|
|
static int command_listNum;
|
2004-06-04 03:58:31 +02:00
|
|
|
|
2008-09-07 13:51:59 +02:00
|
|
|
void command_success(struct client *client)
|
|
|
|
{
|
|
|
|
client_puts(client, "OK\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void command_error_v(struct client *client, int error,
|
|
|
|
const char *fmt, va_list args)
|
|
|
|
{
|
|
|
|
assert(client != NULL);
|
|
|
|
assert(current_command != NULL);
|
|
|
|
|
|
|
|
client_printf(client, "ACK [%i@%i] {%s} ",
|
|
|
|
(int)error, command_listNum, current_command);
|
|
|
|
client_vprintf(client, fmt, args);
|
|
|
|
client_puts(client, "\n");
|
|
|
|
|
|
|
|
current_command = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
mpd_fprintf_ void command_error(struct client *client, int error,
|
|
|
|
const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
va_start(args, fmt);
|
|
|
|
command_error_v(client, error, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
}
|
|
|
|
|
2008-09-29 15:49:29 +02:00
|
|
|
static int mpd_fprintf__ check_uint32(struct client *client, uint32_t *dst,
|
2008-01-26 13:46:53 +01:00
|
|
|
const char *s, const char *fmt, ...)
|
|
|
|
{
|
|
|
|
char *test;
|
|
|
|
|
|
|
|
*dst = strtoul(s, &test, 10);
|
|
|
|
if (*test != '\0') {
|
|
|
|
va_list args;
|
|
|
|
va_start(args, fmt);
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error_v(client, ACK_ERROR_ARG, fmt, args);
|
2008-01-26 13:46:53 +01:00
|
|
|
va_end(args);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
static int mpd_fprintf__ check_int(struct client *client, int *dst,
|
2008-01-26 13:46:53 +01:00
|
|
|
const char *s, const char *fmt, ...)
|
|
|
|
{
|
|
|
|
char *test;
|
|
|
|
|
|
|
|
*dst = strtol(s, &test, 10);
|
|
|
|
if (*test != '\0' ||
|
|
|
|
(fmt == check_boolean && *dst != 0 && *dst != 1) ||
|
|
|
|
(fmt == check_non_negative && *dst < 0)) {
|
|
|
|
va_list args;
|
|
|
|
va_start(args, fmt);
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error_v(client, ACK_ERROR_ARG, fmt, args);
|
2008-01-26 13:46:53 +01:00
|
|
|
va_end(args);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
static int print_playlist_result(struct client *client,
|
|
|
|
enum playlist_result result)
|
2008-09-07 13:39:31 +02:00
|
|
|
{
|
|
|
|
switch (result) {
|
|
|
|
case PLAYLIST_RESULT_SUCCESS:
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
case PLAYLIST_RESULT_ERRNO:
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_SYSTEM, strerror(errno));
|
2008-09-07 13:39:31 +02:00
|
|
|
return -1;
|
|
|
|
|
2008-10-15 22:35:13 +02:00
|
|
|
case PLAYLIST_RESULT_DENIED:
|
|
|
|
command_error(client, ACK_ERROR_NO_EXIST, "Access denied");
|
|
|
|
return -1;
|
|
|
|
|
2008-09-07 13:39:31 +02:00
|
|
|
case PLAYLIST_RESULT_NO_SUCH_SONG:
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST, "No such song");
|
2008-09-07 13:39:31 +02:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
case PLAYLIST_RESULT_NO_SUCH_LIST:
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST, "No such playlist");
|
2008-09-07 13:39:31 +02:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
case PLAYLIST_RESULT_LIST_EXISTS:
|
2008-10-09 11:51:22 +02:00
|
|
|
command_error(client, ACK_ERROR_EXIST,
|
2008-09-07 13:52:48 +02:00
|
|
|
"Playlist already exists");
|
2008-09-07 13:39:31 +02:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
case PLAYLIST_RESULT_BAD_NAME:
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG,
|
|
|
|
"playlist name is invalid: "
|
|
|
|
"playlist names may not contain slashes,"
|
|
|
|
" newlines or carriage returns");
|
2008-09-07 13:39:31 +02:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
case PLAYLIST_RESULT_BAD_RANGE:
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG, "Bad song index");
|
2008-09-07 13:39:31 +02:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
case PLAYLIST_RESULT_NOT_PLAYING:
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_PLAYER_SYNC, "Not playing");
|
2008-09-07 13:39:31 +02:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
case PLAYLIST_RESULT_TOO_LARGE:
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_PLAYLIST_MAX,
|
|
|
|
"playlist is at the max size");
|
2008-09-07 13:39:31 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(0);
|
2008-09-07 19:19:48 +02:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleUrlHandlers(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-06-03 01:22:37 +02:00
|
|
|
{
|
2008-10-17 17:53:43 +02:00
|
|
|
if (client_get_uid(client) > 0)
|
|
|
|
client_puts(client, "handler: file://\n");
|
2008-09-07 14:02:40 +02:00
|
|
|
return printRemoteUrlHandlers(client);
|
2004-06-03 01:22:37 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleTagTypes(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2007-03-31 20:43:16 +02:00
|
|
|
{
|
2008-09-07 13:53:55 +02:00
|
|
|
tag_print_types(client);
|
2007-03-31 20:43:16 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlay(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
int song = -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (argc == 2 && check_int(client, &song, argv[1], need_positive) < 0)
|
2008-01-26 13:46:53 +01:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
result = playPlaylist(song, 0);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlayId(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2004-06-09 04:50:44 +02:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
int id = -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (argc == 2 && check_int(client, &id, argv[1], need_positive) < 0)
|
2008-01-26 13:46:53 +01:00
|
|
|
return -1;
|
|
|
|
|
2008-09-07 13:39:31 +02:00
|
|
|
result = playPlaylistById(id, 0);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2004-06-09 04:50:44 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleStop(mpd_unused struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-08-26 08:27:16 +02:00
|
|
|
stopPlaylist();
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleCurrentSong(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-06-10 06:13:23 +02:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
int song = getPlaylistCurrentSong();
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2004-06-10 06:13:23 +02:00
|
|
|
|
2008-09-07 13:39:31 +02:00
|
|
|
if (song < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return 0;
|
2008-09-07 13:39:31 +02:00
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
result = playlistInfo(client, song);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2004-06-10 06:13:23 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePause(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-29 20:54:56 +02:00
|
|
|
if (argc == 2) {
|
2008-01-26 13:46:53 +01:00
|
|
|
int pause_flag;
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &pause_flag, argv[1], check_boolean, argv[1]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-08-26 08:27:16 +02:00
|
|
|
playerSetPause(pause_flag);
|
|
|
|
return 0;
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
2008-08-26 08:27:16 +02:00
|
|
|
|
|
|
|
playerPause();
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int commandStatus(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-02-05 11:17:33 +01:00
|
|
|
const char *state = NULL;
|
2004-04-11 05:12:00 +02:00
|
|
|
int updateJobId;
|
2006-07-20 18:02:40 +02:00
|
|
|
int song;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2004-06-07 14:11:57 +02:00
|
|
|
playPlaylistIfPlayerStopped();
|
2006-07-20 18:02:40 +02:00
|
|
|
switch (getPlayerState()) {
|
|
|
|
case PLAYER_STATE_STOP:
|
2008-10-22 10:08:14 +02:00
|
|
|
state = "stop";
|
2006-07-20 18:02:40 +02:00
|
|
|
break;
|
|
|
|
case PLAYER_STATE_PAUSE:
|
2008-10-22 10:08:14 +02:00
|
|
|
state = "pause";
|
2006-07-20 18:02:40 +02:00
|
|
|
break;
|
|
|
|
case PLAYER_STATE_PLAY:
|
2008-10-22 10:08:14 +02:00
|
|
|
state = "play";
|
2006-07-20 18:02:40 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
client_printf(client,
|
2008-09-07 13:57:43 +02:00
|
|
|
COMMAND_STATUS_VOLUME ": %i\n"
|
|
|
|
COMMAND_STATUS_REPEAT ": %i\n"
|
|
|
|
COMMAND_STATUS_RANDOM ": %i\n"
|
|
|
|
COMMAND_STATUS_PLAYLIST ": %li\n"
|
|
|
|
COMMAND_STATUS_PLAYLIST_LENGTH ": %i\n"
|
|
|
|
COMMAND_STATUS_CROSSFADE ": %i\n"
|
|
|
|
COMMAND_STATUS_STATE ": %s\n",
|
|
|
|
getVolumeLevel(),
|
|
|
|
getPlaylistRepeatStatus(),
|
|
|
|
getPlaylistRandomStatus(),
|
|
|
|
getPlaylistVersion(),
|
|
|
|
getPlaylistLength(),
|
2008-09-07 13:52:48 +02:00
|
|
|
(int)(getPlayerCrossFade() + 0.5),
|
2008-09-07 13:57:43 +02:00
|
|
|
state);
|
2006-07-20 18:02:40 +02:00
|
|
|
|
|
|
|
song = getPlaylistCurrentSong();
|
|
|
|
if (song >= 0) {
|
2008-09-07 13:57:43 +02:00
|
|
|
client_printf(client,
|
|
|
|
COMMAND_STATUS_SONG ": %i\n"
|
|
|
|
COMMAND_STATUS_SONGID ": %i\n",
|
|
|
|
song, getPlaylistSongId(song));
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
2008-10-10 14:51:22 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (getPlayerState() != PLAYER_STATE_STOP) {
|
2008-10-10 14:51:22 +02:00
|
|
|
const struct audio_format *af = player_get_audio_format();
|
2008-09-07 13:52:48 +02:00
|
|
|
client_printf(client,
|
2008-09-07 13:57:43 +02:00
|
|
|
COMMAND_STATUS_TIME ": %i:%i\n"
|
|
|
|
COMMAND_STATUS_BITRATE ": %li\n"
|
2008-10-10 14:47:58 +02:00
|
|
|
COMMAND_STATUS_AUDIO ": %u:%u:%u\n",
|
2008-09-07 13:52:48 +02:00
|
|
|
getPlayerElapsedTime(), getPlayerTotalTime(),
|
2008-09-07 13:57:43 +02:00
|
|
|
getPlayerBitRate(),
|
2008-10-10 14:51:22 +02:00
|
|
|
af->sample_rate, af->bits, af->channels);
|
2004-06-09 04:50:44 +02:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
|
|
|
|
if ((updateJobId = isUpdatingDB())) {
|
2008-09-07 13:57:43 +02:00
|
|
|
client_printf(client,
|
|
|
|
COMMAND_STATUS_UPDATING_DB ": %i\n",
|
|
|
|
updateJobId);
|
2004-04-11 05:12:00 +02:00
|
|
|
}
|
2004-04-11 04:34:26 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (getPlayerError() != PLAYER_ERROR_NOERROR) {
|
2008-09-07 13:57:43 +02:00
|
|
|
client_printf(client,
|
|
|
|
COMMAND_STATUS_ERROR ": %s\n",
|
|
|
|
getPlayerErrorStr());
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleKill(mpd_unused struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
return COMMAND_RETURN_KILL;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleClose(mpd_unused struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
return COMMAND_RETURN_CLOSE;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleAdd(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-29 20:54:56 +02:00
|
|
|
char *path = argv[1];
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2005-05-03 04:35:19 +02:00
|
|
|
|
2008-10-17 17:53:43 +02:00
|
|
|
if (strncmp(path, "file:///", 8) == 0) {
|
|
|
|
result = playlist_append_file(path + 7, client_get_uid(client),
|
2008-10-15 22:35:13 +02:00
|
|
|
NULL);
|
|
|
|
return print_playlist_result(client, result);
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (isRemoteUrl(path))
|
2008-09-07 13:39:31 +02:00
|
|
|
return addToPlaylist(path, NULL);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-09-07 13:48:37 +02:00
|
|
|
result = addAllIn(path);
|
|
|
|
if (result == (enum playlist_result)-1) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST,
|
|
|
|
"directory or file not found");
|
2008-09-07 13:48:37 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleAddId(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2004-11-03 00:44:33 +01:00
|
|
|
{
|
2008-01-26 13:46:49 +01:00
|
|
|
int added_id;
|
2008-10-15 22:35:13 +02:00
|
|
|
enum playlist_result result;
|
|
|
|
|
2008-10-17 17:53:43 +02:00
|
|
|
if (strncmp(argv[1], "file:///", 8) == 0)
|
|
|
|
result = playlist_append_file(argv[1] + 7,
|
|
|
|
client_get_uid(client),
|
2008-10-15 22:35:13 +02:00
|
|
|
&added_id);
|
|
|
|
else
|
|
|
|
result = addToPlaylist(argv[1], &added_id);
|
2008-09-07 13:39:31 +02:00
|
|
|
|
2008-09-23 23:59:55 +02:00
|
|
|
if (result != PLAYLIST_RESULT_SUCCESS)
|
2008-10-15 22:35:04 +02:00
|
|
|
return print_playlist_result(client, result);
|
2008-09-07 13:39:31 +02:00
|
|
|
|
|
|
|
if (argc == 3) {
|
|
|
|
int to;
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &to, argv[2],
|
2008-09-07 13:39:31 +02:00
|
|
|
check_integer, argv[2]) < 0)
|
|
|
|
return -1;
|
|
|
|
result = moveSongInPlaylistById(added_id, to);
|
|
|
|
if (result != PLAYLIST_RESULT_SUCCESS) {
|
2008-09-07 13:52:48 +02:00
|
|
|
int ret = print_playlist_result(client, result);
|
2008-09-07 13:39:31 +02:00
|
|
|
deleteFromPlaylistById(added_id);
|
|
|
|
return ret;
|
2008-01-26 13:46:56 +01:00
|
|
|
}
|
|
|
|
}
|
2008-09-07 13:39:31 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
client_printf(client, "Id: %d\n", added_id);
|
2008-09-07 13:39:31 +02:00
|
|
|
return result;
|
2004-11-03 00:44:33 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleDelete(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
int song;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &song, argv[1], need_positive) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
|
|
|
|
result = deleteFromPlaylist(song);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleDeleteId(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-06-09 04:50:44 +02:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
int id;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2004-06-09 04:50:44 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &id, argv[1], need_positive) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
|
|
|
|
result = deleteFromPlaylistById(id);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2004-06-09 04:50:44 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlaylist(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-09-07 14:02:52 +02:00
|
|
|
showPlaylist(client);
|
2008-09-07 13:39:19 +02:00
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
static int handleShuffle(mpd_unused struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-09-07 13:39:31 +02:00
|
|
|
shufflePlaylist();
|
2008-09-07 13:39:19 +02:00
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleClear(mpd_unused struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-08-26 08:27:16 +02:00
|
|
|
clearPlaylist();
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleSave(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
|
|
|
|
|
|
|
result = savePlaylist(argv[1]);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleLoad(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-09-07 13:44:12 +02:00
|
|
|
enum playlist_result result;
|
|
|
|
|
2008-09-07 13:57:26 +02:00
|
|
|
result = loadPlaylist(client, argv[1]);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
2006-07-14 20:47:55 +02:00
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleListPlaylist(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-03-26 15:46:05 +02:00
|
|
|
{
|
2008-09-07 13:44:20 +02:00
|
|
|
int ret;
|
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
ret = PlaylistInfo(client, argv[1], 0);
|
2008-09-07 13:44:20 +02:00
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST, "No such playlist");
|
2008-09-07 13:44:20 +02:00
|
|
|
|
|
|
|
return ret;
|
2006-03-26 15:46:05 +02:00
|
|
|
}
|
2006-07-14 20:47:55 +02:00
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleListPlaylistInfo(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-03-26 15:46:05 +02:00
|
|
|
{
|
2008-09-07 13:44:20 +02:00
|
|
|
int ret;
|
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
ret = PlaylistInfo(client, argv[1], 1);
|
2008-09-07 13:44:20 +02:00
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST, "No such playlist");
|
2008-09-07 13:44:20 +02:00
|
|
|
|
|
|
|
return ret;
|
2006-03-26 15:46:05 +02:00
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleLsInfo(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-02-05 11:17:33 +01:00
|
|
|
const char *path = "";
|
2008-10-08 11:07:39 +02:00
|
|
|
const struct directory *directory;
|
2007-05-24 19:06:59 +02:00
|
|
|
|
|
|
|
if (argc == 2)
|
|
|
|
path = argv[1];
|
|
|
|
|
2008-10-08 11:07:55 +02:00
|
|
|
directory = db_get_directory(path);
|
2008-10-08 11:07:39 +02:00
|
|
|
if (directory == NULL) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST,
|
|
|
|
"directory not found");
|
2007-05-24 19:06:59 +02:00
|
|
|
return -1;
|
2008-09-07 13:49:01 +02:00
|
|
|
}
|
2007-05-24 19:06:59 +02:00
|
|
|
|
2008-10-08 11:07:39 +02:00
|
|
|
directory_print(client, directory);
|
|
|
|
|
2007-05-24 19:06:59 +02:00
|
|
|
if (isRootDirectory(path))
|
2008-09-07 14:02:40 +02:00
|
|
|
return lsPlaylists(client, path);
|
2007-05-24 19:06:59 +02:00
|
|
|
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleRm(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
|
|
|
|
|
|
|
result = deletePlaylist(argv[1]);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleRename(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2007-05-24 20:07:19 +02:00
|
|
|
{
|
2008-09-07 13:44:12 +02:00
|
|
|
enum playlist_result result;
|
|
|
|
|
2008-10-22 17:21:59 +02:00
|
|
|
result = spl_rename(argv[1], argv[2]);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2007-05-24 20:07:19 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlaylistChanges(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-06-05 03:14:37 +02:00
|
|
|
{
|
2008-09-29 15:49:29 +02:00
|
|
|
uint32_t version;
|
2004-06-05 03:14:37 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_uint32(client, &version, argv[1], need_positive) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:53:55 +02:00
|
|
|
return playlistChanges(client, version);
|
2004-06-05 03:14:37 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlaylistChangesPosId(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-04-23 13:10:41 +02:00
|
|
|
{
|
2008-09-29 15:49:29 +02:00
|
|
|
uint32_t version;
|
2006-04-23 13:10:41 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_uint32(client, &version, argv[1], need_positive) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 14:02:52 +02:00
|
|
|
return playlistChangesPosId(client, version);
|
2006-04-23 13:10:41 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlaylistInfo(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
int song = -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (argc == 2 && check_int(client, &song, argv[1], need_positive) < 0)
|
2008-01-26 13:46:53 +01:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
result = playlistInfo(client, song);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlaylistId(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2004-06-09 04:50:44 +02:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
int id = -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (argc == 2 && check_int(client, &id, argv[1], need_positive) < 0)
|
2008-01-26 13:46:53 +01:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
result = playlistId(client, id);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2004-06-09 04:50:44 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleFind(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2004-11-10 22:58:27 +01:00
|
|
|
int ret;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
LocateTagItem *items;
|
2006-07-29 20:54:56 +02:00
|
|
|
int numItems = newLocateTagItemArrayFromArgArray(argv + 1,
|
|
|
|
argc - 1,
|
2006-07-20 18:02:40 +02:00
|
|
|
&items);
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (numItems <= 0) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG, "incorrect arguments");
|
2004-11-10 22:58:27 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
ret = findSongsIn(client, NULL, numItems, items);
|
2008-09-07 13:48:37 +02:00
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST,
|
|
|
|
"directory or file not found");
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2004-11-12 02:44:27 +01:00
|
|
|
freeLocateTagItemArray(numItems, items);
|
2004-11-10 22:58:27 +01:00
|
|
|
|
|
|
|
return ret;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleSearch(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2004-11-10 22:58:27 +01:00
|
|
|
int ret;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
LocateTagItem *items;
|
2006-07-29 20:54:56 +02:00
|
|
|
int numItems = newLocateTagItemArrayFromArgArray(argv + 1,
|
|
|
|
argc - 1,
|
2006-07-20 18:02:40 +02:00
|
|
|
&items);
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (numItems <= 0) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG, "incorrect arguments");
|
2004-11-10 22:58:27 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
ret = searchForSongsIn(client, NULL, numItems, items);
|
2008-09-07 13:48:37 +02:00
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST,
|
|
|
|
"directory or file not found");
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2004-11-12 02:44:27 +01:00
|
|
|
freeLocateTagItemArray(numItems, items);
|
2004-11-10 22:58:27 +01:00
|
|
|
|
|
|
|
return ret;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleCount(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2007-04-26 01:46:11 +02:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
LocateTagItem *items;
|
|
|
|
int numItems = newLocateTagItemArrayFromArgArray(argv + 1,
|
|
|
|
argc - 1,
|
|
|
|
&items);
|
|
|
|
|
|
|
|
if (numItems <= 0) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG, "incorrect arguments");
|
2007-04-26 01:46:11 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
ret = searchStatsForSongsIn(client, NULL, numItems, items);
|
2008-09-07 13:48:37 +02:00
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST,
|
|
|
|
"directory or file not found");
|
2007-04-26 01:46:11 +02:00
|
|
|
|
|
|
|
freeLocateTagItemArray(numItems, items);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlaylistFind(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2007-02-24 03:00:03 +01:00
|
|
|
{
|
|
|
|
LocateTagItem *items;
|
|
|
|
int numItems = newLocateTagItemArrayFromArgArray(argv + 1,
|
|
|
|
argc - 1,
|
|
|
|
&items);
|
|
|
|
|
|
|
|
if (numItems <= 0) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG, "incorrect arguments");
|
2007-02-24 03:00:03 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
findSongsInPlaylist(client, numItems, items);
|
2007-02-24 03:00:03 +01:00
|
|
|
|
|
|
|
freeLocateTagItemArray(numItems, items);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlaylistSearch(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2007-02-24 03:00:03 +01:00
|
|
|
{
|
|
|
|
LocateTagItem *items;
|
|
|
|
int numItems = newLocateTagItemArrayFromArgArray(argv + 1,
|
|
|
|
argc - 1,
|
|
|
|
&items);
|
|
|
|
|
|
|
|
if (numItems <= 0) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG, "incorrect arguments");
|
2007-02-24 03:00:03 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
searchForSongsInPlaylist(client, numItems, items);
|
2007-02-24 03:00:03 +01:00
|
|
|
|
|
|
|
freeLocateTagItemArray(numItems, items);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlaylistDelete(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[]) {
|
2007-05-16 14:02:10 +02:00
|
|
|
char *playlist = argv[1];
|
|
|
|
int from;
|
2008-09-07 13:44:12 +02:00
|
|
|
enum playlist_result result;
|
2007-05-16 14:02:10 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &from, argv[2], check_integer, argv[2]) < 0)
|
2007-05-16 14:02:10 +02:00
|
|
|
return -1;
|
|
|
|
|
2008-10-22 17:21:59 +02:00
|
|
|
result = spl_remove_index(playlist, from);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2007-05-16 14:02:10 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlaylistMove(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused mpd_unused int argc, char *argv[])
|
2007-05-16 14:02:10 +02:00
|
|
|
{
|
|
|
|
char *playlist = argv[1];
|
|
|
|
int from, to;
|
2008-09-07 13:44:12 +02:00
|
|
|
enum playlist_result result;
|
2007-05-16 14:02:10 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &from, argv[2], check_integer, argv[2]) < 0)
|
2007-05-16 14:02:10 +02:00
|
|
|
return -1;
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &to, argv[3], check_integer, argv[3]) < 0)
|
2007-05-16 14:02:10 +02:00
|
|
|
return -1;
|
|
|
|
|
2008-10-22 17:21:59 +02:00
|
|
|
result = spl_move_index(playlist, from, to);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2007-05-16 14:02:10 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleUpdate(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-10-06 18:32:27 +02:00
|
|
|
char *path = NULL;
|
2008-10-09 19:20:05 +02:00
|
|
|
unsigned ret;
|
2008-09-07 13:50:06 +02:00
|
|
|
|
2008-10-06 18:32:27 +02:00
|
|
|
assert(argc <= 2);
|
|
|
|
if (argc == 2 && !(path = sanitizePathDup(argv[1]))) {
|
|
|
|
command_error(client, ACK_ERROR_ARG, "invalid path");
|
|
|
|
return -1;
|
2004-04-11 19:37:47 +02:00
|
|
|
}
|
2008-10-09 19:17:44 +02:00
|
|
|
|
|
|
|
ret = directory_update_init(path);
|
|
|
|
if (ret > 0) {
|
|
|
|
client_printf(client, "updating_db: %i\n", ret);
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
command_error(client, ACK_ERROR_UPDATE_ALREADY,
|
|
|
|
"already updating");
|
|
|
|
return -1;
|
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleNext(mpd_unused struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-08-26 08:27:16 +02:00
|
|
|
nextSongInPlaylist();
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePrevious(mpd_unused struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-08-26 08:27:16 +02:00
|
|
|
previousSongInPlaylist();
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleListAll(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
char *directory = NULL;
|
2008-09-07 13:48:37 +02:00
|
|
|
int ret;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-07-29 20:54:56 +02:00
|
|
|
if (argc == 2)
|
|
|
|
directory = argv[1];
|
2008-09-07 13:48:37 +02:00
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
ret = printAllIn(client, directory);
|
2008-09-07 13:48:37 +02:00
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST,
|
|
|
|
"directory or file not found");
|
2008-09-07 13:48:37 +02:00
|
|
|
|
|
|
|
return ret;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleVolume(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-09-07 13:50:16 +02:00
|
|
|
int change, ret;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &change, argv[1], need_integer) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:50:16 +02:00
|
|
|
|
|
|
|
ret = changeVolumeLevel(change, 1);
|
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_SYSTEM,
|
|
|
|
"problems setting volume");
|
2008-09-07 13:50:16 +02:00
|
|
|
|
|
|
|
return ret;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleSetVol(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-09-07 13:50:16 +02:00
|
|
|
int level, ret;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &level, argv[1], need_integer) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:50:16 +02:00
|
|
|
|
|
|
|
ret = changeVolumeLevel(level, 0);
|
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_SYSTEM,
|
|
|
|
"problems setting volume");
|
2008-09-07 13:50:16 +02:00
|
|
|
|
|
|
|
return ret;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleRepeat(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
int status;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &status, argv[1], need_integer) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:38:59 +02:00
|
|
|
|
|
|
|
if (status != 0 && status != 1) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG,
|
|
|
|
"\"%i\" is not 0 or 1", status);
|
2008-09-07 13:38:59 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
setPlaylistRepeatStatus(status);
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleRandom(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
int status;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &status, argv[1], need_integer) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:38:59 +02:00
|
|
|
|
|
|
|
if (status != 0 && status != 1) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG,
|
|
|
|
"\"%i\" is not 0 or 1", status);
|
2008-09-07 13:38:59 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
setPlaylistRandomStatus(status);
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleStats(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-09-07 14:02:57 +02:00
|
|
|
return printStats(client);
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleClearError(mpd_unused struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
clearPlayerError();
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleList(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-03-26 11:37:36 +01:00
|
|
|
int numConditionals;
|
2006-07-20 18:02:40 +02:00
|
|
|
LocateTagItem *conditionals = NULL;
|
2006-07-29 20:54:56 +02:00
|
|
|
int tagType = getLocateTagItemType(argv[1]);
|
2004-11-10 22:58:27 +01:00
|
|
|
int ret;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (tagType < 0) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG, "\"%s\" is not known", argv[1]);
|
2004-11-10 22:58:27 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-12-11 21:18:04 +01:00
|
|
|
if (tagType == LOCATE_TAG_ANY_TYPE) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG,
|
|
|
|
"\"any\" is not a valid return tag type");
|
2006-12-11 21:18:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-11-10 22:58:27 +01:00
|
|
|
/* for compatibility with < 0.12.0 */
|
2006-07-29 20:54:56 +02:00
|
|
|
if (argc == 3) {
|
2006-07-20 18:02:40 +02:00
|
|
|
if (tagType != TAG_ITEM_ALBUM) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG,
|
|
|
|
"should be \"%s\" for 3 arguments",
|
|
|
|
mpdTagItemKeys[TAG_ITEM_ALBUM]);
|
2004-11-10 22:58:27 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
conditionals = newLocateTagItem(mpdTagItemKeys[TAG_ITEM_ARTIST],
|
2006-07-29 20:54:56 +02:00
|
|
|
argv[2]);
|
2004-11-10 22:58:27 +01:00
|
|
|
numConditionals = 1;
|
2006-07-20 18:02:40 +02:00
|
|
|
} else {
|
|
|
|
numConditionals =
|
2006-07-29 20:54:56 +02:00
|
|
|
newLocateTagItemArrayFromArgArray(argv + 2,
|
2006-08-26 08:25:44 +02:00
|
|
|
argc - 2, &conditionals);
|
2006-07-20 18:02:40 +02:00
|
|
|
|
|
|
|
if (numConditionals < 0) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_ARG,
|
|
|
|
"not able to parse args");
|
2004-11-12 02:44:27 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2006-07-14 20:47:55 +02:00
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
ret = listAllUniqueTags(client, tagType, numConditionals, conditionals);
|
2004-11-10 22:58:27 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (conditionals)
|
|
|
|
freeLocateTagItemArray(numConditionals, conditionals);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-09-07 13:48:37 +02:00
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST,
|
|
|
|
"directory or file not found");
|
2008-09-07 13:48:37 +02:00
|
|
|
|
2004-11-10 22:58:27 +01:00
|
|
|
return ret;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleMove(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-01-26 13:46:53 +01:00
|
|
|
int from, to;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &from, argv[1], check_integer, argv[1]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &to, argv[2], check_integer, argv[2]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
result = moveSongInPlaylist(from, to);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleMoveId(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-01-26 13:46:53 +01:00
|
|
|
int id, to;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &id, argv[1], check_integer, argv[1]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &to, argv[2], check_integer, argv[2]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
result = moveSongInPlaylistById(id, to);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleSwap(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-01-26 13:46:53 +01:00
|
|
|
int song1, song2;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &song1, argv[1], check_integer, argv[1]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &song2, argv[2], check_integer, argv[2]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
result = swapSongsInPlaylist(song1, song2);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleSwapId(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-01-26 13:46:53 +01:00
|
|
|
int id1, id2;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &id1, argv[1], check_integer, argv[1]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &id2, argv[2], check_integer, argv[2]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
result = swapSongsInPlaylistById(id1, id2);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleSeek(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-01-26 13:46:53 +01:00
|
|
|
int song, seek_time;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &song, argv[1], check_integer, argv[1]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &seek_time, argv[2], check_integer, argv[2]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
|
|
|
|
result = seekSongInPlaylist(song, seek_time);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleSeekId(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-01-26 13:46:53 +01:00
|
|
|
int id, seek_time;
|
2008-09-07 13:39:31 +02:00
|
|
|
enum playlist_result result;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &id, argv[1], check_integer, argv[1]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &seek_time, argv[2], check_integer, argv[2]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:39:31 +02:00
|
|
|
|
|
|
|
result = seekSongInPlaylistById(id, seek_time);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleListAllInfo(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
|
|
|
char *directory = NULL;
|
2008-09-07 13:48:37 +02:00
|
|
|
int ret;
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2006-07-29 20:54:56 +02:00
|
|
|
if (argc == 2)
|
|
|
|
directory = argv[1];
|
2008-09-07 13:52:48 +02:00
|
|
|
|
2008-09-07 13:53:55 +02:00
|
|
|
ret = printInfoForAllIn(client, directory);
|
2008-09-07 13:48:37 +02:00
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST,
|
|
|
|
"directory or file not found");
|
2008-09-07 13:48:37 +02:00
|
|
|
|
|
|
|
return ret;
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePing(mpd_unused struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePassword(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
2008-10-17 23:53:28 +02:00
|
|
|
unsigned permission = 0;
|
2008-09-07 19:17:25 +02:00
|
|
|
|
|
|
|
if (getPermissionFromPassword(argv[1], &permission) < 0) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_PASSWORD, "incorrect password");
|
2004-02-24 00:41:20 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
client_set_permission(client, permission);
|
|
|
|
|
2004-02-24 00:41:20 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleCrossfade(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2008-01-26 13:46:21 +01:00
|
|
|
int xfade_time;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &xfade_time, argv[1], check_non_negative, argv[1]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-01-26 13:46:21 +01:00
|
|
|
setPlayerCrossFade(xfade_time);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleEnableDevice(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-11-02 23:13:58 +01:00
|
|
|
{
|
2008-09-07 13:51:50 +02:00
|
|
|
int device, ret;
|
2004-11-02 23:13:58 +01:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &device, argv[1], check_non_negative, argv[1]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:51:50 +02:00
|
|
|
|
|
|
|
ret = enableAudioDevice(device);
|
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST,
|
|
|
|
"No such audio output");
|
2008-09-07 13:51:50 +02:00
|
|
|
|
|
|
|
return ret;
|
2004-11-02 23:13:58 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleDisableDevice(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2004-11-02 23:13:58 +01:00
|
|
|
{
|
2008-09-07 13:51:50 +02:00
|
|
|
int device, ret;
|
2004-11-02 23:13:58 +01:00
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
if (check_int(client, &device, argv[1], check_non_negative, argv[1]) < 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2008-09-07 13:51:50 +02:00
|
|
|
|
|
|
|
ret = disableAudioDevice(device);
|
|
|
|
if (ret == -1)
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST,
|
|
|
|
"No such audio output");
|
2008-09-07 13:51:50 +02:00
|
|
|
|
|
|
|
return ret;
|
2004-11-02 23:13:58 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleDevices(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
2004-11-03 00:08:00 +01:00
|
|
|
{
|
2008-09-07 14:04:16 +02:00
|
|
|
printAudioDevices(client);
|
2004-11-03 00:08:00 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-11-08 19:01:36 +01:00
|
|
|
/* don't be fooled, this is the command handler for "commands" command */
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleCommands(struct client *client,
|
2008-10-22 10:08:14 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[]);
|
2004-11-08 19:01:36 +01:00
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handleNotcommands(struct client *client,
|
2008-10-22 10:08:14 +02:00
|
|
|
mpd_unused int argc, mpd_unused char *argv[]);
|
2004-11-23 20:46:33 +01:00
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlaylistClear(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-12-07 15:41:40 +01:00
|
|
|
{
|
2008-09-07 13:44:12 +02:00
|
|
|
enum playlist_result result;
|
|
|
|
|
2008-10-22 17:23:58 +02:00
|
|
|
result = spl_clear(argv[1]);
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2006-12-07 15:41:40 +01:00
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
static int handlePlaylistAdd(struct client *client,
|
2008-08-26 08:27:02 +02:00
|
|
|
mpd_unused int argc, char *argv[])
|
2006-12-07 15:41:40 +01:00
|
|
|
{
|
|
|
|
char *playlist = argv[1];
|
|
|
|
char *path = argv[2];
|
2008-09-07 13:44:12 +02:00
|
|
|
enum playlist_result result;
|
2006-12-07 15:41:40 +01:00
|
|
|
|
|
|
|
if (isRemoteUrl(path))
|
2008-10-22 17:23:58 +02:00
|
|
|
result = spl_append_uri(path, playlist);
|
2008-09-07 13:44:12 +02:00
|
|
|
else
|
2008-09-07 13:48:37 +02:00
|
|
|
result = addAllInToStoredPlaylist(path, playlist);
|
|
|
|
|
|
|
|
if (result == (enum playlist_result)-1) {
|
2008-09-07 13:52:48 +02:00
|
|
|
command_error(client, ACK_ERROR_NO_EXIST,
|
|
|
|
"directory or file not found");
|
2008-09-07 13:48:37 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-09-07 13:52:48 +02:00
|
|
|
return print_playlist_result(client, result);
|
2006-12-07 15:41:40 +01:00
|
|
|
}
|
|
|
|
|
2008-10-14 22:38:14 +02:00
|
|
|
static int
|
|
|
|
handle_idle(struct client *client,
|
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
|
|
|
{
|
|
|
|
/* enable "idle" mode on this client */
|
|
|
|
client_idle_wait(client);
|
|
|
|
|
|
|
|
/* return value is "1" so the caller won't print "OK" */
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2008-10-22 10:08:14 +02:00
|
|
|
/**
|
|
|
|
* The command registry.
|
|
|
|
*
|
|
|
|
* This array must be sorted!
|
|
|
|
*/
|
|
|
|
static const struct command commands[] = {
|
|
|
|
{ "add", PERMISSION_ADD, 1, 1, handleAdd },
|
|
|
|
{ "addid", PERMISSION_ADD, 1, 2, handleAddId },
|
|
|
|
{ "clear", PERMISSION_CONTROL, 0, 0, handleClear },
|
|
|
|
{ "clearerror", PERMISSION_CONTROL, 0, 0, handleClearError },
|
|
|
|
{ "close", PERMISSION_NONE, -1, -1, handleClose },
|
|
|
|
{ "commands", PERMISSION_NONE, 0, 0, handleCommands },
|
|
|
|
{ "count", PERMISSION_READ, 2, -1, handleCount },
|
|
|
|
{ "crossfade", PERMISSION_CONTROL, 1, 1, handleCrossfade },
|
|
|
|
{ "currentsong", PERMISSION_READ, 0, 0, handleCurrentSong },
|
|
|
|
{ "delete", PERMISSION_CONTROL, 1, 1, handleDelete },
|
|
|
|
{ "deleteid", PERMISSION_CONTROL, 1, 1, handleDeleteId },
|
|
|
|
{ "disableoutput", PERMISSION_ADMIN, 1, 1, handleDisableDevice },
|
|
|
|
{ "enableoutput", PERMISSION_ADMIN, 1, 1, handleEnableDevice },
|
|
|
|
{ "find", PERMISSION_READ, 2, -1, handleFind },
|
|
|
|
{ "idle", PERMISSION_READ, 0, 0, handle_idle },
|
|
|
|
{ "kill", PERMISSION_ADMIN, -1, -1, handleKill },
|
|
|
|
{ "list", PERMISSION_READ, 1, -1, handleList },
|
|
|
|
{ "listall", PERMISSION_READ, 0, 1, handleListAll },
|
|
|
|
{ "listallinfo", PERMISSION_READ, 0, 1, handleListAllInfo },
|
|
|
|
{ "listplaylist", PERMISSION_READ, 1, 1, handleListPlaylist },
|
|
|
|
{ "listplaylistinfo", PERMISSION_READ, 1, 1, handleListPlaylistInfo },
|
|
|
|
{ "load", PERMISSION_ADD, 1, 1, handleLoad },
|
|
|
|
{ "lsinfo", PERMISSION_READ, 0, 1, handleLsInfo },
|
|
|
|
{ "move", PERMISSION_CONTROL, 2, 2, handleMove },
|
|
|
|
{ "moveid", PERMISSION_CONTROL, 2, 2, handleMoveId },
|
|
|
|
{ "next", PERMISSION_CONTROL, 0, 0, handleNext },
|
|
|
|
{ "notcommands", PERMISSION_NONE, 0, 0, handleNotcommands },
|
|
|
|
{ "outputs", PERMISSION_READ, 0, 0, handleDevices },
|
|
|
|
{ "password", PERMISSION_NONE, 1, 1, handlePassword },
|
|
|
|
{ "pause", PERMISSION_CONTROL, 0, 1, handlePause },
|
|
|
|
{ "ping", PERMISSION_NONE, 0, 0, handlePing },
|
|
|
|
{ "play", PERMISSION_CONTROL, 0, 1, handlePlay },
|
|
|
|
{ "playid", PERMISSION_CONTROL, 0, 1, handlePlayId },
|
|
|
|
{ "playlist", PERMISSION_READ, 0, 0, handlePlaylist },
|
|
|
|
{ "playlistadd", PERMISSION_CONTROL, 2, 2, handlePlaylistAdd },
|
|
|
|
{ "playlistclear", PERMISSION_CONTROL, 1, 1, handlePlaylistClear },
|
|
|
|
{ "playlistdelete", PERMISSION_CONTROL, 2, 2, handlePlaylistDelete },
|
|
|
|
{ "playlistfind", PERMISSION_READ, 2, -1, handlePlaylistFind },
|
|
|
|
{ "playlistid", PERMISSION_READ, 0, 1, handlePlaylistId },
|
|
|
|
{ "playlistinfo", PERMISSION_READ, 0, 1, handlePlaylistInfo },
|
|
|
|
{ "playlistmove", PERMISSION_CONTROL, 3, 3, handlePlaylistMove },
|
|
|
|
{ "playlistsearch", PERMISSION_READ, 2, -1, handlePlaylistSearch },
|
|
|
|
{ "plchanges", PERMISSION_READ, 1, 1, handlePlaylistChanges },
|
|
|
|
{ "plchangesposid", PERMISSION_READ, 1, 1,
|
|
|
|
handlePlaylistChangesPosId },
|
|
|
|
{ "previous", PERMISSION_CONTROL, 0, 0, handlePrevious },
|
|
|
|
{ "random", PERMISSION_CONTROL, 1, 1, handleRandom },
|
|
|
|
{ "rename", PERMISSION_CONTROL, 2, 2, handleRename },
|
|
|
|
{ "repeat", PERMISSION_CONTROL, 1, 1, handleRepeat },
|
|
|
|
{ "rm", PERMISSION_CONTROL, 1, 1, handleRm },
|
|
|
|
{ "save", PERMISSION_CONTROL, 1, 1, handleSave },
|
|
|
|
{ "search", PERMISSION_READ, 2, -1, handleSearch },
|
|
|
|
{ "seek", PERMISSION_CONTROL, 2, 2, handleSeek },
|
|
|
|
{ "seekid", PERMISSION_CONTROL, 2, 2, handleSeekId },
|
|
|
|
{ "setvol", PERMISSION_CONTROL, 1, 1, handleSetVol },
|
|
|
|
{ "shuffle", PERMISSION_CONTROL, 0, 0, handleShuffle },
|
|
|
|
{ "stats", PERMISSION_READ, 0, 0, handleStats },
|
|
|
|
{ "status", PERMISSION_READ, 0, 0, commandStatus },
|
|
|
|
{ "stop", PERMISSION_CONTROL, 0, 0, handleStop },
|
|
|
|
{ "swap", PERMISSION_CONTROL, 2, 2, handleSwap },
|
|
|
|
{ "swapid", PERMISSION_CONTROL, 2, 2, handleSwapId },
|
|
|
|
{ "tagtypes", PERMISSION_READ, 0, 0, handleTagTypes },
|
|
|
|
{ "update", PERMISSION_ADMIN, 0, 1, handleUpdate },
|
|
|
|
{ "urlhandlers", PERMISSION_READ, 0, 0, handleUrlHandlers },
|
|
|
|
{ "volume", PERMISSION_CONTROL, 1, 1, handleVolume },
|
|
|
|
};
|
|
|
|
|
|
|
|
static const unsigned num_commands = sizeof(commands) / sizeof(commands[0]);
|
|
|
|
|
|
|
|
/* don't be fooled, this is the command handler for "commands" command */
|
|
|
|
static int handleCommands(struct client *client,
|
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
|
|
|
{
|
|
|
|
const unsigned permission = client_get_permission(client);
|
|
|
|
const struct command *cmd;
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < num_commands; ++i) {
|
|
|
|
cmd = &commands[i];
|
|
|
|
|
|
|
|
if (cmd->reqPermission == (permission & cmd->reqPermission)) {
|
|
|
|
client_printf(client, "command: %s\n", cmd->cmd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int handleNotcommands(struct client *client,
|
|
|
|
mpd_unused int argc, mpd_unused char *argv[])
|
|
|
|
{
|
|
|
|
const unsigned permission = client_get_permission(client);
|
|
|
|
const struct command *cmd;
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < num_commands; ++i) {
|
|
|
|
cmd = &commands[i];
|
|
|
|
|
|
|
|
if (cmd->reqPermission != (permission & cmd->reqPermission)) {
|
|
|
|
client_printf(client, "command: %s\n", cmd->cmd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
void initCommands(void)
|
|
|
|
{
|
2008-10-22 10:08:14 +02:00
|
|
|
#ifndef NDEBUG
|
|
|
|
/* ensure that the command list is sorted */
|
|
|
|
for (unsigned i = 0; i < num_commands - 1; ++i)
|
|
|
|
assert(strcmp(commands[i].cmd, commands[i + 1].cmd) < 0);
|
|
|
|
#endif
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void finishCommands(void)
|
|
|
|
{
|
2008-10-22 10:08:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static const struct command *
|
|
|
|
command_lookup(const char *name)
|
|
|
|
{
|
|
|
|
unsigned a = 0, b = num_commands, i;
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
/* binary search */
|
|
|
|
do {
|
|
|
|
i = (a + b) / 2;
|
|
|
|
|
|
|
|
cmp = strcmp(name, commands[i].cmd);
|
|
|
|
if (cmp == 0)
|
|
|
|
return &commands[i];
|
|
|
|
else if (cmp < 0)
|
|
|
|
b = i;
|
|
|
|
else if (cmp > 0)
|
|
|
|
a = i + 1;
|
|
|
|
} while (a < b);
|
|
|
|
|
|
|
|
return NULL;
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
|
|
|
|
2008-10-22 09:59:01 +02:00
|
|
|
static int
|
|
|
|
checkArgcAndPermission(const struct command *cmd, struct client *client,
|
|
|
|
unsigned permission, int argc, char *argv[])
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
|
|
|
int min = cmd->min + 1;
|
|
|
|
int max = cmd->max + 1;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
if (cmd->reqPermission != (permission & cmd->reqPermission)) {
|
2008-09-07 13:52:36 +02:00
|
|
|
if (client != NULL)
|
|
|
|
command_error(client, ACK_ERROR_PERMISSION,
|
|
|
|
"you don't have permission for \"%s\"",
|
|
|
|
cmd->cmd);
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (min == 0)
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (min == max && max != argc) {
|
2008-09-07 13:52:36 +02:00
|
|
|
if (client != NULL)
|
|
|
|
command_error(client, ACK_ERROR_ARG,
|
|
|
|
"wrong number of arguments for \"%s\"",
|
|
|
|
argv[0]);
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
|
|
|
} else if (argc < min) {
|
2008-09-07 13:52:36 +02:00
|
|
|
if (client != NULL)
|
|
|
|
command_error(client, ACK_ERROR_ARG,
|
|
|
|
"too few arguments for \"%s\"", argv[0]);
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
|
|
|
} else if (argc > max && max /* != 0 */ ) {
|
2008-09-07 13:52:36 +02:00
|
|
|
if (client != NULL)
|
|
|
|
command_error(client, ACK_ERROR_ARG,
|
|
|
|
"too many arguments for \"%s\"", argv[0]);
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
|
|
|
} else
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2008-10-22 09:59:01 +02:00
|
|
|
static const struct command *
|
|
|
|
getCommandEntryAndCheckArgcAndPermission(struct client *client,
|
|
|
|
unsigned permission,
|
|
|
|
int argc, char *argv[])
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
2004-06-04 03:58:31 +02:00
|
|
|
static char unknown[] = "";
|
2008-10-22 09:59:01 +02:00
|
|
|
const struct command *cmd;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2004-06-04 03:58:31 +02:00
|
|
|
current_command = unknown;
|
|
|
|
|
2006-07-29 20:54:56 +02:00
|
|
|
if (argc == 0)
|
2006-07-20 18:02:40 +02:00
|
|
|
return NULL;
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2008-10-22 10:08:14 +02:00
|
|
|
cmd = command_lookup(argv[0]);
|
|
|
|
if (cmd == NULL) {
|
2008-09-07 13:52:36 +02:00
|
|
|
if (client != NULL)
|
|
|
|
command_error(client, ACK_ERROR_UNKNOWN,
|
|
|
|
"unknown command \"%s\"", argv[0]);
|
2006-07-20 18:02:40 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2004-06-04 03:58:31 +02:00
|
|
|
current_command = cmd->cmd;
|
|
|
|
|
2008-09-07 19:15:45 +02:00
|
|
|
if (checkArgcAndPermission(cmd, client, permission, argc, argv) < 0) {
|
2004-04-11 19:37:47 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return cmd;
|
|
|
|
}
|
|
|
|
|
2008-10-06 18:39:33 +02:00
|
|
|
int processCommand(struct client *client, char *commandString)
|
2004-04-11 19:37:47 +02:00
|
|
|
{
|
2006-10-06 12:33:27 +02:00
|
|
|
int argc;
|
|
|
|
char *argv[COMMAND_ARGV_MAX] = { NULL };
|
2008-10-22 09:59:01 +02:00
|
|
|
const struct command *cmd;
|
2004-04-12 03:44:52 +02:00
|
|
|
int ret = -1;
|
|
|
|
|
2008-10-06 18:39:33 +02:00
|
|
|
if (!(argc = buffer2array(commandString, argv, COMMAND_ARGV_MAX)))
|
2006-07-20 18:02:40 +02:00
|
|
|
return 0;
|
2004-04-11 19:37:47 +02:00
|
|
|
|
2008-10-06 18:39:33 +02:00
|
|
|
cmd = getCommandEntryAndCheckArgcAndPermission(client,
|
|
|
|
client_get_permission(client),
|
|
|
|
argc, argv);
|
|
|
|
if (cmd)
|
|
|
|
ret = cmd->handler(client, argc, argv);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2004-06-04 03:58:31 +02:00
|
|
|
current_command = NULL;
|
|
|
|
|
2004-04-12 03:44:52 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-09-07 19:17:25 +02:00
|
|
|
int processListOfCommands(struct client *client,
|
2006-07-30 05:43:38 +02:00
|
|
|
int listOK, struct strnode *list)
|
2004-04-12 03:44:52 +02:00
|
|
|
{
|
2006-07-30 05:43:38 +02:00
|
|
|
struct strnode *cur = list;
|
2004-04-12 03:44:52 +02:00
|
|
|
int ret = 0;
|
|
|
|
|
2004-06-04 03:58:31 +02:00
|
|
|
command_listNum = 0;
|
|
|
|
|
2006-07-30 05:43:38 +02:00
|
|
|
while (cur) {
|
2006-07-14 20:47:55 +02:00
|
|
|
DEBUG("processListOfCommands: process command \"%s\"\n",
|
2006-07-30 05:43:38 +02:00
|
|
|
cur->data);
|
2008-10-06 18:39:33 +02:00
|
|
|
ret = processCommand(client, cur->data);
|
2006-07-20 18:02:40 +02:00
|
|
|
DEBUG("processListOfCommands: command returned %i\n", ret);
|
2008-08-29 09:37:11 +02:00
|
|
|
if (ret != 0 || client_is_expired(client))
|
2006-07-30 05:43:38 +02:00
|
|
|
goto out;
|
2006-07-20 18:02:40 +02:00
|
|
|
else if (listOK)
|
2008-09-07 13:24:51 +02:00
|
|
|
client_puts(client, "list_OK\n");
|
2004-06-04 03:58:31 +02:00
|
|
|
command_listNum++;
|
2006-07-30 05:43:38 +02:00
|
|
|
cur = cur->next;
|
2004-04-11 19:37:47 +02:00
|
|
|
}
|
2006-07-30 05:43:38 +02:00
|
|
|
out:
|
2004-06-04 03:58:31 +02:00
|
|
|
command_listNum = 0;
|
2004-04-12 03:44:52 +02:00
|
|
|
return ret;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|