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

Add createFile middleware #130

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Add createFile middleware #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5656197
Add createFile middleware
RRK1000 Oct 11, 2019
3142aa0
Update Utils
RRK1000 Oct 20, 2019
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
87 changes: 43 additions & 44 deletions server/middleware/fileStorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,18 @@ var fileUpload = function (req, res, next) {
User.findOneAndUpdate({
_id: req.user_id
}, {
$push: { files: file._id }
}, { new: true }, function (err, user) {
if (err) {
return res.status(500).send({
success: false,
message: 'Error: Server error'
});
}
else {
console.log("File added to user " + user._id);
}
});
$push: { files: file._id }
}, { new: true }, function (err, user) {
if (err) {
return res.status(500).send({
success: false,
message: 'Error: Server error'
});
}
else {
console.log("File added to user " + user._id);
}
});
});
}
})
Expand All @@ -98,14 +98,14 @@ var downloadFile = function (dir) {
}
User.findOne({
_id: req.params.userID
}, function(err, user){
if(err){
}, function (err, user) {
if (err) {
return res.status(500).send({
success: false,
message: "Error: server error"
});
}
if(!user){
if (!user) {
return res.status(404).send({
success: false,
message: "Error: No such user found"
Expand All @@ -114,51 +114,51 @@ var downloadFile = function (dir) {
var usn = user.usn
var file = files[0];
var filePath = path.join(dir, file.originalname)
var fileName = usn+'_'+file.originalname;
var fileName = usn + '_' + file.originalname;
return res.download(filePath, fileName, function (err) {
if (err) {
return res.status(404).send({
success: false,
message: "Error: File not found."
});
return res.status(404).send({
success: false,
message: "Error: File not found."
});
}
});
});
})
});
}
}

var addFilesForZip = function(){
return function(req,res,next){
var addFilesForZip = function () {
return function (req, res, next) {
console.log("hello");
Assignment.findOne({
_id: req.params.assignmentID
}, function(err, assignment){
if(err){
}, function (err, assignment) {
if (err) {
return res.status(500).send({
success: false,
message: "Error: server error"
});
}
if(!assignment){
if (!assignment) {
return res.status(404).send({
success: false,
message: "Error: No such assignment found"
});
}
if(assignment.submissions.length>0){
if (assignment.submissions.length > 0) {
var files = [];
assignment.submissions.forEach(obj => {
User.findOne({
_id: obj.user
}, function(err, user){
if(err){
}, function (err, user) {
if (err) {
return res.status(500).send({
success: false,
message: "Error: server error"
});
}
if(!user){
if (!user) {
return res.status(404).send({
success: false,
message: "Error: No such user found"
Expand All @@ -167,22 +167,22 @@ var addFilesForZip = function(){
var usn = user.usn;
File.findOne({
_id: obj.file
}, function(err,file){
if(err){
}, function (err, file) {
if (err) {
return res.status(500).send({
success: false,
message: "Error: server error"
});
}
if(!file){
if (!file) {
return res.status(404).send({
success: false,
message: "Error: No such file found"
});
}
var filePath = path.join(dir, file.originalname);
var fileName = usn+'_'+file.originalname;
var fileObj = {'path': filePath, 'name':fileName};
var fileName = usn + '_' + file.originalname;
var fileObj = { 'path': filePath, 'name': fileName };
// fileObj['path'] = filePath;
// fileObj['name'] = fileName;
files.push(fileObj);
Expand All @@ -196,27 +196,26 @@ var addFilesForZip = function(){
}
}

var zipFile = function(){
return function(req,res){
var zipFile = function () {
return function (req, res) {
console.log(req)
var archive = archiver('zip');
archive.on('error',function(err) {
res.status(500).send({error: err.message});
archive.on('error', function (err) {
res.status(500).send({ error: err.message });
});
res.on('close', function() {
res.on('close', function () {
console.log('Archive wrote %d bytes', archive.pointer());
return res.status(200).send('OK').end();
});
var zipName = req.params.assignmentID+'.zip'
var zipName = req.params.assignmentID + '.zip'
res.attachment(zipName);
archive.pipe(res);
req.files.forEach(file => {
archive.append(fs.createReadStream(file.path), {name: file.name})
archive.append(fs.createReadStream(file.path), { name: file.name })
});
archive.finalize();
}
}

//TODO: Delete file endpoint

module.exports = { diskStorage, fileUpload, downloadFile, zipFile, addFilesForZip };
module.exports = { diskStorage, fileUpload, downloadFile, zipFile, addFilesForZip, createFile };
107 changes: 107 additions & 0 deletions server/utils/storage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
var fs = require('fs')
const User = require('../models/User')
const File = require('../models/Files')

var uploadText = function (filename, user_id, text) {
fs.writeFile(process.cwd() + '\\temp\\' + filename, text, function (err) {
if (err) {
throw new Error('Error Creating a file');
}
})
var size = fs.statSync(process.cwd() + '\\temp\\' + filename)['size'];
File.find(
{
user_id: user_id,
originalname: filename
},
function (err) {
if (err) {
throw new Error('Error: Server error')
} else {
var uploadFile = new File();

uploadFile.originalname = filename;
uploadFile.encoding = 'UTF-8';
uploadFile.mimetype = 'text/plain';
uploadFile.destination = process.cwd() + '\\temp\\' + filename;
uploadFile.size = size;
uploadFile.filename = filename;
uploadFile.user_id = user_id;

uploadFile.save(function (err, file) {
if (err) {
throw new Error('Error: Server error');
}
console.log(file._id + ' Added to DB.');
User.findOneAndUpdate(
{
_id: user_id
},
{
$push: { files: file._id }
},
{ new: true },
function (err, user) {
if (err) {
throw new Error('Error: Server error');
} else {
console.log('File added to user ' + user._id);
return file._id;
}
}
)
})
}
}
)
}

var uploadFile = function (file, user_id) {
File.find(
{
user_id: user_id,
originalname: file.originalname
},
function (err) {
if (err) {
throw new Error('Error: Server error')
} else {
var uploadFile = new File();

uploadFile.originalname = file.originalname;
uploadFile.encoding = file.encoding;
uploadFile.mimetype = file.mimetype;
uploadFile.destination = file.destination;
uploadFile.filename = file.filename;
uploadFile.size = file.size;
uploadFile.user_id = user_id;

uploadFile.save(function (err, file) {
if (err) {
throw new Error('Error: Server error');
}
console.log(file._id + ' Added to DB.');
User.findOneAndUpdate(
{
_id: user_id
},
{
$push: { files: file._id }
},
{ new: true },
function (err, user) {
if (err) {
throw new Error('Error: Server error');
} else {
console.log('File added to user ' + user._id);
return file._id;
}
}
)
})
}
}
)
}

module.exports = { uploadText, uploadFile }