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

T357: Added an ID3v1 fallback and added more information to the classification script.

Browse source
This commit is contained in:
Peter Deltchev 2015-09-07 23:01:01 -07:00
parent cd113e4d4b
commit c0e619aacd
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/commands/ClassifyMLPMA.php
View file

@ -88,18 +88,18 @@ class ClassifyMLPMA extends Command {
if (Str::contains(Str::lower($track->filename), 'ingram')) {
$this->info('This is an official song remix!');
list($trackType, $linkedSongIds) = $this->classifyTrack($track->filename, $officialSongs, true);
list($trackType, $linkedSongIds) = $this->classifyTrack($track->filename, $officialSongs, true, $parsedTags);
// If it has "remix" in the name, it's definitely a remix.
} else if (Str::contains(Str::lower($sanitizedTrackTitle), 'remix')) {
$this->info('This is some kind of remix!');
list($trackType, $linkedSongIds) = $this->classifyTrack($track->filename, $officialSongs);
list($trackType, $linkedSongIds) = $this->classifyTrack($track->filename, $officialSongs, false, $parsedTags);
// No idea what this is. Have the pony at the terminal figure it out!
} else {
list($trackType, $linkedSongIds) = $this->classifyTrack($track->filename, $officialSongs);
list($trackType, $linkedSongIds) = $this->classifyTrack($track->filename, $officialSongs, false, $parsedTags);
}
@ -154,7 +154,7 @@ class ClassifyMLPMA extends Command {
* @param bool|false $isRemixOfOfficialTrack
* @return array
*/
protected function classifyTrack($filename, $officialSongs, $isRemixOfOfficialTrack = false) {
protected function classifyTrack($filename, $officialSongs, $isRemixOfOfficialTrack = false, $tags) {
$trackTypeId = null;
$linkedSongIds = [];
@ -181,7 +181,11 @@ class ClassifyMLPMA extends Command {
}
$this->question('If this is a medley, multiple song ID\'s can be separated by commas. ');
$this->question(' ');
$this->question(' ' . $filename . ' ');
$this->question(' ' . $filename . ' ');
$this->question(' ');
$this->question(' Title: '.$tags['title'].' ');
$this->question(' Album: '.$tags['album'].' ');
$this->question(' Artist: '.$tags['artist'].' ');
$this->question(' ');
$this->question(' r = official song remix (accept all "guessed" matches) ');
$this->question(' # = official song remix (enter the ID(s) of the show song(s)) ');

11
app/commands/ImportMLPMA.php
View file

@ -391,7 +391,16 @@ class ImportMLPMA extends Command {
* @return array
*/
protected function getId3Tags($rawTags) {
$tags = $rawTags['tags']['id3v2'];
if (array_key_exists('id3v2', $rawTags['tags'])) {
$tags = $rawTags['tags']['id3v2'];
} else if (array_key_exists('id3v1', $rawTags['tags'])) {
$tags = $rawTags['tags']['id3v1'];
} else {
$tags = [];
}
$comment = null;
if (isset($tags['comment'])) {