tilderadio
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
4
0
Fork 0
Code Issues Releases Wiki Activity

#589 -- Call "set" functions when using "loadFromFile"

This commit is contained in:
Buster "Silver Eagle" Neece 2018-05-17 17:53:22 -05:00
parent 9eab28e085
commit e038b12f65
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/Entity/StationMedia.php
View File

@ -601,12 +601,12 @@ class StationMedia
foreach ($file_info['tags'] as $tag_type => $tag_data) {
foreach ($tags_to_set as $tag) {
if (!empty($tag_data[$tag][0])) {
$this->{$tag} = mb_convert_encoding($tag_data[$tag][0], "UTF-8");
$this->{'set'.ucfirst($tag)}(mb_convert_encoding($tag_data[$tag][0], "UTF-8"));
}
}
if (!empty($tag_data['unsynchronized_lyric'][0])) {
$this->lyrics = $tag_data['unsynchronized_lyric'][0];
$this->setLyrics($tag_data['unsynchronized_lyric'][0]);
}
}
}
@ -615,7 +615,6 @@ class StationMedia
$picture = $file_info['comments']['picture'][0];
$this->setArt(imagecreatefromstring($picture['data']));
}
}
// Attempt to derive title and artist from filename.
@ -626,11 +625,11 @@ class StationMedia
// If not normally delimited, return "text" only.
if (count($string_parts) == 1) {
$this->title = trim($filename);
$this->artist = '';
$this->setTitle(trim($filename));
$this->setArtist('');
} else {
$this->title = trim(array_pop($string_parts));
$this->artist = trim(implode('-', $string_parts));
$this->setTitle(trim(array_pop($string_parts)));
$this->setArtist(trim(implode('-', $string_parts)));
}
}