Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

fix in ENEX import

Browse Source
This commit is contained in:
zadam
2020-09-16 20:32:20 +02:00
parent 13b9f5231c
commit d57a303251
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/routes/api/clipper.js
View File

@@ -53,7 +53,7 @@ function addClipping(req) {
clippingNote.setLabel('pageUrl', pageUrl); clippingNote.setLabel('pageUrl', pageUrl);
} }
const rewrittenContent = addImagesToNote(images, clippingNote, content); const rewrittenContent = processContent(images, clippingNote, content);
const existingContent = clippingNote.getContent(); const existingContent = clippingNote.getContent();
@@ -85,7 +85,7 @@ function createNote(req) {
note.setLabel('pageUrl', pageUrl); note.setLabel('pageUrl', pageUrl);
} }
const rewrittenContent = addImagesToNote(images, note, content); const rewrittenContent = processContent(images, note, content);
note.setContent(rewrittenContent); note.setContent(rewrittenContent);
@@ -94,8 +94,11 @@ function createNote(req) {
}; };
} }
function addImagesToNote(images, note, content) { function processContent(images, note, content) {
let rewrittenContent = content; // H1 is not supported so convert it to H2
let rewrittenContent = content
.replace(/<h1/ig, "<h2")
.replace(/<\/h1/ig, "</h2");
if (images) { if (images) {
for (const {src, dataUrl, imageId} of images) { for (const {src, dataUrl, imageId} of images) {

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

@@ -250,14 +250,14 @@ function importEnex(taskContext, file, parentNote) {
} }
const createFileNote = () => { const createFileNote = () => {
const resourceNote = (noteService.createNewNote({ const resourceNote = noteService.createNewNote({
parentNoteId: noteEntity.noteId, parentNoteId: noteEntity.noteId,
title: resource.title, title: resource.title,
content: resource.content, content: resource.content,
type: 'file', type: 'file',
mime: resource.mime, mime: resource.mime,
isProtected: parentNote.isProtected && protectedSessionService.isProtectedSessionAvailable(), isProtected: parentNote.isProtected && protectedSessionService.isProtectedSessionAvailable(),
})).note; }).note;
for (const attr of resource.attributes) { for (const attr of resource.attributes) {
noteEntity.addAttribute(attr.type, attr.name, attr.value); noteEntity.addAttribute(attr.type, attr.name, attr.value);

6
src/services/note_cache/similarity.js
View File

@@ -11,9 +11,9 @@ const IGNORED_ATTR_NAMES = [
function filterLabelValue(value) { function filterLabelValue(value) {
return value return value
.replace(/https?:\/\//i, "") .replace(/https?:\/\//ig, "")
.replace(/www\./i, "") .replace(/www\./ig, "")
.replace(/(\.net|\.com|\.org|\.info|\.edu)/i, ""); .replace(/(\.net|\.com|\.org|\.info|\.edu)/ig, "");
} }
/** /**

2
src/services/notes.js
View File

@@ -55,6 +55,8 @@ function deriveMime(type, mime) {
mime = 'application/json'; mime = 'application/json';
} else if (['render', 'book'].includes(type)) { } else if (['render', 'book'].includes(type)) {
mime = ''; mime = '';
} else {
mime = 'application/octet-stream';
} }
return mime; return mime;