From ae0bfa05911e771cde0aafad67436aa77495df0f Mon Sep 17 00:00:00 2001 From: "vasary.daniel" Date: Mon, 25 Apr 2022 23:39:38 +0000 Subject: [PATCH] lepesek ellenorizve git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33211 --- .../production/LOCAL/jobs/executors.xml | 2 +- .../production/LOCAL/jobs/schedules.json | 36 ++++++------ .../LOCAL/jobs/steps/CancelableStep.java | 32 +++++----- .../LOCAL/jobs/steps/ProResArchiveStep.java | 58 ------------------- .../LOCAL/jobs/templates/cancelable.xml | 2 +- .../tests/DynamicStepsLoaderTests.java | 7 ++- .../server/steps/DuplicateRemoverStep.java | 4 +- .../steps/shared/PlanAirExtensions.java | 39 ++++++------- server/user.mediacube.gui/pages/jobs.zul | 2 +- 9 files changed, 62 insertions(+), 120 deletions(-) delete mode 100644 server/-product/production/LOCAL/jobs/steps/ProResArchiveStep.java diff --git a/server/-product/production/LOCAL/jobs/executors.xml b/server/-product/production/LOCAL/jobs/executors.xml index 14f3fa67..0fd7a2f2 100644 --- a/server/-product/production/LOCAL/jobs/executors.xml +++ b/server/-product/production/LOCAL/jobs/executors.xml @@ -14,7 +14,7 @@ - + diff --git a/server/-product/production/LOCAL/jobs/schedules.json b/server/-product/production/LOCAL/jobs/schedules.json index 7610e70c..feb14298 100644 --- a/server/-product/production/LOCAL/jobs/schedules.json +++ b/server/-product/production/LOCAL/jobs/schedules.json @@ -1,8 +1,24 @@ { "joblist":[ { - "active": false, + "name" : "n1", + "template": "cancelable.xml", + "active": true, "executeimmediate": true, + "parameters": [ + {"name": "param", "value": 1000, "type": "java.lang.Integer"} + ] + }, + { + "name" : "n2", + "template": "cancelable.xml", + "active": true, + "executeimmediate": true, + "parameters": [ + {"name": "param", "value": 1000, "type": "java.lang.Integer"} + ] + }, + { "name" : "Limitált archiválás", "template": "archive-limited.xml", "cronexpression": "0 */10 * * * ?", @@ -16,21 +32,11 @@ }, { "name" : "SYS: batch-retrieve-ondemand", - "template": "batch-retrieve-ondemand.xml", - "active": false, - "executeimmediate": false - }, - { - "template": "cancelable.xml", - "parameters": [ - {"name": "param", "value": 1000, "type": "java.lang.Integer"} - ] + "template": "batch-retrieve-ondemand.xml" }, { "template": "calculatemd5.xml", "name": "MD5 kiszámítása", - "active": false, - "executeimmediate": false, "parameters": [ { "name": "fileName", "value": "C:\\Users\\machine\\Downloads\\sample.mxf", @@ -41,8 +47,6 @@ { "template": "dummy-test-job.xml", "name": "dummy test job", - "active": true, - "executeimmediate": false, "parameters": [ { "name": "param1", "value": "Jozsi", @@ -54,8 +58,6 @@ { "template": "move-jpeg-to-isilon.xml", "name": "JPEG másolása ISILON-ba", - "active": false, - "executeimmediate": false, "parameters": [ { "name": "sourceUri", "value": "localhost", @@ -98,8 +100,6 @@ { "template": "prores-archive.xml", "name" : "ProRes archiválás", - "active": false, - "executeimmediate": false, "parameters": [ { "name": "sourceStoreFolder", "value": "c:\\data", "type": "java.lang.String" }, diff --git a/server/-product/production/LOCAL/jobs/steps/CancelableStep.java b/server/-product/production/LOCAL/jobs/steps/CancelableStep.java index 75bef7c5..9293427a 100644 --- a/server/-product/production/LOCAL/jobs/steps/CancelableStep.java +++ b/server/-product/production/LOCAL/jobs/steps/CancelableStep.java @@ -14,28 +14,28 @@ public class CancelableStep extends JobStep { for (int i = 0; i < count; i++) { if (getJobRuntime().isWaitingCancel()) break; - if (i == 1) - throw new Exception("AAAAAAAAAA"); +// if (i == 1) +// throw new Exception("AAAAAAAAAA"); Thread.sleep(1000); int progress = (i + 1) * 100 / count; setProgress(progress); } - try { - - // logger.warn("Ez a fo logba megy"); - // - // //marker="MEDIACUBE" - // logger.warn(getMarker(), "Ez a markered logba megy"); - // - // //marker="MEDIACUBE | folyamat_nev" - // logger.warn(getJobRuntime().getSessionMarker(), "Ez a markered logba megy es a nevesitett logba"); - - } catch (Exception e) { - e.printStackTrace(); - throw e; - } +// try { +// +// logger.warn("Ez a fo logba megy"); +// +// //marker="MEDIACUBE" +// logger.warn(getMarker(), "Ez a markered logba megy"); +// +// //marker="MEDIACUBE | folyamat_nev" +// logger.warn(getJobRuntime().getSessionMarker(), "Ez a markered logba megy es a nevesitett logba"); +// +// } catch (Exception e) { +// e.printStackTrace(); +// throw e; +// } return new Object[] { param }; } diff --git a/server/-product/production/LOCAL/jobs/steps/ProResArchiveStep.java b/server/-product/production/LOCAL/jobs/steps/ProResArchiveStep.java deleted file mode 100644 index d3fcfaf9..00000000 --- a/server/-product/production/LOCAL/jobs/steps/ProResArchiveStep.java +++ /dev/null @@ -1,58 +0,0 @@ - -package user.jobengine.server.steps; - -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 com.ibm.nosql.json.api.BasicDBObject; - -import user.jobengine.server.steps.shared.FileSearchFilterOptions; - -public class ProResArchiveStep extends PathItemsCollectorStep { - private static final Logger logger = LogManager.getLogger(); - public static final String DOT_CATCHED = ".catched"; - public static final String STATUSFOLDER = ".STATUS"; - - @Override - protected FileSearchFilterOptions createFileFilter(BasicDBObject filter) { - String fileName = filter.getString("fileName").replaceAll("[^a-zA-Z0-9]", ""); - - FileSearchFilterOptions result = new FileSearchFilterOptions(filter) { - @Override - public boolean acceptFile(Path file) { - if (!isMediaCatched(file)) {/* !catched van-e */ - return super.acceptFile(file); - } - return false; - } - }; - return result; - } - - @Override - @StepEntry - public Object[] execute(String sourceStoreFolder, BasicDBObject filter) throws Exception { - return super.execute(sourceStoreFolder, filter); - } - - /*** - * A média elérési útján alapján a .STATUS almappában vizsgálja .catch fajl - * létezését. - * - * @param mediaFile - * @return - */ - public static boolean isMediaCatched(Path mediaFile) { - Path catchedFile = createMediaCatchFilePath(mediaFile); - return Files.exists(catchedFile); - } - - public static Path createMediaCatchFilePath(Path mediaFile) { - String fileName = mediaFile.getFileName().toString() + DOT_CATCHED; - return Paths.get(mediaFile.getParent().toString(), STATUSFOLDER, fileName); - } -} diff --git a/server/-product/production/LOCAL/jobs/templates/cancelable.xml b/server/-product/production/LOCAL/jobs/templates/cancelable.xml index e5ec0cf3..2be289b3 100644 --- a/server/-product/production/LOCAL/jobs/templates/cancelable.xml +++ b/server/-product/production/LOCAL/jobs/templates/cancelable.xml @@ -6,7 +6,7 @@ - + diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/DynamicStepsLoaderTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/DynamicStepsLoaderTests.java index 2303b7bd..37528a7e 100644 --- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/DynamicStepsLoaderTests.java +++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/DynamicStepsLoaderTests.java @@ -34,15 +34,16 @@ public class DynamicStepsLoaderTests { GroovyClassLoader classLoader = sut.createClassLoader(this.getClass().getClassLoader()); Set sourceFiles = sut.getSourceFiles(); logger.info("Chcking {} files", sourceFiles.size()); - sourceFiles.forEach(f -> { + + for (File f : sourceFiles) { String name = f.getName().toString(); try { logger.info("Loading {}", name); sut.loadClassFromSourceCode(classLoader, name); } catch (Exception e) { logger.error(e.getMessage()); + throw e; } - - }); + } } } diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/DuplicateRemoverStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/DuplicateRemoverStep.java index 741edbbb..5e407eb3 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/DuplicateRemoverStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/DuplicateRemoverStep.java @@ -50,7 +50,7 @@ public class DuplicateRemoverStep extends JobStep { manager.executeQuery("select filename from vw_items_rd_dup order by filecount desc", rs -> { String fileName = rs.getString("filename"); - processLowresDuplicates(fileName); + innerProcessLowresDuplicates(fileName); count[1]++; int progress = (int) ((double) count[1] * 100 / count[0]); setProgress(progress); @@ -61,7 +61,7 @@ public class DuplicateRemoverStep extends JobStep { }, null); } - private void processLowresDuplicates(String fileName) { + private void innerProcessLowresDuplicates(String fileName) { String query = "select mediafileid, mediafilehouseid, relativepath from vw_items_rd_lh where filename = ?"; IStatementDecorator decorator = st -> { st.setString(1, fileName); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java index b64d36d4..129bb6ba 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java @@ -33,6 +33,17 @@ import user.jobengine.db.IResultSetConsumer; import user.jobengine.db.IStatementDecorator; public class PlanAirExtensions { + + private static MetadataType TRAFFIC_MATERIAL; + private static MetadataType TRAFFIC_AD; + private static MetadataType TRAFFIC_PROMO; + + PlanAirExtensions() { + TRAFFIC_MATERIAL = MetadataType.TrafficMaterial; + TRAFFIC_AD = MetadataType.TrafficAD; + TRAFFIC_PROMO = MetadataType.TrafficPromo; + } + private static final Logger logger = LogManager.getLogger(); // @Operation int, @@@Options int, @@ItemID int, @@IntParam1 int=Null, // @@IntParam2 int=Null, @@IntParam3 int=Null, @@ -184,8 +195,7 @@ public class PlanAirExtensions { connection = DriverManager.getConnection(dbUrl, userName, password); // TODO hiba esetén exception - switch (type) { - case TrafficMaterial: { + if (MetadataType.TrafficMaterial.equals(type)) { manager.executeQuery(connection, MATERIAL_SQL, rs -> { String progTitle = rs.getString("v_ProgTitle"); String epTitle = rs.getString("v_EpTitle"); @@ -214,9 +224,7 @@ public class PlanAirExtensions { }, st -> { st.setString(1, name); }); - break; - } - case TrafficPromo: { + } else if (MetadataType.TrafficPromo.equals(type)) { manager.executeQuery(connection, PROMO_SQL, rs -> { String title = rs.getString("v_Title"); int in = rs.getInt("t_TcIn"); @@ -228,9 +236,7 @@ public class PlanAirExtensions { }, st -> { st.setString(1, name); }); - break; - } - case TrafficAD: { + } else if (MetadataType.TrafficAD.equals(type)) { manager.executeQuery(connection, AD_SQL, rs -> { String title = rs.getString("v_Title"); int in = rs.getInt("t_TcIn"); @@ -242,9 +248,7 @@ public class PlanAirExtensions { }, st -> { st.setString(1, name); }); - break; - } - default: + } else { return null; } result = XMLtoString(doc); @@ -267,18 +271,13 @@ public class PlanAirExtensions { if (con == null) connection = DriverManager.getConnection(dbUrl, userName, password); // TODO hiba esetén exception - switch (type) { - case TrafficMaterial: + + if (MetadataType.TrafficMaterial.equals(type)) { manager.executeQuery(connection, MATERIAL_SQL, consumer, decorator); - break; - case TrafficPromo: + } else if (MetadataType.TrafficPromo.equals(type)) { manager.executeQuery(connection, PROMO_SQL, consumer, decorator); - break; - case TrafficAD: + } else if (MetadataType.TrafficAD.equals(type)) { manager.executeQuery(connection, AD_SQL, consumer, decorator); - break; - default: - break; } } catch (Exception e) { logger.catching(e); diff --git a/server/user.mediacube.gui/pages/jobs.zul b/server/user.mediacube.gui/pages/jobs.zul index 907a8eb9..e814063e 100644 --- a/server/user.mediacube.gui/pages/jobs.zul +++ b/server/user.mediacube.gui/pages/jobs.zul @@ -18,7 +18,7 @@ - + -- 2.54.0