From 2efe901f8361cddbe2d134d0a4bb882ea1fd1955 Mon Sep 17 00:00:00 2001 From: MrFry Date: Mon, 23 Mar 2020 11:14:33 +0100 Subject: [PATCH] Added post file api --- modules/api/api.js | 53 ++++++++++++++++++++++-------------- modules/qmining/qmining-page | 2 +- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/modules/api/api.js b/modules/api/api.js index b9fe7c7..d1097d6 100644 --- a/modules/api/api.js +++ b/modules/api/api.js @@ -91,35 +91,48 @@ app.get('/', function (req, res) { res.redirect('https://www.youtube.com/watch?v=ieqGJgqiXFk') }) +app.post('/postfeedbackfile', function (req, res) { + UploadFile(req, res, uloadFiles, (fn) => { + res.json({ success: true }) + }) + + logger.LogReq(req) + logger.Log('New feedback file', logger.GetColor('bluebg'), true) +}) + app.post('/postfeedback', function (req, res) { logger.LogReq(req) logger.Log('New feedback message', logger.GetColor('bluebg'), true) - utils.AppendToFile('\n\n' + logger.GetDateString() + ': ' + req.body.message_field, msgFile) - res.redirect('back') - res.end() + utils.AppendToFile(logger.GetDateString() + ':\n' + JSON.stringify(req.body), msgFile) + res.json({ success: true }) }) function UploadFile (req, res, path, next) { - var fstream - req.pipe(req.busboy) - req.busboy.on('file', function (fieldname, file, filename) { - logger.Log('Uploading: ' + filename, logger.GetColor('blue')) + try { + var fstream + req.pipe(req.busboy) + req.busboy.on('file', function (fieldname, file, filename) { + logger.Log('Uploading: ' + filename, logger.GetColor('blue')) - utils.CreatePath(path, true) - let d = new Date() - let fn = d.getHours() + '' + d.getMinutes() + '' + d.getSeconds() + '_' + filename + utils.CreatePath(path, true) + let d = new Date() + let fn = d.getHours() + '' + d.getMinutes() + '' + d.getSeconds() + '_' + filename - fstream = fs.createWriteStream(path + '/' + fn) - file.pipe(fstream) - fstream.on('close', function () { - logger.Log('Upload Finished of ' + path + '/' + fn, logger.GetColor('blue')) - next(fn) + fstream = fs.createWriteStream(path + '/' + fn) + file.pipe(fstream) + fstream.on('close', function () { + logger.Log('Upload Finished of ' + path + '/' + fn, logger.GetColor('blue')) + next(fn) + }) + fstream.on('error', function (err) { + console.log(err) + res.end('something bad happened :s') + }) }) - fstream.on('error', function (err) { - console.log(err) - res.end('something bad happened :s') - }) - }) + } catch (e) { + logger.Log(`Unable to upload file!`, logger.GetColor('redbg')) + console.log(e) + } } app.route('/fosuploader').post(function (req, res, next) { diff --git a/modules/qmining/qmining-page b/modules/qmining/qmining-page index 5b58945..302741e 160000 --- a/modules/qmining/qmining-page +++ b/modules/qmining/qmining-page @@ -1 +1 @@ -Subproject commit 5b589450ab4321bd9c2b723bc9f7b221e988e11c +Subproject commit 302741ed69681b414a62def068f2ef69196e2c30