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

unretiring notes should not duplicate item value at the top of the searchable text

Browse Source
This commit is contained in:
Kovid Goyal 2023-09-15 19:45:13 +05:30
parent ba2de90d00
commit fa83be4192
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,7 +196,7 @@ class Notes:
rname = x.split('-', 1)[1] rname = x.split('-', 1)[1]
with open(os.path.join(srcdir, x), 'rb') as rsrc: with open(os.path.join(srcdir, x), 'rb') as rsrc:
resources.add(self.add_resource(conn, rsrc, rname, update_name=False)) resources.add(self.add_resource(conn, rsrc, rname, update_name=False))
note_id = self.set_note(conn, field_name, item_id, item_value, marked_up_text, resources, searchable_text) note_id = self.set_note(conn, field_name, item_id, item_value, marked_up_text, resources, searchable_text, add_item_value_to_searchable_text=False)
if note_id > -1: if note_id > -1:
remove_with_retry(srcdir, is_dir=True) remove_with_retry(srcdir, is_dir=True)
return note_id return note_id
@ -207,10 +207,11 @@ class Notes:
def set_note( def set_note(
self, conn, field_name, item_id, item_value, marked_up_text='', used_resource_hashes=(), self, conn, field_name, item_id, item_value, marked_up_text='', used_resource_hashes=(),
searchable_text=copy_marked_up_text, ctime=None, mtime=None searchable_text=copy_marked_up_text, ctime=None, mtime=None, add_item_value_to_searchable_text=True
): ):
if searchable_text is copy_marked_up_text: if searchable_text is copy_marked_up_text:
searchable_text = marked_up_text searchable_text = marked_up_text
if add_item_value_to_searchable_text:
searchable_text = item_value + '\n' + searchable_text searchable_text = item_value + '\n' + searchable_text
note_id = self.note_id_for(conn, field_name, item_id) note_id = self.note_id_for(conn, field_name, item_id)
old_resources = frozenset(self.resources_used_by(conn, note_id)) old_resources = frozenset(self.resources_used_by(conn, note_id))