From 9558b8d672bbd77ebc3feef238f1f9601720a3b1 Mon Sep 17 00:00:00 2001
From: elgekko <vasary@elgekko.net>
Date: Tue, 7 Jun 2022 09:40:01 +0200
Subject: [PATCH] Rekurziv archivalas sebessegenek novelese

---
 .../jobengine/server/steps/ArchiveRecursive.java  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
index cee331ea..119f941e 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
@@ -257,17 +257,21 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 			return true;
 		}
 
-		if (handleArchiveConflict(mediaPath)) {
-			logger.info(getSessionMarker(), "Skipping archive db already contains {}", mediaPath);
-			return true;
-		}
-
 		boolean includeContains = includeList.contains(mediaPath.toString());
 		if (!includeContains) {
 			logger.info(getSessionMarker(), "Not on whitelist {}, skipping", mediaPath);
 			return true;
 		}
 
+		Path nomdFile = Paths.get(mediaPath.toString() + ".nomd");
+		if (Files.exists(nomdFile))
+			return true;
+
+		if (handleArchiveConflict(mediaPath)) {
+			logger.info(getSessionMarker(), "Skipping archive db already contains {}", mediaPath);
+			return true;
+		}
+
 //
 //		if (nomdFile.toFile().exists()) {
 //			// toroljuk es ujbol letrehozzuk ha kell
@@ -296,7 +300,6 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
 //			logger.info(new MediaCubeMarker("vasary@elgekko.net,muszak@mediavivantis.hu",
 //					"Értesítés problémás " + mediaPath.getFileName().toString() + " archiválásról"), msg);
 
-			Path nomdFile = Paths.get(mediaPath.toString() + ".nomd");
 			if (!Files.exists(nomdFile))
 				Files.createFile(nomdFile);
 			return true;
-- 
2.54.0