command: move remaining handlers to OtherCommands.cxx

This commit is contained in:
Max Kellermann 2012-09-25 11:44:49 +02:00
parent e7e52c24f5
commit 510c4a3ef1
4 changed files with 388 additions and 277 deletions

View File

@ -242,6 +242,7 @@ src_mpd_SOURCES = \
src/DatabaseCommands.cxx src/DatabaseCommands.hxx \
src/OutputCommands.cxx src/OutputCommands.hxx \
src/MessageCommands.cxx src/MessageCommands.hxx \
src/OtherCommands.cxx src/OtherCommands.hxx \
src/idle.c \
src/cmdline.c \
src/conf.c \

315
src/OtherCommands.cxx Normal file
View File

@ -0,0 +1,315 @@
/*
* Copyright (C) 2003-2012 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 "OtherCommands.hxx"
#include "DatabaseCommands.hxx"
#include "CommandError.h"
#include "directory.h"
#include "song.h"
extern "C" {
#include "protocol/argparser.h"
#include "protocol/result.h"
#include "time_print.h"
#include "ls.h"
#include "uri.h"
#include "decoder_print.h"
#include "update.h"
#include "volume.h"
#include "stats.h"
#include "permission.h"
#include "stored_playlist.h"
#include "client.h"
#include "client_idle.h"
#include "client_file.h"
#include "tag_print.h"
#include "idle.h"
#include "mapper.h"
#include "song_print.h"
}
#ifdef ENABLE_SQLITE
#include "sticker.h"
#endif
#include <assert.h>
#include <string.h>
static void
print_spl_list(struct client *client, GPtrArray *list)
{
for (unsigned i = 0; i < list->len; ++i) {
struct stored_playlist_info *playlist =
(struct stored_playlist_info *)
g_ptr_array_index(list, i);
client_printf(client, "playlist: %s\n", playlist->name);
if (playlist->mtime > 0)
time_print(client, "Last-Modified", playlist->mtime);
}
}
enum command_return
handle_urlhandlers(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
if (client_is_local(client))
client_puts(client, "handler: file://\n");
print_supported_uri_schemes(client);
return COMMAND_RETURN_OK;
}
enum command_return
handle_decoders(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
decoder_list_print(client);
return COMMAND_RETURN_OK;
}
enum command_return
handle_tagtypes(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
tag_print_types(client);
return COMMAND_RETURN_OK;
}
enum command_return
handle_kill(G_GNUC_UNUSED struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
return COMMAND_RETURN_KILL;
}
enum command_return
handle_close(G_GNUC_UNUSED struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
return COMMAND_RETURN_CLOSE;
}
enum command_return
handle_lsinfo(struct client *client, int argc, char *argv[])
{
const char *uri;
if (argc == 2)
uri = argv[1];
else
/* default is root directory */
uri = "";
if (strncmp(uri, "file:///", 8) == 0) {
/* print information about an arbitrary local file */
const char *path = uri + 7;
GError *error = NULL;
if (!client_allow_file(client, path, &error))
return print_error(client, error);
struct song *song = song_file_load(path, NULL);
if (song == NULL) {
command_error(client, ACK_ERROR_NO_EXIST,
"No such file");
return COMMAND_RETURN_ERROR;
}
song_print_info(client, song);
song_free(song);
return COMMAND_RETURN_OK;
}
enum command_return result = handle_lsinfo2(client, argc, argv);
if (result != COMMAND_RETURN_OK)
return result;
if (isRootDirectory(uri)) {
GPtrArray *list = spl_list(NULL);
if (list != NULL) {
print_spl_list(client, list);
spl_list_free(list);
}
}
return COMMAND_RETURN_OK;
}
enum command_return
handle_update(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
{
const char *path = NULL;
unsigned ret;
assert(argc <= 2);
if (argc == 2) {
path = argv[1];
if (*path == 0 || strcmp(path, "/") == 0)
/* backwards compatibility with MPD 0.15 */
path = NULL;
else if (!uri_safe_local(path)) {
command_error(client, ACK_ERROR_ARG,
"Malformed path");
return COMMAND_RETURN_ERROR;
}
}
ret = update_enqueue(path, false);
if (ret > 0) {
client_printf(client, "updating_db: %i\n", ret);
return COMMAND_RETURN_OK;
} else {
command_error(client, ACK_ERROR_UPDATE_ALREADY,
"already updating");
return COMMAND_RETURN_ERROR;
}
}
enum command_return
handle_rescan(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
{
const char *path = NULL;
unsigned ret;
assert(argc <= 2);
if (argc == 2) {
path = argv[1];
if (!uri_safe_local(path)) {
command_error(client, ACK_ERROR_ARG,
"Malformed path");
return COMMAND_RETURN_ERROR;
}
}
ret = update_enqueue(path, true);
if (ret > 0) {
client_printf(client, "updating_db: %i\n", ret);
return COMMAND_RETURN_OK;
} else {
command_error(client, ACK_ERROR_UPDATE_ALREADY,
"already updating");
return COMMAND_RETURN_ERROR;
}
}
enum command_return
handle_setvol(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
{
unsigned level;
bool success;
if (!check_unsigned(client, &level, argv[1]))
return COMMAND_RETURN_ERROR;
if (level > 100) {
command_error(client, ACK_ERROR_ARG, "Invalid volume value");
return COMMAND_RETURN_ERROR;
}
success = volume_level_change(level);
if (!success) {
command_error(client, ACK_ERROR_SYSTEM,
"problems setting volume");
return COMMAND_RETURN_ERROR;
}
return COMMAND_RETURN_OK;
}
enum command_return
handle_stats(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
stats_print(client);
return COMMAND_RETURN_OK;
}
enum command_return
handle_ping(G_GNUC_UNUSED struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
return COMMAND_RETURN_OK;
}
enum command_return
handle_password(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
{
unsigned permission = 0;
if (getPermissionFromPassword(argv[1], &permission) < 0) {
command_error(client, ACK_ERROR_PASSWORD, "incorrect password");
return COMMAND_RETURN_ERROR;
}
client_set_permission(client, permission);
return COMMAND_RETURN_OK;
}
enum command_return
handle_config(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
if (!client_is_local(client)) {
command_error(client, ACK_ERROR_PERMISSION,
"Command only permitted to local clients");
return COMMAND_RETURN_ERROR;
}
const char *path = mapper_get_music_directory_utf8();
if (path != NULL)
client_printf(client, "music_directory: %s\n", path);
return COMMAND_RETURN_OK;
}
enum command_return
handle_idle(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
unsigned flags = 0, j;
int i;
const char *const* idle_names;
idle_names = idle_get_names();
for (i = 1; i < argc; ++i) {
if (!argv[i])
continue;
for (j = 0; idle_names[j]; ++j) {
if (!g_ascii_strcasecmp(argv[i], idle_names[j])) {
flags |= (1 << j);
}
}
}
/* No argument means that the client wants to receive everything */
if (flags == 0)
flags = ~0;
/* enable "idle" mode on this client */
client_idle_wait(client, flags);
/* return value is "1" so the caller won't print "OK" */
return (enum command_return)1;
}

71
src/OtherCommands.hxx Normal file
View File

@ -0,0 +1,71 @@
/*
* Copyright (C) 2003-2012 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_OTHER_COMMANDS_HXX
#define MPD_OTHER_COMMANDS_HXX
#include "command.h"
G_BEGIN_DECLS
enum command_return
handle_urlhandlers(struct client *client, int argc, char *argv[]);
enum command_return
handle_decoders(struct client *client, int argc, char *argv[]);
enum command_return
handle_tagtypes(struct client *client, int argc, char *argv[]);
enum command_return
handle_kill(struct client *client, int argc, char *argv[]);
enum command_return
handle_close(struct client *client, int argc, char *argv[]);
enum command_return
handle_lsinfo(struct client *client, int argc, char *argv[]);
enum command_return
handle_update(struct client *client, int argc, char *argv[]);
enum command_return
handle_rescan(struct client *client, int argc, char *argv[]);
enum command_return
handle_setvol(struct client *client, int argc, char *argv[]);
enum command_return
handle_stats(struct client *client, int argc, char *argv[]);
enum command_return
handle_ping(struct client *client, int argc, char *argv[]);
enum command_return
handle_password(struct client *client, int argc, char *argv[]);
enum command_return
handle_config(struct client *client, int argc, char *argv[]);
enum command_return
handle_idle(struct client *client, int argc, char *argv[]);
G_END_DECLS
#endif

View File

@ -26,29 +26,14 @@
#include "OutputCommands.hxx"
#include "StickerCommands.hxx"
#include "MessageCommands.hxx"
#include "OtherCommands.hxx"
#include "CommandError.h"
#include "protocol/argparser.h"
#include "protocol/result.h"
#include "time_print.h"
#include "ls.h"
#include "uri.h"
#include "decoder_print.h"
#include "directory.h"
#include "update.h"
#include "volume.h"
#include "stats.h"
#include "permission.h"
#include "tokenizer.h"
#include "stored_playlist.h"
#include "tag.h"
#include "client.h"
#include "client_idle.h"
#include "client_file.h"
#include "tag_print.h"
#include "idle.h"
#include "mapper.h"
#include "song.h"
#include "song_print.h"
#ifdef ENABLE_SQLITE
#include "sticker.h"
@ -74,219 +59,6 @@ struct command {
enum command_return (*handler)(struct client *client, int argc, char **argv);
};
static void
print_spl_list(struct client *client, GPtrArray *list)
{
for (unsigned i = 0; i < list->len; ++i) {
struct stored_playlist_info *playlist =
g_ptr_array_index(list, i);
client_printf(client, "playlist: %s\n", playlist->name);
if (playlist->mtime > 0)
time_print(client, "Last-Modified", playlist->mtime);
}
}
static enum command_return
handle_urlhandlers(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
if (client_is_local(client))
client_puts(client, "handler: file://\n");
print_supported_uri_schemes(client);
return COMMAND_RETURN_OK;
}
static enum command_return
handle_decoders(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
decoder_list_print(client);
return COMMAND_RETURN_OK;
}
static enum command_return
handle_tagtypes(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
tag_print_types(client);
return COMMAND_RETURN_OK;
}
static enum command_return
handle_kill(G_GNUC_UNUSED struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
return COMMAND_RETURN_KILL;
}
static enum command_return
handle_close(G_GNUC_UNUSED struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
return COMMAND_RETURN_CLOSE;
}
static enum command_return
handle_lsinfo(struct client *client, int argc, char *argv[])
{
const char *uri;
if (argc == 2)
uri = argv[1];
else
/* default is root directory */
uri = "";
if (strncmp(uri, "file:///", 8) == 0) {
/* print information about an arbitrary local file */
const char *path = uri + 7;
GError *error = NULL;
if (!client_allow_file(client, path, &error))
return print_error(client, error);
struct song *song = song_file_load(path, NULL);
if (song == NULL) {
command_error(client, ACK_ERROR_NO_EXIST,
"No such file");
return COMMAND_RETURN_ERROR;
}
song_print_info(client, song);
song_free(song);
return COMMAND_RETURN_OK;
}
enum command_return result = handle_lsinfo2(client, argc, argv);
if (result != COMMAND_RETURN_OK)
return result;
if (isRootDirectory(uri)) {
GPtrArray *list = spl_list(NULL);
if (list != NULL) {
print_spl_list(client, list);
spl_list_free(list);
}
}
return COMMAND_RETURN_OK;
}
static enum command_return
handle_update(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
{
const char *path = NULL;
unsigned ret;
assert(argc <= 2);
if (argc == 2) {
path = argv[1];
if (*path == 0 || strcmp(path, "/") == 0)
/* backwards compatibility with MPD 0.15 */
path = NULL;
else if (!uri_safe_local(path)) {
command_error(client, ACK_ERROR_ARG,
"Malformed path");
return COMMAND_RETURN_ERROR;
}
}
ret = update_enqueue(path, false);
if (ret > 0) {
client_printf(client, "updating_db: %i\n", ret);
return COMMAND_RETURN_OK;
} else {
command_error(client, ACK_ERROR_UPDATE_ALREADY,
"already updating");
return COMMAND_RETURN_ERROR;
}
}
static enum command_return
handle_rescan(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
{
const char *path = NULL;
unsigned ret;
assert(argc <= 2);
if (argc == 2) {
path = argv[1];
if (!uri_safe_local(path)) {
command_error(client, ACK_ERROR_ARG,
"Malformed path");
return COMMAND_RETURN_ERROR;
}
}
ret = update_enqueue(path, true);
if (ret > 0) {
client_printf(client, "updating_db: %i\n", ret);
return COMMAND_RETURN_OK;
} else {
command_error(client, ACK_ERROR_UPDATE_ALREADY,
"already updating");
return COMMAND_RETURN_ERROR;
}
}
static enum command_return
handle_setvol(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
{
unsigned level;
bool success;
if (!check_unsigned(client, &level, argv[1]))
return COMMAND_RETURN_ERROR;
if (level > 100) {
command_error(client, ACK_ERROR_ARG, "Invalid volume value");
return COMMAND_RETURN_ERROR;
}
success = volume_level_change(level);
if (!success) {
command_error(client, ACK_ERROR_SYSTEM,
"problems setting volume");
return COMMAND_RETURN_ERROR;
}
return COMMAND_RETURN_OK;
}
static enum command_return
handle_stats(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
stats_print(client);
return COMMAND_RETURN_OK;
}
static enum command_return
handle_ping(G_GNUC_UNUSED struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
return COMMAND_RETURN_OK;
}
static enum command_return
handle_password(struct client *client, G_GNUC_UNUSED int argc, char *argv[])
{
unsigned permission = 0;
if (getPermissionFromPassword(argv[1], &permission) < 0) {
command_error(client, ACK_ERROR_PASSWORD, "incorrect password");
return COMMAND_RETURN_ERROR;
}
client_set_permission(client, permission);
return COMMAND_RETURN_OK;
}
/* don't be fooled, this is the command handler for "commands" command */
static enum command_return
handle_commands(struct client *client,
@ -296,54 +68,6 @@ static enum command_return
handle_not_commands(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[]);
static enum command_return
handle_config(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
if (!client_is_local(client)) {
command_error(client, ACK_ERROR_PERMISSION,
"Command only permitted to local clients");
return COMMAND_RETURN_ERROR;
}
const char *path = mapper_get_music_directory_utf8();
if (path != NULL)
client_printf(client, "music_directory: %s\n", path);
return COMMAND_RETURN_OK;
}
static enum command_return
handle_idle(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
unsigned flags = 0, j;
int i;
const char *const* idle_names;
idle_names = idle_get_names();
for (i = 1; i < argc; ++i) {
if (!argv[i])
continue;
for (j = 0; idle_names[j]; ++j) {
if (!g_ascii_strcasecmp(argv[i], idle_names[j])) {
flags |= (1 << j);
}
}
}
/* No argument means that the client wants to receive everything */
if (flags == 0)
flags = ~0;
/* enable "idle" mode on this client */
client_idle_wait(client, flags);
/* return value is "1" so the caller won't print "OK" */
return 1;
}
/**
* The command registry.
*