mirror of
https://github.com/hotomoe/hotomoe
synced 2024-12-02 08:48:11 +09:00
wip
This commit is contained in:
parent
adc3c16ef3
commit
a048939cf1
@ -34,6 +34,8 @@ export type IMetadata = {
|
|||||||
src?: string;
|
src?: string;
|
||||||
deletedAt?: Date;
|
deletedAt?: Date;
|
||||||
withoutChunks?: boolean;
|
withoutChunks?: boolean;
|
||||||
|
storage?: string;
|
||||||
|
storageProps?: any;
|
||||||
isSensitive?: boolean;
|
isSensitive?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -35,9 +35,11 @@ async function save(readable: stream.Readable, name: string, type: string, hash:
|
|||||||
await minio.putObject(config.drive.bucket, obj, readable);
|
await minio.putObject(config.drive.bucket, obj, readable);
|
||||||
|
|
||||||
Object.assign(metadata, {
|
Object.assign(metadata, {
|
||||||
storage: 'object-storage',
|
|
||||||
withoutChunks: true,
|
withoutChunks: true,
|
||||||
obj: id,
|
storage: 'object-storage',
|
||||||
|
storageProps: {
|
||||||
|
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: `${ config.drive.config.secure ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? ':' + config.drive.config.port : '' }/${ config.drive.bucket }/${ obj }`
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1,7 +1,16 @@
|
|||||||
|
import * as Minio from 'minio';
|
||||||
import DriveFile, { DriveFileChunk, IDriveFile } from '../../models/drive-file';
|
import DriveFile, { DriveFileChunk, IDriveFile } from '../../models/drive-file';
|
||||||
import DriveFileThumbnail, { DriveFileThumbnailChunk } from '../../models/drive-file-thumbnail';
|
import DriveFileThumbnail, { DriveFileThumbnailChunk } from '../../models/drive-file-thumbnail';
|
||||||
|
import config from '../../config';
|
||||||
|
|
||||||
export default async function(file: IDriveFile, isExpired = false) {
|
export default async function(file: IDriveFile, isExpired = false) {
|
||||||
|
if (file.metadata.withoutChunks) {
|
||||||
|
if (file.metadata.storage == 'object-storage') {
|
||||||
|
const minio = new Minio.Client(config.drive.config);
|
||||||
|
const obj = `${config.drive.prefix}/${file.metadata.storageProps.id}`;
|
||||||
|
await minio.removeObject(config.drive.bucket, obj);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
// チャンクをすべて削除
|
// チャンクをすべて削除
|
||||||
await DriveFileChunk.remove({
|
await DriveFileChunk.remove({
|
||||||
files_id: file._id
|
files_id: file._id
|
||||||
@ -28,3 +37,4 @@ export default async function(file: IDriveFile, isExpired = false) {
|
|||||||
}
|
}
|
||||||
//#endregion
|
//#endregion
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user