#110 Újraszegmentálás kliens oldali támogatása

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31362

diff --git a/client/DxPlay/Integration/Traffic.cs b/client/DxPlay/Integration/Traffic.cs
index 8330504c6319088bf6d131194af86a0956aedcd3..90432cac5e9ed92530bf1b19317629a6e19ea0d1 100644 (file)
--- a/client/DxPlay/Integration/Traffic.cs
+++ b/client/DxPlay/Integration/Traffic.cs
@@ -1,11 +1,11 @@
 \r
 using LinkDotNet.MessageHandling.Contracts;\r
-using TrafficClient;\r
-using System.Linq;\r
 using MaestroShared.Metadata;\r
-using System.Collections.Generic;\r
-using NLog;\r
 using MaestroShared.Targets;\r
+using NLog;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using TrafficClient;\r
 \r
 namespace DxPlay.Integration {\r
     public class Traffic {\r
@@ -53,9 +53,14 @@ namespace DxPlay.Integration {
             return result;\r
         }\r
 \r
-        public void Update(TargetUpdateTrafficMessage message) {\r
+        public void SaveSegments(TargetUpdateTrafficMessage message) {\r
             //logger.Info("Now update!!!!!!!!!");\r
-            selector.trafficAPI.UpdateTrafficInformation(message.VariantID, message.Ready, message.MetadataType, message.Segments);\r
+            selector.trafficAPI.SaveSegments(message.VariantID, message.MetadataType, message.Segments);\r
+            //message.Ready, \r
+        }\r
+\r
+        public void Approve(TargetUpdateTrafficMessage message) {\r
+            selector.trafficAPI.Approve(message.VariantID, message.Ready, message.MetadataType);\r
         }\r
     }\r
 }\r

diff --git a/client/DxPlay/Model/DxPlayModel.cs b/client/DxPlay/Model/DxPlayModel.cs
index c24c4465a18f35be204c32f03e2797e8081f7c89..2a154a29fffc5e215e90c0d547903eb034f2f060 100644 (file)
--- a/client/DxPlay/Model/DxPlayModel.cs
+++ b/client/DxPlay/Model/DxPlayModel.cs
@@ -1,19 +1,19 @@
 using DxPlay.Integration;\r
+using DxPlay.Properties;\r
+using LinkDotNet.MessageHandling;\r
+using LinkDotNet.MessageHandling.Contracts;\r
+using MaestroShared.Commons;\r
 using MaestroShared.Metadata;\r
+using MaestroShared.Targets;\r
+using Microsoft.VisualBasic.FileIO;\r
+using NLog;\r
 using System;\r
 using System.Collections.Generic;\r
 using System.ComponentModel;\r
-using System.Runtime.CompilerServices;\r
-using LinkDotNet.MessageHandling;\r
-using LinkDotNet.MessageHandling.Contracts;\r
-using TrafficClient;\r
-using NLog;\r
 using System.IO;\r
-using MaestroShared.Targets;\r
 using System.Linq;\r
-using Microsoft.VisualBasic.FileIO;\r
-using DxPlay.Properties;\r
-using MaestroShared.Commons;\r
+using System.Runtime.CompilerServices;\r
+using TrafficClient;\r
 \r
 namespace DxPlay.Model {\r
     public class DxPlayModel : INotifyPropertyChanged {\r
@@ -160,7 +160,8 @@ namespace DxPlay.Model {
                     MetadataType = MetadataType,\r
                     Segments = Segments.ToList()\r
                 };\r
-                traffic.Update(message);\r
+                traffic.SaveSegments(message);\r
+                traffic.Approve(message);\r
 \r
                 SafeDelete(currentFile.FullName);\r
                 CurrentFile = null;\r
@@ -171,7 +172,7 @@ namespace DxPlay.Model {
                 if (deleteTarget)\r
                     SafeDelete(targetPath);\r
                 throw e;\r
-            } \r
+            }\r
         }\r
 \r
         private void SafeDelete(string targetPath) {\r

diff --git a/client/Maestro/Configuration/configuration.json b/client/Maestro/Configuration/configuration.json
index 5c0e1a050f1526208eb40b059626b4bf4cc1c41f..d434e226e8ee0d53c529fafdcf0ed2b473331f72 100644 (file)
--- a/client/Maestro/Configuration/configuration.json
+++ b/client/Maestro/Configuration/configuration.json
@@ -46,20 +46,20 @@
     {\r
       "$type": "MediaCubeMetadata",\r
       "server": {\r
-        "address": "http://localhost:8888/services/rest/jobengine",\r
+        "address": "http://10.10.1.29:88/services/rest/jobengine",\r
         "userName": "mediacube",\r
         "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
         "timeout": 1000\r
       },\r
       "wsserver": {\r
-        "address": "ws://localhost:8888/services/wsapi",\r
+        "address": "ws://10.10.1.29:88/services/wsapi",\r
         "timeout": 1000\r
       },\r
       "jobTemplate": "retrieve-material.xml",\r
       "archiveFolder": "file://10.10.1.100/BRAAVOS/ARCHIVE",\r
       "restoreFolder": "file://10.10.1.100/BRAAVOS/ARCHIVE_RESTORE",\r
       "restoreNamePattern": "%s_%GUID%",\r
-      "serverRestoreFolder": "/mnt/ISILON/RESTORE",\r
+      "serverRestoreFolder": "/mnt/ISILON/ARCHIVE_RESTORE",\r
       "killDateDays": 1\r
     }\r
   ],\r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index 11cc4e60f98c8be22ee275a7559d56df2fa7939e..609120f8a19c406e0a1281cb27c825512ce0fd64 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -58,7 +58,12 @@ namespace Maestro {
         }\r
 \r
         private void OnTargetUpdateTrafficMessage(TargetUpdateTrafficMessage message) {\r
-            trafficIDSelector.trafficAPI.UpdateTrafficInformation(message.VariantID, message.Ready, message.MetadataType, message.Segments);\r
+            if (message.Ready == false)\r
+                //Target futas elejen elmentjuk a szegmenseket\r
+                trafficIDSelector.trafficAPI.SaveSegments(message.VariantID, message.MetadataType, message.Segments);\r
+            else\r
+                //Target futas vegen OK\r
+                trafficIDSelector.trafficAPI.Approve(message.VariantID, true, message.MetadataType);\r
         }\r
 \r
         private void InitializeTrafficSelector() {\r
@@ -127,6 +132,10 @@ namespace Maestro {
         private void OnDefineSegments(object sender, EventArgs e) {\r
             if (SelectedSource?.FileInfo == null)\r
                 return;\r
+            DefineSegments(SelectedSource.FileInfo);\r
+        }\r
+\r
+        private void DefineSegments(FileInfo fileInfo) {\r
             Cursor = Cursors.WaitCursor;\r
             if (movieSegments == null || movieSegments.Count == 0)\r
                 movieSegments = QuerySegments();\r
@@ -143,8 +152,9 @@ namespace Maestro {
                 readOnly = ArchiveMetadata.ok;\r
             if (readOnly && ArchiveMetadata != null)\r
                 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.");\r
-            OpenFile(SelectedSource.FileInfo, true, readOnly);\r
+            OpenFile(fileInfo, true, readOnly);\r
             UpdateDefineSegmentsStatus();\r
+            Cursor.Current = Cursors.Default;\r
         }\r
 \r
         private BindingList<MovieSegment> QuerySegments() {\r
@@ -223,7 +233,7 @@ namespace Maestro {
                     break;\r
             }\r
 \r
-            if (!String.IsNullOrWhiteSpace(SelectedSource.Prefix) && "Generic".Equals(result.mediaType)) {\r
+            if (!string.IsNullOrWhiteSpace(SelectedSource?.Prefix) && "Generic".Equals(result.mediaType)) {\r
                 metadataType = MetadataTypeUtil.Guess(SelectedSource.Prefix);\r
                 switch (metadataType) {\r
                     case MetadataType.TrafficMaterial:\r
@@ -409,7 +419,13 @@ namespace Maestro {
                     SelectedMetadata.RedefineSegmentsFile = location;\r
             }\r
 \r
-            if (!enableRedefine && mediaCubeApi != null) {\r
+            if (!enableRedefine && metadata != null && mediaCubeApi != null &&\r
+                metadata.WSServer != null &&\r
+                metadata.RestoreFolder != null &&\r
+                metadata.ArchiveFolder != null &&\r
+                !string.IsNullOrWhiteSpace(metadata.JobTemplate) &&\r
+                !string.IsNullOrWhiteSpace(metadata.ServerRestoreFolder) &&\r
+                !string.IsNullOrWhiteSpace(metadata.RestoreNamePattern)) {\r
                 Media media = mediaCubeApi.GetMediaByHouseId(mediaHouseId);\r
                 if (media != null) {\r
                     enableRedefine = true;\r
@@ -419,9 +435,8 @@ namespace Maestro {
                 }\r
             }\r
 \r
-            if (enableRedefine) {\r
+            if (enableRedefine)\r
                 btnRedefineSegments.Visible = true;\r
-            }\r
         }\r
 \r
         private void OnRedefineSegments(object sender, EventArgs e) {\r
@@ -434,6 +449,9 @@ namespace Maestro {
                     return;\r
             }\r
 \r
+            DefineSegments(new FileInfo(SelectedMetadata.RedefineSegmentsFile));\r
+\r
+            //save!\r
 \r
 \r
         }\r

diff --git a/client/PlanAIRClient/TrafficAPI.cs b/client/PlanAIRClient/TrafficAPI.cs
index 903f8fd7d27e5288b54eed5468ee88077763b7c2..b30ddc5bac05166554b0e08d600582bc188ca190 100644 (file)
--- a/client/PlanAIRClient/TrafficAPI.cs
+++ b/client/PlanAIRClient/TrafficAPI.cs
@@ -1,10 +1,10 @@
-using System;\r
+using LinkDotNet.MessageHandling.Contracts;\r
+using MaestroShared.Metadata;\r
+using NLog;\r
+using System;\r
 using System.Collections.Generic;\r
 using System.Data.SqlClient;\r
-using NLog;\r
 using TrafficClient.Workers;\r
-using LinkDotNet.MessageHandling.Contracts;\r
-using MaestroShared.Metadata;\r
 \r
 namespace TrafficClient {\r
     public class TrafficAPI {\r
@@ -39,26 +39,41 @@ namespace TrafficClient {
             return materialWorker.GetMaterialArchiveMetadata(strParam);\r
         }\r
 \r
-        public void UpdateTrafficInformation(int itemID, bool ready, MetadataType kind, List<MovieSegment> segments) {\r
+        public void Approve(int itemID, bool ready, MetadataType kind) {\r
             switch (kind) {\r
                 case MetadataType.TrafficMaterial: {\r
+                        materialWorker.SetMaterialOK(itemID, ready);\r
+                        break;\r
+                    }\r
+                case MetadataType.TrafficAD: {\r
+                        adWorker.SetADOK(itemID, ready);\r
+                        break;\r
+                    }\r
+                case MetadataType.TrafficPromo: {\r
+                        promoWorker.SetPromoOK(itemID, ready);\r
+                        break;\r
+                    }\r
+            }\r
+        }\r
+\r
+        public void SaveSegments(int itemID, MetadataType kind, List<MovieSegment> segments) {\r
+            switch (kind) {\r
+                case MetadataType.TrafficMaterial: {\r
+                        //egyebkent nem fogadja el a szegmnesadatokat?\r
                         materialWorker.SetMaterialOK(itemID, false);\r
                         segmentWorker.DeleteMaterialSegments(itemID);\r
                         foreach (MovieSegment actualSegment in segments)\r
                             segmentWorker.AddMaterialSegment(itemID, actualSegment);\r
-                        materialWorker.SetMaterialOK(itemID, ready);\r
                         break;\r
                     }\r
                 case MetadataType.TrafficAD: {\r
                         if (segments != null && segments.Count == 1)\r
-                            segmentWorker.AddADSegment(itemID, segments[0]);\r
-                        adWorker.SetADOK(itemID, true);\r
+                            segmentWorker.SaveADSegment(itemID, segments[0]);\r
                         break;\r
                     }\r
                 case MetadataType.TrafficPromo: {\r
-                        promoWorker.SetPromoOK(itemID, true);\r
                         if (segments != null && segments.Count == 1)\r
-                            segmentWorker.AddPromoSegment(itemID, segments[0]);\r
+                            segmentWorker.SavePromoSegment(itemID, segments[0]);\r
                         break;\r
                     }\r
             }\r

diff --git a/client/PlanAIRClient/Workers/SegmentWorker.cs b/client/PlanAIRClient/Workers/SegmentWorker.cs
index 8bc4c9943e1faed744c121a82a2c21c66a53eab5..71802d8dbedc10a84fdbca2008082b7e83795c4c 100644 (file)
--- a/client/PlanAIRClient/Workers/SegmentWorker.cs
+++ b/client/PlanAIRClient/Workers/SegmentWorker.cs
@@ -134,7 +134,7 @@ namespace TrafficClient.Workers {
             }\r
         }\r
 \r
-        public void AddADSegment(int itemID, MovieSegment segment) {\r
+        public void SaveADSegment(int itemID, MovieSegment segment) {\r
             object comment = segment.Comment;\r
             if (String.IsNullOrEmpty(segment.Comment))\r
                 comment = DBNull.Value;\r
@@ -160,7 +160,7 @@ namespace TrafficClient.Workers {
             }\r
         }\r
 \r
-        public void AddPromoSegment(int itemID, MovieSegment segment) {\r
+        public void SavePromoSegment(int itemID, MovieSegment segment) {\r
             object comment = segment.Comment;\r
             if (String.IsNullOrEmpty(segment.Comment))\r
                 comment = DBNull.Value;\r