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 #2075131 [Private bug](https://bugs.launchpad.net/calibre/+bug/2075131)

Browse Source
This commit is contained in:
Kovid Goyal 2024-07-30 13:36:39 +05:30
parent bcd0ab12c4
commit d56574285e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/db/backend.py
View File

@ -2365,18 +2365,20 @@ class DB:
fts_engine_query = unicode_normalize(fts_engine_query) fts_engine_query = unicode_normalize(fts_engine_query)
fts_table = 'annotations_fts_stemmed' if use_stemming else 'annotations_fts' fts_table = 'annotations_fts_stemmed' if use_stemming else 'annotations_fts'
text = 'annotations.searchable_text' text = 'annotations.searchable_text'
data = []
if highlight_start is not None and highlight_end is not None: if highlight_start is not None and highlight_end is not None:
if snippet_size is not None: if snippet_size is not None:
text = "snippet({fts_table}, 0, '{highlight_start}', '{highlight_end}', '…', {snippet_size})".format( text = "snippet({fts_table}, 0, ?, ?, '…', {snippet_size})".format(
fts_table=fts_table, highlight_start=highlight_start, highlight_end=highlight_end, fts_table=fts_table, snippet_size=max(1, min(snippet_size, 64)))
snippet_size=max(1, min(snippet_size, 64)))
else: else:
text = f"highlight({fts_table}, 0, '{highlight_start}', '{highlight_end}')" text = f"highlight({fts_table}, 0, ?, ?)"
data.append(highlight_start)
data.append(highlight_end)
query = 'SELECT {0}.id, {0}.book, {0}.format, {0}.user_type, {0}.user, {0}.annot_data, {1} FROM {0} ' query = 'SELECT {0}.id, {0}.book, {0}.format, {0}.user_type, {0}.user, {0}.annot_data, {1} FROM {0} '
query = query.format('annotations', text) query = query.format('annotations', text)
query += ' JOIN {fts_table} ON annotations.id = {fts_table}.rowid'.format(fts_table=fts_table) query += ' JOIN {fts_table} ON annotations.id = {fts_table}.rowid'.format(fts_table=fts_table)
query += f' WHERE {fts_table} MATCH ?' query += f' WHERE {fts_table} MATCH ?'
data = [fts_engine_query] data.append(fts_engine_query)
if restrict_to_user: if restrict_to_user:
query += ' AND annotations.user_type = ? AND annotations.user = ?' query += ' AND annotations.user_type = ? AND annotations.user = ?'
data += list(restrict_to_user) data += list(restrict_to_user)

8
src/calibre/db/fts/connect.py
View File

@ -156,20 +156,22 @@ class FTS:
return return
fts_engine_query = unicode_normalize(fts_engine_query) fts_engine_query = unicode_normalize(fts_engine_query)
fts_table = 'books_fts' + ('_stemmed' if use_stemming else '') fts_table = 'books_fts' + ('_stemmed' if use_stemming else '')
data = []
if return_text: if return_text:
text = 'books_text.searchable_text' text = 'books_text.searchable_text'
if highlight_start is not None and highlight_end is not None: if highlight_start is not None and highlight_end is not None:
if snippet_size is not None: if snippet_size is not None:
text = f'''snippet("{fts_table}", 0, '{highlight_start}', '{highlight_end}', '…', {max(1, min(snippet_size, 64))})''' text = f'''snippet("{fts_table}", 0, ?, ?, '…', {max(1, min(snippet_size, 64))})'''
else: else:
text = f'''highlight("{fts_table}", 0, '{highlight_start}', '{highlight_end}')''' text = f'''highlight("{fts_table}", 0, ?, ?)'''
data.append(highlight_start)
data.append(highlight_end)
text = ', ' + text text = ', ' + text
else: else:
text = '' text = ''
query = 'SELECT {0}.id, {0}.book, {0}.format {1} FROM {0} '.format('books_text', text) query = 'SELECT {0}.id, {0}.book, {0}.format {1} FROM {0} '.format('books_text', text)
query += f' JOIN {fts_table} ON fts_db.books_text.id = {fts_table}.rowid' query += f' JOIN {fts_table} ON fts_db.books_text.id = {fts_table}.rowid'
query += ' WHERE ' query += ' WHERE '
data = []
conn = self.get_connection() conn = self.get_connection()
temp_table_name = '' temp_table_name = ''
if restrict_to_book_ids: if restrict_to_book_ids:

8
src/calibre/db/notes/connect.py
View File

@ -413,13 +413,15 @@ class Notes:
return return
fts_engine_query = unicode_normalize(fts_engine_query) fts_engine_query = unicode_normalize(fts_engine_query)
fts_table = 'notes_fts' + ('_stemmed' if use_stemming else '') fts_table = 'notes_fts' + ('_stemmed' if use_stemming else '')
hl_data = ()
if return_text: if return_text:
text = 'notes.searchable_text' text = 'notes.searchable_text'
if highlight_start is not None and highlight_end is not None: if highlight_start is not None and highlight_end is not None:
if snippet_size is not None: if snippet_size is not None:
text = f'''snippet("{fts_table}", 0, '{highlight_start}', '{highlight_end}', '…', {max(1, min(snippet_size, 64))})''' text = f'''snippet("{fts_table}", 0, ?, ?, '…', {max(1, min(snippet_size, 64))})'''
else: else:
text = f'''highlight("{fts_table}", 0, '{highlight_start}', '{highlight_end}')''' text = f'''highlight("{fts_table}", 0, ?, ?)'''
hl_data = (highlight_start, highlight_end)
text = ', ' + text text = ', ' + text
else: else:
text = '' text = ''
@ -433,7 +435,7 @@ class Notes:
if limit is not None: if limit is not None:
query += f' LIMIT {limit}' query += f' LIMIT {limit}'
try: try:
for record in conn.execute(query, restrict_to_fields+(fts_engine_query,)): for record in conn.execute(query, hl_data + restrict_to_fields + (fts_engine_query,)):
result = { result = {
'id': record[0], 'id': record[0],
'field': record[1], 'field': record[1],