From 06443c58496cf5cef69a47411ba480f1e4debeb9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Thu, 10 Oct 2019 14:38:51 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31567 --- .../run-mediacube-server-user.launch | 2 +- .../config/config.xml | 1 + .../jobtemplates/archive-material.xml | 3 +- .../jobengine/server/steps/TranscodeStep.java | 34 +++++++++++ .../src/user/commons/FFAStransAPI.java | 59 ++++++++++--------- .../zk/model/MaestroJobListModel.java | 7 ++- 6 files changed, 72 insertions(+), 34 deletions(-) create mode 100644 server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java diff --git a/server/-configuration/run-mediacube-server-user.launch b/server/-configuration/run-mediacube-server-user.launch index 7a9ef79e..98399b86 100644 --- a/server/-configuration/run-mediacube-server-user.launch +++ b/server/-configuration/run-mediacube-server-user.launch @@ -19,7 +19,7 @@ - + diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml index 06ad6316..056e06f1 100644 --- a/server/user.jobengine.executors/config/config.xml +++ b/server/user.jobengine.executors/config/config.xml @@ -28,6 +28,7 @@ + diff --git a/server/user.jobengine.executors/jobtemplates/archive-material.xml b/server/user.jobengine.executors/jobtemplates/archive-material.xml index d8ec58f4..63ba7c37 100644 --- a/server/user.jobengine.executors/jobtemplates/archive-material.xml +++ b/server/user.jobengine.executors/jobtemplates/archive-material.xml @@ -38,7 +38,7 @@ - + @@ -57,6 +57,7 @@ + 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 new file mode 100644 index 00000000..71a644a8 --- /dev/null +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java @@ -0,0 +1,34 @@ +package user.jobengine.server.steps; + +import user.jobengine.db.Media; +import user.jobengine.server.IJobEngine; +import user.jobengine.server.IJobRuntime; + +public class TranscodeStep extends JobStep { + @StepEntry + public Object[] execute(String globalSourcePath, ArchiveItem archiveItem, Media mediaCubeMedia, String transcoderTargetPath, String webPath, + IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { + int version = 0; + try { + Boolean.parseBoolean(System.getProperty("jobengine.transcoder.version")); + } catch (Exception e) { + } + switch (version) { + case 0: { + TranscodeSELENIOStep selenioStep = new TranscodeSELENIOStep(); + selenioStep.execute(globalSourcePath, archiveItem, mediaCubeMedia, transcoderTargetPath, webPath, jobEngine, jobRuntime); + break; + } + case 1: { + TranscodeFFAStranStep selenioStep = new TranscodeFFAStranStep(); + String transcoderAddress = System.getProperty("jobengine.transcoder.address"); + String transcoderTemplateName = System.getProperty("jobengine.transcoder.template"); + selenioStep.execute(archiveItem, mediaCubeMedia, transcoderAddress, transcoderTemplateName, globalSourcePath, transcoderTargetPath, webPath, false, + jobEngine, jobRuntime); + break; + } + } + return null; + } + +} diff --git a/server/user.jobengine.osgi.commons/src/user/commons/FFAStransAPI.java b/server/user.jobengine.osgi.commons/src/user/commons/FFAStransAPI.java index cabb330e..9f85b759 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/FFAStransAPI.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/FFAStransAPI.java @@ -19,36 +19,37 @@ import user.commons.nosql.NoSQLUtils; public class FFAStransAPI implements IFFAStransAPI { - // public static void main(String[] args) throws Exception { - // - // for (int i = 0; i < 1; i++) { - // IFFAStransAPI api = new FFAStransAPI("http://10.10.1.74:65445/api/json/v1/", p -> { - // System.out.println("Progress: " + p); - // }); - // - // String inputFile = "\\\\10.10.254.74\\temp_isilon\\NEXIO\\HIRADO\\180201\\0700_hirado_CLN_-_CS.lxf"; - // api.submit("MAM_proxy_copy", inputFile); - // try { - // api.monitor(1000); - // } catch (Exception e) { - // System.out.println(e.getMessage()); - // } - // // try { - // // - // // String outputFile = "\\\\10.10.1.74\\MAM-Proxy_output\\20180201-0700_hirado_TEST-_CS.mp4"; - // // Path outputFilePath = Paths.get(outputFile); - // // File file = outputFilePath.toFile(); - // // if (!file.exists()) - // // Thread.sleep(2000); - // // Files.delete(outputFilePath); - // // } catch (Exception e) { - // // System.out.println(e.getMessage()); - // // } - // - // } - // } - private static final Logger logger = LogManager.getLogger(); + + public static void main(String[] args) throws Exception { + + for (int i = 0; i < 1; i++) { + IFFAStransAPI api = new FFAStransAPI("http://10.11.1.111:65445/api/json/v1/", p -> { + System.out.println("Progress: " + p); + }); + + String inputFile = "\\\\10.11.1.100\\Promise\\ARCHIVE\\2.MXF"; + api.submit("MP4", inputFile); + try { + api.monitor(1000); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + // try { + // + // String outputFile = "\\\\10.10.1.74\\MAM-Proxy_output\\20180201-0700_hirado_TEST-_CS.mp4"; + // Path outputFilePath = Paths.get(outputFile); + // File file = outputFilePath.toFile(); + // if (!file.exists()) + // Thread.sleep(2000); + // Files.delete(outputFilePath); + // } catch (Exception e) { + // System.out.println(e.getMessage()); + // } + + } + } + private ResteasyWebTarget webTarget; private IProgressChangedListener listener; private String jobId; diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java index f0a57bf4..60f1db38 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java @@ -58,11 +58,12 @@ public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedLi } private String applyTargetPath(String targetPath, IMetadata targetMetadata) { - Path path = Paths.get(targetPath, String.format("%s_%s", targetMetadata.getId(), stripDiacritics(targetMetadata.getTitle()))); + String subFolder = String.format("%s_%s", targetMetadata.getId(), stripDiacritics(targetMetadata.getTitle())); + Path path = Paths.get(targetPath, subFolder.toUpperCase()); String result = path.toString(); - result = result.replace(" (OK)", ""); + //result = result.replace(" (OK)", ""); result = result.replace(" ", "_"); - return result.toUpperCase(); + return result; } public ListModelList getJobList() { -- 2.54.0