From 56ace5cd58ad6812934226dba9b656a5a4165177 Mon Sep 17 00:00:00 2001
From: elgekko <vasary@elgekko.net>
Date: Fri, 24 Mar 2023 14:46:46 +0100
Subject: [PATCH] FTP target file felulirodik verziozas helyett

---
 client/Maestro/Configuration/dev-local.json   | 49 ++++++++++++++++++-
 client/Maestro/Maestro.csproj.user            |  2 +-
 client/Maestro/Sources/NexioRESTSource.cs     |  1 +
 .../MaestroShared/Commons/PatternNameMaker.cs |  2 +-
 .../Targets/FTPTargetProcessor.cs             | 11 +++--
 5 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/client/Maestro/Configuration/dev-local.json b/client/Maestro/Configuration/dev-local.json
index bcc10ebf..1e7e988b 100644
--- a/client/Maestro/Configuration/dev-local.json
+++ b/client/Maestro/Configuration/dev-local.json
@@ -27,21 +27,37 @@
     }
   },
   "metadatas": [
+    {
+      "$type": "TrafficMetadata",
+      "server": {
+        "address": "Data Source=localvm;Initial Catalog=PA_Echo;Persist Security Info=True;",
+        "userName": "MAM",
+        "password": "7RKZYBzumKjL40SJwuwiFCvX57xuCN8zay6OttUm2wbrgImyYZBHyZTUUYrXX31Ge2Uwew07HYsqh2uzdJeDBDwcVntxaHg3nIpv9Dyq/odVoiC4tUF/K+lgvKWANcrZ",
+        "timeout": 1000
+      }
+    },
     {
       "$type": "OctopusMetadata",
       "disabled": false,
       "server": {
-        "address": "http://192.168.224.128:9090/services/rest/octopus/",
+        "address": "http://localvm:9090/services/rest/octopus/",
+        "timeout": 1000
+      }
+    },
+    {
+      "$type": "MediaCubeMetadata",
+      "server": {
+        "address": "http://localvm:9090/services/rest/jobengine/",
         "timeout": 1000
       }
     }
+
   ],
   "targets": [
     {
       "label": "Target1",
       "processor": "UNCTargetProcessor",
       "outputFormat": "%ID%",
-      "reference": [ "AUTOTARGET" ],
       "remote": {
         "address": "file://c:/_video/t1"
       }
@@ -55,6 +71,35 @@
         "address": "file://c:/_video/t2"
       }
     },
+    {
+      "label": "Local FTP to subfolder",
+      "processor": "FTPTargetProcessor",
+      "outputFormat": "#%ID%-%SOURCENAME%",
+      "tag": "Betöltés",
+      "subFolderFormat": "FIXED",
+      "killDateDays": 15,
+      "saveArchiveMetadata": false,
+      "remote": {
+        "address": "ftp://localhost:21",
+        "userName": "dani",
+        "password": "6WPklXCjKTRluQOA2OLdF/Hed10EScNkWRQJR2pEQyrtXhpqrKeGxFeqrqQZaOhjgonaQ5deY2hHDh+IrsxAnZ6btG4budLjluR/7My3fwDN1Zn8gquGNWps4D+zRbeZ",
+        "timeout": 1000
+      }
+    },
+    {
+      "label": "Local FTP",
+      "processor": "FTPTargetProcessor",
+      "outputFormat": "%ID%-%SOURCENAME%",
+      "tag": "Betöltés",
+      "killDateDays": 15,
+      "saveArchiveMetadata": false,
+      "remote": {
+        "address": "ftp://localhost:21",
+        "userName": "dani",
+        "password": "6WPklXCjKTRluQOA2OLdF/Hed10EScNkWRQJR2pEQyrtXhpqrKeGxFeqrqQZaOhjgonaQ5deY2hHDh+IrsxAnZ6btG4budLjluR/7My3fwDN1Zn8gquGNWps4D+zRbeZ",
+        "timeout": 1000
+      }
+    },
     {
       "label": "AUTOTARGET",
       "processor": "UNCTargetProcessor",
diff --git a/client/Maestro/Maestro.csproj.user b/client/Maestro/Maestro.csproj.user
index 8552cf89..d0275a49 100644
--- a/client/Maestro/Maestro.csproj.user
+++ b/client/Maestro/Maestro.csproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <StartArguments>nologin</StartArguments>
+    <StartArguments>nologin nosplash</StartArguments>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/client/Maestro/Sources/NexioRESTSource.cs b/client/Maestro/Sources/NexioRESTSource.cs
index 665484ec..6dbb927f 100644
--- a/client/Maestro/Sources/NexioRESTSource.cs
+++ b/client/Maestro/Sources/NexioRESTSource.cs
@@ -13,6 +13,7 @@ using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
+using WebSocketSharp;
 
 namespace Maestro.Sources {
     class NexioRESTSource : BindingList<NexioSourceItem>, ISource {
diff --git a/client/MaestroShared/Commons/PatternNameMaker.cs b/client/MaestroShared/Commons/PatternNameMaker.cs
index 55205dee..85aea923 100644
--- 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";
         private const string HYPHEN = "-";
 
-        static private string Normalize(String s) {
+        static private string Normalize(string s) {
             string normalizedString = s.Normalize(NormalizationForm.FormD);
 
             StringBuilder stringBuilder = new StringBuilder();
diff --git a/client/MaestroShared/Targets/FTPTargetProcessor.cs b/client/MaestroShared/Targets/FTPTargetProcessor.cs
index b26e493b..3949546d 100644
--- a/client/MaestroShared/Targets/FTPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FTPTargetProcessor.cs
@@ -140,7 +140,8 @@ namespace MaestroShared.Targets {
         }
 
         protected override string GetOutputFilePath(string path, string fileName) {
-            return fileName;
+            return "/".Equals(workingDir) ? fileName : Path.Combine(path, fileName);
+//            return fileName;
         }
 
         protected override void EnsureDirectoryExistence(string path) {
@@ -159,8 +160,12 @@ namespace MaestroShared.Targets {
             IPAddress.TryParse(addr, out IPAddress ipaddress);
             if (ipaddress == null) {
                 IPHostEntry hostEntry = Dns.GetHostEntry(addr);
-                if (hostEntry != null && hostEntry.AddressList.Length > 0)
-                    addr = hostEntry.AddressList[0].ToString();
+                if (hostEntry != null && hostEntry.AddressList.Length > 0) {
+                    addr = hostEntry.AddressList.Where(a => a.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork).FirstOrDefault().ToString();
+                    if (addr == null) {
+                        throw new Exception("Nem található visszafejthető IPv4 cím");
+                    }
+                }
             }
 
             logger.Info("Remote address is {0}", addr);
-- 
2.54.0