From: Vásáry Dániel <vasary@elgekko.net>
Date: Thu, 14 Mar 2024 13:36:33 +0000 (+0100)
Subject: Project configuration
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=4010620c0ad89c9d66ae57d749752ae0007969b8;p=mediacube.git

Project configuration
---

diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch
index b8e978aa..aba4e6ed 100644
--- a/server/-configuration/run-mediacube-server.launch
+++ b/server/-configuration/run-mediacube-server.launch
@@ -18,7 +18,7 @@
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/oracle-1.8"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-1.8-202"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.sun.management.jmxremote&#13;&#10;-Dcom.sun.management.jmxremote.port=9010&#13;&#10;-Dcom.sun.management.jmxremote.local.only=false&#13;&#10;-Dcom.sun.management.jmxremote.authenticate=false&#13;&#10;-Dcom.sun.management.jmxremote.ssl=false&#13;&#10;-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=settings/log4j2.xml&#13;&#10;-Djetty.home=settings/jetty&#13;&#10;-Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml&#13;&#10;-Dgosh.home=configuration&#13;&#10;-Djava.io.tmpdir=tmp&#13;&#10;-Dorg.slf4j.simpleLogger.defaultLogLevel=error"/>
diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml
index 293e6158..bac4f50b 100644
--- a/server/-dependencies/pom.xml
+++ b/server/-dependencies/pom.xml
@@ -96,10 +96,10 @@
 									<id>org.eclipse.platform:org.eclipse.equinox.launcher:1.3.201</id>
 								</artifact>
 								<artifact>
-									<id>net.java.dev.jna:jna:5.8.0</id>
+									<id>net.java.dev.jna:jna:5.14.0</id>
 								</artifact>
 								<artifact>
-									<id>net.java.dev.jna:jna-platform:5.8.0</id>
+									<id>net.java.dev.jna:jna-platform:5.14.0</id>
 								</artifact>
 <!-- 
 								<artifact>
