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 annotation merging

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

6
src/calibre/db/cache.py
View File

@ -2346,11 +2346,15 @@ class Cache(object):
@write_api @write_api
def merge_annotations_for_book(self, book_id, fmt, annots_list, user_type='local', user='viewer'): def merge_annotations_for_book(self, book_id, fmt, annots_list, user_type='local', user='viewer'):
from calibre.utils.iso8601 import parse_iso8601
from calibre.utils.date import EPOCH
amap = self._annotations_map_for_book(book_id, fmt, user_type=user_type, user=user) amap = self._annotations_map_for_book(book_id, fmt, user_type=user_type, user=user)
merge_annotations(annots_list, amap) merge_annotations(annots_list, amap)
alist = [] alist = []
for val in itervalues(amap): for val in itervalues(amap):
alist.extend(val) for annot in val:
ts = (parse_iso8601(annot['timestamp']) - EPOCH).total_seconds()
alist.append((annot, ts))
self._set_annotations_for_book(book_id, fmt, alist, user_type=user_type, user=user) self._set_annotations_for_book(book_id, fmt, alist, user_type=user_type, user=user)