Skip to content
Snippets Groups Projects
Commit 5910f6b2 authored by Audrey Hamelers's avatar Audrey Hamelers
Browse files

Merge branch 'dev' into 'master'

recursive file download from FTP - removed filtering of directories which are 'dated folders'

See merge request !395
parents c3185f35 6be49cda
No related branches found
No related tags found
1 merge request!395recursive file download from FTP - removed filtering of directories which are 'dated folders'
...@@ -9,12 +9,12 @@ const { checkJobStatus, uncaughtError } = require('../job-runner') ...@@ -9,12 +9,12 @@ const { checkJobStatus, uncaughtError } = require('../job-runner')
const { FtpAccountManager } = require('../xpub-model') const { FtpAccountManager } = require('../xpub-model')
const path = require('path') const path = require('path')
/* if (!process.env.ENABLE_CRONJOB_FROMFTPBULKUPLOAD) { if (!process.env.ENABLE_CRONJOB_FROMFTPBULKUPLOAD) {
logger.info( logger.info(
'ENABLE_CRONJOB_FROMFTPBULKUPLOAD not defined. fromFtp-BulkUpload cronjob exits.', 'ENABLE_CRONJOB_FROMFTPBULKUPLOAD not defined. fromFtp-BulkUpload cronjob exits.',
) )
process.exit(0) process.exit(0)
} */ }
const BULK_UPLOAD_FILE_EXT = new RegExp(/\S+\.tar\.gz$/i) const BULK_UPLOAD_FILE_EXT = new RegExp(/\S+\.tar\.gz$/i)
...@@ -185,14 +185,11 @@ const readDirRecursive = (ftp, startDir) => { ...@@ -185,14 +185,11 @@ const readDirRecursive = (ftp, startDir) => {
reject(err) reject(err)
} }
// filter out directories which are 'dated folders' const filteredList = dirList.map(ele => ({
const datedRegex = new RegExp(/\d{4}-\d{2}-\d{2}$/i) objPath: `${dirName}/${ele.name}`,
const filteredList = dirList objType: ele.type,
.filter(ele => !(datedRegex.test(ele.name) && ele.type === 'd')) }))
.map(ele => ({
objPath: `${dirName}/${ele.name}`,
objType: ele.type,
}))
resolve(filteredList) resolve(filteredList)
}) })
}) })
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment