PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-12-01 17:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge rPFb66ec54221d5: T357: Added genre handling to the MLPMA importer.

Browse source
This commit is contained in:
Kelvin Zhang 2015-09-10 12:35:35 +01:00
parent 1fe6aa98b5
commit 5a2fb2f05e
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/Console/Commands/ImportMLPMA.php
View file

@ -2,6 +2,7 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Genre;
use App\Image; use App\Image;
use App\Track; use App\Track;
use App\User; use App\User;
@ -87,6 +88,11 @@ class ImportMLPMA extends Command
File::makeDirectory($tmpPath); File::makeDirectory($tmpPath);
} }
$UNKNOWN_GENRE = Genre::firstOrCreate([
'name' => 'Unknown',
'slug' => 'unknown'
]);
$this->comment('Enumerating MLP Music Archive source files...'); $this->comment('Enumerating MLP Music Archive source files...');
$files = File::allFiles($mlpmaPath); $files = File::allFiles($mlpmaPath);
$this->info(sizeof($files) . ' files found!'); $this->info(sizeof($files) . ' files found!');
@ -189,6 +195,31 @@ class ImportMLPMA extends Command
$isVocal = $parsedTags['lyrics'] !== null; $isVocal = $parsedTags['lyrics'] !== null;
//==========================================================================================================
// Determine the genre
//==========================================================================================================
$genreName = $parsedTags['genre'];
$this->info('Genre: '.$genreName);
if ($genreName) {
$genre = Genre::where('name', '=', $genreName)->first();
if ($genre) {
$genreId = $genre->id;
} else {
$genre = new Genre();
$genre->name = $genreName;
$genre->slug = Str::slug($genreName);
$genre->save();
$genreId = $genre->id;
$this->comment('Created a new genre!');
}
} else {
$genreId = $UNKNOWN_GENRE->id; // "Unknown" genre ID
}
//========================================================================================================== //==========================================================================================================
// Determine which artist account this file belongs to using the containing directory. // Determine which artist account this file belongs to using the containing directory.
//========================================================================================================== //==========================================================================================================
@ -264,7 +295,7 @@ class ImportMLPMA extends Command
//========================================================================================================== //==========================================================================================================
// Is this part of an album? // Is this part of an album?
//========================================================================================================== //==========================================================================================================
// Find the album if it exists and create it if it doesn't.
$albumId = null; $albumId = null;
$albumName = $parsedTags['album']; $albumName = $parsedTags['album'];
@ -311,6 +342,7 @@ class ImportMLPMA extends Command
$track->title = $parsedTags['title']; $track->title = $parsedTags['title'];
$track->cover_id = $coverId; $track->cover_id = $coverId;
$track->album_id = $albumId; $track->album_id = $albumId;
$track->genre_id = $genreId;
$track->track_number = $parsedTags['track_number']; $track->track_number = $parsedTags['track_number'];
$track->released_at = $releasedAt; $track->released_at = $releasedAt;
$track->description = $parsedTags['comments']; $track->description = $parsedTags['comments'];

4
app/Genre.php
View file

@ -2,12 +2,14 @@
namespace App; namespace App;
use Illuminate\Database\Eloquent\Model;
use App\Traits\SlugTrait; use App\Traits\SlugTrait;
use Illuminate\Database\Eloquent\Model;
class Genre extends Model class Genre extends Model
{ {
protected $table = 'genres'; protected $table = 'genres';
protected $fillable = ['name', 'slug'];
public $timestamps = false;
use SlugTrait; use SlugTrait;
} }