self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

Desktop,CLI: Fixes #10653: Change Resource filetype detecting strategy (#10907)

Browse Source 
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
This commit is contained in:
pedr
2024-11-07 10:46:08 -03:00
committed by GitHub
parent 02a0d0d0cc
commit 0aba14f581
9 changed files with 278 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/lib/shim-init-node.ts
View File

@@ -12,6 +12,7 @@ import { ResourceEntity } from './services/database/types';
import { TextItem } from 'pdfjs-dist/types/src/display/api';
import replaceUnsupportedCharacters from './utils/replaceUnsupportedCharacters';
import { FetchBlobOptions } from './types';
import { fromFile as fileTypeFromFile } from 'file-type';
import crypto from './services/e2ee/crypto';
import FileApiDriverLocal from './file-api-driver-local';
@@ -306,9 +307,6 @@ function shimInit(options: ShimInitOptions = null) {
...options,
};
const readChunk = require('read-chunk');
const imageType = require('image-type');
const isUpdate = !!options.destinationResourceId;
const uuid = require('./uuid').default;
@@ -332,8 +330,7 @@ function shimInit(options: ShimInitOptions = null) {
let fileExt = safeFileExtension(fileExtension(filePath));
if (!resource.mime) {
const buffer = await readChunk(filePath, 0, 64);
const detectedType = imageType(buffer);
const detectedType = await fileTypeFromFile(filePath);
if (detectedType) {
fileExt = detectedType.ext;