From 36765c429f8a2a005f9d902e3a5a672f9f974536 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Wed, 5 Aug 2020 14:48:56 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31918

---
 client/Maestro/Configuration/editor-mv.json |  8 +-------
 client/Maestro/MaestroForm.Metadata.cs      | 18 ++++++++++++++----
 client/Maestro/Metadata/MetaDataInfo.cs     |  1 +
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/client/Maestro/Configuration/editor-mv.json b/client/Maestro/Configuration/editor-mv.json
index 5645a4dc..52ddf170 100644
--- a/client/Maestro/Configuration/editor-mv.json
+++ b/client/Maestro/Configuration/editor-mv.json
@@ -12,13 +12,7 @@
 		"$type": "UNCSource",
 		"filter": "avi,wav,mxf,mts",
 		"local": {
-			"address": "file://d:/_video",
-			"timeout": 1000
-		},
-		"remote": {
-			"address": "ftp://10.11.1.100/Promise/",
-			"userName": "editor1",
-			"password": "mBsAKn0RRr+lErAWAu+oMD/3CRxlBLNvm3UB84SKl5KBVYD5+wIANFL0eszfbAUtzYKqdN/dEB/6ItBNz9D6C4/hppcYrg0+73+xFW9KYEwd2KfgHaH5uslbA/8IyI/U",
+			"address": "file://c:/_video",
 			"timeout": 1000
 		}
 	},
diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index c6032a96..181497a6 100644
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -241,7 +241,11 @@ namespace Maestro {
         private ArchiveMetadata GetArchiveMetadata() {
             ArchiveMetadata result = null;
             Cursor.Current = Cursors.WaitCursor;
-            MetadataType metadataType = MetadataTypeUtil.Guess(textSelectedMetadata.Text);
+
+
+            //MetadataType metadataType = MetadataTypeUtil.Guess(textSelectedMetadata.Text);
+            MetadataType metadataType = SelectedMetadata.Kind;
+
             switch (metadataType) {
                 case MetadataType.None:
                 case MetadataType.MediaCube:
@@ -311,7 +315,10 @@ namespace Maestro {
             List<TrafficItemMetadata> trafficResult = null;
             switch (metadataType) {
                 case MetadataType.TrafficMaterial:
-                    trafficResult = api.GetMaterialMetadata(id);
+                    if (SelectedMetadata.MetaDataID != null)
+                        trafficResult = api.GetMaterialMetadata(SelectedMetadata.MetaDataID);
+                    else
+                        trafficResult = api.GetMaterialMetadata(id);
                     break;
                 case MetadataType.TrafficPromo:
                     trafficResult = api.GetPromoArchiveMetadata(id);
@@ -328,8 +335,8 @@ namespace Maestro {
             result.itemTitle = actualResult.ProgTitle;
             result.itemDescription = actualResult.ProgDescription;
             result.mediaHouseId = actualResult.EpisodeID;
-            result.mediaTitle = !string.IsNullOrEmpty(actualResult.EpisodeTitle) ? actualResult.EpisodeTitle : actualResult.ProgTitle;
-            result.mediaDescription = actualResult.EpisodeDescription;
+            result.mediaTitle = !string.IsNullOrEmpty(actualResult.EpisodeTitle) && SelectedMetadata.MetaDataID == null ? actualResult.EpisodeTitle : actualResult.ProgTitle;
+            result.mediaDescription = SelectedMetadata.MetaDataID == null ? null : actualResult.EpisodeDescription;
             result.ok = actualResult.OK;
             return result;
         }
@@ -423,10 +430,13 @@ namespace Maestro {
             SelectedMetadata = new MetadataInfo() {
                 Kind = metadataType,
                 ID = btnUseEpisodeID.Checked ? serialID : id,
+                //csak arra hasznaljuk, hogy a metaadat lekeres mukodjon
+                MetaDataID = btnUseEpisodeID.Checked ? id : null,
                 MetadataText = text,
                 VariantID = variantID,
                 Selected = selected
             };
+
             TrafficMetadata metadata = MetadataProvider.Get<TrafficMetadata>(Configuration.Metadatas);
             if (true.Equals(metadata?.RedefineSegments))
                 CheckIfRedefineSegments();
diff --git a/client/Maestro/Metadata/MetaDataInfo.cs b/client/Maestro/Metadata/MetaDataInfo.cs
index dec05161..aad389b5 100644
--- a/client/Maestro/Metadata/MetaDataInfo.cs
+++ b/client/Maestro/Metadata/MetaDataInfo.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 namespace Maestro.Metadata {
     public class MetadataInfo {
         public string ID { get; set; }
+        public string MetaDataID { get; set; }
         public string MetadataText { get; set; }
         public MetadataType Kind { get; set; }
         public int VariantID { get; set; }
-- 
2.54.0