Use splitTOCHref to support other ebook formats as discussed in foliate-js#45

apps/readest-app/src/libs/document.ts

@@ -59,6 +59,7 @@ export interface BookDoc {
   };
   toc: Array<TOCItem>;
   sections: Array<SectionItem>;
+  splitTOCHref(href: string): Array<string | number>;
   getCover(): Promise<Blob | null>;
 }
 

apps/readest-app/src/store/readerStore.ts

@@ -114,13 +114,13 @@ export const useReaderStore = create<ReaderStore>((set, get) => ({
         console.log('Loading book', key);
         const { book: loadedBookDoc } = await new DocumentLoader(file).open();
         const bookDoc = loadedBookDoc as BookDoc;
-        if (bookDoc.toc && bookDoc.sections) {
+        if (bookDoc.toc?.length > 0 && bookDoc.sections?.length > 0) {
           updateTocID(bookDoc.toc);
           const sections = bookDoc.sections.reduce((map: Record<string, SectionItem>, section) => {
             map[section.id] = section;
             return map;
           }, {});
-          updateTocCFI(bookDoc.toc, sections);
+          updateTocCFI(bookDoc, bookDoc.toc, sections);
         }
         useBookDataStore.setState((state) => ({
           booksData: {

apps/readest-app/src/utils/toc.ts

@@ -1,4 +1,4 @@
-import { SectionItem, TOCItem, CFI } from '@/libs/document';
+import { SectionItem, TOCItem, CFI, BookDoc } from '@/libs/document';
 
 export const findParentPath = (toc: TOCItem[], href: string): TOCItem[] => {
   for (const item of toc) {
@@ -47,17 +47,21 @@ export const updateTocID = (items: TOCItem[], index = 0): number => {
   return index;
 };
 
-export const updateTocCFI = (items: TOCItem[], sections: { [id: string]: SectionItem }): void => {
+export const updateTocCFI = (
+  bookDoc: BookDoc,
+  items: TOCItem[],
+  sections: { [id: string]: SectionItem },
+): void => {
   items.forEach((item) => {
     if (item.href) {
-      const id = item.href.split('#')[0]!;
+      const id = bookDoc.splitTOCHref(item.href)[0]!;
       const section = sections[id];
       if (section) {
         item.cfi = section.cfi;
       }
     }
     if (item.subitems) {
-      updateTocCFI(item.subitems, sections);
+      updateTocCFI(bookDoc, item.subitems, sections);
     }
   });
 };