MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-26 04:49:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

[jsonapi] Support "position" parameter in queue/items/add endpoint

Browse Source
This commit is contained in:
chme 2018-10-13 06:57:53 +02:00
parent df7456dc39
commit d2390933e9
1 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/httpd_jsonapi.c
View File

@ -1566,10 +1566,11 @@ queue_item_to_json(struct db_queue_item *queue_item, char shuffle)
} }
static int static int
queue_tracks_add_artist(const char *id) queue_tracks_add_artist(const char *id, int pos)
{ {
struct query_params query_params; struct query_params query_params;
struct player_status status; struct player_status status;
int count = 0;
int ret = 0; int ret = 0;
memset(&query_params, 0, sizeof(struct query_params)); memset(&query_params, 0, sizeof(struct query_params));
@ -1581,18 +1582,22 @@ queue_tracks_add_artist(const char *id)
player_get_status(&status); player_get_status(&status);
ret = db_queue_add_by_query(&query_params, status.shuffle, status.item_id, -1, NULL, NULL); ret = db_queue_add_by_query(&query_params, status.shuffle, status.item_id, pos, &count, NULL);
free(query_params.filter); free(query_params.filter);
if (ret == 0)
return count;
return ret; return ret;
} }
static int static int
queue_tracks_add_album(const char *id) queue_tracks_add_album(const char *id, int pos)
{ {
struct query_params query_params; struct query_params query_params;
struct player_status status; struct player_status status;
int count = 0;
int ret = 0; int ret = 0;
memset(&query_params, 0, sizeof(struct query_params)); memset(&query_params, 0, sizeof(struct query_params));
@ -1604,18 +1609,22 @@ queue_tracks_add_album(const char *id)
player_get_status(&status); player_get_status(&status);
ret = db_queue_add_by_query(&query_params, status.shuffle, status.item_id, -1, NULL, NULL); ret = db_queue_add_by_query(&query_params, status.shuffle, status.item_id, pos, &count, NULL);
free(query_params.filter); free(query_params.filter);
if (ret == 0)
return count;
return ret; return ret;
} }
static int static int
queue_tracks_add_track(const char *id) queue_tracks_add_track(const char *id, int pos)
{ {
struct query_params query_params; struct query_params query_params;
struct player_status status; struct player_status status;
int count = 0;
int ret = 0; int ret = 0;
memset(&query_params, 0, sizeof(struct query_params)); memset(&query_params, 0, sizeof(struct query_params));
@ -1627,18 +1636,22 @@ queue_tracks_add_track(const char *id)
player_get_status(&status); player_get_status(&status);
ret = db_queue_add_by_query(&query_params, status.shuffle, status.item_id, -1, NULL, NULL); ret = db_queue_add_by_query(&query_params, status.shuffle, status.item_id, pos, &count, NULL);
free(query_params.filter); free(query_params.filter);
if (ret == 0)
return count;
return ret; return ret;
} }
static int static int
queue_tracks_add_playlist(const char *id) queue_tracks_add_playlist(const char *id, int pos)
{ {
struct player_status status; struct player_status status;
int playlist_id; int playlist_id;
int count = 0;
int ret; int ret;
ret = safe_atoi32(id, &playlist_id); ret = safe_atoi32(id, &playlist_id);
@ -1651,7 +1664,10 @@ queue_tracks_add_playlist(const char *id)
player_get_status(&status); player_get_status(&status);
ret = db_queue_add_by_playlistid(playlist_id, status.shuffle, status.item_id, -1, NULL, NULL); ret = db_queue_add_by_playlistid(playlist_id, status.shuffle, status.item_id, pos, &count, NULL);
if (ret == 0)
return count;
return ret; return ret;
} }
@ -1663,8 +1679,23 @@ jsonapi_reply_queue_tracks_add(struct httpd_request *hreq)
char *uris; char *uris;
char *uri; char *uri;
const char *id; const char *id;
int pos = -1;
int ret = 0; int ret = 0;
param = evhttp_find_header(hreq->query, "position");
if (param)
{
if (safe_atoi32(param, &pos) < 0)
{
DPRINTF(E_LOG, L_WEB, "Invalid position parameter '%s'\n", param);
return HTTP_BADREQUEST;
}
DPRINTF(E_DBG, L_WEB, "Add tracks starting at position '%d\n", pos);
}
param = evhttp_find_header(hreq->query, "uris"); param = evhttp_find_header(hreq->query, "uris");
if (!param) if (!param)
{ {
@ -1681,22 +1712,22 @@ jsonapi_reply_queue_tracks_add(struct httpd_request *hreq)
if (strncmp(uri, "library:artist:", strlen("library:artist:")) == 0) if (strncmp(uri, "library:artist:", strlen("library:artist:")) == 0)
{ {
id = uri + (strlen("library:artist:")); id = uri + (strlen("library:artist:"));
queue_tracks_add_artist(id); pos += queue_tracks_add_artist(id, pos);
} }
else if (strncmp(uri, "library:album:", strlen("library:album:")) == 0) else if (strncmp(uri, "library:album:", strlen("library:album:")) == 0)
{ {
id = uri + (strlen("library:album:")); id = uri + (strlen("library:album:"));
queue_tracks_add_album(id); pos += queue_tracks_add_album(id, pos);
} }
else if (strncmp(uri, "library:track:", strlen("library:track:")) == 0) else if (strncmp(uri, "library:track:", strlen("library:track:")) == 0)
{ {
id = uri + (strlen("library:track:")); id = uri + (strlen("library:track:"));
queue_tracks_add_track(id); pos += queue_tracks_add_track(id, pos);
} }
else if (strncmp(uri, "library:playlist:", strlen("library:playlist:")) == 0) else if (strncmp(uri, "library:playlist:", strlen("library:playlist:")) == 0)
{ {
id = uri + (strlen("library:playlist:")); id = uri + (strlen("library:playlist:"));
queue_tracks_add_playlist(id); pos += queue_tracks_add_playlist(id, pos);
} }
else else
{ {