X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Flayouts%2FMixedLayout.java;h=915c7c8a4b1f173121e031aaa498f281d3020d95;hb=10e63289bea94532c36c15d8bd23d164869972bb;hp=345cd40a6b5cd3ff476a9c0c4db86cf2b580dbd0;hpb=bc5af7e323346f34d0e551b8be67e458d43271e6;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 345cd40..915c7c8 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,7 +35,7 @@ public class MixedLayout implements Layout {
 
 	String galleryTitle;
 
-	String[] path;
+	List<String> path;
 
 	public static final String encoding = "UTF-8";
 
@@ -44,7 +45,7 @@ public class MixedLayout implements Layout {
 
 	private AbstractIndexer indexer;
 
-	private String pathPrefix;
+	private IndexingContext indexingContext;
 
 	public void columnAdded() {
 		currentColumn++;
@@ -59,8 +60,9 @@ public class MixedLayout implements Layout {
 	@Override
 	public void enlistDirectory(final AbstractFile directory) {
 		dirHtml.append("<TR>");
-		dirHtml.append("<TD><b><a href=\"" + indexer.getDirectoryUrl(directory)
-				+ "\"> ==&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");
 
 	}
@@ -73,9 +75,11 @@ public class MixedLayout implements Layout {
 
 		filesHtml.append("<TR>\n");
 		filesHtml.append("    <TD colspan=\""
-				+ String.valueOf(horizontalColumnsLimit) + "\"><a href=\""
-				+ UrlParamEncoder.encode(pathPrefix + fullFileName) + "\">"
-				+ fullFileName + "</a>\n");
+				+ String.valueOf(horizontalColumnsLimit)
+				+ "\"><a href=\""
+				+ indexingContext.getGlobalUrl()
+				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
+						+ fullFileName) + "\">" + fullFileName + "</a>\n");
 		filesHtml.append("&nbsp;&nbsp;("
 				+ FilePathParser.getFileSizeDescription(file.getFileLength())
 				+ ")</TD>\n");
@@ -100,17 +104,17 @@ public class MixedLayout implements Layout {
 				if (listingDimension.height > imageSize.height)
 					listingDimension = imageSize;
 
-			final String listingThumbnailPath = indexer.getThumbnailPath(
-					picture, listingDimension);
+			final String listingThumbnailUrl = indexer.getThumbnailUrl(picture,
+					listingDimension, indexingContext);
 
 			startcolumn();
 
 			filesHtml.append("<TD><center><a href=\""
-					+ UrlParamEncoder.encode(pathPrefix + picture.fileName)
-					+ "\">\n");
+					+ 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
@@ -123,8 +127,8 @@ 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>");
 			}
@@ -160,21 +164,11 @@ public class MixedLayout implements Layout {
 		filesHtml.append("<video controls=\"controls\" tabindex=\"0\">\n");
 		filesHtml
 				.append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\""
-						+ UrlParamEncoder.encode(pathPrefix + 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(pathPrefix + 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");
@@ -185,8 +179,9 @@ public class MixedLayout implements Layout {
 								.getFileNameWithoutExtension(file.fileName)
 						+ "<b/>  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
 		filesHtml.append("<a href=\""
-				+ UrlParamEncoder.encode(pathPrefix + file.fileName)
-				+ "\">download as OGV</a>\n");
+				+ indexingContext.getGlobalUrl()
+				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
+						+ file.fileName) + "\">download as OGV</a>\n");
 
 		filesHtml.append("</TD></TR>\n");
 
@@ -213,25 +208,31 @@ 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>");
+		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");
+		}
+
+		if (showTitle)
+			finalHtml
+					.append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n");
+
+		finalHtml.append("<CENTER><H2>");
 		for (final String p : path)
 			finalHtml.append(" / " + p);
 		finalHtml.append("</H2></CENTER>\n");
@@ -239,10 +240,11 @@ public class MixedLayout implements Layout {
 		// append directory listing
 		finalHtml.append("<TABLE>\n");
 
-		if (path.length > 0) {
+		if (path.size() > 0) {
 			finalHtml.append("<TR>");
-			finalHtml
-					.append("<TD><b><a href=\"../index.html\"> &lt;== ..</a></b></TD>");
+			finalHtml.append("<TD><b><a href=\""
+					+ indexer.getParentDirectoryUrl(indexingContext)
+					+ "\"><h2> &lt;== parent directory</h2></a></b></TD>");
 			finalHtml.append("</TR>\n");
 		}
 
@@ -257,18 +259,20 @@ public class MixedLayout implements Layout {
 		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, final String pathPrefix) {
+	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.pathPrefix = pathPrefix;
+		this.indexingContext = indexingContext;
 
 		dirHtml = new StringBuffer();
 		filesHtml = new StringBuffer();