fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-18 03:58:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue where jrnl would erroneously mark entries from DayOne as modified due to whitespace differences

Browse source
This commit is contained in:
Nik van der Ploeg 2015-09-06 17:41:09 +08:00
parent 15ef9749ae
commit 42b8f2bdb8
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
jrnl/DayOneJournal.py
View file

@ -127,7 +127,11 @@ class DayOne(Journal.Journal):
match = matched_entries[0] match = matched_entries[0]
if match != entry: if match != entry:
self.entries.remove(match) self.entries.remove(match)
entry.modified = True # DayOne's whitespace conventions are different from jrnl's, so compare 'split()'-ed entry
# bodies instead of comparing the objects directly. This way whitespace differences won't
# mark entries as modified
if match.body.split() != entry.body.split():
entry.modified = True
self.entries.append(entry) self.entries.append(entry)
else: else:
# This entry seems to be new... save it. # This entry seems to be new... save it.