added support for the generate names func

Author: JGAntunes

lib/index.js

@@ -4,6 +4,7 @@ const pkg = require('../package.json')
 const fs = require('fs')
 const Async = require('async')
 const Hoek = require('hoek')
+const Boom = require('boom')
 const Validation = require('./helpers/validation')
 const Uploader = require('./uploader')
 
@@ -15,6 +16,7 @@ function fileUploader (server, options, next) {
   const tags = routeOptions.tags
   const auth = routeOptions.auth || false
   const maxBytes = uploadOptions.maxBytes
+  const log = server.log
   // TODO best practice?
   uploadOptions.log = server.log
 
@@ -27,7 +29,10 @@ function fileUploader (server, options, next) {
   function errorValidation (cb) {
     let methods = {}
     if (uploadOptions.generateName && typeof uploadOptions.generateName !== 'function') {
-      return cb(new Error('Generate name must be a function'))
+      if (typeof uploadOptions.generateName !== 'function') {
+        return cb(new Error('Generate name must be a function'))
+      }
+      methods.generateName = uploadOptions.generateName
     }
     if (options.preUpload) {
       if (typeof options.preUpload !== 'function') {
@@ -59,7 +64,30 @@ function fileUploader (server, options, next) {
     const upload = Uploader(uploadOptions)
     const pre = []
     const uploadMethod = function (request, reply) {
-      return upload(request.payload, reply)
+      let options = {}
+      if (request.pre.fileNames) options.fileNames = request.pre.fileNames
+      return upload(request.payload, options, reply)
+    }
+    const fileNamesMethod = function (request, reply) {
+      let names = {}
+      Async.forEachOf(request.payload, (item, key, cb) => {
+        try {
+          names[key] = methods.generateName(item.hapi.filename, request)
+        } catch (e) {
+          return cb(e)
+        }
+        cb()
+      }, (err) => {
+        if (err) {
+          log(['error'], err)
+          return reply(Boom.internal())
+        }
+        reply(null, names)
+      })
+    }
+
+    if (methods.generateName) {
+      pre.push({method: fileNamesMethod, assign: 'fileNames'})
     }
     if (methods.pre) pre.push({method: methods.pre, assign: 'preUpload'})
     pre.push({method: uploadMethod, assign: 'file'})

lib/uploader.js

@@ -9,32 +9,32 @@ const fs = require('fs')
 
 function uploader (options) {
   const uploadPath = options.path
-  const fileName = options.name
   const log = options.log
 
   return upload
 
-  function upload (data, cb) {
+  function upload (data, options, cb) {
     const files = []
+    const fileNames = options.fileNames || {}
     Async.each(Object.keys(data), (prop, cbAsync) => {
       if (data.hasOwnProperty(prop)) files.push(prop)
       cbAsync()
     },
     (err) => {
       if (err) return cb(Boom.internal())
-      saveFiles(files, data, cb)
+      saveFiles(files, fileNames, data, cb)
     })
   }
 
-  function saveFiles (files, data, cb) {
+  function saveFiles (files, fileNames, data, cb) {
     if (!files) return cb(Boom.badData())
-    if (files.length === 1) return saveFile(data[files[0]], cb)
+    if (files.length === 1) return saveFile(data[files[0]], fileNames[files[0]], cb)
     Async.map(files, (file, cbAsync) => {
-      saveFile(data[file], cbAsync)
+      saveFile(data[file], fileNames[file], cbAsync)
     }, cb)
   }
 
-  function saveFile (data, cb) {
+  function saveFile (data, fileName, cb) {
     const mimeType = data.hapi.headers['content-type']
     const name = fileName || urlencode.decode(data.hapi.filename, 'utf8')
     const file = data
@@ -54,9 +54,10 @@ function uploader (options) {
           'Error while saving file, possible issue with path - ' +
           err
         ))
+      } else {
+        // Still not sure if throw is the best to go here
+        log(['error'], new Error('Error while saving file - ' + err))
       }
-      // Still not sure if throw is the best to go here
-      log(['error'], new Error('Error while saving file - ' + err))
       return cb(Boom.internal())
     })