Fix: Improve Folder clean reporting and code.

KevinJump · Oct 2, 2019 · 50e4081 · 50e4081
1 parent 431f554
commit 50e4081
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/uSync8.BackOffice/SyncHandlers/SyncHandlerBase.cs b/uSync8.BackOffice/SyncHandlers/SyncHandlerBase.cs
@@ -176,7 +176,7 @@ private void ProcessSecondPasses(IDictionary<string, TObject> updates, HandlerSe
                 serializer.Save(updatedItems);
             }
 
-            
+
         }
 
         protected virtual IEnumerable<uSyncAction> ImportFolder(string folder, HandlerSettings config, Dictionary<string, TObject> updates, bool force, SyncUpdateCallback callback)
@@ -238,6 +238,8 @@ protected virtual IEnumerable<uSyncAction> ImportFolder(string folder, HandlerSe
                 {
                     actions.AddRange(CleanFolder(cleanFile, false));
                 }
+                // remove the actual cleans (they will have been replaced by the deletes
+                actions.RemoveAll(x => x.Change == ChangeType.Clean);
             }
 
             callback?.Invoke("", 1, 1);
@@ -297,12 +299,12 @@ protected IEnumerable<uSyncAction> DeleteMissingItems(TObject parent, IEnumerabl
                 if (!keys.Contains(item.Key))
                 {
                     var actualItem = GetFromService(item.Key);
-                    var name = actualItem.Id;
+                    var name = GetItemName(actualItem);
 
                     if (!reportOnly)
                         DeleteViaService(actualItem);
 
-                    actions.Add(uSyncActionHelper<TObject>.SetAction(SyncAttempt<TObject>.Succeed(name.ToString(), ChangeType.Delete), string.Empty));
+                    actions.Add(uSyncActionHelper<TObject>.SetAction(SyncAttempt<TObject>.Succeed(name, ChangeType.Delete), string.Empty));
                 }
             }
 
@@ -514,9 +516,13 @@ private IEnumerable<uSyncAction> ReportElement(XElement node, string filename)
                     }
 
                     action.Message = $"{action.Change.ToString()}";
+                    actions.Add(action);
+                }
+                else
+                {
+                    actions.Add(action);
                 }
 
-                actions.Add(action);
                 return actions;
             }
             catch (FormatException fex)

diff --git a/uSync8.BackOffice/SyncHandlers/SyncHandlerLevelBase.cs b/uSync8.BackOffice/SyncHandlers/SyncHandlerLevelBase.cs
@@ -152,8 +152,11 @@ protected override IEnumerable<uSyncAction> ImportFolder(string folder, HandlerS
                 // then we consider the folder safe to clean 
                 foreach (var cleanfile in cleanMarkers)
                 {
-                    actions.AddRange(CleanFolder(cleanfile, true));
+                    actions.AddRange(CleanFolder(cleanfile, false));
                 }
+                // remove the actual cleans (they will have been replaced by the deletes
+                actions.RemoveAll(x => x.Change == ChangeType.Clean);
+
             }
 
             callback?.Invoke("", 1, 1);

diff --git a/uSync8.ContentEdition/Serializers/ContentSerializer.cs b/uSync8.ContentEdition/Serializers/ContentSerializer.cs
@@ -325,6 +325,17 @@ protected override void SaveItem(IContent item)
         }
 
         protected override void DeleteItem(IContent item)
-            => contentService.Delete(item);
+        {
+            try
+            {
+                contentService.Delete(item);
+            }
+            catch (ArgumentNullException ex)
+            {
+                // we can get thrown a null argument exception by the notifer, 
+                // which is non critical! but we are ignoring this error. ! <= 8.1.5
+                if (!ex.Message.Contains("siteUri")) throw ex;
+            }
+        }
     }
 }
diff --git a/uSync8.Core/Serialization/SyncSerializerBase.cs b/uSync8.Core/Serialization/SyncSerializerBase.cs
@@ -165,6 +165,8 @@ protected SyncAttempt<TObject> ProcessAction(XElement node, SerializerFlags flag
                 case SyncActionType.Rename:
                     return ProcessRename(key, alias, flags);
                 case SyncActionType.Clean:
+                    // we return a 'clean' success, but this is then picked up 
+                    // in the handler, as something to clean, so the handler does it. 
                     return SyncAttempt<TObject>.Succeed(alias, ChangeType.Clean);
                 default:
                     return SyncAttempt<TObject>.Succeed(alias, ChangeType.NoChange);