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

SAAS-1156: Podcast episode playback and download from Radio Page 

Fix metadata html escaping
Tried some tinkering with codecs
This commit is contained in:
drigato 2015-10-29 14:45:19 -04:00
parent 706db9bc25
commit f3f5b4f539
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/controllers/IndexController.php
View File

@ -44,6 +44,10 @@ class IndexController extends Zend_Controller_Action
$podcastEpisodesService = new Application_Service_PodcastEpisodeService();
$stationPodcastId = Application_Model_Preference::getStationPodcastId();
$episodes = $podcastEpisodesService->getPodcastEpisodes($stationPodcastId);
foreach ($episodes as $e => $v) {
$episodes[$e]["track_metadata"]["track_title"] = htmlspecialchars($v["track_metadata"]["track_title"], ENT_QUOTES);
$episodes[$e]["track_metadata"]["artist_name"] = htmlspecialchars($v["track_metadata"]["artist_name"], ENT_QUOTES);
}
$this->view->episodes = json_encode($episodes);
$this->view->displayRssTab = (!Application_Model_Preference::getStationPodcastPrivacy());

5
airtime_mvc/application/views/scripts/embed/player.phtml
View File

@ -186,8 +186,8 @@
};
MusesPlayer.prototype.setCodec = function(codec) {
console.log(codec);
//this.flashDetect ? MRP.setCodec(codec) : musesHTMLSetCodec(codec);
//TODO: get rid of this? Doesn't seem to make a difference
this.flashDetect ? console.log("blah") : musesHTMLSetCodec(codec);
musesPlayer.settings.codec = codec;
}
@ -367,7 +367,6 @@
}
function attachFileMetadataToPlayer(artist, title) {
//TODO escape strings
$("p.now_playing").html(artist+"<span>"+title+"</span>");
}

16
airtime_mvc/application/views/scripts/index/index.phtml
View File

@ -57,10 +57,17 @@ document.getElementById(id).width= (newwidth) + "px";
<div id="tab-4" class="station_rss tab_content">
<script type="text/javascript">
$.each(<?php echo $this->episodes ?>, function(index, value){
console.log(value.track_metadata.track_title);
// map mime to format muses recognizes
// TODO: this doesn't make a difference
if (value.track_metadata.mime == "audio/mp3") {
value.track_metadata.mime = "mp3";
} else if (value.track_metadata.mime == "audio/vorbis") {
value.track_metadata.mime = "ogg";
}
$("#tab-4").append("<div>"+value.track_metadata.artist_name+" - "+value.track_metadata.track_title+
" <a id='rss-download-link' href='"+value.download_url+"'>Download</a>" +
" <a id='rss-play-link' data-metaartist='"+value.track_metadata.artist_name+"' data-metatitle='"+value.track_metadata.track_title+"' data-streamurl='"+value.download_url+"' data-streamcodec='mp3' href='#'>Play</a></div>");
" <a id='rss-play-link' data-metaartist='"+value.track_metadata.artist_name+"' data-metatitle='"+value.track_metadata.track_title+"' data-streamurl='"+value.download_url+"' data-streamcodec='"+value.track_metadata.mime+"' href='#'>Play</a></div>");
});
$("a#rss-play-link").click(function() {
@ -68,14 +75,11 @@ document.getElementById(id).width= (newwidth) + "px";
var file_codec = $(this).attr("data-streamcodec");
var artist_name = $(this).attr("data-metaartist");
var track_title = $(this).attr("data-metatitle");
console.log(track_title);
//var new_src='<?php echo $this->stationUrl ?>'+"embed/player?stream=file&file_url="+file_url+"&file_codec="+file_codec+"&style=premium";
//console.log(track_title);
document.getElementById("player_iframe").contentWindow.musesPlayer.playPodcastTrack(file_url, file_codec);
document.getElementById("player_iframe").contentWindow.detachStreamMetadataFromPlayer();
document.getElementById("player_iframe").contentWindow.attachFileMetadataToPlayer(artist_name, track_title);
//console.log(document.getElementById("player_iframe").contentWindow.musesPlayer);
});
</script>
</div>