Code refactoring

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

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java
index 600d65c..0725382 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java
@@ -1,16 +1,12 @@
 /*
- * Meviz - Various tools collection to work with multimedia.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * 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.metadata;
 
 import eu.svjatoslav.commons.file.FilePathParser;
-import eu.svjatoslav.meviz.htmlindexer.AbstractIndexer;
 import eu.svjatoslav.meviz.htmlindexer.FileSortComparator;
 import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.*;
 
@@ -18,6 +14,9 @@ import java.io.File;
 import java.io.Serializable;
 import java.util.*;
 
+import static eu.svjatoslav.meviz.htmlindexer.indexer.AbstractIndexer.isImage;
+import static eu.svjatoslav.meviz.htmlindexer.indexer.AbstractIndexer.isVideo;
+
 /**
  * Corresponds to single filesystem directory.
  */
@@ -34,27 +33,19 @@ public class DirectoryMetadata implements Serializable {
      * images that no longer exist in the filesystem.
      */
     public void cleanup() {
-        final Iterator<AbstractFile> fileIterator = fileNameToFileMap.values()
-                .iterator();
-
-        while (fileIterator.hasNext()) {
-            final AbstractFile file = fileIterator.next();
-
-            if (!file.isMetaInfoVerified())
-                fileIterator.remove();
-        }
+        fileNameToFileMap.values().removeIf(file -> !file.isMetadataVerified());
     }
 
-    public void ensureFileMetainfoIsUpToDate(final File parentDirectory,
+    public void ensureFileMetadataIsUpToDate(final File parentDirectory,
                                              final File file) throws Exception {
 
         final String fileName = file.getName();
 
         if (fileNameToFileMap.containsKey(fileName)) {
-            final boolean metainfoUpdated = fileNameToFileMap.get(fileName)
-                    .ensureFileMetainfoIsUpToDate(parentDirectory);
+            final boolean metadataUpdated = fileNameToFileMap.get(fileName)
+                    .ensureFileMetadataIsUpToDate(parentDirectory);
 
-            if (metainfoUpdated)
+            if (metadataUpdated)
                 changed = true;
         } else
             registerFile(parentDirectory, file);
@@ -70,14 +61,24 @@ public class DirectoryMetadata implements Serializable {
         final String fileExtension = FilePathParser.getFileExtension(fileName)
                 .toLowerCase();
 
-        if (AbstractIndexer.isImage(fileExtension))
+        if (isImage(fileExtension))
             try {
                 return new Picture(parentDirectory, fileName);
             } catch (final Exception exception) {
+                System.out.println("Failed to decode image \"" + fileName +"\" indexing as normal file instead.");
+
                 // in case image decoding failed, handle image as general file
                 return new GeneralFile(parentDirectory, fileName);
             }
 
+        if (isVideo(fileExtension))
+            try {
+                return new Video(parentDirectory, fileName);
+            } catch (final Exception exception) {
+                // in case video decoding failed, handle it as general file
+                return new GeneralFile(parentDirectory, fileName);
+            }
+
         if (fileName.endsWith(".meviz.org"))
             return new MevizSpecialFile(parentDirectory, fileName);
 
@@ -96,7 +97,7 @@ public class DirectoryMetadata implements Serializable {
         final ArrayList<AbstractFile> files = new ArrayList<>(
                 fileNameToFileMap.values());
 
-        Collections.sort(files, new FileSortComparator());
+        files.sort(new FileSortComparator());
 
         return files;
     }
@@ -132,7 +133,7 @@ public class DirectoryMetadata implements Serializable {
 
     public void removeUnusedMetadataEntries() {
 
-        new HashSet<>(fileNameToFileMap.keySet()).stream().filter(key -> !fileNameToFileMap.get(key).isMetaInfoVerified()).forEach(key -> {
+        new HashSet<>(fileNameToFileMap.keySet()).stream().filter(key -> !fileNameToFileMap.get(key).isMetadataVerified()).forEach(key -> {
             fileNameToFileMap.remove(key);
             changed = true;
         });