X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Flayouts%2FMixedLayout.java;h=fd70b107b1a51224eb0c008d72f4762312cafdc6;hb=4b74c2be1dd6104f3a4dd50d29ece78857ada3fa;hp=9585215a1bed7f5f4643c40af8abde6fdac59b58;hpb=e07b29a32091b5291a62158021aed3487ea5cd3a;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 9585215..fd70b10 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@ -9,6 +9,7 @@
 
 package eu.svjatoslav.meviz.htmlindexer.layouts;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
@@ -21,12 +22,15 @@ 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.DirectoryMetadata;
 import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.AbstractFile;
 import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.GeneralFile;
 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();
@@ -37,167 +41,135 @@ public class MixedLayout implements Layout {
 
 	List<String> path;
 
-	public static final String encoding = "UTF-8";
-
-	int currentColumn = 0;
-
-	int horizontalColumnsLimit = 2;
-
 	private AbstractIndexer indexer;
 
 	private IndexingContext indexingContext;
 
-	public void columnAdded() {
-		currentColumn++;
-		if (currentColumn > horizontalColumnsLimit) {
-
-			currentColumn = 0;
-
-			filesHtml.append("</TR>\n");
-		}
-	}
-
 	@Override
-	public void enlistDirectory(final AbstractFile directory) {
+	public void enlistDirectory(final AbstractFile directory,
+			final DirectoryMetadata parentDirectoryMetadata) {
 		dirHtml.append("<TR>");
 		dirHtml.append("<TD><b><a href=\""
 				+ indexer.getDirectoryUrl(directory, indexingContext)
-				+ "\"> ==&gt; " + directory.fileName + "</a></b></TD>");
+				+ "\"><h2> ==&gt; " + directory.fileName + "</h2></a></b></TD>");
 		dirHtml.append("</TR>\n");
 
 	}
 
 	@Override
-	public void enlistFile(final AbstractFile file) {
-		finishRow();
+	public void enlistFile(final AbstractFile file,
+			final DirectoryMetadata parentDirectoryMetadata) {
 
 		final String fullFileName = file.fileName;
 
-		filesHtml.append("<TR>\n");
-		filesHtml.append("    <TD colspan=\""
-				+ String.valueOf(horizontalColumnsLimit)
-				+ "\"><a href=\""
+		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,
+			final DirectoryMetadata parentDirectoryMetadata) {
 		try {
+			enlistImageInternal(picture);
+		} catch (final Exception e) {
+			logger.error(
+					"Error generating thumbnails for image file: "
+							+ e.toString()
+							+ ", thumbnail generation skipped, enlisting as ordinary file instead.",
+					e);
+			enlistFile(picture, parentDirectoryMetadata);
+		}
+	}
 
-			final Picture picture = (Picture) abstractFile;
-
-			final Dimension imageSize = picture.getDimensions();
-
-			final List<Dimension> recommendedDimensions = Picture
-					.getThumbnailDimensions(imageSize);
-
-			Dimension listingDimension = new Dimension(500, 500);
-
-			if (listingDimension.width > imageSize.width)
-				if (listingDimension.height > imageSize.height)
-					listingDimension = imageSize;
-
-			final String listingThumbnailUrl = indexer.getThumbnailUrl(picture,
-					listingDimension, indexingContext);
+	private String enlistImageDimensions(final Picture picture) {
+		final StringBuilder html = new StringBuilder();
+
+		final List<Dimension> recommendedDimensions = Picture
+				.getThumbnailDimensions(picture.getDimensions());
+
+		int count = 0;
+		for (final Dimension dimension : recommendedDimensions) {
+			count++;
+			if (count > 1)
+				html.append(", ");
+			html.append("<a href=\""
+					+ indexer.getThumbnailUrl(picture, dimension,
+							indexingContext) + "\">");
+			html.append(dimension.width + "x" + dimension.height);
+			html.append("</a>");
+		}
 
-			startcolumn();
+		return html.toString();
+	}
 
-			filesHtml.append("<TD><center><a href=\""
-					+ indexingContext.getGlobalUrl()
-					+ UrlParamEncoder.encode(indexingContext.getLocalUrl()
-							+ "/" + picture.fileName) + "\">\n");
+	private void enlistImageInternal(final Picture picture) {
 
-			filesHtml.append("<img border=\"0\" src=\"" + listingThumbnailUrl
-					+ "\"/></a>\n");
-			filesHtml.append("<br/><b>"
-					+ FilePathParser
-					.getFileNameWithoutExtension(picture.fileName)
-					+ "</b><br/>(");
+		filesHtml.append("<div style=\"float:left; margin: 10px;\">");
 
-			int count = 0;
-			for (final Dimension dimension : recommendedDimensions) {
-				count++;
-				if (count > 1)
-					filesHtml.append(", ");
-				filesHtml.append("<a href=\""
-						+ indexer.getThumbnailUrl(picture, dimension,
-								indexingContext) + "\">");
-				filesHtml.append(dimension.width + "x" + dimension.height);
-				filesHtml.append("</a>");
-			}
+		// clickable image thumbnail
+		filesHtml.append("<a href=\""
+				+ indexingContext.getGlobalUrl()
+				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
+						+ picture.fileName) + "\">\n");
+		filesHtml.append("<img border=\"0\" src=\""
+				+ getImageThumbnailUrl(picture) + "\"/></a><br/>\n");
 
-			filesHtml.append(")</TD>\n");
+		// file name
+		filesHtml.append("<b>"
+				+ FilePathParser.getFileNameWithoutExtension(picture.fileName)
+				+ "</b><br/>");
 
-			columnAdded();
+		// links to thumbnails of various sizes
+		filesHtml.append("(" + enlistImageDimensions(picture) + ")\n");
 
-		} catch (final Exception e) {
-			logger.error(
-					"Error generating thumbnails for image file: "
-							+ e.toString()
-							+ ", thumbnail generation skipped, enlisting as ordinary file instead.",
-							e);
-			enlistFile(abstractFile);
-		}
+		filesHtml.append("</div>");
 	}
 
 	/** {@inheritDoc} */
 	@Override
-	public void enlistOgv(final AbstractFile abstractFile)
+	public void enlistOgv(final AbstractFile abstractFile,
+			final DirectoryMetadata parentDirectoryMetadata)
 			throws UnsupportedEncodingException {
 
 		final GeneralFile file = (GeneralFile) abstractFile;
 
-		finishRow();
+		filesHtml.append("<div style=\"margin: 30px; clear: both;\">");
 
+		// watchable video
 		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("<video preload=\"metadata\" controls=\"controls\" tabindex=\"0\">\n");
 		filesHtml
-		.append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\""
-				+ indexingContext.getGlobalUrl()
-				+ UrlParamEncoder.encode(indexingContext.getLocalUrl()
-						+ "/" + file.fileName) + "\">\n");
+				.append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\""
+						+ indexingContext.getGlobalUrl()
+						+ UrlParamEncoder.encode(indexingContext.getLocalUrl()
+								+ "/" + file.fileName) + "\">\n");
 		filesHtml.append("</source>\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;");
