|
|
@@ -22,14 +22,15 @@ function validMusicFile(path){
|
|
|
}
|
|
|
|
|
|
function tags(path) {
|
|
|
+ var empty = {'artist': '', 'title': '', 'album': ''};
|
|
|
try {
|
|
|
var tag = taglib.tagSync(path);
|
|
|
if(!tag.isEmpty())
|
|
|
- return { 'artist': tag.artist, 'title': tag.title};
|
|
|
+ return { 'artist': tag.artist, 'title': tag.title, 'album': tag.album};
|
|
|
else
|
|
|
- return {'artist': '', 'title': ''};
|
|
|
+ return empty;
|
|
|
} catch (ex) {
|
|
|
- return {'artist': '', 'title': ''};
|
|
|
+ return empty;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -61,8 +62,9 @@ var walk = function(dir, done) {
|
|
|
|
|
|
|
|
|
var populate = function(path) { //"/storage/samba/Music"
|
|
|
- var query = 'INSERT INTO songs(filename,artist,title) values ? on duplicate key update artist=artist,title=title';
|
|
|
+ var query = 'INSERT INTO songs(filename,artist,title,album,added_on) values ? on duplicate key update artist=artist,title=title,album=album';
|
|
|
var res = [];
|
|
|
+ var now = {};
|
|
|
walk(path, function(err, results) {
|
|
|
if (err) throw err;
|
|
|
for( r in results) {
|
|
|
@@ -71,11 +73,13 @@ var populate = function(path) { //"/storage/samba/Music"
|
|
|
s.push(results[r]);
|
|
|
s.push(meta.artist);
|
|
|
s.push(meta.title);
|
|
|
+ s.push(meta.album);
|
|
|
res.push(s);
|
|
|
}
|
|
|
|
|
|
connection.query(query, [res], function(err, result) {
|
|
|
if (err) throw err;
|
|
|
+ console.log("Finished");
|
|
|
//connection.end();
|
|
|
});
|
|
|
});
|
|
|
@@ -106,3 +110,4 @@ module.exports.pathFromID=pathFromID;
|
|
|
module.exports.getArtist=getArtist;
|
|
|
module.exports.populate=populate;
|
|
|
|
|
|
+//populate("/storage/samba/Music");
|