From: vasary.daniel Date: Thu, 23 Sep 2021 14:12:05 +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=4a5641d2d05b51b261556f247515f73afe2b9655;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32341 --- diff --git a/client/MediaCubeApiTest/MediaCubeApiTest.vbproj b/client/MediaCubeApiTest/MediaCubeApiTest.vbproj index cde1e116..c4165cc6 100644 --- a/client/MediaCubeApiTest/MediaCubeApiTest.vbproj +++ b/client/MediaCubeApiTest/MediaCubeApiTest.vbproj @@ -53,6 +53,25 @@ On + + true + true + true + bin\x64\Debug\ + MediaCubeApiTest.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + full + x64 + + + true + ..\bin\MediaCubeApiTest\x64\Release\ + MediaCubeApiTest.xml + true + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + pdbonly + x64 + ..\packages\LinkDotNet.MessageBus.0.1.1\lib\LinkDotNet.MessageHandling.dll @@ -110,6 +129,8 @@ + + MyApplicationCodeGenerator @@ -135,8 +156,6 @@ - - - + \ No newline at end of file diff --git a/client/MediaCubeApiTest/Module1.vb b/client/MediaCubeApiTest/Module1.vb index 4ed03c1a..413825a9 100644 --- a/client/MediaCubeApiTest/Module1.vb +++ b/client/MediaCubeApiTest/Module1.vb @@ -3,27 +3,71 @@ Imports MaestroShared.Configuration Imports MediaCubeClient Imports Newtonsoft.Json.Linq - Module Module1 + Sub Main(ByVal args() As String) + For i As Integer = 0 To args.Length - 1 + Console.WriteLine("Arg: " & i & " is " & args(i)) + Next - Sub Main() - Dim messageBus As IMessageBus = New LinkDotNet.MessageHandling.MessageBus() - Dim writeline = Sub(x As MediaCubeWSMessage) - Console.WriteLine(x.Content) - End Sub + If args.Length < 3 Then + Console.WriteLine("Params: 'server url' 'VOD path' 'query media ID' 'query version or /v' '/q'") + Console.WriteLine("'query media ID' and 'query version' are case sensitive!") + Console.WriteLine("/q parameter is optional, means 'query only' mode") + Console.WriteLine("Sample: restore to //VOD/Input/Pasa_restore/vod all segments starting with CCEM100081- without no version, query ids only") + Console.WriteLine("Sample params: ws://192.168.0.10:9080/services/wsapi /Input/Pasa_restore/vod CCEM100081- /v /q") + Return + End If + + Dim serverURL = args(0) + Dim vodPath = args(1) + Dim queryMediaid = args(2) + Dim version = "" + If Not args(3).Equals("/v") Then + version = args(3) + End If + Dim queryOnly = False + If args.Length > 4 Then + If args(4).Equals("/q") Then + queryOnly = True + End If + End If - messageBus.Subscribe(Of MediaCubeWSMessage)(writeline) + + Dim messageBus As IMessageBus = New LinkDotNet.MessageHandling.MessageBus() + Dim printDebug = Sub(x As MediaCubeWSMessage) + Console.WriteLine(x.Content) + Console.WriteLine(x.Data) + End Sub + messageBus.Subscribe(printDebug) Dim connection As Connection = New Connection() - connection.Address = New Uri("ws://192.168.0.10/services/wsapi") + connection.Address = New Uri(serverURL) connection.Timeout = 1000 + Dim api As MediaCubeWSApi = New MediaCubeWSApi(connection, messageBus) - Dim Data As JObject = New JObject() - Data.Add("param", 1) - api.SubmitJob("cancelable.xml", "teszt név", Data) + Dim ids As List(Of String) = api.QueryMediaNames(queryMediaid, version) + + Dim parameters As JObject = New JObject() + parameters.Add("targetStoreName", "VOD") + + Dim basket As JArray = New JArray() + parameters.Add("basket", basket) + + For Each id As String In ids + Dim item As JObject = New JObject + item.Add("path", vodPath) + item.Add("title", id) + basket.Add(item) + Next + + If queryOnly = False Then + Console.WriteLine("Submitting job") + api.SubmitJob("register-vod-restore.xml", "VOD visszatöltés igénylése", parameters) + End If End Sub + End Module diff --git a/client/MediaCubeApiTest/api/start-test-query-only.bat b/client/MediaCubeApiTest/api/start-test-query-only.bat new file mode 100644 index 00000000..996759ee --- /dev/null +++ b/client/MediaCubeApiTest/api/start-test-query-only.bat @@ -0,0 +1,2 @@ +MediaCubeApiTest.exe ws://192.168.0.10:9080/services/wsapi /Input/Pasa_restore/vod CCEM100081-01 /v /q +pause \ No newline at end of file diff --git a/client/MediaCubeApiTest/api/start-test.bat b/client/MediaCubeApiTest/api/start-test.bat new file mode 100644 index 00000000..996759ee --- /dev/null +++ b/client/MediaCubeApiTest/api/start-test.bat @@ -0,0 +1,2 @@ +MediaCubeApiTest.exe ws://192.168.0.10:9080/services/wsapi /Input/Pasa_restore/vod CCEM100081-01 /v /q +pause \ No newline at end of file diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/mediacube/MediaCubeAPIWSSocket.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/mediacube/MediaCubeAPIWSSocket.java index 592bba3d..641660b5 100644 --- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/mediacube/MediaCubeAPIWSSocket.java +++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/ws/mediacube/MediaCubeAPIWSSocket.java @@ -74,8 +74,7 @@ public class MediaCubeAPIWSSocket extends WebSocketAdapter { if (job.getId() != runtime.getId()) return; BasicDBObject response = new BasicDBObject("jobID", job.getId()).append("status", job.getStatus()) - .append("signal", event.getSignalType()) - .append("progress", job.getProgress()); + .append("signal", event.getSignalType()).append("progress", job.getProgress()); if (JobStatus.SUSPENDED.equals(job.getStatus())) response.append("error", job.getDescription()); @@ -90,7 +89,8 @@ public class MediaCubeAPIWSSocket extends WebSocketAdapter { }; } - private void deserializeParameters(BasicDBObject parameters) throws IOException, JsonParseException, JsonMappingException { + private void deserializeParameters(BasicDBObject parameters) + throws IOException, JsonParseException, JsonMappingException { for (String key : parameters.keySet()) { String paramData = parameters.getString(key); Object value = null; @@ -156,7 +156,7 @@ public class MediaCubeAPIWSSocket extends WebSocketAdapter { final String version = data.getString(VERSION); final boolean useVersion = version != null && version.trim().length() > 0; - final boolean allSegments = query.endsWith("_") || query.endsWith("_"); + final boolean allSegments = query.endsWith("_") || query.endsWith("-"); SQL sql = new SQL(); sql.SELECT("TITLE").FROM("MEDIA");