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

diff --git a/client/Maestro/Resources/configuration-control.json b/client/Maestro/Configuration/configuration-control.json
similarity index 89%
rename from client/Maestro/Resources/configuration-control.json
rename to client/Maestro/Configuration/configuration-control.json
index 0c74a6545a6f83118bd704b322181e70fe3cb7d0..e232a9422bd745a19b8e0bdfef128f5dfebadd19 100644 (file)
--- a/client/Maestro/Resources/configuration-control.json
+++ b/client/Maestro/Configuration/configuration-control.json
@@ -12,7 +12,7 @@
       "address": "ws://10.10.1.28/services/nexio"\r
     },\r
     "remote": {\r
-      "address": "ftp://10.10.1.56:2098/MXF",\r
+      "address": "ftp://10.10.1.56:2098",\r
       "userName": "administrator",\r
       "password": "system"\r
     }\r
@@ -49,7 +49,7 @@
       "outputFormat": "%ID%",\r
       "tag": "Adáskész",\r
       "remote": {\r
-        "address": "ftp://10.10.1.100:21/PLAYOUT_CHECK",\r
+        "address": "ftp://10.10.1.100:21/PLAYOUT_CHECK1",\r
         "userName": "mediacube",\r
         "password":  "Broadca5T"\r
       }\r

diff --git a/client/Maestro/Resources/configuration-ingest.json b/client/Maestro/Configuration/configuration-ingest.json
similarity index 92%
rename from client/Maestro/Resources/configuration-ingest.json
rename to client/Maestro/Configuration/configuration-ingest.json
index cb371883e8391eee97c146ff8ae845711689c2bc..196bf69420d47e3836e9a227f64f2383a15dcaf5 100644 (file)
--- a/client/Maestro/Resources/configuration-ingest.json
+++ b/client/Maestro/Configuration/configuration-ingest.json
@@ -61,7 +61,7 @@
       "tag": "Betöltés",\r
       "killDateDays": 7,\r
       "remote": {\r
-        "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_CHECK",\r
+        "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_CHECK1",\r
         "timeout": 1000\r
       }\r
     },\r

