Use Apache Tika to handle videos.

[meviz.git] / src / main / java / eu / svjatoslav / meviz / htmlindexer / layouts / MixedLayout.java

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
index 7963582..fffa865 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@ -18,13 +18,13 @@ import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
 import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
 import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.AbstractFile;
 import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Picture;
+import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Video;
 import org.apache.log4j.Logger;
 
 import java.io.IOException;
 import java.util.List;
 
 import static eu.svjatoslav.commons.file.FilePathParser.getFileNameWithoutExtension;
-import static eu.svjatoslav.meviz.htmlindexer.AbstractIndexer.getVideoType;
 import static eu.svjatoslav.meviz.htmlindexer.Utils.urlEncode;
 
 public class MixedLayout implements Layout {
@@ -242,25 +242,24 @@ public class MixedLayout implements Layout {
     }
 
     @Override
-    public void enlistVideo(AbstractFile file) {
+    public void enlistVideo(Video video) {
 
         filesHtml.append("<div style=\"margin: 30px; clear: both;\">\n");
 
         // watchable video
         filesHtml.append("  <video width=\"640\" controls>\n");
-        filesHtml.append("    <source src=\"" + getFileUrl(file) + "\" type=\""
-                + getVideoType(file.getFileExtension()) + "\"/>\n");
+        filesHtml.append("    <source src=\"" + getFileUrl(video) + "\" type=\"" + video.mimeType + "\"/>\n");
         filesHtml.append("  </video>\n");
 
         filesHtml.append("  <br/>\n");
 
         // video title
         filesHtml.append("  Video: <b>"
-                        + getFileNameWithoutExtension(file.fileName)
+                        + getFileNameWithoutExtension(video.fileName)
                         + "<b/>  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
 
         // video download link
-        filesHtml.append("  <a href=\"" + getFileUrl(file) + "\">download</a>\n");
+        filesHtml.append("  <a href=\"" + getFileUrl(video) + "\">download</a>\n");
 
         filesHtml.append("</div>\n");