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

Cleaned up logs

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-05-04 21:19:10 +02:00
parent 1a170c6509
commit 54a42548cf
11 changed files with 40 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/handlers/list.js
View File

@@ -85,7 +85,6 @@ function list(msg, guid, coll, offline, socket) {
socket.join(coll);
List.send_list(coll, socket, true, false, true);
db.collection("frontpage_lists").insert({"_id": coll, "count" : 0, "frontpage": true, "accessed": Functions.get_time(), "viewers": 1}, function(e,d){
console.log("added new channel", coll);
});
Functions.check_inlist(coll, guid, socket, offline);
});

2
server/handlers/list_change.js
View File

@@ -381,8 +381,6 @@ function add_function(arr, coll, guid, offline, socket) {
}
var new_song = {"added": added,"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration, "start": parseInt(start), "end": parseInt(end), "type": "video", "source": source};
if(source == "soundcloud") new_song.thumbnail = arr.thumbnail;
console.log(new_song);
//return;
db.collection(coll).update({id: id}, new_song, {upsert: true}, function(err, docs){
new_song._id = "asd";
if(np) {

1
server/public/assets/js/channel.js
View File

@@ -31,7 +31,6 @@ var Channel = {
}
window.onpopstate = function(e){
console.log(e)
Channel.onepage_load();
};

1
server/public/assets/js/frontpage.js
View File

@@ -26,7 +26,6 @@ var Frontpage = {
document.getElementById("channel-list-container").insertAdjacentHTML("beforeend", "<p>No channels yet</p>");
} else {
Frontpage.populate_channels(msg.channels, true);
console.log(msg.channels);
}
Frontpage.set_viewers(msg.viewers);
},

1
server/public/assets/js/functions.js
View File

@@ -201,7 +201,6 @@ function get_list_ajax() {
}
},
error: function(response) {
console.log(response);
response = JSON.parse(response);
if(response.status == 403) {
start_auth();

1
server/public/assets/js/list.js
View File

@@ -356,7 +356,6 @@ var List = {
full_playlist.push(now_playing);
}
console.log(added.source);
if(added.source != "soundcloud" && document.querySelectorAll("#suggested-"+added.id).length > 0) {
number_suggested = number_suggested - 1;
if(number_suggested < 0) number_suggested = 0;

10
server/public/assets/js/listeners.js
View File

@@ -188,16 +188,13 @@ window.addEventListener("DOMContentLoaded", function() {
else if(!fromChannel && window.location.pathname == "/"){
Frontpage.init();
}
console.log(window.location.pathname);
if(window.location.pathname == "/" && !client) {
console.log("time to load");
tag = document.createElement('script');
tag.src = "https://www.youtube.com/iframe_api";
firstScriptTag = document.getElementsByTagName('script')[0];
firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
tag.onload = function() {
console.log("loaded script")
if(document.querySelectorAll("script[src='https://w.soundcloud.com/player/api.js']").length == 1) {
} else {
@@ -211,7 +208,6 @@ window.addEventListener("DOMContentLoaded", function() {
SC.initialize({
client_id: 'ed53fc01f248f15becddf8eb52cc91ef'
}, function() {
console.log("Loaded streamer");
});
}
}
@@ -454,7 +450,6 @@ addListener("submit", "#description_form", function(event){
});
addListener("click", "#playpause-overlay", function(){
console.log("playpause");
if(document.getElementById("play-overlay").classList.contains("hide")){
Player.pauseVideo();
Helper.toggleClass("#play-overlay", "hide");
@@ -619,7 +614,6 @@ document.addEventListener("keydown", function(event) {
document.querySelector("#import") != document.activeElement &&
document.querySelector("#find_input") != document.activeElement &&
document.querySelector("#import_spotify") != document.activeElement) {
console.log("play pause space", videoSource);
if(videoSource == "soundcloud") {
event.preventDefault();
Playercontrols.play_pause();
@@ -1314,7 +1308,6 @@ addListener("click", ".result-object", function(e){
if(end > original_length) {
end = original_length;
}
console.log(source);
if(start > end) {
M.toast({html: "Start can't be before the end..", displayLength: 3000, classes: "red lighten"});
} else if(start < 0) {
@@ -1414,8 +1407,6 @@ addListener("click", "#add-many", function(e){
source = "soundcloud";
thumbnail = e.getAttribute("data-type-thumbnail");
}
console.log(start, end);
console.log(source);
if(start > end) {
M.toast({html: "Start can't be before the end..", displayLength: 3000, classes: "red lighten"});
} else if(start < 0) {
@@ -1427,7 +1418,6 @@ addListener("click", "#add-many", function(e){
e.parentElement.parentElement.parentElement.remove();
Search.submit(id, title, length, false, 0, 1, start, end, source, thumbnail);
} catch(event) {
console.log(event);
M.toast({html: "Only numbers are accepted as song start and end parameters..", displayLength: 3000, classes: "red lighten"});
}
}

186
server/public/assets/js/player.js
View File

@@ -67,10 +67,10 @@ var Player = {
if(obj.np != undefined) {
Player.getTitle(song_title, viewers);
if(((embed && autoplay) || !embed ) && !offline && !was_stopped) {
console.log("loadVideoById \nwas_stopped=",was_stopped,"\noffline=",offline)
Helper.log(["loadVideoById \nwas_stopped="+was_stopped+"\noffline="+offline])
Player.loadVideoById(Player.np.id, duration, Player.np.start, Player.np.end);
} else {
console.log("cueVideoById \nwas_stopped=",was_stopped,"\noffline=",offline)
Helper.log(["cueVideoById \nwas_stopped="+was_stopped+"\noffline="+offline])
Player.cueVideoById(Player.np.id, duration, Player.np.start, Player.np.end);
}
}
@@ -111,7 +111,6 @@ var Player = {
playing = false;
paused = false;
was_stopped = false;
console.log(362, "was stopped", was_stopped);
if(!offline) {
/*var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
if(u == undefined) u = "";*/
@@ -124,7 +123,6 @@ var Player = {
if(videoSource == "soundcloud") {
Player.player.stopVideo();
//was_stopped = false;
console.log(362, "was stopped", was_stopped);
return;
}
if(embed) {
@@ -170,7 +168,6 @@ var Player = {
} else {
if(!chromecastAvailable){
was_stopped = true;
console.log(417, "was stopped", was_stopped);
if(beginning && mobile_beginning) {
Helper.css("#playpause", "visibility", "visible");
Helper.css("#playpause", "pointer-events", "all");
@@ -255,116 +252,47 @@ var Player = {
Player.stopVideo();
if(_autoplay) was_stopped = false;
Helper.removeClass(document.getElementById("player_overlay"), "hide");
//document.getElementById("player_overlay_text").innerText = "Loading SoundCloud";
Helper.css(document.getElementById("player_overlay"), "background-color", "#2d2d2d");
//if(Player.soundcloud_player) {
//console.log(Player.soundcloud_player)
if(start == undefined) start = 0;
if(seekTo == undefined) seekTo = 0;
/*SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000);
SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume());*/
soundcloud_loading = false;
/*SC.Widget(Player.soundcloud_player).isPaused(function(paused) {
if(paused) SC.Widget(Player.soundcloud_player).play();
});*/
//Player.soundcloud_player.listenTo("/tracks/" + id);
/*SC.Widget(Player.soundcloud_player).getCurrentSound(function(sound) {
if(start == undefined) start = 0;
if(seekTo == undefined) seekTo = 0;
soundcloud_loading = false;
var _autoAdd = "false";
if(_autoplay) {
_autoAdd = "true";
Helper.removeClass("#player_loader_container", "hide");
}
try {
if(SC == null || !SC.stream) return;
} catch(e) {
return;
}
SC.stream("/tracks/" + id).then(function(player){
Player.soundcloud_player = player;
Player.soundcloud_player.bind("finish", Player.soundcloudFinish);
Player.soundcloud_player.bind("pause", Player.soundcloudPause);
Player.soundcloud_player.bind("play", Player.soundcloudPlay);
window.player = player;
SC.get('/tracks', {
ids: id
}).then(function(tracks) {
var sound = tracks[0];
Helper.removeClass(".soundcloud_info_container", "hide");
document.querySelector(".soundcloud_info_container .green").href = sound.purchase_url;
document.querySelector(".soundcloud_info_container .red").href = sound.user.permalink_url;
console.log(sound);
});*/
//} else {
var _autoAdd = "false";
document.querySelector("#soundcloud_listen_link").href = sound.permalink_url;
document.querySelector(".soundcloud_info_container .green").href = sound.user.permalink_url;
//document.querySelector(".soundcloud_info_container .red").href = sound.user.permalink_url;
});
if(_autoplay) {
_autoAdd = "true";
Helper.removeClass("#player_loader_container", "hide");
}
/*SC.Widget(Player.soundcloud_player).unbind(SC.Widget.Events.FINISH, Player.soundcloudFinish);
SC.Widget(Player.soundcloud_player).unbind(SC.Widget.Events.PAUSE, Player.soundcloudPause);
SC.Widget(Player.soundcloud_player).unbind(SC.Widget.Events.PLAY, Player.soundcloudPlay);
document.querySelector("#soundcloud_container").innerHTML = '<iframe width="100%" id="soundcloud_player" height="166" scrolling="no" frameborder="no" style="visibility: hidden;z-index: -999;" \
src="https://w.soundcloud.com/player/?url=' + id + '&auto_play=' + _autoAdd + '"> \
</iframe>';
Player.soundcloud_player = document.querySelector("#soundcloud_player");*/
try {
if(SC == null || !SC.stream) return;
} catch(e) {
return;
}
console.log("Trying to play soundcloud here");
SC.stream("/tracks/" + id).then(function(player){
console.log(player);
Player.soundcloud_player = player;
Player.soundcloud_player.bind("finish", Player.soundcloudFinish);
Player.soundcloud_player.bind("pause", Player.soundcloudPause);
Player.soundcloud_player.bind("play", Player.soundcloudPlay);
window.player = player;
SC.get('/tracks', {
ids: id
}).then(function(tracks) {
var sound = tracks[0];
Helper.removeClass(".soundcloud_info_container", "hide");
document.querySelector("#soundcloud_listen_link").href = sound.permalink_url;
document.querySelector(".soundcloud_info_container .green").href = sound.purchase_url;
document.querySelector(".soundcloud_info_container .red").href = sound.user.permalink_url;
player.play().then(function(){
Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100);
Player.soundcloud_player.seek((seekTo) * 1000);
}).catch(function(e){
});
if(_autoplay) {
player.play().then(function(){
console.log(id);
Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100);
Player.soundcloud_player.seek((seekTo) * 1000);
console.log('Playback started!');
}).catch(function(e){
console.error('Playback rejected. Try calling play() from a user interaction.', e);
});
}
});
soundcloud_loading = true;
/*SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.FINISH, Player.soundcloudFinish);
SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PAUSE, Player.soundcloudPause);
SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PLAY, Player.soundcloudPlay);
SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume());*/
/*SC.Widget(Player.soundcloud_player).load(id, {
autoplay: true,
callback: function(element) {
console.log(element);
console.log("It should be playing now");
SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000);
SC.Widget(Player.soundcloud_player).play();
}
})*/
if(start == undefined) start = 0;
if(seekTo == undefined) seekTo = 0;
//SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000);
if(!document.hasFocus()) {
console.log("Is out of focus, trying timout for playing");
/*setTimeout(function() {
SC.Widget(Player.soundcloud_player).getCurrentSound(function(sound) {
console.log(sound, sound.uri, sound.uri.replace("https://api.soundcloud.com", ""))
SC.stream(sound.uri.replace("https://api.soundcloud.com", "")).then(function(player){
console.log(player);
player.play().then(function(){
console.log('Playback started!');
}).catch(function(e){
console.error('Playback rejected. Try calling play() from a user interaction.', e);
});
});
Helper.removeClass(".soundcloud_info_container", "hide");
document.querySelector(".soundcloud_info_container .green").href = sound.purchase_url;
document.querySelector(".soundcloud_info_container .red").href = sound.user.permalink_url;
console.log(sound);
});
}, 500);*/
}
//}
});
soundcloud_loading = true;
if(start == undefined) start = 0;
if(seekTo == undefined) seekTo = 0;
if(_autoplay) was_stopped = false;
Helper.css(document.getElementById("player_overlay"), "background", "url('" + full_playlist[full_playlist.length - 1].thumbnail + "')");
Helper.css(document.getElementById("player_overlay"), "background-size", "auto");
@@ -620,8 +548,6 @@ var Player = {
end_programmatically = false;
} else {
was_stopped = true;
console.log()
console.log(785, "was stopped", was_stopped);
if(!chromecastAvailable){
if(Helper.mobilecheck()) {
Helper.css("#playpause", "visibility", "visible");
@@ -647,21 +573,6 @@ var Player = {
} else if(soundcloud_loading){
Player.soundcloud_player.seek((seekTo) * 1000);
Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100);
/*Player.soundcloud_player.getCurrentSound(function(sound) {
console.log(sound, sound.uri, sound.uri.replace("https://api.soundcloud.com", ""))
SC.stream(sound.uri.replace("https://api.soundcloud.com", "")).then(function(player){
console.log(player);
player.play().then(function(){
console.log('Playback started!');
}).catch(function(e){
console.error('Playback rejected. Try calling play() from a user interaction.', e);
});
});
Helper.removeClass(".soundcloud_info_container", "hide");
document.querySelector(".soundcloud_info_container .green").href = sound.purchase_url;
document.querySelector(".soundcloud_info_container .red").href = sound.user.permalink_url;
console.log(sound);
});*/
soundcloud_loading = false;
}
if(embed) {
@@ -692,7 +603,6 @@ var Player = {
if((was_stopped) && !offline) {
/*var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
if(u == undefined) u = "";*/
console.log("Emit for position");
paused = false;
was_stopped = false;
socket.emit('pos', {channel: chan.toLowerCase()});
@@ -706,17 +616,6 @@ var Player = {
soundcloudReady: function() {
beginning = true;
player_ready = true;
/*SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.FINISH, Player.soundcloudFinish);
SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PAUSE, Player.soundcloudPause);
SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PLAY, Player.soundcloudPlay);*/
/*SC.Widget(Player.soundcloud_player).load("https://soundcloud.com/kid-astray/kid-astray-back-to-the-ordinary", {
auto_play: false,
buying:false,
sharing:false,
download:false,
show_user:false,
});*/
if(videoSource == "soundcloud" && videoId != undefined) Player.loadVideoById(videoId, Player.np.duration, Player.np.start, Player.np.end);
},
@@ -918,16 +817,11 @@ var Player = {
document.getElementById("bar").style.width = per+"%";
}
if(videoSource == "soundcloud") {
console.log(currDurr, Player.np.end, Player.soundcloud_player.isPlaying());
if(Math.ceil(currDurr) + 1 > Player.np.end && Player.soundcloud_player.isPlaying()) {
end_programmatically = true;
if(!offline) {
Player.soundcloud_player.pause();
was_stopped = false;
console.log(1071, "was stopped", was_stopped);
/*var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
if(u == undefined) u = "";*/
socket.emit("end", {id: video_id, channel: chan.toLowerCase()});
} else {
Player.playNext();
@@ -940,9 +834,6 @@ var Player = {
if(!offline) {
Player.player.pauseVideo();
was_stopped = false;
console.log(1086, "was stopped", was_stopped);
/*var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
if(u == undefined) u = "";*/
socket.emit("end", {id: video_id, channel: chan.toLowerCase()});
} else {
Player.playNext();
@@ -987,7 +878,6 @@ var Player = {
SC.initialize({
client_id: 'ed53fc01f248f15becddf8eb52cc91ef'
}, function() {
console.log("Loaded streamer");
});
}
}

5
server/public/assets/js/playercontrols.js
View File

@@ -8,7 +8,6 @@ var Playercontrols = {
},
initControls: function() {
console.log("init controls");
document.getElementById("volume-button").addEventListener("click", Playercontrols.mute_video);
document.getElementById("playpause").addEventListener("click", Playercontrols.play_pause);
document.getElementById("volume-button-overlay").addEventListener("click", Playercontrols.mute_video);
@@ -190,7 +189,6 @@ var Playercontrols = {
},
play_pause: function() {
console.log("play pause here");
if(!chromecastAvailable){
if(videoSource == "soundcloud") {
if(!Player.soundcloud_player.isPlaying()) {
@@ -226,7 +224,6 @@ var Playercontrols = {
},
play_pause_show: function() {
console.log("pause2");
if(chromecastAvailable){
if(document.getElementById("play").classList.contains("hide")){
Player.pauseVideo();
@@ -357,9 +354,7 @@ var Playercontrols = {
},
playPause: function() {
console.log("playpause", videoSource);
if(videoSource == "soundcloud") {
console.log("hello");
if(!Player.soundcloud_player.isPlaying()) {
Helper.addClass("#play", "hide");
Helper.removeClass("#pause", "hide");

3
server/public/assets/js/search.js
View File

@@ -220,7 +220,6 @@ var Search = {
//var thumb = null;
if(thumb == null) thumb = song.waveform_url;
else thumb = thumb.replace("-large.jpg", "-t500x500.jpg");
console.log(song);
//$("#results").append(result_html);
var songs = pre_result.cloneNode(true);
songs.querySelector(".search-title").innerText = title;
@@ -252,7 +251,6 @@ var Search = {
fresh = true;
}
document.getElementById("results_soundcloud").innerHTML = "";
//console.log(output);
if(output.length > 0) {
if(document.querySelector("#results").innerHTML.length > 0) {
Helper.css(".search_results", "display", "block");
@@ -631,7 +629,6 @@ addVideos: function(ids){
},
submit: function(id,title,duration, playlist, num, full_num, start, end, source, thumbnail){
console.log(id,title,duration, playlist, num, full_num, start, end, source, thumbnail);
if((client || Helper.mobilecheck()) && !socket_connected) {
add_ajax(id, title, duration, playlist, num, full_num, start, end, source, thumbnail);
return;

5
server/public/partials/channel/players.handlebars
View File

@@ -3,7 +3,7 @@
<div id="fireplace_player" class="ytplayer"></div>
{{/unless}}
<div id="player" class="ytplayer"></div>
<div id="main_components">
<div id="player_overlay" class="hide valign-wrapper">
<div id="playing_on">
@@ -16,8 +16,7 @@
<a href="#!" id="soundcloud_listen_link" target="_blank">
<img src="https://developers.soundcloud.com/assets/powered_by_large_white-9c2af6a93ad2b1c541f423d9e9045980.png" />
</a>
<a href="#!" class="btn green waves-effect waves-light" target="_blank">Buy</a>
<a href="#!" class="btn red waves-effect waves-light" target="_blank">Artist</a>
<a href="#!" class="btn green waves-effect waves-light" target="_blank">Artist</a>
</div>
<div id="player_overlay_text" class="valign center-align">
Waiting for Video