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

fix import for tars generated outside of trilium

Browse Source
This commit is contained in:
azivner 2018-09-03 17:08:34 +02:00
parent c7a609e349
commit 25f8df1e03
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/routes/api/import.js
View File

@ -151,10 +151,15 @@ async function parseImportFile(file) {
if (header.type === 'file') { if (header.type === 'file') {
({name, key} = getFileName(header.name)); ({name, key} = getFileName(header.name));
} }
else { else if (header.type === 'directory') {
name = header.name; // directory entries in tar often end with directory separator
name = (header.name.endsWith("/") || header.name.endsWith("\\")) ? header.name.substr(0, header.name.length - 1) : header.name;
key = 'directory'; key = 'directory';
} }
else {
log.error("Unrecognized tar entry: " + JSON.stringify(header));
return;
}
let file = fileMap[name]; let file = fileMap[name];