dobo 1.1.5 → 1.1.7

package/lib/add-fixtures.js

@@ -1,8 +1,9 @@
 import path from 'path'
 
 async function addFixture (name, { spinner } = {}) {
-  const { resolvePath, readConfig, eachPlugins } = this.app.bajo
-  const { isEmpty, isArray } = this.lib._
+  const { resolvePath, readConfig, eachPlugins, getPluginDataDir } = this.app.bajo
+  const { isEmpty, isArray, isString } = this.lib._
+  const { fs } = this.lib
   const { schema, connection } = this.getInfo(name)
   if (connection.proxy) {
     this.log.warn('proxiedConnBound%s', schema.name)
@@ -37,7 +38,19 @@ async function addFixture (name, { spinner } = {}) {
         }
         if (v === null) item[k] = undefined
       }
-      await this.recordCreate(schema.name, item, { force: true })
+      const resp = await this.recordCreate(schema.name, item, { force: true })
+      if (isArray(item._attachments) && item._attachments.length > 0) {
+        for (let att of item._attachments) {
+          if (isString(att)) att = { field: 'file', file: att }
+          const fname = path.basename(att.file)
+          if (fs.existsSync(att.file)) {
+            const dest = `${getPluginDataDir(schema.ns)}/${resp.id}/${att.field}/${fname}`
+            try {
+              fs.copySync(att.file, dest)
+            } catch (err) {}
+          }
+        }
+      }
       result.success++
       if (spinner) spinner.setText('recordsAdded%s%d%d', schema.name, result.success, items.length)
     } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Database ORM/ODM for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/waibuMpa/route/attachment/@model/@id/@field/@file.js

@@ -1,20 +1,24 @@
 import path from 'path'
 
 async function attachment (req, reply) {
-  const { isString } = this.lib._
+  const { isString, isEmpty } = this.lib._
   const { importPkg, getPluginDataDir, pascalCase } = this.app.bajo
   const { routePath } = this.app.waibu
   const mime = await importPkg('waibu:mime')
-  const { fs } = this.lib
-  const file = `${getPluginDataDir('dobo')}/attachment/${pascalCase(req.params.model)}/${req.params.id}/${req.params.field}/${req.params.file}`
-  const mimeType = mime.getType(path.extname(file))
+  const { fs, fastGlob } = this.lib
+  let file = `${getPluginDataDir('dobo')}/attachment/${pascalCase(req.params.model)}/${req.params.id}/${req.params.field}/${req.params.file}`
+  if (path.basename(file) === '_first') {
+    const files = await fastGlob(`${path.dirname(file)}/*`)
+    if (files.length > 0) file = files[0]
+  }
+  const mimeType = mime.getType(path.extname(file)) ?? ''
   if (!fs.existsSync(file)) {
     if (!req.query.notfound) throw this.error('_notFound', { noContent: true })
     const [, ext] = mimeType.split('/')
-    const replacer = isString(req.query.notfound) ? req.query.notfound : `waibuStatic.asset:/not-found.${ext}`
+    const replacer = isString(req.query.notfound) ? req.query.notfound : `waibuStatic.asset:/not-found.${ext ?? 'png'}`
     return reply.redirectTo(routePath(replacer))
   }
-  reply.header('Content-Type', mimeType)
+  if (!isEmpty(mimeType)) reply.header('Content-Type', mimeType)
   const stream = fs.createReadStream(file)
   reply.send(stream)
   return reply