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

CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO") 

-fixed
This commit is contained in:
denise 2012-04-11 19:22:47 -04:00
parent 0ec58f0bc3
commit d06b3573e9
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
airtime_mvc/application/models/Schedule.php
View File

@ -412,6 +412,7 @@ class Application_Model_Schedule {
$baseQuery = "SELECT st.file_id AS file_id," $baseQuery = "SELECT st.file_id AS file_id,"
." st.id as id," ." st.id as id,"
." st.instance_id as instance_id,"
." st.starts AS start," ." st.starts AS start,"
." st.ends AS end," ." st.ends AS end,"
." st.cue_in AS cue_in," ." st.cue_in AS cue_in,"
@ -527,7 +528,12 @@ class Application_Model_Schedule {
} }
foreach ($items as $item){ foreach ($items as $item){
$showInstance = CcShowInstancesQuery::create()->findPK($item["instance_id"]);
$showId = $showInstance->getDbShowId();
$show = CcShowQuery::create()->findPK($showId);
$showName = $show->getDbName();
$showEndDateTime = new DateTime($item["show_end"], $utcTimeZone); $showEndDateTime = new DateTime($item["show_end"], $utcTimeZone);
$trackStartDateTime = new DateTime($item["start"], $utcTimeZone); $trackStartDateTime = new DateTime($item["start"], $utcTimeZone);
$trackEndDateTime = new DateTime($item["end"], $utcTimeZone); $trackEndDateTime = new DateTime($item["end"], $utcTimeZone);
@ -559,7 +565,8 @@ class Application_Model_Schedule {
'cue_in' => Application_Model_DateHelper::CalculateLengthInSeconds($item["cue_in"]), 'cue_in' => Application_Model_DateHelper::CalculateLengthInSeconds($item["cue_in"]),
'cue_out' => Application_Model_DateHelper::CalculateLengthInSeconds($item["cue_out"]), 'cue_out' => Application_Model_DateHelper::CalculateLengthInSeconds($item["cue_out"]),
'start' => $start, 'start' => $start,
'end' => Application_Model_Schedule::AirtimeTimeToPypoTime($item["end"]) 'end' => Application_Model_Schedule::AirtimeTimeToPypoTime($item["end"]),
'show_name' => $showName
); );
} }

3
python_apps/pypo/pypofetch.py
View File

@ -421,8 +421,7 @@ class PypoFetch(Thread):
try: try:
mediaKeys = sorted(media.iterkeys()) mediaKeys = sorted(media.iterkeys())
for mkey in mediaKeys: for mkey in mediaKeys:
media_item = media[mkey] media_item = media[mkey]
media_item['show_name'] = "TODO"
except Exception, e: except Exception, e:
self.logger.error("%s", e) self.logger.error("%s", e)