Remove slide size probing from bbb-export-annotations

danielpetri1 · Sep 24, 2024 · 82b02e7 · 82b02e7
1 parent b3d1e7d
commit 82b02e7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 164 deletions.
diff --git a/...cala/org/bigbluebutton/core/apps/presentationpod/MakePresentationDownloadReqMsgHdlr.scala b/...cala/org/bigbluebutton/core/apps/presentationpod/MakePresentationDownloadReqMsgHdlr.scala
@@ -103,13 +103,11 @@ trait MakePresentationDownloadReqMsgHdlr extends RightsManagementTrait {
 
           val whiteboardId = s"${presId}/${pageNumber.toString}"
           val presentationPage: PresentationPage = currentPres.get.pages(whiteboardId)
-          val xOffset: Double = presentationPage.xOffset
-          val yOffset: Double = presentationPage.yOffset
-          val widthRatio: Double = presentationPage.widthRatio
-          val heightRatio: Double = presentationPage.heightRatio
+          val width: Double = presentationPage.width
+          val height: Double = presentationPage.height
           val whiteboardHistory: Array[AnnotationVO] = liveMeeting.wbModel.getHistory(whiteboardId)
 
-          val page = new PresentationPageForExport(pageNumber, xOffset, yOffset, widthRatio, heightRatio, whiteboardHistory)
+          val page = new PresentationPageForExport(pageNumber, width, height, whiteboardHistory)
           getPresentationPagesForExport(pages, pageCount, presId, currentPres, liveMeeting, storeAnnotationPages :+ page)
         } else {
           getPresentationPagesForExport(pages, pageCount, presId, currentPres, liveMeeting, storeAnnotationPages)

diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WhiteboardMsgs.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WhiteboardMsgs.scala
@@ -5,10 +5,8 @@ case class AnnotationVO(id: String, annotationInfo: scala.collection.immutable.M
 
 case class PresentationPageForExport(
   page: Int,
-  xOffset: Double,
-  yOffset: Double,
-  widthRatio: Double,
-  heightRatio: Double,
+  width: Double,
+  height: Double,
   annotations: Array[AnnotationVO],
 )
 

diff --git a/bbb-export-annotations/package-lock.json b/bbb-export-annotations/package-lock.json
diff --git a/bbb-export-annotations/package.json b/bbb-export-annotations/package.json
@@ -13,7 +13,6 @@
     "form-data": "^4.0.0",
     "opentype.js": "^1.3.4",
     "perfect-freehand": "^1.0.16",
-    "probe-image-size": "^7.2.3",
     "redis": "^4.0.3",
     "sanitize-filename": "^1.6.3",
     "svgdom": "^0.1.17"

diff --git a/bbb-export-annotations/workers/process.js b/bbb-export-annotations/workers/process.js
@@ -7,7 +7,6 @@ import WorkerStarter from '../lib/utils/worker-starter.js';
 import {workerData} from 'worker_threads';
 import path from 'path';
 import sanitize from 'sanitize-filename';
-import probe from 'probe-image-size';
 import redis from 'redis';
 import {PresAnnStatusMsg} from '../lib/utils/message-builder.js';
 import {sortByKey} from '../shapes/helpers.js';
@@ -322,15 +321,18 @@ async function processPresentationAnnotations() {
     } else if (fs.existsSync(`${bgImagePath}.jpeg`)) {
       backgroundFormat = 'jpeg';
     } else {
-      logger.error(`Skipping slide ${currentSlide.page} (${jobId})`);
+      logger.error(`Skipping slide ${currentSlide.page} (${jobId}): unknown extension`);
       continue;
     }
 
-    const dimensions = probe.sync(
-        fs.readFileSync(`${bgImagePath}.${backgroundFormat}`));
+    // Rescale slide width and height to match tldraw coordinates
+    const slideWidth = currentSlide.width;
+    const slideHeight = currentSlide.height;
 
-    const slideWidth = parseInt(dimensions.width, 10);
-    const slideHeight = parseInt(dimensions.height, 10);
+    if (!slideWidth || !slideHeight) {
+      logger.error(`Skipping slide ${currentSlide.page} (${jobId}): unknown dimensions`);
+      continue;
+    }
 
     const maxImageWidth = config.process.maxImageWidth;
     const maxImageHeight = config.process.maxImageHeight;