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

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	src/routes/api/sender.js
#	src/services/import/enex.js
This commit is contained in:
zadam
2023-01-10 16:33:31 +01:00
parent 2242397280 5bf9c253f2
commit edbb60f2b5
10 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,13 +8,19 @@ const noteService = require("../notes");
const imageService = require("../image");
const protectedSessionService = require('../protected_session');
const htmlSanitizer = require("../html_sanitizer");
const attributeService = require("../attributes");
const {sanitizeAttributeName} = require("../sanitize_attribute_name");
const {sanitizeAttributeName} = require("../sanitize_attribute_name.js");
// date format is e.g. 20181121T193703Z
/**
* date format is e.g. 20181121T193703Z or 2013-04-14T16:19:00.000Z (Mac evernote, see #3496)
* @returns trilium date format, e.g. 2013-04-14 16:19:00.000Z
*/
function parseDate(text) {
// insert - and : to make it ISO format
text = `${text.substr(0, 4)}-${text.substr(4, 2)}-${text.substr(6, 2)} ${text.substr(9, 2)}:${text.substr(11, 2)}:${text.substr(13, 2)}.000Z`;
// convert ISO format to the "20181121T193703Z" format
text = text.replace(/[-:]/g, "");
// insert - and : to convert it to trilium format
text = text.substr(0, 4) + "-" + text.substr(4, 2) + "-" + text.substr(6, 2)
+ " " + text.substr(9, 2) + ":" + text.substr(11, 2) + ":" + text.substr(13, 2) + ".000Z";
return text;
}
@@ -263,7 +269,7 @@ function importEnex(taskContext, file, parentNote) {
continue;
}
const mediaRegex = new RegExp(`<en-media hash="${hash}"[^>]*>`, 'g');
const mediaRegex = new RegExp(`<en-media [^>]*hash="${hash}"[^>]*>`, 'g');
resource.mime = resource.mime || "application/octet-stream";