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

Merge pull request #334 from phanan/analysis-zO3v2R

Browse source 
Applied fixes from StyleCI
This commit is contained in:
Phan An 2016-05-21 19:32:40 +08:00
commit 5bfb675602
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Models/File.php
View file

@ -121,7 +121,7 @@ class File
// getID3's 'part_of_a_compilation' value can either be null, ['0'], or ['1']
// We convert it into a boolean here.
$props['part_of_a_compilation'] = !!array_get($comments, 'part_of_a_compilation', [false])[0];
$props['part_of_a_compilation'] = (bool) array_get($comments, 'part_of_a_compilation', [false])[0];
// We prefer id3v2 tags over others.
if (!$artist = array_get($info, 'tags.id3v2.artist', [null])[0]) {
@ -190,7 +190,7 @@ class File
// Otherwise, re-use the existing model value.
$artist = isset($info['artist']) ? Artist::get($info['artist']) : $this->song->album->artist;
$isCompilation = !!array_get($info, 'part_of_a_compilation');
$isCompilation = (bool) array_get($info, 'part_of_a_compilation');
// If the "album" tag is specified, use it.
// Otherwise, re-use the existing model value.
@ -199,7 +199,7 @@ class File
: $this->song->album;
} else {
// The file is newly added.
$isCompilation = !!array_get($info, 'part_of_a_compilation');
$isCompilation = (bool) array_get($info, 'part_of_a_compilation');
$artist = Artist::get($info['artist']);
$album = Album::get($artist, $info['album'], $isCompilation);
}

2
database/migrations/2016_04_15_121215_add_is_complilation_into_albums.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddIsComplilationIntoAlbums extends Migration
{

2
database/migrations/2016_04_15_125237_add_contributing_artist_id_into_songs.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddContributingArtistIdIntoSongs extends Migration
{

1
database/migrations/2016_04_16_082627_create_various_artists.php
View file

@ -1,7 +1,6 @@
<?php
use App\Models\Artist;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateVariousArtists extends Migration