MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[db] Fetch additional metadata for artist and album in group query

This commit is contained in:
chme 2020-08-22 12:59:36 +02:00
parent bb9536ef44
commit 8afae4a41b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/db.c
View File

@ -398,6 +398,10 @@ static const ssize_t dbgri_cols_map[] =
dbgri_offsetof(songalbumartist), dbgri_offsetof(songalbumartist),
dbgri_offsetof(songartistid), dbgri_offsetof(songartistid),
dbgri_offsetof(song_length), dbgri_offsetof(song_length),
dbgri_offsetof(data_kind),
dbgri_offsetof(media_kind),
dbgri_offsetof(year),
dbgri_offsetof(date_released),
}; };
/* This list must be kept in sync with /* This list must be kept in sync with
@ -1903,7 +1907,7 @@ db_build_query_group_albums(struct query_params *qp, struct query_clause *qc)
char *query; char *query;
count = sqlite3_mprintf("SELECT COUNT(DISTINCT f.songalbumid) FROM files f %s;", qc->where); 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) 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); return db_build_query_check(qp, count, query);
} }
@ -1915,7 +1919,7 @@ db_build_query_group_artists(struct query_params *qp, struct query_clause *qc)
char *query; char *query;
count = sqlite3_mprintf("SELECT COUNT(DISTINCT f.songartistid) FROM files f %s;", qc->where); 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) 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); return db_build_query_check(qp, count, query);
} }

8
src/db.h
View File

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