git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33211
<executor className="ArchiveListBuilderStep.java" maxConcurrent="1" isRemote="false" />\r
<executor className="ArchiveMaterialSubmitStep.java" maxConcurrent="1" isRemote="false" />\r
<executor className="BatchRetrieveForkStep.java" maxConcurrent="1" isRemote="false" />\r
- <executor className="user.jobengine.server.steps.CancelableStep" maxConcurrent="20" isRemote="false" />\r
+ <executor className="CancelableStep.java" maxConcurrent="20" isRemote="false" />\r
<executor className="CalculateMD5Step.java" maxConcurrent="1" isRemote="false "/>\r
<executor className="CleanupMountedLocationStep.java" maxConcurrent="5" isRemote="false" />\r
<executor className="CreateArchiveItemStep.java" maxConcurrent="1" isRemote="false" />\r
{\r
"joblist":[ \r
{\r
- "active": false,\r
+ "name" : "n1",\r
+ "template": "cancelable.xml",\r
+ "active": true,\r
"executeimmediate": true,\r
+ "parameters": [ \r
+ {"name": "param", "value": 1000, "type": "java.lang.Integer"}\r
+ ] \r
+ },\r
+ {\r
+ "name" : "n2",\r
+ "template": "cancelable.xml",\r
+ "active": true,\r
+ "executeimmediate": true,\r
+ "parameters": [ \r
+ {"name": "param", "value": 1000, "type": "java.lang.Integer"}\r
+ ] \r
+ },\r
+ {\r
"name" : "Limitált archiválás",\r
"template": "archive-limited.xml",\r
"cronexpression": "0 */10 * * * ?",\r
},\r
{\r
"name" : "SYS: batch-retrieve-ondemand",\r
- "template": "batch-retrieve-ondemand.xml",\r
- "active": false,\r
- "executeimmediate": false\r
- },\r
- {\r
- "template": "cancelable.xml",\r
- "parameters": [ \r
- {"name": "param", "value": 1000, "type": "java.lang.Integer"}\r
- ] \r
+ "template": "batch-retrieve-ondemand.xml"\r
},\r
{\r
"template": "calculatemd5.xml",\r
"name": "MD5 kiszámítása",\r
- "active": false,\r
- "executeimmediate": false,\r
"parameters": [ \r
{\r
"name": "fileName", "value": "C:\\Users\\machine\\Downloads\\sample.mxf", \r
{\r
"template": "dummy-test-job.xml",\r
"name": "dummy test job",\r
- "active": true,\r
- "executeimmediate": false,\r
"parameters": [ \r
{\r
"name": "param1", "value": "Jozsi", \r
{\r
"template": "move-jpeg-to-isilon.xml",\r
"name": "JPEG másolása ISILON-ba",\r
- "active": false,\r
- "executeimmediate": false,\r
"parameters": [ \r
{\r
"name": "sourceUri", "value": "localhost", \r
{\r
"template": "prores-archive.xml",\r
"name" : "ProRes archiválás",\r
- "active": false,\r
- "executeimmediate": false,\r
"parameters": \r
[ \r
{ "name": "sourceStoreFolder", "value": "c:\\data", "type": "java.lang.String" },\r
for (int i = 0; i < count; i++) {\r
if (getJobRuntime().isWaitingCancel())\r
break;\r
- if (i == 1)\r
- throw new Exception("AAAAAAAAAA");\r
+// if (i == 1)\r
+// throw new Exception("AAAAAAAAAA");\r
\r
Thread.sleep(1000);\r
int progress = (i + 1) * 100 / count;\r
setProgress(progress);\r
}\r
\r
- try {\r
-\r
- // logger.warn("Ez a fo logba megy");\r
- //\r
- // //marker="MEDIACUBE"\r
- // logger.warn(getMarker(), "Ez a markered logba megy");\r
- //\r
- // //marker="MEDIACUBE | folyamat_nev"\r
- // logger.warn(getJobRuntime().getSessionMarker(), "Ez a markered logba megy es a nevesitett logba");\r
-\r
- } catch (Exception e) {\r
- e.printStackTrace();\r
- throw e;\r
- }\r
+// try {\r
+//\r
+// logger.warn("Ez a fo logba megy");\r
+//\r
+// //marker="MEDIACUBE"\r
+// logger.warn(getMarker(), "Ez a markered logba megy");\r
+//\r
+// //marker="MEDIACUBE | folyamat_nev"\r
+// logger.warn(getJobRuntime().getSessionMarker(), "Ez a markered logba megy es a nevesitett logba");\r
+//\r
+// } catch (Exception e) {\r
+// e.printStackTrace();\r
+// throw e;\r
+// }\r
return new Object[] { param };\r
}\r
\r
+++ /dev/null
-\r
-package user.jobengine.server.steps;\r
-\r
-import java.nio.file.Files;\r
-import java.nio.file.Path;\r
-import java.nio.file.Paths;\r
-\r
-import org.apache.logging.log4j.LogManager;\r
-import org.apache.logging.log4j.Logger;\r
-\r
-import com.ibm.nosql.json.api.BasicDBObject;\r
-\r
-import user.jobengine.server.steps.shared.FileSearchFilterOptions;\r
-\r
-public class ProResArchiveStep extends PathItemsCollectorStep {\r
- private static final Logger logger = LogManager.getLogger();\r
- public static final String DOT_CATCHED = ".catched";\r
- public static final String STATUSFOLDER = ".STATUS";\r
-\r
- @Override\r
- protected FileSearchFilterOptions createFileFilter(BasicDBObject filter) {\r
- String fileName = filter.getString("fileName").replaceAll("[^a-zA-Z0-9]", "");\r
-\r
- FileSearchFilterOptions result = new FileSearchFilterOptions(filter) {\r
- @Override\r
- public boolean acceptFile(Path file) {\r
- if (!isMediaCatched(file)) {/* !catched van-e */\r
- return super.acceptFile(file);\r
- }\r
- return false;\r
- }\r
- };\r
- return result;\r
- }\r
-\r
- @Override\r
- @StepEntry\r
- public Object[] execute(String sourceStoreFolder, BasicDBObject filter) throws Exception {\r
- return super.execute(sourceStoreFolder, filter);\r
- }\r
-\r
- /***\r
- * A média elérési útján alapján a .STATUS almappában vizsgálja .catch fajl\r
- * létezését.\r
- *\r
- * @param mediaFile\r
- * @return\r
- */\r
- public static boolean isMediaCatched(Path mediaFile) {\r
- Path catchedFile = createMediaCatchFilePath(mediaFile);\r
- return Files.exists(catchedFile);\r
- }\r
-\r
- public static Path createMediaCatchFilePath(Path mediaFile) {\r
- String fileName = mediaFile.getFileName().toString() + DOT_CATCHED;\r
- return Paths.get(mediaFile.getParent().toString(), STATUSFOLDER, fileName);\r
- }\r
-}\r
</parameters>\r
</declarations>\r
<commands>\r
- <calljobstep remote="true" type="user.jobengine.server.steps.CancelableStep" weight="1" >\r
+ <calljobstep remote="true" type="CancelableStep.java" weight="1" >\r
<inputs>\r
<input>\r
<parameter name="param" />\r
GroovyClassLoader classLoader = sut.createClassLoader(this.getClass().getClassLoader());\r
Set<File> sourceFiles = sut.getSourceFiles();\r
logger.info("Chcking {} files", sourceFiles.size());\r
- sourceFiles.forEach(f -> {\r
+\r
+ for (File f : sourceFiles) {\r
String name = f.getName().toString();\r
try {\r
logger.info("Loading {}", name);\r
sut.loadClassFromSourceCode(classLoader, name);\r
} catch (Exception e) {\r
logger.error(e.getMessage());\r
+ throw e;\r
}\r
-\r
- });\r
+ }\r
}\r
}\r
\r
manager.executeQuery("select filename from vw_items_rd_dup order by filecount desc", rs -> {\r
String fileName = rs.getString("filename");\r
- processLowresDuplicates(fileName);\r
+ innerProcessLowresDuplicates(fileName);\r
count[1]++;\r
int progress = (int) ((double) count[1] * 100 / count[0]);\r
setProgress(progress);\r
}, null);\r
}\r
\r
- private void processLowresDuplicates(String fileName) {\r
+ private void innerProcessLowresDuplicates(String fileName) {\r
String query = "select mediafileid, mediafilehouseid, relativepath from vw_items_rd_lh where filename = ?";\r
IStatementDecorator decorator = st -> {\r
st.setString(1, fileName);\r
import user.jobengine.db.IStatementDecorator;\r
\r
public class PlanAirExtensions {\r
+\r
+ private static MetadataType TRAFFIC_MATERIAL;\r
+ private static MetadataType TRAFFIC_AD;\r
+ private static MetadataType TRAFFIC_PROMO;\r
+\r
+ PlanAirExtensions() {\r
+ TRAFFIC_MATERIAL = MetadataType.TrafficMaterial;\r
+ TRAFFIC_AD = MetadataType.TrafficAD;\r
+ TRAFFIC_PROMO = MetadataType.TrafficPromo;\r
+ }\r
+\r
private static final Logger logger = LogManager.getLogger();\r
// @Operation int, @@@Options int, @@ItemID int, @@IntParam1 int=Null,\r
// @@IntParam2 int=Null, @@IntParam3 int=Null,\r
\r
connection = DriverManager.getConnection(dbUrl, userName, password);\r
// TODO hiba esetén exception\r
- switch (type) {\r
- case TrafficMaterial: {\r
+ if (MetadataType.TrafficMaterial.equals(type)) {\r
manager.executeQuery(connection, MATERIAL_SQL, rs -> {\r
String progTitle = rs.getString("v_ProgTitle");\r
String epTitle = rs.getString("v_EpTitle");\r
}, st -> {\r
st.setString(1, name);\r
});\r
- break;\r
- }\r
- case TrafficPromo: {\r
+ } else if (MetadataType.TrafficPromo.equals(type)) {\r
manager.executeQuery(connection, PROMO_SQL, rs -> {\r
String title = rs.getString("v_Title");\r
int in = rs.getInt("t_TcIn");\r
}, st -> {\r
st.setString(1, name);\r
});\r
- break;\r
- }\r
- case TrafficAD: {\r
+ } else if (MetadataType.TrafficAD.equals(type)) {\r
manager.executeQuery(connection, AD_SQL, rs -> {\r
String title = rs.getString("v_Title");\r
int in = rs.getInt("t_TcIn");\r
}, st -> {\r
st.setString(1, name);\r
});\r
- break;\r
- }\r
- default:\r
+ } else {\r
return null;\r
}\r
result = XMLtoString(doc);\r
if (con == null)\r
connection = DriverManager.getConnection(dbUrl, userName, password);\r
// TODO hiba esetén exception\r
- switch (type) {\r
- case TrafficMaterial:\r
+\r
+ if (MetadataType.TrafficMaterial.equals(type)) {\r
manager.executeQuery(connection, MATERIAL_SQL, consumer, decorator);\r
- break;\r
- case TrafficPromo:\r
+ } else if (MetadataType.TrafficPromo.equals(type)) {\r
manager.executeQuery(connection, PROMO_SQL, consumer, decorator);\r
- break;\r
- case TrafficAD:\r
+ } else if (MetadataType.TrafficAD.equals(type)) {\r
manager.executeQuery(connection, AD_SQL, consumer, decorator);\r
- break;\r
- default:\r
- break;\r
}\r
} catch (Exception e) {\r
logger.catching(e);\r
<include src="/pages/jobeditor.zul"/>\r
</tabpanel>\r
<tabpanel>\r
- <include src="/pages/jobeditor2.zul" />\r
+<!-- <include src="/pages/jobeditor2.zul" /> -->\r
</tabpanel>\r
</tabpanels>\r
</tabbox>\r
https://git.useribm.hu / mediacube.git / commitdiff