Merge pull request #23 from DrRename/feature/duplicates

Do not add duplicate check results

Author: kerner1000

src/main/java/drrename/RenameUtil.java

@@ -20,7 +20,7 @@ public static Path getImagePathFromNfo(Path nfoFile) throws IOException {
             if(xmlFileContent.getArt() != null && xmlFileContent.getArt().getPoster() != null)
                 return nfoFile.getParent().resolve(xmlFileContent.getArt().getPoster());
         } catch (JsonParseException e) {
-            log.debug("Failed to deserialize {} ({})", nfoFile, e.toString());
+            log.debug("Failed to deserialize image path from {})", nfoFile);
         }
         return null;
     }

src/main/java/drrename/kodi/CheckResult.java

@@ -22,25 +22,36 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
+import java.util.Objects;
+
 public class CheckResult {
 
     protected final StringProperty result;
 
-    protected final String prefix;
-
-    public CheckResult(String prefix, String result) {
-        this.prefix = prefix;
+    public CheckResult(String result) {
         this.result = new SimpleStringProperty(result);
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof CheckResult that)) return false;
+        return Objects.equals(getResult(), that.getResult());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(result);
+    }
+
     @Override
     public String toString() {
-        return getValue();
+        return getResult();
     }
 
     // Getter / Setter //
 
-    public String getValue() {
+    public String getResult() {
         return result.get();
     }
 

src/main/java/drrename/kodi/CheckResultTreeItemContent.java

@@ -21,6 +21,8 @@
 
 import lombok.RequiredArgsConstructor;
 
+import java.util.Objects;
+
 @RequiredArgsConstructor
 public class CheckResultTreeItemContent<T extends CheckResult> extends KodiTreeItemContent {
 
@@ -30,6 +32,18 @@ public T getCheckResult() {
         return checkResult;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof CheckResultTreeItemContent<?> that)) return false;
+        return checkResult.equals(that.checkResult);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(checkResult);
+    }
+
     @Override
     public String toString() {
         return checkResult.toString();

src/main/java/drrename/kodi/CheckService.java

@@ -32,7 +32,8 @@ public void addChildItem(MovieTreeItem treeItem) {
         try {
             R checkResult = checkPath(treeItem.getMoviePath());
             var childItem = buildChildItem(checkResult);
-            Platform.runLater(() -> treeItem.add(childItem));
+            if(!treeItem.contains(childItem))
+                Platform.runLater(() -> treeItem.add(childItem));
         }catch (IOException e){
             log.error(e.getLocalizedMessage(), e);
         }

src/main/java/drrename/kodi/GenericKodiTreeItemContent.java

@@ -20,6 +20,7 @@
 package drrename.kodi;
 
 import drrename.ui.FilterableTreeItem;
+import javafx.scene.control.TreeItem;
 
 public class KodiTreeItem<T extends CheckResult> extends FilterableTreeItem<KodiTreeItemContent> {
 
@@ -31,4 +32,8 @@ public KodiTreeItem(KodiTreeItemContent value) {
     public void add(KodiTreeItem<?> childItem) {
         getSourceChildren().add(childItem);
     }
+
+    public <R extends CheckResult> boolean contains(KodiTreeItem<R> childItem) {
+        return getSourceChildren().stream().map(TreeItem::getValue).anyMatch(v -> v.equals(childItem.getValue()));
+    }
 }

src/main/java/drrename/kodi/KodiTreeItem.java

@@ -19,27 +19,13 @@
 
 package drrename.kodi;
 
-import lombok.AllArgsConstructor;
-import lombok.RequiredArgsConstructor;
+import java.nio.file.Path;
 
-@AllArgsConstructor
-public class GenericTreeItemContent extends KodiTreeItemContent {
+public abstract class NfoCheckResult extends CheckResult {
 
-    private Object value;
-
-    @Override
-    public String toString() {
-        return value.toString();
-    }
-
-    // Getter / Setter //
-
-
-    public Object getValue() {
-        return value;
+    public NfoCheckResult(String result) {
+        super(result);
     }
 
-    public void setValue(Object value) {
-        this.value = value;
-    }
+    public abstract Path getNfoFile();
 }

…rrename/kodi/GenericTreeItemContent.java …n/java/drrename/kodi/NfoCheckResult.javasrc/main/java/drrename/kodi/GenericTreeItemContent.java renamed to src/main/java/drrename/kodi/NfoCheckResult.java src/main/java/drrename/kodi/GenericTreeItemContent.java renamed to src/main/java/drrename/kodi/NfoCheckResult.java

@@ -21,14 +21,14 @@
 
 import java.nio.file.Path;
 
-public class NfoFileContentCheckResult extends CheckResult {
+public class NfoFileContentCheckResult extends NfoCheckResult {
 
     private final Path nfoFile;
 
     private final boolean warning;
 
     public NfoFileContentCheckResult(String result, Path nfoFile, boolean hasWarning) {
-        super("NFO File Content: ", result);
+        super(result);
         this.nfoFile = nfoFile;
         this.warning = hasWarning;
     }

src/main/java/drrename/kodi/NfoFileContentCheckResult.java

@@ -19,7 +19,7 @@
 
 package drrename.kodi;
 
-public class NfoFileContentTreeItemContent extends GenericKodiTreeItemContent<NfoFileContentCheckResult> {
+public class NfoFileContentTreeItemContent extends CheckResultTreeItemContent<NfoFileContentCheckResult> {
 
     public NfoFileContentTreeItemContent(NfoFileContentCheckResult value) {
        super(value);

src/main/java/drrename/kodi/NfoFileContentTreeItemContent.java

@@ -27,17 +27,22 @@
 import java.nio.file.Path;
 import java.util.Collection;
 
-public class NfoFileNameCheckResult extends CheckResult {
+public class NfoFileNameCheckResult extends NfoCheckResult {
 
     private final ListProperty<Path> nfoFiles;
     private final NfoFileNameType type;
 
     public NfoFileNameCheckResult(NfoFileNameType result, Collection<Path> nfoFiles) {
-        super("NFO File Name: ", result.toString());
+        super(result.toString());
         this.type = result;
         this.nfoFiles = new SimpleListProperty<>(FXCollections.observableArrayList(nfoFiles));
     }
 
+    @Override
+    public Path getNfoFile() {
+        return getNfoFiles().isEmpty() ? null : getNfoFiles().get(0);
+    }
+
     // Getter / Setter //
 
     public NfoFileNameType getType() {
@@ -55,4 +60,6 @@ public ListProperty<Path> nfoFilesProperty() {
     public void setNfoFiles(ObservableList<Path> nfoFiles) {
         this.nfoFiles.set(nfoFiles);
     }
+
+
 }