diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/command/AllCommands.cxx | 4 | ||||
| -rw-r--r-- | src/command/StorageCommands.cxx | 63 | ||||
| -rw-r--r-- | src/command/StorageCommands.hxx | 30 |
4 files changed, 98 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index bffd649bc..b8a709c07 100644 --- a/Makefile.am +++ b/Makefile.am @@ -188,6 +188,7 @@ if ENABLE_DATABASE src_mpd_SOURCES += \ src/PlaylistUpdate.cxx \ src/PlaylistDatabase.cxx src/PlaylistDatabase.hxx \ + src/command/StorageCommands.cxx src/command/StorageCommands.hxx \ src/command/DatabaseCommands.cxx src/command/DatabaseCommands.hxx \ src/db/LightSong.cxx src/db/LightSong.hxx \ src/db/LightDirectory.hxx \ diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx index 2ac55e715..793a78078 100644 --- a/src/command/AllCommands.cxx +++ b/src/command/AllCommands.cxx @@ -23,6 +23,7 @@ #include "TagCommands.hxx" #include "PlayerCommands.hxx" #include "PlaylistCommands.hxx" +#include "StorageCommands.hxx" #include "DatabaseCommands.hxx" #include "FileCommands.hxx" #include "OutputCommands.hxx" @@ -117,6 +118,9 @@ static const struct command commands[] = { { "lsinfo", PERMISSION_READ, 0, 1, handle_lsinfo }, { "mixrampdb", PERMISSION_CONTROL, 1, 1, handle_mixrampdb }, { "mixrampdelay", PERMISSION_CONTROL, 1, 1, handle_mixrampdelay }, +#ifdef ENABLE_DATABASE + { "mount", PERMISSION_ADMIN, 2, 2, handle_mount }, +#endif { "move", PERMISSION_CONTROL, 2, 2, handle_move }, { "moveid", PERMISSION_CONTROL, 2, 2, handle_moveid }, { "next", PERMISSION_CONTROL, 0, 0, handle_next }, diff --git a/src/command/StorageCommands.cxx b/src/command/StorageCommands.cxx new file mode 100644 index 000000000..051deebac --- /dev/null +++ b/src/command/StorageCommands.cxx @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2003-2014 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 "StorageCommands.hxx" +#include "CommandError.hxx" +#include "protocol/Result.hxx" +#include "util/Error.hxx" +#include "client/Client.hxx" +#include "Partition.hxx" +#include "Instance.hxx" +#include "storage/Registry.hxx" +#include "storage/CompositeStorage.hxx" + +CommandResult +handle_mount(Client &client, gcc_unused int argc, char *argv[]) +{ + Storage *_composite = client.partition.instance.storage; + if (_composite == nullptr) { + command_error(client, ACK_ERROR_NO_EXIST, "No database"); + return CommandResult::ERROR; + } + + CompositeStorage &composite = *(CompositeStorage *)_composite; + + const char *const local_uri = argv[1]; + const char *const remote_uri = argv[2]; + + if (*local_uri == 0) { + command_error(client, ACK_ERROR_ARG, "Bad mount point"); + return CommandResult::ERROR; + } + + Error error; + Storage *storage = CreateStorageURI(remote_uri, error); + if (storage == nullptr) { + if (error.IsDefined()) + return print_error(client, error); + + command_error(client, ACK_ERROR_ARG, + "Unrecognized storage URI"); + return CommandResult::ERROR; + } + + composite.Mount(local_uri, storage); + return CommandResult::OK; +} diff --git a/src/command/StorageCommands.hxx b/src/command/StorageCommands.hxx new file mode 100644 index 000000000..588cf8ac2 --- /dev/null +++ b/src/command/StorageCommands.hxx @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2003-2014 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_STORAGE_COMMANDS_HXX +#define MPD_STORAGE_COMMANDS_HXX + +#include "CommandResult.hxx" + +class Client; + +CommandResult +handle_mount(Client &client, int argc, char *argv[]); + +#endif |