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

Fixed title parsing and removed old id3 code

Browse source
This commit is contained in:
Josef Citrine 2017-05-15 19:37:36 +01:00
parent d43dd9ba40
commit cbcd5b1c91
1 changed files with 15 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
app/Console/Commands/ImportPonify.php
View file

@ -162,6 +162,15 @@ class ImportPonify extends Command
//$imageFilePath = "$tmpPath/" . $imageFilename; //$imageFilePath = "$tmpPath/" . $imageFilename;
//File::put($imageFilePath, print_r($allTags, true)); //File::put($imageFilePath, print_r($allTags, true));
// Parse out the hyphen in the file name
$hyphen = ' - ';
if (is_null($parsedTags['title'])) {
$fileName = pathinfo($file->getFilename(), PATHINFO_FILENAME);
$parsedTags['title'] = substr($fileName, strpos($fileName, $hyphen) + strlen($hyphen));
}
$this->info('Title: ' . $parsedTags['title']);
//========================================================================================================== //==========================================================================================================
// Determine the release date. // Determine the release date.
//========================================================================================================== //==========================================================================================================
@ -467,6 +476,11 @@ class ImportPonify extends Command
$track->lyrics = $parsedTags['lyrics']; $track->lyrics = $parsedTags['lyrics'];
$track->is_vocal = $isVocal; $track->is_vocal = $isVocal;
$track->license_id = 2; $track->license_id = 2;
if (!is_null($parsedTags['title'])) {
$track->title = $parsedTags['title'];
}
$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.
@ -542,46 +556,6 @@ 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
@ -590,9 +564,7 @@ class ImportPonify extends Command
{ {
$tags = []; $tags = [];
if (array_key_exists('id3v2', $rawTags)) { if (array_key_exists('tags', $rawTags)) {
$tags = $this->parseId3v2Tags($rawTags['id3v2']);
} elseif (array_key_exists('tags', $rawTags)) {
if (array_key_exists('id3v2', $rawTags['tags'])) { if (array_key_exists('id3v2', $rawTags['tags'])) {
$tags = $rawTags['tags']['id3v2']; $tags = $rawTags['tags']['id3v2'];
} elseif (array_key_exists('id3v1', $rawTags['tags'])) { } elseif (array_key_exists('id3v1', $rawTags['tags'])) {