Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Create own embeds for youtube videos not properly scraped by reddit/embedly #47

Merged
merged 2 commits into from

2 participants

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 64 additions and 9 deletions.
  1. +27 −8 js/tv.js
  2. +37 −1 js/tv.youtube.js
View
35 js/tv.js
@@ -268,6 +268,19 @@ function loadChannel(channel, video_id) {
{
globals.videos[this_chan].video.push(data.data.children[x].data);
}
+ //if reddit's scrape didn't build the embed, built it ourself
+ else if(data.data.children[x].data.domain == 'youtube.com'
+ || data.data.children[x].data.domain == 'youtu.be'
+ )
+ {
+ data.data.children[x].data.media_embed.content = youtube.createEmbed(
+ data.data.children[x].data.url
+ );
+ if(data.data.children[x].data.media_embed.content){
+ consoleLog(data.data.children[x].data);
+ globals.videos[this_chan].video.push(data.data.children[x].data);
+ }
+ }
}
//remove duplicates
@@ -425,10 +438,16 @@ function loadVideo(video) {
$video_embed.empty();
$video_embed.addClass('loading');
+
+ consoleLog('embed domain: '+globals.videos[this_chan].video[selected_video].domain);
+ consoleLog('embed content: '+globals.videos[this_chan].video[selected_video].media_embed.content);
+
var embed = $.unescapifyHTML(globals.videos[this_chan].video[selected_video].media_embed.content);
- embed = prepEmbed(embed, globals.videos[this_chan].video[selected_video].media.type);
+ embed = prepEmbed(embed, globals.videos[this_chan].video[selected_video].domain);
embed = prepEmbed(embed, 'size');
+ consoleLog('embed prepped: '+embed);
+
var redditlink = 'http://reddit.com'+$.unescapifyHTML(globals.videos[this_chan].video[selected_video].permalink);
$('#video-title').html('<a href="' + redditlink + '" target="_blank"'
+ ' title="' + globals.videos[this_chan].video[selected_video].title_quot + '">'
@@ -436,7 +455,7 @@ function loadVideo(video) {
$video_embed.html(embed);
$video_embed.removeClass('loading');
- addListeners(globals.videos[this_chan].video[selected_video].media.type);
+ addListeners(globals.videos[this_chan].video[selected_video].domain);
var score = globals.videos[this_chan].video[selected_video].score;
var num_comments = globals.videos[this_chan].video[selected_video].num_comments;
@@ -571,7 +590,7 @@ function getThumbnailUrl(chan, video_id) {
if (sfwCheck(video_id, chan)) {
return 'img/nsfw.png';
}
- else if (globals.videos[chan].video[video_id].media.oembed) {
+ else if (globals.videos[chan].video[video_id].media) {
return globals.videos[chan].video[video_id].media.oembed.thumbnail_url !== undefined ?
globals.videos[chan].video[video_id].media.oembed.thumbnail_url :
'img/noimage.png';
@@ -662,7 +681,7 @@ function prepEmbed(embed, type){
switch(type){
default:
return embed;
- case 'youtube.com':
+ case 'youtube.com': case 'youtu.be':
return youtube.prepEmbed(embed);
case 'vimeo.com':
return vimeo.prepEmbed(embed);
@@ -682,8 +701,8 @@ function addListeners(type){
}
function fillScreen() {
- var fill_screen_domains = ['youtube.com'];
- if(fill_screen_domains.indexOf(globals.videos[globals.cur_chan].video[globals.cur_video].media.type) !== -1){
+ var fill_screen_domains = ['youtube.com', 'youtu.be'];
+ if(fill_screen_domains.indexOf(globals.videos[globals.cur_chan].video[globals.cur_video].domain) !== -1){
$object = $('#video-embed embed');
$fill = $('#fill');
$filloverlay = $('#fill-overlay');
@@ -700,8 +719,8 @@ function fillScreen() {
}
function togglePlay(){
- switch(globals.videos[globals.cur_chan].video[globals.cur_video].media.type){
- case 'youtube.com':
+ switch(globals.videos[globals.cur_chan].video[globals.cur_video].domain){
+ case 'youtube.com': case 'youtu.be':
youtube.togglePlay();
break;
case 'vimeo.com':
View
38 js/tv.youtube.js
@@ -29,13 +29,49 @@ var youtube = {
loadVideo('next');
}
+ ,createEmbed: function(url){
+ var ID, parts;
+
+ if(url.match(/youtu\.be/)){
+ parts = url.split("/");
+ ID = parts[3].substr(0,11);
+ consoleLog('youtu.be ID: '+ID);
+ }
+
+ if(url.match('youtube.com')){
+ if(url.match(/\?v\=/)){
+ parts = url.split('?v=');
+ ID = parts[1].substr(0,11);
+ consoleLog('youtube.com ID: '+ID);
+ }
+ }
+
+ if(ID){
+
+ return "&lt;object width=\"600\" height=\"338\"&gt;&lt;param name=\"movie\" value=\"http://www.youtube.com/v/"
+ +ID+"?version=3&amp;feature=oembed\"&gt;&lt;/param&gt;&lt;param name=\"allowFullScreen\" value=\"true\"&gt;&lt;/param&gt;&lt;param name=\"allowscriptaccess\" value=\"always\"&gt;&lt;/param&gt;&lt;embed src=\"http://www.youtube.com/v/"+ID+"?version=3&amp;feature=oembed\" type=\"application/x-shockwave-flash\" width=\"600\" height=\"338\" allowscriptaccess=\"always\" allowfullscreen=\"true\"&gt;&lt;/embed&gt;&lt;/object&gt;";
+
+/*
+ return '<object width="640" height="480">'
+ +'<param name="movie" value="http://www.youtube.com/v/'
+ +ID+'?version=3&amp;enablejsapi=1&amp;playerapiid=ytplayer&amp;feature=oembed">'
+ +'<param name="allowFullScreen" value="true">'
+ +'<param name="allowscriptaccess" value="always">'
+ +'<embed id="ytplayer" src="http://www.youtube.com/v/'
+ +ID+'?version=3&amp;enablejsapi=1&amp;playerapiid=ytplayer&amp;feature=oembed" type="application/x-shockwave-flash" width="640" height="480" allowscriptaccess="always" allowfullscreen="true"></object>';
+*/
+ }else{
+ return false;
+ }
+ }
+
// prepares embed code for js api access
,prepEmbed: function(embed) {
var js_str = 'version=3&enablejsapi=1&playerapiid=ytplayer';
embed = embed.replace(/version\=3/gi, js_str);
embed = embed.replace(/\<embed/i,'<embed id="ytplayer"');
-
+
return embed;
}
}
Something went wrong with that request. Please try again.