Elgato_dark/readest
1
0
Fork 0
mirror of https://github.com/readest/readest synced 2026-04-21 13:37:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(kosync): send valid progress to kosync server when closing book, closes #3899 (#3901)

Browse source
This commit is contained in:
Huang Xin 2026-04-20 21:16:25 +08:00 committed by GitHub
parent e1dad98e56
commit 293cc545db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/readest-app/src/app/reader/hooks/useKOSync.ts
View file

@ -10,7 +10,6 @@ import { BookDoc } from '@/libs/document';
import { debounce } from '@/utils/debounce';
import { eventDispatcher } from '@/utils/event';
import { getCFIFromXPointer, XCFI } from '@/utils/xcfi';
import { useWindowActiveChanged } from './useWindowActiveChanged';
type SyncState = 'idle' | 'checking' | 'conflict' | 'synced' | 'error';
@ -33,7 +32,7 @@ export const useKOSync = (bookKey: string) => {
const { appService } = useEnv();
const { settings } = useSettingsStore();
const { getProgress, getView } = useReaderStore();
const { getBookData } = useBookDataStore();
const { getBookData, getConfig, setConfig } = useBookDataStore();
const [kosyncClient, setKOSyncClient] = useState<KOSyncClient | null>(null);
const [syncState, setSyncState] = useState<SyncState>('idle');
@ -66,6 +65,7 @@ export const useKOSync = (bookKey: string) => {
percentage = totalPages > 0 ? (page + 1) / totalPages : 0;
} else {
const view = getView(bookKey);
const config = getConfig(bookKey);
const cfi = progress.location;
if (!view || !cfi) return null;
try {
@ -77,6 +77,9 @@ export const useKOSync = (bookKey: string) => {
const converter = new XCFI(doc, spineIndex || 0);
const xpointerResult = converter.cfiToXPointer(cfi);
koProgress = xpointerResult.xpointer;
setConfig(bookKey, { xpointer: koProgress });
} else if (config?.xpointer) {
koProgress = config.xpointer;
}
} catch (error) {
console.error('Failed to convert CFI to XPointer', error);
@ -88,7 +91,7 @@ export const useKOSync = (bookKey: string) => {
}
return { koProgress, percentage };
}, [bookKey, getProgress, getBookData, getView]);
}, [bookKey, getProgress, getBookData, getView, getConfig, setConfig]);
const applyRemoteProgress = async (book: Book, bookDoc: BookDoc, remote: KoSyncProgress) => {
const view = getView(bookKey);

9
apps/readest-app/src/services/nav/fragments.ts
View file

@ -38,8 +38,13 @@ type CFIModule = {
const buildFragmentCfi = (section: SectionItem, element: Element | null): string => {
const cfiLib = CFI as unknown as CFIModule;
const rel = element ? (cfiLib.fromElements([element])[0] ?? '') : '';
return cfiLib.joinIndir(section.cfi, rel);
try {
const rel = element ? (cfiLib.fromElements([element])[0] ?? '') : '';
return cfiLib.joinIndir(section.cfi, rel);
} catch (e) {
console.warn('Failed to build CFI for fragment, falling back to section CFI:', e);
return section.cfi;
}
};
export const buildSectionFragments = (