Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-09-22 01:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Store file on filesystem renew's the storage path

Browse source
This commit is contained in:
Martin Filser 2022-04-08 08:52:48 +02:00
parent 9d587e76ab
commit a064e03fc7
3 changed files with 42 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
models/attachments.js
View file

@ -7,11 +7,13 @@ import { AttachmentStoreStrategyFilesystem, AttachmentStoreStrategyGridFs} from
import FileStoreStrategyFactory, {moveToStorage, STORAGE_NAME_FILESYSTEM, STORAGE_NAME_GRIDFS} from '/models/lib/fileStoreStrategy'; import FileStoreStrategyFactory, {moveToStorage, STORAGE_NAME_FILESYSTEM, STORAGE_NAME_GRIDFS} from '/models/lib/fileStoreStrategy';
let attachmentBucket; let attachmentBucket;
let storagePath;
if (Meteor.isServer) { if (Meteor.isServer) {
attachmentBucket = createBucket('attachments'); attachmentBucket = createBucket('attachments');
storagePath = path.join(process.env.WRITABLE_PATH, 'attachments');
} }
const fileStoreStrategyFactory = new FileStoreStrategyFactory(AttachmentStoreStrategyFilesystem, AttachmentStoreStrategyGridFs, attachmentBucket); const fileStoreStrategyFactory = new FileStoreStrategyFactory(AttachmentStoreStrategyFilesystem, storagePath, AttachmentStoreStrategyGridFs, attachmentBucket);
// XXX Enforce a schema for the Attachments FilesCollection // XXX Enforce a schema for the Attachments FilesCollection
// see: https://github.com/VeliovGroup/Meteor-Files/wiki/Schema // see: https://github.com/VeliovGroup/Meteor-Files/wiki/Schema
@ -28,7 +30,7 @@ Attachments = new FilesCollection({
return ret; return ret;
}, },
storagePath() { storagePath() {
const ret = path.join(process.env.WRITABLE_PATH, 'attachments'); const ret = fileStoreStrategyFactory.storagePath;
return ret; return ret;
}, },
onAfterUpload(fileObj) { onAfterUpload(fileObj) {
@ -88,7 +90,7 @@ if (Meteor.isServer) {
Meteor.startup(() => { Meteor.startup(() => {
Attachments.collection._ensureIndex({ 'meta.cardId': 1 }); Attachments.collection._ensureIndex({ 'meta.cardId': 1 });
const storagePath = Attachments.storagePath(); const storagePath = fileStoreStrategyFactory.storagePath;
if (!fs.existsSync(storagePath)) { if (!fs.existsSync(storagePath)) {
console.log("create storagePath because it doesn't exist: " + storagePath); console.log("create storagePath because it doesn't exist: " + storagePath);
fs.mkdirSync(storagePath, { recursive: true }); fs.mkdirSync(storagePath, { recursive: true });

8
models/avatars.js
View file

@ -6,18 +6,20 @@ import path from 'path';
import FileStoreStrategyFactory, { FileStoreStrategyFilesystem, FileStoreStrategyGridFs} from '/models/lib/fileStoreStrategy'; import FileStoreStrategyFactory, { FileStoreStrategyFilesystem, FileStoreStrategyGridFs} from '/models/lib/fileStoreStrategy';
let avatarsBucket; let avatarsBucket;
let storagePath;
if (Meteor.isServer) { if (Meteor.isServer) {
avatarsBucket = createBucket('avatars'); avatarsBucket = createBucket('avatars');
storagePath = path.join(process.env.WRITABLE_PATH, 'avatars');
} }
const fileStoreStrategyFactory = new FileStoreStrategyFactory(FileStoreStrategyFilesystem, FileStoreStrategyGridFs, avatarsBucket); const fileStoreStrategyFactory = new FileStoreStrategyFactory(FileStoreStrategyFilesystem, storagePath, FileStoreStrategyGridFs, avatarsBucket);
Avatars = new FilesCollection({ Avatars = new FilesCollection({
debug: false, // Change to `true` for debugging debug: false, // Change to `true` for debugging
collectionName: 'avatars', collectionName: 'avatars',
allowClientCode: true, allowClientCode: true,
storagePath() { storagePath() {
const ret = path.join(process.env.WRITABLE_PATH, 'avatars'); const ret = fileStoreStrategyFactory.storagePath;
return ret; return ret;
}, },
onBeforeUpload(file) { onBeforeUpload(file) {
@ -59,7 +61,7 @@ if (Meteor.isServer) {
}); });
Meteor.startup(() => { Meteor.startup(() => {
const storagePath = Avatars.storagePath(); const storagePath = fileStoreStrategyFactory.storagePath;
if (!fs.existsSync(storagePath)) { if (!fs.existsSync(storagePath)) {
console.log("create storagePath because it doesn't exist: " + storagePath); console.log("create storagePath because it doesn't exist: " + storagePath);
fs.mkdirSync(storagePath, { recursive: true }); fs.mkdirSync(storagePath, { recursive: true });

39
models/lib/fileStoreStrategy.js
View file

@ -1,4 +1,5 @@
import fs from 'fs'; import fs from 'fs';
import path from 'path';
import { createObjectId } from './grid/createObjectId'; import { createObjectId } from './grid/createObjectId';
import { httpStreamOutput } from './httpStream.js' import { httpStreamOutput } from './httpStream.js'
@ -10,11 +11,13 @@ export default class FileStoreStrategyFactory {
/** constructor /** constructor
* @param classFileStoreStrategyFilesystem use this strategy for filesystem storage * @param classFileStoreStrategyFilesystem use this strategy for filesystem storage
* @param storagePath file storage path
* @param classFileStoreStrategyGridFs use this strategy for GridFS storage * @param classFileStoreStrategyGridFs use this strategy for GridFS storage
* @param gridFsBucket use this GridFS Bucket as GridFS Storage * @param gridFsBucket use this GridFS Bucket as GridFS Storage
*/ */
constructor(classFileStoreStrategyFilesystem, classFileStoreStrategyGridFs, gridFsBucket) { constructor(classFileStoreStrategyFilesystem, storagePath, classFileStoreStrategyGridFs, gridFsBucket) {
this.classFileStoreStrategyFilesystem = classFileStoreStrategyFilesystem; this.classFileStoreStrategyFilesystem = classFileStoreStrategyFilesystem;
this.storagePath = storagePath;
this.classFileStoreStrategyGridFs = classFileStoreStrategyGridFs; this.classFileStoreStrategyGridFs = classFileStoreStrategyGridFs;
this.gridFsBucket = gridFsBucket; this.gridFsBucket = gridFsBucket;
} }
@ -83,9 +86,10 @@ class FileStoreStrategy {
} }
/** returns a write stream /** returns a write stream
* @param filePath if set, use this path
* @return the write stream * @return the write stream
*/ */
getWriteStream() { getWriteStream(filePath) {
} }
/** writing finished /** writing finished
@ -94,6 +98,18 @@ class FileStoreStrategy {
writeStreamFinished(finishedData) { writeStreamFinished(finishedData) {
} }
/** returns the new file path
* @param storagePath use this storage path
* @return the new file path
*/
getNewPath(storagePath, name) {
if (!_.isString(name)) {
name = this.fileObj.name;
}
const ret = path.join(storagePath, this.fileObj._id + "-" + this.versionName + "-" + name);
return ret;
}
/** remove the file */ /** remove the file */
unlink() { unlink() {
} }
@ -154,9 +170,10 @@ export class FileStoreStrategyGridFs extends FileStoreStrategy {
} }
/** returns a write stream /** returns a write stream
* @param filePath if set, use this path
* @return the write stream * @return the write stream
*/ */
getWriteStream() { getWriteStream(filePath) {
const fileObj = this.fileObj; const fileObj = this.fileObj;
const versionName = this.versionName; const versionName = this.versionName;
const metadata = { ...fileObj.meta, versionName, fileId: fileObj._id }; const metadata = { ...fileObj.meta, versionName, fileId: fileObj._id };
@ -247,10 +264,13 @@ export class FileStoreStrategyFilesystem extends FileStoreStrategy {
} }
/** returns a write stream /** returns a write stream
* @param filePath if set, use this path
* @return the write stream * @return the write stream
*/ */
getWriteStream() { getWriteStream(filePath) {
const filePath = this.fileObj.versions[this.versionName].path; if (!_.isString(filePath)) {
filePath = this.fileObj.versions[this.versionName].path;
}
const ret = fs.createWriteStream(filePath); const ret = fs.createWriteStream(filePath);
return ret; return ret;
} }
@ -287,7 +307,9 @@ export const moveToStorage = function(fileObj, storageDestination, fileStoreStra
if (strategyRead.constructor.name != strategyWrite.constructor.name) { if (strategyRead.constructor.name != strategyWrite.constructor.name) {
const readStream = strategyRead.getReadStream(); const readStream = strategyRead.getReadStream();
const writeStream = strategyWrite.getWriteStream();
const filePath = strategyWrite.getNewPath(fileStoreStrategyFactory.storagePath);
const writeStream = strategyWrite.getWriteStream(filePath);
writeStream.on('error', error => { writeStream.on('error', error => {
console.error('[writeStream error]: ', error, fileObjId); console.error('[writeStream error]: ', error, fileObjId);
@ -303,7 +325,10 @@ export const moveToStorage = function(fileObj, storageDestination, fileStoreStra
// https://forums.meteor.com/t/meteor-code-must-always-run-within-a-fiber-try-wrapping-callbacks-that-you-pass-to-non-meteor-libraries-with-meteor-bindenvironmen/40099/8 // https://forums.meteor.com/t/meteor-code-must-always-run-within-a-fiber-try-wrapping-callbacks-that-you-pass-to-non-meteor-libraries-with-meteor-bindenvironmen/40099/8
readStream.on('end', Meteor.bindEnvironment(() => { readStream.on('end', Meteor.bindEnvironment(() => {
Attachments.update({ _id: fileObj._id }, { $set: { [`versions.${versionName}.storage`]: strategyWrite.getStorageName() } }); Attachments.update({ _id: fileObj._id }, { $set: {
[`versions.${versionName}.storage`]: strategyWrite.getStorageName(),
[`versions.${versionName}.path`]: filePath,
} });
strategyRead.unlink(); strategyRead.unlink();
})); }));