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

Merge pull request #1083 from chme/groups-metadata-alternative

Browse Source 
Metadata for albums and artists (alternative approach)
This commit is contained in:
Christian Meffert 2020-08-30 19:11:21 +02:00 committed by GitHub
commit 7040382688
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 71 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/db.c
View File

@ -398,6 +398,13 @@ static const ssize_t dbgri_cols_map[] =
dbgri_offsetof(songalbumartist),
dbgri_offsetof(songartistid),
dbgri_offsetof(song_length),
dbgri_offsetof(data_kind),
dbgri_offsetof(media_kind),
dbgri_offsetof(year),
dbgri_offsetof(date_released),
dbgri_offsetof(time_added),
dbgri_offsetof(time_played),
dbgri_offsetof(seek),
};
/* This list must be kept in sync with
@ -1903,7 +1910,13 @@ db_build_query_group_albums(struct query_params *qp, struct query_clause *qc)
char *query;
count = sqlite3_mprintf("SELECT COUNT(DISTINCT f.songalbumid) FROM files f %s;", qc->where);
query = sqlite3_mprintf("SELECT g.id, g.persistentid, f.album, f.album_sort, COUNT(f.id) as track_count, 1 as album_count, f.album_artist, f.songartistid, SUM(f.song_length) FROM files f JOIN groups g ON f.songalbumid = g.persistentid %s GROUP BY f.songalbumid %s %s %s;", qc->where, qc->having, qc->order, qc->index);
query = sqlite3_mprintf("SELECT " \
" g.id, g.persistentid, f.album, f.album_sort, COUNT(f.id) as track_count, " \
" 1 as album_count, f.album_artist, f.songartistid, " \
" SUM(f.song_length), MIN(f.data_kind), MIN(f.media_kind), MAX(f.year), MAX(f.date_released), " \
" MAX(f.time_added), MAX(f.time_played), MAX(f.seek) " \
"FROM files f JOIN groups g ON f.songalbumid = g.persistentid %s " \
"GROUP BY f.songalbumid %s %s %s;", qc->where, qc->having, qc->order, qc->index);
return db_build_query_check(qp, count, query);
}
@ -1915,7 +1928,14 @@ db_build_query_group_artists(struct query_params *qp, struct query_clause *qc)
char *query;
count = sqlite3_mprintf("SELECT COUNT(DISTINCT f.songartistid) FROM files f %s;", qc->where);
query = sqlite3_mprintf("SELECT g.id, g.persistentid, f.album_artist, f.album_artist_sort, COUNT(f.id) as track_count, COUNT(DISTINCT f.songalbumid) as album_count, f.album_artist, f.songartistid, SUM(f.song_length) FROM files f JOIN groups g ON f.songartistid = g.persistentid %s GROUP BY f.songartistid %s %s %s;", qc->where, qc->having, qc->order, qc->index);
query = sqlite3_mprintf("SELECT " \
" g.id, g.persistentid, f.album_artist, f.album_artist_sort, COUNT(f.id) as track_count, " \
" COUNT(DISTINCT f.songalbumid) as album_count, f.album_artist, f.songartistid, " \
" SUM(f.song_length), MIN(f.data_kind), MIN(f.media_kind), MAX(f.year), MAX(f.date_released), " \
" MAX(f.time_added), MAX(f.time_played), MAX(f.seek) " \
"FROM files f JOIN groups g ON f.songartistid = g.persistentid %s " \
"GROUP BY f.songartistid %s %s %s;",
qc->where, qc->having, qc->order, qc->index);
return db_build_query_check(qp, count, query);
}

14
src/db.h
View File

@ -297,6 +297,13 @@ struct group_info {
char *songalbumartist; /* song album artist (asaa) */
uint64_t songartistid; /* song artist id (asri) */
uint32_t song_length;
uint32_t data_kind;
uint32_t media_kind;
uint32_t year;
uint32_t date_released;
uint32_t time_added;
uint32_t time_played;
uint32_t seek;
};
#define gri_offsetof(field) offsetof(struct group_info, field)
@ -311,6 +318,13 @@ struct db_group_info {
char *songalbumartist;
char *songartistid;
char *song_length;
char *data_kind;
char *media_kind;
char *year;
char *date_released;
char *time_added;
char *time_played;
char *seek;
};
#define dbgri_offsetof(field) offsetof(struct db_group_info, field)

35
src/httpd_jsonapi.c
View File

@ -151,6 +151,7 @@ static json_object *
artist_to_json(struct db_group_info *dbgri)
{
json_object *item;
int intval;
char uri[100];
char artwork_url[100];
int ret;
@ -164,6 +165,21 @@ artist_to_json(struct db_group_info *dbgri)
safe_json_add_int_from_string(item, "track_count", dbgri->itemcount);
safe_json_add_int_from_string(item, "length_ms", dbgri->song_length);
safe_json_add_time_from_string(item, "time_played", dbgri->time_played, true);
safe_json_add_time_from_string(item, "time_added", dbgri->time_added, true);
ret = safe_atoi32(dbgri->seek, &intval);
if (ret == 0)
json_object_object_add(item, "in_progress", json_object_new_boolean(intval > 0));
ret = safe_atoi32(dbgri->media_kind, &intval);
if (ret == 0)
safe_json_add_string(item, "media_kind", db_media_kind_label(intval));
ret = safe_atoi32(dbgri->data_kind, &intval);
if (ret == 0)
safe_json_add_string(item, "data_kind", db_data_kind_label(intval));
ret = snprintf(uri, sizeof(uri), "%s:%s:%s", "library", "artist", dbgri->persistentid);
if (ret < sizeof(uri))
json_object_object_add(item, "uri", json_object_new_string(uri));
@ -179,6 +195,7 @@ static json_object *
album_to_json(struct db_group_info *dbgri)
{
json_object *item;
int intval;
char uri[100];
char artwork_url[100];
int ret;
@ -193,6 +210,24 @@ album_to_json(struct db_group_info *dbgri)
safe_json_add_int_from_string(item, "track_count", dbgri->itemcount);
safe_json_add_int_from_string(item, "length_ms", dbgri->song_length);
safe_json_add_time_from_string(item, "time_played", dbgri->time_played, true);
safe_json_add_time_from_string(item, "time_added", dbgri->time_added, true);
ret = safe_atoi32(dbgri->seek, &intval);
if (ret == 0)
json_object_object_add(item, "in_progress", json_object_new_boolean(intval > 0));
ret = safe_atoi32(dbgri->media_kind, &intval);
if (ret == 0)
safe_json_add_string(item, "media_kind", db_media_kind_label(intval));
ret = safe_atoi32(dbgri->data_kind, &intval);
if (ret == 0)
safe_json_add_string(item, "data_kind", db_data_kind_label(intval));
safe_json_add_time_from_string(item, "date_released", dbgri->date_released, false);
safe_json_add_int_from_string(item, "year", dbgri->year);
ret = snprintf(uri, sizeof(uri), "%s:%s:%s", "library", "album", dbgri->persistentid);
if (ret < sizeof(uri))
json_object_object_add(item, "uri", json_object_new_string(uri));