mirrors/mStream
3
0
Fork 0
mirror of https://github.com/IrosTheBeggar/mStream.git synced 2025-10-27 07:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

All filepaths are now constructed using the node path library

Browse Source
This commit is contained in:
Paul Sori 2016-09-29 10:47:30 -04:00
parent 4d58a4bc66
commit db1b9e6096
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mstream.js
View File

@ -65,17 +65,18 @@ if(!fs.statSync( program.filepath ).isDirectory()){
var rootDir = fe.normalize(program.filepath);
// Normalize It
if(!path.isAbsolute(program.filepath) ){
if(!fe.isAbsolute(program.filepath) ){
rootDir = fe.join(process.cwd, rootDir);
}
console.log(rootDir);
var userinterface = program.userinterface;
// TODO: Check that this is a real dir
// Static files
mstream.use( express.static(__dirname + '/' + userinterface ));
mstream.use( express.static(fe.join(__dirname, userinterface) ));
mstream.use( '/' , express.static( rootDir ));
// Magic Middleware Things
@ -393,7 +394,7 @@ mstream.post('/dirparser', function (req, res) {
var tempDirArray = {};
var tempFileArray = {};
var filePath = path + files[i];
var filePath = fe.join(path, files[i]);
var stat = fs.statSync(filePath);
@ -421,12 +422,12 @@ mstream.post('/dirparser', function (req, res) {
var returnPath = slash( fe.relative(rootDir, path) );
if(returnPath.slice(-1) !== '/'){
returnPath += '/';
}
// Combine list of directories and mp3s
var finalArray = { path:path, contents:filesArray.concat(directories)};
var finalArray = { path:returnPath, contents:filesArray.concat(directories)};
// Send back some JSON
res.send(JSON.stringify(finalArray));