Mirror/filesafe
1
0
Fork 0
mirror of https://github.com/BobbyWibowo/lolisafe.git synced 2025-01-19 09:41:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated uploadController.js

Browse Source
This commit is contained in:
Bobby Wibowo 2018-05-13 02:16:04 +07:00
parent c4eed6e478
commit 0cf8ff58d0
No known key found for this signature in database
GPG Key ID: 51C3A1E1E22D26CF
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
controllers/uploadController.js
View File

@ -180,10 +180,9 @@ uploadsController.actuallyUpload = async (req, res, user, albumid) => {
const result = await uploadsController.formatInfoMap(req, res, user, infoMap) const result = await uploadsController.formatInfoMap(req, res, user, infoMap)
.catch(erred) .catch(erred)
if (!result) { return }
if (result) { uploadsController.processFilesForDisplay(req, res, result.files, result.existingFiles)
return uploadsController.processFilesForDisplay(req, res, result.files, result.existingFiles)
}
}) })
} }
@ -213,6 +212,7 @@ uploadsController.actuallyUploadByUrl = async (req, res, user, albumid) => {
const head = await snekfetch.head(url) const head = await snekfetch.head(url)
.catch(erred) .catch(erred)
if (!head) { return }
const size = parseInt(head.headers['content-length']) const size = parseInt(head.headers['content-length'])
if (isNaN(size)) { if (isNaN(size)) {
@ -224,6 +224,7 @@ uploadsController.actuallyUploadByUrl = async (req, res, user, albumid) => {
const download = await snekfetch.get(url) const download = await snekfetch.get(url)
.catch(erred) .catch(erred)
if (!download) { return }
const length = uploadsController.getFileNameLength(req) const length = uploadsController.getFileNameLength(req)
const name = await uploadsController.getUniqueRandomName(length, extension) const name = await uploadsController.getUniqueRandomName(length, extension)
@ -251,10 +252,9 @@ uploadsController.actuallyUploadByUrl = async (req, res, user, albumid) => {
if (iteration === urls.length) { if (iteration === urls.length) {
const result = await uploadsController.formatInfoMap(req, res, user, infoMap) const result = await uploadsController.formatInfoMap(req, res, user, infoMap)
.catch(erred) .catch(erred)
if (!result) { return }
if (result) { uploadsController.processFilesForDisplay(req, res, result.files, result.existingFiles)
return uploadsController.processFilesForDisplay(req, res, result.files, result.existingFiles)
}
} }
}) })
} }
@ -299,20 +299,21 @@ uploadsController.actuallyFinishChunks = async (req, res, user, albumid) => {
const files = req.body.files const files = req.body.files
if (!files || !(files instanceof Array)) { return erred('Missing "files" property (Array).') } if (!files || !(files instanceof Array)) { return erred('Missing "files" property (Array).') }
if (!files.length) { return erred('"files" property can not be empty.') }
let iteration = 0 let iteration = 0
const infoMap = [] const infoMap = []
for (const file of files) { for (const file of files) {
const { uuid, original, count } = file if (!file.uuid || typeof file.uuid !== 'string') { return erred('Missing or empty "uuid" property (string).') }
if (!uuid || typeof uuid !== 'string') { return erred('Missing "uuid" property (string).') } if (typeof file.count !== 'number') { return erred('Missing "count" property (number).') }
if (!count || typeof count !== 'number') { return erred('Missing "count" property (number).') } if (file.count < 1) { return erred('"count" property can not be less than 1.') }
const uuidDir = path.join(chunksDir, uuid) const uuidDir = path.join(chunksDir, file.uuid)
fs.readdir(uuidDir, async (error, chunkNames) => { fs.readdir(uuidDir, async (error, chunkNames) => {
if (error) { return erred(error) } if (error) { return erred(error) }
if (count < chunkNames.length) { return erred('Chunks count mismatch.') } if (file.count < chunkNames.length) { return erred('Chunks count mismatch.') }
const extension = typeof original === 'string' ? path.extname(original) : '' const extension = typeof file.original === 'string' ? path.extname(file.original) : ''
if (uploadsController.isExtensionFiltered(extension)) { if (uploadsController.isExtensionFiltered(extension)) {
return erred(`${extension.substr(1).toUpperCase()} files are not permitted for security reasons.`) return erred(`${extension.substr(1).toUpperCase()} files are not permitted for security reasons.`)
} }
@ -330,6 +331,7 @@ uploadsController.actuallyFinishChunks = async (req, res, user, albumid) => {
// Get total chunks size // Get total chunks size
const chunksTotalSize = await uploadsController.getTotalSize(uuidDir, chunkNames) const chunksTotalSize = await uploadsController.getTotalSize(uuidDir, chunkNames)
.catch(erred) .catch(erred)
if (typeof chunksTotalSize !== 'number') { return }
if (chunksTotalSize > maxSizeBytes) { if (chunksTotalSize > maxSizeBytes) {
// Delete all chunks and remove chunks dir // Delete all chunks and remove chunks dir
const chunksCleaned = await uploadsController.cleanUpChunks(uuidDir, chunkNames) const chunksCleaned = await uploadsController.cleanUpChunks(uuidDir, chunkNames)
@ -368,10 +370,9 @@ uploadsController.actuallyFinishChunks = async (req, res, user, albumid) => {
if (iteration === files.length) { if (iteration === files.length) {
const result = await uploadsController.formatInfoMap(req, res, user, infoMap) const result = await uploadsController.formatInfoMap(req, res, user, infoMap)
.catch(erred) .catch(erred)
if (!result) { return }
if (result) { uploadsController.processFilesForDisplay(req, res, result.files, result.existingFiles)
return uploadsController.processFilesForDisplay(req, res, result.files, result.existingFiles)
}
} }
}) })
} }