self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Desktop, Cli: Give correct mime type to more file types

Browse Source
This commit is contained in:
Laurent Cozic 2019-10-08 21:36:33 +02:00
parent fbba4a1ec4
commit add9dda759
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ElectronClient/app/package-lock.json generated
View File

@ -4568,11 +4568,6 @@
}
}
},
"mime": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
"integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="
},
"mime-db": {
"version": "1.42.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",

1
ElectronClient/app/package.json
View File

@ -125,7 +125,6 @@
"markdown-it-sup": "^1.0.0",
"markdown-it-toc-done-right": "^4.0.2",
"md5": "^2.2.1",
"mime": "^2.3.1",
"moment": "^2.22.2",
"multiparty": "^4.2.1",
"mustache": "^3.0.1",

10
ReactNativeClient/lib/mime-utils.js
View File

@ -768,6 +768,9 @@ const mimeTypes = [
{ t: 'x-conference/x-cooltalk', e: ['ice'] },
];
// Note: if the list above is ever updated, make sure Markdown doesn't appear twice
mimeTypes.push({ t: 'text/markdown', e: ['md', 'markdown'] });
const mime = {
fromFileExtension(ext) {
ext = ext.toLowerCase();
@ -780,6 +783,13 @@ const mime = {
return null;
},
fromFilename(name) {
if (!name) return null;
const splitted = name.trim().split('.');
if (splitted.length <= 1) return null;
return mime.fromFileExtension(splitted[splitted.length - 1]);
},
toFileExtension(mimeType) {
mimeType = mimeType.toLowerCase();
for (let i = 0; i < mimeTypes.length; i++) {

3
ReactNativeClient/lib/shim-init-node.js
View File

@ -122,7 +122,6 @@ function shimInit() {
const { uuid } = require('lib/uuid.js');
const { basename, fileExtension, safeFileExtension } = require('lib/path-utils.js');
const mime = require('mime/lite');
if (!(await fs.pathExists(filePath))) throw new Error(_('Cannot access %s', filePath));
@ -132,7 +131,7 @@ function shimInit() {
let resource = Resource.new();
resource.id = resourceId;
resource.mime = mime.getType(filePath);
resource.mime = mimeUtils.fromFilename(filePath);
resource.title = basename(filePath);
let fileExt = safeFileExtension(fileExtension(filePath));