From 9ab889f7db4287c70ce46ea09d74a60173af70df Mon Sep 17 00:00:00 2001 From: Roger Far Date: Thu, 21 Jan 2021 09:22:01 -0700 Subject: [PATCH] Clean temp files on startup. --- server/RdtClient.Service/Services/Settings.cs | 30 +++++++++++++++---- server/RdtClient.Web/Startup.cs | 4 ++- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/server/RdtClient.Service/Services/Settings.cs b/server/RdtClient.Service/Services/Settings.cs index 9d0d54d..eed52ec 100644 --- a/server/RdtClient.Service/Services/Settings.cs +++ b/server/RdtClient.Service/Services/Settings.cs @@ -19,6 +19,7 @@ namespace RdtClient.Service.Services Task TestPath(String path); Task TestDownloadSpeed(CancellationToken cancellationToken); Task TestWriteSpeed(); + void Clean(); } public class Settings : ISettings @@ -133,12 +134,7 @@ namespace RdtClient.Service.Services File.Delete(testFilePath); } - var files = Directory.GetFiles(tempPath, "*.dsc", SearchOption.TopDirectoryOnly); - - foreach (var file in files) - { - File.Delete(file); - } + Clean(); return downloadClient.Speed; } @@ -186,5 +182,27 @@ namespace RdtClient.Service.Services return writeSpeed; } + + public void Clean() + { + try + { + var tempPath = GetString("TempPath").Result; + + if (!String.IsNullOrWhiteSpace(tempPath)) + { + var files = Directory.GetFiles(tempPath, "*.dsc", SearchOption.TopDirectoryOnly); + + foreach (var file in files) + { + File.Delete(file); + } + } + } + catch + { + // ignored + } + } } } diff --git a/server/RdtClient.Web/Startup.cs b/server/RdtClient.Web/Startup.cs index fc78227..f02e8e9 100644 --- a/server/RdtClient.Web/Startup.cs +++ b/server/RdtClient.Web/Startup.cs @@ -91,7 +91,7 @@ namespace RdtClient.Web Service.DiConfig.Config(services); } - public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILogger logger) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILogger logger, ISettings settings) { if (env.IsDevelopment()) { @@ -133,6 +133,8 @@ namespace RdtClient.Web spa.Options.DefaultPage = "/index.html"; }); }); + + settings.Clean(); } } } \ No newline at end of file