From 4377e1236cfb51b7222dd0ff5ee9eef1e4c29f75 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 8 Sep 2021 09:31:53 +0200
Subject: [PATCH 01/14] review migrazioni

---
 ...r.cs => 20210908072932_InitDb.Designer.cs} | 41 +------------------
 ...215_InitDb.cs => 20210908072932_InitDb.cs} | 34 ---------------
 .../MoonPro_ProgContextModelSnapshot.cs       | 39 ------------------
 3 files changed, 1 insertion(+), 113 deletions(-)
 rename MP.FileData/Migrations/{20210907103215_InitDb.Designer.cs => 20210908072932_InitDb.Designer.cs} (81%)
 rename MP.FileData/Migrations/{20210907103215_InitDb.cs => 20210908072932_InitDb.cs} (78%)

diff --git a/MP.FileData/Migrations/20210907103215_InitDb.Designer.cs b/MP.FileData/Migrations/20210908072932_InitDb.Designer.cs
similarity index 81%
rename from MP.FileData/Migrations/20210907103215_InitDb.Designer.cs
rename to MP.FileData/Migrations/20210908072932_InitDb.Designer.cs
index eca66e12..6c6d68c5 100644
--- a/MP.FileData/Migrations/20210907103215_InitDb.Designer.cs
+++ b/MP.FileData/Migrations/20210908072932_InitDb.Designer.cs
@@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace MP.FileData.Migrations
 {
     [DbContext(typeof(MoonPro_ProgContext))]
-    [Migration("20210907103215_InitDb")]
+    [Migration("20210908072932_InitDb")]
     partial class InitDb
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -37,34 +37,6 @@ namespace MP.FileData.Migrations
                     b.ToTable("FileModelTagModel");
                 });
 
-            modelBuilder.Entity("MP.FileData.DatabaseModels.ArticoloModel", b =>
-                {
-                    b.Property<string>("CodArticolo")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("DescArticolo")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Disegno")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Tipo")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("CodArticolo");
-
-                    b.ToTable("Articoli");
-
-                    b.HasData(
-                        new
-                        {
-                            CodArticolo = "ND",
-                            DescArticolo = "--- Tutti ---",
-                            Disegno = "",
-                            Tipo = "ND"
-                        });
-                });
-
             modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b =>
                 {
                     b.Property<int>("FileId")
@@ -75,9 +47,6 @@ namespace MP.FileData.Migrations
                     b.Property<bool>("Active")
                         .HasColumnType("bit");
 
-                    b.Property<string>("CodArticolo")
-                        .HasColumnType("nvarchar(450)");
-
                     b.Property<int>("DiskStatus")
                         .HasColumnType("int");
 
@@ -113,8 +82,6 @@ namespace MP.FileData.Migrations
 
                     b.HasKey("FileId");
 
-                    b.HasIndex("CodArticolo");
-
                     b.HasIndex("IdxMacchina");
 
                     b.ToTable("Files");
@@ -191,16 +158,10 @@ namespace MP.FileData.Migrations
 
             modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b =>
                 {
-                    b.HasOne("MP.FileData.DatabaseModels.ArticoloModel", "Articolo")
-                        .WithMany()
-                        .HasForeignKey("CodArticolo");
-
                     b.HasOne("MP.FileData.DatabaseModels.MacchinaModel", "Macchina")
                         .WithMany()
                         .HasForeignKey("IdxMacchina");
 
-                    b.Navigation("Articolo");
-
                     b.Navigation("Macchina");
                 });
 #pragma warning restore 612, 618
diff --git a/MP.FileData/Migrations/20210907103215_InitDb.cs b/MP.FileData/Migrations/20210908072932_InitDb.cs
similarity index 78%
rename from MP.FileData/Migrations/20210907103215_InitDb.cs
rename to MP.FileData/Migrations/20210908072932_InitDb.cs
index 4ab48e1b..fa1d4b60 100644
--- a/MP.FileData/Migrations/20210907103215_InitDb.cs
+++ b/MP.FileData/Migrations/20210908072932_InitDb.cs
@@ -7,20 +7,6 @@ namespace MP.FileData.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.CreateTable(
-                name: "Articoli",
-                columns: table => new
-                {
-                    CodArticolo = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    DescArticolo = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Disegno = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Tipo = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Articoli", x => x.CodArticolo);
-                });
-
             migrationBuilder.CreateTable(
                 name: "Macchine",
                 columns: table => new
@@ -57,7 +43,6 @@ namespace MP.FileData.Migrations
                     FileId = table.Column<int>(type: "int", nullable: false)
                         .Annotation("SqlServer:Identity", "1, 1"),
                     Active = table.Column<bool>(type: "bit", nullable: false),
-                    CodArticolo = table.Column<string>(type: "nvarchar(450)", nullable: true),
                     IdxMacchina = table.Column<string>(type: "nvarchar(450)", nullable: true),
                     Name = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     Rev = table.Column<int>(type: "int", nullable: false),
@@ -73,12 +58,6 @@ namespace MP.FileData.Migrations
                 constraints: table =>
                 {
                     table.PrimaryKey("PK_Files", x => x.FileId);
-                    table.ForeignKey(
-                        name: "FK_Files_Articoli_CodArticolo",
-                        column: x => x.CodArticolo,
-                        principalTable: "Articoli",
-                        principalColumn: "CodArticolo",
-                        onDelete: ReferentialAction.Restrict);
                     table.ForeignKey(
                         name: "FK_Files_Macchine_IdxMacchina",
                         column: x => x.IdxMacchina,
@@ -111,11 +90,6 @@ namespace MP.FileData.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
-            migrationBuilder.InsertData(
-                table: "Articoli",
-                columns: new[] { "CodArticolo", "DescArticolo", "Disegno", "Tipo" },
-                values: new object[] { "ND", "--- Tutti ---", "", "ND" });
-
             migrationBuilder.InsertData(
                 table: "Macchine",
                 columns: new[] { "IdxMacchina", "BasePath", "CodMacchina", "Descrizione", "ImgUrl", "Nome", "Note", "ShowOrder" },
@@ -126,11 +100,6 @@ namespace MP.FileData.Migrations
                 table: "FileModelTagModel",
                 column: "TagsTagId");
 
-            migrationBuilder.CreateIndex(
-                name: "IX_Files_CodArticolo",
-                table: "Files",
-                column: "CodArticolo");
-
             migrationBuilder.CreateIndex(
                 name: "IX_Files_IdxMacchina",
                 table: "Files",
@@ -148,9 +117,6 @@ namespace MP.FileData.Migrations
             migrationBuilder.DropTable(
                 name: "Tags");
 
-            migrationBuilder.DropTable(
-                name: "Articoli");
-
             migrationBuilder.DropTable(
                 name: "Macchine");
         }
diff --git a/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs b/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs
index 1be4c878..5c4ce761 100644
--- a/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs
+++ b/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs
@@ -35,34 +35,6 @@ namespace MP.FileData.Migrations
                     b.ToTable("FileModelTagModel");
                 });
 
-            modelBuilder.Entity("MP.FileData.DatabaseModels.ArticoloModel", b =>
-                {
-                    b.Property<string>("CodArticolo")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("DescArticolo")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Disegno")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Tipo")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("CodArticolo");
-
-                    b.ToTable("Articoli");
-
-                    b.HasData(
-                        new
-                        {
-                            CodArticolo = "ND",
-                            DescArticolo = "--- Tutti ---",
-                            Disegno = "",
-                            Tipo = "ND"
-                        });
-                });
-
             modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b =>
                 {
                     b.Property<int>("FileId")
@@ -73,9 +45,6 @@ namespace MP.FileData.Migrations
                     b.Property<bool>("Active")
                         .HasColumnType("bit");
 
-                    b.Property<string>("CodArticolo")
-                        .HasColumnType("nvarchar(450)");
-
                     b.Property<int>("DiskStatus")
                         .HasColumnType("int");
 
@@ -111,8 +80,6 @@ namespace MP.FileData.Migrations
 
                     b.HasKey("FileId");
 
-                    b.HasIndex("CodArticolo");
-
                     b.HasIndex("IdxMacchina");
 
                     b.ToTable("Files");
@@ -189,16 +156,10 @@ namespace MP.FileData.Migrations
 
             modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b =>
                 {
-                    b.HasOne("MP.FileData.DatabaseModels.ArticoloModel", "Articolo")
-                        .WithMany()
-                        .HasForeignKey("CodArticolo");
-
                     b.HasOne("MP.FileData.DatabaseModels.MacchinaModel", "Macchina")
                         .WithMany()
                         .HasForeignKey("IdxMacchina");
 
-                    b.Navigation("Articolo");
-
                     b.Navigation("Macchina");
                 });
 #pragma warning restore 612, 618

From 9dfa8d2de5a5e25456bcf18f4d52f03a3494cfe2 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 8 Sep 2021 09:32:04 +0200
Subject: [PATCH 02/14] Eliminaizone articolo da struttura DB

---
 MP.FileData/Controllers/FileController.cs   | 176 ++++++++++----------
 MP.FileData/DatabaseModels/ArticoloModel.cs |  27 ---
 MP.FileData/DatabaseModels/FileModel.cs     |   3 -
 MP.FileData/ModelBuilderExtensions.cs       |   7 +-
 MP.FileData/MoonPro_ProgContext.cs          |   2 +-
 5 files changed, 89 insertions(+), 126 deletions(-)
 delete mode 100644 MP.FileData/DatabaseModels/ArticoloModel.cs

diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs
index 84b7a312..ac190761 100644
--- a/MP.FileData/Controllers/FileController.cs
+++ b/MP.FileData/Controllers/FileController.cs
@@ -34,44 +34,6 @@ namespace MP.FileData.Controllers
 
         #region Public Methods
 
-        /// <summary>
-        /// Elenco tabella Articoli (FILTRATO!!!)
-        /// </summary>
-        /// <param name="searchVal"></param>
-        /// <param name="maxNum"></param>
-        /// <returns></returns>
-        public List<DatabaseModels.ArticoloModel> ArtGetFilt(string searchVal, int maxNum = 100)
-        {
-            maxNum = maxNum <= 0 ? 100 : maxNum;
-            List<DatabaseModels.ArticoloModel> dbResult = new List<DatabaseModels.ArticoloModel>();
-            using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
-            {
-                int totRecord = localDbCtx
-                .DbSetArticoli
-                .Where(x => x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal))
-                .Count();
-                if (totRecord > maxNum)
-                {
-                    dbResult = localDbCtx
-                        .DbSetArticoli
-                        .Where(x => x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal))
-                        .OrderBy(x => x.DescArticolo)
-                        .Take(maxNum)
-                        .ToList();
-                    dbResult.Add(new DatabaseModels.ArticoloModel() { CodArticolo = "#####", DescArticolo = $"... +{totRecord - maxNum} rec ..." });
-                }
-                else
-                {
-                    dbResult = localDbCtx
-                        .DbSetArticoli
-                        .Where(x => x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal))
-                        .OrderBy(x => x.DescArticolo)
-                        .ToList();
-                }
-            }
-            return dbResult;
-        }
-
         /// <summary>
         /// Effettua la comparazione tra i file in archivio ed i file attuali e segna info LastCheck e Changed (se cambiati)
         /// </summary>
@@ -176,7 +138,7 @@ namespace MP.FileData.Controllers
                 // se ce ne fosse un altro precedente --> lo (ri)attiva
                 var file2open = localDbCtx
                     .DbSetProgFile
-                    .Where(x => x.Articolo == currItem.Articolo && x.IdxMacchina == currItem.IdxMacchina)
+                    .Where(x => x.Name == currItem.Name && x.IdxMacchina == currItem.IdxMacchina)
                     .OrderByDescending(y => y.Rev)
                     .FirstOrDefault();
                 if (file2open != null)
@@ -242,7 +204,7 @@ namespace MP.FileData.Controllers
                 dbResult = localDbCtx
                 .DbSetProgFile
                 .Include(m => m.Macchina)
-                .Include(a => a.Articolo)
+                .Include(t => t.Tags)
                 .Where(x => (x.IdxMacchina == IdxMacchina || IdxMacchina == "0") && (x.Active == OnlyActive || !OnlyActive) && (!OnlyMod || x.DiskStatus != FileState.Ok) && (x.Name.Contains(SearchVal) || string.IsNullOrEmpty(SearchVal)))
                 .OrderByDescending(x => x.LastMod)
                 .ToList();
@@ -270,7 +232,6 @@ namespace MP.FileData.Controllers
                     List<DatabaseModels.FileModel> newRec = newFiles.Select(o => new DatabaseModels.FileModel()
                     {
                         Active = true,
-                        CodArticolo = "ND",
                         DiskStatus = FileState.Ok,
                         IdxMacchina = idxMacchina,
                         LastCheck = adesso,
@@ -444,6 +405,91 @@ namespace MP.FileData.Controllers
             return done;
         }
 
+        /// <summary>
+        /// Elenco tabella Macchine
+        /// </summary>
+        /// <returns></returns>
+        public List<DatabaseModels.MacchinaModel> MacchineGetAll()
+        {
+            List<DatabaseModels.MacchinaModel> dbResult = new List<DatabaseModels.MacchinaModel>();
+            using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
+            {
+                dbResult = localDbCtx
+                .DbSetMacchine
+                .OrderBy(x => x.IdxMacchina)
+                .ToList();
+            }
+            return dbResult;
+        }
+
+        public void ResetController()
+        {
+            dbCtx = new MoonPro_ProgContext(_configuration);
+            Log.Info("Effettuato reset FileController");
+        }
+
+        /// <summary>
+        /// Annulla modifiche su una specifica entity (cancel update)
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns></returns>
+        public bool RollBackEntity(object item)
+        {
+            bool answ = false;
+            try
+            {
+                if (dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Deleted || dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Modified)
+                {
+                    dbCtx.Entry(item).Reload();
+                }
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}");
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Elenco TAGS (FILTRATO!!!)
+        /// </summary>
+        /// <param name="searchVal"></param>
+        /// <param name="maxNum"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.TagModel> TagGetFilt(string searchVal, int maxNum = 100)
+        {
+            maxNum = maxNum <= 0 ? 100 : maxNum;
+            List<DatabaseModels.TagModel> dbResult = new List<DatabaseModels.TagModel>();
+            using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
+            {
+                int totRecord = localDbCtx
+                .DbSetTags
+                .Where(x => x.TagId.Contains(searchVal))
+                .Count();
+                if (totRecord > maxNum)
+                {
+                    dbResult = localDbCtx
+                        .DbSetTags
+                        .Where(x => x.TagId.Contains(searchVal))
+                        .OrderBy(x => x.TagId)
+                        .Take(maxNum)
+                        .ToList();
+                    dbResult.Add(new DatabaseModels.TagModel() { TagId = $"... +{totRecord - maxNum} rec ..." });
+                }
+                else
+                {
+                    dbResult = localDbCtx
+                        .DbSetTags
+                        .Where(x => x.TagId.Contains(searchVal))
+                        .OrderBy(x => x.TagId)
+                        .ToList();
+                }
+            }
+            return dbResult;
+        }
+
+        #endregion Public Methods
+
 #if false
         /// <summary>
         /// Elenco Azioni (decodifica)
@@ -500,54 +546,6 @@ namespace MP.FileData.Controllers
             return dbResult;
         }
 #endif
-
-        /// <summary>
-        /// Elenco tabella Macchine
-        /// </summary>
-        /// <returns></returns>
-        public List<DatabaseModels.MacchinaModel> MacchineGetAll()
-        {
-            List<DatabaseModels.MacchinaModel> dbResult = new List<DatabaseModels.MacchinaModel>();
-            using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
-            {
-                dbResult = localDbCtx
-                .DbSetMacchine
-                .OrderBy(x => x.IdxMacchina)
-                .ToList();
-            }
-            return dbResult;
-        }
-
-        public void ResetController()
-        {
-            dbCtx = new MoonPro_ProgContext(_configuration);
-            Log.Info("Effettuato reset FileController");
-        }
-
-        /// <summary>
-        /// Annulla modifiche su una specifica entity (cancel update)
-        /// </summary>
-        /// <param name="item"></param>
-        /// <returns></returns>
-        public bool RollBackEntity(object item)
-        {
-            bool answ = false;
-            try
-            {
-                if (dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Deleted || dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Modified)
-                {
-                    dbCtx.Entry(item).Reload();
-                }
-            }
-            catch (Exception exc)
-            {
-                Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}");
-            }
-            return answ;
-        }
-
-        #endregion Public Methods
-
 #if false
         /// <summary>
         /// Elenco tabella controlli da filtro
