From 29acab8443d380307864b4491463fb02e14dc0f5 Mon Sep 17 00:00:00 2001
From: Yogmatee Roochun <yroochun@ebi.ac.uk>
Date: Wed, 6 Mar 2019 15:50:59 +0000
Subject: [PATCH] dated folder
---
server/ftp-integration/taggedXML.js | 5 +++++
server/utils/files.js | 13 ++++++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/server/ftp-integration/taggedXML.js b/server/ftp-integration/taggedXML.js
index 832811b38..606513b18 100644
--- a/server/ftp-integration/taggedXML.js
+++ b/server/ftp-integration/taggedXML.js
@@ -9,9 +9,14 @@ const { execSync } = require('child_process')
const uuidv4 = require('uuid/v4')
const ftpTagger = config.get('ftp_tagger')
+
+const parentRootPath = '/home/yogmatee/projects/PLAY/chokidar/ftp_mock'
+
+/*
const parentRootPath = `${process.env.HOME}/${config.get('ftp_directory')}/${
ftpTagger.username
}`
+*/
const rootPath = `${parentRootPath}/Done`
diff --git a/server/utils/files.js b/server/utils/files.js
index 423ba413f..59b844d18 100644
--- a/server/utils/files.js
+++ b/server/utils/files.js
@@ -101,7 +101,18 @@ module.exports.uploadFileToMinio = uploadFileToMinio
module.exports.renameFile = function renameFile(path) {
return new Promise((resolve, reject) => {
- fs.rename(path, `${path}_${Date.now()}`, err => {
+ const datedFolder = dateFormat(new Date(), 'yyyy-mm-dd')
+ const dir_path = path.dirname(path)
+ const filename = path.basename(path)
+
+ if (!fs.existsSync(`${dir_path}/DONE/${datedFolder}`)) {
+ fs.mkdirSync(`${dir_path}/DONE${datedFolder}`)
+ }
+
+ const oldPath = path
+ const newPath = `${dir_path}/DONE/${datedFolder}/${filename}_${Date.now()}`
+
+ fs.rename(oldPath, newPath, err => {
if (err) reject(err)
})
resolve(path)
--
GitLab