self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

All: Fix: Make sure a revision is not empty before saving it

Browse Source
This commit is contained in:
Laurent Cozic 2019-05-07 20:46:58 +01:00
parent 219171a18c
commit c400142996
2 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CliClient/tests/services_Revision.js
View File

@ -157,11 +157,11 @@ describe('services_Revision', function() {
const n1_v1 = await Note.save({ title: 'hello' });
const noteId = n1_v1.id;
const rev1 = await service.createNoteRevision(n1_v1);
const rev1 = await service.createNoteRevision_(n1_v1);
const n1_v2 = await Note.save({ id: noteId, title: 'hello Paul' });
const rev2 = await service.createNoteRevision(n1_v2, rev1.id);
const rev2 = await service.createNoteRevision_(n1_v2, rev1.id);
const n1_v3 = await Note.save({ id: noteId, title: 'hello John' });
const rev3 = await service.createNoteRevision(n1_v3, rev1.id);
const rev3 = await service.createNoteRevision_(n1_v3, rev1.id);
const revisions = await Revision.allByType(BaseModel.TYPE_NOTE, noteId);
expect(revisions.length).toBe(3);
@ -369,4 +369,15 @@ describe('services_Revision', function() {
expect((await Revision.all()).length).toBe(1);
}));
it('should not create a revision if the note has not changed', asyncTest(async () => {
const n1_v0 = await Note.save({ title: '' });
const n1_v1 = await Note.save({ id: n1_v0.id, title: 'hello' });
await revisionService().collectRevisions(); // REV 1
expect((await Revision.all()).length).toBe(1);
const n1_v2 = await Note.save({ id: n1_v0.id, title: 'hello' });
await revisionService().collectRevisions(); // Note has not changed (except its timestamp) so don't create a revision
expect((await Revision.all()).length).toBe(1);
}));
});

54
ReactNativeClient/lib/services/RevisionService.js
View File

@ -50,10 +50,25 @@ class RevisionService extends BaseService {
if (excludedFields.indexOf(k) >= 0) continue;
md[k] = note[k];
}
if (note.user_updated_time === note.updated_time) delete md.user_updated_time;
if (note.user_created_time === note.created_time) delete md.user_created_time;
return md;
}
async createNoteRevision(note, parentRevId = null) {
isEmptyRevision_(rev) {
if (!!rev.title_diff) return false;
if (!!rev.body_diff) return false;
const md = JSON.parse(rev.metadata_diff);
if (md.new && md.new.length) return false;
if (md.deleted && md.deleted.length) return false;
return true;
}
async createNoteRevision_(note, parentRevId = null) {
const parentRev = parentRevId ? await Revision.load(parentRevId) : await Revision.latestRevision(BaseModel.TYPE_NOTE, note.id);
const output = {
@ -79,38 +94,11 @@ class RevisionService extends BaseService {
output.metadata_diff = Revision.createObjectPatch(merged.metadata, noteMd);
}
if (this.isEmptyRevision_(output)) return null;
return Revision.save(output);
}
async createNoteRevisionsByIds(noteIds) {
noteIds = ArrayUtils.unique(noteIds);
while (noteIds.length) {
const ids = noteIds.splice(0, 100);
const notes = await Note.byIds(ids);
for (const note of notes) {
const existingRev = await Revision.latestRevision(BaseModel.TYPE_NOTE, note.id);
if (existingRev && existingRev.item_updated_time === note.updated_time) continue;
await this.createNoteRevision(note);
}
}
}
async createNoteRevisionIfNoneFound(noteId, cutOffDate) {
const count = await Revision.countRevisions(BaseModel.TYPE_NOTE, noteId);
if (count) return;
const note = await Note.load(noteId);
if (!note) {
this.logger().warn('RevisionService:createNoteRevisionIfNoneFound: Could not find note ' + noteId);
return;
}
if (note.updated_time > cutOffDate) return;
await this.createNoteRevision(note);
}
async collectRevisions() {
if (this.isCollecting_) return;
@ -150,10 +138,10 @@ class RevisionService extends BaseService {
if (note) {
if (oldNote && oldNote.updated_time < this.installedTime()) {
// This is where we save the original version of this old note
await this.createNoteRevision(oldNote);
await this.createNoteRevision_(oldNote);
}
await this.createNoteRevision(note);
await this.createNoteRevision_(note);
doneNoteIds.push(noteId);
this.isOldNotesCache_[noteId] = false;
}
@ -162,7 +150,7 @@ class RevisionService extends BaseService {
if (change.type === ItemChange.TYPE_DELETE && !!change.before_change_item) {
const note = JSON.parse(change.before_change_item);
const revExists = await Revision.revisionExists(BaseModel.TYPE_NOTE, note.id, note.updated_time);
if (!revExists) await this.createNoteRevision(note);
if (!revExists) await this.createNoteRevision_(note);
doneNoteIds.push(noteId);
}