Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for playlist files in MPD plugin #1722 #1723

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add support for playlist files in MPD plugin #1722 #1723

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfdb702
Add support for playlist files #1722
Feb 23, 2019
6a06531
Merge branch 'master' into m3u-playlist-files
Sep 28, 2019
9e0bc05
Merge branch 'master' into m3u-playlist-files
Jan 11, 2020
86de2d6
Refactor and adjust spacing to make regressions easier to spot #1722
Jan 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 94 additions & 98 deletions app/plugins/music_service/mpd/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2366,36 +2366,19 @@ ControllerMpd.prototype.explodeUri = function(uri) {

var uriPath='/mnt/'+self.sanitizeUri(uri);
//self.commandRouter.logger.info('----------------------------'+uriPath);
var uris=self.scanFolder(uriPath);
var response=[];

libQ.all(uris)
// Try to scan path for songs first;
// if that fails, the path might address a playlist file
return self.scanFolder(uriPath)
.then(function(result)
{
for(var j in result)
{

//self.commandRouter.logger.info("----->>>>> "+JSON.stringify(result[j]));

if(result!==undefined && result[j].uri!==undefined) {
response.push({
uri: self.fromPathToUri(result[j].uri),
service: 'mpd',
name: result[j].name,
artist: result[j].artist,
album: result[j].album,
type: 'track',
tracknumber: result[j].tracknumber,
albumart: result[j].albumart,
duration: result[j].duration,
samplerate: result[j].samplerate,
bitdepth: result[j].bitdepth,
trackType: result[j].trackType
});
}
//self.commandRouter.logger.info("----->>>>> "+JSON.stringify(result));

if (result.length) {
return result;
}
defer.resolve(response);

return self.explodePlaylistFile(uriPath);
}).fail(function(err)
{
self.commandRouter.logger.info("explodeURI: ERROR "+err);
Expand Down Expand Up @@ -2537,33 +2520,28 @@ ControllerMpd.prototype.fromPathToUri = function (uri) {
ControllerMpd.prototype.scanFolder=function(uri)
{
var self=this;
var uris=[];
var isofile = false;
var isofile = uri.toLowerCase().endsWith('.iso');

if ((uri.indexOf(".iso") >= 0) || (uri.indexOf(".ISO") >= 0)){
var uri2 = uri.substr(0, uri.lastIndexOf("/"));
if ((uri2.indexOf(".iso") >= 0) || (uri2.indexOf(".ISO") >= 0)){
} else {
isofile = true
}
} else {
try {
var stat = libFsExtra.statSync(uri);
} catch (err) {
console.log("scanFolder - failure to stat '" + uri + "'");
return uris;
}
try {
var stat = libFsExtra.statSync(uri);
} catch (err) {
console.log('scanFolder - failure to stat "' + uri + '" - ' + err.toString());
return libQ.resolve([]);
}

if( ((uri.indexOf(".iso") < 0) && (uri.indexOf(".ISO") < 0)) && (stat != undefined && stat.isDirectory()) )
{
if (stat && stat.isDirectory()) {
try {
var files=libFsExtra.readdirSync(uri);
for(var i in files) {
uris=uris.concat(self.scanFolder(uri+'/'+files[i]));
}
var promises = files.map(function (file) {
return self.scanFolder(uri + '/' + file);
});
return libQ.all(promises).then(function (results) {
// results is an array of arrays, which need to be concatenated into a single array
return [].concat.apply([], results);
});
} catch(e) {
console.log("Failed to stat '" + uri + "'");
console.log('scanFolder - failure to readdir "' + uri + '" - ' + e.toString());
return libQ.resolve([]);
}
}
else if (isofile){
Expand Down Expand Up @@ -2592,15 +2570,21 @@ ControllerMpd.prototype.scanFolder=function(uri)

self.mpdReady.then(function () {
self.clientMpd.sendCommand(cmd(command, []), function (err, msg) {
var list = [];
if (msg) {
// The file may be a single song, or a container with multiple songs
defer.resolve(self.parseMpdCommandResponse(msg));
});
});

return defer.promise;

var s0 = sections[0] + '/';
var path;
var name;
var lines = msg.split('\n');
var isSolved=false;
}
};

ControllerMpd.prototype.parseMpdCommandResponse = function(msg) {
var self = this;

var list = [];
var lines = (msg || '').split('\n');

for (var i = 0; i < lines.length; i++) {
var line = lines[i];
Expand All @@ -2611,60 +2595,48 @@ ControllerMpd.prototype.scanFolder=function(uri)

var artist = self.searchFor(lines, i + 1, 'Artist:');
var album = self.searchFor(lines, i + 1, 'Album:');
//Include track number if tracknumber variable is set to 'true'
if (!tracknumbers) {
var title = self.searchFor(lines, i + 1, 'Title:');
}
else {
var title1 = self.searchFor(lines, i + 1, 'Title:');
var track = self.searchFor(lines, i + 1, 'Track:');
if(track && title1) {
var title = track + " - " + title1;
} else {
var title = title1;
}
}
var time = parseInt(self.searchFor(lines, i + 1, 'Time:'));

if (title) {
title = title;
} else {
title = name;
var title = self.searchFor(lines, i + 1, 'Title:');
var track = self.searchFor(lines, i + 1, 'Track:') || 0;
var albumArtist = self.searchFor(lines, i + 1, 'AlbumArtist:');
var time = Math.round(parseFloat(self.searchFor(lines, i + 1, 'duration:')))
|| parseInt(self.searchFor(lines, i + 1, 'Time:'));
var year = parseInt(self.searchFor(lines, i + 1, 'Date:')) || '';

var itemUri = path.includes('://') ? path : ('music-library/' + path);

var albumart = self.getAlbumArt({
artist: albumArtist || artist,
album: album
}, self.getAlbumArtPathFromUri(itemUri));

// Include track number if tracknumbers variable is set to 'true'
if (tracknumbers && track && title) {
title = track + " - " + title;
}
self.commandRouter.logger.info("ALBUMART "+self.getAlbumArt({artist:artist,album: album},uri));
self.commandRouter.logger.info("URI "+uri);

defer.resolve({
uri: 'music-library/'+self.fromPathToUri(uri),
self.commandRouter.logger.info("ALBUMART "+albumart);
self.commandRouter.logger.info("URI "+itemUri);

list.push({
uri: itemUri,
service: 'mpd',
name: title,
artist: artist,
name: title || name,
artist: artist || albumArtist,
album: album,
type: 'track',
tracknumber: 0,
albumart: self.getAlbumArt({artist:artist,album: album},self.getAlbumArtPathFromUri(uri)),
tracknumber: track,
albumart: albumart,
duration: time,
trackType: uri.split('.').pop()
year: year,
samplerate: '',
bitdepth: '',
trackType: itemUri.split('.').pop(),
});

isSolved=true;
}
}

if(isSolved===false)
defer.resolve({});

}
else defer.resolve({});
});
});

return defer.promise;

}

return uris;
}
return list;
};

ControllerMpd.prototype.explodeISOFile = function (uri) {
var self = this;
Expand Down Expand Up @@ -2764,6 +2736,30 @@ ControllerMpd.prototype.explodeISOFile = function (uri) {
return defer.promise;
};

ControllerMpd.prototype.explodePlaylistFile = function (path) {
var self = this;

var defer = libQ.defer();
var sections = path.split('/');
var command = 'listplaylistinfo';

if (sections.length > 1) {
var folderToList = sections.slice(2).join('/');
var safeFolderToList = folderToList.replace(/"/g,'\\"');
command += ' "' + safeFolderToList + '"';
}

var cmd = libMpd.cmd;

self.mpdReady.then(function () {
self.clientMpd.sendCommand(cmd(command, []), function (err, msg) {
defer.resolve(self.parseMpdCommandResponse(msg));
});
});

return defer.promise;
};



//----------------------- new play system ----------------------------
Expand Down Expand Up @@ -4086,4 +4082,4 @@ ControllerMpd.prototype.getSpecialCardConfig = function(){
} else {
return null
}
}
}