wip

Reviewed-on: #17

config.json

@@ -15,7 +15,7 @@
     "name": "webplay"
   },
   "redis": {
-    "host": "127.0.0.1",
+    "host": "localhost",
     "port": 6379
   },
   "album_cover_files": [

package.json

@@ -19,7 +19,7 @@
     "fluent-ffmpeg": "^2.1.2",
     "jsonwebtoken": "^9.0.0",
     "mime-types": "^2.1.35",
-    "mongodb": "^4.14.0",
+    "mongodb": "^6.1.0",
     "music-metadata": "^7.13.3",
     "node-fdkaac": "^1.4.1",
     "node-id3": "^0.2.6",

router/album.js

@@ -51,6 +51,12 @@ router.route("/filter/:term")
       res.json(result).status(200).end();
     });
   })
+router.route("/random/:count")
+  .get(passport.authenticate("jwt", { session: false }), (req, res) => {
+    database.albums.randomCovers(req.params.count, 64, (result) => {
+      res.json(result).status(200).end();
+    });
+  })
 
 router.route("/:id")
   .get(checkGuest, (req, res) => {

router/radio.js

@@ -56,9 +56,9 @@ router
         if (radio) {
           if (req.files.file) {
             resize_image_for_radio(req.files.file.data, (result) => {
-              radio.cover32 = result.cover32;
+              radio.covers.cover32 = result.cover32;
-              radio.cover64 = result.cover64;
+              radio.covers.cover64 = result.cover64;
-              radio.cover128 = result.cover128;
+              radio.covers.cover128 = result.cover128;
               database.radios.update(radio);
               res.json(radio).end();
             });

services/database/CONNECTOR.js

@@ -1,4 +1,4 @@
-const { MongoClient } = require('mongodb');
+const MongoClient = require('mongodb').MongoClient;
 const server = require("../../server");
 const config = server.config;
 
@@ -14,7 +14,10 @@ exports.connect = async function () {
     else {
         try {
             console.log("DB CONNECTING:" + config.database.host + ":" + config.database.port)
-            const client = await MongoClient.connect(url);
+            const client = await MongoClient.connect(url, (err, db)=> {
+                console.log("DB Connected")
+            }
+            );
             dbo = client.db(database);
             return dbo;
         } catch (error) {

services/database/albums.js

@@ -311,3 +311,26 @@ exports.empty = function (callback) {
       callback(result.filter(f => !f.tracks || f.tracks.length == 0));
     });
 };
+
+exports.randomCovers = function (count, size, callback) {
+  dbo
+    .collection("albums")
+    .find({ "covers.cover64": { $exists: true } })
+    .project({ "covers.cover64": true })
+    .toArray((err, result) => {
+      if (result.length > count) {
+        let res = [];
+        while (count-- > 0) {
+          let rnd = randomNumber(0, result.length);
+          res.push(result[rnd]);
+        }
+        callback(res);
+      } else {
+        callback(result);
+      }
+    })
+}
+
+function randomNumber(min, max) {
+  return Math.floor(Math.random() * (max - min) + min);
+}

services/database/radios.js

@@ -13,6 +13,9 @@ exports.collection = function (callback) {
     .toArray((err, result) => {
       result.forEach(item => {
         item.type = "radio";
+        if (!item.covers) {
+          item.covers = {};
+        }
       });
       callback(result);
     });
@@ -23,6 +26,9 @@ exports.byId = function (id, callback) {
     .collection("radios")
     .findOne({ _id: ObjectId(id) }, (err, result) => {
       if (err) throw err;
+      if (!result.covers) {
+        result.covers = {};
+      }
       callback(result);
     });
 };
@@ -63,9 +69,7 @@ exports.update = function (radio, callback) {
       $set: {
         name: radio.name,
         url: radio.url,
-        cover32: radio.cover32,
+        covers: radio.covers
-        cover64: radio.cover64,
-        cover128: radio.cover128
       }
     },
     { upsert: false },

services/database/tracks.js

@@ -97,9 +97,16 @@ exports.mostListened = function (filter, callback) {
         }
       }, { $match: { "album.visibility": { $in: filter } } });
   } else {
-    aggregate.unshift({ $match: { type: 'track' } });
+    dbo.collection("history")
-  }
+      .find()
-  aggregate.push({ $sort: { counter: -1, _id: -1 } }, { $limit: 6 })
+      .project({ _id: true })
+      .sort({ _id: -1 })
+      .limit(1000)
+      .toArray((err, ids) => {
+        let arr = ids.map(h => h._id);
+
+        aggregate.unshift({ $match: { type: 'track', _id: { $in: arr } } });
+        aggregate.push({ $sort: { counter: -1 } }, { $limit: 6 })
 
         dbo
           .collection("history")
@@ -110,4 +117,7 @@ exports.mostListened = function (filter, callback) {
             if (err) throw err;
             callback(result);
           });
+      });
+  }
+
 };