diff --git a/MP.FileData/DatabaseModels/ArticoloModel.cs b/MP.FileData/DatabaseModels/ArticoloModel.cs
deleted file mode 100644
index c1e6e739..00000000
--- a/MP.FileData/DatabaseModels/ArticoloModel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-// <Auto-Generated>
-// This is here so CodeMaid doesn't reorganize this document
-// </Auto-Generated>
-namespace MP.FileData.DatabaseModels
-{
-    [Table("Articoli")]
-    public partial class ArticoloModel
-    {
-        #region Public Properties
-
-        [Key]
-        public string CodArticolo { get; set; }
-        public string DescArticolo { get; set; }
-        public string Disegno { get; set; }
-        public string Tipo { get; set; }
-
-        #endregion Public Properties
-    }
-}
diff --git a/MP.FileData/DatabaseModels/FileModel.cs b/MP.FileData/DatabaseModels/FileModel.cs
index af9953b5..021998d8 100644
--- a/MP.FileData/DatabaseModels/FileModel.cs
+++ b/MP.FileData/DatabaseModels/FileModel.cs
@@ -22,7 +22,6 @@ namespace MP.FileData.DatabaseModels
         [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int FileId { get; set; }
         public bool Active { get; set; } = true;
-        public string CodArticolo { get; set; }
         public string IdxMacchina { get; set; } = "";
         public string Name { get; set; } = "";
         public int Rev { get; set; } = 0;
@@ -51,8 +50,6 @@ namespace MP.FileData.DatabaseModels
             }
         }
 
-        [ForeignKey("CodArticolo")]
-        public virtual ArticoloModel Articolo { get; set; }
         [ForeignKey("IdxMacchina")]
         public virtual MacchinaModel Macchina { get; set; }
 
diff --git a/MP.FileData/ModelBuilderExtensions.cs b/MP.FileData/ModelBuilderExtensions.cs
index 74beddde..b3415b80 100644
--- a/MP.FileData/ModelBuilderExtensions.cs
+++ b/MP.FileData/ModelBuilderExtensions.cs
@@ -18,15 +18,10 @@ namespace MP.FileData
         /// <param name="modelBuilder"></param>
         public static void Seed(this ModelBuilder modelBuilder)
         {
-            // inizializzazione dei valori di default x USER
+            // inizializzazione dei valori di default x MACCHINA
             modelBuilder.Entity<MacchinaModel>().HasData(
                 new MacchinaModel { IdxMacchina = "0", CodMacchina = "0", Descrizione = "--- Tutte ---", Nome = "--- Tutte ---", BasePath = "", ImgUrl = "", Note = "", ShowOrder = 0 }
                 );
-
-            // inizializzazione dei valori di default x Plant
-            modelBuilder.Entity<ArticoloModel>().HasData(
-                new ArticoloModel { CodArticolo = "ND", DescArticolo = "--- Tutti ---", Disegno = "", Tipo = "ND" }
-                );
         }
 
         #endregion Public Methods
diff --git a/MP.FileData/MoonPro_ProgContext.cs b/MP.FileData/MoonPro_ProgContext.cs
index 441c0b86..4b31796c 100644
--- a/MP.FileData/MoonPro_ProgContext.cs
+++ b/MP.FileData/MoonPro_ProgContext.cs
@@ -59,9 +59,9 @@ namespace MP.FileData
 
         #region Public Properties
 
-        public virtual DbSet<ArticoloModel> DbSetArticoli { get; set; }
         public virtual DbSet<MacchinaModel> DbSetMacchine { get; set; }
         public virtual DbSet<FileModel> DbSetProgFile { get; set; }
+        public virtual DbSet<TagModel> DbSetTags { get; set; }
 
         #endregion Public Properties
 

From 82736ca98338dedadc980832a1feb6c38162dc2c Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 8 Sep 2021 09:32:11 +0200
Subject: [PATCH 03/14] update x nuova gestione senza articolo

---
 MP.Prog/Components/DiffView.razor      |  4 +--
 MP.Prog/Components/FileEditor.razor.cs |  6 ++--
 MP.Prog/Data/FileArchDataService.cs    | 12 ++++----
 MP.Prog/MP.Prog.csproj                 |  1 +
 MP.Prog/Pages/Archive.razor            | 10 ++++---
 MP.Prog/Pages/Archive.razor.cs         | 29 +++++++++----------
 MP.Prog/Pages/Setup.razor              | 39 --------------------------
 7 files changed, 32 insertions(+), 69 deletions(-)

diff --git a/MP.Prog/Components/DiffView.razor b/MP.Prog/Components/DiffView.razor
index 845fc93e..346db6ca 100644
--- a/MP.Prog/Components/DiffView.razor
+++ b/MP.Prog/Components/DiffView.razor
@@ -24,8 +24,8 @@
                 </div>
                 <div class="col-4">
                 </div>
-                <div class="col-4 text-right">
-                    <span class="border border-danger table-danger px-2"><b>@numChanges</b> modifiche</span>
+                <div class="col-4 text-right p-2">
+                    <span class="border border-danger table-danger py-1 px-2"><b>@numChanges</b> modifiche</span>
                 </div>
             </div>
         </div>
diff --git a/MP.Prog/Components/FileEditor.razor.cs b/MP.Prog/Components/FileEditor.razor.cs
index d600311a..dd163112 100644
--- a/MP.Prog/Components/FileEditor.razor.cs
+++ b/MP.Prog/Components/FileEditor.razor.cs
@@ -36,9 +36,6 @@ namespace MP.Prog.Components
 
         #region Public Properties
 
-        [Parameter]
-        public List<ArticoloModel> ArtList { get; set; }
-
         [Parameter]
         public FileModel currItem
         {
@@ -61,6 +58,9 @@ namespace MP.Prog.Components
         [Parameter]
         public List<MacchinaModel> MacList { get; set; }
 
+        [Parameter]
+        public List<TagModel> TagList { get; set; }
+
         #endregion Public Properties
 
         #region Private Methods
diff --git a/MP.Prog/Data/FileArchDataService.cs b/MP.Prog/Data/FileArchDataService.cs
index 0f1d2a5c..d8ea5784 100644
--- a/MP.Prog/Data/FileArchDataService.cs
+++ b/MP.Prog/Data/FileArchDataService.cs
@@ -205,12 +205,6 @@ namespace MP.Prog.Data
 
         #region Public Methods
 
-        public Task<List<MP.FileData.DatabaseModels.ArticoloModel>> ArticoliGetFilt(string SearchVal)
-        {
-            return Task.FromResult(dbController.ArtGetFilt(SearchVal, 200).ToList());
-            //return Task.FromResult(dbController.ArtGetFilt(SearchVal, 20).ToList());
-        }
-
         public void Dispose()
         {
             // Clear database controller
@@ -245,6 +239,12 @@ namespace MP.Prog.Data
             dbController.RollBackEntity(item);
         }
 
+        public Task<List<MP.FileData.DatabaseModels.TagModel>> TagGetFilt(string SearchVal)
+        {
+            return Task.FromResult(dbController.TagGetFilt(SearchVal, 200).ToList());
+            //return Task.FromResult(dbController.ArtGetFilt(SearchVal, 20).ToList());
+        }
+
         /// <summary>
         /// Aggiorna intero archivio scansionando dati x tutte le macchine che hanno un path valido
         /// </summary>
diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj
index 8f98d113..6dcb148c 100644
--- a/MP.Prog/MP.Prog.csproj
+++ b/MP.Prog/MP.Prog.csproj
@@ -9,6 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Remove="Components\CodArtSelector.razor" />
     <Content Remove="Components\DataPager.razor" />
   </ItemGroup>
 
diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor
index 31c0b83f..e119936d 100644
--- a/MP.Prog/Pages/Archive.razor
+++ b/MP.Prog/Pages/Archive.razor
@@ -65,7 +65,7 @@
     <div class="card-body p-1">
         @if (currRecord != null)
         {
-            <MP.Prog.Components.FileEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" ArtList="@ArtList" MacList="@MacList"></MP.Prog.Components.FileEditor>
+            <MP.Prog.Components.FileEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" ArtList="@TagList" MacList="@MacList"></MP.Prog.Components.FileEditor>
         }
         @if (ListRecords == null)
         {
@@ -89,7 +89,7 @@
                                 <th>Size</th>
                                 <th class="text-center">State</th>
                                 <th>Macchina</th>
-                                <th>Articolo</th>
+                                <th>Tags</th>
                                 <th class="text-right">Modificato</th>
                                 @*<th>Controllo</th>*@
                             </tr>
@@ -136,8 +136,10 @@
                                         <div class="small">@record.Macchina.Descrizione</div>
                                     </td>
                                     <td>
-                                        <div>@record.Articolo.Disegno</div>
-                                        <div class="small">@record.Articolo.DescArticolo</div>
+                                        @foreach (var item in record.Tags)
+                                        {
+                                            <span class="badge badge-info small">@item.TagId</span>
+                                        }
                                     </td>
                                     <td class="text-right">
                                         <div>@record.LastMod.ToString("yyyy.MM.dd")</div>
diff --git a/MP.Prog/Pages/Archive.razor.cs b/MP.Prog/Pages/Archive.razor.cs
index f9279fde..b7230ead 100644
--- a/MP.Prog/Pages/Archive.razor.cs
+++ b/MP.Prog/Pages/Archive.razor.cs
@@ -13,20 +13,19 @@ namespace MP.Prog.Pages
     {
         #region Private Fields
 
-        private List<ArticoloModel> ArtList;
-
         private FileModel currRecord = null;
         private List<FileModel> ListRecords;
         private List<MacchinaModel> MacList;
         private List<FileModel> SearchRecords;
+        private List<TagModel> TagList;
 
         #endregion Private Fields
 
         #region Protected Fields
 
-        protected string _SearchArt;
+        protected string _SearchTag;
 
-        protected string defCodArt = "";
+        protected string defTag = "";
 
         #endregion Protected Fields
 
@@ -170,26 +169,26 @@ namespace MP.Prog.Pages
         [Inject]
         protected NavigationManager NavManager { get; set; }
 
-        protected string SearchArt
+        protected string SearchTag
         {
             get
             {
-                return _SearchArt;
+                return _SearchTag;
             }
             set
             {
                 isLoading = true;
-                _SearchArt = value;
+                _SearchTag = value;
                 // se son > 3 char... debounce...
                 if (string.IsNullOrEmpty(value))
                 {
-                    _SearchArt = defCodArt;
+                    _SearchTag = defTag;
                 }
-                if (value.Length >= defCodArt.Length)
+                if (value.Length >= defTag.Length)
                 {
                     var pUpd = Task.Run(async () =>
                     {
-                        ArtList = await DataService.ArticoliGetFilt(SearchArt);
+                        TagList = await DataService.TagGetFilt(SearchTag);
                     });
                     pUpd.Wait();
                 }
@@ -289,7 +288,7 @@ namespace MP.Prog.Pages
         protected override async Task OnInitializedAsync()
         {
             DataService.ResetController();
-            SearchArt = defCodArt;
+            SearchTag = defTag;
             AppMService.ShowSearch = false;
             AppMService.PageName = "Archivio File Programmi";
             AppMService.PageIcon = "fas fa-folder pr-2";
@@ -302,9 +301,9 @@ namespace MP.Prog.Pages
             isLoading = true;
             MacList = await DataService.MacchineGetAll();
             SelIdxMacc = "0";
-            SearchArt = defCodArt;
+            SearchTag = defTag;
 
-            ArtList = await DataService.ArticoliGetFilt(SearchArt);
+            TagList = await DataService.TagGetFilt(SearchTag);
 
             isLoading = false;
             await ReloadData();
@@ -322,13 +321,13 @@ namespace MP.Prog.Pages
             SearchRecords = null;
             ListRecords = null;
             AppMService.File_Filter = SelectData.Init(5, 10);
-            SearchArt = defCodArt;
+            SearchTag = defTag;
             await ReloadAllData();
         }
 
         protected void ResetSearchArt()
         {
-            SearchArt = defCodArt;
+            SearchTag = defTag;
         }
 
         protected void searchArtUpd(string newCod)
diff --git a/MP.Prog/Pages/Setup.razor b/MP.Prog/Pages/Setup.razor
index d7f551ca..cef56f59 100644
--- a/MP.Prog/Pages/Setup.razor
+++ b/MP.Prog/Pages/Setup.razor
@@ -8,45 +8,6 @@
 
 <h3>Setup</h3>
 
-<div class="row">
-    <div class="col-6">
-        <textarea @bind="@oldText" cols="50" rows="30" />
-    </div>
-    <div class="col-6">
-        <textarea @bind="@newText" cols="50" rows="30" />
-    </div>
-    <div class="col-12">
-        <MP.Prog.Components.DiffView oldText="@oldText" newText="@newText"></MP.Prog.Components.DiffView>
-    </div>
-</div>
-
 @code {
 
-    protected string _oldText = "Prova primo testo";
-    protected string _newText = "Prova secondo testo";
-
-    protected string oldText
-    {
-        get
-        {
-            return _oldText;
-        }
-        set
-        {
-            _oldText = value;
-        }
-    }
-
-    protected string newText
-    {
-        get
-        {
-            return _newText;
-        }
-        set
-        {
-            _newText = value;
-        }
-    }
-
 }
\ No newline at end of file

From 0f2013c75f5acf585445b58b873f645f54e1f4c1 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 8 Sep 2021 10:41:23 +0200
Subject: [PATCH 04/14] Ok ricerca preliminare tags da file

---
 MP.FileData/Controllers/FileController.cs | 20 ++++++-
 MP.FileData/TagsUtils.cs                  | 69 +++++++++++++++++++++++
 MP.Prog/Pages/Archive.razor               |  2 +-
 3 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 MP.FileData/TagsUtils.cs

diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs
index ac190761..97a3930e 100644
--- a/MP.FileData/Controllers/FileController.cs
+++ b/MP.FileData/Controllers/FileController.cs
@@ -244,11 +244,29 @@ namespace MP.FileData.Controllers
                         FileContent = File.ReadAllBytes(o.FullName)
                     }).ToList();
 
-                    // calcolo MD5
+                    List<string> excludeTags = new List<string>() { "M4", "M5", "M4+A", "M4+B", "M5+A", "M5+B" };
+
+                    // calcolo MD5 e tags
                     foreach (var item in newRec)
                     {
                         var hash = md5.ComputeHash(item.FileContent);
                         item.MD5 = BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
+
+                        List<string> Tags = new List<string>();
+                        // cerco codice tag come nome file(TAG) nei primi 500 char
+                        string code2search = "";
+                        if (item.FileStringContent.Length > 200)
+                        {
+                            code2search = item.FileStringContent.Substring(0, 200);
+                        }
+                        else
+                        {
+                            code2search = item.FileStringContent;
+                        }
+                        Tags = TagsUtils.searchProgComment(item.Name, code2search, excludeTags);
+
+                        //// aggiungo i tags SE non ci fossero
+                        //item.Tags = Tags;
                     }
 
                     // aggiungo in blocco
diff --git a/MP.FileData/TagsUtils.cs b/MP.FileData/TagsUtils.cs
new file mode 100644
index 00000000..1c1fdbdc
--- /dev/null
+++ b/MP.FileData/TagsUtils.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace MP.FileData
+{
+    /// <summary>
+    /// Helper estrazione tag x programmi
+    /// </summary>
+    public class TagsUtils
+    {
+        #region Protected Fields
+
+        protected static List<string> ExcludeTags = new List<string>();
+
+        #endregion Protected Fields
+
+        #region Public Methods
+
+        /// <summary>
+        /// Cerca tag di commento inseriti nel formato
+        /// NOME_PROG(commento)
+        ///
+        /// es: O00123(172L D20.5) --> estrae 172L D20.5
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="fileContent"></param>
+        /// <returns></returns>
+        public static List<string> searchProgComment(string fileName, string fileContent, List<string> excludeTags)
+        {
+            // bonifico: a capo --> spazi
+            fileContent = fileContent.Replace(Environment.NewLine, " ");
+            List<string> answ = new List<string>();
+            if (fileContent.Length > 0)
+            {
+                // uso regexp
+                string pattern = $"\\b{fileName}" + @".{0,2}\([\w\d\s]+\)";
+                MatchCollection matchTags = Regex.Matches(fileContent, pattern);
+                if (matchTags.Count > 0)
+                {
+                    for (int count = 0; count < matchTags.Count; count++)
+                    {
+                        // pulizia: elimino nome programma e parentesi
+                        string currMatch = matchTags[count].Value
+                                                .Replace(fileName, "")
+                                                .Replace("(", " ")
+                                                .Replace(")", " ").Trim();
+                        // split con spazi
+                        var splitTags = currMatch.Split(" ");
+                        foreach (var item in splitTags)
+                        {
+                            if (!excludeTags.Contains(item) && !string.IsNullOrEmpty(item))
+                            {
+                                // esclusione valori ignorati
+                                answ.Add(item);
+                            }
+                        }
+                    }
+                }
+            }
+            return answ;
+        }
+
+        #endregion Public Methods
+    }
+}
\ No newline at end of file
diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor
index e119936d..8490d541 100644
--- a/MP.Prog/Pages/Archive.razor
+++ b/MP.Prog/Pages/Archive.razor
@@ -65,7 +65,7 @@
     <div class="card-body p-1">
         @if (currRecord != null)
         {
-            <MP.Prog.Components.FileEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" ArtList="@TagList" MacList="@MacList"></MP.Prog.Components.FileEditor>
+            <MP.Prog.Components.FileEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" TagList="@TagList" MacList="@MacList"></MP.Prog.Components.FileEditor>
         }
         @if (ListRecords == null)
         {

From 8b3fa3652416db445e1f3028f2d6d62d2bff1e27 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 8 Sep 2021 11:00:34 +0200
Subject: [PATCH 05/14] Ancora update in import Tags

---
 MP.FileData/Controllers/FileController.cs | 87 +++++++++++++++++++++--
 1 file changed, 82 insertions(+), 5 deletions(-)

diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs
index 97a3930e..f008f7ee 100644
--- a/MP.FileData/Controllers/FileController.cs
+++ b/MP.FileData/Controllers/FileController.cs
@@ -244,7 +244,9 @@ namespace MP.FileData.Controllers
                         FileContent = File.ReadAllBytes(o.FullName)
                     }).ToList();
 
+                    // gestione Tags (da migliorare...)
                     List<string> excludeTags = new List<string>() { "M4", "M5", "M4+A", "M4+B", "M5+A", "M5+B" };
+                    var currTags = TagGetAll();
 
                     // calcolo MD5 e tags
                     foreach (var item in newRec)
@@ -253,11 +255,13 @@ namespace MP.FileData.Controllers
                         item.MD5 = BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
 
                         List<string> Tags = new List<string>();
-                        // cerco codice tag come nome file(TAG) nei primi 500 char
+                        List<TagModel> Tag2ins = new List<TagModel>();
+                        // cerco codice tag come nome file(TAG) nei primi 100 char
+                        int maxChar = 100;
                         string code2search = "";
-                        if (item.FileStringContent.Length > 200)
+                        if (item.FileStringContent.Length > maxChar)
                         {
-                            code2search = item.FileStringContent.Substring(0, 200);
+                            code2search = item.FileStringContent.Substring(0, maxChar);
                         }
                         else
                         {
@@ -265,8 +269,21 @@ namespace MP.FileData.Controllers
                         }
                         Tags = TagsUtils.searchProgComment(item.Name, code2search, excludeTags);
 
-                        //// aggiungo i tags SE non ci fossero
-                        //item.Tags = Tags;
+                        foreach (var tag in Tags)
+                        {
+                            var foundTag = currTags.Where(x => x.TagId == tag).ToList();
+                            // aggiungo i tags SE non ci fossero
+                            if (foundTag.Count == 0)
+                            {
+                                Tag2ins.Add(new TagModel() { TagId = tag });
+                            }
+                        }
+
+                        // salvo i tags
+                        TagInsert(Tag2ins);
+
+                        // salvo i tags relativi ai files
+                        item.Tags = Tag2ins;
                     }
 
                     // aggiungo in blocco
@@ -468,6 +485,25 @@ namespace MP.FileData.Controllers
             return answ;
         }
 
