From c4f6d8bd4495ad7ec2ca0ffe9343525ab5f8c992 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 31 May 2021 21:56:33 +0800 Subject: [PATCH] Imporve install-libs command --- .../Volo/Abp/Cli/Commands/InstallLibsCommand.cs | 2 +- .../Volo/Abp/Cli/LIbs/IInstallLibsService.cs | 2 +- .../Volo/Abp/Cli/LIbs/InstallLibsService.cs | 13 +++++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/InstallLibsCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/InstallLibsCommand.cs index 36db14856f..dc3e67fe29 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/InstallLibsCommand.cs +++ b/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() diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/IInstallLibsService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/IInstallLibsService.cs index af96df6e22..b0b05f35da 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/IInstallLibsService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/IInstallLibsService.cs @@ -4,6 +4,6 @@ namespace Volo.Abp.Cli.LIbs { public interface IInstallLibsService { - Task InstallLibs(string directory); + Task InstallLibsAsync(string directory); } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs index 7416859486..bf84e4863c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs +++ b/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 const string LibsDirectory = "./wwwroot/libs"; + public ILogger Logger { get; set; } private readonly IJsonSerializer _jsonSerializer; @@ -26,7 +28,7 @@ namespace Volo.Abp.Cli.LIbs Logger = NullLogger.Instance; } - public async Task InstallLibs(string directory) + public async Task InstallLibsAsync(string directory) { var projectFiles = Directory.GetFiles(directory, "*.csproj"); if (!projectFiles.Any()) @@ -65,7 +67,7 @@ namespace Volo.Abp.Cli.LIbs var mappingFiles = Directory.GetFiles(fileDirectory, "abp.resourcemapping.js", SearchOption.AllDirectories); var resourceMapping = new ResourceMapping { - Clean = new List {"./wwwroot/libs"} + Clean = new List {LibsDirectory} }; foreach (var mappingFile in mappingFiles) @@ -92,10 +94,17 @@ namespace Volo.Abp.Cli.LIbs } } + EnsureLibsFolderExists(fileDirectory, LibsDirectory); + CleanDirsAndFiles(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) { foreach (var mapping in resourceMapping.Mappings)