Browse Source

refactor CLI new command for tiered option

pull/3236/head
Alper Ebicoglu 7 years ago
parent
commit
d72dbb994e
  1. 26
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
  2. 4
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs

26
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@ -55,6 +55,12 @@ namespace Volo.Abp.Cli.Commands
Logger.LogInformation("Version: " + version);
}
var isTiered = commandLineArgs.Options.ContainsKey(Options.Tiered.Long);
if (isTiered)
{
Logger.LogInformation("Tiered: yes");
}
var databaseProvider = GetDatabaseProvider(commandLineArgs);
if (databaseProvider != DatabaseProvider.NotSpecified)
{
@ -96,14 +102,9 @@ namespace Volo.Abp.Cli.Commands
var outputFolderRoot =
outputFolder != null ? Path.GetFullPath(outputFolder) : Directory.GetCurrentDirectory();
if (createSolutionFolder)
{
outputFolder = Path.Combine(outputFolderRoot, SolutionName.Parse(projectName).FullName);
}
else
{
outputFolder = outputFolderRoot;
}
outputFolder = createSolutionFolder ?
Path.Combine(outputFolderRoot, SolutionName.Parse(projectName).FullName) :
outputFolderRoot;
if (!Directory.Exists(outputFolder))
{
@ -232,7 +233,7 @@ namespace Volo.Abp.Cli.Commands
}
}
private UiFramework GetUiFramework(CommandLineArgs commandLineArgs)
protected virtual UiFramework GetUiFramework(CommandLineArgs commandLineArgs)
{
var optionValue = commandLineArgs.Options.GetOrNull(Options.UiFramework.Short, Options.UiFramework.Long);
switch (optionValue)
@ -248,7 +249,7 @@ namespace Volo.Abp.Cli.Commands
}
}
private MobileApp GetMobilePreference(CommandLineArgs commandLineArgs)
protected virtual MobileApp GetMobilePreference(CommandLineArgs commandLineArgs)
{
var optionValue = commandLineArgs.Options.GetOrNull(Options.Mobile.Short, Options.Mobile.Long);
switch (optionValue)
@ -316,6 +317,11 @@ namespace Volo.Abp.Cli.Commands
public const string Short = "csf";
public const string Long = "create-solution-folder";
}
public static class Tiered
{
public const string Long = "tiered";
}
}
}
}

4
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs

@ -82,7 +82,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
// Exclude unwanted or known options.
var options = args.ExtraProperties
.Where(x => !x.Key.Equals(CliConsts.Command, StringComparison.InvariantCultureIgnoreCase))
.Where(x => !x.Key.Equals("tiered", StringComparison.InvariantCultureIgnoreCase))
.Where(x => !x.Key.Equals(NewCommand.Options.Tiered.Long, StringComparison.InvariantCultureIgnoreCase))
.Where(x => !x.Key.Equals(NewCommand.Options.DatabaseProvider.Long, StringComparison.InvariantCultureIgnoreCase) &&
!x.Key.Equals(NewCommand.Options.DatabaseProvider.Short, StringComparison.InvariantCultureIgnoreCase))
.Where(x => !x.Key.Equals(NewCommand.Options.OutputFolder.Long, StringComparison.InvariantCultureIgnoreCase) &&
@ -102,7 +102,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
Tool = Options.ToolName,
Command = args.ExtraProperties.ContainsKey(CliConsts.Command) ? args.ExtraProperties[CliConsts.Command] : "",
DatabaseProvider = args.DatabaseProvider.ToProviderName(),
IsTiered = args.ExtraProperties.ContainsKey("tiered"),
IsTiered = args.ExtraProperties.ContainsKey(NewCommand.Options.Tiered.Long),
UiFramework = args.UiFramework.ToFrameworkName(),
Options = JsonSerializer.Serialize(options),
ProjectName = args.SolutionName.FullName,

Loading…
Cancel
Save