git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

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 e857b2e723f97ac114ca0ee9e3a0c217b4884572..0a4fbf669c369862f73ef1f2861793c936a81943 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/FFAStransAPI.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/FFAStransAPI.java
@@ -38,7 +38,7 @@ public class FFAStransAPI implements IFFAStransAPI {
                for (int i = 0; i < inputs.length; i++) {\r
                        final String inputi = inDir + inputs[i];\r
                        final String outputi = outDir + FilenameUtils.removeExtension(inputs[i]) + ".MP4";\r
-                       //Task task = new Task(inDir + input, outDir + output);\r
+                       // Task task = new Task(inDir + input, outDir + output);\r
 \r
                        Runnable task = new Runnable() {\r
                                private String input = inputi;\r
@@ -48,7 +48,7 @@ public class FFAStransAPI implements IFFAStransAPI {
                                public void run() {\r
                                        try {\r
                                                IFFAStransAPI api = new FFAStransAPI("http://10.11.1.111:65445/api/json/v1/", p -> {\r
-                                                       //System.out.println(output + " progress: " + p);\r
+                                                       // System.out.println(output + " progress: " + p);\r
                                                });\r
 \r
                                                api.submit("MP4", input);\r
@@ -64,17 +64,18 @@ public class FFAStransAPI implements IFFAStransAPI {
                        };\r
 \r
                        executor.execute(task);\r
-                       //                      try {\r
+                       // try {\r
                        //\r
-                       //                              String outputFile = "\\\\10.10.1.74\\MAM-Proxy_output\\20180201-0700_hirado_TEST-_CS.mp4";\r
-                       //                              Path outputFilePath = Paths.get(outputFile);\r
-                       //                              File file = outputFilePath.toFile();\r
-                       //                              if (!file.exists())\r
-                       //                                      Thread.sleep(2000);\r
-                       //                              Files.delete(outputFilePath);\r
-                       //                      } catch (Exception e) {\r
-                       //                              System.out.println(e.getMessage());\r
-                       //                      }\r
+                       // String outputFile =\r
+                       // "\\\\10.10.1.74\\MAM-Proxy_output\\20180201-0700_hirado_TEST-_CS.mp4";\r
+                       // Path outputFilePath = Paths.get(outputFile);\r
+                       // File file = outputFilePath.toFile();\r
+                       // if (!file.exists())\r
+                       // Thread.sleep(2000);\r
+                       // Files.delete(outputFilePath);\r
+                       // } catch (Exception e) {\r
+                       // System.out.println(e.getMessage());\r
+                       // }\r
                }\r
                executor.shutdown();\r
                executor.awaitTermination(1, TimeUnit.HOURS);\r
@@ -98,7 +99,7 @@ public class FFAStransAPI implements IFFAStransAPI {
                if (apiResponse.getStatus() != 202)\r
                        throw new Exception("Can not submit, response status is: " + apiResponse.getStatus());\r
                String json = apiResponse.readEntity(String.class);\r
-               //logger.info("Transoder response: {}", json);\r
+               // logger.info("Transoder response: {}", json);\r
                if (StringUtils.isBlank(json))\r
                        throw new Exception("Can not submit, response JSON is empty");\r
                BasicDBObject resultObject = (BasicDBObject) JSONUtil.jsonToDbObject(json);\r
@@ -142,12 +143,12 @@ public class FFAStransAPI implements IFFAStransAPI {
                                        continue;\r
 \r
                                if (file.equals(f.getName())) {\r
-                                       //logger.info("Found success history {}", f.getName());\r
+                                       // logger.info("Found success history {}", f.getName());\r
                                        result = job;\r
                                        break;\r
                                }\r
                                if (file.equals(inputFile)) {\r
-                                       //logger.info("Found error history {}", inputFile);\r
+                                       // logger.info("Found error history {}", inputFile);\r
                                        result = job;\r
                                        break;\r
                                }\r
@@ -166,15 +167,15 @@ public class FFAStransAPI implements IFFAStransAPI {
                BasicDBObject result = null;\r
                try {\r
                        Response apiResponse = target.request().get();\r
-                       //logger.info("Transoder response code: {}", apiResponse.getStatus());\r
+                       // logger.info("Transoder response code: {}", apiResponse.getStatus());\r
 \r
                        if (apiResponse.getStatus() != 200) {\r
                                logger.info("{} | Invalid response {}", inputFileName, apiResponse.getStatus());\r
                                return null;\r
                        }\r
                        String json = apiResponse.readEntity(String.class);\r
-                       //logger.info("Transoder response: {}", json);\r
-                       //System.out.println(json);\r
+                       // logger.info("Transoder response: {}", json);\r
+                       // System.out.println(json);\r
                        BasicDBObject resultObject = (BasicDBObject) JSONUtil.jsonToDbObject(json);\r
                        List<BasicDBObject> jobs = NoSQLUtils.asList(resultObject, "jobs");\r
 \r
@@ -184,7 +185,7 @@ public class FFAStransAPI implements IFFAStransAPI {
                        }\r
                        for (BasicDBObject job : jobs) {\r
                                if (jobID.equals(job.getString("job_id"))) {\r
-                                       //logger.info("Found job {}", jobID);\r
+                                       // logger.info("Found job {}", jobID);\r
                                        result = job;\r
                                        break;\r
                                }\r
@@ -223,16 +224,16 @@ public class FFAStransAPI implements IFFAStransAPI {
 \r
                long started = System.currentTimeMillis();\r
 \r
-               //              BasicDBObject status = getStatus(jobId);\r
+               // BasicDBObject status = getStatus(jobId);\r
                //\r
-               //              while (true) {\r
-               //                      status = getStatus(jobId);\r
-               //                      long current = System.currentTimeMillis();\r
-               //                      if (status != null || current - started > 15 * 60 * 1000)\r
-               //                              break;\r
+               // while (true) {\r
+               // status = getStatus(jobId);\r
+               // long current = System.currentTimeMillis();\r
+               // if (status != null || current - started > 15 * 60 * 1000)\r
+               // break;\r
                //\r
-               //                      Thread.sleep(pollIntervall);\r
-               //              }\r
+               // Thread.sleep(pollIntervall);\r
+               // }\r
 \r
                BasicDBObject status = null;\r
                boolean hasAnyResponse = false;\r
@@ -259,7 +260,7 @@ public class FFAStransAPI implements IFFAStransAPI {
                                }\r
 \r
                        } else {\r
-                               logger.info("{} status not exists, checking history", inputFileName);\r
+                               logger.info("{} status does not exist, checking history", inputFileName);\r
                                listener.onProgressChanged(100);\r
                                BasicDBObject history = getHistory();\r
                                if (history != null) {\r
@@ -279,7 +280,7 @@ public class FFAStransAPI implements IFFAStransAPI {
                                }\r
                        }\r
 \r
-                       //5 percig nincs valasz\r
+                       // 5 percig nincs valasz\r
                        if (!hasAnyResponse && (queryTime - started > 10 * 60 * 1000))\r
                                throw new Exception("Transcoder timeout");\r
                        Thread.sleep(pollIntervall);\r
@@ -298,7 +299,7 @@ public class FFAStransAPI implements IFFAStransAPI {
                long wfID = -1;\r
                wfID = getWorkflowId(workflowName, workflows, wfID);\r
                if (wfID < 0)\r
-                       throw new Exception("Workflow not exists: " + workflowName);\r
+                       throw new Exception("Workflow does not exist: " + workflowName);\r
 \r
                BasicDBObject jobToSubmit = new BasicDBObject("wf_id", wfID).append("inputfile", inputFile);\r
                doSubmit(jobToSubmit);\r