Merge branch 'master' of ssh://git.davidventura.com.ar:443/tati/Autismify

backend/livestream.js

@@ -18,6 +18,14 @@ app.get('/artists', function (req, resp) {
 	}
 	tagger.getArtists(f);
 });
+app.get('/artists/albums', function (req, resp) {
+	function f(a){ 
+//		resp.send(JSON.stringify(a));
+//		console.log(a);
+		resp.send(a);
+	}
+	tagger.getAllArtistWithAlbums(f);
+});
 
 app.get('/albums', function (req, resp) {
 	function f(a){
@@ -42,6 +50,7 @@ app.get('/album/artist/:artist', function (req, resp) {
 	tagger.getAlbumByArtist(artist,f);
 });
 
+
 app.get('/song/:song', function (req, resp) {
     resp.writeHead(200, {
           "Connection": "keep-alive"

backend/tagger.js

@@ -118,17 +118,34 @@ var getAlbums=function(callback){
 	});
 };
 
-var getAlbumByArtist=function(callback){
-	var query = 'select album from songs group by artist order by album';
-	connection.query(query, function(err, result) {
+var getAlbumByArtist=function(artist, callback){
+	var query = 'select album from songs where artist like ? group by album order by album';
+	connection.query(query, "%"+artist+"%", function(err, result) {
 		callback(result);	
 	});	
 }
 
+var getAllArtistWithAlbums=function(callback){
+	var query = 'select artist,album from songs  group by artist,album order by artist,album';
+	var b={};
+	connection.query(query, function(err, result) {
+		for (el in result) {
+			var key=result[el].artist;
+			if (key==null || key==undefined)
+				key="";
+			key=key.toString();
+			if(b[key]===undefined)
+				b[key]=[];
+			b[key].push(result[el].album);
+		}
+		callback(b);	
+	});	
+}
 module.exports.pathFromID=pathFromID;
 module.exports.getArtist=getArtist;
 module.exports.getArtists=getArtists;
 module.exports.getAlbums=getAlbums;
+module.exports.getAlbumByArtist=getAlbumByArtist;
 module.exports.populate=populate;
-
+module.exports.getAllArtistWithAlbums=getAllArtistWithAlbums;
 //populate("/storage/samba/Music");