From: Vásáry Dániel Date: Thu, 23 Nov 2017 22:12:04 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=c408361930700933b1f269180ed7aff72876b377;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30764 --- diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json index 96cda96c..3a7010ad 100644 --- a/client/Maestro/Configuration/configuration-nle.json +++ b/client/Maestro/Configuration/configuration-nle.json @@ -31,15 +31,20 @@ "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", "timeout": 1000 }, - "projectRoot": { - "address": "file://10.10.1.100/BRAAVOS/OCTOPUS", - "userName": "mediacube", - "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", - "timeout": 1000 - }, "templateName": "ALAPTIMELINE.ezp", - "projectName": "%ID%-%TEXT%", - "projectFormat": "%IDROOT%-%TEXT%/PROJECT", + "target": { + "label": "Projekt létrehozása", + "processor": "UNCTargetProcessor", + "outputFormat": "%ID%-%TEXT%", + "subFolderFormat": "%IDROOT%-%TEXT%/PROJECT", + "disableFileVersioning": true, + "remote": { + "address": "file://10.10.1.100/BRAAVOS/.MAESTRO", + "userName": "mediacube", + "password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy", + "timeout": 1000 + } + }, "disableProject": false, "disableSourceOpen": false } diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs index 72cdd087..432ff07e 100644 --- a/client/Maestro/MaestroForm.Target.cs +++ b/client/Maestro/MaestroForm.Target.cs @@ -86,7 +86,8 @@ namespace Maestro { break; } TargetProcessorParameter processorParameter = CreateProcessorParameter(target, sourceItem); - ITargetProcessor processor = CreateProcessor(target, processorParameter); + ITargetProcessor processor = TargetProcessor.Create(target.Processor); + processor.Initialize(this, processorParameter); if (result == null) result = new List(); result.Add(processor); @@ -140,14 +141,6 @@ namespace Maestro { return true; } - private ITargetProcessor CreateProcessor(Target target, TargetProcessorParameter processorParameter) { - string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, target.Processor); - Type type = typeof(ITargetProcessor).Assembly.GetType(typeName); - ITargetProcessor result = Activator.CreateInstance(type) as ITargetProcessor; - result.Initialize(this, processorParameter); - return result; - } - private TargetProcessorParameter CreateProcessorParameter(Target target, ISourceItem sourceItem) { return new TargetProcessorParameter() { MediaCubeApi = mediaCubeApi, diff --git a/client/MaestroShared/Configuration/ConfigurationInfo.cs b/client/MaestroShared/Configuration/ConfigurationInfo.cs index df62d608..ac1a9761 100644 --- a/client/MaestroShared/Configuration/ConfigurationInfo.cs +++ b/client/MaestroShared/Configuration/ConfigurationInfo.cs @@ -110,19 +110,15 @@ namespace MaestroShared.Configuration { public class ProjectSettings { public Connection TemplateRoot { get; set; } - public Connection ProjectRoot { get; set; } + public Target Target { get; set; } public string TemplateName { get; set; } - public string ProjectName { get; set; } - public string ProjectFormat { get; set; } public bool DisableProject { get; set; } public bool DisableSourceOpen { get; set; } public bool IsValid { get { - return TemplateRoot != null && TemplateRoot.Address != null && - ProjectRoot != null && ProjectRoot.Address != null && - !String.IsNullOrEmpty(TemplateName) && - !String.IsNullOrEmpty(ProjectName) && - !String.IsNullOrEmpty(ProjectFormat); + return Target?.Remote?.Address != null && + TemplateRoot?.Address != null && + !String.IsNullOrEmpty(TemplateName); } } } diff --git a/client/MaestroShared/Targets/TargetProcessor.cs b/client/MaestroShared/Targets/TargetProcessor.cs index f3399ef6..877d3a85 100644 --- a/client/MaestroShared/Targets/TargetProcessor.cs +++ b/client/MaestroShared/Targets/TargetProcessor.cs @@ -31,6 +31,12 @@ namespace MaestroShared.Targets { public event PropertyChangedEventHandler PropertyChanged; + public static ITargetProcessor Create(string processorName) { + string typeName = string.Format("{0}.{1}", typeof(ITargetProcessor).Namespace, processorName); + Type type = typeof(ITargetProcessor).Assembly.GetType(typeName); + return Activator.CreateInstance(type) as ITargetProcessor; + } + public virtual void Initialize(Control parent, TargetProcessorParameter parameters) { this.parent = parent; this.Parameters = parameters; diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs index a2371363..ac48deb8 100644 --- a/client/OctopusClient/OctopusIDSelector.cs +++ b/client/OctopusClient/OctopusIDSelector.cs @@ -417,20 +417,14 @@ namespace OctopusClient { Local = projectConfiguration.TemplateRoot, Remote = projectConfiguration.TemplateRoot }, - TargetConfig = new Target() { - Remote = projectConfiguration.ProjectRoot, - OutputFormat = projectConfiguration.ProjectName, - SubFolderFormat = projectConfiguration.ProjectFormat, - DisableFileVersioning = true, - DisableOverride = true - }, + TargetConfig = projectConfiguration.Target, ID = node.Name, MetadataText = String.IsNullOrEmpty(story.Format) ? story.Name : String.Format($"{story.Name}_{story.Format}"), InputFileName = projectConfiguration.TemplateName, UserName = parameters.UserName, }; - ITargetProcessor processor = new UNCTargetProcessor(); + ITargetProcessor processor = TargetProcessor.Create(projectConfiguration.Target.Processor); processor.Initialize(null, processorParameter); processor.Execute();