Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2026-04-01 23:02:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move some function definitions out of branches

Browse Source
This commit is contained in:
Kovid Goyal 2026-03-24 21:26:02 +05:30
parent 404ee855f1
commit c97e98e60b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pyj/read_book/db.pyj
View File

@ -155,15 +155,16 @@ class DB:
idb.close()
self.show_error(_('Database upgraded!'), _(
'A newer version of calibre is available, please click the Reload button in your browser.'))
def try_persist(lock):
if not lock:
return # another tab is already requesting persistence
return window.navigator.storage.persisted().then(def(already_persistent):
if not already_persistent:
return window.navigator.storage.persist()
)
if window.navigator.storage?.persist:
if window.navigator.locks:
def try_persist(lock):
if not lock:
return # another tab is already requesting persistence
return window.navigator.storage.persisted().then(def(already_persistent):
if not already_persistent:
return window.navigator.storage.persist()
)
window.navigator.locks.request('calibre-storage-persist', {'ifAvailable': True}, try_persist)
else:
window.navigator.storage.persisted().then(def(already_persistent):
@ -211,7 +212,7 @@ class DB:
def get_all_pending_annot_uploads(self, proceed):
transaction = self.idb.transaction(['objects'])
store = transaction.objectStore('objects')
key_range = IDBKeyRange.bound('pending-annot-upload:', 'pending-annot-upload:\uffff')
key_range = IDBKeyRange.bound('pending-annot-upload:', 'pending-annot-upload:\uffff') # noqa
entries = v'[]'
req = store.openCursor(key_range)
req.onsuccess = def(event):

29
src/pyj/read_book/ui.pyj
View File

@ -325,21 +325,22 @@ class ReadUI:
self._make_annot_upload_done(library_id, book_id, fmt))
def _make_annot_upload_done(self, library_id, book_id, fmt):
def on_cleared():
if (self.unsynced_amap is not None and self.base_url_data
and self.base_url_data.library_id is library_id
and str(self.base_url_data.book_id) is str(book_id)
and self.base_url_data.fmt is fmt):
self.unsynced_amap = None
if self.unsynced_indicator_timer:
window.clearTimeout(self.unsynced_indicator_timer)
self.unsynced_indicator_timer = None
if self.unsynced_indicator_active:
self.unsynced_indicator_active = False
self.view.show_unsynced_indicator(False)
self._upload_next_from_idb()
def done(end_type, xhr, ev):
if end_type is 'load':
def on_cleared():
if (self.unsynced_amap is not None and self.base_url_data
and self.base_url_data.library_id is library_id
and str(self.base_url_data.book_id) is str(book_id)
and self.base_url_data.fmt is fmt):
self.unsynced_amap = None
if self.unsynced_indicator_timer:
window.clearTimeout(self.unsynced_indicator_timer)
self.unsynced_indicator_timer = None
if self.unsynced_indicator_active:
self.unsynced_indicator_active = False
self.view.show_unsynced_indicator(False)
self._upload_next_from_idb()
self.db.clear_pending_annot_upload(library_id, book_id, fmt, on_cleared)
return done
@ -379,7 +380,7 @@ class ReadUI:
self._make_annot_upload_done(library_id, book_id, fmt))
callback(True)
return
# unsynced_amap is None — page may have been killed or this is another book;
# unsynced_amap is None — page may have been killed or this is another book
# check IDB for surviving entries
self.db.get_all_pending_annot_uploads(def(entries):
if not entries.length: