pjht/buku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle regex search independently.

Browse Source
This commit is contained in:
Arun Prakash Jana 2016-11-13 14:33:19 +05:30
parent 32b25e3d4f
commit 8441cebd50
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
buku.py
View File

@ -811,39 +811,43 @@ class BukuDb:
''' '''
arguments = [] arguments = []
placeholder = "'%' || ? || '%'"
query = 'SELECT id, url, metadata, tags, desc FROM bookmarks WHERE' query = 'SELECT id, url, metadata, tags, desc FROM bookmarks WHERE'
# Non-deep query string
q1 = '(tags REGEXP ? OR URL REGEXP ? OR metadata REGEXP ? OR desc \
REGEXP ?)'
# Deep query string
q2 = "(tags LIKE ('%' || ? || '%') OR URL LIKE ('%' || ? || '%') OR \
metadata LIKE ('%' || ? || '%') OR desc LIKE ('%' || ? || '%'))"
if all_keywords: # Match all keywords in URL or Title if regex:
for token in keywords:
query = '%s %s OR' % (query, q1)
arguments += (token, token, token, token)
query = query[:-3]
elif all_keywords:
for token in keywords: for token in keywords:
if not deep: if not deep:
token = '\\b' + token + '\\b' token = '\\b' + token + '\\b'
query = '%s (tags REGEXP ? OR URL REGEXP ? OR metadata \ query = '%s %s AND' % (query, q1)
REGEXP ? OR desc REGEXP ?) AND' % (query)
else: else:
query = '%s (tags LIKE (%s) OR URL LIKE (%s) OR metadata \ query = '%s %s AND' % (query, q2)
LIKE (%s) OR desc LIKE (%s)) AND' \
% (query, placeholder, placeholder, placeholder,
placeholder)
arguments += (token, token, token, token) arguments += (token, token, token, token)
query = query[:-4] query = query[:-4]
else: # Match any keyword in URL or Title elif not all_keywords:
for token in keywords: for token in keywords:
if not deep: if not deep:
if not regex:
token = '\\b' + token + '\\b' token = '\\b' + token + '\\b'
query = '%s tags REGEXP ? OR URL REGEXP ? OR metadata \ query = '%s %s OR' % (query, q1)
REGEXP ? OR desc REGEXP ? OR' % (query)
else: else:
query = '%s tags LIKE (%s) OR URL LIKE (%s) OR metadata \ query = '%s %s OR' % (query, q2)
LIKE (%s) OR desc LIKE (%s) OR' \
% (query, placeholder, placeholder, placeholder,
placeholder)
arguments += (token, token, token, token) arguments += (token, token, token, token)
query = query[:-3] query = query[:-3]
else:
logger.error('Invalid search option')
return None
query = '%s ORDER BY id ASC' % query query = '%s ORDER BY id ASC' % query
@ -2205,7 +2209,7 @@ def main():
# Run a regular expression search # Run a regular expression search
elif args.sreg is not None: elif args.sreg is not None:
search_opted = True search_opted = True
search_results = bdb.searchdb(args.sreg, False, regex=True) search_results = bdb.searchdb(args.sreg, regex=True)
# Search bookmarks by tag and delete if wanted # Search bookmarks by tag and delete if wanted
elif tagsearch: elif tagsearch: