diff --git a/IOB-UT-NEXT/GenActConf.cs b/IOB-UT-NEXT/Config/GenActConf.cs similarity index 98% rename from IOB-UT-NEXT/GenActConf.cs rename to IOB-UT-NEXT/Config/GenActConf.cs index cac92fbe..eed4447f 100644 --- a/IOB-UT-NEXT/GenActConf.cs +++ b/IOB-UT-NEXT/Config/GenActConf.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace IOB_UT_NEXT +namespace IOB_UT_NEXT.Config { public class GenActConf { diff --git a/IOB-UT-NEXT/Config/ExtToolConf.cs b/IOB-UT-NEXT/Config/Special/ExtToolConf.cs similarity index 98% rename from IOB-UT-NEXT/Config/ExtToolConf.cs rename to IOB-UT-NEXT/Config/Special/ExtToolConf.cs index 9ba5b529..cfb7f5e4 100644 --- a/IOB-UT-NEXT/Config/ExtToolConf.cs +++ b/IOB-UT-NEXT/Config/Special/ExtToolConf.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace IOB_UT_NEXT.Config +namespace IOB_UT_NEXT.Config.Special { /// /// Implementazione di riferimento x un file di configurazione x esecuzione task tramite EgwCApp diff --git a/IOB-UT-NEXT/FtpActConf.cs b/IOB-UT-NEXT/Config/Special/FtpActConf.cs similarity index 96% rename from IOB-UT-NEXT/FtpActConf.cs rename to IOB-UT-NEXT/Config/Special/FtpActConf.cs index 1d7d3e80..d915f6a1 100644 --- a/IOB-UT-NEXT/FtpActConf.cs +++ b/IOB-UT-NEXT/Config/Special/FtpActConf.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace IOB_UT_NEXT +namespace IOB_UT_NEXT.Config.Special { public class FtpActConf : GenActConf { diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj index 43d605eb..af28ecdd 100644 --- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj +++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj @@ -176,7 +176,7 @@ - + @@ -188,17 +188,17 @@ - - + + - - + + - - + + @@ -217,7 +217,7 @@ - + @@ -251,7 +251,6 @@ - diff --git a/IOB-UT-NEXT/Iob/BaseObj.cs b/IOB-UT-NEXT/Iob/BaseObj.cs index d221558a..31e37bb8 100644 --- a/IOB-UT-NEXT/Iob/BaseObj.cs +++ b/IOB-UT-NEXT/Iob/BaseObj.cs @@ -1,4 +1,5 @@ using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Data; using NLog; using System; using System.Collections.Generic; diff --git a/IOB-UT-NEXT/Objects.cs b/IOB-UT-NEXT/Objects.cs index e58db839..f7ab65e4 100644 --- a/IOB-UT-NEXT/Objects.cs +++ b/IOB-UT-NEXT/Objects.cs @@ -1,4 +1,6 @@ -using MapoSDK; +using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Config.Special; +using MapoSDK; using System; using System.Collections.Generic; using System.Linq; diff --git a/IOB-UT-NEXT/DataExport.cs b/IOB-UT-NEXT/Services/Data/DataExport.cs similarity index 99% rename from IOB-UT-NEXT/DataExport.cs rename to IOB-UT-NEXT/Services/Data/DataExport.cs index c422549b..951b4060 100644 --- a/IOB-UT-NEXT/DataExport.cs +++ b/IOB-UT-NEXT/Services/Data/DataExport.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -namespace IOB_UT_NEXT +namespace IOB_UT_NEXT.Services.Data { public class DataExport { diff --git a/IOB-UT-NEXT/DataQueue.cs b/IOB-UT-NEXT/Services/Data/DataQueue.cs similarity index 98% rename from IOB-UT-NEXT/DataQueue.cs rename to IOB-UT-NEXT/Services/Data/DataQueue.cs index 4b8ecd32..99534ac2 100644 --- a/IOB-UT-NEXT/DataQueue.cs +++ b/IOB-UT-NEXT/Services/Data/DataQueue.cs @@ -4,7 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -namespace IOB_UT_NEXT +namespace IOB_UT_NEXT.Services.Data { /// /// Classe gestione code, a seconda della conf come LIST redis o come concurrent queue in memoria diff --git a/IOB-UT-NEXT/Eurom63.cs b/IOB-UT-NEXT/Services/Files/Eurom63.cs similarity index 99% rename from IOB-UT-NEXT/Eurom63.cs rename to IOB-UT-NEXT/Services/Files/Eurom63.cs index 77a276c4..4a4f5e8c 100644 --- a/IOB-UT-NEXT/Eurom63.cs +++ b/IOB-UT-NEXT/Services/Files/Eurom63.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace IOB_UT_NEXT +namespace IOB_UT_NEXT.Services.Files { /// /// Classe di helper per metodi Euromap63 tramite File Exchange diff --git a/IOB-UT-NEXT/fileMover.cs b/IOB-UT-NEXT/Services/Files/FileMover.cs similarity index 99% rename from IOB-UT-NEXT/fileMover.cs rename to IOB-UT-NEXT/Services/Files/FileMover.cs index 0506555c..a453f66d 100644 --- a/IOB-UT-NEXT/fileMover.cs +++ b/IOB-UT-NEXT/Services/Files/FileMover.cs @@ -6,19 +6,19 @@ using System.Linq; using System.Net; using System.Reflection; -namespace IOB_UT_NEXT +namespace IOB_UT_NEXT.Services.Files { /// /// Accesso in lettura e scrittura al filesystem per gestione files upload e download /// - public class fileMover + public class FileMover { #region Public Fields /// - /// versione statica (singleton) del'oggetto fileMover + /// versione statica (singleton) del'oggetto FileMover /// - public static fileMover obj = new fileMover(); + public static FileMover obj = new FileMover(); /// /// oggetto WebClient @@ -34,7 +34,7 @@ namespace IOB_UT_NEXT /// /// /// non serve +... x retrocompatibilit�... - public fileMover(string _path, string _log) + public FileMover(string _path, string _log) { setDirs(_path); WebCli = new WebClient(); @@ -43,7 +43,7 @@ namespace IOB_UT_NEXT /// /// metodo di avvio empty /// - public fileMover() + public FileMover() { WebCli = new WebClient(); } diff --git a/IOB-UT-NEXT/FileProcMan.cs b/IOB-UT-NEXT/Services/Files/FileProcMan.cs similarity index 99% rename from IOB-UT-NEXT/FileProcMan.cs rename to IOB-UT-NEXT/Services/Files/FileProcMan.cs index cc6bd0f2..c4a73ac7 100644 --- a/IOB-UT-NEXT/FileProcMan.cs +++ b/IOB-UT-NEXT/Services/Files/FileProcMan.cs @@ -3,7 +3,7 @@ using System; using System.Diagnostics; using System.IO; -namespace IOB_UT_NEXT +namespace IOB_UT_NEXT.Services.Files { public class FileProcMan { diff --git a/IOB-UT-NEXT/baseUtils.cs b/IOB-UT-NEXT/baseUtils.cs index aab1b465..95549488 100644 --- a/IOB-UT-NEXT/baseUtils.cs +++ b/IOB-UT-NEXT/baseUtils.cs @@ -1,3 +1,4 @@ +using IOB_UT_NEXT.Services.Files; using NLog; using RestSharp; using System; @@ -412,12 +413,12 @@ namespace IOB_UT_NEXT public static void shrinkDir(string dirPath) { // obj filemover... - fileMover.obj.setDirectory(dirPath); - float dirSizeMb = fileMover.obj.totalMb(); + FileMover.obj.setDirectory(dirPath); + float dirSizeMb = FileMover.obj.totalMb(); lg.Info("Inizio shrinkDir LOG folder: {0} Mb", dirSizeMb); // ottengo elenco files *.txt - FileInfo[] _fis = fileMover.obj.elencoFiles_FI("*.log"); + FileInfo[] _fis = FileMover.obj.elencoFiles_FI("*.log"); int numDdMax = 2; try { @@ -429,17 +430,17 @@ namespace IOB_UT_NEXT { if (_file.LastWriteTime < DateTime.Now.AddDays(-1)) // zippo files + vecchi di 2 gg... { - fileMover.obj.zippaSingoloFile(_file); + FileMover.obj.zippaSingoloFile(_file); // cancello l'originale... - fileMover.obj.eliminaFile(_file); + FileMover.obj.eliminaFile(_file); } } // inizio con eliminare file + vecchi della data indicata... int maxLogDays = CRI("maxLogDays"); - fileMover.obj.deleteOlderThan(maxLogDays); + FileMover.obj.deleteOlderThan(maxLogDays); // ora controllo SE sia superata la dim max della directory --> in tal caso cancello dal // + vecchio... - dirSizeMb = fileMover.obj.totalMb(); + dirSizeMb = FileMover.obj.totalMb(); int maxLogDirSize = CRI("maxLogDirSize"); int maxTry = 100; // controllo se serva eliminare... @@ -448,11 +449,11 @@ namespace IOB_UT_NEXT lg.Info("Continuo shrinkDir LOG folder: {0} Mb --> ELIMINAZIONE FILES", dirSizeMb); while (dirSizeMb > maxLogDirSize) { - fileMover.obj.deleteOldest(); + FileMover.obj.deleteOldest(); maxTry--; if (maxTry > 0) { - dirSizeMb = fileMover.obj.totalMb(); + dirSizeMb = FileMover.obj.totalMb(); } else { @@ -460,7 +461,7 @@ namespace IOB_UT_NEXT dirSizeMb = maxLogDirSize - 1; } } - dirSizeMb = fileMover.obj.totalMb(); + dirSizeMb = FileMover.obj.totalMb(); lg.Info("Completata shrinkDir LOG folder: {0} Mb", dirSizeMb); } } diff --git a/IOB-WIN-FORM/AdapterForm.cs b/IOB-WIN-FORM/AdapterForm.cs index 15dd9866..238440eb 100644 --- a/IOB-WIN-FORM/AdapterForm.cs +++ b/IOB-WIN-FORM/AdapterForm.cs @@ -1,6 +1,7 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; using IOB_UT_NEXT.Config.Base; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Networking; using MapoSDK; using Newtonsoft.Json; @@ -1963,7 +1964,7 @@ namespace IOB_WIN_FORM // out di cosa faccio... displayTaskAndLog($"[STARTUP] Loading ConfFile: {iniConfFile}"); var appVers = Assembly.GetExecutingAssembly().GetName().Version; - string path = fileMover.GetExecutingDirectoryName(); // Directory.GetCurrentDirectory(); + string path = FileMover.GetExecutingDirectoryName(); // Directory.GetCurrentDirectory(); string fileName = Path.GetFileName(iniConfFile).Replace(".ini", ".iob"); string dirPath = Path.Combine(path, "DATA", "CONF_RUN"); // verifica directory diff --git a/IOB-WIN-FORM/Iob/Generic.cs b/IOB-WIN-FORM/Iob/Generic.cs index cda2d21a..1d6241c5 100644 --- a/IOB-WIN-FORM/Iob/Generic.cs +++ b/IOB-WIN-FORM/Iob/Generic.cs @@ -2,6 +2,7 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; using IOB_UT_NEXT.Services.Data; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Networking; using MapoSDK; using MathNet.Numerics.Statistics; @@ -8879,7 +8880,7 @@ namespace IOB_WIN_FORM.Iob bool fatto = false; if (Directory.Exists(folderPath)) { - fatto = fileMover.zippaDirectory(folderPath, zipName); + fatto = FileMover.zippaDirectory(folderPath, zipName); // se sent elimino vecchia directory... if (fatto) { diff --git a/IOB-WIN-FORM/Iob/PingWatchDog.cs b/IOB-WIN-FORM/Iob/PingWatchDog.cs index 56843e48..33c87f78 100644 --- a/IOB-WIN-FORM/Iob/PingWatchDog.cs +++ b/IOB-WIN-FORM/Iob/PingWatchDog.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Data; using MapoSDK; using System; using System.Diagnostics; diff --git a/IOB-WIN-FORM/MainForm.cs b/IOB-WIN-FORM/MainForm.cs index f46ee82c..6746702c 100644 --- a/IOB-WIN-FORM/MainForm.cs +++ b/IOB-WIN-FORM/MainForm.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Networking; using MapoSDK; using MathNet.Numerics.Distributions; @@ -845,7 +846,7 @@ namespace IOB_WIN_FORM // salvo! foreach (var item in objFiles.fileList) { - fileMover.obj.salvaFileString(utils.confDir, item.fileName, item.content); + FileMover.obj.salvaFileString(utils.confDir, item.fileName, item.content); } displayTaskAndLog("Download conf files aggiornati"); }