X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2FAbstractIndexer.java;h=22ec82560264e1f6c78ac8c82b6c43533de9d7bd;hb=567410640f4e0428caf9de9fc83df4c73f0e5067;hp=2394ece6c3af420425706134c046524b0cc286fb;hpb=1b742640af99284aae1cd10c259254137316ba7c;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/AbstractIndexer.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/AbstractIndexer.java
index 2394ece..22ec825 100644
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/AbstractIndexer.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/AbstractIndexer.java
@@ -2,28 +2,31 @@ package eu.svjatoslav.meviz.htmlindexer;
 
 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.DirectoryFile;
-import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.GeneralFile;
-import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Picture;
+import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.*;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 
+import static eu.svjatoslav.meviz.htmlindexer.Constants.SUPPORTED_IMAGE_EXTENSIONS;
+import static eu.svjatoslav.meviz.htmlindexer.Constants.SUPPORTED_VIDEO_EXTENSIONS;
+
 public abstract class AbstractIndexer {
 
     public static boolean isImage(final String fileExtension) {
-        for (final String ext : Constants.SUPPORTED_IMAGE_EXTENSIONS)
+        for (final String ext : SUPPORTED_IMAGE_EXTENSIONS)
             if (ext.equals(fileExtension))
                 return true;
         return false;
     }
 
-    public static boolean isOgv(final String fileExtension) {
-        return fileExtension.equalsIgnoreCase("ogv");
+    public static boolean isVideo(final String fileExtension) {
+        for (final String ext : SUPPORTED_VIDEO_EXTENSIONS)
+            if (ext.equals(fileExtension))
+                return true;
+        return false;
     }
 
-    public static boolean shallFileBeIndexed(final File file) {
+    static boolean shallFileBeIndexed(final File file) {
 
         if (file.getName().startsWith("."))
             return false;
@@ -34,26 +37,19 @@ public abstract class AbstractIndexer {
         return true;
     }
 
-    public void compileHtml(final Layout layout,
-                            final DirectoryMetadata directory)
+    void compileHtml(final Layout layout,
+                     final DirectoryMetadata directory)
             throws UnsupportedEncodingException {
 
         for (final AbstractFile file : directory.getFiles())
             if (file instanceof GeneralFile) {
-                final String fileExtension = file.getFileExtension();
-
-                if ("ogv".equals(fileExtension))
-                    layout.enlistOgv(file, directory);
-                else if ("webm".equals(fileExtension))
-                    layout.enlistWebm(file, directory);
-                else
-                    layout.enlistFile(file, directory);
-
-            } else if (file instanceof Picture)
+                layout.enlistFile(file, directory);
+            } else if (file instanceof Picture){
                 layout.enlistImage((Picture) file, directory);
-            else if (file instanceof DirectoryFile)
+            } else if (file instanceof Video){
+                layout.enlistVideo((Video) file);
+            } else if (file instanceof DirectoryFile)
                 layout.enlistDirectory(file, directory);
-
     }
 
     public abstract String getDirectoryUrl(final AbstractFile directory,