FTP target file felulirodik verziozas helyett

diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json
index bcc10ebff71a7bb8ce06b6c362ca77a8bf9d6f2a..1e7e988ba4bee0a86564d0196d360a3d221ba08a 100644 (file)
--- a/client/Maestro/Configuration/dev-local.json
+++ b/client/Maestro/Configuration/dev-local.json
@@ -27,21 +27,37 @@
     }\r
   },\r
   "metadatas": [\r
+    {\r
+      "$type": "TrafficMetadata",\r
+      "server": {\r
+        "address": "Data Source=localvm;Initial Catalog=PA_Echo;Persist Security Info=True;",\r
+        "userName": "MAM",\r
+        "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",\r
+        "timeout": 1000\r
+      }\r
+    },\r
     {\r
       "$type": "OctopusMetadata",\r
       "disabled": false,\r
       "server": {\r
-        "address": "http://192.168.224.128:9090/services/rest/octopus/",\r
+        "address": "http://localvm:9090/services/rest/octopus/",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "$type": "MediaCubeMetadata",\r
+      "server": {\r
+        "address": "http://localvm:9090/services/rest/jobengine/",\r
         "timeout": 1000\r
       }\r
     }\r
+\r
   ],\r
   "targets": [\r
     {\r
       "label": "Target1",\r
       "processor": "UNCTargetProcessor",\r
       "outputFormat": "%ID%",\r
-      "reference": [ "AUTOTARGET" ],\r
       "remote": {\r
         "address": "file://c:/_video/t1"\r
       }\r
@@ -55,6 +71,35 @@
         "address": "file://c:/_video/t2"\r
       }\r
     },\r
+    {\r
+      "label": "Local FTP to subfolder",\r
+      "processor": "FTPTargetProcessor",\r
+      "outputFormat": "#%ID%-%SOURCENAME%",\r
+      "tag": "Betöltés",\r
+      "subFolderFormat": "FIXED",\r
+      "killDateDays": 15,\r
+      "saveArchiveMetadata": false,\r
+      "remote": {\r
+        "address": "ftp://localhost:21",\r
+        "userName": "dani",\r
+        "password": "6WPklXCjKTRluQOA2OLdF/Hed10EScNkWRQJR2pEQyrtXhpqrKeGxFeqrqQZaOhjgonaQ5deY2hHDh+IrsxAnZ6btG4budLjluR/7My3fwDN1Zn8gquGNWps4D+zRbeZ",\r
+        "timeout": 1000\r
+      }\r
+    },\r
+    {\r
+      "label": "Local FTP",\r
+      "processor": "FTPTargetProcessor",\r
+      "outputFormat": "%ID%-%SOURCENAME%",\r
+      "tag": "Betöltés",\r
+      "killDateDays": 15,\r
+      "saveArchiveMetadata": false,\r
+      "remote": {\r
+        "address": "ftp://localhost:21",\r
+        "userName": "dani",\r
+        "password": "6WPklXCjKTRluQOA2OLdF/Hed10EScNkWRQJR2pEQyrtXhpqrKeGxFeqrqQZaOhjgonaQ5deY2hHDh+IrsxAnZ6btG4budLjluR/7My3fwDN1Zn8gquGNWps4D+zRbeZ",\r
+        "timeout": 1000\r
+      }\r
+    },\r
     {\r
       "label": "AUTOTARGET",\r
       "processor": "UNCTargetProcessor",\r

diff --git a/client/Maestro/Maestro.csproj.user b/client/Maestro/Maestro.csproj.user
index 8552cf8964514a7410ca984b3e7dac6fc83a1d93..d0275a49dbb1a3c863f2cf3c15dcce0f4f4c5375 100644 (file)
--- a/client/Maestro/Maestro.csproj.user
+++ b/client/Maestro/Maestro.csproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">\r
-    <StartArguments>nologin</StartArguments>\r
+    <StartArguments>nologin nosplash</StartArguments>\r
   </PropertyGroup>\r
 </Project>
\ No newline at end of file

diff --git a/client/Maestro/Sources/NexioRESTSource.cs b/client/Maestro/Sources/NexioRESTSource.cs
index 665484ecb86f4ec12a11be922346d9bb9351b01d..6dbb927fdceea4daaa972bc7551af9dfc4383483 100644 (file)
--- a/client/Maestro/Sources/NexioRESTSource.cs
+++ b/client/Maestro/Sources/NexioRESTSource.cs
@@ -13,6 +13,7 @@ using System.Diagnostics;
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
+using WebSocketSharp;\r
 \r
 namespace Maestro.Sources {\r
     class NexioRESTSource : BindingList<NexioSourceItem>, ISource {\r

diff --git a/client/MaestroShared/Commons/PatternNameMaker.cs b/client/MaestroShared/Commons/PatternNameMaker.cs
index 55205dee56fdeb02a4ed05451566d09367dab736..85aea923f7d8e675eeb6e63e85f19f9b68c1310a 100644 (file)
--- a/client/MaestroShared/Commons/PatternNameMaker.cs
+++ b/client/MaestroShared/Commons/PatternNameMaker.cs
@@ -31,7 +31,7 @@ namespace MaestroShared.Commons {
         private const string DATE_FORMAT_NODOTS = "yyyyMMdd";\r
         private const string HYPHEN = "-";\r
 \r
-        static private string Normalize(String s) {\r
+        static private string Normalize(string s) {\r
             string normalizedString = s.Normalize(NormalizationForm.FormD);\r
 \r
             StringBuilder stringBuilder = new StringBuilder();\r

diff --git a/client/MaestroShared/Targets/FTPTargetProcessor.cs b/client/MaestroShared/Targets/FTPTargetProcessor.cs
index b26e493bef81f7fd2c6028550ef0da0fa5761b84..3949546da951a4311c36f39135137ba03cd2278e 100644 (file)
--- a/client/MaestroShared/Targets/FTPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FTPTargetProcessor.cs
@@ -140,7 +140,8 @@ namespace MaestroShared.Targets {
         }\r
 \r
         protected override string GetOutputFilePath(string path, string fileName) {\r
-            return fileName;\r
+            return "/".Equals(workingDir) ? fileName : Path.Combine(path, fileName);\r
+//            return fileName;\r
         }\r
 \r
         protected override void EnsureDirectoryExistence(string path) {\r
@@ -159,8 +160,12 @@ namespace MaestroShared.Targets {
             IPAddress.TryParse(addr, out IPAddress ipaddress);\r
             if (ipaddress == null) {\r
                 IPHostEntry hostEntry = Dns.GetHostEntry(addr);\r
-                if (hostEntry != null && hostEntry.AddressList.Length > 0)\r
-                    addr = hostEntry.AddressList[0].ToString();\r
+                if (hostEntry != null && hostEntry.AddressList.Length > 0) {\r
+                    addr = hostEntry.AddressList.Where(a => a.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork).FirstOrDefault().ToString();\r
+                    if (addr == null) {\r
+                        throw new Exception("Nem található visszafejthető IPv4 cím");\r
+                    }\r
+                }\r
             }\r
 \r
             logger.Info("Remote address is {0}", addr);\r