Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed autoloading playlist to avoid errors when trying to schedule empty playlist

This commit is contained in:
Robbt 2019-02-18 18:17:00 -05:00
parent e13fc6b3d9
commit 7d1acab7b6
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
airtime_mvc/application/common/AutoPlaylistManager.php
View File

@ -13,7 +13,6 @@ class AutoPlaylistManager {
* @return bool true if $_AUTOPLAYLIST_POLL_INTERVAL_SECONDS has passed since the last check * @return bool true if $_AUTOPLAYLIST_POLL_INTERVAL_SECONDS has passed since the last check
*/ */
public static function hasAutoPlaylistPollIntervalPassed() { public static function hasAutoPlaylistPollIntervalPassed() {
Logging::info("Checking autoplaylist poll");
$lastPolled = Application_Model_Preference::getAutoPlaylistPollLock(); $lastPolled = Application_Model_Preference::getAutoPlaylistPollLock();
return empty($lastPolled) || (microtime(true) > $lastPolled + self::$_AUTOPLAYLIST_POLL_INTERVAL_SECONDS); return empty($lastPolled) || (microtime(true) > $lastPolled + self::$_AUTOPLAYLIST_POLL_INTERVAL_SECONDS);
} }
@ -23,7 +22,6 @@ class AutoPlaylistManager {
* *
*/ */
public static function buildAutoPlaylist() { public static function buildAutoPlaylist() {
//Logging::info("Checking to run Auto Playlist");
$autoPlaylists = static::_upcomingAutoPlaylistShows(); $autoPlaylists = static::_upcomingAutoPlaylistShows();
foreach ($autoPlaylists as $autoplaylist) { foreach ($autoPlaylists as $autoplaylist) {
// creates a ShowInstance object to build the playlist in from the ShowInstancesQuery Object // creates a ShowInstance object to build the playlist in from the ShowInstancesQuery Object
@ -40,11 +38,14 @@ class AutoPlaylistManager {
// otherwise we continue to go through adding playlists, including the intro and outro if enabled // otherwise we continue to go through adding playlists, including the intro and outro if enabled
$full = false; $full = false;
$repeatuntilfull = $playlistrepeat->getAutoPlaylistRepeat(); $repeatuntilfull = $playlistrepeat->getAutoPlaylistRepeat();
$tempPercentScheduled = 0;
while(!$full) { while(!$full) {
$si = new Application_Model_ShowInstance($autoplaylist->getDbId()); $si = new Application_Model_ShowInstance($autoplaylist->getDbId());
$si->addPlaylistToShow($playlistid, false); // we do not want to try to schedule an empty playlist
if ($playlistid != null) {
$si->addPlaylistToShow($playlistid, false);
}
$ps = $si->getPercentScheduled(); $ps = $si->getPercentScheduled();
//Logging::info($ps);
if ($introplaylistid != null) { if ($introplaylistid != null) {
//Logging::info('adding intro'); //Logging::info('adding intro');
$si->addPlaylistToShowStart($introplaylistid, false); $si->addPlaylistToShowStart($introplaylistid, false);
@ -60,10 +61,19 @@ class AutoPlaylistManager {
elseif (!$repeatuntilfull) { elseif (!$repeatuntilfull) {
break; break;
} }
// we want to avoid an infinite loop if all of the playlists are null
if ($playlistid == null && $introplaylistid == null && $outroplaylistid == null) {
break;
}
// another possible issue would be if the show isn't increasing in length each loop
// ie if all of the playlists being added are zero lengths this could cause an infinite loop
if ($tempPercentScheduled == $ps) {
break;
}
//now reset it to zero
$tempPercentScheduled = $ps;
} }
$si->setAutoPlaylistBuilt(true); $si->setAutoPlaylistBuilt(true);
} }
Application_Model_Preference::setAutoPlaylistPollLock(microtime(true)); Application_Model_Preference::setAutoPlaylistPollLock(microtime(true));
} }