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

Improved tag parsing

Browse source
This commit is contained in:
Josef Citrine 2017-01-25 21:31:55 +00:00
parent f3c03bce18
commit 7d9eaf9405
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/Commands/ParseTrackTagsCommand.php Normal file → Executable file
View file

@ -80,6 +80,9 @@ class ParseTrackTagsCommand extends CommandBase
$this->track->track_number = null; $this->track->track_number = null;
} else { } else {
$this->track->track_number = filter_var($this->input['track_number'] ?? $parsedTags['track_number'], FILTER_SANITIZE_NUMBER_INT); $this->track->track_number = filter_var($this->input['track_number'] ?? $parsedTags['track_number'], FILTER_SANITIZE_NUMBER_INT);
if ($this->track->track_number == null) {
$this->track->track_number = 1;
}
} }
$this->track->released_at = isset($this->input['released_at']) $this->track->released_at = isset($this->input['released_at'])
@ -339,13 +342,19 @@ class ParseTrackTagsCommand extends CommandBase
$tags['comment'][0] = $comment; $tags['comment'][0] = $comment;
} }
$trackNumber = 1;
if (isset($tags['track_number'])) {
$trackNumberComponents = explode('/', $tags['track_number'][0]);
$trackNumber = $trackNumberComponents[0];
}
return [ return [
[ [
'title' => isset($tags['title']) ? $tags['title'][0] : null, 'title' => isset($tags['title']) ? $tags['title'][0] : null,
'artist' => isset($tags['artist']) ? $tags['artist'][0] : null, 'artist' => isset($tags['artist']) ? $tags['artist'][0] : null,
'band' => isset($tags['band']) ? $tags['band'][0] : null, 'band' => isset($tags['band']) ? $tags['band'][0] : null,
'genre' => isset($tags['genre']) ? $tags['genre'][0] : null, 'genre' => isset($tags['genre']) ? $tags['genre'][0] : null,
'track_number' => isset($tags['track_number']) ? $tags['track_number'][0] : null, 'track_number' => $trackNumber,
'album' => isset($tags['album']) ? $tags['album'][0] : null, 'album' => isset($tags['album']) ? $tags['album'][0] : null,
'year' => isset($tags['year']) ? (int) $tags['year'][0] : null, 'year' => isset($tags['year']) ? (int) $tags['year'][0] : null,
'release_date' => isset($tags['release_date']) ? $this->parseDateString($tags['release_date'][0]) : null, 'release_date' => isset($tags['release_date']) ? $this->parseDateString($tags['release_date'][0]) : null,
@ -368,7 +377,7 @@ class ParseTrackTagsCommand extends CommandBase
$tags = []; $tags = [];
} }
$trackNumber = null; $trackNumber = 1;
if (isset($tags['track_number'])) { if (isset($tags['track_number'])) {
$trackNumberComponents = explode('/', $tags['track_number'][0]); $trackNumberComponents = explode('/', $tags['track_number'][0]);
$trackNumber = $trackNumberComponents[0]; $trackNumber = $trackNumberComponents[0];
@ -412,7 +421,7 @@ class ParseTrackTagsCommand extends CommandBase
$tags = []; $tags = [];
} }
$trackNumber = null; $trackNumber = 1;
if (isset($tags['track_number'])) { if (isset($tags['track_number'])) {
$trackNumberComponents = explode('/', $tags['track_number'][0]); $trackNumberComponents = explode('/', $tags['track_number'][0]);
$trackNumber = $trackNumberComponents[0]; $trackNumber = $trackNumberComponents[0];
@ -460,12 +469,12 @@ class ParseTrackTagsCommand extends CommandBase
// YYYY-MM // YYYY-MM
case 7: case 7:
return Carbon::createFromFormat('Y-m', $dateString) return Carbon::createFromFormat('Y m', str_replace("-", " ", $dateString))
->day(1); ->day(1);
// YYYY-MM-DD // YYYY-MM-DD
case 10: case 10:
return Carbon::createFromFormat('Y-m-d', $dateString); return Carbon::createFromFormat('Y m d', str_replace("-", " ", $dateString));
break; break;
default: default: