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
bc2a1160
Commit
bc2a1160
authored
Apr 26, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
db/Count: implement grouping
parent
75542e8f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
109 additions
and
10 deletions
+109
-10
NEWS
NEWS
+1
-1
protocol.xml
doc/protocol.xml
+10
-0
DatabaseCommands.cxx
src/command/DatabaseCommands.cxx
+16
-2
Count.cxx
src/db/Count.cxx
+78
-7
Count.hxx
src/db/Count.hxx
+4
-0
No files found.
NEWS
View file @
bc2a1160
...
...
@@ -6,7 +6,7 @@ ver 0.19 (not yet released)
- "playlistadd" supports file:///
- "idle" with unrecognized event name fails
- "list" on album artist falls back to the artist tag
- "list" a
llows
grouping
- "list" a
nd "count" allow
grouping
* database
- proxy: forward "idle" events
- proxy: copy "Last-Modified" from remote directories
...
...
doc/protocol.xml
View file @
bc2a1160
...
...
@@ -1493,12 +1493,15 @@ OK
<title>
The music database
</title>
<variablelist>
<varlistentry
id=
"command_count"
>
<term>
<cmdsynopsis>
<command>
count
</command>
<arg
choice=
"req"
><replaceable>
TAG
</replaceable></arg>
<arg
choice=
"req"
><replaceable>
NEEDLE
</replaceable></arg>
<arg
choice=
"opt"
>
group
</arg>
<arg
choice=
"opt"
><replaceable>
GROUPTYPE
</replaceable></arg>
</cmdsynopsis>
</term>
<listitem>
...
...
@@ -1506,8 +1509,15 @@ OK
Counts the number of songs and their total playtime in
the db matching
<varname>
TAG
</varname>
exactly.
</para>
<para>
The
<parameter>
group
</parameter>
keyword may be used to
group the results by a tag. The following prints
per-artist counts:
</para>
<programlisting>
count group artist
</programlisting>
</listitem>
</varlistentry>
<varlistentry
id=
"command_find"
>
<term>
<cmdsynopsis>
...
...
src/command/DatabaseCommands.cxx
View file @
bc2a1160
...
...
@@ -153,14 +153,28 @@ handle_count(Client &client, int argc, char *argv[])
{
ConstBuffer
<
const
char
*>
args
(
argv
+
1
,
argc
-
1
);
TagType
group
=
TAG_NUM_OF_ITEM_TYPES
;
if
(
args
.
size
>=
2
&&
strcmp
(
args
[
args
.
size
-
2
],
"group"
)
==
0
)
{
const
char
*
s
=
args
[
args
.
size
-
1
];
group
=
tag_name_parse_i
(
s
);
if
(
group
==
TAG_NUM_OF_ITEM_TYPES
)
{
command_error
(
client
,
ACK_ERROR_ARG
,
"Unknown tag type: %s"
,
s
);
return
CommandResult
::
ERROR
;
}
args
.
pop_back
();
args
.
pop_back
();
}
SongFilter
filter
;
if
(
!
filter
.
Parse
(
args
,
false
))
{
if
(
!
args
.
IsEmpty
()
&&
!
filter
.
Parse
(
args
,
false
))
{
command_error
(
client
,
ACK_ERROR_ARG
,
"incorrect arguments"
);
return
CommandResult
::
ERROR
;
}
Error
error
;
return
PrintSongCount
(
client
,
""
,
&
filter
,
error
)
return
PrintSongCount
(
client
,
""
,
&
filter
,
group
,
error
)
?
CommandResult
::
OK
:
print_error
(
client
,
error
);
}
...
...
src/db/Count.cxx
View file @
bc2a1160
...
...
@@ -23,8 +23,10 @@
#include "Interface.hxx"
#include "client/Client.hxx"
#include "LightSong.hxx"
#include "tag/Set.hxx"
#include <functional>
#include <map>
struct
SearchStats
{
unsigned
n_songs
;
...
...
@@ -34,6 +36,9 @@ struct SearchStats {
:
n_songs
(
0
),
total_time_s
(
0
)
{}
};
class
TagCountMap
:
public
std
::
map
<
std
::
string
,
SearchStats
>
{
};
static
void
PrintSearchStats
(
Client
&
client
,
const
SearchStats
&
stats
)
{
...
...
@@ -43,6 +48,18 @@ PrintSearchStats(Client &client, const SearchStats &stats)
stats
.
n_songs
,
stats
.
total_time_s
);
}
static
void
Print
(
Client
&
client
,
TagType
group
,
const
TagCountMap
&
m
)
{
assert
(
unsigned
(
group
)
<
TAG_NUM_OF_ITEM_TYPES
);
for
(
const
auto
&
i
:
m
)
{
client_printf
(
client
,
"%s: %s
\n
"
,
tag_item_names
[
group
],
i
.
first
.
c_str
());
PrintSearchStats
(
client
,
i
.
second
);
}
}
static
bool
stats_visitor_song
(
SearchStats
&
stats
,
const
LightSong
&
song
)
{
...
...
@@ -52,9 +69,45 @@ stats_visitor_song(SearchStats &stats, const LightSong &song)
return
true
;
}
static
bool
CollectGroupCounts
(
TagCountMap
&
map
,
TagType
group
,
const
Tag
&
tag
)
{
bool
found
=
false
;
for
(
unsigned
i
=
0
;
i
<
tag
.
num_items
;
++
i
)
{
const
TagItem
&
item
=
*
tag
.
items
[
i
];
if
(
item
.
type
==
group
)
{
auto
r
=
map
.
insert
(
std
::
make_pair
(
item
.
value
,
SearchStats
()));
SearchStats
&
s
=
r
.
first
->
second
;
++
s
.
n_songs
;
if
(
tag
.
time
>
0
)
s
.
total_time_s
+=
tag
.
time
;
found
=
true
;
}
}
return
found
;
}
static
bool
GroupCountVisitor
(
TagCountMap
&
map
,
TagType
group
,
const
LightSong
&
song
)
{
assert
(
song
.
tag
!=
nullptr
);
const
Tag
&
tag
=
*
song
.
tag
;
if
(
!
CollectGroupCounts
(
map
,
group
,
tag
)
&&
group
==
TAG_ALBUM_ARTIST
)
/* fall back to "Artist" if no "AlbumArtist" was found */
CollectGroupCounts
(
map
,
TAG_ARTIST
,
tag
);
return
true
;
}
bool
PrintSongCount
(
Client
&
client
,
const
char
*
name
,
const
SongFilter
*
filter
,
TagType
group
,
Error
&
error
)
{
const
Database
*
db
=
client
.
GetDatabase
(
error
);
...
...
@@ -63,14 +116,32 @@ PrintSongCount(Client &client, const char *name,
const
DatabaseSelection
selection
(
name
,
true
,
filter
);
SearchStats
stats
;
if
(
group
==
TAG_NUM_OF_ITEM_TYPES
)
{
/* no grouping */
using
namespace
std
::
placeholders
;
const
auto
f
=
std
::
bind
(
stats_visitor_song
,
std
::
ref
(
stats
),
_1
);
if
(
!
db
->
Visit
(
selection
,
f
,
error
))
return
false
;
SearchStats
stats
;
using
namespace
std
::
placeholders
;
const
auto
f
=
std
::
bind
(
stats_visitor_song
,
std
::
ref
(
stats
),
_1
);
if
(
!
db
->
Visit
(
selection
,
f
,
error
))
return
false
;
PrintSearchStats
(
client
,
stats
);
}
else
{
/* group by the specified tag: store counts in a
std::map */
TagCountMap
map
;
using
namespace
std
::
placeholders
;
const
auto
f
=
std
::
bind
(
GroupCountVisitor
,
std
::
ref
(
map
),
group
,
_1
);
if
(
!
db
->
Visit
(
selection
,
f
,
error
))
return
false
;
Print
(
client
,
group
,
map
);
}
PrintSearchStats
(
client
,
stats
);
return
true
;
}
src/db/Count.hxx
View file @
bc2a1160
...
...
@@ -22,6 +22,9 @@
#include "Compiler.h"
#include <stdint.h>
enum
TagType
:
uint8_t
;
class
Client
;
class
SongFilter
;
class
Error
;
...
...
@@ -30,6 +33,7 @@ gcc_nonnull(2)
bool
PrintSongCount
(
Client
&
client
,
const
char
*
name
,
const
SongFilter
*
filter
,
TagType
group
,
Error
&
error
);
#endif
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