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

Implement merging of removed bookmarks

Browse Source 
Also update timestamp when they are modified
This commit is contained in:
Kovid Goyal 2020-07-09 09:54:18 +05:30
parent 6e2e3ce9fb
commit 3839f92327
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/calibre/gui2/viewer/bookmarks.py
View File

@ -151,8 +151,13 @@ class BookmarkManager(QWidget):
i.setData(Qt.UserRole, self.bm_to_item(bm)) i.setData(Qt.UserRole, self.bm_to_item(bm))
i.setFlags(i.flags() | Qt.ItemIsEditable) i.setFlags(i.flags() | Qt.ItemIsEditable)
self.bookmarks_list.addItem(i) self.bookmarks_list.addItem(i)
if self.bookmarks_list.count() > 0: if bm.get('removed'):
self.bookmarks_list.setCurrentItem(self.bookmarks_list.item(0), QItemSelectionModel.ClearAndSelect) i.setHidden(True)
for i in range(self.bookmarks_list.count()):
item = self.bookmarks_list.item(i)
if not item.isHidden():
self.bookmarks_list.setCurrentItem(item, QItemSelectionModel.ClearAndSelect)
break
def set_current_bookmark(self, bm): def set_current_bookmark(self, bm):
for i, q in enumerate(self): for i, q in enumerate(self):
@ -167,6 +172,14 @@ class BookmarkManager(QWidget):
yield self.item_to_bm(self.bookmarks_list.item(i)) yield self.item_to_bm(self.bookmarks_list.item(i))
def uniqify_bookmark_title(self, base): def uniqify_bookmark_title(self, base):
remove = []
for i in range(self.bookmarks_list.count()):
item = self.bookmarks_list.item(i)
bm = item.data(Qt.UserRole)
if bm.get('removed') and bm['title'] == base:
remove.append(i)
for i in reversed(remove):
self.bookmarks_list.takeItem(i)
all_titles = {bm['title'] for bm in self.get_bookmarks()} all_titles = {bm['title'] for bm in self.get_bookmarks()}
c = 0 c = 0
q = base q = base
@ -180,16 +193,23 @@ class BookmarkManager(QWidget):
title = unicode_type(item.data(Qt.DisplayRole)) or _('Unknown') title = unicode_type(item.data(Qt.DisplayRole)) or _('Unknown')
title = self.uniqify_bookmark_title(title) title = self.uniqify_bookmark_title(title)
item.setData(Qt.DisplayRole, title) item.setData(Qt.DisplayRole, title)
bm = self.item_to_bm(item) bm = item.data(Qt.UserRole)
bm['title'] = title bm['title'] = title
item.setData(Qt.UserRole, self.bm_to_item(bm)) bm['timestamp'] = utcnow().isoformat()
item.setData(Qt.UserRole, bm)
self.bookmarks_list.blockSignals(False) self.bookmarks_list.blockSignals(False)
self.edited.emit(self.get_bookmarks()) self.edited.emit(self.get_bookmarks())
def delete_bookmark(self): def delete_bookmark(self):
row = self.bookmarks_list.currentRow() item = self.bookmarks_list.currentItem()
if row > -1: if item is not None:
self.bookmarks_list.takeItem(row) bm = item.data(Qt.UserRole)
bm['removed'] = True
bm['timestamp'] = utcnow().isoformat()
self.bookmarks_list.blockSignals(True)
item.setData(Qt.UserRole, bm)
self.bookmarks_list.blockSignals(False)
item.setHidden(True)
self.edited.emit(self.get_bookmarks()) self.edited.emit(self.get_bookmarks())
def edit_bookmark(self): def edit_bookmark(self):
@ -229,7 +249,8 @@ class BookmarkManager(QWidget):
self, 'export-viewer-bookmarks', _('Export bookmarks'), self, 'export-viewer-bookmarks', _('Export bookmarks'),
filters=[(_('Saved bookmarks'), ['calibre-bookmarks'])], all_files=False, initial_filename='bookmarks.calibre-bookmarks') filters=[(_('Saved bookmarks'), ['calibre-bookmarks'])], all_files=False, initial_filename='bookmarks.calibre-bookmarks')
if filename: if filename:
data = json.dumps({'type': 'bookmarks', 'entries': self.get_bookmarks()}, indent=True) bm = [x for x in self.get_bookmarks() if not x.get('removed')]
data = json.dumps({'type': 'bookmarks', 'entries': bm}, indent=True)
if not isinstance(data, bytes): if not isinstance(data, bytes):
data = data.encode('utf-8') data = data.encode('utf-8')
with lopen(filename, 'wb') as fileobj: with lopen(filename, 'wb') as fileobj:
@ -259,7 +280,7 @@ class BookmarkManager(QWidget):
if bm['title'] == 'calibre_current_page_bookmark': if bm['title'] == 'calibre_current_page_bookmark':
continue continue
epubcfi = 'epubcfi(/{}/{})'.format((bm['spine'] + 1) * 2, bm['pos'].lstrip('/')) epubcfi = 'epubcfi(/{}/{})'.format((bm['spine'] + 1) * 2, bm['pos'].lstrip('/'))
q = {'pos_type': 'epubcfi', 'pos': epubcfi, 'timestamp': EPOCH, 'title': bm['title']} q = {'pos_type': 'epubcfi', 'pos': epubcfi, 'timestamp': EPOCH.isoformat(), 'title': bm['title']}
if q not in bookmarks: if q not in bookmarks:
bookmarks.append(q) bookmarks.append(q)
self.set_bookmarks(bookmarks) self.set_bookmarks(bookmarks)
@ -301,7 +322,7 @@ class BookmarkManager(QWidget):
'title': title, 'title': title,
'pos_type': 'epubcfi', 'pos_type': 'epubcfi',
'pos': pos_data['cfi'], 'pos': pos_data['cfi'],
'timestamp': utcnow() 'timestamp': utcnow().isoformat(),
} }
bookmarks = self.get_bookmarks() bookmarks = self.get_bookmarks()
bookmarks.append(bm) bookmarks.append(bm)