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

diff --git a/client/DxPlay/PlayerForm.Designer.cs b/client/DxPlay/PlayerForm.Designer.cs
index 49944a667d6b29e609d5a90205956e690c954243..6e5a82088eda86560da9834ee69f1eac3b96fe1b 100644 (file)
--- a/client/DxPlay/PlayerForm.Designer.cs
+++ b/client/DxPlay/PlayerForm.Designer.cs
@@ -83,7 +83,7 @@ namespace DxPlay {
             this.pVideo.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.pVideo.Location = new System.Drawing.Point(0, 0);\r
             this.pVideo.Name = "pVideo";\r
-            this.pVideo.Size = new System.Drawing.Size(478, 419);\r
+            this.pVideo.Size = new System.Drawing.Size(478, 414);\r
             this.pVideo.TabIndex = 0;\r
             this.pVideo.TabStop = true;\r
             this.pVideo.SizeChanged += new System.EventHandler(this.panel1_SizeChanged);\r
@@ -106,7 +106,7 @@ namespace DxPlay {
             this.mainSplit.Panel2.Controls.Add(this.tableLayoutPanel1);\r
             this.mainSplit.Panel2.Controls.Add(this.pMetadataDisplay);\r
             this.mainSplit.Panel2MinSize = 300;\r
-            this.mainSplit.Size = new System.Drawing.Size(784, 421);\r
+            this.mainSplit.Size = new System.Drawing.Size(784, 416);\r
             this.mainSplit.SplitterDistance = 480;\r
             this.mainSplit.TabIndex = 20;\r
             // \r
@@ -116,7 +116,7 @@ namespace DxPlay {
             this.panelPlayer.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.panelPlayer.Location = new System.Drawing.Point(0, 0);\r
             this.panelPlayer.Name = "panelPlayer";\r
-            this.panelPlayer.Size = new System.Drawing.Size(478, 419);\r
+            this.panelPlayer.Size = new System.Drawing.Size(478, 414);\r
             this.panelPlayer.TabIndex = 0;\r
             // \r
             // tableLayoutPanel1\r
@@ -132,7 +132,7 @@ namespace DxPlay {
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
             this.tableLayoutPanel1.RowCount = 1;\r
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(298, 356);\r
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(298, 351);\r
             this.tableLayoutPanel1.TabIndex = 4;\r
             // \r
             // tabEditor\r
@@ -149,7 +149,7 @@ namespace DxPlay {
             this.tabEditor.Name = "tabEditor";\r
             this.tabEditor.Padding = new System.Drawing.Point(10, 5);\r
             this.tabEditor.SelectedIndex = 0;\r
-            this.tabEditor.Size = new System.Drawing.Size(271, 348);\r
+            this.tabEditor.Size = new System.Drawing.Size(271, 343);\r
             this.tabEditor.TabIndex = 2;\r
             // \r
             // tpMetadata\r
@@ -161,7 +161,7 @@ namespace DxPlay {
             this.tpMetadata.Location = new System.Drawing.Point(4, 4);\r
             this.tpMetadata.Name = "tpMetadata";\r
             this.tpMetadata.Padding = new System.Windows.Forms.Padding(3);\r
-            this.tpMetadata.Size = new System.Drawing.Size(263, 309);\r
+            this.tpMetadata.Size = new System.Drawing.Size(263, 304);\r
             this.tpMetadata.TabIndex = 0;\r
             this.tpMetadata.Text = "Metadata";\r
             // \r
@@ -173,7 +173,7 @@ namespace DxPlay {
             this.trafficBrowser.Location = new System.Drawing.Point(3, 3);\r
             this.trafficBrowser.Margin = new System.Windows.Forms.Padding(0);\r
             this.trafficBrowser.Name = "trafficBrowser";\r
-            this.trafficBrowser.Size = new System.Drawing.Size(257, 303);\r
+            this.trafficBrowser.Size = new System.Drawing.Size(257, 298);\r
             this.trafficBrowser.TabIndex = 0;\r
             // \r
             // tpSegments\r
@@ -338,7 +338,7 @@ namespace DxPlay {
             this.pMetadataDisplay.Controls.Add(this.labelSelectedMetadata, 0, 0);\r
             this.pMetadataDisplay.Controls.Add(this.txtSelectedID, 0, 1);\r
             this.pMetadataDisplay.Dock = System.Windows.Forms.DockStyle.Bottom;\r
-            this.pMetadataDisplay.Location = new System.Drawing.Point(0, 356);\r
+            this.pMetadataDisplay.Location = new System.Drawing.Point(0, 351);\r
             this.pMetadataDisplay.Margin = new System.Windows.Forms.Padding(0);\r
             this.pMetadataDisplay.Name = "pMetadataDisplay";\r
             this.pMetadataDisplay.RowCount = 2;\r
@@ -431,10 +431,10 @@ namespace DxPlay {
             this.playerControls.BackColor = System.Drawing.Color.Transparent;\r
             this.playerControls.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;\r
             this.playerControls.Dock = System.Windows.Forms.DockStyle.Bottom;\r
-            this.playerControls.Location = new System.Drawing.Point(0, 445);\r
+            this.playerControls.Location = new System.Drawing.Point(0, 440);\r
             this.playerControls.Margin = new System.Windows.Forms.Padding(0);\r
             this.playerControls.Name = "playerControls";\r
-            this.playerControls.Size = new System.Drawing.Size(784, 116);\r
+            this.playerControls.Size = new System.Drawing.Size(784, 121);\r
             this.playerControls.TabIndex = 22;\r
             // \r
             // PlayerForm\r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 84580376b7ceb148a502494c2cc6cb5c73ea806c..f9ba8d107db34c7707c151e720dc592c19c67001 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -1,14 +1,14 @@
-using System;\r
-using System.Windows.Forms;\r
-using System.IO;\r
-using System.Linq;\r
-using MaestroShared.Metadata;\r
-using NLog;\r
 using DxPlay.Model;\r
-using MaestroShared.Commons;\r
 using DxPlay.Properties;\r
+using MaestroShared.Commons;\r
+using MaestroShared.Metadata;\r
+using NLog;\r
+using System;\r
 using System.Diagnostics;\r
+using System.IO;\r
+using System.Linq;\r
 using System.Runtime.InteropServices;\r
+using System.Windows.Forms;\r
 \r
 namespace DxPlay {\r
 \r
@@ -61,8 +61,15 @@ namespace DxPlay {
             mainMenu.DataBindings.Add(new Binding("Visible", model, "IsMenuVisible", false, DataSourceUpdateMode.Never));\r
             menuOpenFile.DataBindings.Add(new Binding("Enabled", model, "IsMenuVisible", false, DataSourceUpdateMode.Never));\r
             menuApprove.DataBindings.Add(new Binding("Enabled", model, "IsApproveEnabled", false, DataSourceUpdateMode.Never));\r
-            btnApprove.DataBindings.Add(new Binding("Enabled", model, "IsApproveEnabled", false, DataSourceUpdateMode.Never));\r
-            tpSegments.DataBindings.Add(new Binding("Enabled", model, "IsApproveEnabled", false, DataSourceUpdateMode.Never));\r
+\r
+            if (model.IsMenuVisible) {\r
+                btnApprove.DataBindings.Add(new Binding("Enabled", model, "IsApproveEnabled", false, DataSourceUpdateMode.Never));\r
+                tpSegments.DataBindings.Add(new Binding("Enabled", model, "IsSegmentEditorVisible", false, DataSourceUpdateMode.Never));\r
+                txtSelectedID.DataBindings.Add(new Binding("Text", model, "ID", false, DataSourceUpdateMode.Never));\r
+            } else {\r
+                pMetadataDisplay.Visible = false;\r
+                tabEditor.TabPages.Remove(tpMetadata);\r
+            }\r
             Binding segmentEditorPanelBinding = new Binding("Panel2Collapsed", model, "IsSegmentEditorVisible", true, DataSourceUpdateMode.Never);\r
             segmentEditorPanelBinding.Format += (s, e) => {\r
                 bool enabled = (bool)e.Value;\r
@@ -73,7 +80,6 @@ namespace DxPlay {
                     mainSplit.Panel2.Hide();\r
             };\r
             mainSplit.DataBindings.Add(segmentEditorPanelBinding);\r
-            txtSelectedID.DataBindings.Add(new Binding("Text", model, "ID", false, DataSourceUpdateMode.Never));\r
 \r
         }\r
 \r
@@ -490,7 +496,7 @@ namespace DxPlay {
             }\r
 \r
             ProcessCommandLine();\r
-        \r
+\r
             if (m_play != null && true.Equals(Settings?.Player?.AutoStart))\r
                 m_play.Play();\r
         }\r

diff --git a/client/DxPlay/PlayerForm.resx b/client/DxPlay/PlayerForm.resx
index 675af6111805edc7427c4010fcbec382c9e0fc32..4748e2a20a9b8fcf4d1aa0de41bf8ca0f7f28947 100644 (file)
--- a/client/DxPlay/PlayerForm.resx
+++ b/client/DxPlay/PlayerForm.resx
@@ -173,7 +173,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo\r
-        CAAAAk1TRnQBSQFMAgEBAgEAAYgBAQGIAQEBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
+        CAAAAk1TRnQBSQFMAgEBAgEAAZABAQGQAQEBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo\r
         AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r

diff --git a/client/DxPlay/Properties/AssemblyInfo.cs b/client/DxPlay/Properties/AssemblyInfo.cs
index f0f736d4be95e72f2323367cbfa0ef43e8829851..93f91eb9013fa7fc7c77a288c686408d7e3e47db 100644 (file)
--- a/client/DxPlay/Properties/AssemblyInfo.cs
+++ b/client/DxPlay/Properties/AssemblyInfo.cs
@@ -26,7 +26,7 @@ using System.Runtime.CompilerServices;
 // You can specify all the values or you can default the Revision and Build Numbers \r
 // by using the '*' as shown below:\r
 \r
-[assembly: AssemblyVersion("2.0.8.4")]\r
+[assembly: AssemblyVersion("2.0.8.5")]\r
 \r
 //\r
 // In order to sign your assembly you must specify a key to use. Refer to the \r
@@ -56,5 +56,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyDelaySign(false)]\r
 [assembly: AssemblyKeyFile("")]\r
 [assembly: AssemblyKeyName("")]\r
-[assembly: AssemblyFileVersion("2.0.8.4")]\r
+[assembly: AssemblyFileVersion("2.0.8.5")]\r
 \r

diff --git a/client/Maestro/Configuration/configuration-studio.json b/client/Maestro/Configuration/configuration-studio.json
index 56f2a609c2fb56800d5f566feff2d5ec1654697a..dc505802ae226bdff366a62bad285d1502ba21a3 100644 (file)
--- a/client/Maestro/Configuration/configuration-studio.json
+++ b/client/Maestro/Configuration/configuration-studio.json
@@ -52,6 +52,7 @@
       "tag": "Archiválás",\r
       "saveArchiveMetadata": true,\r
       "deleteAfterCopy": false,\r
+      "temporaryCopy": true,\r
       "killDateDays": 5,\r
       "remote": {\r
         "address": "ftp://10.10.1.100:21/ARCHIVE/TESZT",\r

diff --git a/client/Maestro/Configuration/configuration-tqc-archive.json b/client/Maestro/Configuration/configuration-tqc-archive.json
new file mode 100644 (file)
index 0000000..6c41a8b
--- /dev/null
+++ b/client/Maestro/Configuration/configuration-tqc-archive.json
@@ -0,0 +1,65 @@
+{\r
+  "title": "Playout_NLE",\r
+  "active": true,\r
+  "startInTray": false,\r
+  "enableCustomMetadataId": true,\r
+  "player": {\r
+    "enabled": true,\r
+    "autoStart": false,\r
+    "segmentEditor": true\r
+  },\r
+  "source": {\r
+    "$type": "UNCSource",\r
+    "filter": "avi,wav,mxf",\r
+    "local": {\r
+      "address": "file://10.10.1.100/BRAAVOS/ARCHIVE",\r
+      "userName": "mediacube",\r
+      "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+      "timeout": 1000\r
+    },\r
+    "remote": {\r
+      "address": "ftp://10.10.1.100/ARCHIVE",\r
+      "userName": "mediacube",\r
+      "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+      "timeout": 1000\r
+    }\r
+  },\r
+  "metadatas": [\r
+    {\r
+      "$type": "TrafficMetadata",\r
+      "server": {\r
+        "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
+        "userName": "MAM",\r
+        "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "$type": "MediaCubeMetadata",\r
+      "server": {\r
+        "address": "http://10.10.1.27/services/rest/jobengine/",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ],\r
+  "targets": [\r
+    {\r
+      "label": "Archiválás",\r
+      "processor": "FXPTargetProcessor",\r
+      "subFolderFormat": "%IDROOT%-%TEXT%",\r
+      "outputFormat": "%ID%-%TEXT%",\r
+      "tag": "Újravágás",\r
+      "temporaryCopy": true,\r
+      "remote": {\r
+        "address": "ftp://10.10.1.100/ARCHIVE/TEST",\r
+        "userName": "mediacube",\r
+        "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+        "timeout": 1000\r
+      },\r
+      "sendEmailOnSuccess": true,\r
+      "successEmailRecipient": "vasary@elgekko.net",\r
+      "successEmailPattern": "A %TARGETNAME% újravágása szükséges."\r
+    }\r
+   \r
+  ]\r
+}\r

diff --git a/client/Maestro/Configuration/global.json.bak b/client/Maestro/Configuration/global.json.bak
deleted file mode 100644 (file)
index 6942643..0000000
--- a/client/Maestro/Configuration/global.json.bak
+++ /dev/null
@@ -1,8 +0,0 @@
-{\r
-  "minimizeToTray":  false,\r
-  "userDomain": {\r
-    "address": "10.10.254.11",\r
-    "-userName": "echotest",\r
-    "-password": "F3QcfkSEW7hq+FcEraq9xv4UdHHeVoOh7jBH1G1k9SzEayTXyiT4WQ7XKtBO/ygnCpRU97AXoKXKoqXIGP8QlVkFurRqwzo8mywEb1q2VW7dUjkJcLFtLDkqQjM39+N9"\r
-  }\r
-}\r

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index 4084a1a983fe09a80248af58c2d0be4dfbe005ef..646d9390de19e9895e3973c97b21ce77cb8f70d8 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -305,9 +305,6 @@
     <None Include="Configuration\-configuration-transcoder.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\global.json.bak">\r
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
-    </None>\r
     <None Include="Configuration\global.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
@@ -329,6 +326,9 @@
     <None Include="Configuration\-UJ-configuration-tqc-check.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
+    <None Include="Configuration\configuration-tqc-archive.json">\r
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
+    </None>\r
     <None Include="Connected Services\packages.config" />\r
     <None Include="Maestro_TemporaryKey.pfx" />\r
     <None Include="nlog.config">\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index b05e5817ffc56acdd6c246ecad3ad7d78c6fd49f..58980ba0f9048cdbb6174a97e1bc7e93e4025600 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -1,7 +1,6 @@
 using DxPlay;\r
 using Maestro.Metadata;\r
 using Maestro.Sources;\r
-using MaestroShared.Commons;\r
 using MaestroShared.Configuration;\r
 using MaestroShared.Metadata;\r
 using MaestroShared.Resources;\r
@@ -11,7 +10,6 @@ using System.Diagnostics;
 using System.Drawing;\r
 using System.IO;\r
 using System.Linq;\r
-using System.Text;\r
 using System.Windows.Forms;\r
 \r
 namespace Maestro {\r

diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs
index 53dd24571fcd486dafa363832a2ed8ce1ecabd4b..cce438f4e3decc1c837753cb101f6e6f16141e61 100644 (file)
--- a/client/MaestroShared/Properties/AssemblyInfo.cs
+++ b/client/MaestroShared/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers\r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.8.6")]\r
-[assembly: AssemblyFileVersion("2.0.8.6")]\r
+[assembly: AssemblyVersion("2.0.8.7")]\r
+[assembly: AssemblyFileVersion("2.0.8.7")]\r

diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs
index 853abded486ef296e1668f4a3774c8c970e18f13..240f5e9836a9dd6d993aad84f35540de7c610d47 100644 (file)
--- a/client/MaestroShared/Targets/FXPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs
@@ -5,11 +5,9 @@ using NLog;
 using System;\r
 using System.IO;\r
 using System.Linq;\r
-using System.Text;\r
 using System.Text.RegularExpressions;\r
 using System.Threading;\r
 using System.Windows.Forms;\r
-using System.Xml;\r
 using System.Xml.Linq;\r
 \r
 namespace MaestroShared.Targets {\r
@@ -116,6 +114,8 @@ namespace MaestroShared.Targets {
                     Progress = (int)((double)uploadedFileLength / sourceFileLength * 100);\r
                     Thread.Sleep(500);\r
                 }\r
+\r
+                targetFTP.GetReply();\r
                 if (useTemporaryName) {\r
                     if (!targetFTP.MoveFile(targetFilePath, OutputName))\r
                         throw new Exception(UPLOAD_ERROR);\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java
index efdcf7f5fec1284ad0fdf86b49944b9679e62eae..7d25c60c10ffe26e890e61f073a4d4a92d1504c4 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java
@@ -157,10 +157,19 @@ public class TranscodeSELENIOStep extends JobStep {
        private void onTranscodeComplete(TranscodeTask transcodeTask, IJobEngine jobEngine, Media mediaCubeMedia) {\r
                OutputFiles of = transcodeTask.getOutputFiles();\r
                List<user.commons.selenio.wsclient.MediaFile> outputs = of.getOutputFiles();\r
-               if (outputs.size() != 1)\r
-                       throw new IndexOutOfBoundsException("There are more than 1 file in the response: " + transcodeTask.getId());\r
-               user.commons.selenio.wsclient.MediaFile selenioMediaFile = outputs.get(0);\r
-               String outFile = selenioMediaFile.getFile();\r
+\r
+               String outFile = null;\r
+               if (outputs.size() == 0) {\r
+                       throw new IndexOutOfBoundsException("There are 0 file in the response: " + transcodeTask.getId());\r
+               } else {\r
+                       for (int i = 0; i < outputs.size(); i++) {\r
+                               user.commons.selenio.wsclient.MediaFile selenioMediaFile = outputs.get(0);\r
+                               if (outFile != null && !outFile.equals(selenioMediaFile.getFile()))\r
+                                       throw new IndexOutOfBoundsException("There are different files in the response: " + transcodeTask.getId());\r
+                               outFile = selenioMediaFile.getFile();\r
+                       }\r
+               }\r
+\r
                try {\r
 \r
                        outFile = outFile.substring(outFile.lastIndexOf("\\") + 1);\r