etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2025-01-03 06:01:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge: Add file extension to locally-stored media (!832)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/832

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
dakkar 2024-12-31 10:44:22 +00:00
commit 565c987744
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
packages/backend/src/core/DriveService.ts
View file

@ -37,6 +37,7 @@ import { InternalStorageService } from '@/core/InternalStorageService.js';
import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { FileInfoService } from '@/core/FileInfoService.js';
import type { FileInfo } from '@/core/FileInfoService.js';
import { bindThis } from '@/decorators.js';
import { RoleService } from '@/core/RoleService.js';
import { correctFilename } from '@/misc/correct-filename.js';
@ -139,15 +140,18 @@ export class DriveService {
/***
* Save file
* @param file
* @param path Path for original
* @param name Name for original (should be extention corrected)
* @param type Content-Type for original
* @param hash Hash for original
* @param size Size for original
* @param info File metadata
*/
@bindThis
private async save(file: MiDriveFile, path: string, name: string, type: string, hash: string, size: number): Promise<MiDriveFile> {
// thunbnail, webpublic を必要なら生成
private async save(file: MiDriveFile, path: string, name: string, info: FileInfo): Promise<MiDriveFile> {
const type = info.type.mime;
const hash = info.md5;
const size = info.size;
// thunbnail, webpublic を必要なら生成
const alts = await this.generateAlts(path, type, !file.uri);
if (this.meta.useObjectStorage) {
@ -223,9 +227,11 @@ export class DriveService {
return await this.driveFilesRepository.insertOne(file);
} else { // use internal storage
const accessKey = randomUUID();
const thumbnailAccessKey = 'thumbnail-' + randomUUID();
const webpublicAccessKey = 'webpublic-' + randomUUID();
const ext = FILE_TYPE_BROWSERSAFE.includes(type) ? info.type.ext : null;
const accessKey = makeFileKey(ext);
const thumbnailAccessKey = makeFileKey(ext, 'thumbnail');
const webpublicAccessKey = makeFileKey(ext, 'webpublic');
// Ugly type is just to help TS figure out that 2nd / 3rd promises are optional.
const promises: [Promise<string>, ...(Promise<string> | undefined)[]] = [
@ -616,7 +622,7 @@ export class DriveService {
}
}
} else {
file = await (this.save(file, path, detectedName, info.type.mime, info.md5, info.size));
file = await (this.save(file, path, detectedName, info));
}
this.registerLogger.succ(`drive file has been created ${file.id}`);
@ -862,3 +868,16 @@ export class DriveService {
}
}
}
function makeFileKey(ext: string | null, prefix?: string): string {
const parts: string[] = [randomUUID()];
if (prefix) {
parts.unshift(prefix, '-');
}
if (ext) {
parts.push('.', ext);
}
return parts.join('');
}