MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-15 16:53:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

[jsonapi] items/add?expression can take 'limit' param

Browse Source
This commit is contained in:
whatdoineed2do/Ray 2020-05-09 20:04:27 +01:00
parent c5fe0d217b
commit 69c56f5971
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/httpd_jsonapi.c
View File

@ -2287,7 +2287,7 @@ queue_tracks_add_byuris(const char *param, int pos, int *total_count)
} }
static int static int
queue_tracks_add_byexpression(const char *param, int pos, int *total_count) queue_tracks_add_byexpression(const char *param, int pos, int limit, int *total_count)
{ {
char *expression; char *expression;
struct smartpl smartpl_expression; struct smartpl smartpl_expression;
@ -2310,7 +2310,7 @@ queue_tracks_add_byexpression(const char *param, int pos, int *total_count)
query_params.filter = strdup(smartpl_expression.query_where); query_params.filter = strdup(smartpl_expression.query_where);
query_params.order = safe_strdup(smartpl_expression.order); query_params.order = safe_strdup(smartpl_expression.order);
query_params.limit = smartpl_expression.limit; query_params.limit = limit > 0 ? limit : smartpl_expression.limit;
free_smartpl(&smartpl_expression, 1); free_smartpl(&smartpl_expression, 1);
player_get_status(&status); player_get_status(&status);
@ -2333,6 +2333,7 @@ jsonapi_reply_queue_tracks_add(struct httpd_request *hreq)
const char *param_expression; const char *param_expression;
const char *param; const char *param;
int pos = -1; int pos = -1;
int limit = -1;
bool shuffle; bool shuffle;
int total_count = 0; int total_count = 0;
json_object *reply; json_object *reply;
@ -2384,7 +2385,11 @@ jsonapi_reply_queue_tracks_add(struct httpd_request *hreq)
} }
else else
{ {
ret = queue_tracks_add_byexpression(param_expression, pos, &total_count); // This overrides the value specified in query
param = evhttp_find_header(hreq->query, "limit");
if (param)
safe_atoi32(param, &limit);
ret = queue_tracks_add_byexpression(param_expression, pos, limit, &total_count);
} }
if (ret == 0) if (ret == 0)