oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

command: move print_error() to CommandError.cxx

Browse Source 
Prepare for splitting command.c.
This commit is contained in:
Max Kellermann 2012-08-07 22:26:14 +02:00
parent 1a75abffa5
commit a64a2a65a9
5 changed files with 179 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -237,6 +237,7 @@ src_mpd_SOURCES = \
src/audio_parser.c \
src/protocol/argparser.c src/protocol/argparser.h \
src/protocol/result.c src/protocol/result.h \
src/CommandError.cxx src/CommandError.h \
src/command.c \
src/idle.c \
src/cmdline.c \

132
src/CommandError.cxx Normal file
View File

@ -0,0 +1,132 @@
/*
* 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 "CommandError.h"
#include "db_error.h"
extern "C" {
#include "protocol/result.h"
}
#include <assert.h>
#include <errno.h>
enum command_return
print_playlist_result(struct client *client, enum playlist_result result)
{
switch (result) {
case PLAYLIST_RESULT_SUCCESS:
return COMMAND_RETURN_OK;
case PLAYLIST_RESULT_ERRNO:
command_error(client, ACK_ERROR_SYSTEM, "%s",
g_strerror(errno));
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_DENIED:
command_error(client, ACK_ERROR_PERMISSION, "Access denied");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_NO_SUCH_SONG:
command_error(client, ACK_ERROR_NO_EXIST, "No such song");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_NO_SUCH_LIST:
command_error(client, ACK_ERROR_NO_EXIST, "No such playlist");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_LIST_EXISTS:
command_error(client, ACK_ERROR_EXIST,
"Playlist already exists");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_BAD_NAME:
command_error(client, ACK_ERROR_ARG,
"playlist name is invalid: "
"playlist names may not contain slashes,"
" newlines or carriage returns");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_BAD_RANGE:
command_error(client, ACK_ERROR_ARG, "Bad song index");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_NOT_PLAYING:
command_error(client, ACK_ERROR_PLAYER_SYNC, "Not playing");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_TOO_LARGE:
command_error(client, ACK_ERROR_PLAYLIST_MAX,
"playlist is at the max size");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_DISABLED:
command_error(client, ACK_ERROR_UNKNOWN,
"stored playlist support is disabled");
return COMMAND_RETURN_ERROR;
}
assert(0);
return COMMAND_RETURN_ERROR;
}
/**
* Send the GError to the client and free the GError.
*/
enum command_return
print_error(struct client *client, GError *error)
{
assert(client != NULL);
assert(error != NULL);
g_warning("%s", error->message);
if (error->domain == playlist_quark()) {
enum playlist_result result = (playlist_result)error->code;
g_error_free(error);
return print_playlist_result(client, result);
} else if (error->domain == ack_quark()) {
command_error(client, (ack)error->code, "%s", error->message);
g_error_free(error);
return COMMAND_RETURN_ERROR;
} else if (error->domain == db_quark()) {
switch ((enum db_error)error->code) {
case DB_DISABLED:
command_error(client, ACK_ERROR_NO_EXIST, "%s",
error->message);
g_error_free(error);
return COMMAND_RETURN_ERROR;
case DB_NOT_FOUND:
g_error_free(error);
command_error(client, ACK_ERROR_NO_EXIST, "Not found");
return COMMAND_RETURN_ERROR;
}
} else if (error->domain == g_file_error_quark()) {
command_error(client, ACK_ERROR_SYSTEM, "%s",
g_strerror(error->code));
g_error_free(error);
return COMMAND_RETURN_ERROR;
}
g_error_free(error);
command_error(client, ACK_ERROR_UNKNOWN, "error");
return COMMAND_RETURN_ERROR;
}

41
src/CommandError.h Normal file
View File