+        /// <summary>
+        /// Elenco TAGS (tutti)
+        /// </summary>
+        /// <param name="searchVal"></param>
+        /// <param name="maxNum"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.TagModel> TagGetAll()
+        {
+            List<DatabaseModels.TagModel> dbResult = new List<DatabaseModels.TagModel>();
+            using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
+            {
+                dbResult = localDbCtx
+                    .DbSetTags
+                    .OrderBy(x => x.TagId)
+                    .ToList();
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Elenco TAGS (FILTRATO!!!)
         /// </summary>
@@ -506,6 +542,47 @@ namespace MP.FileData.Controllers
             return dbResult;
         }
 
+        /// <summary>
+        /// Ricerca singolo record
+        /// </summary>
+        /// <param name="TagId"></param>
+        /// <returns></returns>
+        public TagModel TagGetSingle(string TagId)
+        {
+            TagModel dbResult = new TagModel();
+            using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
+            {
+                dbResult = localDbCtx
+                    .DbSetTags
+                    .Where(x => x.TagId == TagId)
+                    .FirstOrDefault();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// inserisce i tag
+        /// </summary>
+        /// <param name="newTags"></param>
+        /// <returns></returns>
+        public bool TagInsert(List<TagModel> newTags)
+        {
+            bool done = false;
+            using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
+            {
+                try
+                {
+                    localDbCtx.DbSetTags.AddRange(newTags);
+                    localDbCtx.SaveChanges();
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione in TagInsert{Environment.NewLine}{exc}");
+                }
+            }
+            return done;
+        }
+
         #endregion Public Methods
 
 #if false

From 7633bf504057327a1b4dd0089af8e045c5a141d5 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 8 Sep 2021 12:33:11 +0200
Subject: [PATCH 06/14] Ok x importare maggioranza tags

---
 MP.FileData/Controllers/FileController.cs | 94 +++++++++++++++--------
 MP.FileData/TagsUtils.cs                  | 20 ++++-
 MP.Prog/Data/FileArchDataService.cs       |  9 ++-
 3 files changed, 85 insertions(+), 38 deletions(-)

diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs
index f008f7ee..4242dd44 100644
--- a/MP.FileData/Controllers/FileController.cs
+++ b/MP.FileData/Controllers/FileController.cs
@@ -37,9 +37,14 @@ namespace MP.FileData.Controllers
         /// <summary>
         /// Effettua la comparazione tra i file in archivio ed i file attuali e segna info LastCheck e Changed (se cambiati)
         /// </summary>
+        /// <param name="idxMacchina">cod macchina</param>
+        /// <param name="path">path ricerca x macchina</param>
+        /// <param name="searchPattern">pattern di ricerca (*.*)</param>
+        /// <param name="excludePattern">pattern esclusione (separato da spazi</param>
         /// <returns></returns>
-        public bool CheckFileArchived(string idxMacchina, string path, string searchPattern)
+        public bool CheckFileArchived(string idxMacchina, string path, string searchPattern, string excludePattern)
         {
+            Log.Info($"CheckFileArchived S01 | macchina: {idxMacchina} | path: {path} | pattern: {searchPattern} | excludePattern: {excludePattern}");
             bool answ = false;
             DirectoryInfo dirInfo = new DirectoryInfo(path);
             FileInfo[] fileList = dirInfo.GetFiles(searchPattern);
@@ -55,38 +60,46 @@ namespace MP.FileData.Controllers
                 // verifica i file
                 foreach (var file in fileList)
                 {
-                    // cerca nel DB...
-                    FileModel currRecord = archivedFile
-                                    .Where(x => x.Active && x.Path == file.FullName)
-                                    .OrderByDescending(y => y.Rev)
-                                    .FirstOrDefault();
-                    // se NON trova lo crea
-                    if (currRecord == null)
+                    // escludo i file con desinenza da escludere...
+                    if (excludePattern.Contains(file.Extension) && !string.IsNullOrEmpty(file.Extension))
                     {
-                        fileNew.Add(file);
+                        Log.Info($"CheckFileArchived S02: escluso {file.Name} | estensione {file.Extension}");
                     }
                     else
                     {
-                        // verifico se data modifica sia cambiata...
-                        if (currRecord.LastMod != file.LastWriteTime)
+                        // cerca nel DB...
+                        FileModel currRecord = archivedFile
+                                        .Where(x => x.Active && x.Path == file.FullName)
+                                        .OrderByDescending(y => y.Rev)
+                                        .FirstOrDefault();
+                        // se NON trova lo crea
+                        if (currRecord == null)
                         {
-                            // calcolo e verifico MD5
-                            var fileContent = File.ReadAllBytes(file.FullName);
-                            var hash = md5.ComputeHash(fileContent);
-                            var newMD5 = BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
-                            if (newMD5 != currRecord.MD5)
+                            fileNew.Add(file);
+                        }
+                        else
+                        {
+                            // verifico se data modifica sia cambiata...
+                            if (currRecord.LastMod != file.LastWriteTime)
                             {
-                                fileMod.Add(currRecord);
+                                // calcolo e verifico MD5
+                                var fileContent = File.ReadAllBytes(file.FullName);
+                                var hash = md5.ComputeHash(fileContent);
+                                var newMD5 = BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
+                                if (newMD5 != currRecord.MD5)
+                                {
+                                    fileMod.Add(currRecord);
+                                }
+                                else
+                                {
+                                    fileChecked.Add(currRecord);
+                                }
                             }
                             else
                             {
                                 fileChecked.Add(currRecord);
                             }
                         }
-                        else
-                        {
-                            fileChecked.Add(currRecord);
-                        }
                     }
                 }
             }
@@ -95,11 +108,13 @@ namespace MP.FileData.Controllers
             if (fileNew != null && fileNew.Count > 0)
             {
                 FileInsert(idxMacchina, fileNew, 0);
+                Log.Info($"CheckFileArchived S03 | insert {fileNew.Count} files");
             }
             // aggiorno i file modificati
             if (fileMod != null && fileMod.Count > 0)
             {
                 FileSetUpdated(fileMod);
+                Log.Info($"CheckFileArchived S04 | update {fileMod.Count} files");
             }
             // segno data-ora ultimo controllo x file invariati
             if (fileChecked != null && fileChecked.Count > 0)
@@ -221,6 +236,7 @@ namespace MP.FileData.Controllers
         /// <returns></returns>
         public bool FileInsert(string idxMacchina, List<FileInfo> newFiles, int rev)
         {
+            Log.Info($"FileInsert S01 per macchina {idxMacchina}: {newFiles.Count} files da valutare");
             bool answ = false;
             DateTime adesso = DateTime.Now;
             // MD5 hash
@@ -246,7 +262,7 @@ namespace MP.FileData.Controllers
 
                     // gestione Tags (da migliorare...)
                     List<string> excludeTags = new List<string>() { "M4", "M5", "M4+A", "M4+B", "M5+A", "M5+B" };
-                    var currTags = TagGetAll();
+                    List<TagModel> currTags = TagGetAll();
 
                     // calcolo MD5 e tags
                     foreach (var item in newRec)
@@ -255,7 +271,7 @@ namespace MP.FileData.Controllers
                         item.MD5 = BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
 
                         List<string> Tags = new List<string>();
-                        List<TagModel> Tag2ins = new List<TagModel>();
+                        List<TagModel> Tag4File = new List<TagModel>();
                         // cerco codice tag come nome file(TAG) nei primi 100 char
                         int maxChar = 100;
                         string code2search = "";
@@ -271,31 +287,45 @@ namespace MP.FileData.Controllers
 
                         foreach (var tag in Tags)
                         {
-                            var foundTag = currTags.Where(x => x.TagId == tag).ToList();
+                            var foundTag = currTags.Where(x => x.TagId == tag).FirstOrDefault();
                             // aggiungo i tags SE non ci fossero
-                            if (foundTag.Count == 0)
+                            if (foundTag == null)
                             {
-                                Tag2ins.Add(new TagModel() { TagId = tag });
+                                var newTag = new TagModel() { TagId = tag };
+                                currTags.Add(newTag);
+                                Tag4File.Add(newTag);
+                            }
+                            else
+                            {
+                                // al file aggiungo comunque
+                                Tag4File.Add(foundTag);
                             }
                         }
-
-                        // salvo i tags
-                        TagInsert(Tag2ins);
-
-                        // salvo i tags relativi ai files
-                        item.Tags = Tag2ins;
+                        // aggiungo ai file
+                        if (Tag4File.Count > 0)
+                        {
+                            // salvo i tags relativi ai files
+                            item.Tags = Tag4File;
+                        }
                     }
 
+                    localDbCtx
+                    .DbSetTags
+                    .AddRange(currTags);
+
                     // aggiungo in blocco
                     localDbCtx
                     .DbSetProgFile
                     .AddRange(newRec);
 
+                    Log.Info($"FileInsert S02 per macchina {idxMacchina}: {newRec.Count} files da aggiungere EFCore");
+
                     // salvo
                     localDbCtx.SaveChanges();
                     answ = true;
                 }
             }
+            Log.Info($"FileInsert S03 per macchina {idxMacchina}");
             return answ;
         }
 
