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

diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json
index 96cda96cd811408f6832dd5918ca8638a763b0e7..3a7010ad237a4faf2f171b13cf45ddf405c1dafe 100644 (file)
--- a/client/Maestro/Configuration/configuration-nle.json
+++ b/client/Maestro/Configuration/configuration-nle.json
@@ -31,15 +31,20 @@
           "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
           "timeout": 1000\r
         },\r
-        "projectRoot": {\r
-          "address": "file://10.10.1.100/BRAAVOS/OCTOPUS",\r
-          "userName": "mediacube",\r
-          "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
-          "timeout": 1000\r
-        },\r
         "templateName": "ALAPTIMELINE.ezp",\r
-        "projectName": "%ID%-%TEXT%",\r
-        "projectFormat": "%IDROOT%-%TEXT%/PROJECT",\r
+        "target": {\r
+          "label": "Projekt létrehozása",\r
+          "processor": "UNCTargetProcessor",\r
+          "outputFormat": "%ID%-%TEXT%",\r
+          "subFolderFormat": "%IDROOT%-%TEXT%/PROJECT",\r
+          "disableFileVersioning": true,\r
+          "remote": {\r
+            "address": "file://10.10.1.100/BRAAVOS/.MAESTRO",\r
+            "userName": "mediacube",\r
+            "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
+            "timeout": 1000\r
+          }\r
+        },\r
         "disableProject": false,\r
         "disableSourceOpen": false\r
       }\r

diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs
index 72cdd087a7f0840373f51ec7da6041f1284394d2..432ff07e2efd5a67c25cd207d4e877be16f82336 100644 (file)
--- a/client/Maestro/MaestroForm.Target.cs
+++ b/client/Maestro/MaestroForm.Target.cs
@@ -86,7 +86,8 @@ namespace Maestro {
                     break;\r
                 }\r
                 TargetProcessorParameter processorParameter = CreateProcessorParameter(target, sourceItem);\r
-                ITargetProcessor processor = CreateProcessor(target, processorParameter);\r
+                ITargetProcessor processor = TargetProcessor.Create(target.Processor);\r
+                processor.Initialize(this, processorParameter);\r
                 if (result == null)\r
                     result = new List<ITargetProcessor>();\r
                 result.Add(processor);\r
@@ -140,14 +141,6 @@ namespace Maestro {
             return true;\r
         }\r
 \r
-        private ITargetProcessor CreateProcessor(Target target, TargetProcessorParameter processorParameter) {\r
-            string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, target.Processor);\r
-            Type type = typeof(ITargetProcessor).Assembly.GetType(typeName);\r
-            ITargetProcessor result = Activator.CreateInstance(type) as ITargetProcessor;\r
-            result.Initialize(this, processorParameter);\r
-            return result;\r
-        }\r
-\r
         private TargetProcessorParameter CreateProcessorParameter(Target target, ISourceItem sourceItem) {\r
             return new TargetProcessorParameter() {\r
                 MediaCubeApi = mediaCubeApi,\r

diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs
index df62d60862f2f6ed3e05c7a085e9e0f31a804601..ac1a97613edca48967c30a4ac8926557833e8e4c 100644 (file)
--- a/client/MaestroShared/Configuration/ConfigurationInfo.cs
+++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs
@@ -110,19 +110,15 @@ namespace MaestroShared.Configuration {
 \r
     public class ProjectSettings {\r
         public Connection TemplateRoot { get; set; }\r
-        public Connection ProjectRoot { get; set; }\r
+        public Target Target { get; set; }\r
         public string TemplateName { get; set; }\r
-        public string ProjectName { get; set; }\r
-        public string ProjectFormat { get; set; }\r
         public bool DisableProject { get; set; }\r
         public bool DisableSourceOpen { get; set; }\r
         public bool IsValid {\r
             get {\r
-                return TemplateRoot != null && TemplateRoot.Address != null &&\r
-                    ProjectRoot != null && ProjectRoot.Address != null &&\r
-                    !String.IsNullOrEmpty(TemplateName) &&\r
-                    !String.IsNullOrEmpty(ProjectName) &&\r
-                    !String.IsNullOrEmpty(ProjectFormat);\r
+                return Target?.Remote?.Address != null &&\r
+                    TemplateRoot?.Address != null &&\r
+                    !String.IsNullOrEmpty(TemplateName);\r
             }\r
         }\r
     }\r

diff --git a/client/MaestroShared/Targets/TargetProcessor.cs b/client/MaestroShared/Targets/TargetProcessor.cs
index f3399ef6495556bc5fca67f28cca194b8bfb8d15..877d3a859463ea492385c5ca7df3decb8ce4b767 100644 (file)
--- a/client/MaestroShared/Targets/TargetProcessor.cs
+++ b/client/MaestroShared/Targets/TargetProcessor.cs
@@ -31,6 +31,12 @@ namespace MaestroShared.Targets {
 \r
         public event PropertyChangedEventHandler PropertyChanged;\r
 \r
+        public static ITargetProcessor Create(string processorName) {\r
+            string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, processorName);\r
+            Type type = typeof(ITargetProcessor).Assembly.GetType(typeName);\r
+            return Activator.CreateInstance(type) as ITargetProcessor;\r
+        }\r
+\r
         public virtual void Initialize(Control parent, TargetProcessorParameter parameters) {\r
             this.parent = parent;\r
             this.Parameters = parameters;\r

diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs
index a237136308a83ec6143331d8baaf48b6d38b354a..ac48deb8669e77b38dce3823e628b2811b90ce54 100644 (file)
--- a/client/OctopusClient/OctopusIDSelector.cs
+++ b/client/OctopusClient/OctopusIDSelector.cs
@@ -417,20 +417,14 @@ namespace OctopusClient {
                     Local = projectConfiguration.TemplateRoot,\r
                     Remote = projectConfiguration.TemplateRoot\r
                 },\r
-                TargetConfig = new Target() {\r
-                    Remote = projectConfiguration.ProjectRoot,\r
-                    OutputFormat = projectConfiguration.ProjectName,\r
-                    SubFolderFormat = projectConfiguration.ProjectFormat,\r
-                    DisableFileVersioning = true,\r
-                    DisableOverride = true\r
-                },\r
+                TargetConfig = projectConfiguration.Target,\r
                 ID = node.Name,\r
                 MetadataText = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}"),\r
                 InputFileName = projectConfiguration.TemplateName,\r
                 UserName = parameters.UserName,\r
             };\r
 \r
-            ITargetProcessor processor = new UNCTargetProcessor();\r
+            ITargetProcessor processor = TargetProcessor.Create(projectConfiguration.Target.Processor);\r
             processor.Initialize(null, processorParameter);\r
             processor.Execute();\r
 \r