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

Fix #1255671: escaped parenthesis do not work in any search expression, and match_books does not escape parenthesis.

Browse Source
This commit is contained in:
Charles Haley 2013-11-28 12:46:10 +01:00
parent 98b6c9dbe7
commit 9b0409ea88
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/dialogs/match_books.py
View File

@ -107,7 +107,9 @@ class MatchBooks(QDialog, Ui_MatchBooks):
self.buttonBox.rejected.connect(self.reject)
self.ignore_next_key = False
self.search_text.setText(self.device_db[self.current_device_book_id].title)
search_text= self.device_db[self.current_device_book_id].title
search_text = search_text.replace('(', '\\(').replace(')', '\\)')
self.search_text.setText(search_text)
def return_pressed(self):
self.ignore_next_key = True

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

@ -177,14 +177,17 @@ class Parser(object):
def parse(self, expr, locations):
self.locations = locations
# Strip out escaped backslashes and escaped quotes so that the
# Strip out escaped backslashes, quotes and parens so that the
# lex scanner doesn't get confused. We put them back later.
expr = expr.replace(u'\\\\', u'\x01').replace(u'\\"', u'\x02')
expr = expr.replace(u'\\(', u'\x03').replace(u'\\)', u'\x04')
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(u'\x01', u'\\').replace(u'\x02', u'"'))
self.tokens[i] = (tt,
tv.replace(u'\x01', u'\\').replace(u'\x02', u'"').
replace(u'\x03', u'(').replace(u'\x04', u')'))
self.current_token = 0
prog = self.or_expression()
@ -219,10 +222,10 @@ class Parser(object):
return self.location_expression()
def location_expression(self):
if self.token() == '(':
if self.token_type() == self.OPCODE and self.token() == '(':
self.advance()
res = self.or_expression()
if self.token(advance=True) != ')':
if self.token_type() != self.OPCODE or self.token(advance=True) != ')':
raise ParseException(_('missing )'))
return res
if self.token_type() not in (self.WORD, self.QUOTED_WORD):