Tidy content type serializer.

KevinJump · Dec 6, 2024 · 6a159b4 · 6a159b4
1 parent 230b847
commit 6a159b4
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/uSync.Core/Serialization/Serializers/ContentTypeSerializer.cs b/uSync.Core/Serialization/Serializers/ContentTypeSerializer.cs
@@ -58,10 +58,20 @@ protected override void EnsureAliasCache()
     protected override async Task<SyncAttempt<XElement>> SerializeCoreAsync(IContentType item, SyncSerializerOptions options)
     {
         var node = SerializeBase(item);
-        var info = SerializeInfo(item);
 
-        var history = SerializeCleanupHistory(item);
-        if (history != null) info.Add(history);
+        node.Add(await SerializeInfoAsync(item));
+        node.Add(await SerializeStructureAsync(item));
+        node.Add(await SerializePropertiesAsync(item));
+        node.Add(SerializeTabs(item));
+
+        return SyncAttempt<XElement>.Succeed(item.Name ?? item.Alias, node, typeof(IContentType), ChangeType.Export);
+    }
+
+    protected async Task<XElement> SerializeInfoAsync(IContentType item)
+    {
+        var info = SerializeInfo(item);
+
+        info.AddIfNotNull(SerializeCleanupHistory(item));
 
         var parent = item.ContentTypeComposition.FirstOrDefault(x => x.Id == item.ParentId);
         if (parent != null)
@@ -71,9 +81,7 @@ protected override async Task<SyncAttempt<XElement>> SerializeCoreAsync(IContent
         }
         else if (item.Level != 1)
         {
-            var folderNode = await this.GetFolderNodeAsync(item);
-            if (folderNode != null)
-                info.Add(folderNode);
+            info.AddIfNotNull(await this.GetFolderNodeAsync(item));
         }
 
         // compositions ? 
@@ -86,17 +94,9 @@ protected override async Task<SyncAttempt<XElement>> SerializeCoreAsync(IContent
             : "";
 
         info.Add(new XElement("DefaultTemplate", templateAlias));
+        info.AddIfNotNull(SerializeTemplates(item));
 
-        var templates = SerializeTemplates(item);
-        if (templates != null)
-            info.Add(templates);
-
-        node.Add(info);
-        node.Add(await SerializeStructureAsync(item));
-        node.Add(await SerializePropertiesAsync(item));
-        node.Add(SerializeTabs(item));
-
-        return SyncAttempt<XElement>.Succeed(item.Name ?? item.Alias, node, typeof(IContentType), ChangeType.Export);
+        return info;
     }
 
     protected override void SerializeExtraProperties(XElement node, IContentType item, IPropertyType property)
@@ -131,7 +131,6 @@ protected override async Task<SyncAttempt<IContentType>> DeserializeCoreAsync(XE
 
         details.AddRange(await DeserializeBaseAsync(item, node));
 
-
         // compositions
         details.AddRange(await DeserializeCompositionsAsync(item, node));
 
@@ -185,7 +184,6 @@ public override async Task<SyncAttempt<IContentType>> DeserializeSecondPassAsync
         var historyUpdated = historyChanges.Any(x => x.Change > ChangeDetailType.NoChange);
         details.AddRange(historyChanges);
 
-
         CleanTabAliases(item);
 
         // clean tabs