This commit is contained in:
Arthur Milchior 2020-01-30 16:50:12 -08:00
parent cb7429c433
commit 8eaed49fd4

View file

@ -54,9 +54,10 @@ class ForeignCard:
# The import mode is one of: # The import mode is one of:
# UPDATE_MODE: update if first field matches existing note # UPDATE_MODE: update if first field matches existing note
# IGNORE_MODE: ignore if first field matches existing note # IGNORE_MODE: ignore if first field matches existing note
# 2: import even if first field matches existing note # ADD_MODE: import even if first field matches existing note
UPDATE_MODE = 0 UPDATE_MODE = 0
IGNORE_MODE = 1 IGNORE_MODE = 1
ADD_MODE = 2
class NoteImporter(Importer): class NoteImporter(Importer):
@ -155,7 +156,7 @@ class NoteImporter(Importer):
self.log.append(_("Empty first field: %s") % " ".join(n.fields)) self.log.append(_("Empty first field: %s") % " ".join(n.fields))
continue continue
# earlier in import? # earlier in import?
if fld0 in firsts and self.importMode != 2: if fld0 in firsts and self.importMode != ADD_MODE:
# duplicates in source file; log and ignore # duplicates in source file; log and ignore
self.log.append(_("Appeared twice in file: %s") % fld0) self.log.append(_("Appeared twice in file: %s") % fld0)
continue continue
@ -179,7 +180,7 @@ class NoteImporter(Importer):
found = True found = True
elif self.importMode == IGNORE_MODE: elif self.importMode == IGNORE_MODE:
dupeCount += 1 dupeCount += 1
elif self.importMode == 2: elif self.importMode == ADD_MODE:
# allow duplicates in this case # allow duplicates in this case
if fld0 not in dupes: if fld0 not in dupes:
# only show message once, no matter how many # only show message once, no matter how many