diff --git a/MP.FileData/TagsUtils.cs b/MP.FileData/TagsUtils.cs
index 1c1fdbdc..07f31807 100644
--- a/MP.FileData/TagsUtils.cs
+++ b/MP.FileData/TagsUtils.cs
@@ -1,4 +1,5 @@
-using System;
+using NLog;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,6 +13,12 @@ namespace MP.FileData
     /// </summary>
     public class TagsUtils
     {
+        #region Private Fields
+
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        #endregion Private Fields
+
         #region Protected Fields
 
         protected static List<string> ExcludeTags = new List<string>();
@@ -33,11 +40,11 @@ namespace MP.FileData
         {
             // bonifico: a capo --> spazi
             fileContent = fileContent.Replace(Environment.NewLine, " ");
+            string pattern = $"\\b{fileName}" + @".{0,2}\([\w\d\s.]+\)";
             List<string> answ = new List<string>();
             if (fileContent.Length > 0)
             {
                 // uso regexp
-                string pattern = $"\\b{fileName}" + @".{0,2}\([\w\d\s]+\)";
                 MatchCollection matchTags = Regex.Matches(fileContent, pattern);
                 if (matchTags.Count > 0)
                 {
@@ -60,6 +67,15 @@ namespace MP.FileData
                         }
                     }
                 }
+                else
+                {
+                    Log.Warn($"searchProgComment Attenzione Match non trovato | {fileName} | pattern: {pattern}");
+                }
+            }
+            // se nullo --> segnalo!
+            if (answ.Count == 0)
+            {
+                Log.Warn($"searchProgComment Attenzione Tag non trovati | {fileName} | pattern: {pattern}{Environment.NewLine}{fileContent}");
             }
             return answ;
         }
diff --git a/MP.Prog/Data/FileArchDataService.cs b/MP.Prog/Data/FileArchDataService.cs
index d8ea5784..7f04f4e8 100644
--- a/MP.Prog/Data/FileArchDataService.cs
+++ b/MP.Prog/Data/FileArchDataService.cs
@@ -242,7 +242,6 @@ namespace MP.Prog.Data
         public Task<List<MP.FileData.DatabaseModels.TagModel>> TagGetFilt(string SearchVal)
         {
             return Task.FromResult(dbController.TagGetFilt(SearchVal, 200).ToList());
-            //return Task.FromResult(dbController.ArtGetFilt(SearchVal, 20).ToList());
         }
 
         /// <summary>
@@ -256,11 +255,13 @@ namespace MP.Prog.Data
                 var listaMacchine = await MacchineGetAll();
                 foreach (var item in listaMacchine.Where(x => !string.IsNullOrEmpty(x.BasePath)).ToList())
                 {
-                    dbController.CheckFileArchived(item.IdxMacchina, item.BasePath, "*.*");
+                    dbController.CheckFileArchived(item.IdxMacchina, item.BasePath, "*.*", ".xlsx .xls");
                 }
             }
-            catch
-            { }
+            catch (Exception exc)
+            {
+                Log.Error($"Eccezione in updateAllArchive{Environment.NewLine}{exc}");
+            }
         }
 
         #endregion Public Methods

From 08703a95930c2f2525cbf369e0c33f3dc203bf20 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 8 Sep 2021 13:28:48 +0200
Subject: [PATCH 07/14] Creato classe x parametrizzare gest TAGS

---
 MP.FileData/Controllers/FileController.cs | 49 +++++++++++++--
 MP.FileData/SearchRules.cs                | 73 +++++++++++++++++++++++
 MP.FileData/TagsUtils.cs                  | 45 +++++++++++---
 MP.Prog/Conf/.placeholder                 |  1 +
 MP.Prog/Conf/Rule01.json                  |  1 +
 5 files changed, 157 insertions(+), 12 deletions(-)
 create mode 100644 MP.FileData/SearchRules.cs
 create mode 100644 MP.Prog/Conf/.placeholder
 create mode 100644 MP.Prog/Conf/Rule01.json

diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs
index 4242dd44..d6a78f6c 100644
--- a/MP.FileData/Controllers/FileController.cs
+++ b/MP.FileData/Controllers/FileController.cs
@@ -104,10 +104,32 @@ namespace MP.FileData.Controllers
                 }
             }
 
+            // fixme todo !!! fix da conf file
+
+            // fare: lettura conf rule x recupero tag x singola macchina
+            //$"\\b{fileName}" + @".{0,2}\([\w\d\s.]+\)";
+
+            Dictionary<string, string> confReplace = new Dictionary<string, string>();
+            confReplace.Add("(", " ");
+            confReplace.Add(")", " ");
+            // hard coded + salvataggio conf x creare json
+            SearchRules currRule = new SearchRules()
+            {
+                Name = "Commento Filename",
+                Mode = SearchMode.StringOnFile,
+                MaxChar2Search = 100,
+                ReplaceCR = true,
+                RegExPattern = "\\b{{fileName}}" + @".{0,2}\([\w\d\s.]+\)",
+                RegExRepFileName = true,
+                ExcludedTags = ".xls .xlsx",
+                OutReplace = confReplace,
+                OutExcludeFileName = true
+            };
+
             // salvo i NUOVI file
             if (fileNew != null && fileNew.Count > 0)
             {
-                FileInsert(idxMacchina, fileNew, 0);
+                FileInsert(idxMacchina, fileNew, 0, currRule);
                 Log.Info($"CheckFileArchived S03 | insert {fileNew.Count} files");
             }
             // aggiorno i file modificati
@@ -234,8 +256,9 @@ namespace MP.FileData.Controllers
         /// <param name="newFiles"></param>
         /// <param name="rev"></param>
         /// <returns></returns>
-        public bool FileInsert(string idxMacchina, List<FileInfo> newFiles, int rev)
+        public bool FileInsert(string idxMacchina, List<FileInfo> newFiles, int rev, SearchRules currRule)
         {
+            // fare: lettura conf x macchina
             Log.Info($"FileInsert S01 per macchina {idxMacchina}: {newFiles.Count} files da valutare");
             bool answ = false;
             DateTime adesso = DateTime.Now;
@@ -283,7 +306,7 @@ namespace MP.FileData.Controllers
                         {
                             code2search = item.FileStringContent;
                         }
-                        Tags = TagsUtils.searchProgComment(item.Name, code2search, excludeTags);
+                        Tags = TagsUtils.searchProgComment(item.Name, code2search, currRule);
 
                         foreach (var tag in Tags)
                         {
@@ -339,8 +362,26 @@ namespace MP.FileData.Controllers
                 var newFileInfo = new FileInfo(currFile.Path);
                 listUpdate.Add(newFileInfo);
 
+                // fixme todo !!! fix da conf file
+                Dictionary<string, string> confReplace = new Dictionary<string, string>();
+                confReplace.Add("(", " ");
+                confReplace.Add(")", " ");
+                // hard coded + salvataggio conf x creare json
+                SearchRules currRule = new SearchRules()
+                {
+                    Name = "Commento Filename",
+                    Mode = SearchMode.StringOnFile,
+                    MaxChar2Search = 100,
+                    ReplaceCR = true,
+                    RegExPattern = "\\b{{fileName}}" + @".{0,2}\([\w\d\s.]+\)",
+                    RegExRepFileName = true,
+                    ExcludedTags = ".xls .xlsx",
+                    OutReplace = confReplace,
+                    OutExcludeFileName = true
+                };
+
                 // inserisco come REVISIONE
-                FileInsert(currFile.IdxMacchina, listUpdate, currFile.Rev + 1);
+                FileInsert(currFile.IdxMacchina, listUpdate, currFile.Rev + 1, currRule);
 
                 // archivio vecchio file
                 currFile.Active = false;
diff --git a/MP.FileData/SearchRules.cs b/MP.FileData/SearchRules.cs
new file mode 100644
index 00000000..41b7af27
--- /dev/null
+++ b/MP.FileData/SearchRules.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.FileData
+{
+    public enum SearchMode
+    {
+        /// <summary>
+        /// Ricerca occorrenze di una RegExp dentro il contenuto del file
+        /// </summary>
+        StringOnFile,
+
+        /// <summary>
+        /// Cerca da path relativo + nume file
+        /// </summary>
+        PathAndName
+    }
+
+    public class SearchRules
+    {
+        #region Public Properties
+
+        /// <summary>
+        /// Pattern esclusione Tags (stop-words)
+        /// </summary>
+        public string ExcludedTags { get; set; } = "";
+
+        /// <summary>
+        /// Quantità massima di caratteri da analizzare, 0 = tutti
+        /// </summary>
+        public int MaxChar2Search { get; set; } = 100;
+
+        /// <summary>
+        /// Modalità ricerca
+        /// </summary>
+        public SearchMode Mode { get; set; } = SearchMode.StringOnFile;
+
+        /// <summary>
+        /// Nome della regola di ricerca
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Configurazione opzionale x rimozione filename da output finali
+        /// </summary>
+        public bool OutExcludeFileName { get; set; } = true;
+
+        /// <summary>
+        /// Replace in uscita per "bonificare" il tag
+        /// </summary>
+        public Dictionary<string, string> OutReplace { get; set; } = new Dictionary<string, string>();
+
+        /// <summary>
+        /// Pattern in formato RegExp
+        /// </summary>
+        public string RegExPattern { get; set; } = "";
+
+        /// <summary>
+        /// Configurazione opzionale x sostituzione placeholder {{fileName}} in RegExp con il VERO nome file
+        /// </summary>
+        public bool RegExRepFileName { get; set; } = true;
+
+        /// <summary>
+        /// Configurazione opzionale x sostituzione carriage return --> spazi
+        /// </summary>
+        public bool ReplaceCR { get; set; } = true;
+
+        #endregion Public Properties
+    }
+}
\ No newline at end of file
diff --git a/MP.FileData/TagsUtils.cs b/MP.FileData/TagsUtils.cs
index 07f31807..54147e2e 100644
--- a/MP.FileData/TagsUtils.cs
+++ b/MP.FileData/TagsUtils.cs
@@ -31,16 +31,27 @@ namespace MP.FileData
         /// Cerca tag di commento inseriti nel formato
         /// NOME_PROG(commento)
         ///
-        /// es: O00123(172L D20.5) --> estrae 172L D20.5
+        /// es: O00123(172L D20.5) --> estrae 172L, D20.5
         /// </summary>
-        /// <param name="fileName"></param>
-        /// <param name="fileContent"></param>
+        /// <param name="fileName">Nome del file (da cercare per contenuto)</param>
+        /// <param name="fileContent">Contenuto del file da analizzare</param>
+        /// <param name="currRule">Parametri analisi</param>
         /// <returns></returns>
-        public static List<string> searchProgComment(string fileName, string fileContent, List<string> excludeTags)
+        public static List<string> searchProgComment(string fileName, string fileContent, SearchRules currRule)
         {
+            // verifico se trimmare contenuto file
+            if (fileContent.Length > currRule.MaxChar2Search && currRule.MaxChar2Search > 0)
+            {
+                fileContent.Substring(0, currRule.MaxChar2Search);
+            }
             // bonifico: a capo --> spazi
             fileContent = fileContent.Replace(Environment.NewLine, " ");
-            string pattern = $"\\b{fileName}" + @".{0,2}\([\w\d\s.]+\)";
+            //string pattern = $"\\b{fileName}" + @".{0,2}\([\w\d\s.]+\)";
+            string pattern = currRule.RegExPattern;
+            if (currRule.RegExRepFileName)
+            {
+                pattern = pattern.Replace("{{fileName}}", fileName);
+            }
             List<string> answ = new List<string>();
             if (fileContent.Length > 0)
             {
@@ -50,16 +61,34 @@ namespace MP.FileData
                 {
                     for (int count = 0; count < matchTags.Count; count++)
                     {
+                        string currMatch = matchTags[count].Value;
+                        // bonifica preliminare (se richiesta)
+                        if (currRule.OutExcludeFileName)
+                        {
+                            currMatch.Replace(fileName, "");
+                        }
+                        if (currRule.OutReplace.Count > 0)
+                        {
+                            foreach (var item in currRule.OutReplace)
+                            {
+                                currMatch = currMatch.Replace(item.Key, item.Value);
+                            }
+                        }
+#if false
                         // pulizia: elimino nome programma e parentesi
                         string currMatch = matchTags[count].Value
                                                 .Replace(fileName, "")
                                                 .Replace("(", " ")
                                                 .Replace(")", " ").Trim();
+#endif
+                        // trim finale
+                        currMatch = currMatch.Trim();
+
                         // split con spazi
                         var splitTags = currMatch.Split(" ");
                         foreach (var item in splitTags)
                         {
-                            if (!excludeTags.Contains(item) && !string.IsNullOrEmpty(item))
+                            if (!currRule.ExcludedTags.Contains(item) && !string.IsNullOrEmpty(item))
                             {
                                 // esclusione valori ignorati
                                 answ.Add(item);
@@ -69,13 +98,13 @@ namespace MP.FileData
                 }
                 else
                 {
-                    Log.Warn($"searchProgComment Attenzione Match non trovato | {fileName} | pattern: {pattern}");
+                    Log.Warn($"searchProgComment Attenzione Match non trovato | {fileName} | pattern: {currRule.RegExPattern}");
                 }
             }
             // se nullo --> segnalo!
             if (answ.Count == 0)
             {
-                Log.Warn($"searchProgComment Attenzione Tag non trovati | {fileName} | pattern: {pattern}{Environment.NewLine}{fileContent}");
+                Log.Warn($"searchProgComment Attenzione Tag non trovati | {fileName} | pattern: {currRule.RegExPattern}{Environment.NewLine}{fileContent}");
             }
             return answ;
         }
diff --git a/MP.Prog/Conf/.placeholder b/MP.Prog/Conf/.placeholder
new file mode 100644
index 00000000..5f282702
--- /dev/null
+++ b/MP.Prog/Conf/.placeholder
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/MP.Prog/Conf/Rule01.json b/MP.Prog/Conf/Rule01.json
new file mode 100644
index 00000000..5f282702
--- /dev/null
+++ b/MP.Prog/Conf/Rule01.json
@@ -0,0 +1 @@
+
\ No newline at end of file

From 93423b93b582e81d502843cb037e4d62af370229 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 8 Sep 2021 14:52:51 +0200
Subject: [PATCH 08/14] Cambio datamodel macchina x gestione ruoli json conf

---
 MP.FileData/DatabaseModels/MacchinaModel.cs            |  2 +-
 ...b.Designer.cs => 20210908125127_InitDb.Designer.cs} | 10 +++++-----
 ...210908072932_InitDb.cs => 20210908125127_InitDb.cs} |  6 +++---
 .../Migrations/MoonPro_ProgContextModelSnapshot.cs     |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename MP.FileData/Migrations/{20210908072932_InitDb.Designer.cs => 20210908125127_InitDb.Designer.cs} (97%)
 rename MP.FileData/Migrations/{20210908072932_InitDb.cs => 20210908125127_InitDb.cs} (94%)

diff --git a/MP.FileData/DatabaseModels/MacchinaModel.cs b/MP.FileData/DatabaseModels/MacchinaModel.cs
index d56aaee2..35f4a5e7 100644
--- a/MP.FileData/DatabaseModels/MacchinaModel.cs
+++ b/MP.FileData/DatabaseModels/MacchinaModel.cs
@@ -18,7 +18,7 @@ namespace MP.FileData.DatabaseModels
 
         [Key]
         public string IdxMacchina { get; set; } = "";
-        public string CodMacchina { get; set; } = "";
+        public string RuleName { get; set; } = "";
         public string Nome { get; set; } = "";
         public string Descrizione { get; set; } = "";
         public string BasePath { get; set; } = "";
diff --git a/MP.FileData/Migrations/20210908072932_InitDb.Designer.cs b/MP.FileData/Migrations/20210908125127_InitDb.Designer.cs
similarity index 97%
rename from MP.FileData/Migrations/20210908072932_InitDb.Designer.cs
rename to MP.FileData/Migrations/20210908125127_InitDb.Designer.cs
index 6c6d68c5..02257387 100644
--- a/MP.FileData/Migrations/20210908072932_InitDb.Designer.cs
+++ b/MP.FileData/Migrations/20210908125127_InitDb.Designer.cs
@@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace MP.FileData.Migrations
 {
     [DbContext(typeof(MoonPro_ProgContext))]
-    [Migration("20210908072932_InitDb")]
+    [Migration("20210908125127_InitDb")]
     partial class InitDb
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -95,9 +95,6 @@ namespace MP.FileData.Migrations
                     b.Property<string>("BasePath")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("CodMacchina")
-                        .HasColumnType("nvarchar(max)");
-
                     b.Property<string>("Descrizione")
                         .HasColumnType("nvarchar(max)");
 
@@ -110,6 +107,9 @@ namespace MP.FileData.Migrations
                     b.Property<string>("Note")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("RuleName")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<int>("ShowOrder")
                         .HasColumnType("int");
 
@@ -122,11 +122,11 @@ namespace MP.FileData.Migrations
                         {
                             IdxMacchina = "0",
                             BasePath = "",
-                            CodMacchina = "0",
                             Descrizione = "--- Tutte ---",
                             ImgUrl = "",
                             Nome = "--- Tutte ---",
                             Note = "",
+                            RuleName = "0",
                             ShowOrder = 0
                         });
                 });
diff --git a/MP.FileData/Migrations/20210908072932_InitDb.cs b/MP.FileData/Migrations/20210908125127_InitDb.cs
similarity index 94%
rename from MP.FileData/Migrations/20210908072932_InitDb.cs
rename to MP.FileData/Migrations/20210908125127_InitDb.cs
index fa1d4b60..9367447b 100644
--- a/MP.FileData/Migrations/20210908072932_InitDb.cs
+++ b/MP.FileData/Migrations/20210908125127_InitDb.cs
@@ -12,7 +12,7 @@ namespace MP.FileData.Migrations
                 columns: table => new
                 {
                     IdxMacchina = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    CodMacchina = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    RuleName = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     Nome = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     Descrizione = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     BasePath = table.Column<string>(type: "nvarchar(max)", nullable: true),
@@ -92,8 +92,8 @@ namespace MP.FileData.Migrations
 
             migrationBuilder.InsertData(
                 table: "Macchine",
-                columns: new[] { "IdxMacchina", "BasePath", "CodMacchina", "Descrizione", "ImgUrl", "Nome", "Note", "ShowOrder" },
-                values: new object[] { "0", "", "0", "--- Tutte ---", "", "--- Tutte ---", "", 0 });
+                columns: new[] { "IdxMacchina", "BasePath", "Descrizione", "ImgUrl", "Nome", "Note", "RuleName", "ShowOrder" },
+                values: new object[] { "0", "", "--- Tutte ---", "", "--- Tutte ---", "", "0", 0 });
 
             migrationBuilder.CreateIndex(
                 name: "IX_FileModelTagModel_TagsTagId",
diff --git a/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs b/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs
index 5c4ce761..27ca048c 100644
--- a/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs
+++ b/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs
@@ -93,9 +93,6 @@ namespace MP.FileData.Migrations
                     b.Property<string>("BasePath")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("CodMacchina")
-                        .HasColumnType("nvarchar(max)");
-
                     b.Property<string>("Descrizione")
                         .HasColumnType("nvarchar(max)");
 
@@ -108,6 +105,9 @@ namespace MP.FileData.Migrations
                     b.Property<string>("Note")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("RuleName")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<int>("ShowOrder")
                         .HasColumnType("int");
 
@@ -120,11 +120,11 @@ namespace MP.FileData.Migrations
                         {
                             IdxMacchina = "0",
                             BasePath = "",
-                            CodMacchina = "0",
                             Descrizione = "--- Tutte ---",
                             ImgUrl = "",
                             Nome = "--- Tutte ---",
                             Note = "",
+                            RuleName = "0",
                             ShowOrder = 0
                         });
                 });

