fix: dont override original spine item id

Author: mbret

packages/core/src/cfi/generate.test.ts

@@ -29,7 +29,7 @@ describe("generateCfiForSpineItemPage", () => {
   }
 
   const spreadSpineItem: Manifest["spineItems"][number] = {
-    id: "pr-img-c3ByZWFkLmpwZw",
+    id: "1.spread.jpg",
     href: "wrapper.xhtml",
     index: 1,
     renditionLayout: "reflowable",
@@ -46,7 +46,7 @@ describe("generateCfiForSpineItemPage", () => {
         pageIndex: 0,
         readingDirection: "ltr",
       }),
-    ).toBe("epubcfi(/6/4[pr-img-c3ByZWFkLmpwZw]!/4/2/2[spread-image]@25:50)")
+    ).toBe("epubcfi(/6/4[1.spread.jpg]!/4/2/2[spread-image]@25:50)")
   })
 
   it("should reverse spread spatial offsets for right-to-left reading", () => {
@@ -59,6 +59,6 @@ describe("generateCfiForSpineItemPage", () => {
         pageIndex: 0,
         readingDirection: "rtl",
       }),
-    ).toBe("epubcfi(/6/4[pr-img-c3ByZWFkLmpwZw]!/4/2/2[spread-image]@75:50)")
+    ).toBe("epubcfi(/6/4[1.spread.jpg]!/4/2/2[spread-image]@75:50)")
   })
 })

packages/streamer/src/cbz/pageSpreadSplitManifest.test.ts

@@ -186,12 +186,24 @@ describe("pageSpreadSplit", () => {
       spineItems: [
         {
           href: encodeURI(`file://${resourcePath}`),
-          id: wrapperId,
+          id: "1.p006-007.jpg",
           mediaType: IMAGE_WRAPPER_DOCUMENT_MEDIA_TYPE,
           renditionFlow: "paginated",
           renditionLayout: "reflowable",
         },
       ],
+      items: [
+        {
+          href: `file://${nestedUri}`,
+          id: "1.p006-007.jpg",
+          mediaType: "image/jpeg",
+        },
+        {
+          href: encodeURI(`file://${resourcePath}`),
+          id: wrapperId,
+          mediaType: IMAGE_WRAPPER_DOCUMENT_MEDIA_TYPE,
+        },
+      ],
     })
 
     expect(decodeImageWrapperIdToOriginalUri(wrapperId)).toBe(nestedUri)

packages/streamer/src/cbz/pageSpreadSplitManifest.ts

@@ -141,14 +141,13 @@ const createImageWrapperSpineItem = ({
   originalSpineItem: SpineItem
   originalUri: string
 }): SpineItem => {
-  const id = buildImageWrapperIdFromOriginalUri(originalUri)
+  const wrapperId = buildImageWrapperIdFromOriginalUri(originalUri)
   const resourcePath = buildImageWrapperResourcePath({
-    wrapperId: id,
+    wrapperId,
   })
 
   return {
     ...originalSpineItem,
-    id,
     href: createManifestResourceHref({ baseUrl, resourcePath }),
     mediaType: IMAGE_WRAPPER_DOCUMENT_MEDIA_TYPE,
     pageSpreadLeft: undefined,
@@ -160,11 +159,13 @@ const createImageWrapperSpineItem = ({
 
 const createImageWrapperManifestItem = ({
   href,
-  id,
   mediaType,
-}: Pick<ManifestItem, "href" | "id" | "mediaType">): ManifestItem => ({
+  originalUri,
+}: Pick<ManifestItem, "href" | "mediaType"> & {
+  originalUri: string
+}): ManifestItem => ({
   href,
-  id,
+  id: buildImageWrapperIdFromOriginalUri(originalUri),
   mediaType,
 })
 
@@ -272,7 +273,11 @@ export const pageSpreadSplit =
       })
 
       imageWrapperManifestItems.push(
-        createImageWrapperManifestItem(wrapperSpineItem),
+        createImageWrapperManifestItem({
+          href: wrapperSpineItem.href,
+          mediaType: wrapperSpineItem.mediaType,
+          originalUri: archiveRecord.uri,
+        }),
       )
 
       return wrapperSpineItem

packages/streamer/src/generators/manifest/index.test.ts

@@ -237,7 +237,7 @@ describe("Given a non-epub image archive with a two-page spread filename", () =>
     }
 
     const manifest = await generateManifestFromArchive(archive)
-    const spreadId = buildImageWrapperIdFromOriginalUri(spreadBasename)
+    const wrapperId = buildImageWrapperIdFromOriginalUri(spreadBasename)
 
     expect(manifest.spineItems).toEqual([
       {
@@ -256,7 +256,7 @@ describe("Given a non-epub image archive with a two-page spread filename", () =>
             originalUri: spreadBasename,
           })}`,
         ),
-        id: spreadId,
+        id: `1.${spreadBasename}`,
         index: 1,
         mediaType: IMAGE_WRAPPER_DOCUMENT_MEDIA_TYPE,
         pageSpreadLeft: undefined,
@@ -283,7 +283,7 @@ describe("Given a non-epub image archive with a two-page spread filename", () =>
           originalUri: spreadBasename,
         })}`,
       ),
-      id: spreadId,
+      id: wrapperId,
       mediaType: IMAGE_WRAPPER_DOCUMENT_MEDIA_TYPE,
     })
   })
@@ -317,12 +317,11 @@ describe("Given a non-epub image archive with a two-page spread filename", () =>
     }
 
     const manifest = await generateManifestFromArchive(archive)
-    const spreadId = buildImageWrapperIdFromOriginalUri(spreadBasename)
 
     expect(manifest.readingDirection).toBe("rtl")
     expect(manifest.spineItems).toMatchObject([
       {
-        id: spreadId,
+        id: `1.${spreadBasename}`,
         pageSpreadLeft: undefined,
         pageSpreadRight: undefined,
         renditionFlow: "paginated",