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

diff --git a/client/IntegrationTests/JobEngineIT.cs b/client/IntegrationTests/JobEngineIT.cs
index ea82c8dadae8b2484cea5cf84a9c395048af2b06..38701b1ab7498b396fdfe278407c7b90e26ed13b 100644 (file)
--- a/client/IntegrationTests/JobEngineIT.cs
+++ b/client/IntegrationTests/JobEngineIT.cs
@@ -27,13 +27,13 @@ namespace IntegrationTests {
             item.touched = DateTime.Now;\r
             item.started = DateTime.Now;\r
             item.finished = DateTime.Now;\r
-            var actual = client.Create(item);\r
+            var actual = client.Create<WorkflowAction>(item);\r
         }\r
 \r
         [TestMethod]\r
         public void TestCreateMasterId() {\r
             MediaCubeApi client = new MediaCubeApi("http://10.10.1.28/services/rest/jobengine/", null, null, 100);\r
-            MasterId masterId = client.Create(new MasterId()) as MasterId;\r
+            MasterId masterId = client.Create<MasterId>(new MasterId());\r
             Assert.IsTrue(masterId.id > 0);\r
         }\r
 \r
@@ -51,7 +51,7 @@ namespace IntegrationTests {
                 item.touched = DateTime.Now;\r
                 item.started = DateTime.Now;\r
                 item.finished = DateTime.Now.AddMinutes(5 * i);\r
-                var actual = client.Create(item);\r
+                var actual = client.Create<WorkflowAction>(item);\r
             }\r
 \r
             for (int i = 0; i < 10; i++) {\r
@@ -64,7 +64,7 @@ namespace IntegrationTests {
                 item.touched = DateTime.Now;\r
                 item.started = DateTime.Now;\r
                 item.finished = DateTime.Now.AddHours(-5).AddMinutes(i);\r
-                var actual = client.Create(item);\r
+                var actual = client.Create<WorkflowAction>(item);\r
             }\r
         }\r
 \r