diff --git a/client/Maestro/Configuration/configuration-ingest2.json b/client/Maestro/Configuration/configuration-ingest2.json
new file mode 100644 (file)
index 0000000..f9eed35
--- /dev/null
+++ b/client/Maestro/Configuration/configuration-ingest2.json
@@ -0,0 +1,80 @@
+{\r
+  "title": "Betöltés",\r
+  "active": true,\r
+  "startInTray": false,\r
+  "enableCustomMetadataId": true,\r
+  "player": {\r
+    "enabled": true,\r
+    "autoStart": false,\r
+    "segmentEditor": true\r
+  },\r
+  "source": {\r
+    "$type": "UNCSource",\r
+    "filter": "avi,wav,mxf",\r
+    "local": {\r
+      "address": "file://c:/x"\r
+    }\r
+  },\r
+  "metadatas": [\r
+    {\r
+      "$type": "OctopusMetadata",\r
+      "server": {\r
+        "address": "http://10.10.1.28/services/rest/octopus/",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "$type": "TrafficMetadata",\r
+      "server": {\r
+        "address": "Data Source=10.10.1.45\\sql16;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
+        "userName": "MAM",\r
+        "password": "Echotv.hu",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "$type": "MediaCubeMetadata",\r
+      "server": {\r
+        "address": "http://10.10.1.28/services/rest/jobengine/",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ],\r
+  "targets": [\r
+    {\r
+      "label": "Híranyag betöltés",\r
+      "processor": "UNCTargetProcessor",\r
+      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "tag": "Betöltés",\r
+      "createSubFolder": true,\r
+      "killDateDays": 7,\r
+      "useMetadata": false,\r
+      "remote": {\r
+        "address": "file://10.10.1.100/BRAAVOS/OCTOPUS",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "label": "Adásanyag betöltés",\r
+      "processor": "UNCTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "tag": "Betöltés",\r
+      "killDateDays": 7,\r
+      "remote": {\r
+        "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_CHECK",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "label": "Archiválás",\r
+      "processor": "UNCTargetProcessor",\r
+      "outputFormat": "%ID%",\r
+      "tag": "Archiválás",\r
+      "useMetadata": true,\r
+      "remote": {\r
+        "address": "file://10.10.1.100/BRAAVOS/ARCHIVE",\r
+        "timeout": 1000\r
+      }\r
+    }\r
+  ]\r
+}\r

diff --git a/client/Maestro/Resources/configuration-playout.json b/client/Maestro/Configuration/configuration-playout.json
similarity index 88%
rename from client/Maestro/Resources/configuration-playout.json
rename to client/Maestro/Configuration/configuration-playout.json
index f6a3ca39fb1811001cefb1747ea5e6d65f127aff..fa5e1cb176e86591227a2b7af1af141873aab880 100644 (file)
--- a/client/Maestro/Resources/configuration-playout.json
+++ b/client/Maestro/Configuration/configuration-playout.json
@@ -6,7 +6,7 @@
   "player": {\r
     "enabled": true,\r
     "autoStart": false,\r
-    "segmentEditor": false\r
+    "segmentEditor": true\r
   },\r
   "source": {\r
     "$type": "UNCSource",\r
@@ -47,7 +47,7 @@
       "saveSegments": true,\r
       "tag": "Adáskész",\r
       "remote": {\r
-        "address": "file://10.10.1.100/BRAAVOS/PLAYOUT"\r
+        "address": "file://10.10.1.100/BRAAVOS/PLAYOUT/IceGateway"\r
       }\r
     },\r
     {\r
@@ -56,7 +56,7 @@
       "outputFormat": "%ID%",\r
       "tag": "Újravágás",\r
       "remote": {\r
-        "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_NLE"\r
+        "address": "file://10.10.1.100/BRAAVOS/PLAYOUT_NLE1"\r
       },\r
       "sendSEmailOnSuccess" : true, \r
       "successEmailRecipient": "vasary@elgekko.net",\r

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index 6168d62debd819ecbdfe6d64c2b1d3d6cfb01c52..89dd49a8520aee892c73b9a49d2d38cf65bf7453 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -255,6 +255,9 @@
     <Compile Include="MaestroForm.Source.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
+    <None Include="Configuration\configuration-ingest2.json">\r
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+    </None>\r
     <None Include="Maestro_TemporaryKey.pfx" />\r
     <None Include="nlog.config">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
@@ -279,16 +282,16 @@
     <None Include="Resources\configuration-fxp.json">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Resources\configuration-playout.json">\r
+    <None Include="Configuration\configuration-playout.json">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
     <None Include="Resources\configuration-unc.json">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Resources\configuration-ingest.json">\r
+    <None Include="Configuration\configuration-ingest.json">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Resources\configuration-control.json">\r
+    <None Include="Configuration\configuration-control.json">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </None>\r
   </ItemGroup>\r

diff --git a/client/Maestro/Program.cs b/client/Maestro/Program.cs
index a1e8314398734ccff4d808d2ca5169ce8d1c791b..718fcd0a84784869df7fe2bf1d35f16c3e288cbb 100644 (file)
--- a/client/Maestro/Program.cs
+++ b/client/Maestro/Program.cs
@@ -46,7 +46,7 @@ namespace Maestro {
         }\r
 \r
         private void CreateForms() {\r
-            string[] files = Directory.GetFiles("./Resources", "*.json");\r
+            string[] files = Directory.GetFiles("./Configuration", "*.json");\r
             if (files.Length == 0) {\r
                 MessageBox.Show("Hiányos konfiguráció!");\r
                 Application.Exit();\r

diff --git a/client/Maestro/Targets/FXPTargetProcessor.cs b/client/Maestro/Targets/FXPTargetProcessor.cs
index 69780a7805dc2489bb25b37fb0b7fabf7f6990eb..5c715a0ac6a73db1499703e202b4360b77fbbdb1 100644 (file)
--- a/client/Maestro/Targets/FXPTargetProcessor.cs
+++ b/client/Maestro/Targets/FXPTargetProcessor.cs
@@ -27,7 +27,7 @@ namespace Maestro.Targets {
 \r
             try {\r
                 sourceFTP = CreateClient(sourceConfig.Remote);\r
-                long ilength = sourceFTP.GetFileSize(inputUri.AbsolutePath);\r
+                long ilength = sourceFTP.GetFileSize(inputUri.AbsolutePath) / 2;\r
 \r
                 FtpReply replyPASV = targetFTP.Execute("PASV");\r
                 if (!replyPASV.Success)\r
@@ -46,7 +46,7 @@ namespace Maestro.Targets {
                 if (!sourceReplyTYPE.Success)\r
                     throw new Exception(sourceReplyTYPE.ErrorMessage);\r
 \r
-                FtpReply replyRETR = sourceFTP.Execute("RETR " + inputUri.AbsolutePath);\r
+                FtpReply replyRETR = sourceFTP.Execute("RETR " + inputUri.AbsolutePath.Replace("/", ""));\r
                 if (!replyRETR.Success) {\r
 \r
                     replyRETR = sourceFTP.Execute("RETR " + inputUri.Segments[inputUri.Segments.Length - 1]);\r
@@ -70,10 +70,16 @@ namespace Maestro.Targets {
                 if (!monitorFTP.FileExists(OutputName))\r
                     throw new Exception("A cél állomány nem jött létre.");\r
                 long overall = 0;\r
+                long lastSize = 0;\r
                 while (overall != ilength) {\r
                     overall = monitorFTP.GetFileSize(OutputName);\r
-                    Progress = (int)((double)overall / ilength * 100);\r
-                    Thread.Sleep(100);\r
+                    if (overall == lastSize) {\r
+                        Progress = 100;\r
+                        break;\r
+                    } else {\r
+                        Progress = (int)((double)overall / ilength  * 100);\r
+                    }\r
+                    Thread.Sleep(300);\r
                 }\r
 \r
             }\r