From e9371474ea836d3e70956e62ccc86923ba7ed209 Mon Sep 17 00:00:00 2001
From: Nikos Marinos <nmarinos@ebi.ac.uk>
Date: Mon, 18 Mar 2019 18:36:19 +0000
Subject: [PATCH] bug fixes on tagger import
---
server/utils/files.js | 5 ++++-
server/utils/unTar.js | 4 +---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server/utils/files.js b/server/utils/files.js
index 863d5b728..c9136971c 100644
--- a/server/utils/files.js
+++ b/server/utils/files.js
@@ -14,11 +14,14 @@ module.exports.getManifestFilename = function getManifestFilename(tmpPath) {
return new Promise((resolve, reject) => {
fs.readdir(tmpPath, (err, items) => {
if (err) reject(err)
+ let manifestExists = false
for (let i = 0; i < items.length; i += 1) {
if (items[i].indexOf('manifest') > -1) {
resolve(items[i])
- } else reject(new Error('There is no manifest file.'))
+ manifestExists = true
+ }
}
+ if (!manifestExists) reject(new Error('There is no manifest file.'))
})
})
}
diff --git a/server/utils/unTar.js b/server/utils/unTar.js
index f8ef670c9..404280fc1 100644
--- a/server/utils/unTar.js
+++ b/server/utils/unTar.js
@@ -15,9 +15,7 @@ module.exports.untar = function untar(source, dest) {
}
fs.readdir(dest, (err, items) => {
if (err) reject(err)
- // resolve(`${dest}/${items[0]}`)
- // this works in beta:
- resolve(`${dest}`)
+ resolve(`${dest}/${items[0]}`)
})
},
)
--
GitLab