Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-11 09:13:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix escaped backslashes in the search query parser.

Browse Source
This commit is contained in:
Charles Haley 2013-05-09 09:02:29 +02:00
parent 0c7fb2afda
commit 0a6e03c492
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/utils/search_query_parser.py
View File

@ -135,7 +135,7 @@ class Parser(object):
(r'[()]', lambda x,t: (1, t)), (r'[()]', lambda x,t: (1, t)),
(r'@.+?:[^")\s]+', lambda x,t: (2, unicode(t))), (r'@.+?:[^")\s]+', lambda x,t: (2, unicode(t))),
(r'[^"()\s]+', lambda x,t: (2, unicode(t))), (r'[^"()\s]+', lambda x,t: (2, unicode(t))),
(r'".*?((?<!\\)")', lambda x,t: (3, t[1:-1].replace('\\"', '"'))), (r'".*?((?<!\\)")', lambda x,t: (3, t[1:-1])),
(r'\s+', None) (r'\s+', None)
], flags=re.DOTALL) ], flags=re.DOTALL)
@ -168,7 +168,16 @@ class Parser(object):
def parse(self, expr, locations): def parse(self, expr, locations):
self.locations = locations self.locations = locations
# Strip out escaped backslashes and escaped quotes so that the
# lex scanner doesn't get confused. We put them back later.
expr = expr.replace(u'\\\\', u'\001').replace(u'\\"', u'\002')
self.tokens = self.lex_scanner.scan(expr)[0] self.tokens = self.lex_scanner.scan(expr)[0]
for (i,tok) in enumerate(self.tokens):
tt, tv = tok
if tt == self.WORD or tt == self.QUOTED_WORD:
self.tokens[i] = (tt, tv.replace('\001', '\\').replace('\002', '"'))
self.current_token = 0 self.current_token = 0
prog = self.or_expression() prog = self.or_expression()
if not self.is_eof(): if not self.is_eof():