mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-05-20 23:25:28 +02:00
enhance(backend): ファイル種別が判定できない場合、拡張子を参照するように
This commit is contained in:
@@ -64,6 +64,7 @@ export class FileInfoService {
|
||||
*/
|
||||
@bindThis
|
||||
public async getFileInfo(path: string, opts: {
|
||||
fileName?: string | null;
|
||||
skipSensitiveDetection: boolean;
|
||||
sensitiveThreshold?: number;
|
||||
sensitiveThresholdForPorn?: number;
|
||||
@@ -76,6 +77,26 @@ export class FileInfoService {
|
||||
|
||||
let type = await this.detectType(path);
|
||||
|
||||
if (type.mime === TYPE_OCTET_STREAM.mime && opts.fileName != null) {
|
||||
const ext = opts.fileName.split('.').pop();
|
||||
if (ext === 'txt') {
|
||||
type = {
|
||||
mime: 'text/plain',
|
||||
ext: 'txt',
|
||||
};
|
||||
} else if (ext === 'csv') {
|
||||
type = {
|
||||
mime: 'text/csv',
|
||||
ext: 'csv',
|
||||
};
|
||||
} else if (ext === 'json') {
|
||||
type = {
|
||||
mime: 'application/json',
|
||||
ext: 'json',
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// image dimensions
|
||||
let width: number | undefined;
|
||||
let height: number | undefined;
|
||||
@@ -438,12 +459,12 @@ export class FileInfoService {
|
||||
*/
|
||||
@bindThis
|
||||
private async detectImageSize(path: string): Promise<{
|
||||
width: number;
|
||||
height: number;
|
||||
wUnits: string;
|
||||
hUnits: string;
|
||||
orientation?: number;
|
||||
}> {
|
||||
width: number;
|
||||
height: number;
|
||||
wUnits: string;
|
||||
hUnits: string;
|
||||
orientation?: number;
|
||||
}> {
|
||||
const readable = fs.createReadStream(path);
|
||||
const imageSize = await probeImageSize(readable);
|
||||
readable.destroy();
|
||||
|
||||
Reference in New Issue
Block a user