Merge branch 'rollback' into main

arkalab · Jul 16, 2024 · 5957b84 · 5957b84
2 parents 599dde1 + 6e31195
commit 5957b84
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 30 deletions.
diff --git a/src/plugin.js b/src/plugin.js
@@ -83,24 +83,16 @@ class TropiiifyPlugin {
             manifest.addLabel(item.label);
           });
           if (index === 0) {
-            const {
-              path: imagePath,
-              checksum,
-              width,
-              height,
-              mimetype,
-            } = item.photo[0];
+            const { checksum, width, height } = item.photo[0];
             const ratio = Math.max(width, height) / 300;
             const newWidth = Math.round(width / ratio);
             const newHeight = Math.round(height / ratio);
             collection.addThumbnail({
               id: `${item.baseId}/${checksum}/full/${Math.round(
                 newWidth
-              )},${Math.round(newHeight)}/0/default${
-                path.extname(imagePath) || ".jpg"
-              }`,
+              )},${Math.round(newHeight)}/0/default.jpg`,
               type: "Image",
-              format: mimetype,
+              format: "image/jpeg",
               width: newWidth,
               height: newHeight,
             });
@@ -235,7 +227,7 @@ class TropiiifyPlugin {
               "full",
               `${width},${height}`,
               "0",
-              `default${path.extname(photo.path) || ".jpg"}`
+              "default.jpg"
             );
             fs.promises
               .mkdir(path.dirname(destination), { recursive: true })

diff --git a/src/resource.js b/src/resource.js
@@ -95,13 +95,9 @@ class Resource {
         });
         //props.latitude && props.longitude && manifest.addNavPlace(latitude, longitude)
         manifest.addThumbnail({
-          id: `${this.baseId}/${
-            this.photo[0].checksum
-          }/full/${thumbWidth},${thumbHeight}/0/default${
-            path.extname(this.photo[0].path) || ".jpg"
-          }`,
+          id: `${this.baseId}/${this.photo[0].checksum}/full/${thumbWidth},${thumbHeight}/0/default.jpg`,
           type: "Image",
-          format: this.photo[0].mimetype,
+          format: "image/jpeg",
           width: thumbWidth,
           height: thumbHeight,
         });
@@ -134,23 +130,15 @@ class Resource {
       const canvasId = `${this.baseId}/canvas/${canvasIndex + 1}`; //0266-full-canvas-annotation/canvas-x
       const annPageId = `${canvasId}/annopage-1`; //0266-full-canvas-annotation/canvas-x/annopage-1",
       const paintingAnnId = `${annPageId}/anno-1`; //0266-full-canvas-annotation/canvas-x/annopage-1/anno-1
-      const paintingBodyId = `${this.baseId}/${
-        photo.checksum
-      }/full/${midWidth},${midHeight}/0/default${
-        path.extname(photo.path) || ".jpg"
-      }`;
+      const paintingBodyId = `${this.baseId}/${photo.checksum}/full/${midWidth},${midHeight}/0/default.jpg`;
       manifest.createCanvas(canvasId, (canvas) => {
         canvas.width = photo.width;
         canvas.height = photo.height;
         canvas.addLabel(photo.label || "");
         canvas.addThumbnail({
-          id: `${this.baseId}/${
-            photo.checksum
-          }/full/${thumbWidth},${thumbHeight}/0/default${
-            path.extname(photo.path) || ".jpg"
-          }`,
+          id: `${this.baseId}/${photo.checksum}/full/${thumbWidth},${thumbHeight}/0/default.jpg`,
           type: "Image",
-          format: photo.mimetype,
+          format: "image/jpeg",
           width: thumbWidth,
           height: thumbHeight,
         });
@@ -162,7 +150,7 @@ class Resource {
             body: {
               id: paintingBodyId,
               type: "Image",
-              format: photo.mimetype,
+              format: "image/jpeg",
               width: midWidth,
               height: midHeight,
               service: [