From 38006fae262324fdf8517decd260ee1c6821cd24 Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Mon, 9 Aug 2021 09:20:11 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32290

---
 .../server/steps/ForkDownloadStep.java        | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkDownloadStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkDownloadStep.java
index fda90b6b..6722c822 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkDownloadStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkDownloadStep.java
@@ -15,7 +15,9 @@ import org.apache.logging.log4j.Logger;
 
 import user.commons.DownloadableMedia;
 import user.commons.JobStatus;
+import user.commons.RemoteFile;
 import user.commons.StoreUri;
+import user.commons.remotestore.FtpDirectoryLister;
 import user.commons.remotestore.RemoteStoreProtocol;
 import user.jobengine.db.Store;
 import user.jobengine.server.IJobEngine;
@@ -26,7 +28,8 @@ public class ForkDownloadStep extends JobStep {
 	private static final Logger logger = LogManager.getLogger();
 
 	@StepEntry
-	public Object[] execute(String tempStoreName, String template, String expectedColorSpace, int limit) throws Exception {
+	public Object[] execute(String tempStoreName, String template, String expectedColorSpace, int limit)
+			throws Exception {
 		DirectoryStream<Path> directoryStream = null;
 		int count = limit;
 		int allCount = 0;
@@ -147,6 +150,26 @@ public class ForkDownloadStep extends JobStep {
 
 				if (e.getStatus().equals(JobStatus.CANCELED) || e.getStatus().equals(JobStatus.SUSPENDED))
 					EscortFiles.removeCatchedFile(escortFile);
+
+				if (e.getStatus().equals(JobStatus.FINISHED) && "PBARCHIVE".equals(sourceStoreName)) {
+					try {
+						FtpDirectoryLister lister = (FtpDirectoryLister) sourceStoreUri.getLister();
+						RemoteFile remoteFile = lister.get(sourceFileName);
+						if (remoteFile == null)
+							logger.info(getMarker(), "Remote file for {} is not available", sourceFileName);
+						else {
+							logger.info(getMarker(), "Remote file {} successfully archived, deleting...",
+									sourceFileName);
+							lister.delete(remoteFile);
+						}
+					} catch (Exception ex) {
+						logger.error(getMarker(), ex.getMessage());
+					} finally {
+						if (sourceStoreUri != null)
+							sourceStoreUri.cleanUp();
+					}
+				}
+
 			}, template, "Archiválás", priority, IJobEngine.DEFAULT_OWNER, parameters);
 			if (child == null)
 				throw new Exception("Submit error.");
-- 
2.54.0