diff --git a/Core/Const.cs b/Core/Const.cs index a58b0b1..37fbd8d 100644 --- a/Core/Const.cs +++ b/Core/Const.cs @@ -10,7 +10,7 @@ namespace Core { // classi utilità x cache REDIS dati DB - public const string redisBaseAddr = "MagManUi"; + public const string redisBaseAddr = "LiMan:Ui"; public const string rKeyConfig = $"{redisBaseAddr}:Cache"; } } diff --git a/EgwControlCenter.Core/CoreEnum.cs b/EgwControlCenter.Core/CoreEnum.cs new file mode 100644 index 0000000..9668e05 --- /dev/null +++ b/EgwControlCenter.Core/CoreEnum.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EgwControlCenter.Core +{ + public class CoreEnum + { + + public enum AppType + { + None, + Cli, + Machine, + WebApp, + WinApp + } + } +} diff --git a/EgwControlCenter.Core/EgwControlCenter.Core.csproj b/EgwControlCenter.Core/EgwControlCenter.Core.csproj index fa71b7a..8d46b1c 100644 --- a/EgwControlCenter.Core/EgwControlCenter.Core.csproj +++ b/EgwControlCenter.Core/EgwControlCenter.Core.csproj @@ -6,4 +6,10 @@ enable + + + + + + diff --git a/EgwControlCenter.Core/Enum.cs b/EgwControlCenter.Core/Enum.cs deleted file mode 100644 index d36c109..0000000 --- a/EgwControlCenter.Core/Enum.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace EgwControlCenter.Core -{ - public class Enum - { - /// - /// Elenco tipi app ammessi - /// - public static Dictionary AppType = new Dictionary{ - { "", "---Selezionare---" }, - { "Cli", "Cli (Console)" }, - { "Machine", "Machine" }, - { "WebApp", "WebApp" }, - { "WinApp", "WinApp" } - }; - } -} diff --git a/EgwControlCenter.Core/Models/ControlTarget.cs b/EgwControlCenter.Core/Models/ControlTarget.cs index 008e4c0..e24f0a4 100644 --- a/EgwControlCenter.Core/Models/ControlTarget.cs +++ b/EgwControlCenter.Core/Models/ControlTarget.cs @@ -1,8 +1,10 @@ -using System; +using Newtonsoft.Json.Converters; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; +using System.Text.Json.Serialization; using System.Threading.Tasks; namespace EgwControlCenter.Core.Models @@ -11,7 +13,16 @@ namespace EgwControlCenter.Core.Models { [Key] public int Idx { get; set; } = 0; - public string ObjType { get; set; } = ""; + + /// + /// Tipo applicazione da monitorare + /// + [JsonConverter(typeof(StringEnumConverter))] + public CoreEnum.AppType ApplicationType{ get; set; } = CoreEnum.AppType.None; + + /// + /// Path di base da monitorare + /// public string BasePath { get; set; } = ""; } } diff --git a/EgwControlCenter.Core/Models/ReleaseDTO.cs b/EgwControlCenter.Core/Models/ReleaseDTO.cs new file mode 100644 index 0000000..ce4ad68 --- /dev/null +++ b/EgwControlCenter.Core/Models/ReleaseDTO.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EgwControlCenter.Core.Models +{ + public class ReleaseDTO + { + /// + /// Codice/Nome applicativo + /// + public string CodApp { get; set; } = ""; + + /// + /// Versione applicativo formato semver numerico 4 blocchi + /// + public string VersNum { get; set; } = "0.0.0.0"; + + /// + /// Versione applicativo, formato testuale libero, può essere uguale a VersNum + /// + public string VersText { get; set; } = "a.b"; + + /// + /// Oggetto versione calcolato da VersNum + /// + public Version VersVal + { + get + { + Version answ = new Version(); + try + { + // solo se è una versione valida: SemVer = 2/3 punti + int numPunti = VersNum.Length - VersNum.Replace(".", "").Length; + if (numPunti >= 2 && numPunti <= 3) + { + answ = !string.IsNullOrEmpty(VersNum) ? new Version(VersNum) : new Version(); + } + } + catch { } + return answ; + } + } + + /// + /// Verifica se sia permessa la versione quando viene valutata la versione massima consentita + /// + public bool IsPermitted { get; set; } = false; + + /// + /// Data di release + /// + public DateTime ReleaseDate { get; set; } = DateTime.Today.AddYears(100); + + /// + /// Tag associati a versione, comma separated + /// + public string RelTags { get; set; } = ""; + + /// + /// Url pagina web di changelog (traduzione gestita sul sito target) - calcolato da CodApp + vers + /// + public string UrlChangelog { get; set; } = "http://releases.egalware.com"; + + /// + /// Url pagina web di changelog estesa (traduzione gestita sul sito target) - calcolato da CodApp + vers + /// + public string UrlChangelogExt { get; set; } = "http://releases.egalware.com"; + + /// + /// Attivo/Pubblico (qui calcolato, attivo se la data di release è passata, poi potrebbe essere gestito a parte da DB) + /// + public bool IsActive { get; set; } = false; + } +} diff --git a/EgwControlCenter.Core/Models/TargetStatus.cs b/EgwControlCenter.Core/Models/TargetStatus.cs new file mode 100644 index 0000000..caca4cd --- /dev/null +++ b/EgwControlCenter.Core/Models/TargetStatus.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Cryptography.X509Certificates; +using System.Text; +using System.Threading.Tasks; + +namespace EgwControlCenter.Core.Models +{ + public class TargetStatus + { + #region Public Properties + + /// + /// Nome applicazione + /// + public string CodApp { get; set; } = ""; + + /// + /// Release locale (es Macchine: come letta da file *.mlde) + /// + public ReleaseDTO CurrLocal { get; set; } = new ReleaseDTO(); + + /// + /// DataOra ultima verifica locale + /// + public DateTime LastUpdateLoc { get; set; } = DateTime.Now; + + /// + /// DataOra ultima verifica remota + /// + public DateTime LastUpdateRem { get; set; } = DateTime.Now; + + /// + /// Elenco release remote da REST service + /// + public List ListRemote { get; set; } = new List(); + + #endregion Public Properties + + #region Public Methods + + public ReleaseDTO CurrRemote + { + get + { + ReleaseDTO answ = new ReleaseDTO(); + if (ListRemote != null && ListRemote.Count() > 0) + { + answ = ListRemote + .OrderByDescending(x => x.VersVal) + .ThenByDescending(x => x.ReleaseDate) + .FirstOrDefault() ?? new ReleaseDTO(); + } + return answ; + } + } + + /// + /// Calcolo condizione "ci sono update": + /// - almeno 1 rel remota + /// - la rel remota "+ recente" / + alta > rel locale + /// + /// + public bool HasUpdate() + { + bool answ = false; + if (ListRemote != null && ListRemote.Count > 0) + { + // prendo max release + var lastRemote = ListRemote.OrderByDescending(x => x.VersVal).FirstOrDefault(); + //devo averla trovata... + if (lastRemote != null) + { + answ = lastRemote.VersVal > CurrLocal.VersVal; + } + } + return answ; + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/EgwControlCenter.Core/Models/VersStatusDTO.cs b/EgwControlCenter.Core/Models/VersStatusDTO.cs new file mode 100644 index 0000000..324272f --- /dev/null +++ b/EgwControlCenter.Core/Models/VersStatusDTO.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Cryptography.X509Certificates; +using System.Text; +using System.Threading.Tasks; + +namespace EgwControlCenter.Core.Models +{ + public class VersStatusDTO + { + #region Public Properties + + /// + /// Nome applicazione + /// + public string CodApp { get; set; } = ""; + + + /// + /// Versione applicativo corrente + /// + public string VersNumCurr { get; set; } = "0.0.0.0"; + + + /// + /// Versione applicativo LAST disponibile + /// + public string VersNumLast { get; set; } = "0.0.0.0"; + + /// + /// Tag associati a ultima versione disponibile, comma separated + /// + public string RelTagsLast { get; set; } = ""; + + #endregion Public Properties + + } +} \ No newline at end of file diff --git a/EgwControlCenter.Core/PatrolSettings.cs b/EgwControlCenter.Core/PatrolSettings.cs new file mode 100644 index 0000000..0ce2ce3 --- /dev/null +++ b/EgwControlCenter.Core/PatrolSettings.cs @@ -0,0 +1,14 @@ +using EgwControlCenter.Core.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EgwControlCenter.Core +{ + public class PatrolSettings + { + public List TargetList { get; set; } = new List(); + } +} diff --git a/EgwControlCenter.Core/ReleaseChecker.cs b/EgwControlCenter.Core/ReleaseChecker.cs new file mode 100644 index 0000000..7d76e72 --- /dev/null +++ b/EgwControlCenter.Core/ReleaseChecker.cs @@ -0,0 +1,426 @@ +using EgwControlCenter.Core.Models; +using Newtonsoft.Json; +using NLog; +using RestSharp; +using RestSharp.Serializers; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EgwControlCenter.Core +{ + public class ReleaseChecker + { + #region Public Fields + + /// + /// Classe logger + /// + public static Logger Log = LogManager.GetCurrentClassLogger(); + + #endregion Public Fields + + #region Public Constructors + + public ReleaseChecker(string baseDir, string currConfig) + { + AppDir = baseDir; + ConfName = currConfig; + // verifico path... + if (string.IsNullOrEmpty(AppDir)) + { + AppDir = AppDomain.CurrentDomain.BaseDirectory; + } + if (File.Exists(ConfPath)) + { + var rawData = File.ReadAllText(ConfPath); + if (!string.IsNullOrEmpty(rawData)) + { + CurrPatrolCont = JsonConvert.DeserializeObject(rawData) ?? new PatrolSettings(); + } + } + // cerco se presente file status precedente e lo ricarico... + if (File.Exists(StatusPath)) + { + var rawData = File.ReadAllText(StatusPath); + if (!string.IsNullOrEmpty(rawData)) + { + ListStatus = JsonConvert.DeserializeObject>(rawData) ?? new List(); + } + } + } + + #endregion Public Constructors + + #region Public Properties + + + /// + /// DataOra ultimo check locale + /// + public DateTime LastChecked() + { + DateTime answ = new DateTime(DateTime.Today.Year, 1, 1); + //se ho record locali cerco il + recente + if (ListStatus != null && ListStatus.Count > 0) + { + var primo = ListStatus + .OrderByDescending(x => x.LastUpdateLoc) + .FirstOrDefault(); + if (primo != null) + { + answ = primo.LastUpdateLoc; + } + } + return answ; + } + + public bool HasUpdate() + { + bool answ = false; + //se ho record locali cerco il + recente + if (ListStatus != null && ListStatus.Count > 0) + { + foreach (var item in ListStatus) + { + answ = item.HasUpdate(); + if (answ) + { + break; + } + } + } + return answ; + } + + /// + /// Elenco degli oggetti stato dei programmi monitorati + /// + protected List ListStatus { get; set; } = new List(); + + /// + /// Elenco degli oggetti stato dei programmi monitorati + /// + public List ListAppStatus { get; set; } = new List(); + + #endregion Public Properties + + #region Public Methods + + /// + /// Esegue verifica remota versioni x i sw tracciati + /// + /// + public bool CheckRemoteReleases() + { + bool fatto = false; + try + { + // ciclo x ogni item da controllare + foreach (var item in ListStatus) + { + if (item.CurrLocal != null) + { + // verifico release da remoto aggiorno obj + var ListRem = GetRemoteRel(item.CodApp, item.CurrLocal.VersNum); + if (ListRem != null) + { + item.ListRemote = ListRem; + item.LastUpdateRem = DateTime.Now; + } + } + } + // salvo status... + SaveStatus(); + fatto = true; + } + catch (Exception exc) + { + Log.Error($"Errore in CheckRemoteReleases{Environment.NewLine}{exc}"); + } + return fatto; + } + + /// + /// Aggiorna (se necessario) lo stato degli oggetti da monitorare + /// + /// + /// + public bool UpdateLocalStatus(bool doRefresh) + { + bool fatto = false; + // se non forzato verifico file dello status salvato x necessità refresh + if (!doRefresh) + { + doRefresh = checkScaduto(); + } + // verifico se procedere... + if (doRefresh) + { + // nuovo obj controlli + List newListStatus = new List(); + // ciclo x ogni item da controllare + foreach (var item in CurrPatrolCont.TargetList) + { + // verifico contenuto secondo tipo + if (item != null) + { + switch (item.ApplicationType) + { + case CoreEnum.AppType.None: + break; + + case CoreEnum.AppType.Cli: + break; + + case CoreEnum.AppType.Machine: + // processo la folder indicata e cerco tutte le macchine contenute + if (Directory.Exists(item.BasePath)) + { + // recupero elenco sottodirectory = macchine + var dirList = Directory.GetDirectories(item.BasePath); + // ciclo e cerco i file mlde... + foreach (var currDir in dirList) + { + // cerco se ci sia un file mlde... + var fileFound = Directory.GetFiles(currDir, "*.mlde"); + if (fileFound != null && fileFound.Count() > 0) + { + // prendo il primo... + var tgtFile = fileFound.FirstOrDefault() ?? ""; + var currRelDto = MldeGetRelease(tgtFile); + if (currRelDto != null) + { + string codApp = Path.GetFileName(currDir); + newListStatus.Add(new TargetStatus() + { + CodApp = codApp, + CurrLocal = currRelDto, + LastUpdateLoc = DateTime.Now + }); + } + } + } + } + + break; + + case CoreEnum.AppType.WebApp: + break; + + case CoreEnum.AppType.WinApp: + break; + + default: + break; + } + } + + // aggiungo oggetto TargetStatus + } + // aggiorno obj... + ListStatus = newListStatus; + // salvo status... + SaveStatus(); + fatto = true; + } + return fatto; + } + + #endregion Public Methods + + #region Protected Fields + + protected static string apiUrl = "https://liman.egalware.com/ELM.Api/"; + + #endregion Protected Fields + + #region Protected Properties + + /// + /// Configurazione degli oggetti da monitorare + /// + protected PatrolSettings CurrPatrolCont { get; set; } = new PatrolSettings(); + + #endregion Protected Properties + + #region Private Properties + + private string AppDir { get; set; } = ""; + + /// + /// Periodo minimo per autorefresh versioni default 1 gg) protected TimeSpan AutoRefreshVeto + /// { get; set; } = TimeSpan.FromDays(1); + /// + private TimeSpan AutoRefreshVeto { get; set; } = TimeSpan.FromSeconds(30); + + private string ConfName { get; set; } = ""; + + /// + /// Path file di conf check + /// + private string ConfPath + { + get => Path.Combine(AppDir, ConfName); + } + + private string StatusName { get; set; } = "LastStatus.json"; + + /// + /// Path file salvataggio status + /// + private string StatusPath + { + get => Path.Combine(AppDir, StatusName); + } + + #endregion Private Properties + + #region Private Methods + + private static List GetRemoteRel(string CodApp, string CurrVers) + { + List answ = new List(); + try + { + // client chiamate rest + var client = new RestClient(apiUrl); + string rawData = ""; + // Chiamo il metodo! + var checkRel = new RestRequest($"/api/Release/filt/{CodApp}?VersMin={CurrVers}", Method.Get); + // effettuo vera chiamata + var pUpd = Task.Run(async () => + { + var currResp = await client.GetAsync(checkRel); + if (currResp.StatusCode == System.Net.HttpStatusCode.OK && currResp.Content != null) + { + var currList = JsonConvert.DeserializeObject>(currResp.Content); + if (currList != null) + { + answ = currList; + } + } + }); + pUpd.Wait(); + } + catch (Exception exc) + { + Log.Error($"Eccezione in fase gestione REST services{Environment.NewLine}{exc}"); + } + + return answ; + } + + /// + /// Verifica se il check sia scaduto rispetto ad AutoRefreshVeto + /// + /// + private bool checkScaduto() + { + bool answ = false; + DateTime adesso = DateTime.Now; + // ciclo per ogni oggetto della lista... + foreach (var item in ListStatus) + { + if (item.LastUpdateLoc.Add(AutoRefreshVeto) < adesso) + { + answ = true; + // esco! + break; + } + } + return answ; + } + + /// + /// Recupera oggetto releaseDTO da file indicato + /// + /// + /// + private ReleaseDTO? MldeGetRelease(string filePath) + { + ReleaseDTO? answ = null; + if (File.Exists(filePath)) + { + string versNum = ""; + string versTxt = ""; + string codApp = ""; + // leggo una riga alla volta e cerco le chaivi + using (StreamReader reader = new StreamReader(filePath)) + { + string? line; + bool stop = false; + while ((line = reader.ReadLine()) != null && !stop) + { + if (line.StartsWith("PP_VER")) + { + // splitto e prendo secondo + var splitTxt = line.Split("="); + if (splitTxt.Length > 1) + { + versTxt = splitTxt[1].Trim().Replace("'", "").Trim(); + } + } + else if (line.StartsWith("PP_NVER")) + { + // splitto e prendo secondo + var splitTxt = line.Split("="); + if (splitTxt.Length > 1) + { + versNum = splitTxt[1].Trim().Replace("'", "").Trim(); + } + } + else if (line.StartsWith("MACH_NAME")) + { + // splitto e prendo secondo + var splitTxt = line.Split("="); + if (splitTxt.Length > 1) + { + codApp = splitTxt[1].Trim().Replace("'", "").Trim(); + } + } + // se ho trovato tutto esco! + stop = !string.IsNullOrEmpty(versNum) && !string.IsNullOrEmpty(versTxt) && !string.IsNullOrEmpty(codApp); + } + } + // creo OBJ e lo restituisco... + answ = new ReleaseDTO() + { + CodApp = codApp, + ReleaseDate = DateTime.Now, + VersNum = versNum, + VersText = versTxt + }; + } + return answ; + } + + /// + /// Effettua salvataggio obj status + /// + private void SaveStatus() + { + var rawData = JsonConvert.SerializeObject(ListStatus, Formatting.Indented); + if (rawData != null && rawData.Length > 2) + { + File.WriteAllText(StatusPath, rawData); + } + // aggiorno obj calcolato versioni... + ListAppStatus = ListStatus + .Where(x => x.HasUpdate()) + .Select(x => new VersStatusDTO + { + CodApp = x.CodApp, + VersNumCurr = x.CurrLocal.VersNum, + VersNumLast = x.CurrRemote.VersNum, + RelTagsLast = x.CurrRemote.RelTags + }) + .ToList(); + } + + #endregion Private Methods + } +} \ No newline at end of file diff --git a/EgwControlCenter/AccEnum.cs b/EgwControlCenter/AccEnum.cs index 88a21e8..46cfc05 100644 --- a/EgwControlCenter/AccEnum.cs +++ b/EgwControlCenter/AccEnum.cs @@ -25,5 +25,15 @@ namespace EgwControlCenter /// UPD = 2 } + /// + /// Elenco tipi app ammessi + /// + public static Dictionary AppType = new Dictionary{ + { "", "---Selezionare---" }, + { "Cli", "Cli (Console)" }, + { "Machine", "Machine" }, + { "WebApp", "WebApp" }, + { "WinApp", "WinApp" } + }; } } diff --git a/EgwControlCenter/App.config b/EgwControlCenter/App.config index 9fb6570..9e682e6 100644 --- a/EgwControlCenter/App.config +++ b/EgwControlCenter/App.config @@ -46,7 +46,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/EgwControlCenter/Conf/.placeholder b/EgwControlCenter/Conf/.placeholder new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/EgwControlCenter/Conf/.placeholder @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/EgwControlCenter/Conf/ConfPatrol.json b/EgwControlCenter/Conf/ConfPatrol.json new file mode 100644 index 0000000..c150129 --- /dev/null +++ b/EgwControlCenter/Conf/ConfPatrol.json @@ -0,0 +1,9 @@ +{ + "TargetList": [ + { + "Idx": 1, + "ApplicationType": "Machine", + "BasePath": "C:\\Testing\\Machine" + } + ] +} diff --git a/EgwControlCenter/ControlCenter.Designer.cs b/EgwControlCenter/ControlCenter.Designer.cs index 28d3db6..20ad6bd 100644 --- a/EgwControlCenter/ControlCenter.Designer.cs +++ b/EgwControlCenter/ControlCenter.Designer.cs @@ -31,44 +31,34 @@ components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenter)); label1 = new Label(); - label2 = new Label(); - label3 = new Label(); trayMenu = new ContextMenuStrip(components); notifyIcon1 = new NotifyIcon(components); + btnSetup = new Button(); + btnUpdate = new Button(); + lblOut = new Label(); + timerCheck = new System.Windows.Forms.Timer(components); + statusStrip1 = new StatusStrip(); + tsLabelVers = new ToolStripStatusLabel(); + tsLabelOut = new ToolStripStatusLabel(); + dgView = new DataGridView(); + statusStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dgView).BeginInit(); SuspendLayout(); // // label1 // label1.AutoSize = true; - label1.Font = new Font("Roboto", 24F, FontStyle.Regular, GraphicsUnit.Point, 0); - label1.Location = new Point(193, 9); + label1.Font = new Font("Roboto", 16F, FontStyle.Regular, GraphicsUnit.Point, 0); + label1.Location = new Point(70, 9); label1.Name = "label1"; - label1.Size = new Size(429, 38); + label1.Size = new Size(293, 27); label1.TabIndex = 0; label1.Text = "EgalWare App Control Center"; // - // label2 - // - label2.AutoSize = true; - label2.Location = new Point(53, 83); - label2.Name = "label2"; - label2.Size = new Size(152, 15); - label2.TabIndex = 1; - label2.Text = "Elenco App (list? webview?)"; - // - // label3 - // - label3.AutoSize = true; - label3.Location = new Point(484, 83); - label3.Name = "label3"; - label3.Size = new Size(156, 15); - label3.TabIndex = 2; - label3.Text = "Btn setup app da controllare"; - // // trayMenu // trayMenu.Name = "trayMenu"; - trayMenu.Size = new Size(181, 26); + trayMenu.Size = new Size(61, 4); trayMenu.ItemClicked += trayMenu_ItemClicked; // // notifyIcon1 @@ -79,20 +69,94 @@ notifyIcon1.Visible = true; notifyIcon1.DoubleClick += notifyIcon1_DoubleClick; // + // btnSetup + // + btnSetup.Anchor = AnchorStyles.Top | AnchorStyles.Right; + btnSetup.Location = new Point(385, 13); + btnSetup.Name = "btnSetup"; + btnSetup.Size = new Size(27, 23); + btnSetup.TabIndex = 3; + btnSetup.Text = "..."; + btnSetup.UseVisualStyleBackColor = true; + btnSetup.Click += btnSetup_Click; + // + // btnUpdate + // + btnUpdate.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + btnUpdate.Location = new Point(314, 223); + btnUpdate.Name = "btnUpdate"; + btnUpdate.Size = new Size(98, 23); + btnUpdate.TabIndex = 4; + btnUpdate.Text = "Check Now"; + btnUpdate.UseVisualStyleBackColor = true; + btnUpdate.Click += btnUpdate_Click; + // + // lblOut + // + lblOut.AutoSize = true; + lblOut.Location = new Point(44, 117); + lblOut.Name = "lblOut"; + lblOut.Size = new Size(12, 15); + lblOut.TabIndex = 5; + lblOut.Text = "-"; + // + // timerCheck + // + timerCheck.Interval = 1000; + timerCheck.Tick += timerCheck_Tick; + // + // statusStrip1 + // + statusStrip1.Items.AddRange(new ToolStripItem[] { tsLabelVers, tsLabelOut }); + statusStrip1.Location = new Point(0, 249); + statusStrip1.Name = "statusStrip1"; + statusStrip1.Size = new Size(421, 22); + statusStrip1.TabIndex = 6; + statusStrip1.Text = "statusStrip1"; + // + // tsLabelVers + // + tsLabelVers.Name = "tsLabelVers"; + tsLabelVers.Size = new Size(49, 17); + tsLabelVers.Text = "v.0.0.0.0"; + tsLabelVers.TextImageRelation = TextImageRelation.Overlay; + // + // tsLabelOut + // + tsLabelOut.Name = "tsLabelOut"; + tsLabelOut.Size = new Size(16, 17); + tsLabelOut.Text = "..."; + // + // dgView + // + dgView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + dgView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dgView.Location = new Point(12, 56); + dgView.Name = "dgView"; + dgView.Size = new Size(397, 161); + dgView.TabIndex = 7; + // // ControlCenter // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); - Controls.Add(label3); - Controls.Add(label2); + ClientSize = new Size(421, 271); + Controls.Add(dgView); + Controls.Add(statusStrip1); + Controls.Add(lblOut); + Controls.Add(btnUpdate); + Controls.Add(btnSetup); Controls.Add(label1); Icon = (Icon)resources.GetObject("$this.Icon"); Name = "ControlCenter"; Text = "Egalware Control Center"; FormClosing += ControlCenter_FormClosing; + Load += ControlCenter_Load; Shown += ControlCenter_Shown; Resize += ControlCenter_Resize; + statusStrip1.ResumeLayout(false); + statusStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)dgView).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -100,9 +164,15 @@ #endregion private Label label1; - private Label label2; - private Label label3; private ContextMenuStrip trayMenu; private NotifyIcon notifyIcon1; + private Button btnSetup; + private Button btnUpdate; + private Label lblOut; + private System.Windows.Forms.Timer timerCheck; + private StatusStrip statusStrip1; + private ToolStripStatusLabel tsLabelVers; + private DataGridView dgView; + private ToolStripStatusLabel tsLabelOut; } } diff --git a/EgwControlCenter/ControlCenter.cs b/EgwControlCenter/ControlCenter.cs index 7c96d97..16f759d 100644 --- a/EgwControlCenter/ControlCenter.cs +++ b/EgwControlCenter/ControlCenter.cs @@ -1,5 +1,12 @@ using System.Windows.Forms; using static EgwControlCenter.AccEnum; +using Microsoft.VisualBasic; +using EgwControlCenter.Core; +using System.Diagnostics; +using Newtonsoft.Json; +using System.Text; +using System.ComponentModel; +using EgwControlCenter.Core.Models; namespace EgwControlCenter { @@ -10,8 +17,7 @@ namespace EgwControlCenter public ControlCenter() { InitializeComponent(); - setupTrayIcon(); - createTrayMenu(); + InitObjects(); } #endregion Public Constructors @@ -25,12 +31,55 @@ namespace EgwControlCenter #endregion Protected Fields + #region Private Properties + + private ReleaseChecker CurrCheck { get; set; } = new ReleaseChecker("", ""); + + private bool locCheckOk { get; set; } = false; + + private bool remCheckOk { get; set; } = false; + + #endregion Private Properties + #region Private Methods + private void btnSetup_Click(object sender, EventArgs e) + { + string authPwd = Interaction.InputBox("Prego inserire pwd per abilitare lo sblocco", "Verifica Utente", "", 10, 10); + //verifico passphrase + if (authPwd == "24068Seriate") + { + TargetSetup tgtForm = new TargetSetup(); + tgtForm.Show(); + } + else + { + string message = "La passphrase inserita non è corretta. Impossibile procedere"; + string caption = "Auth Error"; + MessageBoxButtons buttons = MessageBoxButtons.OK; + DialogResult result; + result = MessageBox.Show(message, caption, buttons); + } + } + + private void btnUpdate_Click(object sender, EventArgs e) + { + Stopwatch sw = new Stopwatch(); + sw.Start(); + // effettua un refresh del controllo status... + locCheckOk = CurrCheck.UpdateLocalStatus(true); + if (locCheckOk) + { + remCheckOk = CurrCheck.CheckRemoteReleases(); + } + sw.Stop(); + DisplayCheckResult(sw.Elapsed); + } + /// /// Verifica stato windows (minimized/normal) e visibilità con tray... /// - private void checkFormVisibility() + private void CheckFormVisibility() { // se non può massimizzare imposto COMUNQUE a minimized... if (!AccUtils.CRB("windowCanMax")) @@ -55,47 +104,6 @@ namespace EgwControlCenter { notifyIcon1.Visible = false; } -#if false - // fix child! - this.LayoutMdi(MdiLayout.TileHorizontal); -#endif - } - - /// - /// crea menù tray x applicazione - /// - private void createTrayMenu() - { - // Fix testi menù tray... - trayMenu.Items.Clear(); - // SE permessa massimizzazione... - trayMenu.Items.Add("Show EgalWare ACC"); - // se è permesso chiudere - trayMenu.Items.Add("Close EgalWare ACC"); - } - - /// - /// Gestisce "andata nel tray" della form - /// - private void sendToTray() - { - if (!notifyIcon1.Visible) - { - notifyIcon1.BalloonTipTitle = AccUtils.CRS("appName"); - notifyIcon1.BalloonTipText = $"{AccUtils.CRS("appName")} running on tray"; - notifyIcon1.Visible = true; - notifyIcon1.ShowBalloonTip(100); - } - Hide(); - } - - private void setupTrayIcon() - { - // fix icon! - var currObj = System.Reflection.Assembly.GetExecutingAssembly().GetName(); - notifyIcon1.Text = $"EgalWare's AppControlCenter | {currObj.Version}"; - //Icon = Icon.ExtractAssociatedIcon(AccUtils.defIconFilePath); - //notifyIcon1.Icon = Icon.ExtractAssociatedIcon(AccUtils.defIconFilePath); } /// @@ -105,39 +113,15 @@ namespace EgwControlCenter /// private void ControlCenter_FormClosing(object sender, FormClosingEventArgs e) { -#if false - closeAllChild(); -#endif + timerCheck.Stop(); + timerCheck.Dispose(); } - - /// - /// click su menù contestuale in tray - /// - /// - /// - private void trayMenu_ItemClicked(object sender, ToolStripItemClickedEventArgs e) + private void ControlCenter_Load(object sender, EventArgs e) { - if (e != null && e.ClickedItem != null && !string.IsNullOrEmpty(e.ClickedItem.Text)) - { - if (e.ClickedItem.Text.StartsWith("Close")) - { -#if false - // stop child adapters... - closeAllChild(); -#endif - // chiudo! - Close(); - } - else if (e.ClickedItem.Text.StartsWith("Show")) - { - if (AccUtils.CRB("windowCanMax")) - { - Show(); - WindowState = FormWindowState.Normal; - } - } - } + // posiziono in basso a sx... + Rectangle workArea = Screen.GetWorkingArea(this); + this.Location = new Point(workArea.Right - Size.Width, workArea.Bottom - Size.Height); } /// @@ -147,7 +131,7 @@ namespace EgwControlCenter /// private void ControlCenter_Resize(object sender, EventArgs e) { - checkFormVisibility(); + CheckFormVisibility(); } /// @@ -167,9 +151,72 @@ namespace EgwControlCenter sendToTray(); } } + } + + /// + /// crea menù tray x applicazione + /// + private void CreateTrayMenu() + { + // Fix testi menù tray... + trayMenu.Items.Clear(); + // SE permessa massimizzazione... + trayMenu.Items.Add("Show EgalWare ACC"); + // se è permesso chiudere + trayMenu.Items.Add("Close EgalWare ACC"); + } + + /// + /// Mostra i risultati dell'esito del controllo release + /// + /// + private void DisplayCheckResult(TimeSpan elapsed) + { + var list = new BindingList(CurrCheck.ListAppStatus); + dgView.DataSource = list; #if false - displayTaskAndLog("Main Form SHOWN (MDI)"); + StringBuilder sb = new StringBuilder(); + sb.AppendLine("---------------------"); + sb.AppendLine($"{DateTime.Now:HH:mm:ss}"); + sb.AppendLine("---------------------"); + sb.AppendLine(); + if (locCheckOk && remCheckOk) + { + string rawConf = JsonConvert.SerializeObject(CurrCheck, Formatting.Indented); + sb.Append(rawConf); + } + sb.AppendLine(); + sb.AppendLine("---------------------"); + sb.AppendLine($"Eseguito refresh | Loc: {locCheckOk} | Rem: {remCheckOk} | {elapsed.TotalMilliseconds:N0} ms"); + lblOut.Text = sb.ToString(); #endif + tsLabelOut.Text = $"Last Check: {CurrCheck.LastChecked():yyyy-MM-dd HH:mm:ss}"; + // notifica ballontip se ho aggiornamenti... + if (CurrCheck.HasUpdate() && WindowState != FormWindowState.Normal) + { + notifyIcon1.BalloonTipTitle = "EgalWare's App Control Center"; + notifyIcon1.BalloonTipText = "Update found!"; + notifyIcon1.BalloonTipIcon = ToolTipIcon.Warning; + notifyIcon1.BalloonTipClicked += NotifyIcon1_BalloonTipClicked; + notifyIcon1.ShowBalloonTip(1000); + } + } + + private void InitObjects() + { + SetupTrayIcon(); + CreateTrayMenu(); + // init obj gestione check... + CurrCheck = new ReleaseChecker(AccUtils.confDir, "ConfPatrol.json"); + tsLabelVers.Text = $"EACC v.{CurrAssembly.Version}"; + tsLabelOut.Text = $"Last Check: {CurrCheck.LastChecked():yyyy-MM-dd HH:mm:ss}"; + timerCheck.Start(); + } + + private void NotifyIcon1_BalloonTipClicked(object? sender, EventArgs e) + { + Show(); + WindowState = FormWindowState.Normal; } /// @@ -187,6 +234,81 @@ namespace EgwControlCenter } } + /// + /// Gestisce "andata nel tray" della form + /// + private void sendToTray() + { + if (!notifyIcon1.Visible) + { + notifyIcon1.BalloonTipTitle = AccUtils.CRS("appName"); + notifyIcon1.BalloonTipText = $"{AccUtils.CRS("appName")} running on tray"; + notifyIcon1.BalloonTipIcon = ToolTipIcon.Info; + notifyIcon1.BalloonTipClicked += NotifyIcon1_BalloonTipClicked; + notifyIcon1.Visible = true; + notifyIcon1.ShowBalloonTip(100); + } + WindowState = FormWindowState.Minimized; + Hide(); + } + + private System.Reflection.AssemblyName CurrAssembly { get; set; } = new System.Reflection.AssemblyName(); + + private void SetupTrayIcon() + { + // fix icon! + CurrAssembly = System.Reflection.Assembly.GetExecutingAssembly().GetName(); + notifyIcon1.Text = $"EgalWare's AppControlCenter | {CurrAssembly.Version}"; + //Icon = Icon.ExtractAssociatedIcon(AccUtils.defIconFilePath); + //notifyIcon1.Icon = Icon.ExtractAssociatedIcon(AccUtils.defIconFilePath); + } + + private void timerCheck_Tick(object sender, EventArgs e) + { + Stopwatch sw = new Stopwatch(); + sw.Start(); + // esegue controllo locale ed eventualmente remoto se scaduto... + locCheckOk = CurrCheck.UpdateLocalStatus(false); + if (locCheckOk) + { + remCheckOk = CurrCheck.CheckRemoteReleases(); + } + sw.Stop(); + if (locCheckOk) + { + DisplayCheckResult(sw.Elapsed); + } + } + + /// + /// click su menù contestuale in tray + /// + /// + /// + private void trayMenu_ItemClicked(object sender, ToolStripItemClickedEventArgs e) + { + if (e != null && e.ClickedItem != null && !string.IsNullOrEmpty(e.ClickedItem.Text)) + { + if (e.ClickedItem.Text.StartsWith("Close")) + { +#if false + // stop child adapters... + closeAllChild(); +#endif + // chiudo! + Close(); + } + else if (e.ClickedItem.Text.StartsWith("Show")) + { + if (AccUtils.CRB("windowCanMax")) + { + Show(); + WindowState = FormWindowState.Normal; + } + } + } + } + #endregion Private Methods } } \ No newline at end of file diff --git a/EgwControlCenter/ControlCenter.resx b/EgwControlCenter/ControlCenter.resx index 4f36b58..7072d7c 100644 --- a/EgwControlCenter/ControlCenter.resx +++ b/EgwControlCenter/ControlCenter.resx @@ -290,6 +290,12 @@ AAA= + + 236, 17 + + + 351, 17 + AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA diff --git a/EgwControlCenter/EgwControlCenter.csproj b/EgwControlCenter/EgwControlCenter.csproj index 17672c4..c538ad8 100644 --- a/EgwControlCenter/EgwControlCenter.csproj +++ b/EgwControlCenter/EgwControlCenter.csproj @@ -12,4 +12,13 @@ + + + Always + + + PreserveNewest + + + \ No newline at end of file diff --git a/LiMan.Transfer/Resources/ChangeLog.html b/LiMan.Transfer/Resources/ChangeLog.html index 10ff335..1ced187 100644 --- a/LiMan.Transfer/Resources/ChangeLog.html +++ b/LiMan.Transfer/Resources/ChangeLog.html @@ -1,6 +1,6 @@ License Manager -

Versione: 1.1.2409.1807

+

Versione: 1.1.2409.1910


Note di rilascio:
    diff --git a/LiMan.Transfer/Resources/VersNum.txt b/LiMan.Transfer/Resources/VersNum.txt index e130097..2c7f5a0 100644 --- a/LiMan.Transfer/Resources/VersNum.txt +++ b/LiMan.Transfer/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2409.1807 +1.1.2409.1910 diff --git a/LiMan.Transfer/Resources/manifest.xml b/LiMan.Transfer/Resources/manifest.xml index 878febb..258093c 100644 --- a/LiMan.Transfer/Resources/manifest.xml +++ b/LiMan.Transfer/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2409.1807 + 1.1.2409.1910 https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.Transfer.zip https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html false diff --git a/LiMan.UI/Components/ListApplicazioni.razor b/LiMan.UI/Components/ListApplicazioni.razor index ce74132..7e9da4f 100644 --- a/LiMan.UI/Components/ListApplicazioni.razor +++ b/LiMan.UI/Components/ListApplicazioni.razor @@ -62,6 +62,7 @@ { Tipo Descrizione + Rel. Db ConnString } @@ -100,7 +101,13 @@
    @record.Descrizione
    - + + @if (CurrVersNum(record.CodApp) != "0.0.0.0") + { + @CurrVersNum(record.CodApp) + } + + @if (UserHasClaim("Admin")) {
    @record.TplConnString
    diff --git a/LiMan.UI/Components/ListApplicazioni.razor.cs b/LiMan.UI/Components/ListApplicazioni.razor.cs index 62bf62b..af4ed2a 100644 --- a/LiMan.UI/Components/ListApplicazioni.razor.cs +++ b/LiMan.UI/Components/ListApplicazioni.razor.cs @@ -182,6 +182,17 @@ namespace LiMan.UI.Components #region Private Fields + private string CurrVersNum(string CodApp) + { + string answ = ""; + var pUpd = Task.Run(async () => + { + answ = await DataService.ReleaseLastGetByApp(CodApp); + }); + pUpd.Wait(); + return answ; + } + private string gridKey = "ListApplicazioni"; private List ListRecords; diff --git a/LiMan.UI/Data/LiManDataService.cs b/LiMan.UI/Data/LiManDataService.cs index ec5aa22..4857752 100644 --- a/LiMan.UI/Data/LiManDataService.cs +++ b/LiMan.UI/Data/LiManDataService.cs @@ -12,6 +12,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Newtonsoft.Json; using NLog; +using Org.BouncyCastle.Asn1.Pkcs; using StackExchange.Redis; using System; using System.Collections.Generic; @@ -287,7 +288,6 @@ namespace LiMan.UI.Data { Log.Error($"Error during AuthClaimByUserID:{Environment.NewLine}{exc}"); } - //return await Task.FromResult(dbResult); return dbResult; } @@ -934,6 +934,54 @@ namespace LiMan.UI.Data /// public async Task> ReleaseGetByApp(string CodApp) { + string source = "DB"; + List? dbResult = new List(); + try + { + string currKey = $"{Const.rKeyConfig}:App:AllRel:{CodApp}"; + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + string? rawData = await redisDb.StringGetAsync(currKey); + if (!string.IsNullOrEmpty(rawData)) + { + source = "REDIS"; + var tempResult = JsonConvert.DeserializeObject>(rawData); + if (tempResult == null) + { + dbResult = new List(); + } + else + { + dbResult = tempResult; + } + } + else + { + dbResult = dbControllerNext.ReleaseGetByApp(CodApp); + rawData = JsonConvert.SerializeObject(dbResult, JSSettings); + await redisDb.StringSetAsync(currKey, rawData, LongCache); + // per evitare loopback uso deserialize... + var tempResult = JsonConvert.DeserializeObject>(rawData); + if (tempResult != null) + { + dbResult = tempResult; + } + } + if (dbResult == null) + { + dbResult = new List(); + } + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Debug($"ReleaseGetByApp | {source} in: {ts.TotalMilliseconds} ms"); + } + catch (Exception exc) + { + Log.Error($"Error during ReleaseGetByApp:{Environment.NewLine}{exc}"); + } + return dbResult; + +#if false await Task.Delay(1); List dbResult = new List(); Stopwatch stopWatch = new Stopwatch(); @@ -942,7 +990,39 @@ namespace LiMan.UI.Data stopWatch.Stop(); TimeSpan ts = stopWatch.Elapsed; Log.Trace($"Effettuata lettura da DB per ReleaseGetByApp | {CodApp} | {ts.TotalMilliseconds} ms"); - return dbResult; + return dbResult; +#endif + } + + /// + /// Ultima Release dato Applicativo + /// + /// Codice Applicazione + /// + public async Task ReleaseLastGetByApp(string CodApp) + { + string answ = ""; + RedisKey currKey = $"{Const.rKeyConfig}:App:CurrRel"; + var rawVal = await redisDb.HashGetAsync(currKey, CodApp); + if (rawVal.HasValue) + { + answ = $"{rawVal}"; + } + else + { + var rawList = await ReleaseGetByApp(CodApp); + if (rawList != null) + { + var lastRel = rawList + .OrderByDescending(x => x.VersVal) + .ThenByDescending(x => x.ReleaseDate) + .FirstOrDefault() ?? new ReleaseModel() { CodApp = CodApp }; + answ = lastRel.VersNum; + // salvo su redis tab... + await redisDb.HashSetAsync(currKey, CodApp, answ); + } + } + return answ; } /// diff --git a/LiMan.UI/LiMan.UI.csproj b/LiMan.UI/LiMan.UI.csproj index fb648ba..f48cf8f 100644 --- a/LiMan.UI/LiMan.UI.csproj +++ b/LiMan.UI/LiMan.UI.csproj @@ -2,7 +2,7 @@ net6.0 - 1.1.2409.1807 + 1.1.2409.1910 LiMan.UI LiMan.UI diff --git a/LiMan.UI/Resources/ChangeLog.html b/LiMan.UI/Resources/ChangeLog.html index d997f84..21bb0bd 100644 --- a/LiMan.UI/Resources/ChangeLog.html +++ b/LiMan.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ License Manager -

    Versione: 1.1.2409.1807

    +

    Versione: 1.1.2409.1910


    Note di rilascio:
    • diff --git a/LiMan.UI/Resources/VersNum.txt b/LiMan.UI/Resources/VersNum.txt index e130097..2c7f5a0 100644 --- a/LiMan.UI/Resources/VersNum.txt +++ b/LiMan.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2409.1807 +1.1.2409.1910 diff --git a/LiMan.UI/Resources/manifest.xml b/LiMan.UI/Resources/manifest.xml index 7ed87fd..5f8f799 100644 --- a/LiMan.UI/Resources/manifest.xml +++ b/LiMan.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2409.1807 + 1.1.2409.1910 https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html false