From 5e3f0c5d5930e231db93133bcc68dc1585e8ed88 Mon Sep 17 00:00:00 2001
From: Yogmatee Roochun <yroochun@ebi.ac.uk>
Date: Wed, 6 Mar 2019 16:18:00 +0000
Subject: [PATCH] fixed issue with dated folder
---
server/utils/files.js | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/server/utils/files.js b/server/utils/files.js
index 59b844d18..24f023411 100644
--- a/server/utils/files.js
+++ b/server/utils/files.js
@@ -5,6 +5,7 @@ const path = require('path')
const mime = require('mime-types')
const download = require('download')
const fetch = require('node-fetch')
+const dateFormat = require('dateformat')
const { minioClient } = require('express-middleware-minio')
@@ -99,23 +100,23 @@ module.exports.checkFiles = function checkFiles(files, tmpPath, user) {
module.exports.uploadFileToMinio = uploadFileToMinio
-module.exports.renameFile = function renameFile(path) {
+module.exports.renameFile = function renameFile(filepath) {
return new Promise((resolve, reject) => {
const datedFolder = dateFormat(new Date(), 'yyyy-mm-dd')
- const dir_path = path.dirname(path)
- const filename = path.basename(path)
+ const dir_path = path.dirname(filepath)
+ const filename = path.basename(filepath)
- if (!fs.existsSync(`${dir_path}/DONE/${datedFolder}`)) {
- fs.mkdirSync(`${dir_path}/DONE${datedFolder}`)
+ if (!fs.existsSync(`${dir_path}/${datedFolder}`)) {
+ fs.mkdirSync(`${dir_path}/${datedFolder}`)
}
- const oldPath = path
- const newPath = `${dir_path}/DONE/${datedFolder}/${filename}_${Date.now()}`
+ const oldPath = filepath
+ const newPath = `${dir_path}/${datedFolder}/${filename}_${Date.now()}`
fs.rename(oldPath, newPath, err => {
if (err) reject(err)
})
- resolve(path)
+ resolve(filepath)
})
}
--
GitLab