router/video.js aktualisiert

fix wrong var name

config.json

@@ -10,12 +10,12 @@
     "http://localhost"
   ],
   "database": {
-    "host": "localhost",
+    "host": "database",
     "port": 27017,
     "name": "webplay"
   },
   "redis": {
-    "host": "127.0.0.1",
+    "host": "redis",
     "port": 6379
   },
   "album_cover_files": [

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.cover64 = result.cover64;
-              radio.cover128 = result.cover128;
+              radio.covers.cover32 = result.cover32;
+              radio.covers.cover64 = result.cover64;
+              radio.covers.cover128 = result.cover128;
               database.radios.update(radio);
               res.json(radio).end();
             });

router/video.js

@@ -96,7 +96,7 @@ router.route("/:id/stream")
 router.route("/:id/stream/:rate/:audioIndex")
   .get((req, res) => {
     if (!server.lists.video_quality.includes(req.params.rate)) {
-      req.end();
+      res.end();
     }
 
     let video = getFileName(req);

server.js

@@ -101,7 +101,7 @@ app.use(fileUpload({
 }));
 const corsOptions = {
   origin: (origin, callback) => {
-    if (!origin || config.allowed_domains.indexOf(origin.replace(/:\d*$/g, "")) !== -1) {
+    if (!origin || config.domain == origin.replace(/:\d*$/g, "") || config.allowed_domains.indexOf(origin.replace(/:\d*$/g, "")) !== -1) {
       callback(null, true);
     } else {
       database.system.domains((domains) => {

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,
-        cover64: radio.cover64,
-        cover128: radio.cover128
+        covers: radio.covers
       }
     },
     { upsert: false },

services/database/tracks.js

@@ -97,17 +97,27 @@ exports.mostListened = function (filter, callback) {
         }
       }, { $match: { "album.visibility": { $in: filter } } });
   } else {
-    aggregate.unshift({ $match: { type: 'track' } });
-  }
-  aggregate.push({ $sort: { counter: -1, _id: -1 } }, { $limit: 6 })
+    dbo.collection("history")
+      .find()
+      .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")
+          .aggregate(aggregate, {
+            allowDiskUse: true
+          })
+          .toArray((err, result) => {
+            if (err) throw err;
+            callback(result);
+          });
+      });
+  }
 
-  dbo
-    .collection("history")
-    .aggregate(aggregate, {
-      allowDiskUse: true
-    })
-    .toArray((err, result) => {
-      if (err) throw err;
-      callback(result);
-    });
 };