From 60a8d3b8a6129d0664c8cb4f369f777c8f894d61 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 8 Sep 2021 14:53:02 +0200
Subject: [PATCH 09/14] update x step gestione conf serializzata json

---
 MP.FileData/Controllers/FileController.cs | 41 +++++++++++++++--------
 MP.FileData/ModelBuilderExtensions.cs     |  2 +-
 MP.FileData/SearchRules.cs                |  7 +++-
 MP.FileData/TagsUtils.cs                  | 26 +++++---------
 MP.Prog/Conf/Rule01.json                  | 25 +++++++++++++-
 MP.Prog/MP.Prog.csproj                    |  1 +
 MP.Prog/Pages/Archive.razor               |  4 +--
 7 files changed, 70 insertions(+), 36 deletions(-)

diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs
index d6a78f6c..c1286693 100644
--- a/MP.FileData/Controllers/FileController.cs
+++ b/MP.FileData/Controllers/FileController.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using MP.FileData.DatabaseModels;
+using Newtonsoft.Json;
 
 namespace MP.FileData.Controllers
 {
@@ -112,6 +113,9 @@ namespace MP.FileData.Controllers
             Dictionary<string, string> confReplace = new Dictionary<string, string>();
             confReplace.Add("(", " ");
             confReplace.Add(")", " ");
+
+            Dictionary<string, string> fileExtReplace = new Dictionary<string, string>();
+            fileExtReplace.Add(".P-2", "");
             // hard coded + salvataggio conf x creare json
             SearchRules currRule = new SearchRules()
             {
@@ -119,13 +123,19 @@ namespace MP.FileData.Controllers
                 Mode = SearchMode.StringOnFile,
                 MaxChar2Search = 100,
                 ReplaceCR = true,
-                RegExPattern = "\\b{{fileName}}" + @".{0,2}\([\w\d\s.]+\)",
+                RegExPattern = "\\b{{fileName}}" + @".{0,2}\([\w\d\s./]+\)",
                 RegExRepFileName = true,
-                ExcludedTags = ".xls .xlsx",
+                FileNameExtReplace = fileExtReplace,
+                ExcludedTags = new List<string>() { "M4", "M5", "M4+A", "M4+B", "M5+A", "M5+B" },
                 OutReplace = confReplace,
                 OutExcludeFileName = true
             };
 
+            // serializzo
+
+            string rawRule = JsonConvert.SerializeObject(currRule, Formatting.Indented);
+            Log.Info($"Conf rule:{Environment.NewLine}{rawRule}");
+
             // salvo i NUOVI file
             if (fileNew != null && fileNew.Count > 0)
             {
@@ -284,7 +294,6 @@ namespace MP.FileData.Controllers
                     }).ToList();
 
                     // gestione Tags (da migliorare...)
-                    List<string> excludeTags = new List<string>() { "M4", "M5", "M4+A", "M4+B", "M5+A", "M5+B" };
                     List<TagModel> currTags = TagGetAll();
 
                     // calcolo MD5 e tags
@@ -295,18 +304,17 @@ namespace MP.FileData.Controllers
 
                         List<string> Tags = new List<string>();
                         List<TagModel> Tag4File = new List<TagModel>();
-                        // cerco codice tag come nome file(TAG) nei primi 100 char
-                        int maxChar = 100;
-                        string code2search = "";
-                        if (item.FileStringContent.Length > maxChar)
+                        // se necessario bonifico filename...
+                        string fileName = item.Name;
+                        if (currRule.FileNameExtReplace.Count > 0)
                         {
-                            code2search = item.FileStringContent.Substring(0, maxChar);
+                            foreach (var fReplace in currRule.FileNameExtReplace)
+                            {
+                                fileName = fileName.Replace(fReplace.Key, fReplace.Value).Trim();
+                            }
                         }
-                        else
-                        {
-                            code2search = item.FileStringContent;
-                        }
-                        Tags = TagsUtils.searchProgComment(item.Name, code2search, currRule);
+                        // cerco codice tag da configurazione
+                        Tags = TagsUtils.searchProgComment(fileName, item.FileStringContent, currRule);
 
                         foreach (var tag in Tags)
                         {
@@ -366,6 +374,10 @@ namespace MP.FileData.Controllers
                 Dictionary<string, string> confReplace = new Dictionary<string, string>();
                 confReplace.Add("(", " ");
                 confReplace.Add(")", " ");
+
+                Dictionary<string, string> fileExtReplace = new Dictionary<string, string>();
+                fileExtReplace.Add(".P-2", "");
+
                 // hard coded + salvataggio conf x creare json
                 SearchRules currRule = new SearchRules()
                 {
@@ -375,7 +387,8 @@ namespace MP.FileData.Controllers
                     ReplaceCR = true,
                     RegExPattern = "\\b{{fileName}}" + @".{0,2}\([\w\d\s.]+\)",
                     RegExRepFileName = true,
-                    ExcludedTags = ".xls .xlsx",
+                    ExcludedTags = new List<string>() { "M4", "M5", "M4+A", "M4+B", "M5+A", "M5+B" },
+                    FileNameExtReplace = fileExtReplace,
                     OutReplace = confReplace,
                     OutExcludeFileName = true
                 };
diff --git a/MP.FileData/ModelBuilderExtensions.cs b/MP.FileData/ModelBuilderExtensions.cs
index b3415b80..354ccc88 100644
--- a/MP.FileData/ModelBuilderExtensions.cs
+++ b/MP.FileData/ModelBuilderExtensions.cs
@@ -20,7 +20,7 @@ namespace MP.FileData
         {
             // inizializzazione dei valori di default x MACCHINA
             modelBuilder.Entity<MacchinaModel>().HasData(
-                new MacchinaModel { IdxMacchina = "0", CodMacchina = "0", Descrizione = "--- Tutte ---", Nome = "--- Tutte ---", BasePath = "", ImgUrl = "", Note = "", ShowOrder = 0 }
+                new MacchinaModel { IdxMacchina = "0", RuleName = "0", Descrizione = "--- Tutte ---", Nome = "--- Tutte ---", BasePath = "", ImgUrl = "", Note = "", ShowOrder = 0 }
                 );
         }
 
diff --git a/MP.FileData/SearchRules.cs b/MP.FileData/SearchRules.cs
index 41b7af27..2a1580e7 100644
--- a/MP.FileData/SearchRules.cs
+++ b/MP.FileData/SearchRules.cs
@@ -26,7 +26,12 @@ namespace MP.FileData
         /// <summary>
         /// Pattern esclusione Tags (stop-words)
         /// </summary>
-        public string ExcludedTags { get; set; } = "";
+        public List<string> ExcludedTags { get; set; } = new List<string>();
+
+        /// <summary>
+        /// Pattern in formato RegExp
+        /// </summary>
+        public Dictionary<string, string> FileNameExtReplace { get; set; } = new Dictionary<string, string>();
 
         /// <summary>
         /// Quantità massima di caratteri da analizzare, 0 = tutti
diff --git a/MP.FileData/TagsUtils.cs b/MP.FileData/TagsUtils.cs
index 54147e2e..1023812b 100644
--- a/MP.FileData/TagsUtils.cs
+++ b/MP.FileData/TagsUtils.cs
@@ -42,7 +42,7 @@ namespace MP.FileData
             // verifico se trimmare contenuto file
             if (fileContent.Length > currRule.MaxChar2Search && currRule.MaxChar2Search > 0)
             {
-                fileContent.Substring(0, currRule.MaxChar2Search);
+                fileContent = fileContent.Substring(0, currRule.MaxChar2Search);
             }
             // bonifico: a capo --> spazi
             fileContent = fileContent.Replace(Environment.NewLine, " ");
@@ -65,7 +65,7 @@ namespace MP.FileData
                         // bonifica preliminare (se richiesta)
                         if (currRule.OutExcludeFileName)
                         {
-                            currMatch.Replace(fileName, "");
+                            currMatch = currMatch.Replace(fileName, "");
                         }
                         if (currRule.OutReplace.Count > 0)
                         {
@@ -74,13 +74,6 @@ namespace MP.FileData
                                 currMatch = currMatch.Replace(item.Key, item.Value);
                             }
                         }
-#if false
-                        // pulizia: elimino nome programma e parentesi
-                        string currMatch = matchTags[count].Value
-                                                .Replace(fileName, "")
-                                                .Replace("(", " ")
-                                                .Replace(")", " ").Trim();
-#endif
                         // trim finale
                         currMatch = currMatch.Trim();
 
@@ -88,23 +81,22 @@ namespace MP.FileData
                         var splitTags = currMatch.Split(" ");
                         foreach (var item in splitTags)
                         {
-                            if (!currRule.ExcludedTags.Contains(item) && !string.IsNullOrEmpty(item))
+                            if (!string.IsNullOrEmpty(item))
                             {
-                                // esclusione valori ignorati
-                                answ.Add(item);
+                                if (!currRule.ExcludedTags.Contains(item) && item != fileName)
+                                {
+                                    // esclusione valori ignorati
+                                    answ.Add(item);
+                                }
                             }
                         }
                     }
                 }
-                else
-                {
-                    Log.Warn($"searchProgComment Attenzione Match non trovato | {fileName} | pattern: {currRule.RegExPattern}");
-                }
             }
             // se nullo --> segnalo!
             if (answ.Count == 0)
             {
-                Log.Warn($"searchProgComment Attenzione Tag non trovati | {fileName} | pattern: {currRule.RegExPattern}{Environment.NewLine}{fileContent}");
+                Log.Warn($"searchProgComment Attenzione Tag non trovati | {fileName} | pattern: {pattern}{Environment.NewLine}{fileContent}");
             }
             return answ;
         }
diff --git a/MP.Prog/Conf/Rule01.json b/MP.Prog/Conf/Rule01.json
index 5f282702..4771d118 100644
--- a/MP.Prog/Conf/Rule01.json
+++ b/MP.Prog/Conf/Rule01.json
@@ -1 +1,24 @@
-
\ No newline at end of file
+{
+    "ExcludedTags": [
+        "M4",
+        "M5",
+        "M4+A",
+        "M4+B",
+        "M5+A",
+        "M5+B"
+    ],
+    "FileNameExtReplace": {
+        ".P-2": ""
+    },
+    "MaxChar2Search": 100,
+    "Mode": 0,
+    "Name": "Commento Filename",
+    "OutExcludeFileName": true,
+    "OutReplace": {
+        "(": " ",
+        ")": " "
+    },
+    "RegExPattern": "\\b{{fileName}}.{0,2}\\([\\w\\d\\s./]+\\)",
+    "RegExRepFileName": true,
+    "ReplaceCR": true
+}
\ No newline at end of file
diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj
index 6dcb148c..fc16b061 100644
--- a/MP.Prog/MP.Prog.csproj
+++ b/MP.Prog/MP.Prog.csproj
@@ -21,6 +21,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
   </ItemGroup>
 
diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor
index 8490d541..590a6d4c 100644
--- a/MP.Prog/Pages/Archive.razor
+++ b/MP.Prog/Pages/Archive.razor
@@ -47,7 +47,7 @@
                                 {
                                     foreach (var item in MacList)
                                     {
-                                        <option value="@item.IdxMacchina">@item.Descrizione (@item.CodMacchina)</option>
+                                        <option value="@item.IdxMacchina">@item.Descrizione (@item.RuleName)</option>
                                     }
                                 }
                             </select>
@@ -132,7 +132,7 @@
                                         </span>
                                     </td>
                                     <td>
