From 795b60ee866483033e835699a149c163ee19629a Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 20 Jun 2024 13:15:12 +0200
Subject: [PATCH] Fix pulizia folder + fix selezione cartelle generic

---
 Resources/ChangeLog.html                          |  2 +-
 Resources/VersNum.txt                             |  2 +-
 Resources/manifest.xml                            |  2 +-
 .../Controllers/WebDoorCreatorController.cs       |  5 +++++
 .../Services/WebDoorCreatorService.cs             | 15 ---------------
 .../Components/Hardware/HwSingleInstance.razor.cs |  4 ++--
 WebDoorCreator.UI/WebDoorCreator.UI.csproj        |  2 +-
 7 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 54a30b2..f58d81c 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2406.2009</h4>
+    <h4>Version: 0.9.2406.2013</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index e850dd5..582a1fa 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2406.2009
+0.9.2406.2013
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 83639a5..21d13cd 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2406.2009</version>
+  <version>0.9.2406.2013</version>
   <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/WebDoorCreator.Data/Controllers/WebDoorCreatorController.cs b/WebDoorCreator.Data/Controllers/WebDoorCreatorController.cs
index da1ad64..afcb981 100644
--- a/WebDoorCreator.Data/Controllers/WebDoorCreatorController.cs
+++ b/WebDoorCreator.Data/Controllers/WebDoorCreatorController.cs
@@ -929,6 +929,11 @@ namespace WebDoorCreator.Data.Controllers
                                     .Database
                                     .ExecuteSqlRaw("exec dbo.stp_ListVal_Import");
 
+                    // stored x pulizia folder rimaste in giro
+                    storedRes = localDbCtx
+                                    .Database
+                                    .ExecuteSqlRaw("exec dbo.stp_ListVal_FixDix");
+
                     fatto = true;
                 }
                 catch (Exception exc)
diff --git a/WebDoorCreator.Data/Services/WebDoorCreatorService.cs b/WebDoorCreator.Data/Services/WebDoorCreatorService.cs
index 7f61043..3a8ba5c 100644
--- a/WebDoorCreator.Data/Services/WebDoorCreatorService.cs
+++ b/WebDoorCreator.Data/Services/WebDoorCreatorService.cs
@@ -2467,21 +2467,6 @@ namespace WebDoorCreator.Data.Services
                             var fileContent = File.ReadAllBytes(templateFile);
                             var hash = md5.ComputeHash(fileContent);
                             var oldMD5 = BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
-#if false
-                        DoorOpTypeModel tempType = new DoorOpTypeModel()
-                        {
-                            ParentId = HwTpl.DoorOpTypId,
-                            Description = $"Template for {compoCode.Replace(" ", "_")}",
-                            OpCode = @$"{dir}\{tName[tName.Length - 1]}\{Path.GetFileName(templateFile)}",
-                            HasHw = true,
-                            IsConcrete = true,
-                            HwCode = $"{compoCode}".Replace(" ", "_"),
-                            FileDim = fi.Length,
-                            FileMD5 = oldMD5,
-                            LastMod = fi.LastWriteTime
-                        };
-                        doorOpTypesList.Add(tempType);
-#endif
                             if (values.Where(x => x.TableName == temp.TableName && x.FieldName == temp.FieldName && x.Value == temp.Value).Count() == 0 && temp.TableName != null && temp.FieldName != null && temp.Value != null)
                             {
                                 values.Add(temp);
diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
index 3dcb719..f025c24 100644
--- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
+++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
@@ -423,11 +423,11 @@ namespace WebDoorCreator.UI.Components.Hardware
 
             if (tempListFilesTempl!.Count != 0)
             {
-                listValuesFiles = tempListFilesTempl.Where(x => x.Value.Contains(folderName)).ToList();
+                listValuesFiles = tempListFilesTempl.Where(x => x.Value.Contains($"{folderName}\\")).ToList();
             }
             else if (tempListFilesSh!.Count != 0)
             {
-                listValuesFiles = tempListFilesSh!.Where(x => x.Value.Contains(folderName)).ToList();
+                listValuesFiles = tempListFilesSh!.Where(x => x.Value.Contains($"{folderName}\\")).ToList();
             }
             try
             {
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 3e98866..7c7a430 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-        <Version>0.9.2406.2009</Version>
+        <Version>0.9.2406.2013</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
