From 3bcdbf6e2c25b3d369ebf11f546797be44c3abce Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Thu, 12 Oct 2017 12:17:39 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30607 --- client/IntegrationTests/MaestroIT.cs | 2 +- client/Maestro/Maestro.csproj | 3 + client/Maestro/MaestroForm.Target.cs | 20 +++--- client/Maestro/Metadata/ArchiveMetadata.cs | 3 +- .../Resources/configuration-playout.json | 66 ++++++++++++++++++ client/Maestro/Targets/FTPTargetProcessor.cs | 2 +- client/Maestro/Targets/FXPTargetProcessor.cs | 2 +- client/Maestro/Targets/UNCTargetProcessor.cs | 9 +-- client/PlanAIRClient/TrafficAPI.cs | 2 +- .../img/mediacube_logo_small.ico | Bin 0 -> 3262 bytes server/user.jobengine.osgi.server/index.jsp | 1 + 11 files changed, 89 insertions(+), 21 deletions(-) create mode 100644 client/Maestro/Resources/configuration-playout.json create mode 100644 server/user.jobengine.osgi.server/img/mediacube_logo_small.ico 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 0000000000000000000000000000000000000000..e81b6ff606a93e28bea7a0d54407e15000a7e890 GIT binary patch literal 3262 zcmbuBc~Dd57Qj!CMKOST8C2A|JVk7kO_W`W2q-Qf$Wpb%x+5Y;SX4Gap=?rlA_58s zV!N){mysJJu?@81SFV0 zAAkggP(}ur1prF{U_Jmig8Kaz#?%>xD=eK>J8iXIx6Q)VWv1aA5{dMMOm$4uC7W8< z+ivjQ85l-M%%vpe`UIY^+2CzzZa+zv{3QxaO|6B?R@pf3*y4LQubd@TjVXG#@}73F zYOLTUd#nEu8|NL1Ow2Vkwf?DvL?Ri^`FhRz?caIqK9g12rF<@X^sph#tU45G!hoIr zt-SLAg1tz(aKm}ap0(>ejpi;Sku*NjqCaJZxt**1#+^ZtX{@e6R3T{2+y3x4REI%r z6x2sU9R+A7p!u=~Do5DeL&4D*_O8B`c5VjKW`0_sGf{WBnVroBZ@-@?6*L4L7lHi{tvOXGWDB~Fp)ge$9XC$EKN(Nr!T(8^YbHL8U z$H;imdy2{W(;VDW@piwmSkv6gO)UCOafK{Fk%UQ{YfHgBcVDRs>cSWiZfFtYlsFj}*U!#$-9T`H>B#zg6h#8<<+H-y0mS82+!gW?xGRv?N1YI<#d# zdnRy_q3IknodtFxFyjbI4dorbh61$_#9XRE;9d~47Vl9GzuF&~Xlms=Wy(~w!g{Tp zncZe8L#Av=<)%Sv`go=R=VwCEk_wGy2|j1s!b|{q%y_TV<2Xf(h86|&r--{$9tNcH zOl70e+}^|1ew~`X)zjDB)sH6{L#|tLv!MOFMr$fClXb39^lwHIE_MA)XMuJ`w;*_O zMHsN+fOQ&}F~B$l_oDQ2_D%dXc>HQ%z)t(7Q!?i09^mQoy_&ymhrfe+K!@n5@TLqzaFt2k*CO3PsM5dGt<3*>JGZKM&9yn*ADcw*p_(t51{~9~HIh7cF(^+WFUaEYIcM1D* z50VLf6tL4i&ad?17tP@p8S~4`q)L@^2ro_iwlRIeqf0v6EX|fQZ4r-(v{y1yblNis ze(TTU{1LoM)SrKp%!~(CEO4?u%9lLw6cjHI-Lw-?-DTK-WC$-yF>B4y?#!FSNGIJs z4W;3vqA-oZV^DGo?ngsoGPGSzQzG#4#`&Ax?+;J-L|W-9zU3sLx{Ijp za@CM@2ro%AsY(LcWk+UZW?NfBN0)%tCE##a_ivak)3S3bpiL>2Dxcx#6a0~|ui)eSZ9DuO ziTxVwYySmfgkj7Gloh4ueJUTt`5m>~5^F)3iRh-Ku);!EVct`|3Mrg{T-8JJHM7$a2KULfx% zmsbBIul5z*vh6816IPfDE6fEqmLpg6yRYaWSM`y?Y5XEX5j_;SAHch)+m@llNdoTW zl^v2X2e*LjJ^||ewX|BZ%63!v!$%{kPPG0A#yo*C!^TBnDB~DL4^q}26yM#@Q@&DI zVIjD_xVu0XxndwFnb&iDsi0&bzi2wYaB5fn)Xtnqt;rx|XHw}BGrP^!Ywgv1GMQ{* z;q?81NXfwKL1`_@2u17m6OCd;VXO$W?jS}#iZPGLs=S01mi!_^q;N)0nMu!$ZwP+r zVt(lYLCM^%T%FE~ljN)j+2E@^hfgoJSg)t2ujT{5L|uIcH@|%$3GA-^p^-rq?;=`v z7^5G@8cw40qiFp>jBylWhAL=*!U`*4g{83EOi;F5aD55CbP>PU2q~N{uJr1|Iyr*J z2f~sZ-28OO25;f&m_EzM*2R0n)*sGZC_|Lbhx!Dn<`j&69A$>0bq6r|5sV&$u}@(Q z(Xxj=()%8gd#>VJw!*SyLaKA0q)MQAnUZtMW!sOoF5WW@=e!43ho+YH5>rbX=N;Pu zg057sltaG{%Gp?BJX#w_bc_|DYC5B8j7M1%`NN&E`up_pehi9vz!LU9dESRy#~8PM&R~sks)lHk9-`v? zyMN?KRikuoaGb4+&q{0O$^X}rPsH?DMynk?9NqoHX`R}NP#suT9m#ua7+UOaWo_niXG1fo)tbh0^U-?^R z9@W)r?^cOTzyIh <% pageContext.forward("/pages/login.jsp"); //response.sendRedirect("/pages/login.jsp"); -- 2.54.0