From: Vásáry Dániel Date: Thu, 12 Oct 2017 12:17:39 +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=3bcdbf6e2c25b3d369ebf11f546797be44c3abce;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30607 --- diff --git a/client/IntegrationTests/MaestroIT.cs b/client/IntegrationTests/MaestroIT.cs index 10b60eec..3cea20c3 100644 --- a/client/IntegrationTests/MaestroIT.cs +++ b/client/IntegrationTests/MaestroIT.cs @@ -18,7 +18,7 @@ namespace IntegrationTests { }, OutputFormat = "{0}_{1}_{2}" }; - TargetProcessorParametersWrapper parameters = new TargetProcessorParametersWrapper() { + TargetProcessorParameter parameters = new TargetProcessorParameter() { SourceConfig = null, TargetConfig = configuration, InputFileName = @"c:\tmp\watch\tcdrone.MXF", diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj index 58f8255c..b2c7e53c 100644 --- a/client/Maestro/Maestro.csproj +++ b/client/Maestro/Maestro.csproj @@ -279,6 +279,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs index cd2c6656..71c25848 100644 --- a/client/Maestro/MaestroForm.Target.cs +++ b/client/Maestro/MaestroForm.Target.cs @@ -13,7 +13,7 @@ using JobEngineClient; namespace Maestro { - public class TargetProcessorParametersWrapper { + public class TargetProcessorParameter { public Source SourceConfig { get; set; } public Target TargetConfig { get; set; } public string InputFileName { get; set; } @@ -56,24 +56,20 @@ namespace Maestro { string fileName = actualRow.Cells[1].Value as string; string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, target.Processor); Type type = Type.GetType(typeName); - int variantID = selectedMetadata.VariantID; - TrafficAPI api = trafficIDSelector.trafficAPI; - ISourceItem selectedFile = GetSourceItemFromBindingSource(fileName);//bindingSource.Current as ISourceItem; + ISourceItem selectedFile = GetSourceItemFromBindingSource(fileName); string id = selectedMetadata == null ? textSelectedMetadata.Text : selectedMetadata.ID; - ArchiveMetadata archiveMetadataClone = ArchiveMetadata.DeepClone(archiveMetadatamodel); - List segmentsClone = new List(segments); - TargetProcessorParametersWrapper parameterObj = new TargetProcessorParametersWrapper() { - ArchiveMetadata = archiveMetadataClone, - Client = api, + TargetProcessorParameter processorParameter = new TargetProcessorParameter() { + ArchiveMetadata = ArchiveMetadata.DeepClone(archiveMetadatamodel), + Client = trafficIDSelector.trafficAPI, ID = id, InputFileName = selectedFile.Name, MediaCubeApi = mediaCubeApi, - Segments = segmentsClone, + Segments = new List(segments), SourceConfig = Configuration.Source, TargetConfig = target, - VariantID = variantID + VariantID = selectedMetadata == null ? 0 : selectedMetadata.VariantID }; - object[] parameters = new object[] { this, parameterObj }; + object[] parameters = new object[] { this, processorParameter }; ITargetProcessor processor = (ITargetProcessor)Activator.CreateInstance(type, parameters); processors.Add(processor); } diff --git a/client/Maestro/Metadata/ArchiveMetadata.cs b/client/Maestro/Metadata/ArchiveMetadata.cs index a2e49515..3226d64c 100644 --- a/client/Maestro/Metadata/ArchiveMetadata.cs +++ b/client/Maestro/Metadata/ArchiveMetadata.cs @@ -23,11 +23,12 @@ namespace Maestro.Metadata { } public static ArchiveMetadata DeepClone(ArchiveMetadata obj) { + if (obj == null) + return null; using (var ms = new MemoryStream()) { var formatter = new BinaryFormatter(); formatter.Serialize(ms, obj); ms.Position = 0; - return (ArchiveMetadata)formatter.Deserialize(ms); } } diff --git a/client/Maestro/Resources/configuration-playout.json b/client/Maestro/Resources/configuration-playout.json new file mode 100644 index 00000000..e59187a5 --- /dev/null +++ b/client/Maestro/Resources/configuration-playout.json @@ -0,0 +1,66 @@ +{ + "title": "Adásanyagok", + "active": true, + "startInTray": false, + "enableCustomMetadataId": true, + "player": { + "enabled": true, + "autoStart": false, + "segmentEditor": false + }, + "source": { + "$type": "UNCSource", + "local": { + "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_CHECK" + } + }, + "metadatas": [ + { + "$type": "OctopusMetadata", + "server": { + "address": "http://10.10.1.28/services/rest/octopus/", + "timeout": 1000 + } + }, + { + "$type": "TrafficMetadata", + "server": { + "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;", + "userName": "MAM", + "password": "Echotv.hu", + "timeout": 0 + } + }, + { + "$type": "MediaCubeMetadata", + "server": { + "address": "http://10.10.1.28/services/rest/jobengine/", + "timeout": 1000 + } + } + ], + "targets": [ + { + "label": "Adáskész", + "processor": "UNCTargetProcessor", + "outputFormat": "%ID%", + "saveSegments": true, + "tag": "Adáskész", + "createSubFolder": false, + "useMetadata": false, + "remote": { + "address": "file://10.10.1.100/BRAAVOS/PLAYOUT" + } + }, + { + "label": "Újravágásra", + "processor": "UNCTargetProcessor", + "outputFormat": "%ID%", + "tag": "Újravágásra", + "remote": { + "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_NLE" + } + } + + ] +} diff --git a/client/Maestro/Targets/FTPTargetProcessor.cs b/client/Maestro/Targets/FTPTargetProcessor.cs index 73685440..ca068c90 100644 --- 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(); protected FtpClient targetFTP; - public FTPTargetProcessor(Control parent, TargetProcessorParametersWrapper parameters) + public FTPTargetProcessor(Control parent, TargetProcessorParameter parameters) : base(parent, parameters) { FtpTrace.LogFunctions = false; if (!(parameters.SourceConfig is UNCSource)) { diff --git a/client/Maestro/Targets/FXPTargetProcessor.cs b/client/Maestro/Targets/FXPTargetProcessor.cs index ac53db52..69780a78 100644 --- a/client/Maestro/Targets/FXPTargetProcessor.cs +++ b/client/Maestro/Targets/FXPTargetProcessor.cs @@ -13,7 +13,7 @@ namespace Maestro.Targets { private Source sourceConfig; Uri inputUri; - public FXPTargetProcessor(Control parent,TargetProcessorParametersWrapper parameters) : + public FXPTargetProcessor(Control parent,TargetProcessorParameter parameters) : base(parent, parameters) { sourceConfig = parameters.SourceConfig; inputUri = new Uri(String.Format("{0}/{1}", parameters.SourceConfig.Remote.Address, parameters.InputFileName)); diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs index 9a1a3051..74b3e9de 100644 --- 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"; protected FileInfo inputFile; protected string workingDir; - protected TargetProcessorParametersWrapper parameters; + protected TargetProcessorParameter parameters; public WorkflowAction workFlowAction { get; set; } - public UNCTargetProcessor(Control parent, TargetProcessorParametersWrapper parameters) + public UNCTargetProcessor(Control parent, TargetProcessorParameter parameters) : base(parent) { this.parameters = parameters; InputName = parameters.InputFileName; @@ -81,9 +81,10 @@ namespace Maestro.Targets { UploadKillDateFile(); if (parameters.TargetConfig.UseMetadata && parameters.ArchiveMetadata != null) CreateMetadata(); - if (parameters.TargetConfig.SaveSegments && parameters.Segments != null) + if (parameters.TargetConfig.SaveSegments && parameters.Segments != null) { SaveSegments(); - parameters.Client.BroadcastOKForAir(parameters.VariantID); + parameters.Client.BroadcastOKForAir(parameters.VariantID); + } } private void SaveSegments() { diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs index 4425eacd..7f0efbf0 100644 --- a/client/PlanAIRClient/TrafficAPI.cs +++ b/client/PlanAIRClient/TrafficAPI.cs @@ -18,7 +18,7 @@ namespace TrafficClient { private SegmentWorker segmentWorker; public TrafficAPI(string connString, string user, string password, int timeout, TrafficErrorReporterDelegate errorReporter) { - connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, timeout); + connectionString = String.Format("{0};User ID={1};Password={2};Connection Timeout={3}", connString, user, password, timeout/1000); connection = new SqlConnection(connectionString); cliFSPReader = new CliFSPReader(); broadvastWorker = new BroadcastWorker(connection, cliFSPReader, errorReporter); 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 index 00000000..e81b6ff6 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 4d136e80..256475de 100644 --- a/server/user.jobengine.osgi.server/index.jsp +++ b/server/user.jobengine.osgi.server/index.jsp @@ -1,3 +1,4 @@ + <% pageContext.forward("/pages/login.jsp"); //response.sendRedirect("/pages/login.jsp");