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

Add import option to replace underscores with spaces in note names (#1064)

Browse Source
This commit is contained in:
Adam Coyne
2020-05-30 16:15:00 -05:00
committed by GitHub
parent c0cd321118
commit ac10701b55
9 changed files with 58 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/services/import/zip.js
View File

@@ -100,23 +100,12 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
return parentNoteId;
}
function getNoteTitle(filePath, noteMeta) {
if (noteMeta) {
return noteMeta.title;
}
else {
const basename = path.basename(filePath);
return getTextFileWithoutExtension(basename);
}
}
function getNoteId(noteMeta, filePath) {
if (noteMeta) {
return getNewNoteId(noteMeta.noteId);
}
const filePathNoExt = getTextFileWithoutExtension(filePath);
const filePathNoExt = utils.removeTextFileExtension(filePath);
if (filePathNoExt in createdPaths) {
return createdPaths[filePathNoExt];
@@ -170,7 +159,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
const { parentNoteMeta, noteMeta } = getMeta(filePath);
const noteId = getNoteId(noteMeta, filePath);
const noteTitle = getNoteTitle(filePath, noteMeta);
const noteTitle = utils.getNoteTitle(filePath, taskContext.data.replaceUnderscoresWithSpaces, noteMeta);
const parentNoteId = await getParentNoteId(filePath, parentNoteMeta);
let note = await repository.getNote(noteId);
@@ -202,17 +191,6 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
return noteId;
}
function getTextFileWithoutExtension(filePath) {
const extension = path.extname(filePath).toLowerCase();
if (extension === '.md' || extension === '.markdown' || extension === '.html') {
return filePath.substr(0, filePath.length - extension.length);
}
else {
return filePath;
}
}
function getNoteIdFromRelativeUrl(url, filePath) {
while (url.startsWith("./")) {
url = url.substr(2);
@@ -275,7 +253,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
content = mdWriter.render(parsed);
}
const noteTitle = getNoteTitle(filePath, noteMeta);
const noteTitle = utils.getNoteTitle(filePath, taskContext.data.replaceUnderscoresWithSpaces, noteMeta);
if (type === 'text') {
function isUrlAbsolute(url) {
@@ -368,7 +346,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
}
if (type === 'text') {
filePath = getTextFileWithoutExtension(filePath);
filePath = utils.removeTextFileExtension(filePath);
}
}