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

Update cache api, version, and logic to support caching of individual as 

well as group artwork
This commit is contained in:
Stuart C. Naifeh 2014-12-27 10:48:12 -05:00
parent 2171a1f2b3
commit 9e9ffe6809
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/artwork.c
View File

@ -1083,7 +1083,7 @@ artwork_get_group_persistentid(int64_t persistentid, int max_w, int max_h, struc
/* /*
* First check if the artwork cache has a cached entry for the given persistent id and requested width/height * First check if the artwork cache has a cached entry for the given persistent id and requested width/height
*/ */
ret = cache_artwork_get(persistentid, max_w, max_h, &cached, &format, evbuf); ret = cache_artwork_get(CACHE_ARTWORK_GROUP, persistentid, max_w, max_h, &cached, &format, evbuf);
if (ret == 0 && cached) if (ret == 0 && cached)
{ {
if (format > 0) if (format > 0)
@ -1136,7 +1136,7 @@ artwork_get_group_persistentid(int64_t persistentid, int max_w, int max_h, struc
DPRINTF(E_LOG, L_ART, "Error fetching Q_GROUP_DIRS results\n"); DPRINTF(E_LOG, L_ART, "Error fetching Q_GROUP_DIRS results\n");
else if (got_art > 0) else if (got_art > 0)
{ {
cache_artwork_add(persistentid, max_w, max_h, format, filename, evbuf); cache_artwork_add(CACHE_ARTWORK_GROUP, persistentid, max_w, max_h, format, filename, evbuf);
return format; return format;
} }
@ -1186,13 +1186,13 @@ artwork_get_group_persistentid(int64_t persistentid, int max_w, int max_h, struc
} }
else if (got_art > 0) else if (got_art > 0)
{ {
cache_artwork_add(persistentid, max_w, max_h, format, filename, evbuf); cache_artwork_add(CACHE_ARTWORK_GROUP, persistentid, max_w, max_h, format, filename, evbuf);
return format; return format;
} }
/* Add cache entry for no artwork available */ /* Add cache entry for no artwork available */
if (!got_spotifyitem) if (!got_spotifyitem)
cache_artwork_add(persistentid, max_w, max_h, 0, "", evbuf); cache_artwork_add(CACHE_ARTWORK_GROUP, persistentid, max_w, max_h, 0, "", evbuf);
DPRINTF(E_DBG, L_ART, "No artwork found for group %" PRIi64 "\n", persistentid); DPRINTF(E_DBG, L_ART, "No artwork found for group %" PRIi64 "\n", persistentid);

22
src/cache.c
View File

@ -38,7 +38,7 @@
#include "cache.h" #include "cache.h"
#define CACHE_VERSION 1 #define CACHE_VERSION 2
/* The DAAP cache will cache raw daap replies for queries added with /* The DAAP cache will cache raw daap replies for queries added with
* cache_add(). Only some query types are supported. * cache_add(). Only some query types are supported.
@ -66,6 +66,7 @@ struct cache_command
int msec; int msec;
char *path; // artwork path char *path; // artwork path
int artwork_type; // individual or group artwork
int64_t peristentid; int64_t peristentid;
int max_w; int max_w;
int max_h; int max_h;
@ -236,6 +237,7 @@ cache_create_tables(void)
#define T_ARTWORK \ #define T_ARTWORK \
"CREATE TABLE IF NOT EXISTS artwork (" \ "CREATE TABLE IF NOT EXISTS artwork (" \
" id INTEGER PRIMARY KEY NOT NULL,"\ " id INTEGER PRIMARY KEY NOT NULL,"\
" artwork_type INTEGER NOT NULL DEFAULT 0," \
" persistentid INTEGER NOT NULL," \ " persistentid INTEGER NOT NULL," \
" max_w INTEGER NOT NULL," \ " max_w INTEGER NOT NULL," \
" max_h INTEGER NOT NULL," \ " max_h INTEGER NOT NULL," \
@ -245,7 +247,7 @@ cache_create_tables(void)
" data BLOB" \ " data BLOB" \
");" ");"
#define I_ARTWORK_ID \ #define I_ARTWORK_ID \
"CREATE INDEX IF NOT EXISTS idx_persistentidwh ON artwork(persistentid, max_w, max_h);" "CREATE INDEX IF NOT EXISTS idx_persistentidwh ON artwork(artwork_type, persistentid, max_w, max_h);"
#define I_ARTWORK_PATH \ #define I_ARTWORK_PATH \
"CREATE INDEX IF NOT EXISTS idx_pathtime ON artwork(filepath, db_timestamp);" "CREATE INDEX IF NOT EXISTS idx_pathtime ON artwork(filepath, db_timestamp);"
#define T_ADMIN_CACHE \ #define T_ADMIN_CACHE \
@ -1055,7 +1057,7 @@ cache_artwork_add_impl(struct cache_command *cmd)
int datalen; int datalen;
int ret; int ret;
query = "INSERT INTO artwork (id, persistentid, max_w, max_h, format, filepath, db_timestamp, data) VALUES (NULL, ?, ?, ?, ?, ?, ?, ?);"; query = "INSERT INTO artwork (id, persistentid, max_w, max_h, format, filepath, db_timestamp, data, artwork_type) VALUES (NULL, ?, ?, ?, ?, ?, ?, ?, ?);";
ret = sqlite3_prepare_v2(g_db_hdl, query, -1, &stmt, 0); ret = sqlite3_prepare_v2(g_db_hdl, query, -1, &stmt, 0);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
@ -1079,6 +1081,7 @@ cache_artwork_add_impl(struct cache_command *cmd)
sqlite3_bind_text(stmt, 5, cmd->arg.path, -1, SQLITE_STATIC); sqlite3_bind_text(stmt, 5, cmd->arg.path, -1, SQLITE_STATIC);
sqlite3_bind_int(stmt, 6, (uint64_t)time(NULL)); sqlite3_bind_int(stmt, 6, (uint64_t)time(NULL));
sqlite3_bind_blob(stmt, 7, data, datalen, SQLITE_STATIC); sqlite3_bind_blob(stmt, 7, data, datalen, SQLITE_STATIC);
sqlite3_bind_int(stmt, 8, cmd->arg.artwork_type);
ret = sqlite3_step(stmt); ret = sqlite3_step(stmt);
if (ret != SQLITE_DONE) if (ret != SQLITE_DONE)
@ -1104,7 +1107,8 @@ cache_artwork_add_impl(struct cache_command *cmd)
* If there is a cached entry for the given id and width/height, the parameter cached is set to 1. * If there is a cached entry for the given id and width/height, the parameter cached is set to 1.
* In this case format and data contain the cached values. * In this case format and data contain the cached values.
* *
* @param cmd->arg.persistentid persistent songalbumid or songartistid * @param cmd->arg.artwork_type individual or group artwork
* @param cmd->arg.persistentid persistent itemid, songalbumid or songartistid
* @param cmd->arg.max_w maximum image width * @param cmd->arg.max_w maximum image width
* @param cmd->arg.max_h maximum image height * @param cmd->arg.max_h maximum image height
* @param cmd->arg.cached set by this function to 0 if no cache entry exists, otherwise 1 * @param cmd->arg.cached set by this function to 0 if no cache entry exists, otherwise 1
@ -1115,13 +1119,13 @@ cache_artwork_add_impl(struct cache_command *cmd)
static int static int
cache_artwork_get_impl(struct cache_command *cmd) cache_artwork_get_impl(struct cache_command *cmd)
{ {
#define Q_TMPL "SELECT a.format, a.data FROM artwork a WHERE a.persistentid = '%" PRIi64 "' AND a.max_w = %d AND a.max_h = %d;" #define Q_TMPL "SELECT a.format, a.data FROM artwork a WHERE a.artwork_type = %d AND a.persistentid = '%" PRIi64 "' AND a.max_w = %d AND a.max_h = %d;"
sqlite3_stmt *stmt; sqlite3_stmt *stmt;
char *query; char *query;
int datalen; int datalen;
int ret; int ret;
query = sqlite3_mprintf(Q_TMPL, cmd->arg.peristentid, cmd->arg.max_w, cmd->arg.max_h); query = sqlite3_mprintf(Q_TMPL, cmd->arg.artwork_type, cmd->arg.peristentid, cmd->arg.max_w, cmd->arg.max_h);
if (!query) if (!query)
{ {
DPRINTF(E_LOG, L_CACHE, "Out of memory for query string\n"); DPRINTF(E_LOG, L_CACHE, "Out of memory for query string\n");
@ -1462,7 +1466,7 @@ cache_artwork_purge_cruft(time_t ref)
* @return 0 if successful, -1 if an error occurred * @return 0 if successful, -1 if an error occurred
*/ */
int int
cache_artwork_add(int64_t persistentid, int max_w, int max_h, int format, char *filename, struct evbuffer *evbuf) cache_artwork_add(int artwork_type, int64_t persistentid, int max_w, int max_h, int format, char *filename, struct evbuffer *evbuf)
{ {
struct cache_command cmd; struct cache_command cmd;
int ret; int ret;
@ -1473,6 +1477,7 @@ cache_artwork_add(int64_t persistentid, int max_w, int max_h, int format, char *
command_init(&cmd); command_init(&cmd);
cmd.func = cache_artwork_add_impl; cmd.func = cache_artwork_add_impl;
cmd.arg.artwork_type = artwork_type;
cmd.arg.peristentid = persistentid; cmd.arg.peristentid = persistentid;
cmd.arg.max_w = max_w; cmd.arg.max_w = max_w;
cmd.arg.max_h = max_h; cmd.arg.max_h = max_h;
@ -1502,7 +1507,7 @@ cache_artwork_add(int64_t persistentid, int max_w, int max_h, int format, char *
* @return 0 if successful, -1 if an error occurred * @return 0 if successful, -1 if an error occurred
*/ */
int int
cache_artwork_get(int64_t persistentid, int max_w, int max_h, int *cached, int *format, struct evbuffer *evbuf) cache_artwork_get(int artwork_type, int64_t persistentid, int max_w, int max_h, int *cached, int *format, struct evbuffer *evbuf)
{ {
struct cache_command cmd; struct cache_command cmd;
int ret; int ret;
@ -1513,6 +1518,7 @@ cache_artwork_get(int64_t persistentid, int max_w, int max_h, int *cached, int *
command_init(&cmd); command_init(&cmd);
cmd.func = cache_artwork_get_impl; cmd.func = cache_artwork_get_impl;
cmd.arg.artwork_type = artwork_type;
cmd.arg.peristentid = persistentid; cmd.arg.peristentid = persistentid;
cmd.arg.max_w = max_w; cmd.arg.max_w = max_w;
cmd.arg.max_h = max_h; cmd.arg.max_h = max_h;

7
src/cache.h
View File

@ -27,6 +27,9 @@ cache_daap_threshold(void);
/* ---------------------------- Artwork cache API --------------------------- */ /* ---------------------------- Artwork cache API --------------------------- */
#define CACHE_ARTWORK_GROUP 0
#define CACHE_ARTWORK_INDIVIDUAL 1
int int
cache_artwork_ping(char *path, time_t mtime); cache_artwork_ping(char *path, time_t mtime);
@ -37,10 +40,10 @@ int
cache_artwork_purge_cruft(time_t ref); cache_artwork_purge_cruft(time_t ref);
int int
cache_artwork_add(int64_t persistentid, int max_w, int max_h, int format, char *filename, struct evbuffer *evbuf); cache_artwork_add(int artwork_type, int64_t persistentid, int max_w, int max_h, int format, char *filename, struct evbuffer *evbuf);
int int
cache_artwork_get(int64_t persistentid, int max_w, int max_h, int *cached, int *format, struct evbuffer *evbuf); cache_artwork_get(int artwork_type, int64_t persistentid, int max_w, int max_h, int *cached, int *format, struct evbuffer *evbuf);
/* ---------------------------- Cache API --------------------------- */ /* ---------------------------- Cache API --------------------------- */