all controllers now use this.createMulter()

master
rob 2 years ago
parent 9e40eeb0b5
commit 7e1a2d9561

@ -5,9 +5,8 @@
'use strict'; 'use strict';
const express = require('express'); const express = require('express');
const multer = require('multer');
const { /*SiteError,*/ SiteController } = require('../../../lib/site-lib'); const { SiteController } = require('../../../lib/site-lib');
class ContentReportController extends SiteController { class ContentReportController extends SiteController {
@ -16,7 +15,7 @@ class ContentReportController extends SiteController {
} }
async start ( ) { async start ( ) {
const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/upload` }); const upload = this.createMulter();
const router = express.Router(); const router = express.Router();
router.use(async (req, res, next) => { router.use(async (req, res, next) => {

@ -16,8 +16,6 @@ class CoreNodeController extends SiteController {
} }
async start ( ) { async start ( ) {
// const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/upload` });
const router = express.Router(); const router = express.Router();
router.use(async (req, res, next) => { router.use(async (req, res, next) => {
res.locals.currentView = 'admin'; res.locals.currentView = 'admin';

@ -16,8 +16,6 @@ class CoreUserController extends SiteController {
} }
async start ( ) { async start ( ) {
// const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/upload` });
const router = express.Router(); const router = express.Router();
router.use(async (req, res, next) => { router.use(async (req, res, next) => {
res.locals.currentView = 'admin'; res.locals.currentView = 'admin';

@ -25,7 +25,8 @@ class AuthController extends SiteController {
coreNode: coreNodeService, coreNode: coreNodeService,
limiter: limiterService, limiter: limiterService,
} = this.dtp.services; } = this.dtp.services;
const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${this.component.slug}` });
const upload = this.createMulter();
const router = express.Router(); const router = express.Router();
this.dtp.app.use('/auth', router); this.dtp.app.use('/auth', router);

@ -23,7 +23,7 @@ class ChatController extends SiteController {
session: sessionService, session: sessionService,
} = this.dtp.services; } = this.dtp.services;
const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${this.component.slug}` }); const upload = this.createMulter();
const router = express.Router(); const router = express.Router();
this.dtp.app.use('/chat', router); this.dtp.app.use('/chat', router);

@ -26,8 +26,7 @@ class ImageController extends SiteController {
const router = express.Router(); const router = express.Router();
dtp.app.use('/image', router); dtp.app.use('/image', router);
const imageUpload = multer({ const imageUpload = this.createMulter('uploads', {
dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${this.component.slug}`,
limits: { limits: {
fileSize: 1024 * 1000 * 12, fileSize: 1024 * 1000 * 12,
}, },

@ -19,7 +19,7 @@ class NewsletterController extends SiteController {
const { dtp } = this; const { dtp } = this;
const { limiter: limiterService } = dtp.services; const { limiter: limiterService } = dtp.services;
const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${module.exports.slug}` }); const upload = this.createMulter();
const router = express.Router(); const router = express.Router();
dtp.app.use('/newsletter', router); dtp.app.use('/newsletter', router);

@ -24,7 +24,8 @@ class UserController extends SiteController {
session: sessionService, session: sessionService,
} = dtp.services; } = dtp.services;
const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${this.component.slug}` }); const upload = this.createMulter();
const router = express.Router(); const router = express.Router();
dtp.app.use('/user', router); dtp.app.use('/user', router);

@ -36,9 +36,14 @@ class SiteController extends SiteCommon {
return pagination; return pagination;
} }
createMulter (slug) { createMulter (slug, options) {
slug = slug || 'uploads'; slug = slug || 'uploads';
return multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/${slug}/${this.component.slug}` });
options = Object.assign({
dest: `/tmp/${this.dtp.config.site.domainKey}/${slug}/${this.component.slug}`
}, options || { });
return multer(options);
} }
createDisplayList (name) { createDisplayList (name) {

Loading…
Cancel
Save