Add sequence number to exported PDFs

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

@@ -153,7 +153,14 @@ trait PresentationWithAnnotationsMsgHdlr extends RightsManagementTrait {
 
     val presentationUploadToken: String = PresentationPodsApp.generateToken("DEFAULT_PRESENTATION_POD", userId)
     val jobId = RandomStringGenerator.randomAlphanumericString(16)
-    val filename: String = s"${liveMeeting.props.meetingProp.name}-annotated"
+
+    // Set filename, checking if it is already in use
+    var filename: String = liveMeeting.props.meetingProp.name
+    val duplicatedCount = presentationPods.flatMap(_.getPresentationsByFilename(filename)).size
+    filename = duplicatedCount match {
+      case 0 => filename
+      case _ => s"${filename}(${duplicatedCount})"
+    }
 
     // Informs bbb-web about the token so that when we use it to upload the presentation, it is able to look it up in the list of tokens
     bus.outGW.send(buildPresentationUploadTokenSysPubMsg(parentMeetingId, userId, presentationUploadToken, filename))

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/PresentationPods.scala

@@ -83,6 +83,9 @@ case class PresentationPod(id: String, currentPresenter: String,
   def getPresentation(presentationId: String): Option[PresentationInPod] =
     presentations.values find (p => p.id == presentationId)
 
+  def getPresentationsByFilename(filename: String): Iterable[PresentationInPod] =
+    presentations.values filter (p => p.name.startsWith(filename))
+
   def setCurrentPresentation(presId: String): Option[PresentationPod] = {
     var tempPod: PresentationPod = this
     presentations.values foreach (curPres => { // unset previous current presentation