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

[artwork] Remove errors in log saying "Source 'stream' returned an error..."

Browse Source 
Handler for stream doesn't support URL's with "file:", so ignore any such URLs.
This commit is contained in:
ejurgensen 2024-01-12 23:04:59 +01:00
parent f5c6a1c770
commit 74c82141d4
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/artwork.c
View File

@ -918,7 +918,7 @@ artwork_get_bydir(struct evbuffer *evbuf, char *out_path, size_t len, char *dir,
* before making a request. Stashes result in cache, also if negative. * before making a request. Stashes result in cache, also if negative.
* *
* @out artwork Image data * @out artwork Image data
* @in url URL of the artwork * @in url HTTP(S) URL of the artwork
* @in req_params Requested max size/format * @in req_params Requested max size/format
* @return ART_FMT_* on success, ART_E_NONE or ART_E_ERROR * @return ART_FMT_* on success, ART_E_NONE or ART_E_ERROR
*/ */
@ -1584,16 +1584,22 @@ static int
source_item_artwork_url_get(struct artwork_ctx *ctx) source_item_artwork_url_get(struct artwork_ctx *ctx)
{ {
struct db_queue_item *queue_item; struct db_queue_item *queue_item;
const char *proto_http = "http:";
const char *proto_https = "https:";
bool is_http;
bool is_https;
int ret; int ret;
DPRINTF(E_SPAM, L_ART, "Trying artwork url for %s\n", ctx->dbmfi->path); DPRINTF(E_SPAM, L_ART, "Trying artwork url for %s\n", ctx->dbmfi->path);
queue_item = db_queue_fetch_byfileid(ctx->id); queue_item = db_queue_fetch_byfileid(ctx->id);
if (!queue_item || !queue_item->artwork_url) if (!queue_item || !queue_item->artwork_url)
{ goto notfound;
free_queue_item(queue_item, 0);
return ART_E_NONE; is_http = (strncmp(queue_item->artwork_url, proto_http, strlen(proto_http)) == 0);
} is_https = (strncmp(queue_item->artwork_url, proto_https, strlen(proto_https)) == 0);
if (!is_http && !is_https)
goto notfound;
ret = artwork_get_byurl(ctx->evbuf, queue_item->artwork_url, ctx->req_params); ret = artwork_get_byurl(ctx->evbuf, queue_item->artwork_url, ctx->req_params);
@ -1602,6 +1608,10 @@ source_item_artwork_url_get(struct artwork_ctx *ctx)
free_queue_item(queue_item, 0); free_queue_item(queue_item, 0);
return ret; return ret;
notfound:
free_queue_item(queue_item, 0);
return ART_E_NONE;
} }
/* /*
@ -1613,17 +1623,22 @@ static int
source_item_pipe_get(struct artwork_ctx *ctx) source_item_pipe_get(struct artwork_ctx *ctx)
{ {
struct db_queue_item *queue_item; struct db_queue_item *queue_item;
const char *proto = "file:"; const char *proto_file = "file:";
bool is_file;
char *path; char *path;
int ret; int ret;
DPRINTF(E_SPAM, L_ART, "Trying pipe metadata from %s.metadata\n", ctx->dbmfi->path); DPRINTF(E_SPAM, L_ART, "Trying pipe metadata from %s.metadata\n", ctx->dbmfi->path);
queue_item = db_queue_fetch_byfileid(ctx->id); queue_item = db_queue_fetch_byfileid(ctx->id);
if (!queue_item || !queue_item->artwork_url || strncmp(queue_item->artwork_url, proto, strlen(proto)) != 0) if (!queue_item || !queue_item->artwork_url)
goto notfound; goto notfound;
path = queue_item->artwork_url + strlen(proto); is_file = (strncmp(queue_item->artwork_url, proto_file, strlen(proto_file)) == 0);
if (!is_file)
goto notfound;
path = queue_item->artwork_url + strlen(proto_file);
// Sometimes the file has been replaced, but queue_item->artwork_url hasn't // Sometimes the file has been replaced, but queue_item->artwork_url hasn't
// been updated yet. In that case just stop now. // been updated yet. In that case just stop now.