gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

unify markdown mime to text/x-markdown

Browse Source
This commit is contained in:
zadam 2019-02-25 21:57:11 +01:00
parent 4b1cf05c0e
commit 003eed368b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/export/single.js
View File

@ -34,7 +34,7 @@ async function exportSingleNote(exportContext, branch, format, res) {
const turndownService = new TurndownService(); const turndownService = new TurndownService();
payload = turndownService.turndown(noteContent.content); payload = turndownService.turndown(noteContent.content);
extension = 'md'; extension = 'md';
mime = 'text/markdown' mime = 'text/x-markdown'
} }
} }
else if (note.type === 'code') { else if (note.type === 'code') {

4
src/services/import/single.js
View File

@ -28,6 +28,8 @@ const CODE_MIME_TYPES = {
'text/x-kotlin': true, 'text/x-kotlin': true,
'text/x-stex': true, 'text/x-stex': true,
'text/x-lua': true, 'text/x-lua': true,
// possibly later migrate to text/markdown as primary MIME
'text/markdown': 'text/x-markdown',
'text/x-markdown': true, 'text/x-markdown': true,
'text/x-objectivec': true, 'text/x-objectivec': true,
'text/x-pascal': true, 'text/x-pascal': true,
@ -48,7 +50,7 @@ async function importSingleFile(importContext, file, parentNote) {
if (importContext.textImportedAsText) { if (importContext.textImportedAsText) {
if (file.mimetype === 'text/html') { if (file.mimetype === 'text/html') {
return await importHtml(importContext, file, parentNote); return await importHtml(importContext, file, parentNote);
} else if (file.mimetype === 'text/markdown') { } else if (['text/markdown', 'text/x-markdown'].includes(file.mimetype)) {
return await importMarkdown(importContext, file, parentNote); return await importMarkdown(importContext, file, parentNote);
} else if (file.mimetype === 'text/plain') { } else if (file.mimetype === 'text/plain') {
return await importPlainText(importContext, file, parentNote); return await importPlainText(importContext, file, parentNote);

4
src/services/import/tar.js
View File

@ -133,7 +133,7 @@ async function importTar(importContext, fileBuffer, importRootNote) {
let type = 'file'; let type = 'file';
if (mime) { if (mime) {
if (mime === 'text/html' || mime === 'text/markdown') { if (mime === 'text/html' || ['text/markdown', 'text/x-markdown'].includes(mime)) {
type = 'text'; type = 'text';
} }
else if (mime.startsWith('image/')) { else if (mime.startsWith('image/')) {
@ -251,7 +251,7 @@ async function importTar(importContext, fileBuffer, importRootNote) {
} }
} }
if ((noteMeta && noteMeta.format === 'markdown') || (!noteMeta && mime === 'text/markdown')) { if ((noteMeta && noteMeta.format === 'markdown') || (!noteMeta && ['text/markdown', 'text/x-markdown'].includes(mime))) {
const parsed = mdReader.parse(content); const parsed = mdReader.parse(content);
content = mdWriter.render(parsed); content = mdWriter.render(parsed);
} }