OO-725 implement copy of resource, beautify caption chooser, fix controller...

OO-725 implement copy of resource, beautify caption chooser, fix controller leak, reload transcoding list on segment change

src/main/java/org/olat/modules/video/VideoManager.java

@@ -171,4 +171,11 @@ public interface VideoManager {
 	 */
 	public abstract void updateVersion(OLATResource video, VideoQualityVersion updatedVersion);
 
+	/**
+	 * Copy video resource to identical new video resource. 
+	 * @param sourceResource the existing video resource
+	 * @param targetResource the empty new resource
+	 */
+	public abstract void copyVideo(OLATResource sourceResource, OLATResource targetResource);
+
 }
\ No newline at end of file

src/main/java/org/olat/modules/video/manager/VideoExportMediaResource.java

@@ -114,10 +114,7 @@ public class VideoExportMediaResource implements MediaResource {
 					String names = relativeFile.toString();
 					
 					if(!attrs.isDirectory()) {
-						// do not include poster proposal images
-						if (names.contains("proposalPosters")) {
-							return FileVisitResult.SKIP_SUBTREE;
-						}
+						// add everything that belongs to resource to zip
 						zout.putNextEntry(new ZipEntry(names));							
 						
 						try(InputStream in=Files.newInputStream(file)) {

src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java

@@ -45,6 +45,7 @@ import org.olat.core.commons.services.taskexecutor.TaskExecutorManager;
 import org.olat.core.commons.services.video.MovieService;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
+import org.olat.core.util.FileUtils;
 import org.olat.core.util.ZipUtil;
 import org.olat.core.util.vfs.LocalFileImpl;
 import org.olat.core.util.vfs.VFSContainer;
@@ -590,5 +591,16 @@ public class VideoManagerImpl implements VideoManager {
 		XStreamHelper.writeObject(XStreamHelper.createXStreamInstance(), optimizedMetadataFile, versions);
 	}
 
-	
+	@Override
+	public void copyVideo(OLATResource sourceResource, OLATResource targetResource) {
+		// 1) Copy files on disk
+		File sourceFileroot = FileResourceManager.getInstance().getFileResourceRootImpl(sourceResource).getBasefile();
+		File targetFileroot = FileResourceManager.getInstance().getFileResourceRootImpl(targetResource).getBasefile();
+		FileUtils.copyDirContentsToDir(sourceFileroot, targetFileroot, false, "copyVideoResource");
+		// 2) Trigger transcoding in background
+		if (videoModule.isTranscodingEnabled()) {
+			startTranscodingProcess(targetResource);
+		}
+	}
+
 }

src/main/java/org/olat/modules/video/manager/VideoMediaMapper.java

@@ -41,7 +41,13 @@ public class VideoMediaMapper implements Mapper  {
 	public MediaResource handle(String relPath, HttpServletRequest request) {
 		VFSItem mediaFile = mediaBase.resolve(relPath);
 		if (mediaFile instanceof VFSLeaf && !relPath.endsWith("xml")){
-			return new VFSMediaResource((VFSLeaf)mediaFile);
+			VFSMediaResource res =  new VFSMediaResource((VFSLeaf)mediaFile);
+			if (relPath.toLowerCase().endsWith("srt")) {
+				// SRT caption files are supposed to be UTF-8, see
+				// https://en.wikipedia.org/wiki/SubRip#Text_encoding
+				res.setEncoding("utf-8");				
+			}
+			return res;
 		} else {
  			return new NotFoundMediaResource(relPath);
 		}

src/main/java/org/olat/modules/video/ui/VideoSettingsController.java

@@ -105,6 +105,7 @@ public class VideoSettingsController extends BasicController {
 	private void doOpenMetaDataConfig(UserRequest ureq) {
 		if(metaDataController == null) {
 			metaDataController = new VideoMetaDataEditFormController(ureq, getWindowControl(), entry.getOlatResource());
+			listenTo(metaDataController);
 		}
 		mainVC.put("segmentCmp", metaDataController.getInitialComponent());
 	}
@@ -112,6 +113,7 @@ public class VideoSettingsController extends BasicController {
 	private void doOpenPosterConfig(UserRequest ureq) {
 		if(posterEditController == null) {
 			posterEditController = new VideoPosterEditController(ureq, getWindowControl(), entry.getOlatResource());
+			listenTo(posterEditController);
 		}
 		mainVC.put("segmentCmp", posterEditController.getInitialComponent());
 	}
@@ -119,14 +121,17 @@ public class VideoSettingsController extends BasicController {
 	private void doOpenTrackConfig(UserRequest ureq) {
 		if(trackEditController == null) {
 			trackEditController = new VideoTrackEditController(ureq, getWindowControl(), entry.getOlatResource());
+			listenTo(trackEditController);
 		}
 		mainVC.put("segmentCmp", trackEditController.getInitialComponent());
 	}
 
 	private void doOpenQualityConfig(UserRequest ureq) {
-		if(qualityEditController == null) {
-			qualityEditController = new VideoQualityTableFormController(ureq, getWindowControl(), entry);
+		if(qualityEditController != null) {
+			removeAsListenerAndDispose(qualityEditController);
 		}
+		qualityEditController = new VideoQualityTableFormController(ureq, getWindowControl(), entry);
+		listenTo(qualityEditController);
 		mainVC.put("segmentCmp", qualityEditController.getInitialComponent());
 	}
 

src/main/java/org/olat/repository/handlers/VideoHandler.java

@@ -48,7 +48,6 @@ import org.olat.core.util.coordinate.LockResult;
 import org.olat.core.util.vfs.LocalFileImpl;
 import org.olat.core.util.vfs.VFSLeaf;
 import org.olat.course.assessment.AssessmentMode;
-import org.olat.fileresource.FileResourceManager;
 import org.olat.fileresource.types.FileResource;
 import org.olat.fileresource.types.ResourceEvaluation;
 import org.olat.fileresource.types.VideoFileResource;
@@ -206,9 +205,8 @@ public class VideoHandler extends FileHandler {
 			RepositoryEntry target) {
 		OLATResource sourceResource = source.getOlatResource();
 		OLATResource targetResource = target.getOlatResource();
-		File sourceFileroot = FileResourceManager.getInstance().getFileResourceRootImpl(sourceResource).getBasefile();
-		File targetFileroot = FileResourceManager.getInstance().getFileResourceRootImpl(targetResource).getBasefile();
-		FileUtils.copyDirContentsToDir(sourceFileroot, targetFileroot, false, "copy");
+		VideoManager videoManager = CoreSpringFactory.getImpl(VideoManager.class);
+		videoManager.copyVideo(sourceResource, targetResource);
 		return target;
 	}
 

src/main/webapp/static/themes/light/modules/_video.scss

@@ -45,8 +45,10 @@
 	
 }
 
+/* beautify source chooser plugin, remove radio button */
 .mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector {
 	visibility: visible !important;
+	width: 160px;
 	ul li {
 		label {
 			font-weight: normal;
@@ -68,3 +70,28 @@
 		}
 	}	
 }
+
+/* beautify track plugin, remove radio button */
+.mejs-controls .mejs-captions-button .mejs-captions-selector {
+	right: -26px;
+	ul li {
+		label {
+			font-weight: normal;
+			&:hover {
+				color: #eee;
+			}
+			.type {
+				display: none;
+			}
+		}
+		input {
+			/* hide ugly input radio button */
+			visibility: hidden;
+			margin: 0;
+			width: 0;
+			&:checked+label {
+				color: $brand-danger;
+			}
+		}
+	}	
+}
\ No newline at end of file