KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved end-checking somewhat with less needed database-calls

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-06-05 15:24:31 +02:00
parent 48bb88d8e0
commit c134ccc058
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
server/handlers/list.js
View File

@@ -588,40 +588,38 @@ function end(obj, coll, guid, offline, socket) {
socket.emit("update_required", result); socket.emit("update_required", result);
return; return;
} }
//coll = coll.replace(/ /g,''); var callback_function = function() {
Functions.getSessionAdminUser(Functions.getSession(socket), coll, function(userpass) { for(var i = 0; i < arguments.length; i++) {
if(typeof(arguments[i]) == "function") {
arguments[i]();
}
}
}
db.collection(coll + "_settings").find(function(err, docs){
var authentication_needed = false;
if(docs.length > 0 && (docs[0].userpass != undefined && docs[0].userpass != "")) {
callback_function = Functions.getSessionAdminUser;
authentication_needed = true;
}
callback_function(Functions.getSession(socket), coll, function(userpass) {
if(userpass != "" || obj.pass == undefined) { if(userpass != "" || obj.pass == undefined) {
obj.pass = userpass; obj.pass = userpass;
} }
if(!authentication_needed || (authentication_needed && obj.hasOwnProperty('pass') && docs[0].userpass == crypto.createHash('sha256').update(Functions.decrypt_string(obj.pass)).digest("base64"))) {
db.collection(coll + "_settings").find(function(err, docs){
if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (obj.hasOwnProperty('pass') && docs[0].userpass == crypto.createHash('sha256').update(Functions.decrypt_string(obj.pass)).digest("base64")))) {
Functions.check_inlist(coll, guid, socket, offline); Functions.check_inlist(coll, guid, socket, offline);
db.collection(coll).find({now_playing:true}, function(err, np){ db.collection(coll).find({now_playing:true}, function(err, np){
if(err !== null) console.log(err); if(err !== null) console.log(err);
if(np !== null && np !== undefined && np.length == 1 && np[0].id == id){ if(np !== null && np !== undefined && np.length == 1 && np[0].id == id){
//db.collection(coll + "_settings").find(function(err, docs){
var startTime = docs[0].startTime; var startTime = docs[0].startTime;
if(docs[0].removeplay === true && startTime+parseInt(np[0].duration)<=Functions.get_time()+5) {
db.collection(coll).remove({now_playing:true, id: id}, function(err, docs){
change_song_post(coll, undefined, docs);
if(docs.deletedCount == 1) {
db.collection("frontpage_lists").update({_id:coll, count: {$gt: 0}}, {$inc:{count:-1}, $set:{accessed: Functions.get_time()}}, {upsert:true}, function(err, docs){});
}
});
} else {
if(startTime+parseInt(np[0].duration)<=Functions.get_time()+5) { if(startTime+parseInt(np[0].duration)<=Functions.get_time()+5) {
change_song(coll, false, id, docs); change_song(coll, false, id, docs);
} }
} }
//});
}
}); });
} else { } else {
socket.emit("auth_required"); socket.emit("auth_required");
} }
}); })
}); });
} else { } else {
var result = { var result = {