GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 06:22:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #176 from luoliyan/escape-sql-queries

Browse source 
Allow user to escape special characters in tags
This commit is contained in:
Damien Elmes 2017-03-01 22:49:47 +10:00 committed by GitHub
commit c17e68d5f3
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
anki/find.py
View file

@ -246,10 +246,10 @@ select distinct(n.id) from cards c, notes n where c.nid=n.id and """+preds
val = val.replace("*", "%") val = val.replace("*", "%")
if not val.startswith("%"): if not val.startswith("%"):
val = "% " + val val = "% " + val
if not val.endswith("%"): if not val.endswith("%") or val.endswith('\\%'):
val += " %" val += " %"
args.append(val) args.append(val)
return "n.tags like ?" return "n.tags like ? escape '\\'"
def _findCardState(self, args): def _findCardState(self, args):
(val, args) = args (val, args) = args

10
tests/test_find.py
View file

@ -25,14 +25,14 @@ def test_findCards():
f = deck.newNote() f = deck.newNote()
f['Front'] = 'dog' f['Front'] = 'dog'
f['Back'] = 'cat' f['Back'] = 'cat'
f.tags.append("monkey") f.tags.append("monkey animal_1 * %")
f1id = f.id f1id = f.id
deck.addNote(f) deck.addNote(f)
firstCardId = f.cards()[0].id firstCardId = f.cards()[0].id
f = deck.newNote() f = deck.newNote()
f['Front'] = 'goats are fun' f['Front'] = 'goats are fun'
f['Back'] = 'sheep' f['Back'] = 'sheep'
f.tags.append("sheep goat horse") f.tags.append("sheep goat horse animal11")
deck.addNote(f) deck.addNote(f)
f2id = f.id f2id = f.id
f = deck.newNote() f = deck.newNote()
@ -52,6 +52,12 @@ def test_findCards():
deck.addNote(f) deck.addNote(f)
latestCardIds = [c.id for c in f.cards()] latestCardIds = [c.id for c in f.cards()]
# tag searches # tag searches
assert len(deck.findCards("tag:*")) == 5
assert len(deck.findCards("tag:\\*")) == 1
assert len(deck.findCards("tag:%")) == 5
assert len(deck.findCards("tag:\\%")) == 1
assert len(deck.findCards("tag:animal_1")) == 2
assert len(deck.findCards("tag:animal\\_1")) == 1
assert not deck.findCards("tag:donkey") assert not deck.findCards("tag:donkey")
assert len(deck.findCards("tag:sheep")) == 1 assert len(deck.findCards("tag:sheep")) == 1
assert len(deck.findCards("tag:sheep tag:goat")) == 1 assert len(deck.findCards("tag:sheep tag:goat")) == 1