ProjectSegfault/invidious-experimenting
4
0
Fork 0
forked from midou/invidious
Code Pull Requests Activity

Refactor embed.js

Browse Source
This commit is contained in:
Omar Roth
2019-05-06 10:37:10 -05:00
parent e04b7d0f01
commit 2ddc61fa5c
2 changed files with 87 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
assets/js/embed.js Normal file
View File

@@ -0,0 +1,80 @@
function get_playlist(plid, timeouts = 0) {
if (timeouts > 10) {
console.log('Failed to pull playlist');
return;
}
if (plid.startsWith('RD')) {
var plid_url = '/api/v1/mixes/' + plid +
'?continuation=' + embed_data.id +
'&format=html&hl=' + embed_data.preferences.locale;
} else {
var plid_url = '/api/v1/playlists/' + plid +
'?continuation=' + embed_data.id +
'&format=html&hl=' + embed_data.preferences.locale;
}
var xhr = new XMLHttpRequest();
xhr.responseType = 'json';
xhr.timeout = 20000;
xhr.open('GET', plid_url, true);
xhr.send();
xhr.onreadystatechange = function () {
if (xhr.readyState == 4) {
if (xhr.status == 200) {
if (xhr.response.nextVideo) {
player.on('ended', function () {
var url = new URL('https://example.com/embed/' + xhr.response.nextVideo);
if (embed_data.params.autoplay || embed_data.params.continue_autoplay) {
url.searchParams.set('autoplay', '1');
}
if (embed_data.params.listen !== embed_data.preferences.listen) {
url.searchParams.set('listen', embed_data.params.listen);
}
if (embed_data.params.speed !== embed_data.preferences.speed) {
url.searchParams.set('speed', embed_data.params.speed);
}
url.searchParams.set('list', plid);
location.assign(url.pathname + url.search);
});
}
}
}
}
xhr.ontimeout = function () {
console.log('Pulling playlist timed out.');
get_playlist(plid, timeouts + 1);
}
}
if (embed_data.plid) {
get_playlist(embed_data.plid);
} else if (embed_data.video_series) {
player.on('ended', function () {
var url = new URL('https://example.com/embed/' + embed_data.video_series.shift());
if (embed_data.params.autoplay || embed_data.params.continue_autoplay) {
url.searchParams.set('autoplay', '1');
}
if (embed_data.params.listen !== embed_data.preferences.listen) {
url.searchParams.set('listen', embed_data.params.listen);
}
if (embed_data.params.speed !== embed_data.preferences.speed) {
url.searchParams.set('speed', embed_data.params.speed);
}
if (embed_data.video_series.length !== 0) {
url.searchParams.set('playlist', embed_data.video_series.join(','))
}
location.assign(url.pathname + url.search);
});
}

79
src/invidious/views/embed.ecr
View File

@@ -26,79 +26,14 @@
<%= rendered "components/player" %>
<script>
<% if plid %>
function get_playlist(plid, timeouts = 0) {
if (timeouts > 10) {
console.log('Failed to pull playlist');
return;
}
if (plid.startsWith('RD')) {
var plid_url = '/api/v1/mixes/' + plid +
'?continuation=<%= video.id %>' +
'&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>';
} else {
var plid_url = '/api/v1/playlists/' + plid +
'?continuation=<%= video.id %>' +
'&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>';
}
var xhr = new XMLHttpRequest();
xhr.responseType = 'json';
xhr.timeout = 20000;
xhr.open('GET', plid_url, true);
xhr.send();
xhr.onreadystatechange = function() {
if (xhr.readyState == 4) {
if (xhr.status == 200) {
if (xhr.response.nextVideo) {
player.on('ended', function() {
location.assign('/watch?v=' + xhr.response.nextVideo +
'&list=' + plid +
<% if params.listen != preferences.listen %>
'&listen=<%= params.listen %>' +
<% end %>
<% if params.autoplay || params.continue_autoplay %>
'&autoplay=1' +
<% end %>
<% if params.speed != preferences.speed %>
'&speed=<%= params.speed %>' +
<% end %>
''
);
});
}
}
}
}
xhr.ontimeout = function() {
console.log('Pulling playlist timed out.');
get_playlist(plid, timeouts + 1);
}
var embed_data = {
id: '<%= video.id %>',
plid: '<%= plid %>',
video_series: <%= video_series.to_json %>,
params: <%= params.to_json %>,
preferences: <%= preferences.to_json %>
}
get_playlist('<%= plid %>');
<% elsif video_series %>
player.on('ended', function() {
location.assign('/embed/<%= video_series.shift %>' +
<% if !video_series.empty? %>
'?playlist=<%= video_series.join(",") %>' +
<% end %>
<% if params.listen != preferences.listen %>
'&listen=<%= params.listen %>' +
<% end %>
<% if params.autoplay || params.continue_autoplay %>
'&autoplay=1' +
<% end %>
<% if params.speed != preferences.speed %>
'&speed=<%= params.speed %>' +
<% end %>
''
);
});
<% end %>
</script>
<script src="/js/embed.js"></script>
</body>
</html>