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

diff --git a/client/IntegrationTests/MaestroIT.cs b/client/IntegrationTests/MaestroIT.cs
index 10b60eec8bc9bfa855d36fce52ea8ec1de561065..3cea20c3f6f4355161797640b8f8901ae90cf3dd 100644 (file)
--- a/client/IntegrationTests/MaestroIT.cs
+++ b/client/IntegrationTests/MaestroIT.cs
@@ -18,7 +18,7 @@ namespace IntegrationTests {
                 },\r
                 OutputFormat = "{0}_{1}_{2}"\r
             };\r
-            TargetProcessorParametersWrapper parameters = new TargetProcessorParametersWrapper() {\r
+            TargetProcessorParameter parameters = new TargetProcessorParameter() {\r
                 SourceConfig = null,\r
                 TargetConfig = configuration,\r
                 InputFileName = @"c:\tmp\watch\tcdrone.MXF",\r

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index 58f8255c5f3db4930ac77f3d414fba1e8c671126..b2c7e53c1d2c15c2842a392c4ae9ae120c0cd294 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -279,6 +279,9 @@
     <None Include="Resources\configuration-fxp.json">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
+    <None Include="Resources\configuration-playout.json">\r
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+    </None>\r
     <None Include="Resources\configuration-unc.json">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r

diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs
index cd2c6656ef9a0f616020bf24d1faaf5056941803..71c25848661c0a7eb13ebf343b248c4de26cc9ba 100644 (file)
--- a/client/Maestro/MaestroForm.Target.cs
+++ b/client/Maestro/MaestroForm.Target.cs
@@ -13,7 +13,7 @@ using JobEngineClient;
 \r
 namespace Maestro {\r
 \r
-    public class TargetProcessorParametersWrapper {\r
+    public class TargetProcessorParameter {\r
         public Source SourceConfig { get; set; }\r
         public Target TargetConfig { get; set; }\r
         public string InputFileName { get; set; }\r
@@ -56,24 +56,20 @@ namespace Maestro {
                         string fileName = actualRow.Cells[1].Value as string;\r
                         string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, target.Processor);\r
                         Type type = Type.GetType(typeName);\r
-                        int variantID = selectedMetadata.VariantID;\r
-                        TrafficAPI api = trafficIDSelector.trafficAPI;\r
-                        ISourceItem selectedFile = GetSourceItemFromBindingSource(fileName);//bindingSource.Current as ISourceItem;\r
+                        ISourceItem selectedFile = GetSourceItemFromBindingSource(fileName);\r
                         string id = selectedMetadata == null ? textSelectedMetadata.Text : selectedMetadata.ID;\r
-                        ArchiveMetadata archiveMetadataClone = ArchiveMetadata.DeepClone(archiveMetadatamodel);\r
-                        List<Segment> segmentsClone = new List<Segment>(segments);\r
-                        TargetProcessorParametersWrapper parameterObj = new TargetProcessorParametersWrapper() {\r
-                            ArchiveMetadata = archiveMetadataClone,\r
-                            Client = api,\r
+                        TargetProcessorParameter processorParameter = new TargetProcessorParameter() {\r
+                            ArchiveMetadata = ArchiveMetadata.DeepClone(archiveMetadatamodel),\r
+                            Client = trafficIDSelector.trafficAPI,\r
                             ID = id,\r
                             InputFileName = selectedFile.Name,\r
                             MediaCubeApi = mediaCubeApi,\r
-                            Segments = segmentsClone,\r
+                            Segments = new List<Segment>(segments),\r
                             SourceConfig = Configuration.Source,\r
                             TargetConfig = target,\r
-                            VariantID = variantID\r
+                            VariantID = selectedMetadata == null ? 0 : selectedMetadata.VariantID\r
                         };\r
-                        object[] parameters = new object[] { this, parameterObj };\r
+                        object[] parameters = new object[] { this, processorParameter };\r
                         ITargetProcessor processor = (ITargetProcessor)Activator.CreateInstance(type, parameters);\r
                         processors.Add(processor);\r
                     }\r

diff --git a/client/Maestro/Metadata/ArchiveMetadata.cs b/client/Maestro/Metadata/ArchiveMetadata.cs
index a2e49515ab9ecd7512be71547e5941a896e061ba..3226d64c9e567a9c1fbc2482a9cbf80e58928df3 100644 (file)
--- a/client/Maestro/Metadata/ArchiveMetadata.cs
+++ b/client/Maestro/Metadata/ArchiveMetadata.cs
@@ -23,11 +23,12 @@ namespace Maestro.Metadata {
         }\r
 \r
         public static ArchiveMetadata DeepClone(ArchiveMetadata obj) {\r
+            if (obj == null)\r
+                return null;\r
             using (var ms = new MemoryStream()) {\r
                 var formatter = new BinaryFormatter();\r
                 formatter.Serialize(ms, obj);\r
                 ms.Position = 0;\r
-\r
                 return (ArchiveMetadata)formatter.Deserialize(ms);\r
             }\r
         }\r

diff --git a/client/Maestro/Resources/configuration-playout.json b/client/Maestro/Resources/configuration-playout.json
new file mode 100644 (file)
index 0000000..e59187a
--- /dev/null
+++ b/client/Maestro/Resources/configuration-playout.json
@@ -0,0 +1,66 @@
+{\r
+  "title": "Adásanyagok",\r
+  "active": true,\r
+  "startInTray": false,\r
+  "enableCustomMetadataId": true,\r
+  "player": {\r
+    "enabled": true,\r
+    "autoStart": false,\r
+    "segmentEditor": false\r
+  },\r
+  "source": {\r
+    "$type": "UNCSource",\r
+    "local": {\r
+      "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_CHECK"\r
+    }\r
+  },\r
+  "metadatas": [\r
+    {\r
+      "$type": "OctopusMetadata",\r
+      "server": {\r
+        "address": "http://10.10.1.28/services/rest/octopus/",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "$type": "TrafficMetadata",\r
+      "server": {\r
+        "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
+        "userName": "MAM",\r
+        "password": "Echotv.hu",\r
+        "timeout": 0\r
+      }\r
+    },\r
+    {\r
+      "$type": "MediaCubeMetadata",\r
+      "server": {\r
+        "address": "http://10.10.1.28/services/rest/jobengine/",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ],\r
+  "targets": [\r
+    {\r
+      "label": "Adáskész",\r
+      "processor": "UNCTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "saveSegments": true,\r
+      "tag": "Adáskész",\r
+      "createSubFolder": false,\r
+      "useMetadata": false,\r
+      "remote": {\r
+        "address": "file://10.10.1.100/BRAAVOS/PLAYOUT"\r
+      }\r
+    },\r
+    {\r
+      "label": "Újravágásra",\r
+      "processor": "UNCTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "tag": "Újravágásra",\r
+      "remote": {\r
+        "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_NLE"\r
+      }\r
+    }\r
+\r
+  ]\r
+}\r

diff --git a/client/Maestro/Targets/FTPTargetProcessor.cs b/client/Maestro/Targets/FTPTargetProcessor.cs
index 73685440f6cbfa51ca5d1565b3f5670d25e3548a..ca068c9039cadb2e27156681eb2c6b87a964ee3c 100644 (file)
--- a/client/Maestro/Targets/FTPTargetProcessor.cs
+++ b/client/Maestro/Targets/FTPTargetProcessor.cs
@@ -13,7 +13,7 @@ namespace Maestro.Targets {
         private readonly Logger logger = LogManager.GetCurrentClassLogger();\r
         protected FtpClient targetFTP;\r
 \r
-        public FTPTargetProcessor(Control parent, TargetProcessorParametersWrapper parameters)\r
+        public FTPTargetProcessor(Control parent, TargetProcessorParameter parameters)\r
             : base(parent, parameters) {\r
             FtpTrace.LogFunctions = false;\r
             if (!(parameters.SourceConfig is UNCSource)) {\r

diff --git a/client/Maestro/Targets/FXPTargetProcessor.cs b/client/Maestro/Targets/FXPTargetProcessor.cs
index ac53db52628e1de2941dd8bec02b70f234fb9aae..69780a7805dc2489bb25b37fb0b7fabf7f6990eb 100644 (file)
--- a/client/Maestro/Targets/FXPTargetProcessor.cs
+++ b/client/Maestro/Targets/FXPTargetProcessor.cs
@@ -13,7 +13,7 @@ namespace Maestro.Targets {
         private Source sourceConfig;\r
         Uri inputUri;\r
 \r
-        public FXPTargetProcessor(Control parent,TargetProcessorParametersWrapper parameters) :\r
+        public FXPTargetProcessor(Control parent,TargetProcessorParameter parameters) :\r
             base(parent, parameters) {\r
             sourceConfig = parameters.SourceConfig;\r
             inputUri = new Uri(String.Format("{0}/{1}", parameters.SourceConfig.Remote.Address, parameters.InputFileName));\r

diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs
index 9a1a305186abb8841d52ff66077d03239604c1fe..74b3e9de91355964ee0ef060373854d00bb2aa82 100644 (file)
--- a/client/Maestro/Targets/UNCTargetProcessor.cs
+++ b/client/Maestro/Targets/UNCTargetProcessor.cs
@@ -24,11 +24,11 @@ namespace Maestro.Targets {
         private const string DEFAULT_EXTENSION = ".mxf";\r
         protected FileInfo inputFile;\r
         protected string workingDir;\r
-        protected TargetProcessorParametersWrapper parameters;\r
+        protected TargetProcessorParameter parameters;\r
 \r
         public WorkflowAction workFlowAction { get; set; }\r
 \r
-        public UNCTargetProcessor(Control parent, TargetProcessorParametersWrapper parameters)\r
+        public UNCTargetProcessor(Control parent, TargetProcessorParameter parameters)\r
             : base(parent) {\r
             this.parameters = parameters;\r
             InputName = parameters.InputFileName;\r
@@ -81,9 +81,10 @@ namespace Maestro.Targets {
                 UploadKillDateFile();\r
             if (parameters.TargetConfig.UseMetadata && parameters.ArchiveMetadata != null)\r
                 CreateMetadata();\r
-            if (parameters.TargetConfig.SaveSegments && parameters.Segments != null)\r
+            if (parameters.TargetConfig.SaveSegments && parameters.Segments != null) {\r
                 SaveSegments();\r
-            parameters.Client.BroadcastOKForAir(parameters.VariantID);\r
+                parameters.Client.BroadcastOKForAir(parameters.VariantID);\r
+            } \r
         }\r
 \r
         private void SaveSegments() {\r

diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 4425eacd6450d92caad8a7e23c94e12fc70146a5..7f0efbf097829a8c1c96ee9123d1dc867fbab5e2 100644 (file)
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -18,7 +18,7 @@ namespace TrafficClient {
         private SegmentWorker segmentWorker;\r
 \r
         public TrafficAPI(string connString, string user, string password, int timeout, TrafficErrorReporterDelegate errorReporter) {\r
-            connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, timeout);\r
+            connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, timeout/1000);\r
             connection = new SqlConnection(connectionString);\r
             cliFSPReader = new CliFSPReader();\r
             broadvastWorker = new BroadcastWorker(connection, cliFSPReader, errorReporter);\r

diff --git a/server/user.jobengine.osgi.server/img/mediacube_logo_small.ico b/server/user.jobengine.osgi.server/img/mediacube_logo_small.ico
new file mode 100644 (file)
index 0000000..e81b6ff
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/mediacube_logo_small.ico differ

diff --git a/server/user.jobengine.osgi.server/index.jsp b/server/user.jobengine.osgi.server/index.jsp
index 4d136e80160651b80337bc85b915de1d038f4ac8..256475deba8378e432d30df1ab0f606301b1f288 100644 (file)
--- a/server/user.jobengine.osgi.server/index.jsp
+++ b/server/user.jobengine.osgi.server/index.jsp
@@ -1,3 +1,4 @@
+<link rel="shortcut icon" href="img/mediacube_logo_small.ico">\r
 <%\r
        pageContext.forward("/pages/login.jsp");\r
        //response.sendRedirect("/pages/login.jsp");\r