From 77ceaeb81f7b23bc27408f93345980f8c0d6b180 Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Tue, 22 Feb 2022 13:41:59 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32989

---
 .../jobengine/server/steps/SafeDeleteRecursive.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java
index a3593eae..527a469f 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/SafeDeleteRecursive.java
@@ -306,8 +306,12 @@ public class SafeDeleteRecursive extends JobStep implements FileVisitor<Path> {
 			}
 		}
 
-		boolean canDelete = !noMDExists && catchedExists && killdateExists && mcArchived && tsmArchived
-				&& metadataEquals;
+//		boolean canDelete = !noMDExists && catchedExists && killdateExists && mcArchived && tsmArchived
+//				&& metadataEquals;
+
+		boolean canDelete = mcArchived && tsmArchived && metadataEquals && sizeEquals && mediaInfoAvailable;
+		logger.info(getSessionMarker(), canDelete);
+
 		Date now = new Date(System.currentTimeMillis());
 		logger.info(csvMarker, "{};{};{};{};{};{};{};{};{};{};{};{};{};{};{};{};{};{};{};", D(now), fileName,
 				mediaPath.getParent(), size, D(createDate), D(lastModifiedDate), D(mcArchivedDate), D(tsmBackupDate),
@@ -318,8 +322,8 @@ public class SafeDeleteRecursive extends JobStep implements FileVisitor<Path> {
 				YN(killdateExists), YN(noMDExists), YN(mcArchived), YN(tsmArchived), YN(metadataEquals), YN(sizeEquals),
 				YN(includeContains), YN(mediaInfoAvailable));
 
-//		if (canDelete)
-//			removeFiles(mediaPath, killDateFiles);
+		if (canDelete)
+			removeFiles(mediaPath, killDateFiles);
 
 		return true;
 	}
-- 
2.54.0