@ -0,0 +1,41 @@
/*
* 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_COMMAND_ERROR_H
#define MPD_COMMAND_ERROR_H
#include "command.h"
#include "playlist_error.h"
#include <glib.h>
G_BEGIN_DECLS
enum command_return
print_playlist_result(struct client *client, enum playlist_result result);
/**
* Send the GError to the client and free the GError.
*/
enum command_return
print_error(struct client *client, GError *error);
G_END_DECLS
#endif

105
src/command.c
View File

@ -19,6 +19,7 @@
#include "config.h"
#include "command.h"
#include "CommandError.h"
#include "protocol/argparser.h"
#include "protocol/result.h"
#include "player_control.h"
@ -110,110 +111,6 @@ struct command {
enum command_return (*handler)(struct client *client, int argc, char **argv);
};
static enum command_return
print_playlist_result(struct client *client,
enum playlist_result result)
{
switch (result) {
case PLAYLIST_RESULT_SUCCESS:
return COMMAND_RETURN_OK;
case PLAYLIST_RESULT_ERRNO:
command_error(client, ACK_ERROR_SYSTEM, "%s",
g_strerror(errno));
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_DENIED:
command_error(client, ACK_ERROR_PERMISSION, "Access denied");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_NO_SUCH_SONG:
command_error(client, ACK_ERROR_NO_EXIST, "No such song");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_NO_SUCH_LIST:
command_error(client, ACK_ERROR_NO_EXIST, "No such playlist");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_LIST_EXISTS:
command_error(client, ACK_ERROR_EXIST,
"Playlist already exists");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_BAD_NAME:
command_error(client, ACK_ERROR_ARG,
"playlist name is invalid: "
"playlist names may not contain slashes,"
" newlines or carriage returns");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_BAD_RANGE:
command_error(client, ACK_ERROR_ARG, "Bad song index");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_NOT_PLAYING:
command_error(client, ACK_ERROR_PLAYER_SYNC, "Not playing");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_TOO_LARGE:
command_error(client, ACK_ERROR_PLAYLIST_MAX,
"playlist is at the max size");
return COMMAND_RETURN_ERROR;
case PLAYLIST_RESULT_DISABLED:
command_error(client, ACK_ERROR_UNKNOWN,
"stored playlist support is disabled");
return COMMAND_RETURN_ERROR;
}
assert(0);
return COMMAND_RETURN_ERROR;
}
/**
* Send the GError to the client and free the GError.
*/
static enum command_return
print_error(struct client *client, GError *error)
{
assert(client != NULL);
assert(error != NULL);
g_warning("%s", error->message);
if (error->domain == playlist_quark()) {
enum playlist_result result = error->code;
g_error_free(error);
return print_playlist_result(client, result);
} else if (error->domain == ack_quark()) {
command_error(client, error->code, "%s", error->message);
g_error_free(error);
return COMMAND_RETURN_ERROR;
} else if (error->domain == db_quark()) {
switch ((enum db_error)error->code) {
case DB_DISABLED:
command_error(client, ACK_ERROR_NO_EXIST, "%s",
error->message);
g_error_free(error);
return COMMAND_RETURN_ERROR;
case DB_NOT_FOUND:
g_error_free(error);
command_error(client, ACK_ERROR_NO_EXIST, "Not found");
return COMMAND_RETURN_ERROR;
}
} else if (error->domain == g_file_error_quark()) {
command_error(client, ACK_ERROR_SYSTEM, "%s",
g_strerror(error->code));
g_error_free(error);
return COMMAND_RETURN_ERROR;
}
g_error_free(error);
command_error(client, ACK_ERROR_UNKNOWN, "error");
return COMMAND_RETURN_ERROR;
}
static void
print_spl_list(struct client *client, GPtrArray *list)
{

4
src/command.h
View File

@ -33,6 +33,8 @@ enum command_return {
struct client;
G_BEGIN_DECLS
void command_init(void);
void command_finish(void);
@ -42,4 +44,6 @@ command_process(struct client *client, unsigned num, char *line);
void command_success(struct client *client);
G_END_DECLS
#endif