Mirrors/koel
2
0
Fork 0
mirror of https://github.com/koel/koel synced 2024-11-24 13:13:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation sync

Browse source
This commit is contained in:
An Phan 2016-06-05 02:17:27 +08:00
parent e2d35738fd
commit 63fc810e9d
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/Models/File.php
View file

@ -178,9 +178,15 @@ class File
// In such a case, the user must have specified a list of tags to sync.
// A sample command could be: ./artisan koel:sync --force --tags=artist,album,lyrics
// We cater for these tags by removing those not specified.
// There's a special case with 'album though'.
// If 'part_of_a_compilation' tag is specified, 'album' must be counted in as well.
// But if 'album' isn't specified, we don't want to update normal albums.
// This variable is to keep track of this state.
$changeCompilationAlbumOnly = false;
if (in_array('part_of_a_compilation', $tags) && !in_array('album', $tags)) {
// If 'part_of_a_compilation' tag is specified, 'album' must be counted in as well.
$tags[] = 'album';
$changeCompilationAlbumOnly = true;
}
$info = array_intersect_key($info, array_flip($tags));
@ -193,9 +199,13 @@ class File
// If the "album" tag is specified, use it.
// Otherwise, re-use the existing model value.
$album = isset($info['album'])
? Album::get($artist, $info['album'], $isCompilation)
: $this->song->album;
if (isset($info['album'])) {
$album = $changeCompilationAlbumOnly
? $this->song->album
: Album::get($artist, $info['album'], $isCompilation);
} else {
$album = $this->song->album;
}
} else {
// The file is newly added.
$isCompilation = (bool) array_get($info, 'part_of_a_compilation');