-                                        <div>@record.Macchina.CodMacchina</div>
+                                        <div>@record.Macchina.RuleName</div>
                                         <div class="small">@record.Macchina.Descrizione</div>
                                     </td>
                                     <td>

From 3ae71e73a84a45df9631ff0b7cde448246f35215 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 9 Sep 2021 17:03:35 +0200
Subject: [PATCH 10/14] OK decode biglia 445 (tranne nomi file sbagliati) + fix
 446 tags

---
 MP.FileData/Controllers/FileController.cs | 49 ++++-------------
 MP.FileData/SearchRules.cs                |  7 ++-
 MP.FileData/TagsUtils.cs                  |  2 +-
 MP.Prog/Conf/Rule01.json                  |  9 +++-
 MP.Prog/Data/FileArchDataService.cs       | 65 ++++++++++++++++++++++-
 MP.Prog/Pages/Archive.razor               |  2 +-
 6 files changed, 88 insertions(+), 46 deletions(-)

diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs
index c1286693..2f0baaa7 100644
--- a/MP.FileData/Controllers/FileController.cs
+++ b/MP.FileData/Controllers/FileController.cs
@@ -43,12 +43,13 @@ namespace MP.FileData.Controllers
         /// <param name="searchPattern">pattern di ricerca (*.*)</param>
         /// <param name="excludePattern">pattern esclusione (separato da spazi</param>
         /// <returns></returns>
-        public bool CheckFileArchived(string idxMacchina, string path, string searchPattern, string excludePattern)
+        public bool CheckFileArchived(string idxMacchina, string path, string searchPattern, SearchRules currRule)
         {
-            Log.Info($"CheckFileArchived S01 | macchina: {idxMacchina} | path: {path} | pattern: {searchPattern} | excludePattern: {excludePattern}");
+            Log.Info($"CheckFileArchived S00 | macchina: {idxMacchina} | path: {path} | pattern: {searchPattern} | # ExcludedFileExt: {currRule.ExcludedFileExt.Count()}");
             bool answ = false;
             DirectoryInfo dirInfo = new DirectoryInfo(path);
             FileInfo[] fileList = dirInfo.GetFiles(searchPattern);
+            Log.Info($"CheckFileArchived S01 | file trovati: {fileList.Count()}");
             List<FileInfo> fileNew = new List<FileInfo>();
             List<FileModel> fileChecked = new List<FileModel>();
             List<FileModel> fileMod = new List<FileModel>();
@@ -62,7 +63,7 @@ namespace MP.FileData.Controllers
                 foreach (var file in fileList)
                 {
                     // escludo i file con desinenza da escludere...
-                    if (excludePattern.Contains(file.Extension) && !string.IsNullOrEmpty(file.Extension))
+                    if (!string.IsNullOrEmpty(file.Extension) && currRule.ExcludedFileExt.Contains(file.Extension))
                     {
                         Log.Info($"CheckFileArchived S02: escluso {file.Name} | estensione {file.Extension}");
                     }
@@ -105,37 +106,6 @@ namespace MP.FileData.Controllers
                 }
             }
 
-            // fixme todo !!! fix da conf file
-
-            // fare: lettura conf rule x recupero tag x singola macchina
-            //$"\\b{fileName}" + @".{0,2}\([\w\d\s.]+\)";
-
-            Dictionary<string, string> confReplace = new Dictionary<string, string>();
-            confReplace.Add("(", " ");
-            confReplace.Add(")", " ");
-
-            Dictionary<string, string> fileExtReplace = new Dictionary<string, string>();
-            fileExtReplace.Add(".P-2", "");
-            // hard coded + salvataggio conf x creare json
-            SearchRules currRule = new SearchRules()
-            {
-                Name = "Commento Filename",
-                Mode = SearchMode.StringOnFile,
-                MaxChar2Search = 100,
-                ReplaceCR = true,
-                RegExPattern = "\\b{{fileName}}" + @".{0,2}\([\w\d\s./]+\)",
-                RegExRepFileName = true,
-                FileNameExtReplace = fileExtReplace,
-                ExcludedTags = new List<string>() { "M4", "M5", "M4+A", "M4+B", "M5+A", "M5+B" },
-                OutReplace = confReplace,
-                OutExcludeFileName = true
-            };
-
-            // serializzo
-
-            string rawRule = JsonConvert.SerializeObject(currRule, Formatting.Indented);
-            Log.Info($"Conf rule:{Environment.NewLine}{rawRule}");
-
             // salvo i NUOVI file
             if (fileNew != null && fileNew.Count > 0)
             {
@@ -294,7 +264,8 @@ namespace MP.FileData.Controllers
                     }).ToList();
 
                     // gestione Tags (da migliorare...)
-                    List<TagModel> currTags = TagGetAll();
+                    List<TagModel> currTags = localDbCtx.DbSetTags.ToList();
+                    //List<TagModel> currTags = TagGetAll();
 
                     // calcolo MD5 e tags
                     foreach (var item in newRec)
@@ -318,7 +289,7 @@ namespace MP.FileData.Controllers
 
                         foreach (var tag in Tags)
                         {
-                            var foundTag = currTags.Where(x => x.TagId == tag).FirstOrDefault();
+                            var foundTag = currTags.SingleOrDefault(x => x.TagId == tag);
                             // aggiungo i tags SE non ci fossero
                             if (foundTag == null)
                             {
@@ -340,9 +311,9 @@ namespace MP.FileData.Controllers
                         }
                     }
 
-                    localDbCtx
-                    .DbSetTags
-                    .AddRange(currTags);
+                    //localDbCtx
+                    //.DbSetTags
+                    //.AddRange(newTags);
 
                     // aggiungo in blocco
                     localDbCtx
diff --git a/MP.FileData/SearchRules.cs b/MP.FileData/SearchRules.cs
index 2a1580e7..d928d5a2 100644
--- a/MP.FileData/SearchRules.cs
+++ b/MP.FileData/SearchRules.cs
@@ -23,6 +23,11 @@ namespace MP.FileData
     {
         #region Public Properties
 
+        /// <summary>
+        /// Estensioni file esclusi
+        /// </summary>
+        public List<string> ExcludedFileExt { get; set; } = new List<string>();
+
         /// <summary>
         /// Pattern esclusione Tags (stop-words)
         /// </summary>
@@ -46,7 +51,7 @@ namespace MP.FileData
         /// <summary>
         /// Nome della regola di ricerca
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get; set; } = "ND";
 
         /// <summary>
         /// Configurazione opzionale x rimozione filename da output finali
diff --git a/MP.FileData/TagsUtils.cs b/MP.FileData/TagsUtils.cs
index 1023812b..15dfb70c 100644
--- a/MP.FileData/TagsUtils.cs
+++ b/MP.FileData/TagsUtils.cs
@@ -45,7 +45,7 @@ namespace MP.FileData
                 fileContent = fileContent.Substring(0, currRule.MaxChar2Search);
             }
             // bonifico: a capo --> spazi
-            fileContent = fileContent.Replace(Environment.NewLine, " ");
+            fileContent = fileContent.Replace(Environment.NewLine, " ").ToUpper();
             //string pattern = $"\\b{fileName}" + @".{0,2}\([\w\d\s.]+\)";
             string pattern = currRule.RegExPattern;
             if (currRule.RegExRepFileName)
diff --git a/MP.Prog/Conf/Rule01.json b/MP.Prog/Conf/Rule01.json
index 4771d118..1ee93dff 100644
--- a/MP.Prog/Conf/Rule01.json
+++ b/MP.Prog/Conf/Rule01.json
@@ -7,18 +7,23 @@
         "M5+A",
         "M5+B"
     ],
+    "ExcludedFileExt": [
+        ".xls",
+        ".xls#",
+        ".xlsx"
+    ],
     "FileNameExtReplace": {
         ".P-2": ""
     },
     "MaxChar2Search": 100,
     "Mode": 0,
-    "Name": "Commento Filename",
+    "Name": "Tag da Commento Filename",
     "OutExcludeFileName": true,
     "OutReplace": {
         "(": " ",
         ")": " "
     },
-    "RegExPattern": "\\b{{fileName}}.{0,2}\\([\\w\\d\\s./]+\\)",
+    "RegExPattern": "\\b{{fileName}}.{0,2}\\([\\w\\d\\s./\\-=]+\\)",
     "RegExRepFileName": true,
     "ReplaceCR": true
 }
\ No newline at end of file
diff --git a/MP.Prog/Data/FileArchDataService.cs b/MP.Prog/Data/FileArchDataService.cs
index 7f04f4e8..7d53343c 100644
--- a/MP.Prog/Data/FileArchDataService.cs
+++ b/MP.Prog/Data/FileArchDataService.cs
@@ -2,9 +2,12 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using MP.FileData;
+using Newtonsoft.Json;
 using NLog;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -100,6 +103,15 @@ namespace MP.Prog.Data
 
         #endregion Private Properties
 
+        #region Protected Methods
+
+        protected string rulePath(string ruleName)
+        {
+            return string.Format($"Conf/{ruleName}");
+        }
+
+        #endregion Protected Methods
+
         #region Internal Methods
 
         internal Task FileApprove(FileData.DatabaseModels.FileModel currItem)
@@ -250,17 +262,66 @@ namespace MP.Prog.Data
         /// <returns></returns>
         public async Task updateAllArchive()
         {
+            string ruleName = "Rule01.json";
             try
             {
                 var listaMacchine = await MacchineGetAll();
                 foreach (var item in listaMacchine.Where(x => !string.IsNullOrEmpty(x.BasePath)).ToList())
                 {
-                    dbController.CheckFileArchived(item.IdxMacchina, item.BasePath, "*.*", ".xlsx .xls");
+                    if (!string.IsNullOrEmpty(item.RuleName))
+                    { }
+                    // gestione confRule...
+                    SearchRules currRule = new SearchRules();
+                    try
+                    {
+                        string rawData = File.ReadAllText(rulePath(ruleName));
+                        currRule = JsonConvert.DeserializeObject<SearchRules>(rawData);
+                        Log.Info($"Conf rule acquisito da file {ruleName}:{Environment.NewLine}{rawData}");
+                    }
+                    catch (Exception exc)
+                    {
+                        Log.Error($"Eccezione in deserializzazione conf rule{Environment.NewLine}{exc}");
+                    }
+
+                    // se NON deserializzato inizializzo hard-coded
+                    if (currRule.Name == "ND")
+                    {
+                        // fare: lettura conf rule x recupero tag x singola macchina
+                        //$"\\b{fileName}" + @".{0,2}\([\w\d\s.]+\)";
+
+                        Dictionary<string, string> confReplace = new Dictionary<string, string>();
+                        confReplace.Add("(", " ");
+                        confReplace.Add(")", " ");
+
+                        Dictionary<string, string> fileExtReplace = new Dictionary<string, string>();
+                        fileExtReplace.Add(".P-2", "");
+                        // hard coded + salvataggio conf x creare json
+                        currRule = new SearchRules()
+                        {
+                            Name = "Commento Filename",
+                            Mode = SearchMode.StringOnFile,
+                            MaxChar2Search = 100,
+                            ReplaceCR = true,
+                            RegExPattern = "\\b{{fileName}}" + @".{0,2}\([\w\d\s./]+\)",
+                            RegExRepFileName = true,
+                            FileNameExtReplace = fileExtReplace,
+                            ExcludedTags = new List<string>() { "M4", "M5", "M4+A", "M4+B", "M5+A", "M5+B" },
+                            OutReplace = confReplace,
+                            OutExcludeFileName = true
+                        };
+
+                        // serializzo
+
+                        string rawRule = JsonConvert.SerializeObject(currRule, Formatting.Indented);
+                        Log.Info($"Conf rule generato:{Environment.NewLine}{rawRule}");
+                    }
+
+                    dbController.CheckFileArchived(item.IdxMacchina, item.BasePath, "*.*", currRule);
                 }
             }
             catch (Exception exc)
             {
-                Log.Error($"Eccezione in updateAllArchive{Environment.NewLine}{exc}");
+                Log.Error($"Eccezione in updateAllArchive{Environment.NewLine}{exc}{Environment.NewLine}{exc.InnerException}");
             }
         }
 
diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor
index 590a6d4c..cd593b00 100644
--- a/MP.Prog/Pages/Archive.razor
+++ b/MP.Prog/Pages/Archive.razor
@@ -132,7 +132,7 @@
                                         </span>
                                     </td>
                                     <td>
-                                        <div>@record.Macchina.RuleName</div>
+                                        <div>@record.Macchina.Nome</div>
                                         <div class="small">@record.Macchina.Descrizione</div>
                                     </td>
                                     <td>

From 7ce2d0720cc849151056a1b2bf501529eae980fa Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 13 Sep 2021 08:46:32 +0200
Subject: [PATCH 11/14] Fix componente DataPager

---
 MP.Prog/Components/DataPager.razor    | 38 ++++++---------------------
 MP.Prog/Components/DataPager.razor.cs | 23 +++++++++++-----
 2 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/MP.Prog/Components/DataPager.razor b/MP.Prog/Components/DataPager.razor
index 818627ba..34106e7f 100644
--- a/MP.Prog/Components/DataPager.razor
+++ b/MP.Prog/Components/DataPager.razor
@@ -4,37 +4,17 @@
             <div class="col-12 small">
                 @if (totalCount > 0)
                 {
-                    <Pagination Class="mb-0">
-                        <PaginationItem>
-                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="1">
-                                <i class="fas fa-angle-double-left"></i>
-                            </PaginationLink>
-                        </PaginationItem>
-                        <PaginationItem>
-                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="@prevBlock.ToString()">
-                                <span aria-hidden="true"><i class="fas fa-angle-left"></i></span>
-                            </PaginationLink>
-                        </PaginationItem>
+                    <ul class="pagination pagination-sm">
+                        <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(1)"><i class="fas fa-angle-double-left"></i></button></li>
+                        <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(prevBlock)"><i class="fas fa-angle-left"></i></button></li>
                         @for (int i = @startPage; i <= endPage; ++i)
                         {
                             var pageNum = i;
-                            <PaginationItem Active="@(currPage.Equals(pageNum))">
-                                <PaginationLink Clicked="@HandlePaginationItemClick" Page="@pageNum.ToString()">
-                                    @pageNum
-                                </PaginationLink>
-                            </PaginationItem>
+                            <li class="page-item"><button class="page-link @cssActive(pageNum)" @onclick="() => PaginationItemClick(pageNum)">@pageNum</button></li>
                         }
-                        <PaginationItem>
-                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="@nextBlock.ToString()">
-                                <i class="fas fa-angle-right"></i>
-                            </PaginationLink>
-                        </PaginationItem>
-                        <PaginationItem>
-                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="@LastPage.ToString()">
-                                <i class="fas fa-angle-double-right"></i>
-                            </PaginationLink>
-                        </PaginationItem>
-                    </Pagination>
+                        <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(nextBlock)"><i class="fas fa-angle-right"></i></button></li>
+                        <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(LastPage)"><i class="fas fa-angle-double-right"></i></button></li>
+                    </ul>
                 }
             </div>
         </div>
@@ -42,9 +22,7 @@
             <div class="col-12 small">
                 @if (showLoading)
                 {
-                    <Progress>
-                        <ProgressBar Value="@percLoading" Striped="true" Animated="true" />
-                    </Progress>
+                    <i>loading...</i>
                 }
             </div>
         </div>
