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

Future proof backing up of resource metadata

Browse Source 
Store the metadata as json instead of plain text so we can add more
fields if needed in the future.
This commit is contained in:
Kovid Goyal 2023-09-04 20:15:56 +05:30
parent d120efdced
commit 00936dbafb
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
# License: GPLv3 Copyright: 2023, Kovid Goyal <kovid at kovidgoyal.net> # License: GPLv3 Copyright: 2023, Kovid Goyal <kovid at kovidgoyal.net>
import apsw import apsw
import json
import os import os
import shutil import shutil
import time import time
@ -30,6 +31,7 @@ class cmt(str):
copy_marked_up_text = cmt() copy_marked_up_text = cmt()
SEP = b'\0\x1c\0' SEP = b'\0\x1c\0'
DOC_NAME = 'doc.html' DOC_NAME = 'doc.html'
METADATA_EXT = '.metadata'
def hash_data(data: bytes) -> str: def hash_data(data: bytes) -> str:
@ -131,7 +133,7 @@ class Notes:
for (x,) in conn.execute(stmt, resources_to_potentially_remove): for (x,) in conn.execute(stmt, resources_to_potentially_remove):
p = self.path_for_resource(x) p = self.path_for_resource(x)
remove_with_retry(p) remove_with_retry(p)
remove_with_retry(p + '.name') remove_with_retry(p + METADATA_EXT)
def note_id_for(self, conn, field_name, item_id): def note_id_for(self, conn, field_name, item_id):
return conn.get('SELECT id FROM notes_db.notes WHERE item=? AND colname=?', (item_id, field_name), all=False) return conn.get('SELECT id FROM notes_db.notes WHERE item=? AND colname=?', (item_id, field_name), all=False)
@ -302,8 +304,8 @@ class Notes:
while True: while True:
try: try:
conn.execute('UPDATE notes_db.resources SET name=? WHERE hash=?', (name, resource_hash)) conn.execute('UPDATE notes_db.resources SET name=? WHERE hash=?', (name, resource_hash))
with open(path + '.name', 'w') as fn: with open(path + METADATA_EXT, 'w') as fn:
fn.write(name) fn.write(json.dumps({'name':name}))
break break
except apsw.ConstraintError: except apsw.ConstraintError:
c += 1 c += 1
@ -313,8 +315,8 @@ class Notes:
while True: while True:
try: try:
conn.get('INSERT INTO notes_db.resources (hash,name) VALUES (?,?)', (resource_hash, name), all=False) conn.get('INSERT INTO notes_db.resources (hash,name) VALUES (?,?)', (resource_hash, name), all=False)
with open(path + '.name', 'w') as fn: with open(path + METADATA_EXT, 'w') as fn:
fn.write(name) fn.write(json.dumps({'name':name}))
break break
except apsw.ConstraintError: except apsw.ConstraintError:
c += 1 c += 1
@ -389,10 +391,10 @@ class Notes:
errors = [] errors = []
for subdir in os.listdir(make_long_path_useable(self.resources_dir)): for subdir in os.listdir(make_long_path_useable(self.resources_dir)):
for rf in os.listdir(make_long_path_useable(os.path.join(self.resources_dir, subdir))): for rf in os.listdir(make_long_path_useable(os.path.join(self.resources_dir, subdir))):
name_path = os.path.join(self.resources_dir, subdir, rf + '.name') name_path = os.path.join(self.resources_dir, subdir, rf + METADATA_EXT)
name = 'unnamed' name = 'unnamed'
with suppress(OSError), open(make_long_path_useable(name_path)) as n: with suppress(OSError), open(make_long_path_useable(name_path)) as n:
name = n.read() name = json.loads(n.read())['name']
resources[rf] = name resources[rf] = name
items = {} items = {}
for f in os.listdir(make_long_path_useable(self.backup_dir)): for f in os.listdir(make_long_path_useable(self.backup_dir)):