fix: file missing callback (#51)

* fix: missing callback * refactor[file]: do not files on filename changes * fix: release template scripts when using externally
theeye-io-team · May 12, 2022 · aa6819b · aa6819b
1 parent be24099
commit aa6819b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git a/core/lib/file.js b/core/lib/file.js
@@ -4,15 +4,6 @@ const logger = require('./logger')('lib:file')
 const storage = require('./storage').get()
 const filenameRegexp = /^[A-Za-z0-9._][0-9a-zA-Z-_.]*$/
 
-function isValidFilename (filename) {
-  if (!filename) { return false }
-  return filenameRegexp.test(filename)
-}
-
-function keynamegen (filename) {
-  return filename + '[ts:' + Date.now() + ']'
-}
-
 module.exports = {
   /**
    *
@@ -35,10 +26,10 @@ module.exports = {
     }
 
     // filename has changed
-    if (input.model.filename !== filename) {
-      logger.log('new file uploaded. removing old one')
-      storage.remove(input.model)
-    }
+    //if (input.model.filename !== filename) {
+    //  logger.log('new file uploaded. removing old one')
+    //  storage.remove(input.model)
+    //}
 
     storage.save({
       filename: keyname,
@@ -163,3 +154,13 @@ module.exports = {
     })
   }
 }
+
+function isValidFilename (filename) {
+  if (!filename) { return false }
+  return filenameRegexp.test(filename)
+}
+
+function keynamegen (filename) {
+  return filename + '[ts:' + Date.now() + ']'
+}
+
diff --git a/core/lib/storage.js b/core/lib/storage.js
@@ -164,6 +164,8 @@ const LocalStorage = {
     return stream
   },
   remove (file, next) {
+    next || (next = (() => {}))
+
     const storagePath = systemConfig.file_upload_folder
     try {
       const filepath = path.join(storagePath, file.customer_name, 'scripts', file.keyname)

diff --git a/core/service/task.js b/core/service/task.js
@@ -1,7 +1,7 @@
 
 const App = require('../app')
 
-const ObjectId = require('mongoose').Types.ObjectId
+const ObjectID = require('mongoose').Types.ObjectId
 
 const isMongoId = require('validator/lib/isMongoId')
 const logger = require('../lib/logger')('service:task')
@@ -587,9 +587,13 @@ FactoryMethod[ TaskConstants.TYPE_SCRIPT ] = async function (input) {
   }
 
   // the script was created or determined in a previous phase.
-  // no further actions are required. skip this
-  if (!ObjectId.isValid(input.script_id)) {
-    let script
+  // ensure it is an ObjectID instance and not a MongoID
+  let script
+  if (input.script_id instanceof ObjectID) {
+    script = await App.Models.File.File.findById(input.script_id)
+  }
+
+  if (!script) {
     if (input.script_id) { // string
       script = await App.Models.File.File.findById(input.script_id)
     } else if (input.script?.id) { // file model
@@ -608,23 +612,25 @@ FactoryMethod[ TaskConstants.TYPE_SCRIPT ] = async function (input) {
         script = await App.file.create(attrs)
       }
     }
+  }
 
-    if (script?._id) {
+  if (script?._id) {
+    if (script.template_id) {
       if (
         !task.template_id ||
-        (task.template_id.toString() !== script.template_id.toString())
+        (task.template_id.toString() !== script.template_id?.toString())
       ) {
         // remove from the template
         script.template = null
         script.template_id = null
         await script.save()
       }
-      task.script_id = script._id
-      task.script = script._id
-    } else {
-      task.script_id = null
-      task.script = null
     }
+    task.script_id = script._id
+    task.script = script._id
+  } else {
+    task.script_id = null
+    task.script = null
   }
 
   return task