From 5eed03ab24f6475601d32e16937810266ba3731b Mon Sep 17 00:00:00 2001 From: elgekko Date: Tue, 10 May 2022 10:31:35 +0200 Subject: [PATCH] 2.8.0 verziovaltas htv groovy problemak javitasa --- .../CopyForArchiveNEXIORecordingsStep.java | 3 +- .../ImportMORPHEUSMissingMaterialsStep.java | 52 ++++++++++--------- .../jobengine/server/steps/TranscodeStep.java | 6 +-- .../steps/shared/PlanAirExtensions.java | 30 ++++------- 4 files changed, 44 insertions(+), 47 deletions(-) diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java index c7b2f599..941b65c6 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java @@ -267,7 +267,8 @@ public class CopyForArchiveNEXIORecordingsStep extends JobStep { current++; if (current == limit) break; - setProgress(current * 100 / limit); + int progress = current * 100 / limit; + setProgress(progress); } } diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java index f1df9e94..f2216a33 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java @@ -58,8 +58,9 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep { storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.TIME_TO_AIR, result); storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.DURATION, result); storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.TITLE, result); - // storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.DEVICE_ID, result); - // storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.REASON, result); + // storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.DEVICE_ID, + // result); + // storeMetadataPosition(csvFilePath, dataList, MorpheusStrings.REASON, result); return result; } @@ -77,14 +78,14 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep { processPathItems(filePaths); } catch (Exception e) { logger.catching(e); - logger.error(jobRuntime.getSessionMarker(), "Hiba a végrehajtás során. A rendszer üzenete: {}", e.getMessage()); + logger.error(getSessionMarker(), "Hiba a végrehajtás során. A rendszer üzenete: {}", e.getMessage()); } return null; } private void moveProcessedCSV(Path csvFilePath) throws IOException { EscortFiles.ensureUNCFolder(csvFilePath.getParent().toString(), processedFolder); - String fileName = csvFilePath.getFileName() + "." + EscortFiles.composeKillDate(0); + String fileName = csvFilePath.getFileName().toString() + "." + EscortFiles.composeKillDate(0); Path targetPath = Paths.get(csvFilePath.getParent().toString(), processedFolder, fileName); Files.move(csvFilePath, targetPath); } @@ -95,8 +96,8 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep { String duration = data[metadatas.get(MorpheusStrings.DURATION)]; String materialID = data[metadatas.get(MorpheusStrings.MATERIAL_ID)]; String title = data[metadatas.get(MorpheusStrings.TITLE)]; - // String deviceID = data[metadatas.get(MorpheusStrings.DEVICE_ID)]; - // String reason = data[metadatas.get(MorpheusStrings.REASON)]; + // String deviceID = data[metadatas.get(MorpheusStrings.DEVICE_ID)]; + // String reason = data[metadatas.get(MorpheusStrings.REASON)]; DBObject query = QueryBuilder.start() .and(QueryBuilder.start(MorpheusStrings.MATERIALID).is(materialID).get(), QueryBuilder.start(MorpheusStrings.TIMETOAIR).is(timeToAir).get()) @@ -104,7 +105,7 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep { DBCollection collection = db.getCollection(MorpheusStrings.COLLECTION_NAME); BasicDBObject existingObject = (BasicDBObject) collection.findOne(query); if (existingObject != null) { - logger.warn(jobRuntime.getSessionMarker(), "Az '{}' anyag már feldolgozásra került az {} időpontban.", materialID, + logger.warn(getSessionMarker(), "Az '{}' anyag már feldolgozásra került az {} időpontban.", materialID, existingObject.getDate(MorpheusStrings.IMPORTED)); return; } @@ -115,26 +116,26 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep { dbObject.put(MorpheusStrings.DURATION, duration); dbObject.put(MorpheusStrings.MATERIALID, materialID); dbObject.put(MorpheusStrings.TITLE, title); - // dbObject.put(MorpheusStrings.DEVICEID, deviceID); - // dbObject.put(MorpheusStrings.REASON, reason); + // dbObject.put(MorpheusStrings.DEVICEID, deviceID); + // dbObject.put(MorpheusStrings.REASON, reason); String fileName = materialID + MXF_EXT; Path targetFilePath = Paths.get(targetPath, fileName); boolean exists = Files.exists(targetFilePath); if (exists && targetFilePath.toFile().length() > 0) { - logger.warn(jobRuntime.getSessionMarker(), "Az '{}' anyag már be van töltve.", materialID); + logger.warn(getSessionMarker(), "Az '{}' anyag már be van töltve.", materialID); dbObject.put(MorpheusStrings.STATUS, MorpheusStrings.STATUS_SKIPPED); } else { List medias = dao.getByHouseId(fileName); if (medias == null || medias.size() == 0) { - logger.warn(jobRuntime.getSessionMarker(), "Az '{}' anyag nem található az archívumban.", materialID); + logger.warn(getSessionMarker(), "Az '{}' anyag nem található az archívumban.", materialID); dbObject.put(MorpheusStrings.STATUS, MorpheusStrings.STATUS_UNAVAILABLE); } else if (medias.size() > 1) { - logger.warn(jobRuntime.getSessionMarker(), "Az '{}' anyagból egynél több található az archívumban.", materialID); + logger.warn(getSessionMarker(), "Az '{}' anyagból egynél több található az archívumban.", materialID); dbObject.put(MorpheusStrings.STATUS, MorpheusStrings.STATUS_MULTIPLE); } else { - logger.info(jobRuntime.getSessionMarker(), "Az '{}' anyag megtalálható az archívumban.", materialID); + logger.info(getSessionMarker(), "Az '{}' anyag megtalálható az archívumban.", materialID); dbObject.put(MorpheusStrings.STATUS, MorpheusStrings.STATUS_RESTORABLE); MediaFile mf = (MediaFile) medias.get(0); @@ -146,8 +147,9 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep { collection.insert(dbObject); } - // Channel,Time to Air,Duration,Material ID,Title,Device ID,Reason, - // TX02,10-JAN-2018 13:25:21:08,00:05:00:00,M009572A,Tiéd a pálya/26. - 1. seg - Eredeti ** mc ,ICELE-02,On Domain (ISILON, ICELE-01, ICELE-05) , + // Channel,Time to Air,Duration,Material ID,Title,Device ID,Reason, + // TX02,10-JAN-2018 13:25:21:08,00:05:00:00,M009572A,Tiéd a pálya/26. - 1. seg - + // Eredeti ** mc ,ICELE-02,On Domain (ISILON, ICELE-01, ICELE-05) , private void processMissingMaterialCSV(Path csvFilePath, List lines) throws Exception { if (lines == null | lines.size() == 0) { return; @@ -165,7 +167,8 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep { processLine(data, metadatas); current++; - setProgress(current * 100 / overall); + int progress = current * 100 / overall; + setProgress(progress); } } @@ -178,7 +181,7 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep { moveProcessedCSV(csvFilePath); } catch (Exception e) { logger.catching(e); - logger.error(jobRuntime.getSessionMarker(), "A {} MORPHEUS állomány mozgatásakor hiba történt. A rendszer hibaüzenete: {}.", csvFile.getName(), + logger.error(getSessionMarker(), "A {} MORPHEUS állomány mozgatásakor hiba történt. A rendszer hibaüzenete: {}.", csvFile.getName(), e.getMessage()); } } @@ -190,6 +193,7 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep { File csvFile = filePath.toFile(); if (csvFile.isDirectory() || !csvFile.getName().toLowerCase().endsWith(CSV_EXT.toLowerCase())) continue; + logger.info(getSessionMarker(), "Processing {}", filePath); List lines = Files.readAllLines(filePath, Charset.forName("UTF-8")); overall += lines.size(); contents.put(filePath, lines); @@ -203,39 +207,39 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep { private void setAndCheck(String sourcePath, String processedFolder, String targetPath, IJobEngine jobEngine) { if (jobEngine == null) { - logger.error(jobRuntime.getSessionMarker(), "Az folyamatkezelő réteg nem elérhető."); + logger.error(getSessionMarker(), "Az folyamatkezelő réteg nem elérhető."); throw new NullPointerException("Internal error, missing JobEngine reference."); } IItemManager manager = jobEngine.getItemManager(); if (manager == null) { - logger.error(jobRuntime.getSessionMarker(), "Az adatbáziskezelő réteg nem elérhető."); + logger.error(getSessionMarker(), "Az adatbáziskezelő réteg nem elérhető."); throw new NullPointerException("Internal error, missing ItemManager reference."); } dao = (MediaFileDAO) manager.getBaseDAO(MediaFile.class); if (dao == null) { - logger.error(jobRuntime.getSessionMarker(), "Az adatbáziskezelő réteg MediaFile kezelöje nem elérhető."); + logger.error(getSessionMarker(), "Az adatbáziskezelő réteg MediaFile kezelöje nem elérhető."); throw new NullPointerException("Internal error, missing MediaFile DAO reference."); } if (sourcePath == null) { - logger.error(jobRuntime.getSessionMarker(), "A folyamat 'sourcePath' bemeneti paramétere üres."); + logger.error(getSessionMarker(), "A folyamat 'sourcePath' bemeneti paramétere üres."); throw new NullPointerException("System is not configured properly, 'sourcePath' input parameter missing."); } if (processedFolder == null) { - logger.error(jobRuntime.getSessionMarker(), "A folyamat 'processedFolder' bemeneti paramétere üres."); + logger.error(getSessionMarker(), "A folyamat 'processedFolder' bemeneti paramétere üres."); throw new NullPointerException("System is not configured properly, 'processedFolder' input parameter missing."); } this.processedFolder = processedFolder; if (targetPath == null) { - logger.error(jobRuntime.getSessionMarker(), "A folyamat 'targetPath' bemeneti paramétere üres."); + logger.error(getSessionMarker(), "A folyamat 'targetPath' bemeneti paramétere üres."); throw new NullPointerException("System is not configured properly, 'targetPath' input parameter missing."); } this.targetPath = targetPath; db = NoSQLUtils.getNoSQLDB(); if (db == null) { - logger.error(jobRuntime.getSessionMarker(), "Sikertelen kapcsolódás a NoSQL adatbázishoz."); + logger.error(getSessionMarker(), "Sikertelen kapcsolódás a NoSQL adatbázishoz."); throw new NullPointerException("Can not connect to NoSQL database."); } diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java index 64018f37..dd1246ea 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java @@ -6,9 +6,9 @@ import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; public class TranscodeStep extends JobStep { - private static int TRANSCODER_VERSION = SystemConfiguration.getInstance().value("services.transcoder.version"); - private static String TRANSCODER_API_ADDRESS = SystemConfiguration.getInstance().value("services.transcoder.api.address"); - private static String TRANSCODER_API_TEMPLATE = SystemConfiguration.getInstance().value("services.transcoder.api.template"); + private static int TRANSCODER_VERSION = SystemConfiguration.getInstance().value("services.transcoder.version", 0); + private static String TRANSCODER_API_ADDRESS = SystemConfiguration.getInstance().value("services.transcoder.api.address", ""); + private static String TRANSCODER_API_TEMPLATE = SystemConfiguration.getInstance().value("services.transcoder.api.template", ""); @StepEntry public Object[] execute(String globalSourcePath, ArchiveItem archiveItem, Media mediaCubeMedia, String transcoderTargetPath, IJobEngine jobEngine, 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 129bb6ba..ef86f0a5 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 @@ -122,18 +122,15 @@ public class PlanAirExtensions { private static final String HYPHEN_SPACES = " - "; private static Connection connection; - private static void appendInstanceData(Document doc, Node node, String name, String deviceID, Timecode tcIn, - Timecode tcOut) { + private static void appendInstanceData(Document doc, Node node, String name, String deviceID, Timecode tcIn, Timecode tcOut) { node.appendChild(doc.createElement("Long_File_Id")).appendChild(doc.createTextNode(name)); node.appendChild(doc.createElement("Device_Id")).appendChild(doc.createTextNode(deviceID)); node.appendChild(doc.createElement("Timecode_In")).appendChild(doc.createTextNode(tcIn.toString(""))); node.appendChild(doc.createElement("Timecode_Out")).appendChild(doc.createTextNode(tcOut.toString(""))); - node.appendChild(doc.createElement("Quality_Check")) - .appendChild(doc.createTextNode(new SimpleDateFormat("dd/MM/yyyy").format(new Date()))); + node.appendChild(doc.createElement("Quality_Check")).appendChild(doc.createTextNode(new SimpleDateFormat("dd/MM/yyyy").format(new Date()))); } - private static void appendItemData(Document doc, Node node, String name, String title, Timecode duration, - String type) { + private static void appendItemData(Document doc, Node node, String name, String title, Timecode duration, String type) { node.appendChild(doc.createElement("Material_Id")).appendChild(doc.createTextNode(name)); node.appendChild(doc.createElement("Title")).appendChild(doc.createTextNode(title)); @@ -150,7 +147,7 @@ public class PlanAirExtensions { } public static long getExistingRundownMedia(IItemManager manager, String houseid) { - final long[] result = { 0 }; + final long[] result = new long[] { 0 }; StringBuilder query = new StringBuilder(); query.append("select mediaid, mediafilehouseid, filename"); query.append(" "); @@ -179,8 +176,7 @@ public class PlanAirExtensions { * XMLTEST011 * */ - public static String getMorpeusXML(IItemManager manager, String dbUrl, String userName, String password, - String name, String deviceID) throws Exception { + public static String getMorpeusXML(IItemManager manager, String dbUrl, String userName, String password, String name, String deviceID) throws Exception { String result = null; try { Class.forName(SQLSERVER_JDBC_SQL_SERVER_DRIVER); @@ -209,7 +205,7 @@ public class PlanAirExtensions { for (int i = 1; i <= rsmd.getColumnCount(); i++) System.out.println(rsmd.getColumnName(i) + " " + rsmd.getColumnTypeName(i)); - int[] segment = { rs1.getInt("v_TcIn"), rs1.getInt("v_TcOut") }; + int[] segment = new int[] { rs1.getInt("v_TcIn"), rs1.getInt("v_TcOut") }; segments.add(segment); return true; }, st -> { @@ -218,8 +214,7 @@ public class PlanAirExtensions { int out = segments.get(segments.size() - 1)[1]; int in = segments.get(0)[0]; appendItemData(doc, itemNode, name, title, new Timecode(out - in, Type.PAL), "PROGRAMME"); - appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), - new Timecode(out, Type.PAL)); + appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), new Timecode(out, Type.PAL)); return false; }, st -> { st.setString(1, name); @@ -230,8 +225,7 @@ public class PlanAirExtensions { int in = rs.getInt("t_TcIn"); int out = rs.getInt("t_TcOut"); appendItemData(doc, itemNode, name, title, new Timecode(out - in, Type.PAL), "COMMERCIAL"); - appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), - new Timecode(out, Type.PAL)); + appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), new Timecode(out, Type.PAL)); return false; }, st -> { st.setString(1, name); @@ -242,8 +236,7 @@ public class PlanAirExtensions { int in = rs.getInt("t_TcIn"); int out = rs.getInt("t_TcOut"); appendItemData(doc, itemNode, name, title, new Timecode(out - in, Type.PAL), "JUNCTION"); - appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), - new Timecode(out, Type.PAL)); + appendInstanceData(doc, instanceNode, name, deviceID, new Timecode(in, Type.PAL), new Timecode(out, Type.PAL)); return false; }, st -> { st.setString(1, name); @@ -262,9 +255,8 @@ public class PlanAirExtensions { return result; } - public static Connection search(Connection con, MetadataType type, IItemManager manager, String dbUrl, - String userName, String password, IResultSetConsumer consumer, IStatementDecorator decorator) - throws Exception { + public static Connection search(Connection con, MetadataType type, IItemManager manager, String dbUrl, String userName, String password, + IResultSetConsumer consumer, IStatementDecorator decorator) throws Exception { try { Class.forName(SQLSERVER_JDBC_SQL_SERVER_DRIVER); -- 2.54.0