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

Remove retired entry when setting a note value

Browse Source 
Useful since the number of reired entries is capped, no need to use up
one slot for a note that has a value set
This commit is contained in:
Kovid Goyal 2023-09-13 07:55:31 +05:30
parent 07a77403a8
commit 652fb651cb
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,11 +158,14 @@ class Notes:
f.write(SEP) f.write(SEP)
f.write('\n'.join(resource_hashes).encode('utf-8')) f.write('\n'.join(resource_hashes).encode('utf-8'))
def path_to_retired_dir_for_item(self, field_name, item_id, item_value):
key = icu_lower(item_value or '')
return os.path.join(self.retired_dir, hash_key(f'{field_name} {key}'))
def retire_entry(self, field_name, item_id, item_value, resources, note_id): def retire_entry(self, field_name, item_id, item_value, resources, note_id):
path = make_long_path_useable(os.path.join(self.backup_dir, field_name, str(item_id))) path = make_long_path_useable(os.path.join(self.backup_dir, field_name, str(item_id)))
if os.path.exists(path): if os.path.exists(path):
key = icu_lower(item_value or '') destdir = self.path_to_retired_dir_for_item(field_name, item_id, item_value)
destdir = os.path.join(self.retired_dir, hash_key(f'{field_name} {key}'))
os.makedirs(make_long_path_useable(destdir), exist_ok=True) os.makedirs(make_long_path_useable(destdir), exist_ok=True)
dest = os.path.join(destdir, DOC_NAME) dest = os.path.join(destdir, DOC_NAME)
os.replace(path, make_long_path_useable(dest)) os.replace(path, make_long_path_useable(dest))
@ -177,8 +180,7 @@ class Notes:
self.trim_retired_dir() self.trim_retired_dir()
def unretire(self, conn, field_name, item_id, item_value) -> int: def unretire(self, conn, field_name, item_id, item_value) -> int:
key = icu_lower(item_value or '') srcdir = make_long_path_useable(self.path_to_retired_dir_for_item(field_name, item_id, item_value))
srcdir = make_long_path_useable(os.path.join(self.retired_dir, hash_key(f'{field_name} {key}')))
note_id = -1 note_id = -1
if not os.path.exists(srcdir) or self.note_id_for(conn, field_name, item_id) is not None: if not os.path.exists(srcdir) or self.note_id_for(conn, field_name, item_id) is not None:
return note_id return note_id
@ -199,6 +201,10 @@ class Notes:
remove_with_retry(srcdir, is_dir=True) remove_with_retry(srcdir, is_dir=True)
return note_id return note_id
def remove_retired_entry(self, field_name, item_id, item_value):
srcdir = self.path_to_retired_dir_for_item(field_name, item_id, item_value)
remove_with_retry(srcdir, is_dir=True)
def set_note(self, conn, field_name, item_id, item_value, marked_up_text='', used_resource_hashes=(), searchable_text=copy_marked_up_text): def set_note(self, conn, field_name, item_id, item_value, marked_up_text='', used_resource_hashes=(), searchable_text=copy_marked_up_text):
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
@ -221,6 +227,7 @@ class Notes:
resources_to_potentially_remove = old_resources - new_resources resources_to_potentially_remove = old_resources - new_resources
resources_to_add = new_resources - old_resources resources_to_add = new_resources - old_resources
if note_id is None: if note_id is None:
self.remove_retired_entry(field_name, item_id, item_value)
note_id = conn.get(''' note_id = conn.get('''
INSERT INTO notes_db.notes (item,colname,doc,searchable_text) VALUES (?,?,?,?) RETURNING notes.id; INSERT INTO notes_db.notes (item,colname,doc,searchable_text) VALUES (?,?,?,?) RETURNING notes.id;
''', (item_id, field_name, marked_up_text, searchable_text), all=False) ''', (item_id, field_name, marked_up_text, searchable_text), all=False)

10
src/calibre/db/tests/notes.py
View File

@ -55,6 +55,16 @@ def test_notes_api(self: 'NotesTest'):
self.ae(cache.get_notes_resource(h1)['data'], b'resource1') self.ae(cache.get_notes_resource(h1)['data'], b'resource1')
self.ae(cache.get_notes_resource(h2)['data'], b'resource2') self.ae(cache.get_notes_resource(h2)['data'], b'resource2')
# test that retired entries are removed when setting a non-empty value
h1 = cache.add_notes_resource(b'resource1', 'r1.jpg')
cache.set_notes_for('authors', authors[0], doc2, resource_hashes=(h1,))
self.ae(len(os.listdir(notes.retired_dir)), 0)
cache.set_notes_for('authors', authors[0], '', resource_hashes=())
self.ae(len(os.listdir(notes.retired_dir)), 1)
cache.set_notes_for('authors', authors[0], doc2, resource_hashes=(h1,))
self.ae(len(os.listdir(notes.retired_dir)), 0)
cache.set_notes_for('authors', authors[0], '', resource_hashes=())
self.ae(len(os.listdir(notes.retired_dir)), 1)
def test_cache_api(self: 'NotesTest'): def test_cache_api(self: 'NotesTest'):
cache, notes = self.create_notes_db() cache, notes = self.create_notes_db()