Merge branch 'v13/clean-root' of https://github.com/KevinJump/uSync i…

…nto v13/clean-root
KevinJump · Aug 28, 2024 · bee140c · bee140c
2 parents 89c6dfb + 67969ec
commit bee140c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/uSync.BackOffice/SyncHandlers/SyncHandlerContainerBase.cs b/uSync.BackOffice/SyncHandlers/SyncHandlerContainerBase.cs
@@ -120,7 +120,18 @@ public virtual IEnumerable<uSyncAction> ProcessPostImport(IEnumerable<uSyncActio
             if (actions == null || !actions.Any())
                 return Enumerable.Empty<uSyncAction>();
 
-            return CleanFolders(-1);
+            var results = new List<uSyncAction>();
+
+            // we only do deletes here. 
+            foreach (var action in actions.Where(x => x.Change == ChangeType.Hidden))
+            {
+                results.AddRange(
+                    Import(action.FileName, config, SerializerFlags.LastPass));
+            }
+
+            results.AddRange(CleanFolders(-1));
+
+            return results;
         }
 
         /// <summary>

diff --git a/uSync.Core/Serialization/SyncContainerSerializerBase.cs b/uSync.Core/Serialization/SyncContainerSerializerBase.cs
@@ -11,6 +11,7 @@
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Extensions;
+using uSync.Core.Models;
 
 namespace uSync.Core.Serialization
 {
@@ -26,6 +27,18 @@ public SyncContainerSerializerBase(IEntityService entityService, ILogger<SyncCon
             this.containerType = containerType;
         }
 
+        protected override SyncAttempt<TObject> ProcessDelete(Guid key, string alias, SerializerFlags flags)
+        {
+            if (flags.HasFlag(SerializerFlags.LastPass))
+            {
+                logger.LogDebug("Processing deletes as part of the last pass");
+                return base.ProcessDelete(key, alias, flags);
+            }
+
+            logger.LogDebug("Delete not processing as this is not the final pass");
+            return SyncAttempt<TObject>.Succeed(alias, ChangeType.Hidden);
+        }
+
         protected override Attempt<TObject> FindOrCreate(XElement node)
         {