From 2fa5a0df16be889b39e3b68ad13e2e24a1da7f4c Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 11 Mar 2024 10:47:39 +0100
Subject: [PATCH] Update serializzatore DDF x evitare race conditions

---
 Resources/ChangeLog.html                         |  2 +-
 Resources/VersNum.txt                            |  2 +-
 Resources/manifest.xml                           |  2 +-
 WebDoorCreator.Data/DDF/Converter.cs             | 13 +++++++++----
 WebDoorCreator.Data/DTO/EdgesDto.cs              |  1 -
 WebDoorCreator.Data/Services/QueueDataService.cs |  2 +-
 WebDoorCreator.UI/WebDoorCreator.UI.csproj       |  2 +-
 7 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 612edab..eb215ef 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2403.0911</h4>
+    <h4>Version: 0.9.2403.1110</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index b2e9b5d..a0cc888 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2403.0911
+0.9.2403.1110
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index f212fe5..721fe76 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2403.0911</version>
+  <version>0.9.2403.1110</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/DDF/Converter.cs b/WebDoorCreator.Data/DDF/Converter.cs
index e1f1e3a..e6f52ba 100644
--- a/WebDoorCreator.Data/DDF/Converter.cs
+++ b/WebDoorCreator.Data/DDF/Converter.cs
@@ -37,7 +37,7 @@ namespace WebDoorCreator.Data.DDF
         {
             string outDdf = "";
             try
-            {                
+            {
                 DoorOpsDTO CurrentDoorOp = new DoorOpsDTO();
                 EdgesDto CurrentEdges = new EdgesDto();
                 SizeDto CurrentSize = new SizeDto();
@@ -46,10 +46,13 @@ namespace WebDoorCreator.Data.DDF
                 FinishingDto CurrentFinishing = new FinishingDto();
                 DDFDto CurrentConf = new DDFDto();
                 ListValuesModel CurrentCompoOrder = new ListValuesModel();
+                Dictionary<string, List<Dictionary<string, string>>> dictDoorOP = new Dictionary<string, List<Dictionary<string, string>>>();
+                Dictionary<string, Dictionary<string, string>> dictBaseDoorOp = new Dictionary<string, Dictionary<string, string>>();
+                Dictionary<string, Dictionary<string, string>> dictBaseSwing = new Dictionary<string, Dictionary<string, string>>();
                 // per prima cosa popolo gli oggetti di appoggio...
                 dictDoorOP = new Dictionary<string, List<Dictionary<string, string>>>();
                 var i = 0;
-                foreach (var item in listOp.Where(x=>x.ObjectId != "Size" && x.ObjectId != "Profiles" && x.ObjectId != "Swing" && x.ObjectId != "Properties"  && x.ObjectId != "Finishing"))
+                foreach (var item in listOp.Where(x => x.ObjectId != "Size" && x.ObjectId != "Profiles" && x.ObjectId != "Swing" && x.ObjectId != "Properties" && x.ObjectId != "Finishing"))
                 {
                     var deserialized = JsonConvert.DeserializeObject<Dictionary<string, string>>(item.JsoncActVal!);
                     if (deserialized != null)
@@ -122,7 +125,7 @@ namespace WebDoorCreator.Data.DDF
                     }
                     i++;
                 }
-                CurrentSize.size = dictBaseDoorOp; 
+                CurrentSize.size = dictBaseDoorOp;
                 string sizeSer = CurrentSize.GetSerialized(RemDoorOp);
                 //dictBaseDoorOp.Clear();
                 foreach (var item in listOp.Where(x => x.ObjectId == "Swing"))
@@ -148,9 +151,11 @@ namespace WebDoorCreator.Data.DDF
 
         #region Protected Properties
 
+#if false
         protected Dictionary<string, List<Dictionary<string, string>>> dictDoorOP { get; set; } = new Dictionary<string, List<Dictionary<string, string>>>();
         protected Dictionary<string, Dictionary<string, string>> dictBaseDoorOp { get; set; } = new Dictionary<string, Dictionary<string, string>>();
-        protected Dictionary<string, Dictionary<string, string>> dictBaseSwing { get; set; } = new Dictionary<string, Dictionary<string, string>>();
+        protected Dictionary<string, Dictionary<string, string>> dictBaseSwing { get; set; } = new Dictionary<string, Dictionary<string, string>>();  
+#endif
         protected List<string> FootRows { get; set; } = new List<string>();
         protected string FormatVers { get; set; } = "0";
         protected List<string> HeadRows { get; set; } = new List<string>();
diff --git a/WebDoorCreator.Data/DTO/EdgesDto.cs b/WebDoorCreator.Data/DTO/EdgesDto.cs
index f828403..cff0e95 100644
--- a/WebDoorCreator.Data/DTO/EdgesDto.cs
+++ b/WebDoorCreator.Data/DTO/EdgesDto.cs
@@ -35,7 +35,6 @@ namespace WebDoorCreator.Data.DTO
                     }
                     if (item.Contains("Separator"))
                     {
-                        //sb.Remove(item);
                         sb.AppendLine(" ");
                     }
                 }
diff --git a/WebDoorCreator.Data/Services/QueueDataService.cs b/WebDoorCreator.Data/Services/QueueDataService.cs
index 7d151d3..4efdf73 100644
--- a/WebDoorCreator.Data/Services/QueueDataService.cs
+++ b/WebDoorCreator.Data/Services/QueueDataService.cs
@@ -1275,7 +1275,7 @@ namespace WebDoorCreator.Data.Services
             int currVers = 0;
             string sCurrVers = "";
             // per prima cosa controllo se ho GIA' in coda qualcosa come richieste
-            if (string.IsNullOrEmpty(sCurrVers) && await NumRequestPending() > 0)
+            if (await NumRequestPending() > 0)
             {
                 var currPending = await RequestPending();
                 if (currPending != null)
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 67f84b5..2333801 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.2403.0911</Version>
+        <Version>0.9.2403.1110</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
