Update x cleanup dir

This commit is contained in:
2023-09-14 15:05:05 +02:00
parent 781c1bc1dc
commit 4ecaae4867
2 changed files with 72 additions and 74 deletions
+58 -58
View File
@@ -14,6 +14,9 @@ namespace SMGen.Pages
#region Protected Fields
protected static Logger Log = LogManager.GetCurrentClassLogger();
protected bool _OrderByEvNxSt = false;
protected bool _OrderByEvSt = false;
protected bool _OrderByStEv = true;
protected SelectSMIn2EvParams currFilter = new SelectSMIn2EvParams();
protected DataPager? pagerSMIn2Ev = null!;
@@ -22,39 +25,19 @@ namespace SMGen.Pages
#region Protected Properties
protected bool CalcEmptyState { get; set; } = true;
protected bool CalcItself { get; set; } = false;
[Inject]
protected IConfiguration conf { get; set; } = null!;
[Inject]
protected IWebHostEnvironment env { get; set; } = null!;
protected string pathDir { get; set; } = "";
protected string pathFile { get; set; } = "";
protected Dictionary<string, FilesClass> Files { get; set; } = new Dictionary<string, FilesClass>();
protected int maxAllowedFiles { get; set; } = 100;
[Inject]
protected SMGDataService SMGDService { get; set; } = null!;
protected string statiCsvPath
{
get => conf.GetValue<string>("ServerConf:StatiCsvPath");
}
#endregion Protected Properties
#region Protected Methods
protected override async Task OnInitializedAsync()
{
await Task.Delay(1);
await SMGDService.ExecFlushRedisPattern(Constants.FILES_TO_PROC);
}
protected bool CalcItself { get; set; } = false;
protected bool CalcEmptyState { get; set; } = true;
protected bool _OrderByEvNxSt = false;
protected bool OrderByEvNxSt
{
get => _OrderByEvNxSt;
@@ -70,7 +53,21 @@ namespace SMGen.Pages
}
}
protected bool _OrderByStEv = true;
protected bool OrderByEvSt
{
get => _OrderByEvSt;
set
{
_OrderByEvSt = value;
if (value)
{
OrderType = Core.Enum.ORDERTYPE.eventState;
OrderByEvNxSt = false;
OrderByStEv = false;
}
}
}
protected bool OrderByStEv
{
get => _OrderByStEv;
@@ -85,23 +82,24 @@ namespace SMGen.Pages
}
}
}
protected bool _OrderByEvSt = false;
protected bool OrderByEvSt
{
get => _OrderByEvSt;
set
{
_OrderByEvSt = value;
if (value)
{
OrderType = Core.Enum.ORDERTYPE.eventState;
OrderByEvNxSt = false;
OrderByStEv = false;
}
}
}
protected Core.Enum.ORDERTYPE OrderType { get; set; } = Core.Enum.ORDERTYPE.stateEvent;
protected string pathDir { get; set; } = "";
protected string pathFile { get; set; } = "";
protected int resetSucc { get; set; } = 0;
[Inject]
protected SMGDataService SMGDService { get; set; } = null!;
protected string statiCsvPath
{
get => conf.GetValue<string>("ServerConf:StatiCsvPath");
}
#endregion Protected Properties
#region Protected Methods
protected void ForceReload(int newNum)
{
@@ -113,6 +111,12 @@ namespace SMGen.Pages
currPage = newNum;
}
protected override async Task OnInitializedAsync()
{
await Task.Delay(1);
await SMGDService.ExecFlushRedisPattern(Constants.FILES_TO_PROC);
}
protected async Task pgResetReq(bool doReset)
{
if (doReset)
@@ -177,15 +181,13 @@ namespace SMGen.Pages
foreach (string file in files)
{
FileInfo fi = new FileInfo(file);
if (fi.LastAccessTime < DateTime.Now.AddMinutes(-20))
if (fi.LastAccessTime < DateTime.Now.AddMinutes(-10))
{
fi.Delete();
}
}
}
protected int maxAllowedFiles { get; set; } = 100;
//// va dopo
//private StreamWriter objWriter { get; set; };
private async Task LoadFiles(InputFileChangeEventArgs e)
@@ -195,6 +197,17 @@ namespace SMGen.Pages
loadedFiles.Clear();
Files.Clear();
// path cartella root (development)
pathDir = Path.Combine("Temp", "unsafe_uploads");
//se la cartella non esistesse la creo
if (!Directory.Exists(pathDir))
{
Directory.CreateDirectory(pathDir);
Log.Info($"Creato directory {pathDir}");
}
// svuoto cartella prima di partire
deleteOldFiles(pathDir);
foreach (var file in e.GetMultipleFiles(maxAllowedFiles))
{
try
@@ -205,18 +218,7 @@ namespace SMGen.Pages
var trustedFileNameForFileStorage = Path.GetRandomFileName();
//path del file da scrivere
pathFile = Path.Combine("Temp", "unsafe_uploads",
trustedFileNameForFileStorage);
//path cartella root (development)
pathDir = Path.Combine("Temp", "unsafe_uploads");
//se la cartella non esiste, creo
if (!Directory.Exists(pathDir))
{
Directory.CreateDirectory(pathDir);
Log.Info($"Creato directory {pathDir}");
}
pathFile = Path.Combine(pathDir, trustedFileNameForFileStorage);
// creo file
using (FileStream fs = new(pathFile, FileMode.Create))
@@ -254,8 +256,6 @@ namespace SMGen.Pages
await InvokeAsync(() => StateHasChanged());
}
protected int resetSucc { get; set; } = 0;
#endregion Private Methods
}
}
+14 -16
View File
@@ -5,9 +5,7 @@ using NLog;
using SMGen.Core;
using SMGen.Data;
using SMGen.Data.Data;
using SMGen.Data.DbModels;
using SMGen.Data.Services;
using System.Text;
namespace SMGen.Pages
{
@@ -59,6 +57,7 @@ namespace SMGen.Pages
protected string pathDir { get; set; } = "";
protected string pathFile { get; set; } = "";
protected int resetSucc { get; set; } = 0;
[Inject]
protected SMGDataService SMGDService { get; set; } = null!;
@@ -82,7 +81,6 @@ namespace SMGen.Pages
await SMGDService.ExecFlushRedisPattern(Constants.FILES_TO_PROC);
}
protected async Task pgResetReq(bool doReset)
{
if (doReset)
@@ -137,7 +135,7 @@ namespace SMGen.Pages
foreach (string file in files)
{
FileInfo fi = new FileInfo(file);
if (fi.LastAccessTime < DateTime.Now.AddMinutes(-20))
if (fi.LastAccessTime < DateTime.Now.AddMinutes(-10))
{
fi.Delete();
}
@@ -153,6 +151,17 @@ namespace SMGen.Pages
loadedFiles.Clear();
Files.Clear();
// path cartella root (development)
pathDir = Path.Combine("Temp", "unsafe_uploads");
// se la cartella non esistesse la creo
if (!Directory.Exists(pathDir))
{
Directory.CreateDirectory(pathDir);
Log.Info($"Creato directory {pathDir}");
}
// svuoto cartella prima di partire
deleteOldFiles(pathDir);
foreach (var file in e.GetMultipleFiles(maxAllowedFiles))
{
try
@@ -163,18 +172,7 @@ namespace SMGen.Pages
var trustedFileNameForFileStorage = Path.GetRandomFileName();
//path del file da scrivere
pathFile = Path.Combine("Temp", "unsafe_uploads",
trustedFileNameForFileStorage);
//path cartella root (development)
pathDir = Path.Combine("Temp", "unsafe_uploads");
//se la cartella non esiste, creo
if (!Directory.Exists(pathDir))
{
Directory.CreateDirectory(pathDir);
Log.Info($"Creato directory {pathDir}");
}
pathFile = Path.Combine(pathDir, trustedFileNameForFileStorage);
// creo file
using (FileStream fs = new(pathFile, FileMode.Create))