From 86f8a936fcdb81f06907edb8e2f29435d5ffea3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Mon, 26 Feb 2018 12:56:43 +0100 Subject: [PATCH] Better Helper.log and view --- server/public/assets/js/channel.js | 25 ++++------ server/public/assets/js/frontpage.js | 26 +++++----- server/public/assets/js/functions.js | 12 ++--- server/public/assets/js/helpers.js | 6 ++- server/public/assets/js/hostcontroller.js | 6 ++- server/public/assets/js/list.js | 61 ++++++++++++++--------- server/public/assets/js/listeners.js | 15 +++--- server/public/assets/js/mobileremote.js | 1 - server/public/assets/js/player.js | 33 ++++++------ server/public/assets/js/search.js | 25 ++++++---- 10 files changed, 118 insertions(+), 92 deletions(-) diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js index 74fcd25b..c0b40457 100644 --- a/server/public/assets/js/channel.js +++ b/server/public/assets/js/channel.js @@ -247,8 +247,7 @@ var Channel = { $(".castButton").css("display", "none"); } - Helper.log("chromecastAvailable" + chromecastAvailable); - Helper.log("chromecastAvailable" + chromecastReady); + Helper.log(["chromecastAvailable " + chromecastAvailable, "chromecastAvailable" + chromecastReady]); if(chromecastAvailable){ hide_native(1); @@ -281,7 +280,6 @@ var Channel = { var total = full_playlist[full_playlist.length - 1].duration / $("#controls").width(); total = total * e.clientX; - Helper.log(total); if(!chromecastAvailable){ Player.player.seekTo(total + Player.np.start); @@ -345,18 +343,17 @@ var Channel = { spotify_is_authenticated: function(bool){ if(bool){ - Helper.log("------------------------"); - Helper.log("Spotify is authenticated"); - Helper.log("access_token: " + access_token_data.access_token); - Helper.log("token_type:" + access_token_data.token_type); - Helper.log("expires_in: " + access_token_data.expires_in); - Helper.log("------------------------"); + Helper.log([ + "Spotify is authenticated", + "access_token: " + access_token_data.access_token, + "token_type:" + access_token_data.token_type, + "expires_in: " + access_token_data.expires_in + ]); + $(".spotify_authenticated").css("display", "block"); $(".spotify_unauthenticated").css("display", "none"); } else { - Helper.log("----------------------------"); - Helper.log("Spotify is not authenticated"); - Helper.log("----------------------------"); + Helper.log(["Spotify is not authenticated"]); $(".spotify_authenticated").css("display", "none"); $(".spotify_unauthenticated").css("display", "block"); } @@ -522,7 +519,7 @@ var Channel = { clearTimeout(tap_target_timeout); before_toast(); if(Helper.mobilecheck() || user_auth_avoid) { - Helper.log("Removing all listeners"); + Helper.log(["Removing all listeners"]); //socket.emit("change_channel"); //removeAllListeners(); //socket.removeEventListener(id); @@ -595,7 +592,7 @@ var Channel = { $("#favicon").attr("href", "/assets/images/favicon-32x32.png"); $(".context-menu-list").remove(); - Helper.log(socket); + Helper.log(["Socket", socket]); if($("#alreadyfp").length == 1){ Frontpage.init(); }else { diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js index 28232c3c..3ff2a17c 100755 --- a/server/public/assets/js/frontpage.js +++ b/server/public/assets/js/frontpage.js @@ -18,10 +18,10 @@ var Frontpage = { frontpage_function: function(msg) { frontpage = true; - Helper.log("-----------"); - Helper.log("Frontpage fetch"); - Helper.log(msg); - Helper.log("------------"); + Helper.log([ + "Frontpage fetch", + msg + ]); Frontpage.all_channels = msg.channels; Frontpage.populate_channels(msg.channels, true); Frontpage.set_viewers(msg.viewers); @@ -63,9 +63,10 @@ var Frontpage = { pre_card = $(channel_list); - Helper.log("------------"); - Helper.log(pre_card); - Helper.log("-------------"); + Helper.log([ + "Pre_card: ", + pre_card + ]); for(var x in lists) { var chan = lists[x]._id; @@ -297,7 +298,7 @@ var Frontpage = { new_channel = new_channel.toLowerCase(); clearTimeout(rotation_timeout); if(Helper.mobilecheck()){ - Helper.log("removing all listeners"); + Helper.log(["removing all listeners"]); removeAllListeners(); } $("#main-container").css("background-color", "#2d2d2d"); @@ -415,10 +416,11 @@ var Frontpage = { $("#contact").modal(); $('select').material_select(); - Helper.log("----"); - Helper.log("Sending frontpage_lists"); - Helper.log("Socket", socket); - Helper.log("-----"); + Helper.log([ + "Sending frontpage_lists", + "Socket", + socket + ]); Crypt.init(); if(Crypt.get_offline()){ diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js index d687b181..64b84348 100644 --- a/server/public/assets/js/functions.js +++ b/server/public/assets/js/functions.js @@ -1,6 +1,6 @@ function removeAllListeners() { - Helper.log("Removing all listeners"); + Helper.log(["Removing all listeners"]); socket.removeEventListener("chat.all"); socket.removeEventListener("chat"); socket.removeEventListener("conf"); @@ -147,7 +147,7 @@ function setup_auth_listener() { function setup_no_connection_listener(){ socket.on('connect_failed', function(){ - Helper.log('Connection Failed'); + Helper.log(['Connection Failed']); if(!connect_error){ connect_error = true; Materialize.toast("Error connecting to server, please wait..", 100000000, "red lighten connect_error"); @@ -155,7 +155,7 @@ function setup_no_connection_listener(){ }); socket.on("connect_error", function(){ - Helper.log("Connection Failed."); + Helper.log(["Connection Failed."]); if(!connect_error){ connect_error = true; Materialize.toast("Error connecting to server, please wait..", 100000000, "red lighten connect_error"); @@ -225,17 +225,17 @@ function setup_list_listener(){ } function setup_playlist_listener(){ - Helper.log("Setting up playlist_listener"); + Helper.log(["Setting up playlist_listener"]); socket.on('playlists', Frontpage.frontpage_function); } function setup_host_initialization(){ - Helper.log("Setting up host initialization listener"); + Helper.log(["Setting up host initialization listener"]); socket.on("id", Hostcontroller.host_listener); } function setup_host_listener(id){ - Helper.log("Setting up host action listener"); + Helper.log(["Setting up host action listener"]); socket.on(id, Hostcontroller.host_on_action); } diff --git a/server/public/assets/js/helpers.js b/server/public/assets/js/helpers.js index 933c5074..e2acd9a7 100755 --- a/server/public/assets/js/helpers.js +++ b/server/public/assets/js/helpers.js @@ -2,7 +2,11 @@ var Helper = { log: function(to_log) { if(localStorage.debug === "true") { - console.log(to_log); + console.log("------------"); + for(var i = 0; i < to_log.length; i++) { + console.log(to_log[i]); + } + console.log("------------"); } }, diff --git a/server/public/assets/js/hostcontroller.js b/server/public/assets/js/hostcontroller.js index bf47eecd..abdc334f 100755 --- a/server/public/assets/js/hostcontroller.js +++ b/server/public/assets/js/hostcontroller.js @@ -5,8 +5,10 @@ var Hostcontroller = { old_id: null, host_listener: function(id) { - Helper.log("Host-listener triggered"); - Helper.log("Host-listener id:" + id); + Helper.log([ + "Host-listener triggered", + "Host-listener id:" + id + ]); if(Hostcontroller.old_id === null) Hostcontroller.old_id = id; else { socket.removeAllListeners(id); diff --git a/server/public/assets/js/list.js b/server/public/assets/js/list.js index fd9c21bf..d83a9326 100755 --- a/server/public/assets/js/list.js +++ b/server/public/assets/js/list.js @@ -163,10 +163,10 @@ var List = { $("#wrapper").empty(); - Helper.log("---------------------------"); - Helper.log("---------FULL PLAYLIST-----"); - Helper.log(full_playlist); - Helper.log("---------------------------"); + Helper.log([ + "FULL PLAYLIST", + full_playlist + ]); if(full_playlist.length > 1){ $.each(full_playlist, function(j, _current_song){ if(!_current_song.hasOwnProperty("start")) full_playlist[j].start = 0; @@ -213,7 +213,7 @@ var List = { $("#pageButtons").removeClass("hide"); if(!embed) { - Helper.log("Starting empty-checker"); + Helper.log(["Starting empty-checker"]); clearTimeout(timed_remove_check); timed_remove_check = setTimeout(function() { if(full_playlist.length > 0) { @@ -230,7 +230,7 @@ var List = { function (data, status, xhr) { //Helper.log("Empty-checker items " + data.items.length); if (data.items.length == 0) { - Helper.log("Emtpy-checker error at " + full_playlist[i].id + " " + full_playlist[i].title); + Helper.log(["Emtpy-checker error at " + full_playlist[i].id + " " + full_playlist[i].title]); socket.emit("error_video", {channel: chan.toLowerCase(), id: full_playlist[i].id, title: full_playlist[i].title}); } if(full_playlist.length > i + 1 && window.location.pathname != "/") { @@ -238,7 +238,7 @@ var List = { } }).error(function (xhr, errorType, exception) { - Helper.log("Emtpy-checker error at " + full_playlist[i].id + " " + full_playlist[i].title); + Helper.log(["Emtpy-checker error at " + full_playlist[i].id + " " + full_playlist[i].title]); socket.emit("error_video", {channel: chan.toLowerCase(), id: full_playlist[i].id, title: full_playlist[i].title}); if(full_playlist.length > i + 1 && window.location.pathname != "/") { List.check_error_videos(i + 1); @@ -521,10 +521,10 @@ var List = { } else { delete full_playlist[length]; } - Helper.log("---------------------------"); - Helper.log("---SONG ON FIRST INDEX-----"); - Helper.log(full_playlist[0]); - Helper.log("---------------------------"); + Helper.log([ + "SONG ON FIRST INDEX", + full_playlist[0] + ]); full_playlist.push(full_playlist.shift()); if(!remove){ List.insertAtIndex(full_playlist[$("#wrapper").children().length], false, true); @@ -634,12 +634,12 @@ var List = { async: true, error: function(err){ if(err.status == 429 || err.status == 502){ - Helper.log(err.getAllResponseHeaders()); + Helper.log([err.getAllResponseHeaders()]); var retryAfter = err.getResponseHeader("Retry-After"); - Helper.log(retryAfter); + Helper.log([retryAfter]); if (!retryAfter) retryAfter = 5; retryAfter = parseInt(retryAfter, 10); - Helper.log("Retry-After", retryAfter); + Helper.log(["Retry-After", retryAfter]); setTimeout(function(){ List.searchSpotify(curr_song, playlist_id, user_id, full_playlist, current_element); }, retryAfter * 1000); @@ -657,13 +657,19 @@ var List = { if(similarity(data.artists[0].name + " - " + data.name, decodeURIComponent(track)) > 0.60 || (data.artists.length > 1 && similarity(data.artists[0].name + " " + data.artists[1].name + " - " + data.name, decodeURIComponent(track)))) { found = true; List.uris.push(data.uri); - Helper.log("Found", track); + Helper.log([ + "Found", + track + ]); //List.num_songs = List.num_songs + 1; return false; } else if(decodeURIComponent(track).indexOf(data.artists[0].name.toLowerCase()) >= 0 && decodeURIComponent(track).indexOf(data.name.toLowerCase()) >= 0){ found = true; List.uris.push(data.uri); - Helper.log("Found", track); + Helper.log([ + "Found", + track + ]); //List.num_songs = List.num_songs + 1; return false; } else { @@ -677,7 +683,10 @@ var List = { } found = true; List.uris.push(data.uri); - Helper.log("Found", track); + Helper.log([ + "Found", + track + ]); //List.num_songs = List.num_songs + 1; return false; } @@ -685,7 +694,10 @@ var List = { if(!found){ List.not_found.push(original_track); List.num_songs = List.num_songs + 1; - Helper.log("Didn't find", original_track); + Helper.log([ + "Didn't find", + original_track + ]); } if(List.num_songs + List.uris.length == full_playlist.length){ if(List.uris.length > 100){ @@ -738,7 +750,7 @@ var List = { }, 3000); }, success: function(response){ - Helper.log("Added songs"); + Helper.log(["Added songs"]); } }) }, @@ -769,7 +781,10 @@ var List = { List.addToYoutubePlaylist(playlist_id, full_playlist, number_added, request_url) }, error: function(response){ - Helper.log(response); + Helper.log([ + "export to youtube response", + response + ]); } }); }, @@ -793,10 +808,10 @@ var List = { }, data: _data, success: function(response){ - Helper.log("Added video: " + full_playlist[num].id + " to playlist id " + playlist_id); + Helper.log(["Added video: " + full_playlist[num].id + " to playlist id " + playlist_id]); if(num == full_playlist.length - 1){ - Helper.log("All videoes added!"); - Helper.log("url: https://www.youtube.com/playlist?list=" + playlist_id); + Helper.log(["All videoes added!"]); + Helper.log(["url: https://www.youtube.com/playlist?list=" + playlist_id]); $(".exported-list").append("" + chan + ""); $("#playlist_loader_export").addClass("hide"); $(".current_number").addClass("hide"); diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index e3913d77..ff734c94 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -205,8 +205,10 @@ initializeCastApi = function() { var context = cast.framework.CastContext.getInstance(); chromecastReady = true; context.addEventListener(cast.framework.CastContextEventType.SESSION_STATE_CHANGED, function(event) { - Helper.log("session state"); - Helper.log(event.sessionState); + Helper.log([ + "session state", + event.sessionState + ]); switch (event.sessionState) { case cast.framework.SessionState.SESSION_STARTED: castSession = cast.framework.CastContext.getInstance().getCurrentSession(); @@ -268,8 +270,10 @@ initializeCastApi = function() { }); context.addEventListener(cast.framework.CastContextEventType.CAST_STATE_CHANGED, function(event){ - Helper.log("cast state"); - Helper.log(event.castState); + Helper.log([ + "cast state", + event.castState + ]); if(event.castState == "NOT_CONNECTED"){ $(".castButton").css("display", "block"); if(!$(".volume-container").hasClass("volume-container-cast")) { @@ -692,7 +696,6 @@ $("#clickme").click(function(){ $(document).on("click", "#listExport", function(e){ e.preventDefault(); - Helper.log(full_playlist); if(!youtube_authenticated){ var nonce = Helper.randomString(29); window.callback = function(data) { @@ -1288,6 +1291,6 @@ $(document).on("submit", "#find_form", function(e){ List.dynamicContentPageJumpTo(jump_to_page); } else { $(".highlight").removeClass("highlight"); - Helper.log("none found"); + Helper.log(["none found"]); } }); diff --git a/server/public/assets/js/mobileremote.js b/server/public/assets/js/mobileremote.js index fd4c0b53..a58b86c5 100755 --- a/server/public/assets/js/mobileremote.js +++ b/server/public/assets/js/mobileremote.js @@ -47,7 +47,6 @@ var Mobile_remote = { animate: true, stop:function(event, ui) { socket.emit("id", {id: Mobile_remote.id, type: "volume", value: ui.value}); - Helper.log("volume"); } }); } diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index aae2030c..42d39784 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -30,21 +30,21 @@ var Player = { prev_chan_player = chan; 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); + Helper.log([ + "youtube_listener", + "Received: ", + obj, + "paused variable: " + paused, + "mobile_beginning variable: " + mobile_beginning]); try{ - Helper.log("getVideoUrl(): " + Player.player.getVideoUrl().split('v=')[1]); + Helper.log(["getVideoUrl(): " + Player.player.getVideoUrl().split('v=')[1]]); } catch(e){ } - Helper.log("video_id variable: " + video_id); - Helper.log("---------------------------------"); + Helper.log(["video_id variable: " + video_id]); if(!obj.np){ - document.getElementById('song-title').innerHTML = "Empty channel. Add some songs!"; + $('#song-title').html("Empty channel. Add some songs!"); document.title = "Zoff - the shared YouTube based radio"; $("#channel-load").css("display", "none"); //$("#player_overlay").height($("#player").height()); @@ -205,15 +205,16 @@ var Player = { }, onPlayerStateChange: function(newState) { - Helper.log("-------onPlayerStateChange------"); - Helper.log("New state\nState: "); - Helper.log(newState); + Helper.log([ + "onPlayerStateChange", + "New state\nState: ", + newState + ]); try{ - Helper.log("Duration: " + Player.player.getDuration(), "Current time: " + Player.player.getCurrentTime()); - Helper.log("getVideoUrl(): " + Player.player.getVideoUrl().split('v=')[1]); + Helper.log(["Duration: " + Player.player.getDuration(), "Current time: " + Player.player.getCurrentTime()]); + Helper.log(["getVideoUrl(): " + Player.player.getVideoUrl().split('v=')[1]]); }catch(e){} - Helper.log("video_id variable: " + video_id); - Helper.log("---------------------------------"); + Helper.log(["video_id variable: " + video_id]); switch(newState.data) { case YT.PlayerState.UNSTARTED: break; diff --git a/server/public/assets/js/search.js b/server/public/assets/js/search.js index 14c6db1b..2fd7d75c 100755 --- a/server/public/assets/js/search.js +++ b/server/public/assets/js/search.js @@ -193,11 +193,11 @@ var Search = { //Helper.log(response); if(response.items.length === 0){ Search.readySubmit(false, {totalLength: totalNumber - 1}); - Helper.log("------------------------------"); - Helper.log("NO MATCH FOR:"); - Helper.log("Spotify title: " + title + " " + artist.join(" ")); - Helper.log("Spotify length: " + length); - Helper.log("------------------------------"); + Helper.log([ + "NO MATCH FOR:", + "Spotify title: " + title + " " + artist.join(" "), + "Spotify length: " + length + ]); var not_added_song = $("
" + not_import_html + "
"); not_added_song.find(".extra-add-text").text(title + " - " + artist.join(" ")); not_added_song.find(".extra-add-text").attr("title", title + " - " + artist.join(" ")); @@ -251,11 +251,11 @@ var Search = { }); if(!matched){ Search.readySubmit(false, {totalLength: totalNumber - 1}); - Helper.log("------------------------------"); - Helper.log("NO MATCH FOR:"); - Helper.log("Spotify title: " + title + " " + artist.join(" ")); - Helper.log("Spotify length: " + length); - Helper.log("------------------------------"); + Helper.log([ + "NO MATCH FOR:", + "Spotify title: " + title + " " + artist.join(" "), + "Spotify length: " + length + ]); var not_added_song = $("
" + not_import_html + "
"); not_added_song.find(".extra-add-text").text(title + " - " + artist.join(" ")); not_added_song.find(".extra-add-text").attr("title", title + " - " + artist.join(" ")); @@ -351,7 +351,10 @@ var Search = { }; youtube_window = window.open("/o_callback#youtube=true&nonce=" + nonce, "", "width=600, height=600"); } else { - Helper.log(response.error); + Helper.log([ + "import list error: ", + response.error + ]); document.getElementById("import").disabled = false; $("#playlist_loader").addClass("hide"); $("#import").removeClass("hide");