aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--NEWS1
-rw-r--r--doc/protocol.xml34
-rw-r--r--src/command/AllCommands.cxx2
-rw-r--r--src/command/DatabaseCommands.cxx21
-rw-r--r--src/command/DatabaseCommands.hxx6
5 files changed, 4 insertions, 60 deletions
diff --git a/NEWS b/NEWS
index feb591050..8922ff562 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,6 @@ ver 0.18 (2012/??/??)
- new command "readcomments" lists arbitrary file tags
- new command "toggleoutput"
- "find"/"search" with "any" does not match file name
- - new commands "findin", "searchin" with base URI
- search for album artist falls back to the artist tag
- re-add the "volume" command
* input:
diff --git a/doc/protocol.xml b/doc/protocol.xml
index ab88468fc..234db46db 100644
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
@@ -1491,23 +1491,6 @@ OK
</para>
</listitem>
</varlistentry>
- <varlistentry id="command_findin">
- <term>
- <cmdsynopsis>
- <command>findin</command>
- <arg choice="req"><replaceable>URI</replaceable></arg>
- <arg choice="req"><replaceable>TYPE</replaceable></arg>
- <arg choice="req"><replaceable>WHAT</replaceable></arg>
- <arg choice="opt"><replaceable>...</replaceable></arg>
- </cmdsynopsis>
- </term>
- <listitem>
- <para>
- Like <command>find</command>, but allows specifying a
- base URI for the find.
- </para>
- </listitem>
- </varlistentry>
<varlistentry id="command_findadd">
<term>
<cmdsynopsis>
@@ -1643,23 +1626,6 @@ OK
</para>
</listitem>
</varlistentry>
- <varlistentry id="command_searchin">
- <term>
- <cmdsynopsis>
- <command>searchin</command>
- <arg choice="req"><replaceable>URI</replaceable></arg>
- <arg choice="req"><replaceable>TYPE</replaceable></arg>
- <arg choice="req"><replaceable>WHAT</replaceable></arg>
- <arg choice="opt"><replaceable>...</replaceable></arg>
- </cmdsynopsis>
- </term>
- <listitem>
- <para>
- Like <command>search</command>, but allows specifying a
- base URI for the search.
- </para>
- </listitem>
- </varlistentry>
<varlistentry id="command_searchadd">
<term>
<cmdsynopsis>
diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx
index 94aa9f335..0ab5953d0 100644
--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@@ -91,7 +91,6 @@ static const struct command commands[] = {
{ "enableoutput", PERMISSION_ADMIN, 1, 1, handle_enableoutput },
{ "find", PERMISSION_READ, 2, -1, handle_find },
{ "findadd", PERMISSION_READ, 2, -1, handle_findadd},
- { "findin", PERMISSION_READ, 3, -1, handle_find_in },
{ "idle", PERMISSION_READ, 0, -1, handle_idle },
{ "kill", PERMISSION_ADMIN, -1, -1, handle_kill },
{ "list", PERMISSION_READ, 1, -1, handle_list },
@@ -143,7 +142,6 @@ static const struct command commands[] = {
{ "search", PERMISSION_READ, 2, -1, handle_search },
{ "searchadd", PERMISSION_ADD, 2, -1, handle_searchadd },
{ "searchaddpl", PERMISSION_CONTROL, 3, -1, handle_searchaddpl },
- { "searchin", PERMISSION_READ, 3, -1, handle_search_in },
{ "seek", PERMISSION_CONTROL, 2, 2, handle_seek },
{ "seekcur", PERMISSION_CONTROL, 1, 1, handle_seekcur },
{ "seekid", PERMISSION_CONTROL, 2, 2, handle_seekid },
diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx
index 16e10b4de..b86cbdae7 100644
--- a/src/command/DatabaseCommands.cxx
+++ b/src/command/DatabaseCommands.cxx
@@ -55,8 +55,7 @@ handle_lsinfo2(Client &client, int argc, char *argv[])
}
static CommandResult
-handle_match(Client &client, int argc, char *argv[],
- const char *uri, bool fold_case)
+handle_match(Client &client, int argc, char *argv[], bool fold_case)
{
SongFilter filter;
if (!filter.Parse(argc - 1, argv + 1, fold_case)) {
@@ -64,7 +63,7 @@ handle_match(Client &client, int argc, char *argv[],
return CommandResult::ERROR;
}
- const DatabaseSelection selection(uri, true, &filter);
+ const DatabaseSelection selection("", true, &filter);
Error error;
return db_selection_print(client, selection, true, error)
@@ -75,25 +74,13 @@ handle_match(Client &client, int argc, char *argv[],
CommandResult
handle_find(Client &client, int argc, char *argv[])
{
- return handle_match(client, argc, argv, "", false);
-}
-
-CommandResult
-handle_find_in(Client &client, int argc, char *argv[])
-{
- return handle_match(client, argc - 1, argv + 1, argv[1], false);
+ return handle_match(client, argc, argv, false);
}
CommandResult
handle_search(Client &client, int argc, char *argv[])
{
- return handle_match(client, argc, argv, "", true);
-}
-
-CommandResult
-handle_search_in(Client &client, int argc, char *argv[])
-{
- return handle_match(client, argc - 1, argv + 1, argv[1], true);
+ return handle_match(client, argc, argv, true);
}
static CommandResult
diff --git a/src/command/DatabaseCommands.hxx b/src/command/DatabaseCommands.hxx
index fa23c5492..c60caf246 100644
--- a/src/command/DatabaseCommands.hxx
+++ b/src/command/DatabaseCommands.hxx
@@ -31,18 +31,12 @@ CommandResult
handle_find(Client &client, int argc, char *argv[]);
CommandResult
-handle_find_in(Client &client, int argc, char *argv[]);
-
-CommandResult
handle_findadd(Client &client, int argc, char *argv[]);
CommandResult
handle_search(Client &client, int argc, char *argv[]);
CommandResult
-handle_search_in(Client &client, int argc, char *argv[]);
-
-CommandResult
handle_searchadd(Client &client, int argc, char *argv[]);
CommandResult