diff --git a/MP.Prog/Components/DataPager.razor.cs b/MP.Prog/Components/DataPager.razor.cs
index adc3e47e..79df0eaa 100644
--- a/MP.Prog/Components/DataPager.razor.cs
+++ b/MP.Prog/Components/DataPager.razor.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using Microsoft.AspNetCore.Components;
+using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
-using MP.Prog.Components;
-using MP.Prog.Data;
 
 namespace MP.Prog.Components
 {
@@ -168,6 +164,16 @@ namespace MP.Prog.Components
 
         #region Protected Methods
 
+        protected string cssActive(int numPage)
+        {
+            string answ = "";
+            if (numPage == currPage)
+            {
+                answ = "active";
+            }
+            return answ;
+        }
+
         protected void HandlePaginationItemClick(string page)
         {
             currPage = int.Parse(page);
@@ -178,6 +184,11 @@ namespace MP.Prog.Components
             await Task.Run(() => showLoading = false);
         }
 
+        protected void PaginationItemClick(int page)
+        {
+            currPage = page;
+        }
+
         #endregion Protected Methods
     }
 }
\ No newline at end of file

From 7fb3e354167a4ac98d5a877a4f1ecef5ab47bb73 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 13 Sep 2021 08:46:52 +0200
Subject: [PATCH 12/14] Modifica controllo file (con ricerdca ultime modifiche)

---
 MP.FileData/Controllers/FileController.cs | 30 ++++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs
index 2f0baaa7..087316d5 100644
--- a/MP.FileData/Controllers/FileController.cs
+++ b/MP.FileData/Controllers/FileController.cs
@@ -40,20 +40,37 @@ namespace MP.FileData.Controllers
         /// </summary>
         /// <param name="idxMacchina">cod macchina</param>
         /// <param name="path">path ricerca x macchina</param>
+        /// <param name="numDayPre">Numero giorni x ricerca all'indietro da data corrente / 0 = nessun limite</param>
         /// <param name="searchPattern">pattern di ricerca (*.*)</param>
-        /// <param name="excludePattern">pattern esclusione (separato da spazi</param>
+        /// <param name="SearchRules">Regole di ricerca applicate</param>
         /// <returns></returns>
-        public bool CheckFileArchived(string idxMacchina, string path, string searchPattern, SearchRules currRule)
+        public bool CheckFileArchived(string idxMacchina, string path, int numDayPre, string searchPattern, SearchRules currRule)
         {
             Log.Info($"CheckFileArchived S00 | macchina: {idxMacchina} | path: {path} | pattern: {searchPattern} | # ExcludedFileExt: {currRule.ExcludedFileExt.Count()}");
             bool answ = false;
             DirectoryInfo dirInfo = new DirectoryInfo(path);
-            FileInfo[] fileList = dirInfo.GetFiles(searchPattern);
+            FileInfo[] fileListRaw = dirInfo.GetFiles(searchPattern, SearchOption.AllDirectories);
+            List<FileInfo> fileList = new List<FileInfo>();
+            DateTime adesso = DateTime.Now;
+            // se ho un limite x giorni indietor x modifiche --> limito!
+            if (numDayPre > 0)
+            {
+                foreach (var item in fileListRaw)
+                {
+                    if (adesso.Subtract(item.LastWriteTime).TotalDays <= numDayPre)
+                    {
+                        fileList.Add(item);
+                    }
+                }
+            }
+            else
+            {
+                fileList = fileListRaw.ToList();
+            }
             Log.Info($"CheckFileArchived S01 | file trovati: {fileList.Count()}");
             List<FileInfo> fileNew = new List<FileInfo>();
             List<FileModel> fileChecked = new List<FileModel>();
             List<FileModel> fileMod = new List<FileModel>();
-            DateTime adesso = DateTime.Now;
 
             // recupera elenco file nel DB
             var archivedFile = FileGetByPath(path, true);
@@ -265,7 +282,6 @@ namespace MP.FileData.Controllers
 
                     // gestione Tags (da migliorare...)
                     List<TagModel> currTags = localDbCtx.DbSetTags.ToList();
-                    //List<TagModel> currTags = TagGetAll();
 
                     // calcolo MD5 e tags
                     foreach (var item in newRec)
@@ -311,10 +327,6 @@ namespace MP.FileData.Controllers
                         }
                     }
 
-                    //localDbCtx
-                    //.DbSetTags
-                    //.AddRange(newTags);
-
                     // aggiungo in blocco
                     localDbCtx
                     .DbSetProgFile

From 66a2fd0923adcdba035b81ff5f21646ed42f0784 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 13 Sep 2021 08:46:58 +0200
Subject: [PATCH 13/14] refresh con pager

---
 MP.Prog/Data/FileArchDataService.cs |  5 +++--
 MP.Prog/MP.Prog.csproj              |  5 -----
 MP.Prog/Pages/Archive.razor         | 33 ++++++++++++++++++---------
 MP.Prog/Pages/Archive.razor.cs      | 35 +++++++++++++++++++++--------
 MP.Stats/MP.Stats.csproj            |  2 +-
 Resources/ChangeLog.html            |  2 +-
 Resources/VersNum.txt               |  2 +-
 Resources/manifest.xml              |  2 +-
 8 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/MP.Prog/Data/FileArchDataService.cs b/MP.Prog/Data/FileArchDataService.cs
index 7d53343c..f99fd3f6 100644
--- a/MP.Prog/Data/FileArchDataService.cs
+++ b/MP.Prog/Data/FileArchDataService.cs
@@ -259,8 +259,9 @@ namespace MP.Prog.Data
         /// <summary>
         /// Aggiorna intero archivio scansionando dati x tutte le macchine che hanno un path valido
         /// </summary>
+        /// <param name="numDayPre">Numero giorni x ricerca all'indietro da data corrente / 0 = nessun limite</param>
         /// <returns></returns>
-        public async Task updateAllArchive()
+        public async Task updateAllArchive(int numDayPre)
         {
             string ruleName = "Rule01.json";
             try
@@ -316,7 +317,7 @@ namespace MP.Prog.Data
                         Log.Info($"Conf rule generato:{Environment.NewLine}{rawRule}");
                     }
 
-                    dbController.CheckFileArchived(item.IdxMacchina, item.BasePath, "*.*", currRule);
+                    dbController.CheckFileArchived(item.IdxMacchina, item.BasePath, numDayPre, "*.*", currRule);
                 }
             }
             catch (Exception exc)
diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj
index fc16b061..bbc39c46 100644
--- a/MP.Prog/MP.Prog.csproj
+++ b/MP.Prog/MP.Prog.csproj
@@ -4,13 +4,8 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Components\DataPager.razor.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Remove="Components\CodArtSelector.razor" />
-    <Content Remove="Components\DataPager.razor" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor
index cd593b00..c5e547e0 100644
--- a/MP.Prog/Pages/Archive.razor
+++ b/MP.Prog/Pages/Archive.razor
@@ -1,5 +1,7 @@
 @page "/Archive"
 
+@using MP.Prog.Components
+
 <div class="card">
     <div class="card-header table-primary h3">
         <div class="row">
@@ -10,12 +12,19 @@
                 <div class="form-row">
                     <div class="col-1">
                         <div class="form-group mb-0">
-                            <button id="btnForceCheck" class="btn btn-warning btn-sm btn-block" @onclick="() => ForceCheck()" title="Forza verifica archivio">
+                            <button id="btnForceCheck" class="btn btn-danger btn-sm btn-block" @onclick="() => ForceCheck(0)" title="Forza verifica archivio (totale)">
                                 <i class="far fa-folder-open"></i>&nbsp;<i class="fas fa-sync-alt"></i>
                             </button>
                         </div>
                     </div>
-                    <div class="col-2">
+                    <div class="col-1">
+                        <div class="form-group mb-0">
+                            <button id="btnForceCheck" class="btn btn-warning btn-sm btn-block" @onclick="() => TestLoading()" title="Ultime modifiche (last 48h)">
+                                <i class="far fa-folder-open"></i>&nbsp;<i class="fas fa-sync-alt"></i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="col-1">
                         <div class="input-group input-group-sm">
                             <div class="input-group-prepend">
                             </div>
@@ -25,17 +34,17 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-2">
+                    <div class="col-1">
                         <div class="input-group input-group-sm">
                             <div class="input-group-prepend">
                             </div>
                             <div class="custom-control custom-switch">
                                 <input type="checkbox" class="custom-control-input" id="togModificati" title="Solo Aperti / Mostra tutti" @bind-value="@OnlyMod" checked="@OnlyMod" />
-                                <label class="custom-control-label small" for="togModificati"><sub>Modifiche</sub></label>
+                                <label class="custom-control-label small" for="togModificati"><sub>Mod</sub></label>
                             </div>
                         </div>
                     </div>
-                    <div class="col-6">
+                    <div class="col-7">
                         <div class="input-group">
                             <div class="input-group-prepend">
                                 <span class="input-group-text">
@@ -63,14 +72,18 @@
         </div>
     </div>
     <div class="card-body p-1">
+        @if (isLoading == true)
+        {
+            <h1 class="alert alert-info">Bingo!</h1>
+        }
+
         @if (currRecord != null)
         {
-            <MP.Prog.Components.FileEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" TagList="@TagList" MacList="@MacList"></MP.Prog.Components.FileEditor>
+            <FileEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" TagList="@TagList" MacList="@MacList"></FileEditor>
         }
-        @if (ListRecords == null)
+        @if (ListRecords == null || isLoading == true)
         {
-            <MP.Prog.Components.LoadingData></MP.Prog.Components.LoadingData>
-            <d2>RELOADING</d2>
+            <LoadingData></LoadingData>
         }
         else if (totalCount == 0)
         {
@@ -158,6 +171,6 @@
         }
     </div>
     <div class="card-footer p-1">
-        @*<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />*@
+        <DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
     </div>
 </div>
\ No newline at end of file
diff --git a/MP.Prog/Pages/Archive.razor.cs b/MP.Prog/Pages/Archive.razor.cs
index b7230ead..a44b46c1 100644
--- a/MP.Prog/Pages/Archive.razor.cs
+++ b/MP.Prog/Pages/Archive.razor.cs
@@ -5,6 +5,7 @@ using MP.Prog.Data;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace MP.Prog.Pages
@@ -263,16 +264,20 @@ namespace MP.Prog.Pages
             pUpd.Wait();
         }
 
-        protected async Task ForceCheck()
+        protected void ForceCheck(int maxHour)
         {
-            isLoading = true;
-            await DataService.updateAllArchive();
-            currRecord = null;
-            SearchRecords = null;
-            ListRecords = null;
-            AppMService.File_Filter = SelectData.Init(5, 10);
-            isLoading = false;
-            await ReloadAllData();
+            var pUpd = Task.Run(async () =>
+            {
+                isLoading = true;
+                currRecord = null;
+                SearchRecords = null;
+                ListRecords = null;
+                await DataService.updateAllArchive(maxHour);
+                AppMService.File_Filter = SelectData.Init(5, 10);
+                isLoading = false;
+                await ReloadAllData();
+            });
+            pUpd.Wait();
         }
 
         protected void ForceReload(int newNum)
@@ -341,6 +346,18 @@ namespace MP.Prog.Pages
             currRecord = selRecord;
         }
 