+				.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()
 				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
-						+ file.fileName) + "\">download as OGV</a>\n");
+						+ file.fileName) + "\">download as OGV</a>");
 
-		filesHtml.append("</TD></TR>\n");
+		filesHtml.append("</div>\n");
 
-	}
-
-	public void finishRow() {
+		filesHtml.append("\n");
 
-		if (currentColumn == 0)
-			return;
-
-		while (currentColumn <= horizontalColumnsLimit) {
-			filesHtml.append("<TD></TD>");
-			currentColumn++;
-		}
-		filesHtml.append("</TR>\n");
-		currentColumn = 0;
 	}
 
 	/** {@inheritDoc} */
@@ -206,63 +178,56 @@ 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");
-
-		finalHtml.append("<CENTER><H2>");
-		for (final String p : path)
-			finalHtml.append(" / " + p);
-		finalHtml.append("</H2></CENTER>\n");
+			html.append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n");
 
-		// append directory listing
-		finalHtml.append("<TABLE>\n");
+		html.append(showCurrentPath());
+		html.append(listDirectories());
+		html.append(directory.getHeaderMevizMetadataHtml());
+		html.append(filesHtml.toString());
 
-		if (path.size() > 0) {
-			finalHtml.append("<TR>");
-			finalHtml.append("<TD><b><a href=\""
-					+ indexer.getParentDirectoryUrl(indexingContext)
-					+ "\"> &lt;== ..</a></b></TD>");
-			finalHtml.append("</TR>\n");
-		}
+		if (doHtmlHeaderAndFooter)
+			html.append("</font></BODY></HTML>\n");
 
-		finalHtml.append(dirHtml.toString());
-		finalHtml.append("\n<TR><TD><br></TD></TR>\n");
-		finalHtml.append("</TABLE>\n");
+		return html.toString();
+	}
 
-		// append file listing
+	private String getImageThumbnailUrl(final Picture picture) {
+		final Dimension imageSize = picture.getDimensions();
 
-		finishRow();
-		finalHtml.append("<TABLE width=\"1100\">\n");
-		finalHtml.append(filesHtml.toString());
-		finalHtml.append("\n</TABLE>\n");
+		Dimension listingDimension = new Dimension(1500, 450);
 
-		if (doHtmlHeaderAndFooter)
-			finalHtml.append("</font></BODY></HTML>\n");
+		if (listingDimension.width > imageSize.width)
+			if (listingDimension.height > imageSize.height)
+				listingDimension = imageSize;
 
-		return finalHtml.toString();
+		return indexer.getThumbnailUrl(picture, listingDimension,
+				indexingContext);
 	}
 
 	@Override
@@ -278,11 +243,33 @@ public class MixedLayout implements Layout {
 		filesHtml = new StringBuffer();
 	}
 
-	public void startcolumn() {
-		if (currentColumn == 0) {
-			filesHtml.append("<TR>");
-			currentColumn = 1;
+	private String listDirectories() {
+		final StringBuilder html = new StringBuilder();
+		html.append("<TABLE>\n");
+
+		if (path.size() > 0) {
+			html.append("<TR>");
+			html.append("<TD><b><a href=\""
+					+ indexer.getParentDirectoryUrl(indexingContext)
+					+ "\"><h2> &lt;== parent directory</h2></a></b></TD>");
+			html.append("</TR>\n");
 		}
+
+		html.append(dirHtml.toString());
+		html.append("\n<TR><TD><br></TD></TR>\n");
+		html.append("</TABLE>\n");
+
+		return html.toString();
+	}
+
+	private String showCurrentPath() {
+		final StringBuilder html = new StringBuilder();
+		html.append("<CENTER><H2>");
+		for (final String p : path)
+			html.append(" / " + p);
+		html.append("</H2></CENTER>\n");
+
+		return html.toString();
 	}
 
 }