From 562592c9dbc71296ede104a6895bd39903ac955b Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Fri, 7 Dec 2018 10:25:37 +0000 Subject: [PATCH] =?utf8?q?#110=20=C3=9Ajraszegment=C3=A1l=C3=A1s=20kliens?= =?utf8?q?=20oldali=20t=C3=A1mogat=C3=A1sa?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31362 --- client/DxPlay/Integration/Traffic.cs | 17 +++++---- client/DxPlay/Model/DxPlayModel.cs | 23 ++++++------ .../Maestro/Configuration/configuration.json | 6 ++-- client/Maestro/MaestroForm.Metadata.cs | 30 ++++++++++++---- client/PlanAIRClient/TrafficAPI.cs | 35 +++++++++++++------ client/PlanAIRClient/Workers/SegmentWorker.cs | 4 +-- 6 files changed, 77 insertions(+), 38 deletions(-) diff --git a/client/DxPlay/Integration/Traffic.cs b/client/DxPlay/Integration/Traffic.cs index 8330504c..90432cac 100644 --- a/client/DxPlay/Integration/Traffic.cs +++ b/client/DxPlay/Integration/Traffic.cs @@ -1,11 +1,11 @@  using LinkDotNet.MessageHandling.Contracts; -using TrafficClient; -using System.Linq; using MaestroShared.Metadata; -using System.Collections.Generic; -using NLog; using MaestroShared.Targets; +using NLog; +using System.Collections.Generic; +using System.Linq; +using TrafficClient; namespace DxPlay.Integration { public class Traffic { @@ -53,9 +53,14 @@ namespace DxPlay.Integration { return result; } - public void Update(TargetUpdateTrafficMessage message) { + public void SaveSegments(TargetUpdateTrafficMessage message) { //logger.Info("Now update!!!!!!!!!"); - selector.trafficAPI.UpdateTrafficInformation(message.VariantID, message.Ready, message.MetadataType, message.Segments); + selector.trafficAPI.SaveSegments(message.VariantID, message.MetadataType, message.Segments); + //message.Ready, + } + + public void Approve(TargetUpdateTrafficMessage message) { + selector.trafficAPI.Approve(message.VariantID, message.Ready, message.MetadataType); } } } diff --git a/client/DxPlay/Model/DxPlayModel.cs b/client/DxPlay/Model/DxPlayModel.cs index c24c4465..2a154a29 100644 --- a/client/DxPlay/Model/DxPlayModel.cs +++ b/client/DxPlay/Model/DxPlayModel.cs @@ -1,19 +1,19 @@ using DxPlay.Integration; +using DxPlay.Properties; +using LinkDotNet.MessageHandling; +using LinkDotNet.MessageHandling.Contracts; +using MaestroShared.Commons; using MaestroShared.Metadata; +using MaestroShared.Targets; +using Microsoft.VisualBasic.FileIO; +using NLog; using System; using System.Collections.Generic; using System.ComponentModel; -using System.Runtime.CompilerServices; -using LinkDotNet.MessageHandling; -using LinkDotNet.MessageHandling.Contracts; -using TrafficClient; -using NLog; using System.IO; -using MaestroShared.Targets; using System.Linq; -using Microsoft.VisualBasic.FileIO; -using DxPlay.Properties; -using MaestroShared.Commons; +using System.Runtime.CompilerServices; +using TrafficClient; namespace DxPlay.Model { public class DxPlayModel : INotifyPropertyChanged { @@ -160,7 +160,8 @@ namespace DxPlay.Model { MetadataType = MetadataType, Segments = Segments.ToList() }; - traffic.Update(message); + traffic.SaveSegments(message); + traffic.Approve(message); SafeDelete(currentFile.FullName); CurrentFile = null; @@ -171,7 +172,7 @@ namespace DxPlay.Model { if (deleteTarget) SafeDelete(targetPath); throw e; - } + } } private void SafeDelete(string targetPath) { diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json index 5c0e1a05..d434e226 100644 --- a/client/Maestro/Configuration/configuration.json +++ b/client/Maestro/Configuration/configuration.json @@ -46,20 +46,20 @@ { "$type": "MediaCubeMetadata", "server": { - "address": "http://localhost:8888/services/rest/jobengine", + "address": "http://10.10.1.29:88/services/rest/jobengine", "userName": "mediacube", "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", "timeout": 1000 }, "wsserver": { - "address": "ws://localhost:8888/services/wsapi", + "address": "ws://10.10.1.29:88/services/wsapi", "timeout": 1000 }, "jobTemplate": "retrieve-material.xml", "archiveFolder": "file://10.10.1.100/BRAAVOS/ARCHIVE", "restoreFolder": "file://10.10.1.100/BRAAVOS/ARCHIVE_RESTORE", "restoreNamePattern": "%s_%GUID%", - "serverRestoreFolder": "/mnt/ISILON/RESTORE", + "serverRestoreFolder": "/mnt/ISILON/ARCHIVE_RESTORE", "killDateDays": 1 } ], diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index 11cc4e60..609120f8 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -58,7 +58,12 @@ namespace Maestro { } private void OnTargetUpdateTrafficMessage(TargetUpdateTrafficMessage message) { - trafficIDSelector.trafficAPI.UpdateTrafficInformation(message.VariantID, message.Ready, message.MetadataType, message.Segments); + if (message.Ready == false) + //Target futas elejen elmentjuk a szegmenseket + trafficIDSelector.trafficAPI.SaveSegments(message.VariantID, message.MetadataType, message.Segments); + else + //Target futas vegen OK + trafficIDSelector.trafficAPI.Approve(message.VariantID, true, message.MetadataType); } private void InitializeTrafficSelector() { @@ -127,6 +132,10 @@ namespace Maestro { private void OnDefineSegments(object sender, EventArgs e) { if (SelectedSource?.FileInfo == null) return; + DefineSegments(SelectedSource.FileInfo); + } + + private void DefineSegments(FileInfo fileInfo) { Cursor = Cursors.WaitCursor; if (movieSegments == null || movieSegments.Count == 0) movieSegments = QuerySegments(); @@ -143,8 +152,9 @@ namespace Maestro { readOnly = ArchiveMetadata.ok; if (readOnly && ArchiveMetadata != null) MsgBox.Warning("Az anyag már el van fogadva, a szegmens módosítás nem kerül mentésre. A szegmensek módosításához vissza kell vonni az anyag elfogadását az adástervező rendszerben."); - OpenFile(SelectedSource.FileInfo, true, readOnly); + OpenFile(fileInfo, true, readOnly); UpdateDefineSegmentsStatus(); + Cursor.Current = Cursors.Default; } private BindingList QuerySegments() { @@ -223,7 +233,7 @@ namespace Maestro { break; } - if (!String.IsNullOrWhiteSpace(SelectedSource.Prefix) && "Generic".Equals(result.mediaType)) { + if (!string.IsNullOrWhiteSpace(SelectedSource?.Prefix) && "Generic".Equals(result.mediaType)) { metadataType = MetadataTypeUtil.Guess(SelectedSource.Prefix); switch (metadataType) { case MetadataType.TrafficMaterial: @@ -409,7 +419,13 @@ namespace Maestro { SelectedMetadata.RedefineSegmentsFile = location; } - if (!enableRedefine && mediaCubeApi != null) { + if (!enableRedefine && metadata != null && mediaCubeApi != null && + metadata.WSServer != null && + metadata.RestoreFolder != null && + metadata.ArchiveFolder != null && + !string.IsNullOrWhiteSpace(metadata.JobTemplate) && + !string.IsNullOrWhiteSpace(metadata.ServerRestoreFolder) && + !string.IsNullOrWhiteSpace(metadata.RestoreNamePattern)) { Media media = mediaCubeApi.GetMediaByHouseId(mediaHouseId); if (media != null) { enableRedefine = true; @@ -419,9 +435,8 @@ namespace Maestro { } } - if (enableRedefine) { + if (enableRedefine) btnRedefineSegments.Visible = true; - } } private void OnRedefineSegments(object sender, EventArgs e) { @@ -434,6 +449,9 @@ namespace Maestro { return; } + DefineSegments(new FileInfo(SelectedMetadata.RedefineSegmentsFile)); + + //save! } diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs index 903f8fd7..b30ddc5b 100644 --- a/client/PlanAIRClient/TrafficAPI.cs +++ b/client/PlanAIRClient/TrafficAPI.cs @@ -1,10 +1,10 @@ -using System; +using LinkDotNet.MessageHandling.Contracts; +using MaestroShared.Metadata; +using NLog; +using System; using System.Collections.Generic; using System.Data.SqlClient; -using NLog; using TrafficClient.Workers; -using LinkDotNet.MessageHandling.Contracts; -using MaestroShared.Metadata; namespace TrafficClient { public class TrafficAPI { @@ -39,26 +39,41 @@ namespace TrafficClient { return materialWorker.GetMaterialArchiveMetadata(strParam); } - public void UpdateTrafficInformation(int itemID, bool ready, MetadataType kind, List segments) { + public void Approve(int itemID, bool ready, MetadataType kind) { switch (kind) { case MetadataType.TrafficMaterial: { + materialWorker.SetMaterialOK(itemID, ready); + break; + } + case MetadataType.TrafficAD: { + adWorker.SetADOK(itemID, ready); + break; + } + case MetadataType.TrafficPromo: { + promoWorker.SetPromoOK(itemID, ready); + break; + } + } + } + + public void SaveSegments(int itemID, MetadataType kind, List segments) { + switch (kind) { + case MetadataType.TrafficMaterial: { + //egyebkent nem fogadja el a szegmnesadatokat? materialWorker.SetMaterialOK(itemID, false); segmentWorker.DeleteMaterialSegments(itemID); foreach (MovieSegment actualSegment in segments) segmentWorker.AddMaterialSegment(itemID, actualSegment); - materialWorker.SetMaterialOK(itemID, ready); break; } case MetadataType.TrafficAD: { if (segments != null && segments.Count == 1) - segmentWorker.AddADSegment(itemID, segments[0]); - adWorker.SetADOK(itemID, true); + segmentWorker.SaveADSegment(itemID, segments[0]); break; } case MetadataType.TrafficPromo: { - promoWorker.SetPromoOK(itemID, true); if (segments != null && segments.Count == 1) - segmentWorker.AddPromoSegment(itemID, segments[0]); + segmentWorker.SavePromoSegment(itemID, segments[0]); break; } } diff --git a/client/PlanAIRClient/Workers/SegmentWorker.cs b/client/PlanAIRClient/Workers/SegmentWorker.cs index 8bc4c994..71802d8d 100644 --- a/client/PlanAIRClient/Workers/SegmentWorker.cs +++ b/client/PlanAIRClient/Workers/SegmentWorker.cs @@ -134,7 +134,7 @@ namespace TrafficClient.Workers { } } - public void AddADSegment(int itemID, MovieSegment segment) { + public void SaveADSegment(int itemID, MovieSegment segment) { object comment = segment.Comment; if (String.IsNullOrEmpty(segment.Comment)) comment = DBNull.Value; @@ -160,7 +160,7 @@ namespace TrafficClient.Workers { } } - public void AddPromoSegment(int itemID, MovieSegment segment) { + public void SavePromoSegment(int itemID, MovieSegment segment) { object comment = segment.Comment; if (String.IsNullOrEmpty(segment.Comment)) comment = DBNull.Value; -- 2.54.0