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=4e6b5bf89698418df30e055680f8310696c424ff;hpb=115456739edd5ae7dc67ac9e9f90d628aa65b4a3;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 4e6b5bf..cf1285e 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@ -9,17 +9,18 @@
 
 package eu.svjatoslav.meviz.htmlindexer.layouts;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 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;
@@ -28,6 +29,8 @@ import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Picture;
 
 public class MixedLayout implements Layout {
 
+	public static final String encoding = "UTF-8";
+
 	Logger logger = Logger.getLogger(MixedLayout.class);
 
 	StringBuffer dirHtml = new StringBuffer();
@@ -38,8 +41,6 @@ public class MixedLayout implements Layout {
 
 	List<String> path;
 
-	public static final String encoding = "UTF-8";
-
 	private AbstractIndexer indexer;
 
 	private IndexingContext indexingContext;
@@ -63,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())
@@ -114,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");
 
@@ -146,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");
@@ -162,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");
 
@@ -177,42 +179,43 @@ public class MixedLayout implements Layout {
 		return "";
 	}
 
-	/** {@inheritDoc} */
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @throws IOException
+	 */
 	@Override
 	public String getHtml(final boolean showTitle,
-			final boolean doHtmlHeaderAndFooter) {
+			final boolean doHtmlHeaderAndFooter,
+			final DirectoryMetadata directory) {
 
 		// assemble final page HTML
-		final StringBuffer finalHtml = new StringBuffer();
+		final StringBuffer html = new StringBuffer();
 
 		if (doHtmlHeaderAndFooter) {
 			// page header
-			finalHtml.append("<HTML>\n");
-			finalHtml.append("<HEAD>\n");
-			finalHtml
-					.append("    <meta HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\"/>\n");
-			finalHtml.append("</HEAD>\n");
-			finalHtml
-					.append("<BODY bgcolor=\"#000000\" alink=\"#50ffff\" link=\"#50ffff\" vlink=\"#ff50ff\" text=\"#ffffff\">\n");
-			finalHtml.append("<!-- " + Constants.HTML_MAGIC_STRING + " -->\n");
-			finalHtml.append("<!-- " + Constants.HTML_MEMO + " -->\n");
-			finalHtml.append("<font color=\"#ffffff\">\n");
+			html.append("<HTML>\n");
+			html.append("<HEAD>\n");
+			html.append("    <meta HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\"/>\n");
+			html.append("</HEAD>\n");
+			html.append("<BODY bgcolor=\"#000000\" alink=\"#50ffff\" link=\"#50ffff\" vlink=\"#ff50ff\" text=\"#ffffff\">\n");
+			html.append("<!-- " + Constants.HTML_MAGIC_STRING + " -->\n");
+			html.append("<!-- " + Constants.HTML_MEMO + " -->\n");
+			html.append("<font color=\"#ffffff\">\n");
 		}
 
 		if (showTitle)
-			finalHtml
-					.append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n");
+			html.append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n");
 
-		showCurrentPath(finalHtml);
-
-		listDirectories(finalHtml);
-
-		finalHtml.append(filesHtml.toString());
+		html.append(showCurrentPath());
+		html.append(listDirectories());
+		html.append(directory.getHeaderMevizMetadataHtml());
+		html.append(filesHtml.toString());
 
 		if (doHtmlHeaderAndFooter)
-			finalHtml.append("</font></BODY></HTML>\n");
+			html.append("</font></BODY></HTML>\n");
 
-		return finalHtml.toString();
+		return html.toString();
 	}
 
 	private String getImageThumbnailUrl(final Picture picture) {
@@ -241,27 +244,69 @@ public class MixedLayout implements Layout {
 		filesHtml = new StringBuffer();
 	}
 
-	private void listDirectories(final StringBuffer finalHtml) {
-		finalHtml.append("<TABLE>\n");
+	private String listDirectories() {
+		final StringBuilder html = new StringBuilder();
+		html.append("<TABLE>\n");
 
 		if (path.size() > 0) {
-			finalHtml.append("<TR>");
-			finalHtml.append("<TD><b><a href=\""
+			html.append("<TR>");
+			html.append("<TD><b><a href=\""
 					+ indexer.getParentDirectoryUrl(indexingContext)
 					+ "\"><h2> &lt;== parent directory</h2></a></b></TD>");
-			finalHtml.append("</TR>\n");
+			html.append("</TR>\n");
 		}
 
-		finalHtml.append(dirHtml.toString());
-		finalHtml.append("\n<TR><TD><br></TD></TR>\n");
-		finalHtml.append("</TABLE>\n");
+		html.append(dirHtml.toString());
+		html.append("\n<TR><TD><br></TD></TR>\n");
+		html.append("</TABLE>\n");
+
+		return html.toString();
 	}
 
-	private void showCurrentPath(final StringBuffer finalHtml) {
-		finalHtml.append("<CENTER><H2>");
+	private String showCurrentPath() {
+		final StringBuilder html = new StringBuilder();
+		html.append("<CENTER><H2>");
 		for (final String p : path)
-			finalHtml.append(" / " + p);
-		finalHtml.append("</H2></CENTER>\n");
+			html.append(" / " + p);
+		html.append("</H2></CENTER>\n");
+
+		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");
+	}
 }