X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Findexer%2FFilesystemIndexer.java;h=e553c806c1e03ed4117eb69e3f5e4fad53e459eb;hb=55413b4e5a1c3fb76d77e20ea67fd29853083c7e;hp=6add6bede8c7555b36216538fb96d5c5ffd476e9;hpb=35252da406b80b367bf8ff130991165c7e865687;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/indexer/FilesystemIndexer.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/indexer/FilesystemIndexer.java
index 6add6be..e553c80 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/indexer/FilesystemIndexer.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/indexer/FilesystemIndexer.java
@@ -1,16 +1,15 @@
 /*
- * Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012 -- 2019, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public License
- * or later as published by the Free Software Foundation.
-*/
+ * Meviz - Various tools collection to work with multimedia. Author: Svjatoslav Agejenko.
+ * This project is released under Creative Commons Zero (CC0) license.
+ */
+
 
 package eu.svjatoslav.meviz.htmlindexer.indexer;
 
-import eu.svjatoslav.commons.file.IOHelper;
-import eu.svjatoslav.meviz.htmlindexer.*;
+import eu.svjatoslav.meviz.htmlindexer.CommandlineHandler;
+import eu.svjatoslav.meviz.htmlindexer.Constants;
+import eu.svjatoslav.meviz.htmlindexer.IndexingContext;
+import eu.svjatoslav.meviz.htmlindexer.Utils;
 import eu.svjatoslav.meviz.htmlindexer.layouts.Layout;
 import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
 import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
@@ -25,6 +24,12 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
+import static eu.svjatoslav.commons.file.IOHelper.overwriteFileIfContentDiffers;
+import static eu.svjatoslav.meviz.htmlindexer.Constants.THUMBNAILS_DIRECTORY_NAME;
+import static eu.svjatoslav.meviz.htmlindexer.Utils.getThumbnailsDirectoryPath;
+import static eu.svjatoslav.meviz.htmlindexer.Utils.urlEncode;
+import static eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Picture.makeThumbnail;
+
 /**
  * Main class of HTML indexer.
  */
@@ -83,7 +88,6 @@ public class FilesystemIndexer extends AbstractIndexer {
     }
 
     private void generateHtmlFromMetadata(final HashSet<Layout> layouts) {
-        // Generate HTML from metadata
         for (final Layout layout : layouts)
             try {
                 final File indexFile = Utils.getLayoutIndexFile(layout,
@@ -93,7 +97,7 @@ public class FilesystemIndexer extends AbstractIndexer {
 
                     compileHtml(layout, metadata);
 
-                    IOHelper.overwriteFileIfContentDiffers(indexFile, layout
+                    overwriteFileIfContentDiffers(indexFile, layout
                             .getHtml(true, true, metadata).getBytes());
                 }
             } catch (final Exception e) {
@@ -113,7 +117,7 @@ public class FilesystemIndexer extends AbstractIndexer {
     @Override
     public String getDirectoryUrl(final AbstractFile directory,
                                   final IndexingContext context) {
-        return Utils.urlEncode(directory.fileName) + "/index.html";
+        return urlEncode(directory.fileName) + "/index.html";
     }
 
     @Override
@@ -135,20 +139,16 @@ public class FilesystemIndexer extends AbstractIndexer {
 
         validMetadataFiles.add(thumbnailFileName);
         final File thumbnailFile = new File(
-                Utils.getThumbnailsDirectoryPath(directoryToIndex)
-                        + thumbnailFileName);
+                getThumbnailsDirectoryPath(directoryToIndex) + thumbnailFileName);
 
         if (!thumbnailFile.exists()) {
 
             final File originalFile = new File(
                     directoryToIndex.getAbsolutePath() + "/" + picture.fileName);
 
-            // generate new thumbnail
-            Picture.makeThumbnail(originalFile, thumbnailFile,
-                    desiredDimension.getAwtDimension());
+            makeThumbnail(originalFile, thumbnailFile, desiredDimension.getAwtDimension());
         }
-        return Constants.THUMBNAILS_DIRECTORY_NAME + "/"
-                + Utils.urlEncode(thumbnailFileName);
+        return THUMBNAILS_DIRECTORY_NAME + "/" + urlEncode(thumbnailFileName);
     }
 
     private void initializeLayouts() {
@@ -173,7 +173,7 @@ public class FilesystemIndexer extends AbstractIndexer {
     private void loadOrCreateMetadata() {
 
         metadataFile = new File(
-                Utils.getThumbnailsDirectoryPath(directoryToIndex)
+                getThumbnailsDirectoryPath(directoryToIndex)
                         + Constants.METADATA_FILE_NAME);
 
         metadata = MetadadaHelper.initDirectoryMetadata(metadataFile);