alex/anki-connect
1
Fork 0
Code Releases 7 Activity

Don't call note.dupeOrEmpty when mode is 'deck' (#204)

Browse Source 
* Don't call note.dupeOrEmpty when mode is 'deck'

* Update return type to be consistent with latest note.duplicateOrEmpty

* Fix main deck ID not always being included
This commit is contained in:
toasted-nutbread 2020-12-06 00:23:03 -05:00 committed by GitHub
parent ab1f518474
commit b03414a8d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugin/__init__.py
View File

@ -233,36 +233,39 @@ class AnkiConnect:
raise Exception('cannot create note because it is a duplicate') raise Exception('cannot create note because it is a duplicate')
else: else:
return ankiNote return ankiNote
elif duplicateOrEmpty == False: elif duplicateOrEmpty == 0:
return ankiNote return ankiNote
else: else:
raise Exception('cannot create note for unknown reason') raise Exception('cannot create note for unknown reason')
def isNoteDuplicateOrEmptyInScope(self, note, deck, collection, duplicateScope, duplicateScopeDeckName, duplicateScopeCheckChildren): def isNoteDuplicateOrEmptyInScope(self, note, deck, collection, duplicateScope, duplicateScopeDeckName, duplicateScopeCheckChildren):
"1 if first is empty; 2 if first is a duplicate, False otherwise." "1 if first is empty; 2 if first is a duplicate, 0 otherwise."
result = note.dupeOrEmpty() if duplicateScope != 'deck':
if result != 2 or duplicateScope != 'deck': result = note.dupeOrEmpty()
if result == False:
return 0
return result return result
# dupeOrEmpty returns if a note is a global duplicate # dupeOrEmpty returns if a note is a global duplicate
# the rest of the function checks to see if the note is a duplicate in the deck # the rest of the function checks to see if the note is a duplicate in the deck
val = note.fields[0] val = note.fields[0]
did = deck['id'] if not val.strip():
return 1
csum = anki.utils.fieldChecksum(val) csum = anki.utils.fieldChecksum(val)
did = deck['id']
if duplicateScopeDeckName is not None: if duplicateScopeDeckName is not None:
deck2 = collection.decks.byName(duplicateScopeDeckName) deck2 = collection.decks.byName(duplicateScopeDeckName)
if deck2 is None: if deck2 is None:
# Invalid deck, so cannot be duplicate # Invalid deck, so cannot be duplicate
return False return 0
did = deck2['id'] did = deck2['id']
dids = {} dids = {}
dids[did] = True
if duplicateScopeCheckChildren: if duplicateScopeCheckChildren:
for kv in collection.decks.children(did): for kv in collection.decks.children(did):
dids[kv[1]] = True dids[kv[1]] = True
else:
dids[did] = True
for noteId in note.col.db.list( for noteId in note.col.db.list(
"select id from notes where csum = ? and id != ? and mid = ?", "select id from notes where csum = ? and id != ? and mid = ?",
@ -276,7 +279,7 @@ class AnkiConnect:
): ):
if cardDeckId in dids: if cardDeckId in dids:
return 2 return 2
return False return 0
# #