X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Flayouts%2FMixedLayout.java;h=f7eee2cbd8e2dfb2c3f15b5685d4891210676d7c;hb=1d9057cc722b349a0bc370c0860344f59c42fd0f;hp=f54b72f93913c80f9e0a83e0ebb53c45b334a3f1;hpb=50cb7085d553fdd82cd06806cd27b1675299f719;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 f54b72f..f7eee2c 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@ -1,7 +1,7 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
  * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public License
  * as published by the Free Software Foundation.
@@ -18,6 +18,7 @@ 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.metadata.Dimension;
 import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.AbstractFile;
@@ -34,81 +35,64 @@ public class MixedLayout implements Layout {
 
 	String galleryTitle;
 
-	String[] path;
+	List<String> path;
 
 	public static final String encoding = "UTF-8";
 
-	int currentColumn = 0;
-
-	int horizontalColumnsLimit = 2;
-
 	private AbstractIndexer indexer;
 
-	public void columnAdded() {
-		currentColumn++;
-		if (currentColumn > horizontalColumnsLimit) {
-
-			currentColumn = 0;
-
-			filesHtml.append("</TR>\n");
-		}
-	}
+	private IndexingContext indexingContext;
 
 	@Override
 	public void enlistDirectory(final AbstractFile directory) {
 		dirHtml.append("<TR>");
-		dirHtml.append("<TD><b><a href=\"" + directory.fileName
-				+ "/index.html\"> ==&gt; " + directory.fileName
-				+ "</a></b></TD>");
+		dirHtml.append("<TD><b><a href=\""
+				+ indexer.getDirectoryUrl(directory, indexingContext)
+				+ "\"><h2> ==&gt; " + directory.fileName + "</h2></a></b></TD>");
 		dirHtml.append("</TR>\n");
 
 	}
 
 	@Override
 	public void enlistFile(final AbstractFile file) {
-		finishRow();
 
 		final String fullFileName = file.fileName;
 
-		filesHtml.append("<TR>\n");
-		filesHtml.append("    <TD colspan=\""
-				+ String.valueOf(horizontalColumnsLimit) + "\"><a href=\""
-				+ UrlParamEncoder.encode(fullFileName) + "\">" + fullFileName
-				+ "</a>\n");
+		filesHtml.append("<div style=\"clear: both;\"><a href=\""
+				+ indexingContext.getGlobalUrl()
+				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
+						+ fullFileName) + "\">" + fullFileName + "</a>\n");
 		filesHtml.append("&nbsp;&nbsp;("
 				+ FilePathParser.getFileSizeDescription(file.getFileLength())
-				+ ")</TD>\n");
-		filesHtml.append("</TR>\n");
+				+ ")</div><br/>\n");
 
 	}
 
 	@Override
