mirror of
https://github.com/Poniverse/Pony.fm.git
synced 2025-02-18 02:54:21 +01:00
Merge rPF9cb13ee535e4: T357: The importer no longer assumes that a title tag is present.
This commit is contained in:
parent
05f1745b1f
commit
bddfd6cae5
1 changed files with 14 additions and 6 deletions
|
@ -196,10 +196,18 @@ class ImportMLPMA extends Command
|
||||||
|
|
||||||
|
|
||||||
//==========================================================================================================
|
//==========================================================================================================
|
||||||
// Determine the genre
|
// Fill in the title tag if it's missing.
|
||||||
|
//==========================================================================================================
|
||||||
|
if (!$parsedTags['title']) {
|
||||||
|
$parsedTags['title'] = $file->getBasename($file->getExtension());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//==========================================================================================================
|
||||||
|
// Determine the genre.
|
||||||
//==========================================================================================================
|
//==========================================================================================================
|
||||||
$genreName = $parsedTags['genre'];
|
$genreName = $parsedTags['genre'];
|
||||||
$this->info('Genre: '.$genreName);
|
$this->info('Genre: ' . $genreName);
|
||||||
|
|
||||||
if ($genreName) {
|
if ($genreName) {
|
||||||
$genre = Genre::where('name', '=', $genreName)->first();
|
$genre = Genre::where('name', '=', $genreName)->first();
|
||||||
|
@ -393,8 +401,8 @@ class ImportMLPMA extends Command
|
||||||
|
|
||||||
return [
|
return [
|
||||||
[
|
[
|
||||||
'title' => $tags['title'][0],
|
'title' => isset($tags['title']) ? $tags['title'][0] : null,
|
||||||
'artist' => $tags['artist'][0],
|
'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' => isset($tags['track_number']) ? $tags['track_number'][0] : null,
|
||||||
|
@ -423,8 +431,8 @@ class ImportMLPMA extends Command
|
||||||
|
|
||||||
return [
|
return [
|
||||||
[
|
[
|
||||||
'title' => $tags['title'][0],
|
'title' => isset($tags['title']) ? $tags['title'][0] : null,
|
||||||
'artist' => $tags['artist'][0],
|
'artist' => isset($tags['artist']) ? $tags['artist'][0] : null,
|
||||||
'band' => isset($tags['band']) ? $tags['band'][0] : null,
|
'band' => isset($tags['band']) ? $tags['band'][0] : null,
|
||||||
'album_artist' => isset($tags['album_artist']) ? $tags['album_artist'][0] : null,
|
'album_artist' => isset($tags['album_artist']) ? $tags['album_artist'][0] : null,
|
||||||
'genre' => isset($tags['genre']) ? $tags['genre'][0] : null,
|
'genre' => isset($tags['genre']) ? $tags['genre'][0] : null,
|
||||||
|
|
Loading…
Reference in a new issue