KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added functionality for offline playing

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-01-25 13:57:24 +01:00
parent 275d1a95b2
commit 1305dd3072
13 changed files with 277 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/js/admin.js
View File

@@ -102,7 +102,6 @@ var Admin = {
conf: function(msg)
{
Crypt.init();
Admin.set_conf(msg[0]);
if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Admin.beginning && Crypt.get_pass(chan.toLowerCase()) !== ""){
socket.emit("password", {password: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), channel: chan.toLowerCase()});

47
public/js/crypt.js
View File

@@ -4,10 +4,12 @@ var Crypt = {
init: function(){
if (location.protocol != "https:"){
document.cookie = chan.toLowerCase() + '=;path=/' + chan.toLowerCase() + ';expires=' + new Date(0).toUTCString();
} else {
document.cookie = chan.toLowerCase() + '=;path=/' + chan.toLowerCase() + ';secure;expires=' + new Date(0).toUTCString();
if(window.location.pathname != "/"){
if (location.protocol != "https:"){
document.cookie = chan.toLowerCase() + '=;path=/' + chan.toLowerCase() + ';expires=' + new Date(0).toUTCString();
} else {
document.cookie = chan.toLowerCase() + '=;path=/' + chan.toLowerCase() + ';secure;expires=' + new Date(0).toUTCString();
}
}
try{
@@ -15,14 +17,18 @@ var Crypt = {
}catch(err){
conf_arr = Crypt.decrypt(Crypt.create_cookie("_opt"), "_opt");
}
try{
Crypt.conf_pass = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase()), chan.toLowerCase());
}catch(err){
Crypt.conf_pass = Crypt.decrypt(Crypt.create_cookie(chan.toLowerCase()), chan.toLowerCase());
}
Hostcontroller.change_enabled(conf_arr.remote);
if(conf_arr.width != 100) Player.set_width(conf_arr.width);
if(conf_arr.name !== undefined && conf_arr.name !== "") Chat.namechange(conf_arr.name);
if(window.location.pathname != "/"){
try{
Crypt.conf_pass = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase()), chan.toLowerCase());
}catch(err){
Crypt.conf_pass = Crypt.decrypt(Crypt.create_cookie(chan.toLowerCase()), chan.toLowerCase());
}
Hostcontroller.change_enabled(conf_arr.remote);
if(conf_arr.width != 100) Player.set_width(conf_arr.width);
if(conf_arr.name !== undefined && conf_arr.name !== "") Chat.namechange(conf_arr.name);
}
},
decrypt: function(cookie, name){
@@ -91,13 +97,23 @@ var Crypt = {
//return conf_arr.volume;
},
get_offline: function(){
var temp_offline = Crypt.decrypt(Crypt.getCookie("_opt"), "_opt").offline;
if(temp_offline != undefined){
return Crypt.decrypt(Crypt.getCookie("_opt"), "_opt").offline;
} else {
Crypt.set_offline(false);
return false;
}
},
set_volume: function(val){
conf_arr.volume = val;
Crypt.encrypt(conf_arr, "_opt");
},
create_cookie: function(name){
if(name == "_opt") cookie_object = {volume: 100, width: 100, remote: true, name: ""};
if(name == "_opt") cookie_object = {volume: 100, width: 100, remote: true, name: "", offline: false};
else cookie_object = {passwords: {}};
var string_it = JSON.stringify(cookie_object);
@@ -139,6 +155,11 @@ var Crypt = {
Crypt.encrypt(conf_arr, "_opt");
},
set_offline: function(enabled){
conf_arr.offline = enabled;
Crypt.encrypt(conf_arr, "_opt");
},
remove_name:function(){
conf_arr.name = "";
Crypt.encrypt(conf_arr, "_opt");

9
public/js/frontpage.js
View File

@@ -97,7 +97,6 @@ var Frontpage = {
$("#channels").append(card.html());
//$("#channels").append(card);
//console.log(chan);
}
output+="<option value='"+chan+"'> ";
num++;
@@ -263,7 +262,7 @@ var Frontpage = {
window.history.pushState("to the channel!", "Title", "/" + new_channel);
window.chan = new_channel;
}
console.log(chromecastReady);
var response = $("<div>" + e + "</div>");
$(".mega").remove();
@@ -286,6 +285,7 @@ var Frontpage = {
}
$("#search").attr("placeholder", "Find song on YouTube...");
$(".page-footer").addClass("padding-bottom-novideo");
from_frontpage = true;
if($("#alreadychannel").length == 1){
init();
}else{
@@ -352,6 +352,11 @@ function initfp(){
Helper.log("Socket", socket);
Helper.log("-----");
Crypt.init();
if(Crypt.get_offline()){
change_offline(true);
}
socket.emit('frontpage_lists');
$("#channel-load").css("display", "none");

13
public/js/list.js
View File

@@ -10,7 +10,6 @@ var List = {
channel_function: function(msg)
{
switch(msg.type)
{
case "list":
@@ -391,12 +390,20 @@ var List = {
},
vote: function(id, vote){
socket.emit('vote', {channel: chan, id: id, type: vote, adminpass: adminpass});
if(!offline){
socket.emit('vote', {channel: chan, id: id, type: vote, adminpass: adminpass});
} else {
List.channel_function({type:"vote", value: id, time: (new Date()).getTime()})
}
return true;
},
skip: function(){
socket.emit('skip', {pass: adminpass, id:video_id, channel: chan.toLowerCase()});
if(!offline){
socket.emit('skip', {pass: adminpass, id:video_id, channel: chan.toLowerCase()});
} else {
Player.playNext();
}
return true;
},

73
public/js/listeners.js
View File

@@ -28,6 +28,7 @@ var durationBegun = false;
var chat_active = false;
var chat_unseen = false;
var blinking = false;
var from_frontpage = false;
var access_token_data = {};
var spotify_authenticated = false;
var not_import_html = "";
@@ -42,6 +43,7 @@ var chromecastAvailable = false;
var color = "808080";
var find_start = false;
var find_started = false;
var offline = false;
var chromecastReady = false;
var found_array = [];
var found_array_index = 0;
@@ -193,6 +195,12 @@ function init(){
socket = io.connect(''+add+':8080', connection_options);
}
Crypt.init();
if(Crypt.get_offline()){
$(".offline_switch_class")[0].checked = true;
change_offline(true);
}
if($("#alreadychannel").length === 0 || Helper.mobilecheck()){
setup_youtube_listener();
get_list_listener();
@@ -221,7 +229,6 @@ function init(){
//if(/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
/*if(!Helper.mobilecheck() && !window.MSStream){
console.log("asd");
document.getElementById("search").blur();
$("#channel-load").css("display", "none");
} else {*/
@@ -234,6 +241,7 @@ function init(){
setup_admin_listener();
setup_list_listener();
setup_chat_listener();
if(!Helper.mobilecheck() && $("#alreadychannel").length === 0) setup_host_initialization();
if(!Helper.msieversion() && !Helper.mobilecheck()) Notification.requestPermission();
@@ -485,6 +493,46 @@ function randomString(length){
return text;
}
function change_offline(enabled){
Crypt.set_offline(enabled);
offline = enabled;
socket.emit("offline", enabled);
if(enabled){
if(list_html){
list_html = $("<div>" + list_html + "</div>");
list_html.find(".card-content").css("display", "flex");
list_html.find(".card-content").css("height", "100%");
list_html.find(".list-title").css("align-self", "center");
list_html.find(".vote-span").addClass("hide");
list_html = list_html.html();
}
$(".card-content").css("display", "flex");
$(".card-content").css("height", "100%");
$(".list-title").css("align-self", "center");
$(".vote-span").addClass("hide");
$("#viewers").addClass("hide");
$("#offline-mode").removeClass("waves-cyan");
$("#offline-mode").addClass("cyan");
} else {
if(list_html){
list_html = $("<div>" + list_html + "</div>");
list_html.find(".card-content").css("display", "block");
list_html.find(".card-content").css("height", "initial");
list_html.find(".list-title").css("align-self", "center");
list_html.find(".vote-span").removeClass("hide");
list_html = list_html.html();
}
$(".card-content").css("display", "block");
$(".card-content").css("height", "initial");
$(".list-title").css("align-self", "center");
$(".vote-span").removeClass("hide");
$("#viewers").removeClass("hide");
$("#offline-mode").addClass("waves-cyan");
$("#offline-mode").removeClass("cyan");
socket.emit("pos");
}
}
function spotify_is_authenticated(bool){
if(bool){
Helper.log("------------------------");
@@ -526,6 +574,15 @@ $(document).keyup(function(e) {
}
});
$(document).on("click", "#offline-mode", function(){
if(!Crypt.get_offline()){
change_offline(true);
} else{
change_offline(false);
}
});
$(document).on("click", "#playpause-overlay", function(){
if($("#play-overlay").hasClass("hide")){
Player.pauseVideo();
@@ -577,7 +634,7 @@ $(document).on("click", ".extra-button-delete", function(e){
$(document).on("click", "#closePlayer", function(e){
e.preventDefault();
socket.emit("change_channel");
socket.emit("change_channel");
try{
if(chromecastAvailable){
var castSession = cast.framework.CastContext.getInstance().getCurrentSession();
@@ -682,6 +739,13 @@ $(document).on("change", 'input[class=remote_switch_class]', function()
Crypt.set_remote(enabled);
});
$(document).on("change", 'input[class=offline_switch_class]', function()
{
//Hostcontroller.change_enabled(document.getElementsByName("remote_switch")[0].checked);
offline = document.getElementsByName("offline_switch")[0].checked;
change_offline(offline);
});
$(document).on("change", 'input[class=conf]', function()
{
Admin.save();
@@ -859,7 +923,7 @@ $(document).on("click", ".chat-tab", function(){
$(document).on("click", "#skip", function(e){
e.preventDefault();
e.preventDefault();
List.skip();
});
@@ -1166,7 +1230,8 @@ function onepage_load(){
var url_split = window.location.href.split("/");
if(url_split[3].substr(0,1) != "#!" && url_split[3] !== "" && !(url_split.length == 5 && url_split[4].substr(0,1) == "#")){
socket.emit("change_channel");
socket.emit("change_channel");
Admin.beginning = true;
chan = url_split[3].replace("#", "");

201
public/js/player.js
View File

@@ -8,101 +8,112 @@ var Player = {
youtube_listener: function(obj)
{
Player.loaded = false;
Helper.log("--------youtube_listener--------");
Helper.log("Received: ");
Helper.log(obj);
Helper.log("paused variable: " + paused);
Helper.log("mobile_beginning variable: " + mobile_beginning);
var state;
try{
Helper.log("getVideoUrl(): " + Player.player.getVideoUrl().split('v=')[1]);
} catch(e){}
Helper.log("video_id variable: " + video_id);
Helper.log("---------------------------------");
if(!obj.np){
document.getElementById('song-title').innerHTML = "Empty channel. Add some songs!";
$("#player_overlay").height($("#player").height());
if(!window.MSStream && !chromecastAvailable) $("#player_overlay").toggleClass("hide");
state = Player.player.getPlayerState();
}catch(e){
state = null;
}
if((!offline && (state || from_frontpage)) || (offline && (!state || from_frontpage))|| (!offline && (!state || from_frontpage))){
from_frontpage = false;
Player.loaded = false;
Helper.log("--------youtube_listener--------");
Helper.log("Received: ");
Helper.log(obj);
Helper.log("paused variable: " + paused);
Helper.log("mobile_beginning variable: " + mobile_beginning);
try{
Helper.log("getVideoUrl(): " + Player.player.getVideoUrl().split('v=')[1]);
} catch(e){}
Helper.log("video_id variable: " + video_id);
Helper.log("---------------------------------");
if(!obj.np){
document.getElementById('song-title').innerHTML = "Empty channel. Add some songs!";
$("#player_overlay").height($("#player").height());
if(!window.MSStream && !chromecastAvailable) $("#player_overlay").toggleClass("hide");
try{
if(!chromecastAvailable) Player.stopVideo();
}catch(e){}
//List.importOldList(channel.toLowerCase());
} else if(paused){
Player.getTitle(obj.np[0].title, viewers);
//Player.setBGimage(video_id);
if(!Helper.mobilecheck()) Player.notifyUser(obj.np[0].id, obj.np[0].title);
if(!chromecastAvailable) Player.stopVideo();
}catch(e){}
//List.importOldList(channel.toLowerCase());
} else if(paused){
Player.getTitle(obj.np[0].title, viewers);
//Player.setBGimage(video_id);
if(!Helper.mobilecheck()) Player.notifyUser(obj.np[0].id, obj.np[0].title);
if(!chromecastAvailable) Player.stopVideo();
video_id = obj.np[0].id;
conf = obj.conf[0];
time = obj.time;
seekTo = time - conf.startTime;
song_title = obj.np[0].title;
duration = obj.np[0].duration;
Player.setBGimage(video_id);
}else if(!paused){
//Helper.log("gotten new song");
if(previous_video_id === undefined)
previous_video_id = obj.np[0].id;
else if(previous_video_id != video_id)
previous_video_id = video_id;
video_id = obj.np[0].id;
conf = obj.conf[0];
time = obj.time;
seekTo = time - conf.startTime;
song_title = obj.np[0].title;
duration = obj.np[0].duration;
Player.setBGimage(video_id);
}else if(!paused){
//Helper.log("gotten new song");
if(previous_video_id === undefined)
previous_video_id = obj.np[0].id;
else if(previous_video_id != video_id)
previous_video_id = video_id;
video_id = obj.np[0].id;
conf = obj.conf[0];
time = obj.time;
seekTo = time - conf.startTime;
song_title = obj.np[0].title;
duration = obj.np[0].duration;
video_id = obj.np[0].id;
conf = obj.conf[0];
time = obj.time;
seekTo = time - conf.startTime;
song_title = obj.np[0].title;
duration = obj.np[0].duration;
if(mobile_beginning && Helper.mobilecheck() && seekTo === 0 && !chromecastAvailable)
seekTo = 1;
try{
if(full_playlist[0].id == video_id){
List.song_change(full_playlist[0].added);
}
Suggestions.fetchYoutubeSuggests(video_id);
}catch(e){}
Player.getTitle(song_title, viewers);
Player.setBGimage(video_id);
//if(player_ready && !Helper.mobilecheck())
if(player_ready && !window.MSStream)
{
if(mobile_beginning && Helper.mobilecheck() && seekTo === 0 && !chromecastAvailable)
seekTo = 1;
try{
if(Player.player.getVideoUrl().split('v=')[1] != video_id || chromecastAvailable){
Player.loadVideoById(video_id);
if(!Helper.mobilecheck()) Player.notifyUser(video_id, song_title);
Player.seekTo(seekTo);
if(paused && !chromecastAvailable){
Player.pauseVideo();
}
if(full_playlist[0].id == video_id){
List.song_change(full_playlist[0].added);
}
if(!paused){
if(!mobile_beginning || chromecastAvailable)
Player.playVideo();
if(!durationBegun)
Suggestions.fetchYoutubeSuggests(video_id);
}catch(e){}
Player.getTitle(song_title, viewers);
Player.setBGimage(video_id);
//if(player_ready && !Helper.mobilecheck())
if(player_ready && !window.MSStream)
{
try{
if(Player.player.getVideoUrl().split('v=')[1] != video_id || chromecastAvailable){
Player.loadVideoById(video_id);
if(!Helper.mobilecheck()) Player.notifyUser(video_id, song_title);
Player.seekTo(seekTo);
if(paused && !chromecastAvailable){
Player.pauseVideo();
}
}
if(!paused){
if(!mobile_beginning || chromecastAvailable)
Player.playVideo();
if(!durationBegun)
Player.durationSetter();
}
if(Player.player.getDuration() > seekTo || Player.player.getDuration() === 0 || chromecastAvailable || Player.player.getCurrentTime() != seekTo)
Player.seekTo(seekTo);
Player.after_load = video_id;
if(!Player.loaded) setTimeout(function(){Player.loaded = true;},500);
}catch(e){
if(chromecastAvailable){
Player.loadVideoById(video_id);
Player.seekTo(seekTo);
}
if(!durationBegun && !chromecastAvailable)
Player.durationSetter();
}
if(Player.player.getDuration() > seekTo || Player.player.getDuration() === 0 || chromecastAvailable || Player.player.getCurrentTime() != seekTo)
Player.seekTo(seekTo);
Player.after_load = video_id;
if(!Player.loaded) setTimeout(function(){Player.loaded = true;},500);
}catch(e){
if(chromecastAvailable){
Player.loadVideoById(video_id);
Player.seekTo(seekTo);
}
if(!durationBegun && !chromecastAvailable)
Player.durationSetter();
}
else
Player.getTitle(song_title, viewers);
}
else
Player.getTitle(song_title, viewers);
} else {
if(!durationBegun)
Player.durationSetter();
}
},
@@ -123,7 +134,11 @@ var Player = {
case 0:
playing = false;
paused = false;
socket.emit("end", {id: video_id, channel: chan.toLowerCase()});
if(!offline){
socket.emit("end", {id: video_id, channel: chan.toLowerCase()});
} else {
Player.playNext();
}
break;
case 1:
@@ -146,7 +161,7 @@ var Player = {
if(document.getElementById("pause").className.split(" ").length == 2)
$("#pause").toggleClass("hide");
}
if(paused)
if(paused && !offline)
{
socket.emit('pos', {channel: chan.toLowerCase()});
paused = false;
@@ -202,8 +217,10 @@ var Player = {
seekTo: function(_seekTo){
if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.no", {type: "seekTo", seekTo: _seekTo});
} else {
} else if(!offline){
Player.player.seekTo(_seekTo);
} else {
Player.player.seekTo(0);
}
},
@@ -233,6 +250,18 @@ var Player = {
}
},
playNext: function(){
var next_song = full_playlist[0];
video_id = next_song.id;
time = (new Date()).getTime();
song_title = next_song.title;
duration = next_song.duration;
Player.getTitle(song_title, viewers);
Player.setBGimage(video_id);
Player.loadVideoById(video_id);
List.channel_function({type:"song_change", time: time});
},
sendNext: function(obj){
if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.no", {type: "nextVideo", title: obj.title, videoId: obj.videoId});

1
public/js/remotecontroller.js
View File

@@ -97,7 +97,6 @@ var Remotecontroller = {
},*/
stop:function(event, ui) {
socket.emit("id", {id: id, type: "volume", value: ui.value});
console.log("volume");
//console.log(ui.value);
}
});