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

diff --git a/client/MaestroShared/Targets/FTPTargetProcessor.cs b/client/MaestroShared/Targets/FTPTargetProcessor.cs
index cced4b4bb3f062a381c36613beb22d82cbcde1cc..d0fc6eb09f510073c99d544918629ac7ac8556ec 100644 (file)
--- a/client/MaestroShared/Targets/FTPTargetProcessor.cs
+++ b/client/MaestroShared/Targets/FTPTargetProcessor.cs
@@ -22,7 +22,12 @@ namespace MaestroShared.Targets {
             FtpTrace.LogFunctions = false;\r
             if (!(parameters.SourceConfig is UNCSource)) {\r
                 inputFile = null;\r
-                Uri inputUri = new Uri(String.Format(PATTERN_CONCAT, parameters.SourceConfig.Remote.Address, parameters.InputFileName));\r
+                string address = parameters?.SourceConfig?.Remote?.Address.ToString();\r
+                if (address == null)\r
+                    throw new Exception("Missing 'source.remote' parameter.");\r
+                if (!SLASH.Equals(address[address.Length - 1]))\r
+                    address = address + SLASH;\r
+                Uri inputUri = new Uri(new Uri(address.ToString()), parameters.InputFileName);\r
                 Input = inputUri.ToString();\r
             }\r
         }\r

diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs
index 5e64ef2a85296ccb649ddd64acd6b5c326d3eba7..ad0af0e2c03f8415297ff57686bb06277a3164c4 100644 (file)
--- a/client/MaestroShared/Targets/UNCTargetProcessor.cs
+++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs
@@ -174,7 +174,7 @@ namespace MaestroShared.Targets {
                 MetadataType = Parameters.MetadataKind,\r
                 Segments = Parameters.MovieSegments\r
             };\r
-            \r
+\r
         }\r
 \r
         private void UploadNexioMetadata() {\r
@@ -236,7 +236,7 @@ namespace MaestroShared.Targets {
 \r
         private void SendWorkFlowAction() {\r
             try {\r
-                Parameters.MediaCubeApi.Create<WorkflowAction>(workFlowAction);\r
+                Parameters?.MediaCubeApi?.Create<WorkflowAction>(workFlowAction);\r
             }\r
             catch (Exception e) {\r
                 MessageBox.Show(parent, e.Message);\r
@@ -257,34 +257,33 @@ namespace MaestroShared.Targets {
 \r
         protected string DetermineWorkingDirectory(Connection connection) {\r
             string result = Slash(connection.Address.LocalPath);\r
-            if (!String.IsNullOrEmpty(Parameters.TargetConfig.SubFolderFormat)) {\r
-                string subFolderName = Slash(GetDynamicText(Parameters.TargetConfig.SubFolderFormat));\r
-                string pattern = subFolderName;\r
-                string searchPath = result;\r
-                if (pattern.Contains(SLASH)) {\r
-                    string[] segments = pattern.Split(SLASH[0]);\r
-                    pattern = segments[segments.Length - 1];\r
-                    searchPath = Slash(Path.Combine(result, subFolderName.Substring(0, subFolderName.Length - pattern.Length - 1)));\r
-                }\r
-                int p = pattern.IndexOf(HYPHEN);\r
-                int o = pattern.IndexOf(UNDERSCORE);\r
-                if (p > -1 || o > -1) {\r
-                    if (p < o && p > -1)\r
-                        pattern = pattern.Substring(0, p);\r
-                    else\r
-                        pattern = pattern.Substring(0, o);\r
-\r
-                    pattern += STAR;\r
-                    string searchResult = SearchDirectory(searchPath, pattern);\r
-                    if (searchResult == null)\r
-                        result = Slash(Path.Combine(result, subFolderName));\r
-                    else\r
-                        result = Slash(Path.Combine(result, searchResult));\r
-                } else\r
-                    result = Slash(Path.Combine(connection.Address.LocalPath, subFolderName));\r
+            if (String.IsNullOrEmpty(Parameters.TargetConfig.SubFolderFormat))\r
+                return result;\r
+            string subFolderName = Slash(GetDynamicText(Parameters.TargetConfig.SubFolderFormat));\r
+            string pattern = subFolderName;\r
+            string searchPath = result;\r
+            if (pattern.Contains(SLASH)) {\r
+                string[] segments = pattern.Split(SLASH[0]);\r
+                pattern = segments[segments.Length - 1];\r
+                searchPath = Slash(Path.Combine(result, subFolderName.Substring(0, subFolderName.Length - pattern.Length - 1)));\r
             }\r
+            int p = pattern.IndexOf(HYPHEN);\r
+            int o = pattern.IndexOf(UNDERSCORE);\r
+            if (p > -1 || o > -1) {\r
+                if (p < o && p > -1)\r
+                    pattern = pattern.Substring(0, p);\r
+                else\r
+                    pattern = pattern.Substring(0, o);\r
+                pattern += STAR;\r
+                string searchResult = SearchDirectory(searchPath, pattern);\r
+                if (searchResult == null)\r
+                    result = Slash(Path.Combine(result, subFolderName));\r
+                else\r
+                    result = Slash(Path.Combine(result, searchResult));\r
+            } else\r
+                result = Slash(Path.Combine(connection.Address.LocalPath, subFolderName));\r
 \r
-            return result.Replace(BACKSLASH, SLASH);\r
+            return result;\r
         }\r
 \r
         private DateTime GetKillDate() {\r

diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs
index ac5964f6f938bdf4394dd74a9fb0a0e3ab3cc026..ac785efebe7bb7a694839603b5d0148fa1d90a1d 100644 (file)
--- a/client/OctopusClient/OctopusIDSelector.cs
+++ b/client/OctopusClient/OctopusIDSelector.cs
@@ -419,7 +419,8 @@ namespace OctopusClient {
 \r
             TargetProcessorParameter processorParameter = new TargetProcessorParameter() {\r
                 SourceConfig = new Source() {\r
-                    Local = projectConfiguration.TemplateRoot\r
+                    Local = projectConfiguration.TemplateRoot,\r
+                    Remote = projectConfiguration.TemplateRoot\r
                 },\r
                 TargetConfig = new Target() {\r
                     Remote = projectConfiguration.ProjectRoot,\r