vp9 codec was slow and produced no keyframes. Trying vp8 instead.

[meviz.git] / src / main / java / eu / svjatoslav / meviz / htmlindexer / layouts / MixedLayout.java
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..fd70b10 100755 (executable)
--- 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;
  
@@ -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;
@@ -177,42 +178,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");
-
-               showCurrentPath(finalHtml);
-
-               listDirectories(finalHtml);
+                       html.append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n");
  
-               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 +243,33 @@ 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();
         }
  
  }