From e5013599c894e14652d5838144f9a4b69fd200da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 9 Nov 2017 16:11:57 +0100 Subject: [PATCH] Added test serverside to ensure that title is correct + duration isn't insanely much higher that it should be --- .gitignore | 1 + server/handlers/list_change.js | 5 ++++- server/index.js | 1 + server/public/assets/js/list.js | 17 +++++++++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d54eb89b..a63cff8f 100755 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ server/public/assets/images/thumbnails/ server/config/mailconfig.js +server/config/api_key.js server/config/mongo_config.js server/config/cert_config.js server/public/assets/dist/callback.min.js diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js index cec7a0df..b433a720 100644 --- a/server/handlers/list_change.js +++ b/server/handlers/list_change.js @@ -88,8 +88,11 @@ function add_function(arr, coll, guid, offline, socket) { db.collection(coll).update({views:{$exists:true}}, {$set:{startTime: Functions.get_time()}}); List.send_play(coll, undefined); Frontpage.update_frontpage(coll, id, title); + Search.get_correct_info(new_song, coll, false); } else { - io.to(coll).emit("channel", {type: "added", value: {"_id": "asd", "added":added,"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration}}); + var new_song = {"_id": "asd", "added":added,"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration}; + io.to(coll).emit("channel", {type: "added", value: new_song}); + Search.get_correct_info(new_song, coll, true); } db.collection("frontpage_lists").update({_id:coll}, {$inc:{count:1}, $set:{accessed: Functions.get_time()}}, {upsert:true}, function(err, docs){}); List.getNextSong(coll); diff --git a/server/index.js b/server/index.js index ec121516..db4c58d9 100755 --- a/server/index.js +++ b/server/index.js @@ -87,6 +87,7 @@ List = require('./handlers/list.js'); Suggestions = require('./handlers/suggestions.js'); ListSettings = require('./handlers/list_settings.js'); Frontpage = require('./handlers/frontpage.js'); +Search = require('./handlers/search.js'); crypto = require('crypto'); node_cryptojs = require('node-cryptojs-aes'); CryptoJS = node_cryptojs.CryptoJS; diff --git a/server/public/assets/js/list.js b/server/public/assets/js/list.js index 684c6429..92dd077e 100755 --- a/server/public/assets/js/list.js +++ b/server/public/assets/js/list.js @@ -136,6 +136,9 @@ var List = { found_array_index = 0; //if(!w_p) List.dragging(true); break; + case "changed_values": + List.changedValues(msg.value); + break; case "song_change_prev": if(window.location.pathname != "/") List.song_change_prev(msg.time); if(full_playlist.length > 0) { @@ -148,6 +151,20 @@ var List = { } }, + changedValues: function(song) { + var i = List.getIndexOfSong(song.id); + full_playlist[i].title = song.title; + full_playlist[i].duration = song.duration; + full_playlist[i].start = song.start; + full_playlist[i].end = song.end; + + $("#" + song.id).find(".vote-container").attr("title", song.title); + $("#" + song.id).find(".list-title").attr("title", song.title); + $("#" + song.id).find(".list-title").text(song.title); + var _temp_duration = Helper.secondsToOther(song.duration); + $("#" + song.id).find(".card-duration").text(Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1])); + }, + insertAtBeginning: function(song_info, transition) { var display = List.page == 0 ? "" : "none"; var add = List.generateSong(song_info, transition, false, true, false, display, false);