-	public void enlistImage(final AbstractFile abstractFile) {
+	public void enlistImage(final Picture picture) {
 		try {
 
-			final Picture picture = (Picture) abstractFile;
-
 			final Dimension imageSize = picture.getDimensions();
 
 			final List<Dimension> recommendedDimensions = Picture
 					.getThumbnailDimensions(imageSize);
 
-			Dimension listingDimension = new Dimension(500, 500);
+			Dimension listingDimension = new Dimension(1500, 450);
 
 			if (listingDimension.width > imageSize.width)
 				if (listingDimension.height > imageSize.height)
 					listingDimension = imageSize;
 
-			final String listingThumbnailPath = indexer.getThumbnailPath(
-					picture, listingDimension);
-
-			startcolumn();
+			final String listingThumbnailUrl = indexer.getThumbnailUrl(picture,
+					listingDimension, indexingContext);
 
-			filesHtml.append("<TD><center><a href=\""
-					+ UrlParamEncoder.encode(picture.fileName) + "\">\n");
+			filesHtml.append("<div style=\"float:left; margin: 10px;\">");
+			filesHtml.append("<a href=\""
+					+ indexingContext.getGlobalUrl()
+					+ UrlParamEncoder.encode(indexingContext.getLocalUrl()
+							+ "/" + picture.fileName) + "\">\n");
 
-			filesHtml.append("<img border=\"0\" src=\""
-					+ UrlParamEncoder.encode(listingThumbnailPath)
+			filesHtml.append("<img border=\"0\" src=\"" + listingThumbnailUrl
 					+ "\"/></a>\n");
 			filesHtml.append("<br/><b>"
 					+ FilePathParser
@@ -121,15 +105,14 @@ public class MixedLayout implements Layout {
 				if (count > 1)
 					filesHtml.append(", ");
 				filesHtml.append("<a href=\""
-						+ UrlParamEncoder.encode(indexer.getThumbnailPath(
-								picture, dimension)) + "\">");
+						+ indexer.getThumbnailUrl(picture, dimension,
+								indexingContext) + "\">");
 				filesHtml.append(dimension.width + "x" + dimension.height);
 				filesHtml.append("</a>");
 			}
 
-			filesHtml.append(")</TD>\n");
-
-			columnAdded();
+			filesHtml.append(")\n");
+			filesHtml.append("</div>");
 
 		} catch (final Exception e) {
 			logger.error(
@@ -137,7 +120,7 @@ public class MixedLayout implements Layout {
 							+ e.toString()
 							+ ", thumbnail generation skipped, enlisting as ordinary file instead.",
 					e);
-			enlistFile(abstractFile);
+			enlistFile(picture);
 		}
 	}
 
@@ -148,28 +131,16 @@ public class MixedLayout implements Layout {
 
 		final GeneralFile file = (GeneralFile) abstractFile;
 
-		finishRow();
-
 		filesHtml
-				.append("<TR style=\"background-color: #404040; text-align: center\">\n");
-		filesHtml.append("<TD style=\"text-align: center\" colspan=\""
-				+ String.valueOf(horizontalColumnsLimit) + "\">\n");
-
-		filesHtml.append("<video controls=\"controls\" tabindex=\"0\">\n");
+				.append("<div style=\"margin: 30px; clear: both;\">"
+						+ "<video preload=\"metadata\" controls=\"controls\" tabindex=\"0\">\n");
 		filesHtml
 				.append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\""
-						+ UrlParamEncoder.encode(file.fileName) + "\">\n");
+						+ indexingContext.getGlobalUrl()
+						+ UrlParamEncoder.encode(indexingContext.getLocalUrl()
+								+ "/" + file.fileName) + "\">\n");
 		filesHtml.append("</source>\n");
 
-		// if browser cannot play video directry, fall back to java Applet
-		filesHtml
-				.append("<applet code=\"com.fluendo.player.Cortado.class\" archive=\"http://theora.org/cortado.jar\" width=\"800\" height=\"600\">\n");
-		filesHtml.append("    <param name=\"url\" value=\""
-				+ UrlParamEncoder.encode(file.fileName) + "\"/>\n");
-		filesHtml.append("    <param name=\"keepAspect\" value=\"true\"/>\n");
-		filesHtml.append("    <param name=\"autoPlay\" value=\"false\"/>\n");
-		filesHtml.append("</applet>\n");
-
 		filesHtml.append("</video>\n");
 
 		filesHtml.append("<br/>\n");
@@ -179,24 +150,13 @@ public class MixedLayout implements Layout {
 						+ FilePathParser
 								.getFileNameWithoutExtension(file.fileName)
 						+ "<b/>  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
-		filesHtml.append("<a href=\"" + UrlParamEncoder.encode(file.fileName)
-				+ "\">download as OGV</a>\n");
-
-		filesHtml.append("</TD></TR>\n");
-
-	}
-
-	public void finishRow() {
+		filesHtml.append("<a href=\""
+				+ indexingContext.getGlobalUrl()
+				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
+						+ file.fileName) + "\">download as OGV</a></div>\n");
 
-		if (currentColumn == 0)
-			return;
+		filesHtml.append("\n");
 
-		while (currentColumn <= horizontalColumnsLimit) {
-			filesHtml.append("<TD></TD>");
-			currentColumn++;
-		}
-		filesHtml.append("</TR>\n");
-		currentColumn = 0;
 	}
 
 	/** {@inheritDoc} */
@@ -207,68 +167,76 @@ public class MixedLayout implements Layout {
 
 	/** {@inheritDoc} */
 	@Override
-	public String getHtml() {
+	public String getHtml(final boolean showTitle,
+			final boolean doHtmlHeaderAndFooter) {
 
 		// assemble final page HTML
 		final StringBuffer finalHtml = new StringBuffer();
 
-		// 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");
-		finalHtml.append("<CENTER><H1>" + galleryTitle + "</H1>\n");
-
-		finalHtml.append("<H2>");
-		for (final String p : path)
-			finalHtml.append(" / " + p);
-		finalHtml.append("</H2></CENTER>\n");
-
-		// append directory listing
-		finalHtml.append("<TABLE>\n");
-
-		if (path.length > 0) {
-			finalHtml.append("<TR>");
+		if (doHtmlHeaderAndFooter) {
+			// page header
+			finalHtml.append("<HTML>\n");
+			finalHtml.append("<HEAD>\n");
 			finalHtml
-					.append("<TD><b><a href=\"../index.html\"> &lt;== ..</a></b></TD>");
-			finalHtml.append("</TR>\n");
+					.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");
 		}
 
-		finalHtml.append(dirHtml.toString());
-		finalHtml.append("\n<TR><TD><br></TD></TR>\n");
-		finalHtml.append("</TABLE>\n");
+		if (showTitle)
+			finalHtml
+					.append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n");
+
+		showCurrentPath(finalHtml);
 
-		// append file listing
+		listDirectories(finalHtml);
 
-		finishRow();
-		finalHtml.append("<TABLE width=\"1100\">\n");
 		finalHtml.append(filesHtml.toString());
-		finalHtml.append("\n</TABLE>\n");
 
-		finalHtml.append("</font></BODY></HTML>\n");
+		if (doHtmlHeaderAndFooter)
+			finalHtml.append("</font></BODY></HTML>\n");
 
 		return finalHtml.toString();
 	}
 
 	@Override
-	public void init(final String galleryTitle, final String[] path,
-			final AbstractIndexer indexer) {
+	public void init(final String galleryTitle, final List<String> path,
+			final AbstractIndexer indexer, final IndexingContext indexingContext) {
+
 		this.indexer = indexer;
 		this.galleryTitle = galleryTitle;
 		this.path = path;
+		this.indexingContext = indexingContext;
+
+		dirHtml = new StringBuffer();
+		filesHtml = new StringBuffer();
 	}
 
-	public void startcolumn() {
-		if (currentColumn == 0) {
-			filesHtml.append("<TR>");
-			currentColumn = 1;
+	private void listDirectories(final StringBuffer finalHtml) {
+		finalHtml.append("<TABLE>\n");
+
+		if (path.size() > 0) {
+			finalHtml.append("<TR>");
+			finalHtml.append("<TD><b><a href=\""
+					+ indexer.getParentDirectoryUrl(indexingContext)
+					+ "\"><h2> &lt;== parent directory</h2></a></b></TD>");
+			finalHtml.append("</TR>\n");
 		}
+
+		finalHtml.append(dirHtml.toString());
+		finalHtml.append("\n<TR><TD><br></TD></TR>\n");
+		finalHtml.append("</TABLE>\n");
+	}
+
+	private void showCurrentPath(final StringBuffer finalHtml) {
+		finalHtml.append("<CENTER><H2>");
+		for (final String p : path)
+			finalHtml.append(" / " + p);
+		finalHtml.append("</H2></CENTER>\n");
 	}
 
 }