From: Sweidan Omar <TFS\sweidan.omar>
Date: Thu, 24 Mar 2022 08:40:52 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=c3df951c5363ad898a239e4ce40a1043be2bd5bd;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33094
---

diff --git a/server/-product/production/LOCAL/jobs/steps/ValidateProResStep.java b/server/-product/production/LOCAL/jobs/steps/ValidateProResStep.java
index 3d972860..e36f784d 100644
--- a/server/-product/production/LOCAL/jobs/steps/ValidateProResStep.java
+++ b/server/-product/production/LOCAL/jobs/steps/ValidateProResStep.java
@@ -1,65 +1,32 @@
 package user.jobengine.server.steps;
 
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.sql.Timestamp;
+import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.io.FilenameUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import user.commons.DownloadableMedia;
-import user.commons.StoreUri;
 import user.commons.mediaarea.MediaArea;
-import user.commons.remotestore.RemoteStoreProtocol;
-import user.jobengine.server.steps.shared.EscortFiles;
 
 public class ValidateProResStep extends JobStep {
 	private static final Logger logger = LogManager.getLogger();
 
 	@StepEntry
-	public Object[] execute(Map<String, MediaArea> proResFiles, String sourceStoreFolder, String targetStoreFolder,
-			String escortStoreFolder) {
+	public Object[] execute(Map<String, MediaArea> proResFiles) {
+		Map<String, MediaArea> files = new HashMap<String, MediaArea>();
+
 		if (!proResFiles.isEmpty()) {
 			for (String fileName : proResFiles.keySet()) {
 				MediaArea mediaArea = proResFiles.get(fileName);
-				String title = FilenameUtils.removeExtension(fileName);
-				Timestamp created = null;
-				Timestamp modified = null;
-				long frameCount = mediaArea.getFrameCount();
 				String videoFormat = mediaArea.getFormat();
-				StoreUri sourceStoreUri = getManager().getStoreUri(sourceStoreFolder, RemoteStoreProtocol.LOCAL);
-//				StoreUri targetStoreUri = getManager().getStoreUri(targetStoreFolder, RemoteStoreProtocol.LOCAL);
-				StoreUri targetStoreUri = getManager().getStoreUri("TSM", RemoteStoreProtocol.TSM);
-				StoreUri escortStoreUri = getManager().getStoreUri(escortStoreFolder, RemoteStoreProtocol.LOCAL);
-				try {
-					String outputPath = Paths.get(escortStoreUri.toString(true)).toString();
-				} catch (Exception e1) {
-					e1.printStackTrace();
-				}
-				long mediaId = 0;
 
 				if (mediaArea.getFrameRate() == 23.976 && videoFormat.equals("PRORES")) {
-					DownloadableMedia downloadable = DownloadableMedia.create(title, fileName, modified, created,
-							frameCount, 0, sourceStoreUri.getId(), targetStoreUri.getId(), mediaId);
-					String escortFileName = targetStoreFolder + "." + downloadable.getString("fileName");
-					try {
-						if (EscortFiles.createMetadataIfNotExists(targetStoreFolder, escortFileName,
-								downloadable.toPrettyString(""))) {
-							logger.info(getMarker(), "Archive status file created for {}", fileName);
-						} else {
-							logger.info(getMarker(), "Archive status file already exists for {}", fileName);
-						}
-					} catch (IOException e) {
-						logger.error("{}", e.getCause());
-						e.printStackTrace();
-					}
+					files.put(fileName, mediaArea);
 				}
 			}
 		} else {
 			logger.info("proResFiles is empty!");
 		}
-		return null;
+		return new Object[] { files };
 	}
 }