MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-03-31 01:33:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Artwork file names made configurable

Browse Source
This commit is contained in:
ejurgensen 2013-07-13 12:31:01 +02:00
parent 0f3cf27f57
commit 0b571765d3
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forked-daapd.conf
View File

@ -29,6 +29,10 @@ library {
# Matches anywhere in the path (not a regexp, though) # Matches anywhere in the path (not a regexp, though)
# compilations = { "/compilations/" } # compilations = { "/compilations/" }
# Artwork file names (without file type extension)
# forked-daapd will look for jpg and png files with these base names
# artwork_basenames = { "artwork", "cover" }
# Should iTunes metadata override ours? # Should iTunes metadata override ours?
# itunes_overrides = true # itunes_overrides = true

23
src/artwork.c
View File

@ -37,17 +37,14 @@
#include "db.h" #include "db.h"
#include "logger.h" #include "logger.h"
#include "conffile.h"
#if LIBAVFORMAT_VERSION_MAJOR >= 53 #if LIBAVFORMAT_VERSION_MAJOR >= 53
# include "avio_evbuffer.h" # include "avio_evbuffer.h"
#endif #endif
#include "artwork.h" #include "artwork.h"
static const char *cover_basename[] =
{
"artwork", "cover", "folder",
};
static const char *cover_extension[] = static const char *cover_extension[] =
{ {
"png", "jpg", "png", "jpg",
@ -674,6 +671,8 @@ artwork_get_dir_image(char *path, int isdir, int max_w, int max_h, int format, s
int j; int j;
int len; int len;
int ret; int ret;
cfg_t *lib;
int nbasenames;
ret = snprintf(artwork, sizeof(artwork), "%s", path); ret = snprintf(artwork, sizeof(artwork), "%s", path);
if ((ret < 0) || (ret >= sizeof(artwork))) if ((ret < 0) || (ret >= sizeof(artwork)))
@ -692,14 +691,20 @@ artwork_get_dir_image(char *path, int isdir, int max_w, int max_h, int format, s
len = strlen(artwork); len = strlen(artwork);
for (i = 0; i < (sizeof(cover_basename) / sizeof(cover_basename[0])); i++) lib = cfg_getsec(cfg, "library");
nbasenames = cfg_size(lib, "artwork_basenames");
if (nbasenames == 0)
return -1;
for (i = 0; i < nbasenames; i++)
{ {
for (j = 0; j < (sizeof(cover_extension) / sizeof(cover_extension[0])); j++) for (j = 0; j < (sizeof(cover_extension) / sizeof(cover_extension[0])); j++)
{ {
ret = snprintf(artwork + len, sizeof(artwork) - len, "/%s.%s", cover_basename[i], cover_extension[j]); ret = snprintf(artwork + len, sizeof(artwork) - len, "/%s.%s", cfg_getnstr(lib, "artwork_basenames", i), cover_extension[j]);
if ((ret < 0) || (ret >= sizeof(artwork) - len)) if ((ret < 0) || (ret >= sizeof(artwork) - len))
{ {
DPRINTF(E_INFO, L_ART, "Artwork path exceeds PATH_MAX (%s.%s)\n", cover_basename[i], cover_extension[j]); DPRINTF(E_INFO, L_ART, "Artwork path exceeds PATH_MAX (%s.%s)\n", cfg_getnstr(lib, "artwork_basenames", i), cover_extension[j]);
continue; continue;
} }
@ -717,7 +722,7 @@ artwork_get_dir_image(char *path, int isdir, int max_w, int max_h, int format, s
break; break;
} }
if (i == (sizeof(cover_basename) / sizeof(cover_basename[0]))) if (i == nbasenames)
return -1; return -1;
return artwork_get(artwork, max_w, max_h, format, evbuf); return artwork_get(artwork, max_w, max_h, format, evbuf);

1
src/conffile.c
View File

@ -61,6 +61,7 @@ static cfg_opt_t sec_library[] =
CFG_STR("password", NULL, CFGF_NONE), CFG_STR("password", NULL, CFGF_NONE),
CFG_STR_LIST("directories", NULL, CFGF_NONE), CFG_STR_LIST("directories", NULL, CFGF_NONE),
CFG_STR_LIST("compilations", NULL, CFGF_NONE), CFG_STR_LIST("compilations", NULL, CFGF_NONE),
CFG_STR_LIST("artwork_basenames", "{artwork,cover}", CFGF_NONE),
CFG_BOOL("itunes_overrides", cfg_false, CFGF_NONE), CFG_BOOL("itunes_overrides", cfg_false, CFGF_NONE),
CFG_STR_LIST("no_transcode", NULL, CFGF_NONE), CFG_STR_LIST("no_transcode", NULL, CFGF_NONE),
CFG_STR_LIST("force_transcode", NULL, CFGF_NONE), CFG_STR_LIST("force_transcode", NULL, CFGF_NONE),