mirror of
https://github.com/Poniverse/Pony.fm.git
synced 2024-11-22 04:58:01 +01:00
Added ID3v2 support and some stuff from the MLPMA script
This commit is contained in:
Josef Citrine
parent
373703990c
commit
c510dd7dfc
1 changed files with 151 additions and 12 deletions
|
|
@ -12,6 +12,8 @@ use getID3;
|
||||||
use Poniverse\Ponyfm\Models\Image;
|
use Poniverse\Ponyfm\Models\Image;
|
||||||
use Poniverse\Ponyfm\Models\Track;
|
use Poniverse\Ponyfm\Models\Track;
|
||||||
use Poniverse\Ponyfm\Models\User;
|
use Poniverse\Ponyfm\Models\User;
|
||||||
|
use Poniverse\Ponyfm\Models\Genre;
|
||||||
|
use Poniverse\Ponyfm\Models\Album;
|
||||||
use Poniverse\Ponyfm\Commands\UploadTrackCommand;
|
use Poniverse\Ponyfm\Commands\UploadTrackCommand;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
|
|
@ -89,6 +91,11 @@ class ImportPonify extends Command
|
||||||
File::makeDirectory($tmpPath);
|
File::makeDirectory($tmpPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$UNKNOWN_GENRE = Genre::firstOrCreate([
|
||||||
|
'name' => 'Unknown',
|
||||||
|
'slug' => 'unknown'
|
||||||
|
]);
|
||||||
|
|
||||||
//==========================================================================================================
|
//==========================================================================================================
|
||||||
// Get the list of files and artists
|
// Get the list of files and artists
|
||||||
//==========================================================================================================
|
//==========================================================================================================
|
||||||
|
|
@ -151,9 +158,63 @@ class ImportPonify extends Command
|
||||||
|
|
||||||
list($parsedTags, $rawTags) = $this->parseTags($file, $allTags);
|
list($parsedTags, $rawTags) = $this->parseTags($file, $allTags);
|
||||||
|
|
||||||
$imageFilename = $file->getFilename() . ".tags.txt";
|
//$imageFilename = $file->getFilename() . ".tags.txt";
|
||||||
$imageFilePath = "$tmpPath/" . $imageFilename;
|
//$imageFilePath = "$tmpPath/" . $imageFilename;
|
||||||
File::put($imageFilePath, print_r($allTags, true));
|
//File::put($imageFilePath, print_r($allTags, true));
|
||||||
|
|
||||||
|
//==========================================================================================================
|
||||||
|
// Determine the release date.
|
||||||
|
//==========================================================================================================
|
||||||
|
$modifiedDate = Carbon::createFromTimeStampUTC(File::lastModified($file->getPathname()));
|
||||||
|
$taggedYear = $parsedTags['year'];
|
||||||
|
|
||||||
|
$this->info('Modification year: '.$modifiedDate->year);
|
||||||
|
$this->info('Tagged year: '.$taggedYear);
|
||||||
|
|
||||||
|
if ($taggedYear !== null && $modifiedDate->year === $taggedYear) {
|
||||||
|
$releasedAt = $modifiedDate;
|
||||||
|
|
||||||
|
} else if ($taggedYear !== null && $modifiedDate->year !== $taggedYear) {
|
||||||
|
$this->error('Release years don\'t match! Using the tagged year...');
|
||||||
|
$releasedAt = Carbon::create($taggedYear);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// $taggedYear is null
|
||||||
|
$this->error('This track isn\'t tagged with its release year! Using the track\'s last modified date...');
|
||||||
|
$releasedAt = $modifiedDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
// This is later used by the classification/publishing script to determine the publication date.
|
||||||
|
$parsedTags['released_at'] = $releasedAt->toDateTimeString();
|
||||||
|
|
||||||
|
//==========================================================================================================
|
||||||
|
// Does this track have vocals?
|
||||||
|
//==========================================================================================================
|
||||||
|
$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
|
||||||
|
}
|
||||||
|
|
||||||
//==========================================================================================================
|
//==========================================================================================================
|
||||||
// Check to see if we have this track already, if so, compare hashes of the two files
|
// Check to see if we have this track already, if so, compare hashes of the two files
|
||||||
|
|
@ -352,6 +413,30 @@ class ImportPonify extends Command
|
||||||
$this->comment('No cover art found!');
|
$this->comment('No cover art found!');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//==========================================================================================================
|
||||||
|
// Is this part of an album?
|
||||||
|
//==========================================================================================================
|
||||||
|
$albumId = null;
|
||||||
|
$albumName = $parsedTags['album'];
|
||||||
|
|
||||||
|
if ($albumName !== null) {
|
||||||
|
$album = Album::where('user_id', '=', $artist->id)
|
||||||
|
->where('title', '=', $albumName)
|
||||||
|
->first();
|
||||||
|
|
||||||
|
if (!$album) {
|
||||||
|
$album = new Album;
|
||||||
|
|
||||||
|
$album->title = $albumName;
|
||||||
|
$album->user_id = $artist->id;
|
||||||
|
$album->cover_id = $coverId;
|
||||||
|
|
||||||
|
$album->save();
|
||||||
|
}
|
||||||
|
|
||||||
|
$albumId = $album->id;
|
||||||
|
}
|
||||||
|
|
||||||
//==========================================================================================================
|
//==========================================================================================================
|
||||||
// Send the track into the upload system like a user just uploaded a track
|
// Send the track into the upload system like a user just uploaded a track
|
||||||
//==========================================================================================================
|
//==========================================================================================================
|
||||||
|
|
@ -361,7 +446,8 @@ class ImportPonify extends Command
|
||||||
|
|
||||||
$mime = $allTags['mime_type'];
|
$mime = $allTags['mime_type'];
|
||||||
|
|
||||||
$trackFile = new UploadedFile($file->getPathname(), $file->getFilename(), $mime, null, null, true);
|
File::copy($file->getPathname(), "$tmpPath/" . $file->getFilename());
|
||||||
|
$trackFile = new UploadedFile("$tmpPath/" . $file->getFilename(), $file->getFilename(), $mime, null, null, true);
|
||||||
|
|
||||||
$upload = new UploadTrackCommand(true);
|
$upload = new UploadTrackCommand(true);
|
||||||
$upload->_file = $trackFile;
|
$upload->_file = $trackFile;
|
||||||
|
|
@ -372,7 +458,15 @@ class ImportPonify extends Command
|
||||||
} else {
|
} else {
|
||||||
$track = Track::find($result->getResponse()['id']);
|
$track = Track::find($result->getResponse()['id']);
|
||||||
$track->cover_id = $coverId;
|
$track->cover_id = $coverId;
|
||||||
$track->license_id = 2;
|
$track->album_id = $albumId;
|
||||||
|
$track->genre_id = $genreId;
|
||||||
|
$track->track_number = $parsedTags['track_number'];
|
||||||
|
$track->released_at = $releasedAt;
|
||||||
|
$track->description = $parsedTags['comments'];
|
||||||
|
$track->is_downloadable = true;
|
||||||
|
$track->lyrics = $parsedTags['lyrics'];
|
||||||
|
$track->is_vocal = $isVocal;
|
||||||
|
$track->license_id = 2;
|
||||||
$track->save();
|
$track->save();
|
||||||
|
|
||||||
// If we made it to here, the track is intact! Log the import.
|
// If we made it to here, the track is intact! Log the import.
|
||||||
|
|
@ -448,23 +542,68 @@ class ImportPonify extends Command
|
||||||
return [$parsedTags, $rawTags];
|
return [$parsedTags, $rawTags];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function parseId3v2Tags($tags) {
|
||||||
|
$parsedTags = [];
|
||||||
|
|
||||||
|
if (array_key_exists('TIT2', $tags)) {
|
||||||
|
$parsedTags['title'] = $tags['TIT2'][0]['data'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_key_exists('TPE1', $tags)) {
|
||||||
|
$parsedTags['artist'] = $tags['TPE1'][0]['data'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_key_exists('TPE2', $tags)) {
|
||||||
|
$parsedTags['band'] = $tags['TPE2'][0]['data'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_key_exists('TRCK', $tags)) {
|
||||||
|
$parsedTags['track_number'] = $tags['TRCK'][0]['data'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_key_exists('TALB', $tags)) {
|
||||||
|
$parsedTags['album'] = $tags['TALB'][0]['data'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_key_exists('TYER', $tags)) {
|
||||||
|
$parsedTags['year'] = $tags['TYER'][0]['data'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_key_exists('COMM', $tags)) {
|
||||||
|
$parsedTags['comments'] = $tags['COMM'][0]['data'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_key_exists('TDAT', $tags)) {
|
||||||
|
$parsedTags['release_date'] = $tags['TDAT'][0]['data'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_key_exists('USLT', $tags)) {
|
||||||
|
$parsedTags['unsynchronised_lyric'] = $tags['USLT'][0]['data'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $rawTags
|
* @param array $rawTags
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
protected function getId3Tags($rawTags)
|
protected function getId3Tags($rawTags)
|
||||||
{
|
{
|
||||||
if (array_key_exists('tags', $rawTags) && array_key_exists('id3v2', $rawTags['tags'])) {
|
$tags = [];
|
||||||
$tags = $rawTags['tags']['id3v2'];
|
|
||||||
} elseif (array_key_exists('id3v2', $rawTags['tags'])) {
|
if (array_key_exists('id3v2', $rawTags)) {
|
||||||
$tags = $rawTags['tags']['id3v2'];
|
$tags = $this->parseId3v2Tags($rawTags['id3v2']);
|
||||||
} elseif (array_key_exists('tags', $rawTags) && array_key_exists('id3v1', $rawTags['tags'])) {
|
} elseif (array_key_exists('tags', $rawTags)) {
|
||||||
$tags = $rawTags['tags']['id3v1'];
|
if (array_key_exists('id3v2', $rawTags['tags'])) {
|
||||||
|
$tags = $rawTags['tags']['id3v2'];
|
||||||
|
} elseif (array_key_exists('id3v1', $rawTags['tags'])) {
|
||||||
|
$tags = $rawTags['tags']['id3v1'];
|
||||||
|
} else {
|
||||||
|
$tags = [];
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
$tags = [];
|
$tags = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$comment = null;
|
$comment = null;
|
||||||
|
|
||||||
if (isset($tags['comment'])) {
|
if (isset($tags['comment'])) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue