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

Merge rPFf4f97acd9fc0: T357: Validate the length of a year correctly.

Browse source
This commit is contained in:
Kelvin Zhang 2015-09-12 15:59:19 +01:00
parent 9468ced8c4
commit 616b6e9ccf
1 changed files with 22 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,12 +179,10 @@ class ImportMLPMA extends Command
if ($taggedYear !== null && $modifiedDate->year === $taggedYear) { if ($taggedYear !== null && $modifiedDate->year === $taggedYear) {
$releasedAt = $modifiedDate; $releasedAt = $modifiedDate;
} else { } elseif ($taggedYear !== null && (string)Str::length($taggedYear) !== 4) {
if ($taggedYear !== null && (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;
} else { } elseif ($taggedYear !== null && $modifiedDate->year !== $taggedYear) {
if ($taggedYear !== null && $modifiedDate->year !== $taggedYear) {
$this->error('Release years don\'t match! Using the tagged year...'); $this->error('Release years don\'t match! Using the tagged year...');
$releasedAt = Carbon::create($taggedYear); $releasedAt = Carbon::create($taggedYear);
@ -193,8 +191,6 @@ class ImportMLPMA extends Command
$this->error('This track isn\'t tagged with its release year! Using the track\'s last modified date...'); $this->error('This track isn\'t tagged with its release year! Using the track\'s last modified date...');
$releasedAt = $modifiedDate; $releasedAt = $modifiedDate;
} }
}
}
// This is later used by the classification/publishing script to determine the publication date. // This is later used by the classification/publishing script to determine the publication date.
$parsedTags['released_at'] = $releasedAt->toDateTimeString(); $parsedTags['released_at'] = $releasedAt->toDateTimeString();
@ -281,19 +277,15 @@ class ImportMLPMA extends Command
if ($image['image_mime'] === 'image/png') { if ($image['image_mime'] === 'image/png') {
$extension = 'png'; $extension = 'png';
} else { } elseif ($image['image_mime'] === 'image/jpeg') {
if ($image['image_mime'] === 'image/jpeg') {
$extension = 'jpg'; $extension = 'jpg';
} else { } elseif ($image['image_mime'] === 'image/gif') {
if ($image['image_mime'] === 'image/gif') {
$extension = 'gif'; $extension = 'gif';
} else { } else {
$this->error('Unknown cover art format!'); $this->error('Unknown cover art format!');
} }
}
}
// write temporary image file // write temporary image file
$imageFilename = $file->getFilename() . ".cover.$extension"; $imageFilename = $file->getFilename() . ".cover.$extension";
@ -393,22 +385,14 @@ class ImportMLPMA extends Command
*/ */
protected function getId3Tags($rawTags) protected function getId3Tags($rawTags)
{ {
if (array_key_exists('tags', $rawTags) && if (array_key_exists('tags', $rawTags) && array_key_exists('id3v2', $rawTags['tags'])) {
array_key_exists('id3v2', $rawTags['tags'])
) {
$tags = $rawTags['tags']['id3v2']; $tags = $rawTags['tags']['id3v2'];
} elseif (array_key_exists('tags', $rawTags) && array_key_exists('id3v1', $rawTags['tags'])) {
} else {
if (
array_key_exists('tags', $rawTags) &&
array_key_exists('id3v1', $rawTags['tags'])
) {
$tags = $rawTags['tags']['id3v1']; $tags = $rawTags['tags']['id3v1'];
} else { } else {
$tags = []; $tags = [];
} }
}
$comment = null; $comment = null;