Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
b5fc21b9
Commit
b5fc21b9
authored
Oct 29, 2013
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "command: new commands "findin", "searchin" with base URI"
This reverts commit
a577944a
. Will be replaced by new options for the old commands "search" and "find".
parent
44581dbe
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
60 deletions
+4
-60
NEWS
NEWS
+0
-1
protocol.xml
doc/protocol.xml
+0
-34
AllCommands.cxx
src/command/AllCommands.cxx
+0
-2
DatabaseCommands.cxx
src/command/DatabaseCommands.cxx
+4
-17
DatabaseCommands.hxx
src/command/DatabaseCommands.hxx
+0
-6
No files found.
NEWS
View file @
b5fc21b9
...
...
@@ -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:
...
...
doc/protocol.xml
View file @
b5fc21b9
...
...
@@ -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>
...
...
src/command/AllCommands.cxx
View file @
b5fc21b9
...
...
@@ -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
},
...
...
src/command/DatabaseCommands.cxx
View file @
b5fc21b9
...
...
@@ -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
...
...
src/command/DatabaseCommands.hxx
View file @
b5fc21b9
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment