OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-15 13:25:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add config.drive.baseUrl

Browse source
This commit is contained in:
mei23 2018-07-26 17:29:05 +09:00
parent e8783b15b1
commit 8ef38ebab1
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/config/types.ts
View file

@ -53,6 +53,7 @@ export type Source = {
storage: string; storage: string;
bucket?: string; bucket?: string;
prefix?: string; prefix?: string;
baseUrl?: string;
config?: any; config?: any;
}; };

4
src/services/drive/add-file.ts
View file

@ -25,6 +25,8 @@ async function save(readable: stream.Readable, name: string, type: string, hash:
const minio = new Minio.Client(config.drive.config); const minio = new Minio.Client(config.drive.config);
const id = uuid.v4(); const id = uuid.v4();
const obj = `${config.drive.prefix}/${id}`; const obj = `${config.drive.prefix}/${id}`;
const baseUrl = config.drive.baseUrl
|| `${ config.drive.config.secure ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? ':' + config.drive.config.port : '' }/${ config.drive.bucket }`;
await minio.putObject(config.drive.bucket, obj, readable, size, { 'Content-Type': type, 'Cache-Control': 'max-age=31536000, immutable' }); await minio.putObject(config.drive.bucket, obj, readable, size, { 'Content-Type': type, 'Cache-Control': 'max-age=31536000, immutable' });
Object.assign(metadata, { Object.assign(metadata, {
@ -33,7 +35,7 @@ async function save(readable: stream.Readable, name: string, type: string, hash:
storageProps: { storageProps: {
id: id id: id
}, },
url: `${ config.drive.config.secure ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? ':' + config.drive.config.port : '' }/${ config.drive.bucket }/${ obj }` url: `${ baseUrl }/${ obj }`
}); });
const file = await DriveFile.insert({ const file = await DriveFile.insert({