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

Playing and downloading m3u playlists - review fixes

Browse Source
This commit is contained in:
Łukasz Woźniak 2019-10-28 20:34:44 +01:00
parent e252bbee14
commit 0168947ff3
2 changed files with 33 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
modules/file-explorer.js
View File

@ -4,14 +4,15 @@ const fe = require("path");
const archiver = require('archiver');
const winston = require('winston');
const mkdirp = require('make-dir');
const m3uread = require('m3u8-reader')
const m3uread = require('m3u8-reader');
const path = require('path');
const masterFileTypesArray = ["mp3", "flac", "wav", "ogg", "aac", "m4a", "opus", "m3u"];
exports.setup = function(mstream, program) {
function getPathInfoOrThrow(req, path) {
const pathInfo = program.getVPathInfo(path);
function getPathInfoOrThrow(req, pathString) {
const pathInfo = program.getVPathInfo(pathString);
if (pathInfo == false) {
throw {code: 500, json: { error: "Could not find file" }};
}
@ -21,43 +22,26 @@ exports.setup = function(mstream, program) {
return pathInfo;
}
function getPathArray(path) {
return path.split("/").filter(Boolean)
function getPathArray(pathString) {
return pathString.split(path.sep).filter(Boolean);
}
function getParentDirPath(path) {
return getPathArray(path).slice(0, -1).join("/");
function getFileType(pathString) {
return path.extname(pathString).substr(1);
}
function readPlaylistSongs(path) {
return m3uread(fs.readFileSync(path))
function readPlaylistSongs(pathString) {
return m3uread(fs.readFileSync(pathString))
.filter(function (item) { return typeof item === "string" })
.map(function (item) { return item.replace(/\\/g, "/") }) // m3u path separated by \
.map(function (item) { return item.replace(/\\/g, path.sep) }) // m3u path separated by \
}
function getFileName(path) {
return getPathArray(path).pop()
}
function joinPaths(path1, path2) {
return getPathArray(path1).concat(getPathArray(path2)).join("/")
}
function handleError(error, res, next) {
function handleError(error, res) {
if (error.code && error.json) {
res.status(error.code).json(error.json);
} else {
next(error);
}
}
function setArchiverErrorHandler(archive, res) {
archive.on('error', function (err) {
winston.error(`Download Error: ${err.message}`);
res.status(500).json({ error: err.message });
});
}
mstream.post('/download-directory', (req, res) => {
if (!req.body.directory) {
return res.status(500).json({ error: 'Missing Params' });
@ -83,7 +67,10 @@ exports.setup = function(mstream, program) {
}
const archive = archiver('zip');
setArchiverErrorHandler(archive, res);
archive.on('error', function (err) {
winston.error(`Download Error: ${err.message}`);
res.status(500).json({ error: err.message });
});
// sets the archive name. TODO: Rename this
res.attachment('zipped-playlist.zip');
@ -97,20 +84,23 @@ exports.setup = function(mstream, program) {
mstream.post('/fileplaylist/download', (req, res, next) => {
try {
const playlistPathInfo = getPathInfoOrThrow(req, req.body.path);
const playlistParentDir = getParentDirPath(req.body.path);
const playlistParentDir = path.dirname(req.body.path);
const songs = readPlaylistSongs(playlistPathInfo.fullPath);
const archive = archiver('zip');
setArchiverErrorHandler(archive, res);
res.attachment(getFileName(req.body.path) + ".zip");
archive.on('error', function (err) {
winston.error(`Download Error: ${err.message}`);
res.status(500).json({ error: err.message });
});
res.attachment(path.basename(req.body.path) + ".zip");
archive.pipe(res);
for (let song of songs) {
const songPath = joinPaths(playlistParentDir, song);
const songPath = path.join(playlistParentDir, song);
const songPathInfo = getPathInfoOrThrow(req, songPath);
archive.file(songPathInfo.fullPath, { name: getFileName(song) })
archive.file(songPathInfo.fullPath, { name: path.basename(song) })
}
archive.finalize();
} catch (error) {
handleError(error, res, next);
handleError(error, res);
}
});
@ -153,26 +143,26 @@ exports.setup = function(mstream, program) {
mstream.post("/fileplaylist/load", function(req, res, next) {
try {
const playlistPathInfo = getPathInfoOrThrow(req, req.body.path);
const playlistParentDir = getParentDirPath(req.body.path);
const playlistParentDir = path.dirname(req.body.path);
const songs = readPlaylistSongs(playlistPathInfo.fullPath);
res.json({
contents: songs.map(function (song) {
return {type: getFileType(song), name: getFileName(song), path: joinPaths(playlistParentDir, song)}
return {type: getFileType(song), name: path.basename(song), path: path.join(playlistParentDir, song)}
})
})
} catch (error) {
handleError(error, res, next);
handleError(error, res);
}
})
mstream.post("/fileplaylist/loadpaths", function(req, res, next) {
try {
const playlistPathInfo = getPathInfoOrThrow(req, req.body.path);
const playlistParentDir = getParentDirPath(req.body.path);
const playlistParentDir = path.dirname(req.body.path);
const songs = readPlaylistSongs(playlistPathInfo.fullPath);
res.json(songs.map(function (song) { return joinPaths(playlistParentDir, song); }));
res.json(songs.map(function (song) { return path.join(playlistParentDir, song); }));
} catch (error) {
handleError(error, res, next);
handleError(error, res);
}
})
@ -322,8 +312,4 @@ exports.setup = function(mstream, program) {
res.json(recursiveTrot(pathInfo.fullPath, [], pathInfo.relativePath));
});
function getFileType(filename) {
return filename.split(".").pop();
}
};

16
public/js/mstream.js
View File

@ -425,18 +425,6 @@ $(document).ready(function () {
senddir(null, fileExplorerArray);
}
function createNewFileExplorerArray(nextDir) {
return fileExplorerArray.concat(nextDir);
// old impl, todo: ask Paul if we can use modern js in webapp.
// var newArray = [];
// for (var i = 0; i < fileExplorerArray.length; i++) {
// newArray.push(fileExplorerArray[i]);
// }
// newArray.push(nextDir);
// return newArray;
}
function setScrollPosition(scrollPosition) {
if (scrollPosition === false) {
var sp = $('#filelist').scrollTop();
@ -453,13 +441,13 @@ $(document).ready(function () {
// when you click on a directory, go to that directory
$("#filelist").on('click', 'div.dirz', function () {
var newArray = createNewFileExplorerArray($(this).data("directory"));
var newArray = fileExplorerArray.concat($(this).data("directory"));
senddir(false, newArray);
});
// when you click on a playlist, go to that playlist
$("#filelist").on('click', 'div.fileplaylistz', function () {
var newArray = createNewFileExplorerArray($(this).data("directory"));
var newArray = fileExplorerArray.concat($(this).data("directory"));
var directoryString = getFileExplorerPath(newArray);
$('.directoryName').html('/' + directoryString);