Browse Source

Imporve install-libs command

pull/9198/head
liangshiwei 5 years ago
parent
commit
c4f6d8bd44
  1. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/InstallLibsCommand.cs
  2. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/IInstallLibsService.cs
  3. 13
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/InstallLibsCommand.cs

@ -40,7 +40,7 @@ namespace Volo.Abp.Cli.Commands
); );
} }
await InstallLibsService.InstallLibs(workingDirectory); await InstallLibsService.InstallLibsAsync(workingDirectory);
} }
public string GetUsageInfo() public string GetUsageInfo()

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/IInstallLibsService.cs

@ -4,6 +4,6 @@ namespace Volo.Abp.Cli.LIbs
{ {
public interface IInstallLibsService public interface IInstallLibsService
{ {
Task InstallLibs(string directory); Task InstallLibsAsync(string directory);
} }
} }

13
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs

@ -16,6 +16,8 @@ namespace Volo.Abp.Cli.LIbs
{ {
public class InstallLibsService : IInstallLibsService, ITransientDependency public class InstallLibsService : IInstallLibsService, ITransientDependency
{ {
public const string LibsDirectory = "./wwwroot/libs";
public ILogger<InstallLibsService> Logger { get; set; } public ILogger<InstallLibsService> Logger { get; set; }
private readonly IJsonSerializer _jsonSerializer; private readonly IJsonSerializer _jsonSerializer;
@ -26,7 +28,7 @@ namespace Volo.Abp.Cli.LIbs
Logger = NullLogger<InstallLibsService>.Instance; Logger = NullLogger<InstallLibsService>.Instance;
} }
public async Task InstallLibs(string directory) public async Task InstallLibsAsync(string directory)
{ {
var projectFiles = Directory.GetFiles(directory, "*.csproj"); var projectFiles = Directory.GetFiles(directory, "*.csproj");
if (!projectFiles.Any()) if (!projectFiles.Any())
@ -65,7 +67,7 @@ namespace Volo.Abp.Cli.LIbs
var mappingFiles = Directory.GetFiles(fileDirectory, "abp.resourcemapping.js", SearchOption.AllDirectories); var mappingFiles = Directory.GetFiles(fileDirectory, "abp.resourcemapping.js", SearchOption.AllDirectories);
var resourceMapping = new ResourceMapping var resourceMapping = new ResourceMapping
{ {
Clean = new List<string> {"./wwwroot/libs"} Clean = new List<string> {LibsDirectory}
}; };
foreach (var mappingFile in mappingFiles) foreach (var mappingFile in mappingFiles)
@ -92,10 +94,17 @@ namespace Volo.Abp.Cli.LIbs
} }
} }
EnsureLibsFolderExists(fileDirectory, LibsDirectory);
CleanDirsAndFiles(fileDirectory, resourceMapping); CleanDirsAndFiles(fileDirectory, resourceMapping);
CopyResourcesToLibs(fileDirectory, resourceMapping); CopyResourcesToLibs(fileDirectory, resourceMapping);
} }
private void EnsureLibsFolderExists(string fileDirectory, string libsDirectory)
{
Directory.CreateDirectory(Path.Combine(fileDirectory, libsDirectory));
}
private void CopyResourcesToLibs(string fileDirectory, ResourceMapping resourceMapping) private void CopyResourcesToLibs(string fileDirectory, ResourceMapping resourceMapping)
{ {
foreach (var mapping in resourceMapping.Mappings) foreach (var mapping in resourceMapping.Mappings)

Loading…
Cancel
Save