Merge branch 'master' of https://gitea.arnweb.nl/corner/Cassettea-api-node

.gitignore

@@ -1,3 +1,2 @@
 node_modules/
 bin/ffmpeg
-music/

routes/index.js

@@ -38,14 +38,17 @@ router.get('/get/:type/:id', (req, res, _next) => {
   let db = {};
 
   if (type === 'song') {
-    db = require(rootdir + '/songs.json');
+    db = require(rootdir + 'database/songs.json');
   } else if (type === 'album') {
-    db = require(rootdir + '/albums.json');
+    db = require(rootdir + "database/albums.json");
   } else if (type === 'artist') {
-    db = require(rootdir + '/artists.json');
+    db = require(rootdir + "database/artists.json");
   }
 
-  const arg = id.split(',');
+  if (id === 'all') {
+    res.json({result: db})
+  } else {
+    const arg = id.split(",");
 
     if (arg.length > 1) {
       let result = [];
@@ -56,13 +59,14 @@ router.get('/get/:type/:id', (req, res, _next) => {
     } else {
       res.json({ result: db[id] });
     }
+  }
 
 });
 
 router.get('/play/:track', (req, res, _next) => {
   var key = req.params.track;
 
-  var music = rootdir + "/music/" + key + ".mp3";
+  var music = rootdir + "music/" + key + ".mp3";
 
   var stat = fs.statSync(music);
   range = req.headers.range;
@@ -112,13 +116,14 @@ router.get('/search/:query', (req, res, _next) => {
   const query = req.params.query;
   let result = [];
 
-  fs.readdir(rootdir + '/database/', (err, files) => {
+  fs.readdir(rootdir + 'database/', (err, files) => {
     files.forEach(file => {
 
-      const content = require(rootdir + '/database/' + file);
+      const content = require(rootdir + 'database/' + file);
 
       content.forEach(element => {
         if (element.name.match(query)) {
+          element.foundIn = file;
           result.push(element);
         }
       });

views/index.pug

@@ -3,7 +3,7 @@ extends layout
 block content
   h1= title
   p Welcome to #{title}
-  form(action="/download" method="get")
+  form(action="download" method="get")
     label(for="url")
       input(name="url" type="text")
     input(type="submit")