Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:airtime

Browse source
This commit is contained in:
Naomi 2013-05-10 17:36:18 -04:00
commit da46757e28
10 changed files with 169 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/ApiController.php
View file

@ -800,7 +800,7 @@ class ApiController extends Zend_Controller_Action
$watchDir = Application_Model_MusicDir::getDirByPath($rd);
// get all the files that is under $dirPath
$files = Application_Model_StoredFile::listAllFiles(
$dir->getId(),$all=false, true);
$dir->getId(),$all=false);
foreach ($files as $f) {
// if the file is from this mount
if (substr($f->getFilePath(), 0, strlen($rd)) === $rd) {

9
airtime_mvc/application/models/MusicDir.php
View file

@ -195,7 +195,7 @@ SQL;
$exist_dir = self::getDirByPath($p_path);
if ($exist_dir == NULL) {
if (is_null($exist_dir)) {
$temp_dir = new CcMusicDirs();
$dir = new Application_Model_MusicDir($temp_dir);
} else {
@ -228,7 +228,12 @@ SQL;
return array("code"=>1, "error"=>"$msg");
} catch (Exception $e) {
return array("code"=>1,
"error"=>sprintf(_("%s is already set as the current storage dir or in the watched folders list"), $p_path));
"error" => sprintf(
_("%s is already set as the current storage dir or in the".
" watched folders list"),
$p_path
)
);
}
}

7
airtime_mvc/application/models/Scheduler.php
View file

@ -438,15 +438,12 @@ class Application_Model_Scheduler
->find($this->con);
foreach ($schedule as $item) {
$itemEndDT = $this->findEndTime($itemStartDT, $item->getDbClipLength());
$itemEndDT = $item->getDbEnds(null);
$item
->setDbStarts($itemStartDT)
$item->setDbStarts($itemStartDT)
->setDbEnds($itemEndDT);
$itemStartDT = $this->findTimeDifference($itemEndDT, $this->crossfadeDuration);
$itemEndDT = $this->findEndTime($itemStartDT, $item->getDbClipLength());
}
$schedule->save($this->con);

6
airtime_mvc/application/models/StoredFile.php
View file

@ -1071,7 +1071,7 @@ SQL;
* @param $dir_id - if this is not provided, it returns all files with full
* path constructed.
*/
public static function listAllFiles($dir_id=null, $all)
public static function listAllFiles($dir_id=null, $all=true)
{
$con = Propel::getConnection();
@ -1081,10 +1081,6 @@ FROM CC_FILES AS f
WHERE f.directory = :dir_id
SQL;
# TODO : the option $all is deprecated now and is always true.
# refactor code where it's still being passed
$all = true;
if (!$all) {
$sql .= " AND f.file_exists = 'TRUE'";
}

49
airtime_mvc/application/services/SchedulerService.php
View file

@ -145,9 +145,8 @@ class Application_Service_SchedulerService
return $dt;
}
public static function fillLinkedShows($ccShow)
public static function fillNewLinkedInstances($ccShow)
{
if ($ccShow->isLinked()) {
/* First check if any linked instances have content
* If all instances are empty then we don't need to fill
* any other instances with content
@ -178,7 +177,9 @@ class Application_Service_SchedulerService
* the first instance, we cant to fill/replace with the show stamp
* (The show stamp is taken from the first show instance's content)
*/
if ($ccSchedules->isEmpty() || self::replaceInstanceContentCheck($ccShowInstance, $showStamp)) {
if ($ccSchedules->isEmpty() ||
self::replaceInstanceContentCheck($ccShowInstance, $showStamp)) {
$nextStartDT = $ccShowInstance->getDbStarts(null);
foreach ($showStamp as $item) {
@ -211,6 +212,48 @@ class Application_Service_SchedulerService
} //foreach linked instance
} //if at least one linked instance has content
}
public static function fillPreservedLinkedShowContent($ccShow, $showStamp)
{
$item = $showStamp->getFirst();
$timeFilled = $item->getCcShowInstances()->getDbTimeFilled();
foreach ($ccShow->getCcShowInstancess() as $ccShowInstance) {
$ccSchedules = CcScheduleQuery::create()
->filterByDbInstanceId($ccShowInstance->getDbId())
->find();
if ($ccSchedules->isEmpty()) {
$nextStartDT = $ccShowInstance->getDbStarts(null);
foreach ($showStamp as $item) {
$endTimeDT = self::findEndTime($nextStartDT, $item->getDbClipLength());
$ccSchedule = new CcSchedule();
$ccSchedule
->setDbStarts($nextStartDT)
->setDbEnds($endTimeDT)
->setDbFileId($item->getDbFileId())
->setDbStreamId($item->getDbStreamId())
->setDbClipLength($item->getDbClipLength())
->setDbFadeIn($item->getDbFadeIn())
->setDbFadeOut($item->getDbFadeOut())
->setDbCuein($item->getDbCueIn())
->setDbCueOut($item->getDbCueOut())
->setDbInstanceId($ccShowInstance->getDbId())
->setDbPosition($item->getDbPosition())
->save();
$nextStartDT = $endTimeDT;
} //foreach show item
$ccShowInstance
->setDbTimeFilled($timeFilled)
->setDbLastScheduled(gmdate("Y-m-d H:i:s"))
->save();
}
}
}
private static function replaceInstanceContentCheck($ccShowInstance, $showStamp)

32
airtime_mvc/application/services/ShowService.php
View file

@ -13,6 +13,7 @@ class Application_Service_ShowService
private $isRebroadcast;
private $repeatType;
private $isUpdate;
private $linkedShowContent;
public function __construct($showId=null, $showData=null, $isUpdate=false)
{
@ -217,10 +218,16 @@ class Application_Service_ShowService
}
}
if (isset($this->ccShow) && ($this->isUpdate || $fillInstances)) {
Application_Service_SchedulerService::fillLinkedShows(
$this->ccShow);
if (isset($this->ccShow) && ($this->isUpdate || $fillInstances) &&
$this->ccShow->isLinked()) {
Application_Service_SchedulerService::fillNewLinkedInstances($this->ccShow);
}
if (isset($this->linkedShowContent)) {
Application_Service_SchedulerService::fillPreservedLinkedShowContent(
$this->ccShow, $this->linkedShowContent);
}
return $this->ccShow;
}
@ -379,6 +386,9 @@ SQL;
if (count($daysRemoved) > 0) {
//delete repeating show instances for the repeating
//days that were removed
if ($this->ccShow->isLinked()) {
$this->preserveLinkedShowContent();
}
$this->deleteRemovedShowDayInstances($daysRemoved,
$ccShowDays, $showId);
}
@ -423,6 +433,22 @@ SQL;
return $daysAdded;
}
private function preserveLinkedShowContent()
{
/* Get show content from any linekd instance. It doesn't
* matter which instance since content is the same in all.
*/
$ccShowInstance = $this->ccShow->getCcShowInstancess()->getFirst();
$ccSchedules = CcScheduleQuery::create()
->filterByDbInstanceId($ccShowInstance->getDbId())
->find();
if (!$ccSchedules->isEmpty()) {
$this->linkedShowContent = $ccSchedules;
}
}
public function getRepeatingEndDate()
{
$sql = <<<SQL

3
airtime_mvc/public/js/airtime/library/library.js
View file

@ -773,6 +773,9 @@ var AIRTIME = (function(AIRTIME) {
});
//sort by title, by default
oTable.fnSort( [ [5, 'asc'] ] );
setColumnFilter(oTable);
oTable.fnSetFilteringDelay(350);

3
airtime_mvc/public/js/airtime/preferences/preferences.js
View file

@ -113,6 +113,9 @@ $(document).ready(function() {
$.cookie("default_airtime_locale", $('#locale').val(), {path: '/'});
setTimeout(removeSuccessMsg, 5000);
showErrorSections();
setMailServerInputReadonly();
setConfigureMailServerListener();
setEnableSystemEmailsListener();
});
});

