Merge branch 'master' of github.com:IrosTheBeggar/mStream

docs/API.md

@@ -79,7 +79,9 @@ http://yourserver.com/vPath/filepath/song.mp3?token=XXXXXXXX
 
 [/playlist/delete](API/playlist_delete.md)
 
-### Database Read (Albums/Artists/Etc)
+### Metadata (Albums/Artists/Etc)
+
+[/db/metadata](API/db_metadata.md)
 
 [/db/search](API/db_search.md)
 
@@ -93,7 +95,7 @@ http://yourserver.com/vPath/filepath/song.mp3?token=XXXXXXXX
 
 ### JukeBox
 
-[/jukebox/push-to-client.md](API/jukebox_push-to-client.md)
+[/jukebox/push-to-client](API/jukebox_push-to-client.md)
 
 ### Download
 

docs/API/db_metadata.md

@@ -33,10 +33,10 @@
     {
       "filepath":"/path/to/file.mp3",
       "metadata":{
-        "artist": "",
-        "album": "",
+        "artist": "Artist",
+        "album": "Album",
         "track": 1,
-        "title": "",
+        "title": "Song Title",
         "year": 1990,
         "album-art": "hash.jpg"
       }

modules/db-management/database-master.js

@@ -215,12 +215,8 @@ exports.setup = function(mstream, program){
   // TODO: Make this queue run several in parallel
   // Scan on startup
   function *bootScan(){
-    console.log('yo');
     // Loop through list of users
     for (let username in program.users) {
-      console.log(username);
-      console.log(program.users[username]);
-
       yield scanIt( {
         username: username,
         musicDir: program.users[username].musicDir,

modules/db-read/database-public-sqlite.js

@@ -55,7 +55,7 @@ exports.setup = function (mstream, dbSettings){
   db.run(playlistSql,  function() {});
 
 
-  // TODO: Finish and test this
+  // Finish and test this
   mstream.post('/db/metadata', function (req, res){
     var relativePath = req.body.filepath;
     var fullpath = fe.join(req.user.musicDir, relativePath);