mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2025-06-08 17:34:11 +00:00
Code Issues Releases Wiki Activity

Feat: first code for mpd 0.21 filter expressions in search

Browse Source
This commit is contained in:
jcorporation 2018-11-19 22:37:08 +00:00
parent 2d03a55793
commit 1321bd45a5
2 changed files with 76 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/mpd_client.c
View File

@ -2126,6 +2126,81 @@ int mympd_search(char *buffer, char *searchstr, char *filter, char *plist, unsig
if (mpd_send_command(mpd.conn, "searchaddpl", plist, filter, searchstr, NULL) == false) if (mpd_send_command(mpd.conn, "searchaddpl", plist, filter, searchstr, NULL) == false)
RETURN_ERROR_AND_RECOVER("mpd_searchaddpl"); RETURN_ERROR_AND_RECOVER("mpd_searchaddpl");
} }
if (strcmp(plist, "") == 0) {
while ((song = mpd_recv_song(mpd.conn)) != NULL) {
entity_count++;
if (entity_count > offset && entity_count <= offset + config.max_elements_per_page) {
if (entities_returned++)
len += json_printf(&out, ", ");
len += json_printf(&out, "{Type: song, ");
if (mpd.feat_tags == true)
PUT_SONG_TAGS();
else
PUT_MIN_SONG_TAGS();
len += json_printf(&out, "}");
}
mpd_song_free(song);
}
}
else
mpd_response_finish(mpd.conn);
if (strcmp(plist, "") == 0) {
len += json_printf(&out, "], totalEntities: %d, offset: %d, returnedEntities: %d, searchstr: %Q}",
entity_count,
offset,
entities_returned,
searchstr
);
}
else
len = json_printf(&out, "{type: result, data: ok}");
CHECK_RETURN_LEN();
return len;
}
int mympd_search_v21(char *buffer, char *searchstr, char *filter, char *plist, unsigned int offset) {
struct mpd_song *song;
unsigned long entity_count = 0;
unsigned long entities_returned = 0;
int len = 0;
struct json_out out = JSON_OUT_BUF(buffer, MAX_SIZE);
if (strcmp(plist, "") == 0) {
if (mpd_search_db_songs(mpd.conn, false) == false)
RETURN_ERROR_AND_RECOVER("mpd_search_db_songs");
len = json_printf(&out, "{type: search, data: [");
}
else if (strcmp(plist, "queue") == 0) {
if (mpd_search_add_db_songs(mpd.conn, false) == false)
RETURN_ERROR_AND_RECOVER("mpd_search_add_db_songs");
}
else {
if (mpd_search_add_pl_db_songs(mpd.conn) == false)
RETURN_ERROR_AND_RECOVER("mpd_search_add_pl_db_songs");
if (mpd_search_add_pl_constraint(mpd.conn, MPD_OPERATOR_DEFAULT, plist) == false)
RETURN_ERROR_AND_RECOVER("mpd_search_add_pl_constraint");
}
if (strcmp(filter, "any") == 0) {
if (mpd_search_add_any_tag_constraint(mpd.conn, MPD_OPERATOR_DEFAULT, searchstr) == false)
RETURN_ERROR_AND_RECOVER("mpd_search_add_any_tag_constraint");
}
else if (strcmp(filter, "modified-since") == 0) {
char *crap;
long timestamp = strtol(searchstr, &crap, 10);
if (mpd_search_add_modified_since_constraint(mpd.conn, MPD_OPERATOR_DEFAULT, timestamp) == false)
RETURN_ERROR_AND_RECOVER("mpd_search_add_tag_constraint");
}
else {
if (mpd_search_add_tag_constraint(mpd.conn, MPD_OPERATOR_DEFAULT, mpd_tag_name_parse(filter), searchstr) == false)
RETURN_ERROR_AND_RECOVER("mpd_search_add_tag_constraint");
}
if (mpd_search_commit(mpd.conn) == false)
RETURN_ERROR_AND_RECOVER("mpd_search_commit");
if (strcmp(plist, "") == 0) { if (strcmp(plist, "") == 0) {
while ((song = mpd_recv_song(mpd.conn)) != NULL) { while ((song = mpd_recv_song(mpd.conn)) != NULL) {

1
src/mpd_client.h
View File

@ -265,6 +265,7 @@ int mympd_put_current_song(char *buffer);
int mympd_put_queue(char *buffer, unsigned int offset, unsigned *queue_version, unsigned *queue_length); int mympd_put_queue(char *buffer, unsigned int offset, unsigned *queue_version, unsigned *queue_length);
int mympd_put_browse(char *buffer, char *path, unsigned int offset, char *filter); int mympd_put_browse(char *buffer, char *path, unsigned int offset, char *filter);
int mympd_search(char *buffer, char *searchstr, char *filter, char *plist, unsigned int offset); int mympd_search(char *buffer, char *searchstr, char *filter, char *plist, unsigned int offset);
int mympd_search_v21(char *buffer, char *searchstr, char *filter, char *plist, unsigned int offset);
int mympd_search_queue(char *buffer, char *mpdtagtype, unsigned int offset, char *searchstr); int mympd_search_queue(char *buffer, char *mpdtagtype, unsigned int offset, char *searchstr);
int mympd_put_welcome(char *buffer); int mympd_put_welcome(char *buffer);
int mympd_put_volume(char *buffer); int mympd_put_volume(char *buffer);