diff --git a/client/Maestro/Configuration/ConfigurationInfo.cs b/client/Maestro/Configuration/ConfigurationInfo.cs
index b09fc8a32db886b3b98d6e53270c1a50ffabdb63..c5f9afbe7c1b764858c488dcae8badf48f9d3fa7 100644 (file)
--- a/client/Maestro/Configuration/ConfigurationInfo.cs
+++ b/client/Maestro/Configuration/ConfigurationInfo.cs
@@ -48,7 +48,7 @@ namespace Maestro.Configuration {
         public bool SaveSegments { get; set; }\r
         public bool CreateSubFolder { get; set; }\r
         public string Tag { get; set; }\r
-        public bool CreateMetadata {get; set;}\r
+        public bool SaveMetadata {get; set;}\r
         public bool SendEmailOnError { get; set; }\r
         public string ErrorEmailRecipient { get; set; }\r
         public string ErrorEmailPattern { get; set; }\r

diff --git a/client/Maestro/Configuration/configuration-editor.json b/client/Maestro/Configuration/configuration-editor.json
index 216100485a12212e9b92840a0835173f376e58f4..4bd428eac8eb76c566707b253860ea225cc67466 100644 (file)
--- a/client/Maestro/Configuration/configuration-editor.json
+++ b/client/Maestro/Configuration/configuration-editor.json
@@ -48,7 +48,7 @@
       "tag": "Betöltés",\r
       "createSubFolder": true,\r
       "killDateDays": 7,\r
-      "useMetadata": false,\r
+      "saveMetadata": false,\r
       "remote": {\r
         "address": "ftp://10.10.1.100/OCTOPUS",\r
         "userName": "mediacube",\r
@@ -63,7 +63,7 @@
       "tag": "Betöltés",\r
       "createSubFolder": true,\r
       "killDateDays": 7,\r
-      "useMetadata": false,\r
+      "saveMetadata": false,\r
       "remote": {\r
         "address": "ftp://10.10.1.100/PLAYOUT_NLE",\r
         "userName": "mediacube",\r
@@ -105,7 +105,7 @@
       "processor": "FTPTargetProcessor",\r
       "outputFormat": "%ID%",\r
       "tag": "Archiválás",\r
-      "useMetadata": true,\r
+      "saveMetadata": true,\r
       "remote": {\r
         "address": "ftp://10.10.1.100/ARCHIVE",\r
         "userName": "mediacube",\r

diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json
index 427ddab65a09ad5de8586ca20440b66bd497ac1e..d6da4739f729d8ac0add01a6f0ed2f8ef445f882 100644 (file)
--- a/client/Maestro/Configuration/configuration-nle.json
+++ b/client/Maestro/Configuration/configuration-nle.json
@@ -48,7 +48,7 @@
       "tag": "Betöltés",\r
       "createSubFolder": true,\r
       "killDateDays": 7,\r
-      "useMetadata": false,\r
+      "saveMetadata": false,\r
       "remote": {\r
         "address": "ftp://10.10.1.100/OCTOPUS",\r
         "userName": "mediacube",\r
@@ -63,7 +63,7 @@
       "tag": "Betöltés",\r
       "createSubFolder": true,\r
       "killDateDays": 7,\r
-      "useMetadata": false,\r
+      "saveMetadata": false,\r
       "remote": {\r
         "address": "ftp://10.10.1.100/PLAYOUT_NLE",\r
         "userName": "mediacube",\r
@@ -105,7 +105,7 @@
       "processor": "FTPTargetProcessor",\r
       "outputFormat": "%ID%",\r
       "tag": "Archiválás",\r
-      "useMetadata": true,\r
+      "saveMetadata": true,\r
       "remote": {\r
         "address": "ftp://10.10.1.100/ARCHIVE",\r
         "userName": "mediacube",\r

diff --git a/client/Maestro/Configuration/configuration-sxs.json b/client/Maestro/Configuration/configuration-sxs.json
index 407b1d75666112a062be4c2ceeb453e66e353177..c99f650a35aacbd59bff1c05de0c1facf83c35b7 100644 (file)
--- a/client/Maestro/Configuration/configuration-sxs.json
+++ b/client/Maestro/Configuration/configuration-sxs.json
@@ -48,7 +48,7 @@
       "tag": "Betöltés",\r
       "createSubFolder": true,\r
       "killDateDays": 7,\r
-      "useMetadata": false,\r
+      "saveMetadata": false,\r
       "remote": {\r
         "address": "file://10.10.1.100/BRAAVOS/OCTOPUS",\r
         "userName": "mediacube",\r
@@ -63,7 +63,7 @@
       "tag": "Betöltés",\r
       "createSubFolder": true,\r
       "killDateDays": 7,\r
-      "useMetadata": false,\r
+      "saveMetadata": false,\r
       "remote": {\r
         "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_NLE",\r
         "userName": "mediacube",\r
@@ -89,7 +89,7 @@
       "processor": "UNCTargetProcessor",\r
       "outputFormat": "%ID%",\r
       "tag": "Archiválás",\r
-      "useMetadata": true,\r
+      "saveMetadata": true,\r
       "remote": {\r
         "address": "file://10.10.1.100/BRAAVOS/ARCHIVE",\r
         "userName": "mediacube",\r

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index cca7c4c757eabe1da9bc9193fcbcdec5eee7c9b7..1375fcc67c57e6ccddba3e25f1c1da604e23f4d6 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -44,7 +44,7 @@ namespace Maestro {
             this.dataGridSource = new System.Windows.Forms.DataGridView();\r
             this.bindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();\r
-            this.textSelectedSource = new System.Windows.Forms.TextBox();\r
+            this.txtSelectedSource = new System.Windows.Forms.TextBox();\r
             this.label1 = new System.Windows.Forms.Label();\r
             this.buttonMetadata = new System.Windows.Forms.Button();\r
             this.panel2 = new System.Windows.Forms.Panel();\r
@@ -64,7 +64,7 @@ namespace Maestro {
             this.trafficIDSelector = new TrafficClient.TrafficIDSelector();\r
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
             this.labelSelectedMetadata = new System.Windows.Forms.Label();\r
-            this.textSelectedMetadata = new System.Windows.Forms.TextBox();\r
+            this.txtSelectedMetadata = new System.Windows.Forms.TextBox();\r
             this.menuButtonActions = new Maestro.MenuButton();\r
             this.groupTarget = new System.Windows.Forms.GroupBox();\r
             this.panelActions = new System.Windows.Forms.TableLayoutPanel();\r
@@ -199,7 +199,7 @@ namespace Maestro {
             this.tableLayoutPanel2.ColumnCount = 2;\r
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel2.Controls.Add(this.textSelectedSource, 0, 1);\r
+            this.tableLayoutPanel2.Controls.Add(this.txtSelectedSource, 0, 1);\r
             this.tableLayoutPanel2.Controls.Add(this.label1, 0, 0);\r
             this.tableLayoutPanel2.Controls.Add(this.buttonMetadata, 1, 1);\r
             this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;\r
@@ -212,17 +212,17 @@ namespace Maestro {
             this.tableLayoutPanel2.Size = new System.Drawing.Size(394, 62);\r
             this.tableLayoutPanel2.TabIndex = 12;\r
             // \r
-            // textSelectedSource\r
+            // txtSelectedSource\r
             // \r
-            this.textSelectedSource.BackColor = System.Drawing.SystemColors.ActiveCaption;\r
-            this.textSelectedSource.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.textSelectedSource.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textSelectedSource.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.textSelectedSource.Location = new System.Drawing.Point(3, 28);\r
-            this.textSelectedSource.Name = "textSelectedSource";\r
-            this.textSelectedSource.Size = new System.Drawing.Size(292, 26);\r
-            this.textSelectedSource.TabIndex = 10;\r
-            this.textSelectedSource.TextChanged += new System.EventHandler(this.OnInfoTextChanged);\r
+            this.txtSelectedSource.BackColor = System.Drawing.SystemColors.ActiveCaption;\r
+            this.txtSelectedSource.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.txtSelectedSource.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.txtSelectedSource.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.txtSelectedSource.Location = new System.Drawing.Point(3, 28);\r
+            this.txtSelectedSource.Name = "txtSelectedSource";\r
+            this.txtSelectedSource.Size = new System.Drawing.Size(292, 26);\r
+            this.txtSelectedSource.TabIndex = 10;\r
+            this.txtSelectedSource.TextChanged += new System.EventHandler(this.OnInfoTextChanged);\r
             // \r
             // label1\r
             // \r
@@ -436,7 +436,7 @@ namespace Maestro {
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
             this.tableLayoutPanel1.Controls.Add(this.labelSelectedMetadata, 0, 0);\r
-            this.tableLayoutPanel1.Controls.Add(this.textSelectedMetadata, 0, 1);\r
+            this.tableLayoutPanel1.Controls.Add(this.txtSelectedMetadata, 0, 1);\r
             this.tableLayoutPanel1.Controls.Add(this.menuButtonActions, 1, 1);\r
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;\r
             this.tableLayoutPanel1.Location = new System.Drawing.Point(10, 399);\r
@@ -461,17 +461,17 @@ namespace Maestro {
             this.labelSelectedMetadata.TabIndex = 13;\r
             this.labelSelectedMetadata.Text = "Selected metadata";\r
             // \r
-            // textSelectedMetadata\r
+            // txtSelectedMetadata\r
             // \r
-            this.textSelectedMetadata.BackColor = System.Drawing.SystemColors.ActiveCaption;\r
-            this.textSelectedMetadata.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.textSelectedMetadata.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.textSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.textSelectedMetadata.Location = new System.Drawing.Point(3, 28);\r
-            this.textSelectedMetadata.Name = "textSelectedMetadata";\r
-            this.textSelectedMetadata.Size = new System.Drawing.Size(162, 26);\r
-            this.textSelectedMetadata.TabIndex = 12;\r
-            this.textSelectedMetadata.TextChanged += new System.EventHandler(this.OnInfoTextChanged);\r
+            this.txtSelectedMetadata.BackColor = System.Drawing.SystemColors.ActiveCaption;\r
+            this.txtSelectedMetadata.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.txtSelectedMetadata.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.txtSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.txtSelectedMetadata.Location = new System.Drawing.Point(3, 28);\r
+            this.txtSelectedMetadata.Name = "txtSelectedMetadata";\r
+            this.txtSelectedMetadata.Size = new System.Drawing.Size(162, 26);\r
+            this.txtSelectedMetadata.TabIndex = 12;\r
+            this.txtSelectedMetadata.TextChanged += new System.EventHandler(this.OnInfoTextChanged);\r
             // \r
             // menuButtonActions\r
             // \r
@@ -908,9 +908,9 @@ namespace Maestro {
         private System.Windows.Forms.GroupBox groupMetadata;\r
         private System.Windows.Forms.GroupBox groupTarget;\r
         private System.Windows.Forms.Button btnExecute;\r
-        private System.Windows.Forms.TextBox textSelectedSource;\r
+        private System.Windows.Forms.TextBox txtSelectedSource;\r
         private System.Windows.Forms.Label labelSelectedMetadata;\r
-        private System.Windows.Forms.TextBox textSelectedMetadata;\r
+        private System.Windows.Forms.TextBox txtSelectedMetadata;\r
         private System.Windows.Forms.TableLayoutPanel panelActions;\r
         private System.Windows.Forms.GroupBox groupActions;\r
         private System.Windows.Forms.DataGridView dataGridJobs;\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index 5e6da4dd1e3078eb4ed43b8eacff88543f43dd6b..fc7d4f0e11efbeb54ca044a0027671e6c7538526 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -14,6 +14,7 @@ using Model;
 \r
 namespace Maestro {\r
     public partial class MaestroForm {\r
+        private const string ARCHIVEID_PREFIX = "MC-";\r
         private MetadataInfo selectedMetadata;\r
         private List<Segment> segments;\r
         private MediaCubeApi mediaCubeApi;\r
@@ -28,7 +29,7 @@ namespace Maestro {
                 selectedMetadata = value;\r
                 movieSegments = null;\r
                 segments = null;\r
-                textSelectedMetadata.Text = value?.ID;\r
+                txtSelectedMetadata.Text = value?.ID;\r
             }\r
         }\r
 \r
@@ -36,7 +37,7 @@ namespace Maestro {
             InitializeOctopusSelector();\r
             InitializeTrafficSelector();\r
             InitializeMediaCubeApi();\r
-            textSelectedMetadata.ReadOnly = !Configuration.EnableCustomMetadataId;\r
+            txtSelectedMetadata.ReadOnly = !Configuration.EnableCustomMetadataId;\r
         }\r
 \r
         private void InitializeTrafficSelector() {\r
@@ -133,11 +134,12 @@ namespace Maestro {
 \r
         private ArchiveMetadata GetArchiveMetadata() {\r
             ArchiveMetadata result = null;\r
-            SourceIDType idType = GetSourceType(textSelectedMetadata.Text);\r
+            SourceIDType idType = GetSourceType(txtSelectedMetadata.Text);\r
             Cursor.Current = Cursors.WaitCursor;\r
             switch (idType) {\r
                 case SourceIDType.MediaCube:\r
                     result = GetMediaCubeMetadata();\r
+                    txtSelectedMetadata.Text = result.itemHouseId;\r
                     break;\r
                 case SourceIDType.OctopusID:\r
                     result = GetOctopusMetadata();\r
@@ -151,17 +153,17 @@ namespace Maestro {
         }\r
 \r
         private ArchiveMetadata GetMediaCubeMetadata() {\r
-            MasterId masterId = mediaCubeApi.Create(new MasterId()) as MasterId;\r
+            MasterId masterId = mediaCubeApi.Create<MasterId>(new MasterId());\r
             if (masterId == null)\r
                 return null;\r
             ArchiveMetadata result = new ArchiveMetadata();\r
-            result.itemHouseId = masterId.ToString();\r
-            result.mediaHouseId = masterId.ToString();\r
+            result.itemHouseId = ARCHIVEID_PREFIX + masterId.id.ToString();\r
+            result.mediaHouseId = result.itemHouseId;\r
             return result;\r
         }\r
 \r
         private ArchiveMetadata GetTrafficMetadata() {\r
-            string id = textSelectedMetadata.Text;\r
+            string id = txtSelectedMetadata.Text;\r
             if (String.IsNullOrEmpty(id))\r
                 return null;\r
             TrafficAPI api = trafficIDSelector.trafficAPI;\r
@@ -193,7 +195,7 @@ namespace Maestro {
 \r
         private ArchiveMetadata GetOctopusMetadata() {\r
             ArchiveMetadata result = new ArchiveMetadata();\r
-            string id = textSelectedMetadata.Text;\r
+            string id = txtSelectedMetadata.Text;\r
             OctopusAPI api = octopusIDSelector.GetClient();\r
             IEnumerable<Story> storyEnum = api.GetStoriesById(id);\r
             if (storyEnum != null)\r
@@ -287,7 +289,7 @@ namespace Maestro {
         }\r
 \r
         private void UpdateEditArchiveMetadataEnabled() {\r
-            ctxiModifyArchiveMetadata.Enabled = !String.IsNullOrEmpty(textSelectedSource.Text);\r
+            ctxiModifyArchiveMetadata.Enabled = !String.IsNullOrEmpty(txtSelectedSource.Text);\r
         }\r
 \r
         private void UpdateDefineSegmentEnabled() {\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index 0212c6ee1f44f898bac021e2cbf919ba092af4fe..2bae55c730b1b5c72eb8493928762f4edc35dd9c 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -28,7 +28,7 @@ namespace Maestro {
             }\r
             set {\r
                 selectedSource = value;\r
-                textSelectedSource.Text = selectedSource.Name;\r
+                txtSelectedSource.Text = selectedSource.Name;\r
                 UpdateEditArchiveMetadataEnabled();\r
             }\r
         }\r
@@ -277,7 +277,7 @@ namespace Maestro {
                 String actualName = actual.Cells[index].Value as string;\r
                 if (fileName.Equals(actualName)) {\r
                     selectedSourceRows.Remove(actual);\r
-                    if (textSelectedSource.InvokeRequired) {\r
+                    if (txtSelectedSource.InvokeRequired) {\r
                         SetTextCallback d = new SetTextCallback(SetTextSelectedSourceAndMetadataButtonEnabled);\r
                         Invoke(d);\r
                     } else\r

diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs
index 7242a80f288f1589f6d6d5a94bcc9b7220c29894..cc94116e715bce8f4d6f53df7a58d60ca82bd1fe 100644 (file)
--- a/client/Maestro/MaestroForm.Target.cs
+++ b/client/Maestro/MaestroForm.Target.cs
@@ -146,7 +146,7 @@ namespace Maestro {
         }\r
 \r
         private bool EnsureMetadata(Target target) {\r
-            if (target.CreateMetadata && (archiveMetadata == null || !archiveMetadata.IsFilled)) {\r
+            if (target.SaveMetadata && (archiveMetadata == null || !archiveMetadata.IsFilled)) {\r
                 archiveMetadata = GetArchiveMetadata();\r
                 if (archiveMetadata == null) {\r
                     MessageBox.Show(String.Format("A {0} folyamat nem futtatható kísérő adatok nélkül.", target.Label));\r
@@ -167,12 +167,12 @@ namespace Maestro {
                 MediaCubeApi = mediaCubeApi,\r
                 SourceConfig = Configuration.Source,\r
                 TargetConfig = target,\r
-                ID = textSelectedMetadata.Text,\r
+                ID = txtSelectedMetadata.Text,\r
                 InputFileName = sourceItem.Name,\r
                 Segments = segments == null ? null : new List<Segment>(segments),\r
                 ArchiveMetadata = ArchiveMetadata.DeepClone(archiveMetadata),\r
                 VariantID = selectedMetadata == null ? 0 : selectedMetadata.VariantID,\r
-                MetadataKind = selectedMetadata.Kind\r
+                MetadataKind = selectedMetadata == null ? MetadataType.None : selectedMetadata.Kind\r
             };\r
         }\r
 \r
@@ -210,7 +210,7 @@ namespace Maestro {
         }\r
 \r
         private void OnInfoTextChanged(object sender, EventArgs e) {\r
-            if (!sender.Equals(textSelectedSource))\r
+            if (!sender.Equals(txtSelectedSource))\r
                 ApplyProcessorButtonsLogic();\r
             ApplyMetaDataButtonLogic();\r
         }\r
@@ -240,7 +240,7 @@ namespace Maestro {
 \r
         private void ApplyProcessorButtonsLogic() {\r
             ClearSelectedProcessors();\r
-            if (!String.IsNullOrEmpty(textSelectedSource.Text) && !String.IsNullOrEmpty(textSelectedMetadata.Text)) {\r
+            if (!String.IsNullOrEmpty(txtSelectedSource.Text) && !String.IsNullOrEmpty(txtSelectedMetadata.Text)) {\r
                 ChangeProcessButtonsState(true);\r
             } else {\r
                 ChangeProcessButtonsState(false);\r
@@ -273,7 +273,7 @@ namespace Maestro {
 \r
         private void ApplyProcessorButtonsLogicWithoutArchiveMetadataButton() {\r
             ClearSelectedProcessors();\r
-            if (!String.IsNullOrEmpty(textSelectedMetadata.Text) && !String.IsNullOrEmpty(textSelectedMetadata.Text)) {\r
+            if (!String.IsNullOrEmpty(txtSelectedMetadata.Text) && !String.IsNullOrEmpty(txtSelectedMetadata.Text)) {\r
                 ChangeProcessButtonsState(true);\r
             } else {\r
                 ChangeProcessButtonsState(false);\r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index f2a7315a8481c0ed43f345af7e6ead85242e5559..bd65eed59de911422aa77e8689876726f680212f 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -195,7 +195,7 @@ namespace Maestro {
             List<Story> list = stories.ToList();\r
             if (list.Count == 1) {\r
                 UpdateEditArchiveMetadataEnabled();\r
-                textSelectedMetadata.Text = list[0].ID;\r
+                txtSelectedMetadata.Text = list[0].ID;\r
                 octopusMetadataSelected?.Invoke(list[0].ID);\r
                 //octopusIDSelector.IDSelectedFromOutside(list[0].ID);\r
                 return;\r
@@ -217,7 +217,7 @@ namespace Maestro {
             }\r
             if (list.Count == 1) {\r
                 UpdateEditArchiveMetadataEnabled();\r
-                textSelectedMetadata.Text = list[0].ID;\r
+                txtSelectedMetadata.Text = list[0].ID;\r
                 octopusMetadataSelected?.Invoke(list[0].ID);\r
                 //octopusIDSelector.IDSelectedFromOutside(list[0].ID);\r
                 return;\r
@@ -248,7 +248,7 @@ namespace Maestro {
             if (result.Count == 1) {\r
                 trafficMetadataSelected?.Invoke(result[0].MediaID, result[0].VariantID);\r
                 UpdateEditArchiveMetadataEnabled();\r
-                textSelectedMetadata.Text = result[0].MediaID;\r
+                txtSelectedMetadata.Text = result[0].MediaID;\r
                 return;\r
             }\r
             SearchResult searchResult = new SearchResult(result, trafficMetadataSelected);\r

diff --git a/client/Maestro/Targets/FTPTargetProcessor.cs b/client/Maestro/Targets/FTPTargetProcessor.cs
index b5a198b91d182878103f9bc06d829edd40bda8f7..5911c427c783f69390766b4fb91025caebc0a3ac 100644 (file)
--- a/client/Maestro/Targets/FTPTargetProcessor.cs
+++ b/client/Maestro/Targets/FTPTargetProcessor.cs
@@ -96,7 +96,7 @@ namespace Maestro.Targets {
             return x > -1;\r
         }\r
 \r
-        protected override string GetOutputFilePath(string fileName) {\r
+        protected override string GetOutputFilePath(string path, string fileName) {\r
             return fileName;\r
         }\r
 \r

diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs
index ba409b059b1192590b44e6b5a38f2fd5a53e7c21..abac4edbba6df5c0f55f9705bedb56bf86eb63be 100644 (file)
--- a/client/Maestro/Targets/UNCTargetProcessor.cs
+++ b/client/Maestro/Targets/UNCTargetProcessor.cs
@@ -100,7 +100,7 @@ namespace Maestro.Targets {
                     UploadKillDateFile();\r
             }\r
 \r
-            if (parameters.TargetConfig.CreateMetadata && parameters.ArchiveMetadata != null)\r
+            if (parameters.TargetConfig.SaveMetadata && parameters.ArchiveMetadata != null)\r
                 CreateMetadata();\r
             if (parameters.TargetConfig.SaveSegments && parameters.Segments != null)\r
                 //eljuthat-e ide a felhasználó, ha a MetadataKind octopus?\r
@@ -149,7 +149,7 @@ namespace Maestro.Targets {
 \r
         private void SendWorkFlowAction() {\r
             try {\r
-                parameters.MediaCubeApi.Create(workFlowAction);\r
+                parameters.MediaCubeApi.Create<WorkflowAction>(workFlowAction);\r
             }\r
             catch (Exception e) {\r
                 MessageBox.Show(parent, e.Message);\r
@@ -178,8 +178,8 @@ namespace Maestro.Targets {
             DateTime date = GetKillDate();\r
             string fileName = String.Format(KILLDATE_FILE, OutputName, date.ToString("yyyyMMdd"));\r
             logger.Debug("Creating KILLDATE status file {0}", fileName);\r
-            KillDatePath = Path.Combine(statusWorkDir, fileName);\r
-            UploadContent(fileName, new byte[] { });\r
+            KillDatePath = GetOutputFilePath(statusWorkDir, fileName);\r
+            UploadContent(KillDatePath, new byte[] { });\r
             KillDate = date.ToString("yyyy.MM.dd");\r
         }\r
 \r
@@ -190,7 +190,8 @@ namespace Maestro.Targets {
             string fileName = String.Format(METADATA_FILE, OutputName);\r
             logger.Debug("Creating METADATA file {0}", fileName);\r
             byte[] content = Encoding.UTF8.GetBytes(parameters.ArchiveMetadata.ToString());\r
-            UploadContent(Path.Combine(statusWorkDir, fileName), content);\r
+            string ouputPath = GetOutputFilePath(statusWorkDir, fileName);\r
+            UploadContent(ouputPath, content);\r
         }\r
 \r
         protected void CopyStream(Stream istream, long ilength, Stream ostream) {\r
@@ -219,8 +220,8 @@ namespace Maestro.Targets {
             Win32File.CopyFileEx(Input, Output, new CopyProgressRoutine(this.CopyProgressHandler), IntPtr.Zero, ref pbCancel, CopyFileFlags.COPY_FILE_RESTARTABLE);\r
         }\r
 \r
-        protected virtual string GetOutputFilePath(string fileName) {\r
-            return "/".Equals(workingDir) ? fileName : Path.Combine(workingDir, fileName);\r
+        protected virtual string GetOutputFilePath(string path, string fileName) {\r
+            return "/".Equals(workingDir) ? fileName : Path.Combine(path, fileName);\r
         }\r
 \r
         protected virtual string CreateOutputFileName() {\r
@@ -230,7 +231,7 @@ namespace Maestro.Targets {
 \r
             string result = String.Format(FILENAME, nameWithoutExtension, extension);\r
             int version = 1;\r
-            while (FileExists(GetOutputFilePath(result))) {\r
+            while (FileExists(GetOutputFilePath(workingDir, result))) {\r
                 string versioned = String.Format(VERSIONED_FILENAME, nameWithoutExtension, version, extension);\r
                 logger.Debug(ALREADY_EXISTS, result, versioned);\r
                 result = versioned;\r

diff --git a/client/MediaCubeClient/MediaCubeApi.cs b/client/MediaCubeClient/MediaCubeApi.cs
index 731efedb19e336e75077f8b275575b402629520b..ed3e45c907b22f8b9a521443e2fb735e1c7642e8 100644 (file)
--- a/client/MediaCubeClient/MediaCubeApi.cs
+++ b/client/MediaCubeClient/MediaCubeApi.cs
@@ -38,7 +38,7 @@ namespace JobEngineClient {
         }\r
 \r
 \r
-        public Object Create(object data) {\r
+        public T Create<T>(object data) {\r
             var request = new RestRequest("create", Method.POST);\r
             String body = JsonConvert.SerializeObject(data, serializerSettings);\r
             //Debug.WriteLine(body);\r
@@ -46,10 +46,10 @@ namespace JobEngineClient {
             var response = client.Execute(request);\r
             if (response.StatusCode != HttpStatusCode.OK && response.ErrorMessage != null) {\r
                 ErrorReporter?.Invoke(DateTime.Now, "Error", String.Format("[MediaCube] {0}", response.ErrorMessage), Color.Red);\r
-                return null;\r
+                return default(T);\r
             }\r
             //Debug.WriteLine(response.Content);\r
-            var result = JsonConvert.DeserializeObject<WorkflowAction>(response.Content);\r
+            var result = JsonConvert.DeserializeObject<T>(response.Content);\r
             return result;\r
         }\r
 \r