+        protected async void TestLoading()
+        {
+            await InvokeAsync(() =>
+            {
+                isLoading = !isLoading;
+                //StateHasChanged();
+                //Thread.Sleep(500);
+                //Task.Delay(1);
+                //isLoading = false;
+            });
+        }
+
         protected async Task UpdateData()
         {
             currRecord = null;
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index 6f622334..4555e6e3 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>1.0.2109.0318</Version>
+        <Version>1.0.2109.1308</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 7c25555c..3f8966c0 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 1.0.2109.0318</h4>
+    <h4>Versione: 1.0.2109.1308</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index f39fda21..9aabad6d 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2109.0318
+1.0.2109.1308
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index cb5c5903..20cd83ff 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2109.0318</version>
+  <version>1.0.2109.1308</version>
   <url>http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/MP.Stats.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 461b00dc906075d0c2496aed5015950477e55735 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 13 Sep 2021 11:43:30 +0200
Subject: [PATCH 14/14] Fix display update caricamento pagina

---
 MP.Prog/Components/DataPager.razor    |   8 +-
 MP.Prog/Components/DataPager.razor.cs |   5 -
 MP.Prog/Components/Test.razor         |  27 ++++++
 MP.Prog/Data/FileArchDataService.cs   |  37 +++++---
 MP.Prog/Data/SelectData.cs            |  22 +++++
 MP.Prog/MP.Prog.csproj                |   2 +-
 MP.Prog/Pages/Archive.razor           |  10 +-
 MP.Prog/Pages/Archive.razor.cs        | 130 +++++++++++++-------------
 MP.Prog/Pages/Setup.razor             |   2 +
 9 files changed, 151 insertions(+), 92 deletions(-)
 create mode 100644 MP.Prog/Components/Test.razor

diff --git a/MP.Prog/Components/DataPager.razor b/MP.Prog/Components/DataPager.razor
index 34106e7f..3d577d19 100644
--- a/MP.Prog/Components/DataPager.razor
+++ b/MP.Prog/Components/DataPager.razor
@@ -4,13 +4,13 @@
             <div class="col-12 small">
                 @if (totalCount > 0)
                 {
-                    <ul class="pagination pagination-sm">
+                    <ul class="pagination pagination-sm mb-1">
                         <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(1)"><i class="fas fa-angle-double-left"></i></button></li>
                         <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(prevBlock)"><i class="fas fa-angle-left"></i></button></li>
                         @for (int i = @startPage; i <= endPage; ++i)
                         {
                             var pageNum = i;
-                            <li class="page-item"><button class="page-link @cssActive(pageNum)" @onclick="() => PaginationItemClick(pageNum)">@pageNum</button></li>
+                            <li class="page-item @cssActive(pageNum)"><button class="page-link" @onclick="() => PaginationItemClick(pageNum)">@pageNum</button></li>
                         }
                         <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(nextBlock)"><i class="fas fa-angle-right"></i></button></li>
                         <li class="page-item"><button class="page-link" @onclick="() => PaginationItemClick(LastPage)"><i class="fas fa-angle-double-right"></i></button></li>
@@ -22,7 +22,9 @@
             <div class="col-12 small">
                 @if (showLoading)
                 {
-                    <i>loading...</i>
+                    <div class="progress" style="height: 10px;">
+                        <div class="progress-bar progress-bar-striped progress-bar-animated" style="width:@percLoading%;"></div>
+                    </div>
                 }
             </div>
         </div>
diff --git a/MP.Prog/Components/DataPager.razor.cs b/MP.Prog/Components/DataPager.razor.cs
index 79df0eaa..c88f0745 100644
--- a/MP.Prog/Components/DataPager.razor.cs
+++ b/MP.Prog/Components/DataPager.razor.cs
@@ -174,11 +174,6 @@ namespace MP.Prog.Components
             return answ;
         }
 
-        protected void HandlePaginationItemClick(string page)
-        {
-            currPage = int.Parse(page);
-        }
-
         protected override async Task OnInitializedAsync()
         {
             await Task.Run(() => showLoading = false);
diff --git a/MP.Prog/Components/Test.razor b/MP.Prog/Components/Test.razor
new file mode 100644
index 00000000..075ca757
--- /dev/null
+++ b/MP.Prog/Components/Test.razor
@@ -0,0 +1,27 @@
+<h3>Test</h3>
+
+<button type="button" @onclick="@PlaceOrder_Clicked" disabled="@DisablePlaceOrderButton">@Title</button>
+
+@code{
+    private bool DisablePlaceOrderButton { get; set; } = false;
+
+    public string Title { get; set; } = "Place Order";
+
+    private async Task PlaceOrder_Clicked()
+    {
+
+        await DisablePlaceOrder();
+
+        DisablePlaceOrderButton = false;
+        Title = "Place Order";
+
+    }
+
+    async Task DisablePlaceOrder()
+    {
+        DisablePlaceOrderButton = true;
+        Title = "Wait...";
+        await Task.Delay(1000);
+
+    }
+}
\ No newline at end of file
diff --git a/MP.Prog/Data/FileArchDataService.cs b/MP.Prog/Data/FileArchDataService.cs
index f99fd3f6..a4d32bcb 100644
--- a/MP.Prog/Data/FileArchDataService.cs
+++ b/MP.Prog/Data/FileArchDataService.cs
@@ -11,6 +11,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Diagnostics;
 
 namespace MP.Prog.Data
 {
@@ -22,7 +23,7 @@ namespace MP.Prog.Data
 
         private static ILogger<FileArchDataService> _logger;
 
-        private static List<MP.FileData.DatabaseModels.MacchinaModel> ElencoMacchine = new List<MP.FileData.DatabaseModels.MacchinaModel>();
+        private static List<FileData.DatabaseModels.MacchinaModel> ElencoMacchine = new List<FileData.DatabaseModels.MacchinaModel>();
 
         private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
 
@@ -53,7 +54,7 @@ namespace MP.Prog.Data
 
         #region Public Fields
 
-        public static MP.FileData.Controllers.FileController dbController;
+        public static FileData.Controllers.FileController dbController;
 
         #endregion Public Fields
 
@@ -74,7 +75,7 @@ namespace MP.Prog.Data
             }
             else
             {
-                dbController = new MP.FileData.Controllers.FileController(configuration);
+                dbController = new FileData.Controllers.FileController(configuration);
                 StringBuilder sb = new StringBuilder();
                 sb.AppendLine($"DbController OK");
                 _logger.LogInformation(sb.ToString());
@@ -223,27 +224,34 @@ namespace MP.Prog.Data
             dbController.Dispose();
         }
 
-        public Task<MP.FileData.DatabaseModels.FileModel> FileGetByKey(int FileId)
+        public Task<FileData.DatabaseModels.FileModel> FileGetByKey(int FileId)
         {
             return Task.FromResult(dbController.FileGetByKey(FileId));
         }
 
-        public Task<List<MP.FileData.DatabaseModels.FileModel>> FileGetFilt(string IdxMacchina, string CodArticolo, bool OnlyActive, bool OnlyMod, string SearchVal)
+        public async Task<List<FileData.DatabaseModels.FileModel>> FileGetFilt(string IdxMacchina, string CodArticolo, bool OnlyActive, bool OnlyMod, string SearchVal)
         {
-            return Task.FromResult(dbController.FileGetFilt(IdxMacchina, CodArticolo, OnlyActive, OnlyMod, SearchVal).ToList());
+            List<FileData.DatabaseModels.FileModel> dbResult = new List<FileData.DatabaseModels.FileModel>();
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            dbResult = dbController.FileGetFilt(IdxMacchina, CodArticolo, OnlyActive, OnlyMod, SearchVal).ToList();
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Info($"Effettuata lettura da DB + caching per FileGetFilt: {ts.TotalMilliseconds} ms");
+            return await Task.FromResult(dbResult);
         }
 
-        public Task<List<MP.FileData.DatabaseModels.MacchinaModel>> MacchineGetAll()
+        public Task<List<FileData.DatabaseModels.MacchinaModel>> MacchineGetAll()
         {
             return Task.FromResult(dbController.MacchineGetAll().ToList());
         }
 
-        public Task<List<AutocompleteModel>> MachineList()
+        public async Task<List<AutocompleteModel>> MachineList()
         {
             List<AutocompleteModel> answ = new List<AutocompleteModel>();
             answ.Add(new AutocompleteModel { LabelField = "--- TUTTE ---", ValueField = "*" });
             answ.AddRange(dbController.MacchineGetAll().Select(x => new AutocompleteModel { LabelField = $"{x.IdxMacchina} | {x.Nome} {x.Descrizione} ", ValueField = x.IdxMacchina }).ToList());
-            return Task.FromResult(answ);
+            return await Task.FromResult(answ);
         }
 
         public void rollBackEdit(object item)
@@ -251,9 +259,9 @@ namespace MP.Prog.Data
             dbController.RollBackEntity(item);
         }
 
-        public Task<List<MP.FileData.DatabaseModels.TagModel>> TagGetFilt(string SearchVal)
+        public async Task<List<FileData.DatabaseModels.TagModel>> TagGetFilt(string SearchVal)
         {
-            return Task.FromResult(dbController.TagGetFilt(SearchVal, 200).ToList());
+            return await Task.FromResult(dbController.TagGetFilt(SearchVal, 200).ToList());
         }
 
         /// <summary>
@@ -261,8 +269,9 @@ namespace MP.Prog.Data
         /// </summary>
         /// <param name="numDayPre">Numero giorni x ricerca all'indietro da data corrente / 0 = nessun limite</param>
         /// <returns></returns>
-        public async Task updateAllArchive(int numDayPre)
+        public async Task<bool> updateAllArchive(int numDayPre)
         {
+            bool done = false;
             string ruleName = "Rule01.json";
             try
             {
@@ -317,13 +326,15 @@ namespace MP.Prog.Data
                         Log.Info($"Conf rule generato:{Environment.NewLine}{rawRule}");
                     }
 
-                    dbController.CheckFileArchived(item.IdxMacchina, item.BasePath, numDayPre, "*.*", currRule);
+                    done = dbController.CheckFileArchived(item.IdxMacchina, item.BasePath, numDayPre, "*.*", currRule);
                 }
             }
             catch (Exception exc)
             {
                 Log.Error($"Eccezione in updateAllArchive{Environment.NewLine}{exc}{Environment.NewLine}{exc.InnerException}");
             }
+
+            return await Task.FromResult(done);
         }
 
         #endregion Public Methods
diff --git a/MP.Prog/Data/SelectData.cs b/MP.Prog/Data/SelectData.cs
index 62f2a68b..c8e92923 100644
--- a/MP.Prog/Data/SelectData.cs
+++ b/MP.Prog/Data/SelectData.cs
@@ -12,10 +12,27 @@ namespace MP.Prog.Data
         public string CodArticolo { get; set; } = "";
         public DateTime DateEnd { get; set; } = DateTime.Now.AddMinutes(1);
         public DateTime DateStart { get; set; } = DateTime.Now.AddDays(-7);
+
+        /// <summary>
+        /// Primo record x selezione paginata, tipicamente primo della "decina" della pagina corrente
+        /// </summary>
+        public int FirstRecord
+        {
+            get
+            {
+                int primaPag = PageNum % 10;
+                int decina = PageNum - primaPag;
+                return PageSize * decina + 1;
+            }
+        }
+
         public string IdxMacchina { get; set; } = "";
         public bool OnlyActive { get; set; } = true;
         public bool OnlyMod { get; set; } = false;
 
+        public int PageNum { get; set; } = 1;
+        public int PageSize { get; set; } = 10;
+
         #endregion Public Properties
 
         #region Public Methods
@@ -43,6 +60,11 @@ namespace MP.Prog.Data
         {
             if (!(obj is SelectData item))
                 return false;
+
+            if (PageSize != item.PageSize)
+                return false;
+            if (PageNum != item.PageNum)
+                return false;
             if (OnlyActive != item.OnlyActive)
                 return false;
             if (OnlyMod != item.OnlyMod)
diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj
index bbc39c46..d2f8bc3c 100644
--- a/MP.Prog/MP.Prog.csproj
+++ b/MP.Prog/MP.Prog.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor
index c5e547e0..cbe96c1c 100644
--- a/MP.Prog/Pages/Archive.razor
+++ b/MP.Prog/Pages/Archive.razor
@@ -72,17 +72,13 @@
         </div>
     </div>
     <div class="card-body p-1">
-        @if (isLoading == true)
-        {
-            <h1 class="alert alert-info">Bingo!</h1>
-        }
-
         @if (currRecord != null)
         {
             <FileEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" TagList="@TagList" MacList="@MacList"></FileEditor>
         }
-        @if (ListRecords == null || isLoading == true)
+        @if (ListRecords == null)
         {
+            <h1 class="alert alert-info">Working</h1>
             <LoadingData></LoadingData>
         }
         else if (totalCount == 0)
@@ -171,6 +167,6 @@
         }
     </div>
     <div class="card-footer p-1">
-        <DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
+        <DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="PagerReloadNum" numPageChanged="PagerReloadPage" totalCount="totalCount" showLoading="isLoading" />
     </div>
 </div>
\ No newline at end of file
diff --git a/MP.Prog/Pages/Archive.razor.cs b/MP.Prog/Pages/Archive.razor.cs
index a44b46c1..c491d13d 100644
--- a/MP.Prog/Pages/Archive.razor.cs
+++ b/MP.Prog/Pages/Archive.razor.cs
@@ -30,8 +30,7 @@ namespace MP.Prog.Pages
 
         #endregion Protected Fields
 
-        #region Private Properties
-
+#if false
         private int _currPage { get; set; } = 1;
 
         private int _numRecord { get; set; } = 10;
@@ -49,9 +48,37 @@ namespace MP.Prog.Pages
                 }
             }
         }
+#endif
+
+        #region Private Properties
+
+        private int currPage
+        {
+            get
+            {
+                return AppMService.File_Filter.PageNum;
+            }
+            set
+            {
+                AppMService.File_Filter.PageNum = value;
+            }
+        }
 
         private bool isLoading { get; set; } = false;
 
+        private int numRecord
+        {
+            get
+            {
+                return AppMService.File_Filter.PageSize;
+            }
+            set
+            {
+                AppMService.File_Filter.PageSize = value;
+            }
+        }
+
+#if false
         private int numRecord
         {
             get => _numRecord;
@@ -65,6 +92,7 @@ namespace MP.Prog.Pages
                 }
             }
         }
+#endif
 
         private bool OnlyActive
         {
@@ -110,28 +138,6 @@ namespace MP.Prog.Pages
             }
         }
 
-        private string SelCodArt
-        {
-            get
-            {
-                string answ = "";
-                if (AppMService.File_Filter != null)
-                {
-                    answ = AppMService.File_Filter.CodArticolo;
-                }
-                return answ;
-            }
-            set
-            {
-                if (!AppMService.File_Filter.CodArticolo.Equals(value))
-                {
-                    AppMService.File_Filter.CodArticolo = value;
-                    var pUpd = Task.Run(async () => await ReloadData());
-                    pUpd.Wait();
-                }
-            }
-        }
-
         private string SelIdxMacc
         {
             get
@@ -178,7 +184,6 @@ namespace MP.Prog.Pages
             }
             set
             {
-                isLoading = true;
                 _SearchTag = value;
                 // se son > 3 char... debounce...
                 if (string.IsNullOrEmpty(value))
@@ -245,14 +250,6 @@ namespace MP.Prog.Pages
             return answ;
         }
 
-        private async Task ReloadData()
-        {
-            isLoading = true;
-            SearchRecords = await DataService.FileGetFilt(AppMService.File_Filter.IdxMacchina, AppMService.File_Filter.CodArticolo, AppMService.File_Filter.OnlyActive, AppMService.File_Filter.OnlyMod, AppMService.SearchVal);
-            ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
-            isLoading = false;
-        }
-
         #endregion Private Methods
 
         #region Protected Methods
@@ -268,28 +265,17 @@ namespace MP.Prog.Pages
         {
             var pUpd = Task.Run(async () =>
             {
-                isLoading = true;
                 currRecord = null;
                 SearchRecords = null;
                 ListRecords = null;
                 await DataService.updateAllArchive(maxHour);
                 AppMService.File_Filter = SelectData.Init(5, 10);
-                isLoading = false;
                 await ReloadAllData();
+                isLoading = false;
             });
             pUpd.Wait();
         }
 
-        protected void ForceReload(int newNum)
-        {
-            numRecord = newNum;
-        }
-
-        protected void ForceReloadPage(int newNum)
-        {
-            currPage = newNum;
-        }
-
         protected override async Task OnInitializedAsync()
         {
             DataService.ResetController();
@@ -299,6 +285,21 @@ namespace MP.Prog.Pages
             AppMService.PageIcon = "fas fa-folder pr-2";
             AppMService.EA_SearchUpdated += OnSeachUpdated;
             await ReloadAllData();
+            isLoading = false;
+        }
+
+        protected async Task PagerReloadNum(int newNum)
+        {
+            numRecord = newNum;
+            await ReloadData();
+            isLoading = false;
+        }
+
+        protected async Task PagerReloadPage(int newNum)
+        {
+            currPage = newNum;
+            await ReloadData();
+            isLoading = false;
         }
 
         protected async Task ReloadAllData()
@@ -307,13 +308,19 @@ namespace MP.Prog.Pages
             MacList = await DataService.MacchineGetAll();
             SelIdxMacc = "0";
             SearchTag = defTag;
-
             TagList = await DataService.TagGetFilt(SearchTag);
-
-            isLoading = false;
             await ReloadData();
         }
 
+        protected async Task ReloadData()
+        {
+            isLoading = true;
+            await Task.Delay(1);
+            SearchRecords = await DataService.FileGetFilt(AppMService.File_Filter.IdxMacchina, AppMService.File_Filter.CodArticolo, AppMService.File_Filter.OnlyActive, AppMService.File_Filter.OnlyMod, AppMService.SearchVal);
+            // faccio paginazione SOLO NELLA DECINA attuale... (quindi non tutte le pagine ma solo subset)
+            ListRecords = SearchRecords.Skip(numRecord * (currPage % 10 - 1)).Take(numRecord).ToList();
+        }
+
         protected void ResetData()
         {
             DataService.rollBackEdit(currRecord);
@@ -328,34 +335,31 @@ namespace MP.Prog.Pages
             AppMService.File_Filter = SelectData.Init(5, 10);
             SearchTag = defTag;
             await ReloadAllData();
+            isLoading = false;
         }
 
-        protected void ResetSearchArt()
+        protected void ResetSearchTag()
         {
             SearchTag = defTag;
         }
 
-        protected void searchArtUpd(string newCod)
-        {
-            SelCodArt = newCod;
-        }
-
         protected void Select(FileModel selRecord)
         {
             // applico filtro da selezione
             currRecord = selRecord;
         }
 
-        protected async void TestLoading()
+        protected async Task TestLoading()
         {
-            await InvokeAsync(() =>
-            {
-                isLoading = !isLoading;
-                //StateHasChanged();
-                //Thread.Sleep(500);
-                //Task.Delay(1);
-                //isLoading = false;
-            });
+            //isLoading = !isLoading;
+            await TestLoadingCloseTest();
+            isLoading = false;
+        }
+
+        protected async Task TestLoadingCloseTest()
+        {
+            isLoading = true;
+            await Task.Delay(1000);
         }
 
         protected async Task UpdateData()
diff --git a/MP.Prog/Pages/Setup.razor b/MP.Prog/Pages/Setup.razor
index cef56f59..cd9bc354 100644
--- a/MP.Prog/Pages/Setup.razor
+++ b/MP.Prog/Pages/Setup.razor
@@ -8,6 +8,8 @@
 
 <h3>Setup</h3>
 
+<MP.Prog.Components.Test></MP.Prog.Components.Test>
+
 @code {
 
 }
\ No newline at end of file