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

Merge pull request #995 from whatdoineed2do/json-add-by-query-with-limit

Browse Source 
[jsonapi] support 'limit' on 'api/queue/items/add?expression='
This commit is contained in:
Christian Meffert 2020-07-03 20:09:00 +02:00 committed by GitHub
commit db51d59be4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/httpd_jsonapi.c
View File

@ -2332,7 +2332,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;
@ -2344,7 +2344,6 @@ queue_tracks_add_byexpression(const char *param, int pos, int *total_count)
query_params.type = Q_ITEMS; query_params.type = Q_ITEMS;
query_params.sort = S_NAME; query_params.sort = S_NAME;
query_params.idx_type = I_NONE;
memset(&smartpl_expression, 0, sizeof(struct smartpl)); memset(&smartpl_expression, 0, sizeof(struct smartpl));
expression = safe_asprintf("\"query\" { %s }", param); expression = safe_asprintf("\"query\" { %s }", param);
@ -2356,10 +2355,13 @@ 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 = limit > 0 ? limit : smartpl_expression.limit;
free_smartpl(&smartpl_expression, 1); free_smartpl(&smartpl_expression, 1);
player_get_status(&status); player_get_status(&status);
query_params.idx_type = query_params.limit > 0 ? I_FIRST : I_NONE;
ret = db_queue_add_by_query(&query_params, status.shuffle, status.item_id, pos, total_count, NULL); ret = db_queue_add_by_query(&query_params, status.shuffle, status.item_id, pos, total_count, NULL);
free_query_params(&query_params, 1); free_query_params(&query_params, 1);
@ -2376,6 +2378,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;
@ -2427,7 +2430,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)