self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-11 11:12:03 +02:00
Code Issues Releases Activity

Handle resource in enex files

Browse Source
This commit is contained in:
Laurent Cozic 2017-06-27 20:53:40 +00:00
parent 32b7207ea1
commit 2c713cdf7a
2 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
CliClient/app/import-enex.js
View File

@ -65,6 +65,26 @@ async function fuzzyMatch(note) {
return null;
}
async function saveNoteResources(note) {
let resourcesCreated = 0;
for (let i = 0; i < note.resources.length; i++) {
let resource = note.resources[i];
let toSave = Object.assign({}, resource);
delete toSave.data;
// The same resource sometimes appear twice in the same enex (exact same ID and file).
// In that case, just skip it - it means two different notes might be linked to the
// same resource.
let existingResource = await Resource.load(toSave.id);
if (existingResource) continue;
await Resource.save(toSave, { isNew: true });
await filePutContents(Resource.fullPath(toSave), resource.data)
resourcesCreated++;
}
return resourcesCreated;
}
async function saveNoteToStorage(note, fuzzyMatching = false) {
note = Note.filter(note);
@ -77,17 +97,17 @@ async function saveNoteToStorage(note, fuzzyMatching = false) {
resourcesCreated: 0,
};
let resourcesCreated = await saveNoteResources(note);
result.resourcesCreated += resourcesCreated;
if (existingNote) {
let diff = BaseModel.diffObjects(existingNote, note);
delete diff.tags;
delete diff.resources;
delete diff.id;
// TODO: also save resources
if (!Object.getOwnPropertyNames(diff).length) {
result.noteSkipped = true;
// TODO: also save resources
return result;
}
@ -96,22 +116,6 @@ async function saveNoteToStorage(note, fuzzyMatching = false) {
await Note.save(diff, { autoTimestamp: false })
result.noteUpdated = true;
} else {
for (let i = 0; i < note.resources.length; i++) {
let resource = note.resources[i];
let toSave = Object.assign({}, resource);
delete toSave.data;
// The same resource sometimes appear twice in the same enex (exact same ID and file).
// In that case, just skip it - it means two different notes might be linked to the
// same resource.
let existingResource = await Resource.load(toSave.id);
if (existingResource) continue;
await Resource.save(toSave, { isNew: true });
await filePutContents(Resource.fullPath(toSave), resource.data)
result.resourcesCreated++;
}
await Note.save(note, {
isNew: true,
autoTimestamp: false,

10
CliClient/app/main.js
View File

@ -365,7 +365,15 @@ commands.push({
if (folderTitle) {
folder = await Folder.loadByField('title', folderTitle);
if (!folder) return cmdError(this, _('Folder does not exists: "%s"', folderTitle), end);
if (!folder) {
let ok = await cmdPromptConfirm(this, _('Folder does not exists: "%s". Create it?', folderTitle))
if (!ok) {
end();
return;
}
folder = await Folder.save({ title: folderTitle });
}
} else {
folderTitle = filename(filePath);
folderTitle = _('Imported - %s', folderTitle);