X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Flayouts%2FMixedLayout.java;h=cf1285e6aec6227a62575be66eed90eeb929130b;hb=ebf93054aaee0c329075a98c02e5cbc90013335a;hp=fd70b107b1a51224eb0c008d72f4762312cafdc6;hpb=0679806fed21137dc0d10f1ef99dc1bba73ddb95;p=meviz.git

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 fd70b10..cf1285e 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@ -16,11 +16,11 @@ import java.util.List;
 import org.apache.log4j.Logger;
 
 import eu.svjatoslav.commons.file.FilePathParser;
-import eu.svjatoslav.commons.network.UrlParamEncoder;
 import eu.svjatoslav.meviz.htmlindexer.AbstractIndexer;
 import eu.svjatoslav.meviz.htmlindexer.Constants;
 import eu.svjatoslav.meviz.htmlindexer.IndexingContext;
 import eu.svjatoslav.meviz.htmlindexer.Layout;
+import eu.svjatoslav.meviz.htmlindexer.Utils;
 import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
 import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
 import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.AbstractFile;
@@ -64,7 +64,7 @@ public class MixedLayout implements Layout {
 
 		filesHtml.append("<div style=\"clear: both;\"><a href=\""
 				+ indexingContext.getGlobalUrl()
-				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
+				+ Utils.urlEncode(indexingContext.getLocalUrl() + "/"
 						+ fullFileName) + "\">" + fullFileName + "</a>\n");
 		filesHtml.append("&nbsp;&nbsp;("
 				+ FilePathParser.getFileSizeDescription(file.getFileLength())
@@ -115,8 +115,9 @@ public class MixedLayout implements Layout {
 		// clickable image thumbnail
 		filesHtml.append("<a href=\""
 				+ indexingContext.getGlobalUrl()
-				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
+				+ Utils.urlEncode(indexingContext.getLocalUrl() + "/"
 						+ picture.fileName) + "\">\n");
+
 		filesHtml.append("<img border=\"0\" src=\""
 				+ getImageThumbnailUrl(picture) + "\"/></a><br/>\n");
 
@@ -147,8 +148,8 @@ public class MixedLayout implements Layout {
 		filesHtml
 				.append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\""
 						+ indexingContext.getGlobalUrl()
-						+ UrlParamEncoder.encode(indexingContext.getLocalUrl()
-								+ "/" + file.fileName) + "\">\n");
+						+ Utils.urlEncode(indexingContext.getLocalUrl() + "/"
+								+ file.fileName) + "\">\n");
 		filesHtml.append("</source>\n");
 		filesHtml.append("</video>\n");
 		filesHtml.append("<br/>\n");
@@ -163,8 +164,8 @@ public class MixedLayout implements Layout {
 		// video download link
 		filesHtml.append("<a href=\""
 				+ indexingContext.getGlobalUrl()
-				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
-						+ file.fileName) + "\">download as OGV</a>");
+				+ Utils.urlEncode(indexingContext.getLocalUrl() + "/"
+						+ file.fileName) + "\">download as OGV file</a>");
 
 		filesHtml.append("</div>\n");
 
@@ -272,4 +273,40 @@ public class MixedLayout implements Layout {
 		return html.toString();
 	}
 
+	@Override
+	public void enlistWebm(AbstractFile abstractFile,
+			DirectoryMetadata directory) {
+		final GeneralFile file = (GeneralFile) abstractFile;
+
+		filesHtml.append("<div style=\"margin: 30px; clear: both;\">");
+
+		// watchable video
+
+		String fileUrl = indexingContext.getGlobalUrl()
+				+ Utils.urlEncode(indexingContext.getLocalUrl() + "/"
+						+ file.fileName);
+
+		filesHtml.append("<video controls>\n");
+		filesHtml.append("  <source src=\"" + fileUrl
+				+ "\" type='video/webm;codecs=\"vp8, opus\"'/>\n");
+		filesHtml.append("</video>\n");
+		filesHtml.append("<br/>\n");
+
+		// video title
+		filesHtml
+				.append("Video: <b>"
+						+ FilePathParser
+								.getFileNameWithoutExtension(file.fileName)
+						+ "<b/>  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
+
+		// video download link
+		filesHtml.append("<a href=\""
+				+ indexingContext.getGlobalUrl()
+				+ Utils.urlEncode(indexingContext.getLocalUrl() + "/"
+						+ file.fileName) + "\">download as WebM file</a>");
+
+		filesHtml.append("</div>\n");
+
+		filesHtml.append("\n");
+	}
 }