From ae8a2bfb1b84a6c78e869902a100817a86c1a1dd Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 1 Sep 2019 22:43:16 +0200 Subject: [PATCH] updated demo document based on changes in tar format --- db/demo.tar | Bin 506368 -> 529408 bytes src/services/import/tar.js | 18 +++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/db/demo.tar b/db/demo.tar index 4edf70636408455281969ad245c4272db430aa5e..599f8a0b9815096310a5e3933c5b5f8396736bae 100644 GIT binary patch delta 33062 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

y=oNDEm8W-ER+o14UKEcY6|fa7iy4PRGU zqQy(i%nPyk9MzbZ$*qzcj>@BYace`4=`XT7nQ84pt}|ziP_io<1&dketL2-OW)%*r ztKBw#qRO7#tioaNeDUt2S*0$`Vpe&a7>u9H<8Bnhyg#2iD4JL74R(ug;k*LwX8e+x z+X*^T;dcwTgn#PRa4umTui-8cKHpr!eMwTx@wMEAk~TN5;|B1h>$t1%{Pmnx(rd|j zu2Z=G%JrOEy8o%~uuJjw4cx8xpEiItMLQT!!$V>$UscGJ;nqT~6W>w@3UAVIR(!LD z>&35XxNqWP8{t~TCb)L}CT;?=o4HLAnr)joaX&P&nd=r!_y_N^EAekPb0q@u!^9OXu+TQ zn8yf?P`tTHukDHoyO82fdM!B%tr>L|f|p1$ec=?rM>RmPSR*%c?gPz=&_a{mD~&=U zf+l8;3SsV3%@yE+RxXq>Asx*B2x+%*9KiNm8bS+&+txXWu!QRsKQvjjk~(6@X2`(Y0h&@8N_kf_ zS`rfsB55y&U7ci)M{W!8u+Kb4#`iH~q)mvZ$La7p!@H!3uH@6Ot79I)gj@;}B2VhLxmHm= zE2a1~W8>SR6E^zEkeP^IaFpY$i$^DmM>?-k2|1z5=@+JBZvQBpmJ~`V$$0GY=>oVS z9t-#=QH5eb4yMC?&QF+<(M%rZ7~!^vn~n-&Ba*=gS1Ag!Fq1zTl;{2u!u-4O$8oT? z^WR1nC=Xe{+=NH~V;>o}$l;O@-v8d@bV%^aFDm?!4DAOwvuH}inKGb3xqbTgm;r+v zoHjVZ4bC|60Fza6ZYr3Fv}5CP+Po2Y;|;bsV8`YPsuY1%knmWZD@AzMm0V}a>!C8% z!5vb_gEJi;e)nqb+WF+VK^Q>DwKz}J;_z&0Iw3wBt8Rl(D*%OXD%Z*BBPvQ9N`S4I ZUrEPh@1|NbICzw7pauEd^=)p+{|A#$LpuNf delta 13464 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 DW^Df> diff --git a/src/services/import/tar.js b/src/services/import/tar.js index 64a70e0b7..899fc5065 100644 --- a/src/services/import/tar.js +++ b/src/services/import/tar.js @@ -115,24 +115,28 @@ async function importTar(importContext, fileBuffer, importRootNote) { function getNoteId(noteMeta, filePath) { let noteId; - if (noteMeta) { - noteId = getNewNoteId(noteMeta.noteId); + const filePathNoExt = getTextFileWithoutExtension(filePath); - createdPaths[filePath] = noteId; + if (noteMeta) { + if (filePathNoExt in createdPaths) { + noteId = createdPaths[filePathNoExt]; + noteIdMap[noteMeta.noteId] = noteId; + } + else { + noteId = getNewNoteId(noteMeta.noteId); + } } else { - const filePathNoExt = getTextFileWithoutExtension(filePath); - if (filePathNoExt in createdPaths) { noteId = createdPaths[filePathNoExt]; } else { noteId = utils.newEntityId(); } - - createdPaths[filePathNoExt] = noteId; } + createdPaths[filePathNoExt] = noteId; + return noteId; }