7
airtime_mvc/public/js/airtime/schedule/add-show.js
View file

@ -187,6 +187,13 @@ function setAddShowEvents() {
}
});
form.find("#add_show_linked").click(function(){
if (!$(this).attr("checked")) {
$(this).parent().after("<ul class='errors'><li>Warning: Shows cannot be re-linked</li></ul>");
}
});
form.find("#add_show_record").click(function(){
$(this).blur();
form.find("#add_show_rebroadcast").toggle();

12
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View file

@ -283,6 +283,12 @@ function eventRender(event, element, view) {
.find(".fc-event-time")
.before('<span id="'+event.id+'" class="small-icon show-partial-filled"></span>');
}
} else {
if (event.linked) {
$(element)
.find(".fc-event-time")
.before('<span id="'+event.id+'" class="small-icon linked"></span>');
}
}
} else if (view.name === 'month') {
if (event.show_empty === 1) {
@ -305,6 +311,12 @@ function eventRender(event, element, view) {
.find(".fc-event-title")
.after('<span id="'+event.id+'" title="'+$.i18n._("Show is partially filled")+'" class="small-icon show-partial-filled"></span>');
}
} else {
if (event.linked) {
$(element)
.find(".fc-event-title")
.after('<span id="'+event.id+'" class="small-icon linked"></span>');
}
}
}
}