* feat(backup): include global settings in backup zip
Backup zips previously held only book files and library.json. Issue
#4098 asks for app configuration to be backed up too.
A `settings.json` snapshot is now written at the zip root. Restore
deep-merges it onto the current device's settings, so fields the
snapshot omits keep their current values.
`sanitizeSettingsForBackup` strips, via a blacklist, fields that are
device-specific or sync/migration bookkeeping (filesystem paths,
replica/kosync device ids, sync cursors, lastOpenBooks, screen
brightness, schema versions). Account credentials (kosync/Readwise/
Hardcover tokens, AI gateway key, OPDS catalog logins) are stripped
unless the user opts in via a new "Include account credentials"
checkbox in the Backup & Restore dialog — the zip is unencrypted.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(backup): keep revived books visible after a cloud-synced restore
When the library is deleted (soft delete) and the deletion has synced
to the cloud, restoring an older backup un-deletes the books locally —
but the next sync's last-writer-wins merge re-applied the cloud's
deletion tombstone, so the restored books vanished again.
The deletion never bumps `updatedAt`, so a restored book and its cloud
tombstone share the same timestamp; `processOldBook` breaks the tie
toward the cloud.
`reviveRestoredBooks` now fixes up books that were soft-deleted locally
but present in the backup:
- Bumps `updatedAt` so the restore out-ranks the cloud tombstone. A
single uniform offset is applied to every revived book, so their
relative order — and the library's "Updated" sort — is preserved
exactly; the newest maps to now, none land in the future.
- Clears `syncedAt` so the next push re-uploads them and corrects the
cloud rows.
- Restores `downloadedAt` / `coverDownloadedAt` from the backup record
(the local deletion had cleared them) so revived books are not shown
as not-downloaded even though their files were re-extracted.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Huang Xin
52f9634810