From: elgekko <vasary@elgekko.net>
Date: Mon, 22 May 2023 10:16:33 +0000 (+0200)
Subject: Nagy file FXP ateneti nev hasznalataval hibat dob
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=00736609b3534aa3c2e75cd0afd4b362a16f0ccc;p=mediacube.git

Nagy file FXP ateneti nev hasznalataval hibat dob
---

diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs
index ebd037d0..94f2a3ed 100644
--- a/client/Maestro/Properties/AssemblyInfo.cs
+++ b/client/Maestro/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.1.8")]
-[assembly: AssemblyFileVersion("2.1.1.8")]
+[assembly: AssemblyVersion("2.1.1.9")]
+[assembly: AssemblyFileVersion("2.1.1.9")]
diff --git a/client/MaestroShared/Properties/AssemblyInfo.cs b/client/MaestroShared/Properties/AssemblyInfo.cs
index 5da145e3..5ad59bc4 100644
--- a/client/MaestroShared/Properties/AssemblyInfo.cs
+++ b/client/MaestroShared/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.1.1")]
-[assembly: AssemblyFileVersion("2.1.1.1")]
+[assembly: AssemblyVersion("2.1.1.2")]
+[assembly: AssemblyFileVersion("2.1.1.2")]
diff --git a/client/MaestroShared/Targets/FTPTargetProcessor.cs b/client/MaestroShared/Targets/FTPTargetProcessor.cs
index 3949546d..895641c8 100644
--- a/client/MaestroShared/Targets/FTPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FTPTargetProcessor.cs
@@ -175,7 +175,7 @@ namespace MaestroShared.Targets {
                 InternetProtocolVersions = FtpIpVersion.IPv4,
                 UploadDataType = FtpDataType.Binary,
                 DownloadDataType = FtpDataType.Binary,
-                Credentials = new NetworkCredential(connection.UserName, connection.Password),
+                Credentials = new NetworkCredential(connection.UserName, connection.Password)
             };
             result.Connect();
             return result;
diff --git a/client/MaestroShared/Targets/FXPTargetProcessor.cs b/client/MaestroShared/Targets/FXPTargetProcessor.cs
index d17f0a41..76d12094 100644
--- a/client/MaestroShared/Targets/FXPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FXPTargetProcessor.cs
@@ -83,7 +83,7 @@ namespace MaestroShared.Targets {
                 targetFTP.Command("TYPE I");
 
                 string currentWorkingDir = targetFTP.GetWorkingDirectory();
-                logger.Debug("Current target working directory is {0}", currentWorkingDir);
+                logger.Info("Current target working directory is {0}", currentWorkingDir);
 
                 string targetFilePath = OutputName;
                 bool useTemporaryName = !targetFTP.IsNexio() && Parameters.TargetConfig.TemporaryCopy;
@@ -119,15 +119,43 @@ namespace MaestroShared.Targets {
                     Thread.Sleep(500);
                 }
 
+                logger.Info("Upload completed for {0}", Input);
                 var sreply = sourceFTP.GetReply();
                 logger.Info("Source last reply is {0}", sreply.Message);
 
-                var treply = targetFTP.GetReply();
-                logger.Info("Target last reply is {0}", treply.Message);
+                try
+                {
+                    Thread.Sleep(500);
+                    var treply = targetFTP.GetReply();
+                    logger.Info("Target last reply is {0}", treply.Message);
+                }
+                catch (Exception e1){
+                    logger.Warn("Can't query target.");
+                }
 
                 if (useTemporaryName) {
+                    logger.Info("Temporary target used, rename required. From {0}, to {1}, in {2}", targetFilePath, OutputName, currentWorkingDir);
+
+                    try
+                    {
+                        targetFTP.Disconnect();
+                    }
+                    catch (Exception e)
+                    {
+                        logger.Error(e.Message);
+                    }
+                    try
+                    {
+                        targetFTP = CreateClient(Parameters.TargetConfig.Remote);
+                        targetFTP.SetWorkingDirectory(currentWorkingDir);
+                    }
+                    catch (Exception e)
+                    {
+                        logger.Error(e.Message);
+                    }
+
                     if (!targetFTP.MoveFile(targetFilePath, OutputName))
-                        throw new Exception(UPLOAD_ERROR);
+                        throw new Exception("A fájl átnevezése a célrendszerben sikertelen!");
                 }
             } catch (Exception e) {
                 throw e;