PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2025-04-01 00:35:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge rPF9b9f25dc512d: T357: Gracefully handle missing tags in M4A and OGG files.

Browse source
This commit is contained in:
Kelvin Zhang 2015-09-12 16:01:53 +01:00
parent 5e4875b9ad
commit 7c2863b942
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,7 +179,7 @@ class ImportMLPMA extends Command
if ($taggedYear !== null && $modifiedDate->year === $taggedYear) { if ($taggedYear !== null && $modifiedDate->year === $taggedYear) {
$releasedAt = $modifiedDate; $releasedAt = $modifiedDate;
} elseif ($taggedYear !== null && Str::length((string) $taggedYear) !== 4) { } elseif ($taggedYear !== null && Str::length((string)$taggedYear) !== 4) {
$this->error('This track\'s tagged year makes no sense! Using the track\'s last modified date...'); $this->error('This track\'s tagged year makes no sense! Using the track\'s last modified date...');
$releasedAt = $modifiedDate; $releasedAt = $modifiedDate;
} elseif ($taggedYear !== null && $modifiedDate->year !== $taggedYear) { } elseif ($taggedYear !== null && $modifiedDate->year !== $taggedYear) {
@ -431,7 +431,11 @@ class ImportMLPMA extends Command
*/ */
protected function getAtomTags($rawTags) protected function getAtomTags($rawTags)
{ {
$tags = $rawTags['tags']['quicktime']; if (array_key_exists('tags', $rawTags) && array_key_exists('quicktime', $rawTags['tags'])) {
$tags = $rawTags['tags']['quicktime'];
} else {
$tags = [];
}
$trackNumber = null; $trackNumber = null;
if (isset($tags['track_number'])) { if (isset($tags['track_number'])) {
@ -462,7 +466,11 @@ class ImportMLPMA extends Command
*/ */
protected function getVorbisTags($rawTags) protected function getVorbisTags($rawTags)
{ {
$tags = $rawTags['tags']['vorbiscomment']; if (array_key_exists('tags', $rawTags) && array_key_exists('vorbiscomment', $rawTags['tags'])) {
$tags = $rawTags['tags']['vorbiscomment'];
} else {
$tags = [];
}
$trackNumber = null; $trackNumber = null;
if (isset($tags['track_number'])) { if (isset($tags['track_number'])) {