MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-24 04:20:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

[library] rss pulls channel->image->url if available

Browse Source
This commit is contained in:
whatdoineed2do/Ray 2020-04-26 16:59:01 +01:00 committed by ejurgensen
parent e7c62086a2
commit 5a872dc436
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/library/rssscanner.c
View File

@ -281,7 +281,7 @@ rss_xml_get(const char *url)
} }
static int static int
rss_xml_parse_feed(const char **feed_title, const char **feed_author, mxml_node_t *xml) rss_xml_parse_feed(const char **feed_title, const char **feed_author, const char **feed_artwork, mxml_node_t *xml)
{ {
mxml_node_t *channel; mxml_node_t *channel;
mxml_node_t *node; mxml_node_t *node;
@ -304,6 +304,14 @@ rss_xml_parse_feed(const char **feed_title, const char **feed_author, mxml_node_
node = mxmlFindElement(channel, channel, "itunes:author", NULL, NULL, MXML_DESCEND_FIRST); node = mxmlFindElement(channel, channel, "itunes:author", NULL, NULL, MXML_DESCEND_FIRST);
*feed_author = node ? mxmlGetOpaque(node) : NULL; *feed_author = node ? mxmlGetOpaque(node) : NULL;
*feed_artwork = NULL;
node = mxmlFindElement(channel, channel, "image", NULL, NULL, MXML_DESCEND_FIRST);
if (node)
{
node = mxmlFindElement(node, node, "url", NULL, NULL, MXML_DESCEND_FIRST);
*feed_artwork = node ? mxmlGetOpaque(node) : NULL;
}
return 0; return 0;
} }
@ -405,6 +413,7 @@ rss_save(struct playlist_info *pli, int *count, enum rss_scan_type scan_type)
mxml_node_t *xml; mxml_node_t *xml;
const char *feed_title; const char *feed_title;
const char *feed_author; const char *feed_author;
const char *feed_artwork;
struct media_file_info mfi = { 0 }; struct media_file_info mfi = { 0 };
struct rss_item_info ri; struct rss_item_info ri;
uint32_t time_added; uint32_t time_added;
@ -418,7 +427,7 @@ rss_save(struct playlist_info *pli, int *count, enum rss_scan_type scan_type)
return -1; return -1;
} }
ret = rss_xml_parse_feed(&feed_title, &feed_author, xml); ret = rss_xml_parse_feed(&feed_title, &feed_author, &feed_artwork, xml);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_LIB, "Invalid RSS/xml received from '%s' (id %d)\n", pli->path, pli->id); DPRINTF(E_LOG, L_LIB, "Invalid RSS/xml received from '%s' (id %d)\n", pli->path, pli->id);
@ -429,6 +438,9 @@ rss_save(struct playlist_info *pli, int *count, enum rss_scan_type scan_type)
free(pli->title); free(pli->title);
pli->title = safe_strdup(feed_title); pli->title = safe_strdup(feed_title);
free(pli->artwork_url);
pli->artwork_url = safe_strdup(feed_artwork);
free(pli->virtual_path); free(pli->virtual_path);
pli->virtual_path = safe_asprintf("/%s", pli->path); pli->virtual_path = safe_asprintf("/%s", pli->path);