Browse Source

fix(nocodb): update filepath

pull/9722/head
Ramesh Mane 6 days ago
parent
commit
c7f68fd187
  1. 26
      packages/nocodb/src/services/attachments.service.ts

26
packages/nocodb/src/services/attachments.service.ts

@ -73,13 +73,13 @@ export class AttachmentsService {
: param.path || `${moment().format('YYYY/MM/DD')}/${hash(userId)}`; : param.path || `${moment().format('YYYY/MM/DD')}/${hash(userId)}`;
// TODO: add getAjvValidatorMw // TODO: add getAjvValidatorMw
const filePath = this.sanitizeUrlPath( const _filePath = this.sanitizeUrlPath(
param.path?.toString()?.split('/') || [''], param.path?.toString()?.split('/') || [''],
); );
const _destPath = path.join( const _destPath = path.join(
'nc', 'nc',
param.scope ? param.scope : 'uploads', param.scope ? param.scope : 'uploads',
...filePath, ..._filePath,
); );
const storageAdapter = await NcPluginMgrv2.storageAdapter(); const storageAdapter = await NcPluginMgrv2.storageAdapter();
@ -97,8 +97,15 @@ export class AttachmentsService {
queue.addAll( queue.addAll(
param.files?.map((file) => async () => { param.files?.map((file) => async () => {
try { try {
const nanoId = nanoid(5);
const filePath = this.sanitizeUrlPath([
...(param?.path?.toString()?.split('/') || ['']),
...(param.scope ? [nanoId] : []),
]);
const destPath = param.scope const destPath = param.scope
? path.join(_destPath, `${nanoid(5)}`) ? path.join(_destPath, `${nanoId}`)
: _destPath; : _destPath;
const originalName = utf8ify(file.originalname); const originalName = utf8ify(file.originalname);
@ -229,14 +236,14 @@ export class AttachmentsService {
? `${hash(userId)}` ? `${hash(userId)}`
: param.path || `${moment().format('YYYY/MM/DD')}/${hash(userId)}`; : param.path || `${moment().format('YYYY/MM/DD')}/${hash(userId)}`;
const filePath = this.sanitizeUrlPath( const _filePath = this.sanitizeUrlPath(
param?.path?.toString()?.split('/') || [''], param?.path?.toString()?.split('/') || [''],
); );
const _destPath = path.join( const _destPath = path.join(
'nc', 'nc',
param.scope ? param.scope : 'uploads', param.scope ? param.scope : 'uploads',
...filePath, ..._filePath,
); );
const storageAdapter = await NcPluginMgrv2.storageAdapter(); const storageAdapter = await NcPluginMgrv2.storageAdapter();
@ -256,8 +263,15 @@ export class AttachmentsService {
try { try {
const { url, fileName: _fileName } = urlMeta; const { url, fileName: _fileName } = urlMeta;
const nanoId = nanoid(5);
const filePath = this.sanitizeUrlPath([
...(param?.path?.toString()?.split('/') || ['']),
...(param.scope ? [nanoId] : []),
]);
const destPath = param.scope const destPath = param.scope
? path.join(_destPath, `${nanoid(5)}`) ? path.join(_destPath, `${nanoId}`)
: _destPath; : _destPath;
let mimeType, let mimeType,

Loading…
Cancel
Save