BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix multiple pres. export; include PresId in NewPresAnnFileAvailable msg.

Browse Source
This commit is contained in:
Daniel Petri Rocha 2022-07-26 15:19:23 +02:00
parent 07434d238c
commit 6ac3040d4a
5 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationWithAnnotationsMsgHdlr.scala
View File

@ -36,7 +36,7 @@ trait PresentationWithAnnotationsMsgHdlr extends RightsManagementTrait {
val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, liveMeeting.props.meetingProp.intId, "not-used")
val envelope = BbbCoreEnvelope(PresentationPageConvertedEventMsg.NAME, routing)
val header = BbbClientMsgHeader(NewPresAnnFileAvailableEvtMsg.NAME, liveMeeting.props.meetingProp.intId, "not-used")
val body = NewPresAnnFileAvailableEvtMsgBody(fileURI = newPresAnnFileAvailableMsg.body.fileURI)
val body = NewPresAnnFileAvailableEvtMsgBody(fileURI = newPresAnnFileAvailableMsg.body.fileURI, presId = newPresAnnFileAvailableMsg.body.presId)
val event = NewPresAnnFileAvailableEvtMsg(header, body)
BbbCommonEnvCoreMsg(envelope, event)
@ -82,13 +82,18 @@ trait PresentationWithAnnotationsMsgHdlr extends RightsManagementTrait {
val userId = m.header.userId
val presentationPods: Vector[PresentationPod] = state.presentationPodManager.getAllPresentationPodsInMeeting()
val currentPres: Option[PresentationInPod] = presentationPods.flatMap(_.getCurrentPresentation()).headOption
val presId: String = m.body.presId match {
case "" => PresentationPodsApp.getAllPresentationPodsInMeeting(state).flatMap(_.getCurrentPresentation.map(_.id)).mkString
case _ => m.body.presId
}
val currentPres: Option[PresentationInPod] = presentationPods.flatMap(_.getPresentation(presId)).headOption
if (permissionFailed(PermissionCheck.MOD_LEVEL, PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, userId)) {
val reason = "No permission to export presentation."
PermissionCheck.ejectUserForFailedPermission(meetingId, userId, reason, bus.outGW, liveMeeting)
} else if (currentPres.isEmpty) {
log.error(s"No presentation set in meeting ${meetingId}")
log.error(s"Presentation ${presId} not found in meeting ${meetingId}")
} else {
val jobType: String = "PresentationWithAnnotationDownloadJob"
@ -96,11 +101,6 @@ trait PresentationWithAnnotationsMsgHdlr extends RightsManagementTrait {
val allPages: Boolean = m.body.allPages
val pageCount = currentPres.get.pages.size
val presId: String = m.body.presId match {
case "" => PresentationPodsApp.getAllPresentationPodsInMeeting(state).flatMap(_.getCurrentPresentation.map(_.id)).mkString
case _ => m.body.presId
}
val presLocation = List("var", "bigbluebutton", meetingId, meetingId, presId).mkString(File.separator, File.separator, "");
val pages: List[Int] = m.body.pages // Desired presentation pages for export
val pagesRange: List[Int] = if (allPages) (1 to pageCount).toList else pages
@ -173,7 +173,7 @@ trait PresentationWithAnnotationsMsgHdlr extends RightsManagementTrait {
}
def handle(m: NewPresAnnFileAvailableMsg, liveMeeting: LiveMeeting, bus: MessageBus): Unit = {
log.info("Received NewPresAnnFileAvailableMsg meetingId={} fileUrl={}", liveMeeting.props.meetingProp.intId, m.body.fileURI)
log.info("Received NewPresAnnFileAvailableMsg meetingId={} presId={} fileUrl={}", liveMeeting.props.meetingProp.intId, m.body.presId, m.body.fileURI)
bus.outGW.send(buildBroadcastNewPresAnnFileAvailable(m, liveMeeting))

4
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PresentationMsgs.scala
View File

@ -20,11 +20,11 @@ case class ExportPresentationWithAnnotationReqMsgBody(parentMeetingId: String, a
object NewPresAnnFileAvailableMsg { val NAME = "NewPresAnnFileAvailableMsg" }
case class NewPresAnnFileAvailableMsg(header: BbbClientMsgHeader, body: NewPresAnnFileAvailableMsgBody) extends StandardMsg
case class NewPresAnnFileAvailableMsgBody(fileURI: String)
case class NewPresAnnFileAvailableMsgBody(fileURI: String, presId: String)
object NewPresAnnFileAvailableEvtMsg { val NAME = "NewPresAnnFileAvailableEvtMsg" }
case class NewPresAnnFileAvailableEvtMsg(header: BbbClientMsgHeader, body: NewPresAnnFileAvailableEvtMsgBody) extends BbbCoreMsg
case class NewPresAnnFileAvailableEvtMsgBody(fileURI: String)
case class NewPresAnnFileAvailableEvtMsgBody(fileURI: String, presId: String)
// ------------ bbb-common-web to akka-apps ------------

3
bbb-export-annotations/workers/notifier.js
View File

@ -43,7 +43,8 @@ async function notifyMeetingActor() {
userId: ""
},
body: {
fileURI: link
fileURI: link,
presId: exportJob.presId
},
}
}

13
bigbluebutton-html5/imports/api/presentations/server/handlers/presentationExport.js
View File

@ -6,16 +6,11 @@ export default function handlePresentationExport({ body }, meetingId) {
check(body, Object);
check(meetingId, String);
const { fileURI } = body;
const { fileURI, presId } = body;
check(fileURI, String);
check(presId, String);
const fileURL = new URL(fileURI);
const path = fileURL.pathname;
const presentationId = path.split('/')[5];
check(presentationId, String);
sendExportedPresentationChatMsg(meetingId, presentationId, fileURI);
setPresentationExporting(meetingId, presentationId, { status: 'EXPORTED' });
sendExportedPresentationChatMsg(meetingId, presId, fileURI);
setPresentationExporting(meetingId, presId, { status: 'EXPORTED' });
}

2
bigbluebutton-html5/public/locales/en.json
View File

@ -237,7 +237,7 @@
"app.presentationUploader.exporting": "Sending to chat",
"app.presentationUploader.sending": "Sending...",
"app.presentationUploader.sent": "Sent",
"app.presentationUploader.exportingTimeout": "The exporting is taking too long...",
"app.presentationUploader.exportingTimeout": "The export is taking too long...",
"app.presentationUploader.export": "Send to chat",
"app.presentationUploader.currentPresentationLabel": "Current presentation",
"app.presentationUploder.extraHint": "IMPORTANT: each file may not exceed {0} MB and {1} pages.",