monkee.ch/monkeeShark
1
0
Fork 0
Code Pull requests Activity

Fix bug nado

Browse source
This commit is contained in:
syuilo 2018-07-25 08:01:12 +09:00
parent 9c4e0a4ae6
commit b3b82e7595
4 changed files with 55 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.config/example.yml
View file

@ -58,8 +58,7 @@ drive:
# OR # OR
# storage: 'object-storage' # storage: 'minio'
# service: 'minio'
# bucket: # bucket:
# prefix: # prefix:
# config: # config:

5
src/config/types.ts
View file

@ -51,9 +51,8 @@ export type Source = {
drive?: { drive?: {
storage: string; storage: string;
bucket: string; bucket?: string;
prefix: string; prefix?: string;
service?: string;
config?: any; config?: any;
}; };

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

@ -21,9 +21,7 @@ import config from '../../config';
const log = debug('misskey:drive:add-file'); const log = debug('misskey:drive:add-file');
async function save(readable: stream.Readable, name: string, type: string, hash: string, size: number, metadata: any): Promise<IDriveFile> { async function save(readable: stream.Readable, name: string, type: string, hash: string, size: number, metadata: any): Promise<IDriveFile> {
if (config.drive && config.drive.storage == 'object-storage') { if (config.drive && config.drive.storage == 'minio') {
if (config.drive.service == 'minio') {
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}`;
@ -31,7 +29,7 @@ async function save(readable: stream.Readable, name: string, type: string, hash:
Object.assign(metadata, { Object.assign(metadata, {
withoutChunks: true, withoutChunks: true,
storage: 'object-storage', storage: 'minio',
storageProps: { storageProps: {
id: id id: id
}, },
@ -48,9 +46,6 @@ async function save(readable: stream.Readable, name: string, type: string, hash:
}); });
return file; return file;
} else {
throw 'unknown storage type';
}
} else { } else {
// Get MongoDB GridFS bucket // Get MongoDB GridFS bucket
const bucket = await getDriveFileBucket(); const bucket = await getDriveFileBucket();

6
src/services/drive/delete-file.ts
View file

@ -4,13 +4,12 @@ import DriveFileThumbnail, { DriveFileThumbnailChunk } from '../../models/drive-
import config from '../../config'; 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 == 'minio') {
if (file.metadata.storage == 'object-storage') {
const minio = new Minio.Client(config.drive.config); const minio = new Minio.Client(config.drive.config);
const obj = `${config.drive.prefix}/${file.metadata.storageProps.id}`; const obj = `${config.drive.prefix}/${file.metadata.storageProps.id}`;
await minio.removeObject(config.drive.bucket, obj); await minio.removeObject(config.drive.bucket, obj);
} }
} else {
// チャンクをすべて削除 // チャンクをすべて削除
await DriveFileChunk.remove({ await DriveFileChunk.remove({
files_id: file._id files_id: file._id
@ -37,4 +36,3 @@ export default async function(file: IDriveFile, isExpired = false) {
} }
//#endregion //#endregion
} }
}