MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-03-13 21:12:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

[scan] Always use compilation_artist for tracks in compilation dir

Browse Source 
Reason is that tracks in compilation dir are not to be trusted when it comes
to album_artist.

See afee99d5db (commitcomment-31807556).
This commit is contained in:
ejurgensen 2018-12-31 14:13:57 +01:00
parent 9929832b5f
commit 19c39bf133
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
forked-daapd.conf.in
View File

@ -95,11 +95,13 @@ library {
# (changing this setting only takes effect after rescan, see the README) # (changing this setting only takes effect after rescan, see the README)
compilations = { "/Compilations" } compilations = { "/Compilations" }
# Compilations usually have many artists, and sometimes no album arist. # Compilations usually have many artists, and sometimes no album artist.
# If you don't want every non album artist to be listed in artist views, # If you don't want every artist to be listed in artist views, you can
# you can set a single name which will be used for all compilations. # set a single name which will be used for all compilation tracks
# without an album artist, and for all tracks in the compilation
# directories.
# (changing this setting only takes effect after rescan, see the README) # (changing this setting only takes effect after rescan, see the README)
compilation_artist = "Various artists" compilation_artist = "Various Artists"
# If your album and artist lists are cluttered, you can choose to hide # If your album and artist lists are cluttered, you can choose to hide
# albums and artists with only one track. The tracks will still be # albums and artists with only one track. The tracks will still be

4
src/db_init.c
View File

@ -66,7 +66,7 @@
" artwork INTEGER DEFAULT 0," \ " artwork INTEGER DEFAULT 0," \
" rating INTEGER DEFAULT 0," \ " rating INTEGER DEFAULT 0," \
" play_count INTEGER DEFAULT 0," \ " play_count INTEGER DEFAULT 0," \
" skip_count INTEGER DEFAULT 0," \ " skip_count INTEGER DEFAULT 0," \
" seek INTEGER DEFAULT 0," \ " seek INTEGER DEFAULT 0," \
" data_kind INTEGER DEFAULT 0," \ " data_kind INTEGER DEFAULT 0," \
" media_kind INTEGER DEFAULT 0," \ " media_kind INTEGER DEFAULT 0," \
@ -76,7 +76,7 @@
" time_added INTEGER DEFAULT 0," \ " time_added INTEGER DEFAULT 0," \
" time_modified INTEGER DEFAULT 0," \ " time_modified INTEGER DEFAULT 0," \
" time_played INTEGER DEFAULT 0," \ " time_played INTEGER DEFAULT 0," \
" time_skipped INTEGER DEFAULT 0," \ " time_skipped INTEGER DEFAULT 0," \
" disabled INTEGER DEFAULT 0," \ " disabled INTEGER DEFAULT 0," \
" sample_count INTEGER DEFAULT 0," \ " sample_count INTEGER DEFAULT 0," \
" codectype VARCHAR(5) DEFAULT NULL," \ " codectype VARCHAR(5) DEFAULT NULL," \

8
src/library/filescanner.c
View File

@ -509,14 +509,18 @@ process_regular_file(const char *file, struct stat *sb, int type, int flags, int
else else
{ {
mfi.data_kind = DATA_KIND_FILE; mfi.data_kind = DATA_KIND_FILE;
mfi.file_size = sb->st_size;
if (type & F_SCAN_TYPE_AUDIOBOOK) if (type & F_SCAN_TYPE_AUDIOBOOK)
mfi.media_kind = MEDIA_KIND_AUDIOBOOK; mfi.media_kind = MEDIA_KIND_AUDIOBOOK;
else if (type & F_SCAN_TYPE_PODCAST) else if (type & F_SCAN_TYPE_PODCAST)
mfi.media_kind = MEDIA_KIND_PODCAST; mfi.media_kind = MEDIA_KIND_PODCAST;
mfi.compilation = (type & F_SCAN_TYPE_COMPILATION); if (type & F_SCAN_TYPE_COMPILATION)
mfi.file_size = sb->st_size; {
mfi.compilation = 1;
mfi.album_artist = safe_strdup(cfg_getstr(cfg_getsec(cfg, "library"), "compilation_artist"));
}
ret = scan_metadata_ffmpeg(file, &mfi); ret = scan_metadata_ffmpeg(file, &mfi);
if (ret < 0) if (ret < 0)