From e5579144595a457e06f87ad8540d1b28c387a319 Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Fri, 3 May 2019 16:35:32 +0300 Subject: [PATCH] Use user data folder for template cache and logging. --- .../src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs | 13 +++++++++++++ .../Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs | 3 ++- framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs | 3 ++- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs new file mode 100644 index 0000000000..b0296671b3 --- /dev/null +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliPaths.cs @@ -0,0 +1,13 @@ +using System; +using System.IO; + +namespace Volo.Abp.Cli +{ + public static class CliPaths + { + public static string TemplateCachePath => Path.Combine(AbpRootPath, "templates"); + public static string CliLogPath => Path.Combine(AbpRootPath, "cli", "logs"); + + private static readonly string AbpRootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".abp"); + } +} diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs index e81e7e414b..6f3956f604 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/AbpIoTemplateStore.cs @@ -3,6 +3,7 @@ using System.IO; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; +using Volo.Abp.Cli; using Volo.Abp.DependencyInjection; using Volo.Abp.IO; @@ -19,7 +20,7 @@ namespace Volo.Abp.ProjectBuilding public async Task GetAsync(string templateName, string version) { - var localCacheFolder = "C:\\Temp\\abp-template-cache\\" + version; + var localCacheFolder = Path.Combine(CliPaths.TemplateCachePath, version); DirectoryHelper.CreateIfNotExists(localCacheFolder); var localCacheFile = Path.Combine(localCacheFolder, templateName + ".zip"); diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs index 706dc91d47..02759655ff 100644 --- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs +++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using Serilog; using Serilog.Events; +using System.IO; using Volo.Abp.Threading; namespace Volo.Abp.Cli @@ -13,7 +14,7 @@ namespace Volo.Abp.Cli .MinimumLevel.Information() .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) .Enrich.FromLogContext() - //.WriteTo.File("Logs/logs.txt") //TODO: Write logs to a global path + .WriteTo.File(Path.Combine(CliPaths.CliLogPath, "abp-cli-logs.txt")) .WriteTo.Console() .CreateLogger();