From 316755bde2cebeacaaaf0edd34cbb645e0219888 Mon Sep 17 00:00:00 2001 From: IrosTheBeggar Date: Fri, 17 Jan 2020 21:54:13 -0500 Subject: [PATCH] revert auto dj algorithm --- modules/db-read/database-public-loki.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/db-read/database-public-loki.js b/modules/db-read/database-public-loki.js index ac08091..49aad9a 100644 --- a/modules/db-read/database-public-loki.js +++ b/modules/db-read/database-public-loki.js @@ -532,8 +532,13 @@ exports.setup = function (mstream, program) { ]}; } - // Get song list - const count = fileCollection.count(); + const leftFun = function(leftData) { + return leftData.hash + '-' + req.user.username; + }; + + const results = fileCollection.chain().eqJoin(userMetadataCollection.chain(), leftFun, rightFunDefault, mapFunDefault).find(orClause).data(); + + const count = results.length; if (count === 0) { res.status(444).json({ error: 'No songs that match criteria' }); return; @@ -550,12 +555,7 @@ exports.setup = function (mstream, program) { randomNumber = Math.floor(Math.random() * count); } - const leftFun = function(leftData) { - return leftData.hash + '-' + req.user.username; - }; - - const results = fileCollection.chain().offset(randomNumber).limit(1).eqJoin(userMetadataCollection.chain(), leftFun, rightFunDefault, mapFunDefault).data(); - const randomSong = results[0]; + let randomSong = results[randomNumber]; returnThis.songs.push({ "filepath": fe.join(randomSong.vpath, randomSong.filepath).replace(/\\/g, '/'),