diff --git a/server/RemoteSystemsTempFiles/.project b/server/RemoteSystemsTempFiles/.project
deleted file mode 100644
index 76756293..00000000
--- a/server/RemoteSystemsTempFiles/.project
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>RemoteSystemsTempFiles</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.rse.ui.remoteSystemsTempNature</nature>
-	</natures>
-</projectDescription>
diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OutputPathSelectorTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OutputPathSelectorTests.java
new file mode 100644
index 00000000..7e738b03
--- /dev/null
+++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/OutputPathSelectorTests.java
@@ -0,0 +1,40 @@
+package hu.user.mediacube.executors.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Test;
+
+import user.jobengine.server.JobRuntime;
+import user.jobengine.server.steps.OutputPathAndNameSelectorStep;
+
+public class OutputPathSelectorTests {
+	private static final Logger logger = LogManager.getLogger();
+
+	@Test
+	public void testOctopusIdSelect() throws Throwable {
+
+		System.out.println(System.getProperty("os.name"));
+
+		JobRuntime rt = new JobRuntime();
+		OutputPathAndNameSelectorStep sut = new OutputPathAndNameSelectorStep();
+
+		String id = "123456789_1";
+		Path octopusTargetPath = Paths.get("/temp");
+		Path existingTargetPath = Paths.get("/temp", id + "-blabla");
+		if (!Files.isDirectory(existingTargetPath)) {
+			Files.createDirectory(existingTargetPath);
+		}
+		Object[] params = { "", "", "", "", octopusTargetPath.toString(), "", "", id, "0", null };
+		Object[] result = sut.run(null, rt, params);
+
+		assertEquals(existingTargetPath.toString(), result[0].toString());
+		Files.delete(existingTargetPath);
+	}
+
+}
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java
index 52e30e91..00b48155 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java
@@ -32,31 +32,38 @@ public class OutputPathAndNameSelectorStep extends JobStep {
 
 	private String octopusAddress = SystemConfiguration.getInstance().value("services.octopus.api.address", "");
 
-	private void check(String localRetrievePath, String materialOutputFolder, String promoOutputFolder, String advertisementOutputFolder,
-			String octopusOutputFolder, String genericOutputFolder, String houseId, String targetPathType) {
+	private void check(String localRetrievePath, String materialOutputFolder, String promoOutputFolder,
+			String advertisementOutputFolder, String octopusOutputFolder, String genericOutputFolder, String houseId,
+			String targetPathType) {
 		if (StringUtils.isBlank(localRetrievePath)) {
 			logger.error(marker, "A folyamat 'localRetrievePath' bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'localRetrievePath' input parameter missing.");
+			throw new NullPointerException(
+					"System is not configured properly, 'localRetrievePath' input parameter missing.");
 		}
 		if (StringUtils.isBlank(materialOutputFolder)) {
 			logger.error(marker, "A folyamat 'materialOutputFolder' bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'materialOutputFolder' input parameter missing.");
+			throw new NullPointerException(
+					"System is not configured properly, 'materialOutputFolder' input parameter missing.");
 		}
 		if (StringUtils.isBlank(promoOutputFolder)) {
 			logger.error(marker, "A folyamat 'promoOutputFolder' bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'promoOutputFolder' input parameter missing.");
+			throw new NullPointerException(
+					"System is not configured properly, 'promoOutputFolder' input parameter missing.");
 		}
 		if (StringUtils.isBlank(advertisementOutputFolder)) {
 			logger.error(marker, "A folyamat 'advertisementOutputFolder' bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'advertisementOutputFolder' input parameter missing.");
+			throw new NullPointerException(
+					"System is not configured properly, 'advertisementOutputFolder' input parameter missing.");
 		}
 		if (StringUtils.isBlank(octopusOutputFolder)) {
 			logger.error(marker, "A folyamat 'octopusOutputFolder' bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'octopusOutputFolder' input parameter missing.");
+			throw new NullPointerException(
+					"System is not configured properly, 'octopusOutputFolder' input parameter missing.");
 		}
 		if (StringUtils.isBlank(genericOutputFolder)) {
 			logger.error(marker, "A folyamat 'genericOutputFolder' bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'genericOutputFolder' input parameter missing.");
+			throw new NullPointerException(
+					"System is not configured properly, 'genericOutputFolder' input parameter missing.");
 		}
 		if (StringUtils.isBlank(houseId)) {
 			logger.error(marker, "A folyamat 'houseId' bemeneti paramétere üres.");
@@ -64,26 +71,30 @@ public class OutputPathAndNameSelectorStep extends JobStep {
 		}
 		if (StringUtils.isBlank(targetPathType)) {
 			logger.error(marker, "A folyamat 'targetPathType' bemeneti paramétere üres.");
-			throw new NullPointerException("System is not configured properly, 'targetPathType' input parameter missing.");
+			throw new NullPointerException(
+					"System is not configured properly, 'targetPathType' input parameter missing.");
 		}
 	}
 
 	@StepEntry
-	public Object[] execute(String localRetrievePath, String materialOutputFolder, String promoOutputFolder, String advertisementOutputFolder,
-			String octopusOutputFolder, String genericOutputFolder, String onlineOutputFolder, String houseId, String targetPathType,
-			ArchivedMedia archivedMedia, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {
-		marker = jobRuntime.getSessionMarker();
-		check(localRetrievePath, materialOutputFolder, promoOutputFolder, advertisementOutputFolder, octopusOutputFolder, genericOutputFolder, houseId,
-				targetPathType);
+	public Object[] execute(String localRetrievePath, String materialOutputFolder, String promoOutputFolder,
+			String advertisementOutputFolder, String octopusOutputFolder, String genericOutputFolder,
+			String onlineOutputFolder, String houseId, String targetPathType, ArchivedMedia archivedMedia,
+			IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {
+		marker = getSessionMarker();
+		check(localRetrievePath, materialOutputFolder, promoOutputFolder, advertisementOutputFolder,
+				octopusOutputFolder, genericOutputFolder, houseId, targetPathType);
 		Object[] result = null;
+		boolean isOctopusTarget = false;
 		switch (Integer.parseInt(targetPathType)) {
 		case 0:
-			String outputFolder = getFolderById(materialOutputFolder, promoOutputFolder, advertisementOutputFolder, octopusOutputFolder, genericOutputFolder,
-					houseId, archivedMedia);
-			result = localTargetInit(localRetrievePath, outputFolder, houseId, jobRuntime);
+			String outputFolder = getFolderById(materialOutputFolder, promoOutputFolder, advertisementOutputFolder,
+					octopusOutputFolder, genericOutputFolder, houseId, archivedMedia);
+			isOctopusTarget = outputFolder.equals(octopusOutputFolder);
+			result = localTargetInit(localRetrievePath, outputFolder, houseId, isOctopusTarget);
 			break;
 		case 1:
-			result = localTargetInit(localRetrievePath, onlineOutputFolder, houseId, jobRuntime);
+			result = localTargetInit(localRetrievePath, onlineOutputFolder, houseId, isOctopusTarget);
 			break;
 		case 2:
 
@@ -96,8 +107,9 @@ public class OutputPathAndNameSelectorStep extends JobStep {
 		return result;
 	}
 
-	private String getFolderById(String materialOutputFolder, String promoOutputFolder, String advertisementOutputFolder, String octopusOutputFolder,
-			String genericOutputFolder, String houseId, ArchivedMedia archivedMedia) throws Exception {
+	private String getFolderById(String materialOutputFolder, String promoOutputFolder,
+			String advertisementOutputFolder, String octopusOutputFolder, String genericOutputFolder, String houseId,
+			ArchivedMedia archivedMedia) throws Exception {
 		String id = houseId.toUpperCase();
 		MetadataType mdType = MetadataTypeDetector.GuessMetadataType(id);
 		String result = null;
@@ -145,14 +157,41 @@ public class OutputPathAndNameSelectorStep extends JobStep {
 		return result[0];
 	}
 
-	private Object[] localTargetInit(String localRetrievePath, String outputFolder, String houseId, IJobRuntime jobRuntime) throws IOException {
+	private String getPossibleOctopusPath(String id, Path targetPath) throws IOException {
+		String[] result = new String[] { targetPath.toString() };
+		FileVisitor<Path> matcherVisitor = new SimpleFileVisitor<Path>() {
+			@Override
+			public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+				String dirName = dir.getFileName().toString();
+				if (dirName.startsWith(id + "-") || dirName.equals(id)) {
+					result[0] = dir.toString();
+					return FileVisitResult.TERMINATE;
+				}
+				return FileVisitResult.CONTINUE;
+			}
+		};
+		Files.walkFileTree(targetPath.getParent(), matcherVisitor);
+		return result[0];
+	}
+
+	private Object[] localTargetInit(String localRetrievePath, String outputFolder, String houseId,
+			boolean isOctopusTarget) throws IOException {
 		String id = houseId.toUpperCase();
-		String targetPath = getPossiblePath(id, Paths.get(localRetrievePath, outputFolder, id)).toString();
+		String targetPath = null;
+
+		if (isOctopusTarget) {
+			String[] tokens = id.split("_");
+			targetPath = getPossibleOctopusPath(tokens[0], Paths.get(localRetrievePath, outputFolder, id)).toString();
+		} else {
+			targetPath = getPossiblePath(id, Paths.get(localRetrievePath, outputFolder, id)).toString();
+		}
+
 		String targetNamePattern = houseId + TARGETNAMEPATTERN;
 		try {
 			EscortFiles.ensureUNCFolder(Paths.get(targetPath));
 		} catch (Exception e) {
-			logger.error(jobRuntime.getSessionMarker(), "A cél mappa '{}' nem létezik és nem hozható létre. A rendszer hibaüzenete: {}", targetPath,
+			logger.error(getSessionMarker(),
+					"A cél mappa '{}' nem létezik és nem hozható létre. A rendszer hibaüzenete: {}", targetPath,
 					e.getMessage());
 			throw e;
 		}