From de669631c9370ef856a1907f18a7f22c56c30fb4 Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Thu, 24 Mar 2022 14:19:20 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33109

---
 .../mediacube/executors/tests/SmallTests.java | 24 ++++++++--------
 .../steps/MetadataSyncRecursiveStep.java      | 28 +++++++++++++------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
index f8558bb4..8a6630c9 100644
--- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
+++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
@@ -41,7 +41,6 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -1504,17 +1503,20 @@ public class SmallTests {
 //		MediaArea m = new MediaArea(Paths.get(string));
 //		System.out.println(m.getFrameCount());
 
-		Map<String, Integer> inputFiles = new HashMap<String, Integer>();
-		inputFiles.put("A", 1);
-		inputFiles.put("B", 2);
-
-		Map<String, Integer> result = inputFiles.entrySet().stream().filter(fileEntry -> {
-			return fileEntry.getValue() > 1;
-		}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+//		Map<String, Integer> inputFiles = new HashMap<String, Integer>();
+//		inputFiles.put("A", 1);
+//		inputFiles.put("B", 2);
+//
+//		Map<String, Integer> result = inputFiles.entrySet().stream().filter(fileEntry -> {
+//			return fileEntry.getValue() > 1;
+//		}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+//
+//		result.entrySet().forEach(i -> {
+//			System.out.println(i.getKey() + " " + i.getValue());
+//		});
 
-		result.entrySet().forEach(i -> {
-			System.out.println(i.getKey() + " " + i.getValue());
-		});
+		String mediaHouseId = "XX-1";
+		System.out.println(mediaHouseId.substring(0, mediaHouseId.length() - 2));
 	}
 
 }
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java
index 423bcae5..c133bcf5 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataSyncRecursiveStep.java
@@ -159,6 +159,23 @@ public class MetadataSyncRecursiveStep extends JobStep implements FileVisitor<Pa
 			result.setMediaDescription(json.getString(MEDIA_DESCRIPTION));
 			result.setMediaType(json.getString(MEDIA_TYPE));
 		}
+
+		if (result == null) {
+			logger.info(getSessionMarker(), "Metadata not available for {}", mediaHouseId);
+
+			if (mediaHouseId.charAt(mediaHouseId.length() - 2) == '-') {
+				mediaHouseId = mediaHouseId.substring(0, mediaHouseId.length() - 2);
+				logger.info(getSessionMarker(), "Checking metadata for {}", mediaHouseId);
+				ArchiveItem metadata = getPlanAirMetadata(mediaHouseId);
+				if (metadata == null)
+					logger.info(getSessionMarker(), "Metadata not available for {}", mediaHouseId);
+				else
+					logger.info(getSessionMarker(), "Metadata is available for {}: {}", mediaHouseId,
+							metadata.getMediaTitle());
+			}
+
+		}
+
 		return result;
 	}
 
@@ -222,14 +239,9 @@ public class MetadataSyncRecursiveStep extends JobStep implements FileVisitor<Pa
 				tsmSize = tsmFile.getSize();
 				sizeEquals = tsmSize == size;
 
-				if (archiveItem == null) {
-					// korabban mentettuk metaadat nelkul
-					logger.info(getSessionMarker(), "Metadata not available for {}", mediaPath);
-				} else {
-					if (sizeEquals && !metadataEquals) {
-						syncMetadata(mediaPath, item, media, archiveItem, mediaFile);
-						logger.info(getSessionMarker(), "Metadata sync applied for {}", mediaPath);
-					}
+				if (sizeEquals && archiveItem != null && !metadataEquals) {
+					syncMetadata(mediaPath, item, media, archiveItem, mediaFile);
+					logger.info(getSessionMarker(), "Metadata sync applied for {}", mediaPath);
 				}
 
 			}
-- 
2.54.0