possibility to remove artifacts generated by meviz index

[meviz.git] / src / main / java / eu / svjatoslav / meviz / htmlindexer / FilesystemIndexer.java

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
index 0edea71..d9726dd 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
@@ -9,10 +9,8 @@
 
 package eu.svjatoslav.meviz.htmlindexer;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -23,7 +21,6 @@ import org.apache.log4j.Logger;
 
 import eu.svjatoslav.commons.file.IOHelper;
 import eu.svjatoslav.commons.network.UrlParamEncoder;
-import eu.svjatoslav.meviz.htmlindexer.layouts.MixedLayout;
 import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
 import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
 import eu.svjatoslav.meviz.htmlindexer.metadata.MetadadaHelper;
@@ -92,33 +89,11 @@ public class FilesystemIndexer extends AbstractIndexer {
 
        public boolean canWriteIndexFile(final File indexFile)
                        throws FileNotFoundException, IOException {
-               boolean canWriteIndexFile = false;
 
-               if (indexFile.exists()) {
-                       // if file already exists, make sure that we can overwrite
-                       // it
-                       final FileReader fileReader = new FileReader(indexFile);
-                       final BufferedReader reader = new BufferedReader(fileReader);
+               if (!indexFile.exists())
+                       return true;
 
-                       parseFile: {
-                               while (true) {
-                                       final String line = reader.readLine();
-
-                                       if (line == null)
-                                               break parseFile;
-
-                                       if (line.contains(Constants.HTML_MAGIC_STRING)) {
-                                               canWriteIndexFile = true;
-                                               break parseFile;
-                                       }
-                               }
-                       }
-
-                       reader.close();
-                       fileReader.close();
-               } else
-                       canWriteIndexFile = true;
-               return canWriteIndexFile;
+               return Utils.isMevizGeneratedIndexFile(indexFile);
        }
 
        public void cleanupUnusedMetadataFiles() {
@@ -131,14 +106,11 @@ public class FilesystemIndexer extends AbstractIndexer {
 
        public void generateHtmlFromMetadata(final HashSet<Layout> layouts) {
                // Generate HTML from metadata
-               for (final Layout layout : layouts) {
-
-                       final String indexFilePath = directoryToIndex.getAbsolutePath()
-                                       + "/index" + layout.getFileNameSuffix() + ".html";
-
+               for (final Layout layout : layouts)
                        try {
+                               final File indexFile = Utils.getLayoutIndexFile(layout,
+                                               directoryToIndex);
 
-                               final File indexFile = new File(indexFilePath);
                                if (canWriteIndexFile(indexFile)) {
 
                                        indexForLayout(layout);
@@ -147,9 +119,8 @@ public class FilesystemIndexer extends AbstractIndexer {
                                                        .getHtml(true, true).getBytes());
                                }
                        } catch (final Exception e) {
-                               logger.error("Error writing index file to:" + indexFilePath, e);
+                               logger.error("Error writing index file. ", e);
                        }
-               }
        }
 
        public List<String> getChildPath(final File file) {
@@ -219,8 +190,8 @@ public class FilesystemIndexer extends AbstractIndexer {
        }
 
        public void initializeLayouts() {
-               layouts = new HashSet<Layout>();
-               layouts.add(new MixedLayout());
+
+               layouts = Utils.getLayouts();
 
                final String galleryTitle = commandlineHandler.getGalleryTitle();
 
@@ -230,12 +201,9 @@ public class FilesystemIndexer extends AbstractIndexer {
        }
 
        public void initializeThumbnailsDirectory() {
-               // initialize thumbnails directory
-               thumbnailsPath = directoryToIndex.getAbsolutePath() + "/"
-                               + Constants.THUMBNAILS_DIRECTORY_NAME + "/";
+               final File thumbnailsDirectory = Utils
+                               .getThumbnailsDirectory(directoryToIndex);
 
-               // ensure thumbnails directory exists
-               final File thumbnailsDirectory = new File(thumbnailsPath);
                if (!thumbnailsDirectory.exists())
                        thumbnailsDirectory.mkdirs();
        }