Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-27 20:58:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

removed createInterceptDownload file and use existing code for http download

Browse source
This commit is contained in:
Martin Filser 2022-04-05 16:31:53 +02:00
parent 72b8672e62
commit cfb88baa7f
3 changed files with 49 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

24
models/lib/fileStoreStrategy.js
View file

@ -1,6 +1,6 @@
import fs from 'fs';
import { createObjectId } from './grid/createObjectId';
import { createInterceptDownload } from './fsHooks/createInterceptDownload';
import { httpStreamOutput } from './httpStream.js'
export const STORAGE_NAME_FILESYSTEM = "fs";
export const STORAGE_NAME_GRIDFS = "gridfs";
@ -125,7 +125,15 @@ export class FileStoreStrategyGridFs extends FileStoreStrategy {
* @param http the current http request
*/
interceptDownload(http) {
const ret = createInterceptDownload(this.filesCollection, this.gridFsBucket, this.fileObj, http, this.versionName);
const readStream = this.getReadStream();
const downloadFlag = http?.params?.query?.download;
let ret = false;
if (readStream) {
ret = true;
httpStreamOutput(readStream, this.fileObj.name, http, downloadFlag, this.filesCollection.cacheControl);
}
return ret;
}
@ -195,15 +203,23 @@ export class FileStoreStrategyGridFs extends FileStoreStrategy {
* @return the GridFS Object-Id
*/
getGridFsObjectId() {
const gridFsFileId = (this.fileObj.versions[this.versionName].meta || {})
.gridFsFileId;
let ret;
const gridFsFileId = this.getGridFsFileId();
if (gridFsFileId) {
ret = createObjectId({ gridFsFileId });
}
return ret;
}
/** returns the GridFS Object-Id
* @return the GridFS Object-Id
*/
getGridFsFileId() {
const ret = (this.fileObj.versions[this.versionName].meta || {})
.gridFsFileId;
return ret;
}
/** returns the property name of gridFsFileId
* @return the property name of gridFsFileId
*/