From: Sweidan Omar Date: Fri, 10 Dec 2021 10:07:31 +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=8be3cdffd0fec0511b9760904c3ac81ec5725b63;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32540 --- diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkUploadStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkUploadStep.java index 92eff37a..eca4024a 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkUploadStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkUploadStep.java @@ -33,7 +33,8 @@ public class ForkUploadStep extends JobStep { private static final Logger logger = LogManager.getLogger(); @StepEntry - public Object[] execute(String tempStoreName, String template, String expectedColorSpace, int limit) throws Exception { + public Object[] execute(String tempStoreName, String template, String expectedColorSpace, int limit) + throws Exception { DirectoryStream directoryStream = null; int count = limit; int allCount = 0; @@ -63,12 +64,12 @@ public class ForkUploadStep extends JobStep { escortFiles.add(escortFile); } allCount = escortFiles.size(); - //a file neve az adasbakerules idopontjaval kezdodik - // escortFiles.sort((p1, p2) -> { - // return p1.compareTo(p2); - // }); + // a file neve az adasbakerules idopontjaval kezdodik + // escortFiles.sort((p1, p2) -> { + // return p1.compareTo(p2); + // }); - //200911 megis inkabb a letrehozas idopontja legyen + // 200911 megis inkabb a letrehozas idopontja legyen try { escortFiles.sort((p1, p2) -> { int result = 0; @@ -138,20 +139,20 @@ public class ForkUploadStep extends JobStep { if (escortFile.toFile().isDirectory()) return false; - //ami nem JSON azt nem kezeljuk + // ami nem JSON azt nem kezeljuk if (!escortFile.getFileName().toString().toLowerCase().endsWith(EscortFiles.DOT_JSON)) return false; - //aminek van COLORSPACE kiterjesztésű - // Path colorspaceFile = Paths.get(escortFile.toString() + ".colorspace"); - // if (colorspaceFile.toFile().exists()) - // return false; + // aminek van COLORSPACE kiterjesztésű + // Path colorspaceFile = Paths.get(escortFile.toString() + ".colorspace"); + // if (colorspaceFile.toFile().exists()) + // return false; if (EscortFiles.isCatchedFileExists(escortFile)) return false; String escortFileName = escortFile.getFileName().toString(); - //minimum 3 karakter: STORENAME.FILENAME.MXF.JSON + // minimum 3 karakter: STORENAME.FILENAME.MXF.JSON long dotCount = escortFileName.chars().filter(ch -> ch == '.').count(); if (dotCount < 3) return false; @@ -193,11 +194,12 @@ public class ForkUploadStep extends JobStep { parameters.put("expectedColorSpace", downloadable.getString("colorSpace")); parameters.put("escortFile", escortFile.toAbsolutePath().toString()); - //int priority = downloadable.containsKey("priority") ? downloadable.getInt("priority") : 0; - //mindenki egyforman induljon 20.09.07 - //a NEXIO egy kicsit fontosabb 20.09.08. megsem 20.09.09 - //int priority = escortFile.toString().contains("NEXIO") ? 51 : 50; - //megszakitasok miatt a mar lejott mozikat vegyuk elore 20.09.09 + // int priority = downloadable.containsKey("priority") ? + // downloadable.getInt("priority") : 0; + // mindenki egyforman induljon 20.09.07 + // a NEXIO egy kicsit fontosabb 20.09.08. megsem 20.09.09 + // int priority = escortFile.toString().contains("NEXIO") ? 51 : 50; + // megszakitasok miatt a mar lejott mozikat vegyuk elore 20.09.09 int priority = 50; if (targetExists(tempStoreUri, targetFileName))