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

Handle non PDF slide conversion for breakout rooms.

Browse Source
This commit is contained in:
Ghazi Triki 2016-10-03 17:39:02 +01:00
parent 886f9617ac
commit 27fd992294
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
bigbluebutton-web/src/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
View File

@ -49,20 +49,29 @@ public class PresentationUrlDownloadService {
+ File.separator + presentationId); + File.separator + presentationId);
final String presentationFilter = presentationId; final String presentationFilter = presentationId;
FilenameFilter filter = new FilenameFilter() { FilenameFilter pdfFilter = new FilenameFilter() {
public boolean accept(File dir, String name) { public boolean accept(File dir, String name) {
return name.startsWith(presentationFilter); return name.startsWith(presentationFilter)
&& name.toLowerCase().endsWith("pdf");
} }
}; };
File[] children = sourceMeetingPath.listFiles(filter); File[] matches = sourceMeetingPath.listFiles(pdfFilter);
if (matches.length != 1) {
// No PDF presentation was found, we look for an image presentation
FilenameFilter imgFlter = new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.startsWith(presentationFilter);
}
};
if (children.length != 1) { matches = sourceMeetingPath.listFiles(imgFlter);
log.error("Not matching file with prefix {} found at {}", }
if (matches.length != 1) {
log.info("Not matching PDF file with prefix {} found at {}",
sourceMeetingId, sourceMeetingPath); sourceMeetingId, sourceMeetingPath);
return;
} else { } else {
File sourcePresentationFile = children[0]; File sourcePresentationFile = matches[0];
String filenameExt = FilenameUtils String filenameExt = FilenameUtils
.getExtension(sourcePresentationFile.getName()); .getExtension(sourcePresentationFile.getName());
String presId = generatePresentationId(presentationId); String presId = generatePresentationId(presentationId);
@ -72,13 +81,25 @@ public class PresentationUrlDownloadService {
presentationDir, presId); presentationDir, presId);
String newFilePath = uploadDir.getAbsolutePath() String newFilePath = uploadDir.getAbsolutePath()
+ File.separatorChar + newFilename; + File.separatorChar + newFilename;
File newPresentation = new File(newFilePath);
pageExtractor.extractPage(sourcePresentationFile, new File( if (sourcePresentationFile.getName().toLowerCase().endsWith("pdf")) {
newFilePath), presentationSlide); pageExtractor.extractPage(sourcePresentationFile, new File(
newFilePath), presentationSlide);
} else {
try {
FileUtils.copyFile(sourcePresentationFile, newPresentation);
} catch (IOException e) {
log.error("Could not copy presentation {} to {}",
sourcePresentationFile.getAbsolutePath(),
newPresentation.getAbsolutePath());
e.printStackTrace();
}
}
File pres = new File(newFilePath);
processUploadedFile(destinationMeetingId, presId, "default-" processUploadedFile(destinationMeetingId, presId, "default-"
+ presentationSlide.toString() + "." + filenameExt, pres); + presentationSlide.toString() + "." + filenameExt,
newPresentation);
} }
} }