Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dont fail when trying to read/write annotations to un-upgraded db

Browse Source
This commit is contained in:
Kovid Goyal 2020-07-05 21:32:09 +05:30
parent 6b48a7c353
commit be61b2612c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/gui2/viewer/integration.py
View File

@ -21,6 +21,10 @@ def get_book_library_details(absolute_path_to_ebook):
return {'dbpath': dbpath, 'book_id': book_id, 'fmt': absolute_path_to_ebook.rpartition('.')[-1].upper()}
def database_has_annotations_support(cursor):
return next(cursor.execute('pragma user_version;'))[0] > 23
def load_annotations_map_from_library(book_library_details):
import apsw
from calibre.db.backend import annotations_for_book, Connection
@ -32,7 +36,10 @@ def load_annotations_map_from_library(book_library_details):
return ans
try:
conn.setbusytimeout(Connection.BUSY_TIMEOUT)
for annot in annotations_for_book(conn.cursor(), book_library_details['book_id'], book_library_details['fmt']):
cursor = conn.cursor()
if not database_has_annotations_support(cursor):
return ans
for annot in annotations_for_book(cursor, book_library_details['book_id'], book_library_details['fmt']):
ans.setdefault(annot['type'], []).append(annot)
finally:
conn.close()
@ -51,6 +58,8 @@ def save_annotations_list_to_library(book_library_details, alist):
return
try:
conn.setbusytimeout(Connection.BUSY_TIMEOUT)
if not database_has_annotations_support(conn.cursor()):
return
amap = {}
with conn:
cursor = conn.cursor()