From a21a1e46a80866cf469b60978219daabf5345939 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Fri, 20 Oct 2017 13:29:24 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30660 --- client/IntegrationTests/JobEngineIT.cs | 8 +-- .../Configuration/ConfigurationInfo.cs | 2 +- .../Configuration/configuration-editor.json | 6 +-- .../Configuration/configuration-nle.json | 6 +-- .../Configuration/configuration-sxs.json | 6 +-- client/Maestro/MaestroForm.Designer.cs | 52 +++++++++---------- client/Maestro/MaestroForm.Metadata.cs | 20 +++---- client/Maestro/MaestroForm.Source.cs | 4 +- client/Maestro/MaestroForm.Target.cs | 12 ++--- client/Maestro/MaestroForm.cs | 6 +-- client/Maestro/Targets/FTPTargetProcessor.cs | 2 +- client/Maestro/Targets/UNCTargetProcessor.cs | 17 +++--- client/MediaCubeClient/MediaCubeApi.cs | 6 +-- 13 files changed, 75 insertions(+), 72 deletions(-) diff --git a/client/IntegrationTests/JobEngineIT.cs b/client/IntegrationTests/JobEngineIT.cs index ea82c8da..38701b1a 100644 --- a/client/IntegrationTests/JobEngineIT.cs +++ b/client/IntegrationTests/JobEngineIT.cs @@ -27,13 +27,13 @@ namespace IntegrationTests { item.touched = DateTime.Now; item.started = DateTime.Now; item.finished = DateTime.Now; - var actual = client.Create(item); + var actual = client.Create(item); } [TestMethod] public void TestCreateMasterId() { MediaCubeApi client = new MediaCubeApi("http://10.10.1.28/services/rest/jobengine/", null, null, 100); - MasterId masterId = client.Create(new MasterId()) as MasterId; + MasterId masterId = client.Create(new MasterId()); Assert.IsTrue(masterId.id > 0); } @@ -51,7 +51,7 @@ namespace IntegrationTests { item.touched = DateTime.Now; item.started = DateTime.Now; item.finished = DateTime.Now.AddMinutes(5 * i); - var actual = client.Create(item); + var actual = client.Create(item); } for (int i = 0; i < 10; i++) { @@ -64,7 +64,7 @@ namespace IntegrationTests { item.touched = DateTime.Now; item.started = DateTime.Now; item.finished = DateTime.Now.AddHours(-5).AddMinutes(i); - var actual = client.Create(item); + var actual = client.Create(item); } } diff --git a/client/Maestro/Configuration/ConfigurationInfo.cs b/client/Maestro/Configuration/ConfigurationInfo.cs index b09fc8a3..c5f9afbe 100644 --- a/client/Maestro/Configuration/ConfigurationInfo.cs +++ b/client/Maestro/Configuration/ConfigurationInfo.cs @@ -48,7 +48,7 @@ namespace Maestro.Configuration { public bool SaveSegments { get; set; } public bool CreateSubFolder { get; set; } public string Tag { get; set; } - public bool CreateMetadata {get; set;} + public bool SaveMetadata {get; set;} public bool SendEmailOnError { get; set; } public string ErrorEmailRecipient { get; set; } public string ErrorEmailPattern { get; set; } diff --git a/client/Maestro/Configuration/configuration-editor.json b/client/Maestro/Configuration/configuration-editor.json index 21610048..4bd428ea 100644 --- a/client/Maestro/Configuration/configuration-editor.json +++ b/client/Maestro/Configuration/configuration-editor.json @@ -48,7 +48,7 @@ "tag": "Betöltés", "createSubFolder": true, "killDateDays": 7, - "useMetadata": false, + "saveMetadata": false, "remote": { "address": "ftp://10.10.1.100/OCTOPUS", "userName": "mediacube", @@ -63,7 +63,7 @@ "tag": "Betöltés", "createSubFolder": true, "killDateDays": 7, - "useMetadata": false, + "saveMetadata": false, "remote": { "address": "ftp://10.10.1.100/PLAYOUT_NLE", "userName": "mediacube", @@ -105,7 +105,7 @@ "processor": "FTPTargetProcessor", "outputFormat": "%ID%", "tag": "Archiválás", - "useMetadata": true, + "saveMetadata": true, "remote": { "address": "ftp://10.10.1.100/ARCHIVE", "userName": "mediacube", diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json index 427ddab6..d6da4739 100644 --- a/client/Maestro/Configuration/configuration-nle.json +++ b/client/Maestro/Configuration/configuration-nle.json @@ -48,7 +48,7 @@ "tag": "Betöltés", "createSubFolder": true, "killDateDays": 7, - "useMetadata": false, + "saveMetadata": false, "remote": { "address": "ftp://10.10.1.100/OCTOPUS", "userName": "mediacube", @@ -63,7 +63,7 @@ "tag": "Betöltés", "createSubFolder": true, "killDateDays": 7, - "useMetadata": false, + "saveMetadata": false, "remote": { "address": "ftp://10.10.1.100/PLAYOUT_NLE", "userName": "mediacube", @@ -105,7 +105,7 @@ "processor": "FTPTargetProcessor", "outputFormat": "%ID%", "tag": "Archiválás", - "useMetadata": true, + "saveMetadata": true, "remote": { "address": "ftp://10.10.1.100/ARCHIVE", "userName": "mediacube", diff --git a/client/Maestro/Configuration/configuration-sxs.json b/client/Maestro/Configuration/configuration-sxs.json index 407b1d75..c99f650a 100644 --- a/client/Maestro/Configuration/configuration-sxs.json +++ b/client/Maestro/Configuration/configuration-sxs.json @@ -48,7 +48,7 @@ "tag": "Betöltés", "createSubFolder": true, "killDateDays": 7, - "useMetadata": false, + "saveMetadata": false, "remote": { "address": "file://10.10.1.100/BRAAVOS/OCTOPUS", "userName": "mediacube", @@ -63,7 +63,7 @@ "tag": "Betöltés", "createSubFolder": true, "killDateDays": 7, - "useMetadata": false, + "saveMetadata": false, "remote": { "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_NLE", "userName": "mediacube", @@ -89,7 +89,7 @@ "processor": "UNCTargetProcessor", "outputFormat": "%ID%", "tag": "Archiválás", - "useMetadata": true, + "saveMetadata": true, "remote": { "address": "file://10.10.1.100/BRAAVOS/ARCHIVE", "userName": "mediacube", diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs index cca7c4c7..1375fcc6 100644 --- 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(); this.bindingSource = new System.Windows.Forms.BindingSource(this.components); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.textSelectedSource = new System.Windows.Forms.TextBox(); + this.txtSelectedSource = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.buttonMetadata = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); @@ -64,7 +64,7 @@ namespace Maestro { this.trafficIDSelector = new TrafficClient.TrafficIDSelector(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.labelSelectedMetadata = new System.Windows.Forms.Label(); - this.textSelectedMetadata = new System.Windows.Forms.TextBox(); + this.txtSelectedMetadata = new System.Windows.Forms.TextBox(); this.menuButtonActions = new Maestro.MenuButton(); this.groupTarget = new System.Windows.Forms.GroupBox(); this.panelActions = new System.Windows.Forms.TableLayoutPanel(); @@ -199,7 +199,7 @@ namespace Maestro { this.tableLayoutPanel2.ColumnCount = 2; this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.Controls.Add(this.textSelectedSource, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.txtSelectedSource, 0, 1); this.tableLayoutPanel2.Controls.Add(this.label1, 0, 0); this.tableLayoutPanel2.Controls.Add(this.buttonMetadata, 1, 1); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -212,17 +212,17 @@ namespace Maestro { this.tableLayoutPanel2.Size = new System.Drawing.Size(394, 62); this.tableLayoutPanel2.TabIndex = 12; // - // textSelectedSource + // txtSelectedSource // - this.textSelectedSource.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.textSelectedSource.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textSelectedSource.Dock = System.Windows.Forms.DockStyle.Fill; - this.textSelectedSource.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textSelectedSource.Location = new System.Drawing.Point(3, 28); - this.textSelectedSource.Name = "textSelectedSource"; - this.textSelectedSource.Size = new System.Drawing.Size(292, 26); - this.textSelectedSource.TabIndex = 10; - this.textSelectedSource.TextChanged += new System.EventHandler(this.OnInfoTextChanged); + this.txtSelectedSource.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.txtSelectedSource.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtSelectedSource.Dock = System.Windows.Forms.DockStyle.Fill; + this.txtSelectedSource.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.txtSelectedSource.Location = new System.Drawing.Point(3, 28); + this.txtSelectedSource.Name = "txtSelectedSource"; + this.txtSelectedSource.Size = new System.Drawing.Size(292, 26); + this.txtSelectedSource.TabIndex = 10; + this.txtSelectedSource.TextChanged += new System.EventHandler(this.OnInfoTextChanged); // // label1 // @@ -436,7 +436,7 @@ namespace Maestro { this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.Controls.Add(this.labelSelectedMetadata, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.textSelectedMetadata, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.txtSelectedMetadata, 0, 1); this.tableLayoutPanel1.Controls.Add(this.menuButtonActions, 1, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.tableLayoutPanel1.Location = new System.Drawing.Point(10, 399); @@ -461,17 +461,17 @@ namespace Maestro { this.labelSelectedMetadata.TabIndex = 13; this.labelSelectedMetadata.Text = "Selected metadata"; // - // textSelectedMetadata + // txtSelectedMetadata // - this.textSelectedMetadata.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.textSelectedMetadata.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.textSelectedMetadata.Dock = System.Windows.Forms.DockStyle.Fill; - this.textSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.textSelectedMetadata.Location = new System.Drawing.Point(3, 28); - this.textSelectedMetadata.Name = "textSelectedMetadata"; - this.textSelectedMetadata.Size = new System.Drawing.Size(162, 26); - this.textSelectedMetadata.TabIndex = 12; - this.textSelectedMetadata.TextChanged += new System.EventHandler(this.OnInfoTextChanged); + this.txtSelectedMetadata.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.txtSelectedMetadata.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtSelectedMetadata.Dock = System.Windows.Forms.DockStyle.Fill; + this.txtSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.txtSelectedMetadata.Location = new System.Drawing.Point(3, 28); + this.txtSelectedMetadata.Name = "txtSelectedMetadata"; + this.txtSelectedMetadata.Size = new System.Drawing.Size(162, 26); + this.txtSelectedMetadata.TabIndex = 12; + this.txtSelectedMetadata.TextChanged += new System.EventHandler(this.OnInfoTextChanged); // // menuButtonActions // @@ -908,9 +908,9 @@ namespace Maestro { private System.Windows.Forms.GroupBox groupMetadata; private System.Windows.Forms.GroupBox groupTarget; private System.Windows.Forms.Button btnExecute; - private System.Windows.Forms.TextBox textSelectedSource; + private System.Windows.Forms.TextBox txtSelectedSource; private System.Windows.Forms.Label labelSelectedMetadata; - private System.Windows.Forms.TextBox textSelectedMetadata; + private System.Windows.Forms.TextBox txtSelectedMetadata; private System.Windows.Forms.TableLayoutPanel panelActions; private System.Windows.Forms.GroupBox groupActions; private System.Windows.Forms.DataGridView dataGridJobs; diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index 5e6da4dd..fc7d4f0e 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -14,6 +14,7 @@ using Model; namespace Maestro { public partial class MaestroForm { + private const string ARCHIVEID_PREFIX = "MC-"; private MetadataInfo selectedMetadata; private List segments; private MediaCubeApi mediaCubeApi; @@ -28,7 +29,7 @@ namespace Maestro { selectedMetadata = value; movieSegments = null; segments = null; - textSelectedMetadata.Text = value?.ID; + txtSelectedMetadata.Text = value?.ID; } } @@ -36,7 +37,7 @@ namespace Maestro { InitializeOctopusSelector(); InitializeTrafficSelector(); InitializeMediaCubeApi(); - textSelectedMetadata.ReadOnly = !Configuration.EnableCustomMetadataId; + txtSelectedMetadata.ReadOnly = !Configuration.EnableCustomMetadataId; } private void InitializeTrafficSelector() { @@ -133,11 +134,12 @@ namespace Maestro { private ArchiveMetadata GetArchiveMetadata() { ArchiveMetadata result = null; - SourceIDType idType = GetSourceType(textSelectedMetadata.Text); + SourceIDType idType = GetSourceType(txtSelectedMetadata.Text); Cursor.Current = Cursors.WaitCursor; switch (idType) { case SourceIDType.MediaCube: result = GetMediaCubeMetadata(); + txtSelectedMetadata.Text = result.itemHouseId; break; case SourceIDType.OctopusID: result = GetOctopusMetadata(); @@ -151,17 +153,17 @@ namespace Maestro { } private ArchiveMetadata GetMediaCubeMetadata() { - MasterId masterId = mediaCubeApi.Create(new MasterId()) as MasterId; + MasterId masterId = mediaCubeApi.Create(new MasterId()); if (masterId == null) return null; ArchiveMetadata result = new ArchiveMetadata(); - result.itemHouseId = masterId.ToString(); - result.mediaHouseId = masterId.ToString(); + result.itemHouseId = ARCHIVEID_PREFIX + masterId.id.ToString(); + result.mediaHouseId = result.itemHouseId; return result; } private ArchiveMetadata GetTrafficMetadata() { - string id = textSelectedMetadata.Text; + string id = txtSelectedMetadata.Text; if (String.IsNullOrEmpty(id)) return null; TrafficAPI api = trafficIDSelector.trafficAPI; @@ -193,7 +195,7 @@ namespace Maestro { private ArchiveMetadata GetOctopusMetadata() { ArchiveMetadata result = new ArchiveMetadata(); - string id = textSelectedMetadata.Text; + string id = txtSelectedMetadata.Text; OctopusAPI api = octopusIDSelector.GetClient(); IEnumerable storyEnum = api.GetStoriesById(id); if (storyEnum != null) @@ -287,7 +289,7 @@ namespace Maestro { } private void UpdateEditArchiveMetadataEnabled() { - ctxiModifyArchiveMetadata.Enabled = !String.IsNullOrEmpty(textSelectedSource.Text); + ctxiModifyArchiveMetadata.Enabled = !String.IsNullOrEmpty(txtSelectedSource.Text); } private void UpdateDefineSegmentEnabled() { diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs index 0212c6ee..2bae55c7 100644 --- a/client/Maestro/MaestroForm.Source.cs +++ b/client/Maestro/MaestroForm.Source.cs @@ -28,7 +28,7 @@ namespace Maestro { } set { selectedSource = value; - textSelectedSource.Text = selectedSource.Name; + txtSelectedSource.Text = selectedSource.Name; UpdateEditArchiveMetadataEnabled(); } } @@ -277,7 +277,7 @@ namespace Maestro { String actualName = actual.Cells[index].Value as string; if (fileName.Equals(actualName)) { selectedSourceRows.Remove(actual); - if (textSelectedSource.InvokeRequired) { + if (txtSelectedSource.InvokeRequired) { SetTextCallback d = new SetTextCallback(SetTextSelectedSourceAndMetadataButtonEnabled); Invoke(d); } else diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs index 7242a80f..cc94116e 100644 --- a/client/Maestro/MaestroForm.Target.cs +++ b/client/Maestro/MaestroForm.Target.cs @@ -146,7 +146,7 @@ namespace Maestro { } private bool EnsureMetadata(Target target) { - if (target.CreateMetadata && (archiveMetadata == null || !archiveMetadata.IsFilled)) { + if (target.SaveMetadata && (archiveMetadata == null || !archiveMetadata.IsFilled)) { archiveMetadata = GetArchiveMetadata(); if (archiveMetadata == null) { MessageBox.Show(String.Format("A {0} folyamat nem futtatható kísérő adatok nélkül.", target.Label)); @@ -167,12 +167,12 @@ namespace Maestro { MediaCubeApi = mediaCubeApi, SourceConfig = Configuration.Source, TargetConfig = target, - ID = textSelectedMetadata.Text, + ID = txtSelectedMetadata.Text, InputFileName = sourceItem.Name, Segments = segments == null ? null : new List(segments), ArchiveMetadata = ArchiveMetadata.DeepClone(archiveMetadata), VariantID = selectedMetadata == null ? 0 : selectedMetadata.VariantID, - MetadataKind = selectedMetadata.Kind + MetadataKind = selectedMetadata == null ? MetadataType.None : selectedMetadata.Kind }; } @@ -210,7 +210,7 @@ namespace Maestro { } private void OnInfoTextChanged(object sender, EventArgs e) { - if (!sender.Equals(textSelectedSource)) + if (!sender.Equals(txtSelectedSource)) ApplyProcessorButtonsLogic(); ApplyMetaDataButtonLogic(); } @@ -240,7 +240,7 @@ namespace Maestro { private void ApplyProcessorButtonsLogic() { ClearSelectedProcessors(); - if (!String.IsNullOrEmpty(textSelectedSource.Text) && !String.IsNullOrEmpty(textSelectedMetadata.Text)) { + if (!String.IsNullOrEmpty(txtSelectedSource.Text) && !String.IsNullOrEmpty(txtSelectedMetadata.Text)) { ChangeProcessButtonsState(true); } else { ChangeProcessButtonsState(false); @@ -273,7 +273,7 @@ namespace Maestro { private void ApplyProcessorButtonsLogicWithoutArchiveMetadataButton() { ClearSelectedProcessors(); - if (!String.IsNullOrEmpty(textSelectedMetadata.Text) && !String.IsNullOrEmpty(textSelectedMetadata.Text)) { + if (!String.IsNullOrEmpty(txtSelectedMetadata.Text) && !String.IsNullOrEmpty(txtSelectedMetadata.Text)) { ChangeProcessButtonsState(true); } else { ChangeProcessButtonsState(false); diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs index f2a7315a..bd65eed5 100644 --- a/client/Maestro/MaestroForm.cs +++ b/client/Maestro/MaestroForm.cs @@ -195,7 +195,7 @@ namespace Maestro { List list = stories.ToList(); if (list.Count == 1) { UpdateEditArchiveMetadataEnabled(); - textSelectedMetadata.Text = list[0].ID; + txtSelectedMetadata.Text = list[0].ID; octopusMetadataSelected?.Invoke(list[0].ID); //octopusIDSelector.IDSelectedFromOutside(list[0].ID); return; @@ -217,7 +217,7 @@ namespace Maestro { } if (list.Count == 1) { UpdateEditArchiveMetadataEnabled(); - textSelectedMetadata.Text = list[0].ID; + txtSelectedMetadata.Text = list[0].ID; octopusMetadataSelected?.Invoke(list[0].ID); //octopusIDSelector.IDSelectedFromOutside(list[0].ID); return; @@ -248,7 +248,7 @@ namespace Maestro { if (result.Count == 1) { trafficMetadataSelected?.Invoke(result[0].MediaID, result[0].VariantID); UpdateEditArchiveMetadataEnabled(); - textSelectedMetadata.Text = result[0].MediaID; + txtSelectedMetadata.Text = result[0].MediaID; return; } SearchResult searchResult = new SearchResult(result, trafficMetadataSelected); diff --git a/client/Maestro/Targets/FTPTargetProcessor.cs b/client/Maestro/Targets/FTPTargetProcessor.cs index b5a198b9..5911c427 100644 --- a/client/Maestro/Targets/FTPTargetProcessor.cs +++ b/client/Maestro/Targets/FTPTargetProcessor.cs @@ -96,7 +96,7 @@ namespace Maestro.Targets { return x > -1; } - protected override string GetOutputFilePath(string fileName) { + protected override string GetOutputFilePath(string path, string fileName) { return fileName; } diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs index ba409b05..abac4edb 100644 --- a/client/Maestro/Targets/UNCTargetProcessor.cs +++ b/client/Maestro/Targets/UNCTargetProcessor.cs @@ -100,7 +100,7 @@ namespace Maestro.Targets { UploadKillDateFile(); } - if (parameters.TargetConfig.CreateMetadata && parameters.ArchiveMetadata != null) + if (parameters.TargetConfig.SaveMetadata && parameters.ArchiveMetadata != null) CreateMetadata(); if (parameters.TargetConfig.SaveSegments && parameters.Segments != null) //eljuthat-e ide a felhasználó, ha a MetadataKind octopus? @@ -149,7 +149,7 @@ namespace Maestro.Targets { private void SendWorkFlowAction() { try { - parameters.MediaCubeApi.Create(workFlowAction); + parameters.MediaCubeApi.Create(workFlowAction); } catch (Exception e) { MessageBox.Show(parent, e.Message); @@ -178,8 +178,8 @@ namespace Maestro.Targets { DateTime date = GetKillDate(); string fileName = String.Format(KILLDATE_FILE, OutputName, date.ToString("yyyyMMdd")); logger.Debug("Creating KILLDATE status file {0}", fileName); - KillDatePath = Path.Combine(statusWorkDir, fileName); - UploadContent(fileName, new byte[] { }); + KillDatePath = GetOutputFilePath(statusWorkDir, fileName); + UploadContent(KillDatePath, new byte[] { }); KillDate = date.ToString("yyyy.MM.dd"); } @@ -190,7 +190,8 @@ namespace Maestro.Targets { string fileName = String.Format(METADATA_FILE, OutputName); logger.Debug("Creating METADATA file {0}", fileName); byte[] content = Encoding.UTF8.GetBytes(parameters.ArchiveMetadata.ToString()); - UploadContent(Path.Combine(statusWorkDir, fileName), content); + string ouputPath = GetOutputFilePath(statusWorkDir, fileName); + UploadContent(ouputPath, content); } protected void CopyStream(Stream istream, long ilength, Stream ostream) { @@ -219,8 +220,8 @@ namespace Maestro.Targets { Win32File.CopyFileEx(Input, Output, new CopyProgressRoutine(this.CopyProgressHandler), IntPtr.Zero, ref pbCancel, CopyFileFlags.COPY_FILE_RESTARTABLE); } - protected virtual string GetOutputFilePath(string fileName) { - return "/".Equals(workingDir) ? fileName : Path.Combine(workingDir, fileName); + protected virtual string GetOutputFilePath(string path, string fileName) { + return "/".Equals(workingDir) ? fileName : Path.Combine(path, fileName); } protected virtual string CreateOutputFileName() { @@ -230,7 +231,7 @@ namespace Maestro.Targets { string result = String.Format(FILENAME, nameWithoutExtension, extension); int version = 1; - while (FileExists(GetOutputFilePath(result))) { + while (FileExists(GetOutputFilePath(workingDir, result))) { string versioned = String.Format(VERSIONED_FILENAME, nameWithoutExtension, version, extension); logger.Debug(ALREADY_EXISTS, result, versioned); result = versioned; diff --git a/client/MediaCubeClient/MediaCubeApi.cs b/client/MediaCubeClient/MediaCubeApi.cs index 731efedb..ed3e45c9 100644 --- a/client/MediaCubeClient/MediaCubeApi.cs +++ b/client/MediaCubeClient/MediaCubeApi.cs @@ -38,7 +38,7 @@ namespace JobEngineClient { } - public Object Create(object data) { + public T Create(object data) { var request = new RestRequest("create", Method.POST); String body = JsonConvert.SerializeObject(data, serializerSettings); //Debug.WriteLine(body); @@ -46,10 +46,10 @@ namespace JobEngineClient { var response = client.Execute(request); if (response.StatusCode != HttpStatusCode.OK && response.ErrorMessage != null) { ErrorReporter?.Invoke(DateTime.Now, "Error", String.Format("[MediaCube] {0}", response.ErrorMessage), Color.Red); - return null; + return default(T); } //Debug.WriteLine(response.Content); - var result = JsonConvert.DeserializeObject(response.Content); + var result = JsonConvert.DeserializeObject(response.Content); return result; } -- 2.54.0