MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-27 23:55:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

[artwork] Get enablement of online srcs from settings

Browse Source 
Settings will take care of consulting the cfg file now
This commit is contained in:
ejurgensen 2020-02-22 16:49:00 +01:00
parent 9b9d2d0fb7
commit 1ed10771f1
1 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/artwork.c
View File

@ -142,8 +142,6 @@ enum parse_result {
struct online_source { struct online_source {
// Name of online source // Name of online source
const char *name; const char *name;
const bool is_default;
const char *setting_name; const char *setting_name;
// How to authorize (using the Authorize http header) // How to authorize (using the Authorize http header)
@ -334,14 +332,13 @@ static enum parse_result response_jparse_musicbrainz(char **artwork_url, json_ob
static struct online_source spotify_source = static struct online_source spotify_source =
{ {
.name = "Spotify", .name = "Spotify",
.is_default = true,
.setting_name = "use_artwork_source_spotify", .setting_name = "use_artwork_source_spotify",
.auth_header = "Bearer $SECRET$", .auth_header = "Bearer $SECRET$",
.search_endpoint = "https://api.spotify.com/v1/search", .search_endpoint = "https://api.spotify.com/v1/search",
.search_param = "type=track&limit=1&$QUERY$", .search_param = "type=track&limit=1&$QUERY$",
.query_parts = .query_parts =
{ {
{ "q", "artist:$ARTIST$ album:$ALBUM$" }, // TODO test if album search works with type=track { "q", "artist:$ARTIST$ album:$ALBUM$" },
{ "q", "artist:$ARTIST$ track:$TITLE$" }, { "q", "artist:$ARTIST$ track:$TITLE$" },
{ NULL, NULL }, { NULL, NULL },
}, },
@ -352,7 +349,6 @@ static struct online_source spotify_source =
static struct online_source discogs_source = static struct online_source discogs_source =
{ {
.name = "Discogs", .name = "Discogs",
.is_default = false,
.setting_name = "use_artwork_source_discogs", .setting_name = "use_artwork_source_discogs",
.auth_header = "Discogs key=$KEY$, secret=$SECRET$", .auth_header = "Discogs key=$KEY$, secret=$SECRET$",
.auth_key = "ivzUxlkUiwpptDKpSCHF", .auth_key = "ivzUxlkUiwpptDKpSCHF",
@ -373,7 +369,6 @@ static struct online_source discogs_source =
static struct online_source musicbrainz_source = static struct online_source musicbrainz_source =
{ {
.name = "Musicbrainz", .name = "Musicbrainz",
.is_default = false,
.setting_name = "use_artwork_source_coverartarchive", .setting_name = "use_artwork_source_coverartarchive",
.search_endpoint = "http://musicbrainz.org/ws/2/release-group/", .search_endpoint = "http://musicbrainz.org/ws/2/release-group/",
.search_param = "limit=1&fmt=json&$QUERY$", .search_param = "limit=1&fmt=json&$QUERY$",
@ -997,8 +992,7 @@ online_source_response_parse(char **artwork_url, struct online_source *src, stru
evbuffer_add(response, "", 1); evbuffer_add(response, "", 1);
body = (char *)evbuffer_pullup(response, -1); body = (char *)evbuffer_pullup(response, -1);
// TODO remove DPRINTF(E_SPAM, L_ART, "Response from '%s': %s\n", src->name, body);
DPRINTF(E_DBG, L_ART, "Response from '%s': %s\n", src->name, body);
if (src->response_jparse) if (src->response_jparse)
{ {
@ -1261,34 +1255,15 @@ static bool
online_source_is_enabled(struct online_source *src) online_source_is_enabled(struct online_source *src)
{ {
struct settings_category *category; struct settings_category *category;
cfg_t *lib; bool enabled;
const char *name;
int n_cfg;
int i;
lib = cfg_getsec(cfg, "library"); CHECK_NULL(L_ART, category = settings_category_get("artwork"));
enabled = settings_option_getbool(settings_option_get(category, src->setting_name));
n_cfg = cfg_size(lib, "artwork_online_sources"); if (!enabled)
if (n_cfg == 0) // User didn't set anything in the config file, use settings DPRINTF(E_DBG, L_ART, "Source %s is disabled\n", src->name);
{
category = settings_category_get("artwork");
if (!category)
return src->is_default;
// if (!settings_option_is_set(category, src->setting_name)) return enabled;
// return src->is_default;
return settings_option_getbool(settings_option_get(category, src->setting_name));
}
for (i = 0; i < n_cfg; i++)
{
name = cfg_getnstr(lib, "artwork_online_sources", i);
if (strcasecmp(name, src->name) == 0)
return true;
}
return src->is_default;
} }