From: Vásáry Dániel Date: Wed, 10 Oct 2018 13:46:44 +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=d3e5d17596162dd00fe3c1db361717d942ea0af7;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31318 --- diff --git a/client/DxPlay/PlayerForm.Designer.cs b/client/DxPlay/PlayerForm.Designer.cs index 49944a66..6e5a8208 100644 --- 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; this.pVideo.Location = new System.Drawing.Point(0, 0); this.pVideo.Name = "pVideo"; - this.pVideo.Size = new System.Drawing.Size(478, 419); + this.pVideo.Size = new System.Drawing.Size(478, 414); this.pVideo.TabIndex = 0; this.pVideo.TabStop = true; this.pVideo.SizeChanged += new System.EventHandler(this.panel1_SizeChanged); @@ -106,7 +106,7 @@ namespace DxPlay { this.mainSplit.Panel2.Controls.Add(this.tableLayoutPanel1); this.mainSplit.Panel2.Controls.Add(this.pMetadataDisplay); this.mainSplit.Panel2MinSize = 300; - this.mainSplit.Size = new System.Drawing.Size(784, 421); + this.mainSplit.Size = new System.Drawing.Size(784, 416); this.mainSplit.SplitterDistance = 480; this.mainSplit.TabIndex = 20; // @@ -116,7 +116,7 @@ namespace DxPlay { this.panelPlayer.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPlayer.Location = new System.Drawing.Point(0, 0); this.panelPlayer.Name = "panelPlayer"; - this.panelPlayer.Size = new System.Drawing.Size(478, 419); + this.panelPlayer.Size = new System.Drawing.Size(478, 414); this.panelPlayer.TabIndex = 0; // // tableLayoutPanel1 @@ -132,7 +132,7 @@ namespace DxPlay { this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(298, 356); + this.tableLayoutPanel1.Size = new System.Drawing.Size(298, 351); this.tableLayoutPanel1.TabIndex = 4; // // tabEditor @@ -149,7 +149,7 @@ namespace DxPlay { this.tabEditor.Name = "tabEditor"; this.tabEditor.Padding = new System.Drawing.Point(10, 5); this.tabEditor.SelectedIndex = 0; - this.tabEditor.Size = new System.Drawing.Size(271, 348); + this.tabEditor.Size = new System.Drawing.Size(271, 343); this.tabEditor.TabIndex = 2; // // tpMetadata @@ -161,7 +161,7 @@ namespace DxPlay { this.tpMetadata.Location = new System.Drawing.Point(4, 4); this.tpMetadata.Name = "tpMetadata"; this.tpMetadata.Padding = new System.Windows.Forms.Padding(3); - this.tpMetadata.Size = new System.Drawing.Size(263, 309); + this.tpMetadata.Size = new System.Drawing.Size(263, 304); this.tpMetadata.TabIndex = 0; this.tpMetadata.Text = "Metadata"; // @@ -173,7 +173,7 @@ namespace DxPlay { this.trafficBrowser.Location = new System.Drawing.Point(3, 3); this.trafficBrowser.Margin = new System.Windows.Forms.Padding(0); this.trafficBrowser.Name = "trafficBrowser"; - this.trafficBrowser.Size = new System.Drawing.Size(257, 303); + this.trafficBrowser.Size = new System.Drawing.Size(257, 298); this.trafficBrowser.TabIndex = 0; // // tpSegments @@ -338,7 +338,7 @@ namespace DxPlay { this.pMetadataDisplay.Controls.Add(this.labelSelectedMetadata, 0, 0); this.pMetadataDisplay.Controls.Add(this.txtSelectedID, 0, 1); this.pMetadataDisplay.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pMetadataDisplay.Location = new System.Drawing.Point(0, 356); + this.pMetadataDisplay.Location = new System.Drawing.Point(0, 351); this.pMetadataDisplay.Margin = new System.Windows.Forms.Padding(0); this.pMetadataDisplay.Name = "pMetadataDisplay"; this.pMetadataDisplay.RowCount = 2; @@ -431,10 +431,10 @@ namespace DxPlay { this.playerControls.BackColor = System.Drawing.Color.Transparent; this.playerControls.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.playerControls.Dock = System.Windows.Forms.DockStyle.Bottom; - this.playerControls.Location = new System.Drawing.Point(0, 445); + this.playerControls.Location = new System.Drawing.Point(0, 440); this.playerControls.Margin = new System.Windows.Forms.Padding(0); this.playerControls.Name = "playerControls"; - this.playerControls.Size = new System.Drawing.Size(784, 116); + this.playerControls.Size = new System.Drawing.Size(784, 121); this.playerControls.TabIndex = 22; // // PlayerForm diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index 84580376..f9ba8d10 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -1,14 +1,14 @@ -using System; -using System.Windows.Forms; -using System.IO; -using System.Linq; -using MaestroShared.Metadata; -using NLog; using DxPlay.Model; -using MaestroShared.Commons; using DxPlay.Properties; +using MaestroShared.Commons; +using MaestroShared.Metadata; +using NLog; +using System; using System.Diagnostics; +using System.IO; +using System.Linq; using System.Runtime.InteropServices; +using System.Windows.Forms; namespace DxPlay { @@ -61,8 +61,15 @@ namespace DxPlay { mainMenu.DataBindings.Add(new Binding("Visible", model, "IsMenuVisible", false, DataSourceUpdateMode.Never)); menuOpenFile.DataBindings.Add(new Binding("Enabled", model, "IsMenuVisible", false, DataSourceUpdateMode.Never)); menuApprove.DataBindings.Add(new Binding("Enabled", model, "IsApproveEnabled", false, DataSourceUpdateMode.Never)); - btnApprove.DataBindings.Add(new Binding("Enabled", model, "IsApproveEnabled", false, DataSourceUpdateMode.Never)); - tpSegments.DataBindings.Add(new Binding("Enabled", model, "IsApproveEnabled", false, DataSourceUpdateMode.Never)); + + if (model.IsMenuVisible) { + btnApprove.DataBindings.Add(new Binding("Enabled", model, "IsApproveEnabled", false, DataSourceUpdateMode.Never)); + tpSegments.DataBindings.Add(new Binding("Enabled", model, "IsSegmentEditorVisible", false, DataSourceUpdateMode.Never)); + txtSelectedID.DataBindings.Add(new Binding("Text", model, "ID", false, DataSourceUpdateMode.Never)); + } else { + pMetadataDisplay.Visible = false; + tabEditor.TabPages.Remove(tpMetadata); + } Binding segmentEditorPanelBinding = new Binding("Panel2Collapsed", model, "IsSegmentEditorVisible", true, DataSourceUpdateMode.Never); segmentEditorPanelBinding.Format += (s, e) => { bool enabled = (bool)e.Value; @@ -73,7 +80,6 @@ namespace DxPlay { mainSplit.Panel2.Hide(); }; mainSplit.DataBindings.Add(segmentEditorPanelBinding); - txtSelectedID.DataBindings.Add(new Binding("Text", model, "ID", false, DataSourceUpdateMode.Never)); } @@ -490,7 +496,7 @@ namespace DxPlay { } ProcessCommandLine(); - + if (m_play != null && true.Equals(Settings?.Player?.AutoStart)) m_play.Play(); } diff --git a/client/DxPlay/PlayerForm.resx b/client/DxPlay/PlayerForm.resx index 675af611..4748e2a2 100644 --- a/client/DxPlay/PlayerForm.resx +++ b/client/DxPlay/PlayerForm.resx @@ -173,7 +173,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo - CAAAAk1TRnQBSQFMAgEBAgEAAYgBAQGIAQEBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAZABAQGQAQEBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/client/DxPlay/Properties/AssemblyInfo.cs b/client/DxPlay/Properties/AssemblyInfo.cs index f0f736d4..93f91eb9 100644 --- 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 // by using the '*' as shown below: -[assembly: AssemblyVersion("2.0.8.4")] +[assembly: AssemblyVersion("2.0.8.5")] // // In order to sign your assembly you must specify a key to use. Refer to the @@ -56,5 +56,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")] -[assembly: AssemblyFileVersion("2.0.8.4")] +[assembly: AssemblyFileVersion("2.0.8.5")] diff --git a/client/Maestro/Configuration/configuration-studio.json b/client/Maestro/Configuration/configuration-studio.json index 56f2a609..dc505802 100644 --- a/client/Maestro/Configuration/configuration-studio.json +++ b/client/Maestro/Configuration/configuration-studio.json @@ -52,6 +52,7 @@ "tag": "Archiválás", "saveArchiveMetadata": true, "deleteAfterCopy": false, + "temporaryCopy": true, "killDateDays": 5, "remote": { "address": "ftp://10.10.1.100:21/ARCHIVE/TESZT", diff --git a/client/Maestro/Configuration/configuration-tqc-archive.json b/client/Maestro/Configuration/configuration-tqc-archive.json new file mode 100644 index 00000000..6c41a8bd --- /dev/null +++ b/client/Maestro/Configuration/configuration-tqc-archive.json @@ -0,0 +1,65 @@ +{ + "title": "Playout_NLE", + "active": true, + "startInTray": false, + "enableCustomMetadataId": true, + "player": { + "enabled": true, + "autoStart": false, + "segmentEditor": true + }, + "source": { + "$type": "UNCSource", + "filter": "avi,wav,mxf", + "local": { + "address": "file://10.10.1.100/BRAAVOS/ARCHIVE", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + }, + "remote": { + "address": "ftp://10.10.1.100/ARCHIVE", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, + "metadatas": [ + { + "$type": "TrafficMetadata", + "server": { + "address": "Data Source=10.10.1.45;Initial Catalog=PA_Echo;Persist Security Info=True;", + "userName": "MAM", + "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ", + "timeout": 1000 + } + }, + { + "$type": "MediaCubeMetadata", + "server": { + "address": "http://10.10.1.27/services/rest/jobengine/", + "timeout": 1000 + } + } + ], + "targets": [ + { + "label": "Archiválás", + "processor": "FXPTargetProcessor", + "subFolderFormat": "%IDROOT%-%TEXT%", + "outputFormat": "%ID%-%TEXT%", + "tag": "Újravágás", + "temporaryCopy": true, + "remote": { + "address": "ftp://10.10.1.100/ARCHIVE/TEST", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + }, + "sendEmailOnSuccess": true, + "successEmailRecipient": "vasary@elgekko.net", + "successEmailPattern": "A %TARGETNAME% újravágása szükséges." + } + + ] +} diff --git a/client/Maestro/Configuration/global.json.bak b/client/Maestro/Configuration/global.json.bak deleted file mode 100644 index 69426439..00000000 --- a/client/Maestro/Configuration/global.json.bak +++ /dev/null @@ -1,8 +0,0 @@ -{ - "minimizeToTray": false, - "userDomain": { - "address": "10.10.254.11", - "-userName": "echotest", - "-password": "F3QcfkSEW7hq+FcEraq9xv4UdHHeVoOh7jBH1G1k9SzEayTXyiT4WQ7XKtBO/ygnCpRU97AXoKXKoqXIGP8QlVkFurRqwzo8mywEb1q2VW7dUjkJcLFtLDkqQjM39+N9" - } -} diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj index 4084a1a9..646d9390 100644 --- a/client/Maestro/Maestro.csproj +++ b/client/Maestro/Maestro.csproj @@ -305,9 +305,6 @@ Always - - Always - Always @@ -329,6 +326,9 @@ Always + + Always + diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs index b05e5817..58980ba0 100644 --- a/client/Maestro/MaestroForm.Source.cs +++ b/client/Maestro/MaestroForm.Source.cs @@ -1,7 +1,6 @@ using DxPlay; using Maestro.Metadata; using Maestro.Sources; -using MaestroShared.Commons; using MaestroShared.Configuration; using MaestroShared.Metadata; using MaestroShared.Resources; @@ -11,7 +10,6 @@ using System.Diagnostics; using System.Drawing; using System.IO; using System.Linq; -using System.Text; using System.Windows.Forms; namespace Maestro { diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs index 53dd2457..cce438f4 100644 --- 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 // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.8.6")] -[assembly: AssemblyFileVersion("2.0.8.6")] +[assembly: AssemblyVersion("2.0.8.7")] +[assembly: AssemblyFileVersion("2.0.8.7")] diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs index 853abded..240f5e98 100644 --- a/client/MaestroShared/Targets/FXPTargetProcessor.cs +++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs @@ -5,11 +5,9 @@ using NLog; using System; using System.IO; using System.Linq; -using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Windows.Forms; -using System.Xml; using System.Xml.Linq; namespace MaestroShared.Targets { @@ -116,6 +114,8 @@ namespace MaestroShared.Targets { Progress = (int)((double)uploadedFileLength / sourceFileLength * 100); Thread.Sleep(500); } + + targetFTP.GetReply(); if (useTemporaryName) { if (!targetFTP.MoveFile(targetFilePath, OutputName)) throw new Exception(UPLOAD_ERROR); 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 efdcf7f5..7d25c60c 100644 --- 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) { OutputFiles of = transcodeTask.getOutputFiles(); List outputs = of.getOutputFiles(); - if (outputs.size() != 1) - throw new IndexOutOfBoundsException("There are more than 1 file in the response: " + transcodeTask.getId()); - user.commons.selenio.wsclient.MediaFile selenioMediaFile = outputs.get(0); - String outFile = selenioMediaFile.getFile(); + + String outFile = null; + if (outputs.size() == 0) { + throw new IndexOutOfBoundsException("There are 0 file in the response: " + transcodeTask.getId()); + } else { + for (int i = 0; i < outputs.size(); i++) { + user.commons.selenio.wsclient.MediaFile selenioMediaFile = outputs.get(0); + if (outFile != null && !outFile.equals(selenioMediaFile.getFile())) + throw new IndexOutOfBoundsException("There are different files in the response: " + transcodeTask.getId()); + outFile = selenioMediaFile.getFile(); + } + } + try { outFile = outFile.substring(outFile.lastIndexOf("\\") + 1);