Merge branch 'dev' into 'master'

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

See merge request !395

server/ftp-integration/fromFTP-BulkUpload.js

@@ -9,12 +9,12 @@ const { checkJobStatus, uncaughtError } = require('../job-runner')
 const { FtpAccountManager } = require('../xpub-model')
 const path = require('path')
 
-/* if (!process.env.ENABLE_CRONJOB_FROMFTPBULKUPLOAD) {
+if (!process.env.ENABLE_CRONJOB_FROMFTPBULKUPLOAD) {
   logger.info(
     'ENABLE_CRONJOB_FROMFTPBULKUPLOAD not defined. fromFtp-BulkUpload cronjob exits.',
   )
   process.exit(0)
-} */
+}
 
 const BULK_UPLOAD_FILE_EXT = new RegExp(/\S+\.tar\.gz$/i)
 
@@ -185,14 +185,11 @@ const readDirRecursive = (ftp, startDir) => {
             reject(err)
           }
 
-          // filter out directories which are 'dated folders'
-          const datedRegex = new RegExp(/\d{4}-\d{2}-\d{2}$/i)
-          const filteredList = dirList
-            .filter(ele => !(datedRegex.test(ele.name) && ele.type === 'd'))
-            .map(ele => ({
-              objPath: `${dirName}/${ele.name}`,
-              objType: ele.type,
-            }))
+          const filteredList = dirList.map(ele => ({
+            objPath: `${dirName}/${ele.name}`,
+            objType: ele.type,
+          }))
+
           resolve(filteredList)
         })
       })