MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle include-sort-headers parameter in DAAP queries

Browse Source
This commit is contained in:
Kai Elwert 2010-08-14 12:13:41 +02:00 committed by Julien BLACHE
parent 9dec6d23be
commit d4f341aff0
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/httpd_daap.c
View File

@ -848,7 +848,7 @@ dmap_add_field(struct evbuffer *evbuf, const struct dmap_field *df, char *strval
static void static void
get_query_params(struct evkeyvalq *query, struct query_params *qp) get_query_params(struct evkeyvalq *query, int *sort_headers, struct query_params *qp)
{ {
const char *param; const char *param;
char *ptr; char *ptr;
@ -916,6 +916,22 @@ get_query_params(struct evkeyvalq *query, struct query_params *qp)
DPRINTF(E_DBG, L_DAAP, "Sorting songlist by %s\n", param); DPRINTF(E_DBG, L_DAAP, "Sorting songlist by %s\n", param);
} }
if (sort_headers)
{
*sort_headers = 0;
param = evhttp_find_header(query, "include-sort-headers");
if (param)
{
if (strcmp(param, "1") == 0)
{
*sort_headers = 1;
DPRINTF(E_DBG, L_DAAP, "Sort headers requested\n");
}
else
DPRINTF(E_DBG, L_DAAP, "Unknown include-sort-headers param: %s\n", param);
}
}
param = evhttp_find_header(query, "query"); param = evhttp_find_header(query, "query");
if (!param) if (!param)
param = evhttp_find_header(query, "filter"); param = evhttp_find_header(query, "filter");
@ -1420,7 +1436,7 @@ daap_reply_songlist_generic(struct evhttp_request *req, struct evbuffer *evbuf,
} }
memset(&qp, 0, sizeof(struct query_params)); memset(&qp, 0, sizeof(struct query_params));
get_query_params(query, &qp); get_query_params(query, NULL, &qp);
if (playlist != -1) if (playlist != -1)
{ {
@ -1766,7 +1782,7 @@ daap_reply_playlists(struct evhttp_request *req, struct evbuffer *evbuf, char **
} }
memset(&qp, 0, sizeof(struct query_params)); memset(&qp, 0, sizeof(struct query_params));
get_query_params(query, &qp); get_query_params(query, NULL, &qp);
qp.type = Q_PL; qp.type = Q_PL;
ret = db_query_start(&qp); ret = db_query_start(&qp);
@ -2009,7 +2025,7 @@ daap_reply_groups(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
} }
memset(&qp, 0, sizeof(struct query_params)); memset(&qp, 0, sizeof(struct query_params));
get_query_params(query, &qp); get_query_params(query, NULL, &qp);
qp.type = Q_GROUPS; qp.type = Q_GROUPS;
ret = db_query_start(&qp); ret = db_query_start(&qp);
@ -2214,7 +2230,7 @@ daap_reply_browse(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
return; return;
} }
get_query_params(query, &qp); get_query_params(query, NULL, &qp);
ret = db_query_start(&qp); ret = db_query_start(&qp);
if (ret < 0) if (ret < 0)