From 843228c09e60446a79187bf6732e0ea31ba68a51 Mon Sep 17 00:00:00 2001
From: erri120 <erri120@protonmail.com>
Date: Sat, 26 Oct 2019 21:52:42 +0200
Subject: [PATCH] Using new Ceras options instead of JSON

---
 VirtualFileSystem/VirtualFileSystem.cs      | 13 ++++-----
 Wabbajack.Lib/Data.cs                       | 29 +++++----------------
 Wabbajack.Lib/Downloaders/HTTPDownloader.cs |  6 ++---
 3 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/VirtualFileSystem/VirtualFileSystem.cs b/VirtualFileSystem/VirtualFileSystem.cs
index 27ba5e64..07c685c1 100644
--- a/VirtualFileSystem/VirtualFileSystem.cs
+++ b/VirtualFileSystem/VirtualFileSystem.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using Ceras;
 using Compression.BSA;
 using ICSharpCode.SharpZipLib.Zip;
 using Newtonsoft.Json;
@@ -505,7 +506,7 @@ namespace VFS
         }
     }
 
-    [JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+    [MemberConfig(TargetMember.None)]
     public class VirtualFile
     {
         private string _fullPath;
@@ -517,7 +518,7 @@ namespace VFS
 
         internal string _stagedPath;
 
-        [JsonProperty]
+        [Include]
         public string[] Paths
         {
             get => _paths;
@@ -529,13 +530,13 @@ namespace VFS
             }
         }
 
-        [JsonProperty] public string Hash { get; set; }
+        [Include] public string Hash { get; set; }
 
-        [JsonProperty] public long Size { get; set; }
+        [Include] public long Size { get; set; }
 
-        [JsonProperty] public ulong LastModified { get; set; }
+        [Include] public ulong LastModified { get; set; }
 
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        [Include]
         public bool? FinishedIndexing { get; set; }
 
 
diff --git a/Wabbajack.Lib/Data.cs b/Wabbajack.Lib/Data.cs
index 4ee9e5d2..cd282f31 100644
--- a/Wabbajack.Lib/Data.cs
+++ b/Wabbajack.Lib/Data.cs
@@ -1,7 +1,6 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Diagnostics;
+using Ceras;
 using Compression.BSA;
 using VFS;
 using Wabbajack.Common;
@@ -34,7 +33,6 @@ namespace Wabbajack.Lib
         }
     }
 
-    [Serializable]
     public class ModList
     {
         /// <summary>
@@ -93,7 +91,6 @@ namespace Wabbajack.Lib
         public string ReportHTML;
     }
 
-    [Serializable]
     public class Directive
     {
         /// <summary>
@@ -104,18 +101,15 @@ namespace Wabbajack.Lib
         public string Hash;
     }
 
-    [Serializable]
     public class IgnoredDirectly : Directive
     {
         public string Reason;
     }
 
-    [Serializable]
     public class NoMatch : IgnoredDirectly
     {
     }
 
-    [Serializable]
     public class InlineFile : Directive
     {
         /// <summary>
@@ -129,13 +123,11 @@ namespace Wabbajack.Lib
     /// <summary>
     ///     File meant to be extracted before the installation
     /// </summary>
-    [Serializable]
     public class PropertyFile : InlineFile
     {
         public PropertyType Type;
     }
 
-    [Serializable]
     public class CleanedESM : InlineFile
     {
         public string SourceESMHash;
@@ -144,12 +136,11 @@ namespace Wabbajack.Lib
     /// <summary>
     ///     A file that has the game and MO2 folders remapped on installation
     /// </summary>
-    [Serializable]
     public class RemappedInlineFile : InlineFile
     {
     }
 
-    [Serializable]
+    [MemberConfig(TargetMember.All)]
     public class FromArchive : Directive
     {
         private string _fullPath;
@@ -159,9 +150,10 @@ namespace Wabbajack.Lib
         /// </summary>
         public string[] ArchiveHashPath;
 
-        [JsonIgnore] [NonSerialized] public VirtualFile FromFile;
+        [Exclude]
+        public VirtualFile FromFile;
 
-        [JsonIgnore]
+        [Exclude]
         public string FullPath
         {
             get
@@ -172,7 +164,6 @@ namespace Wabbajack.Lib
         }
     }
 
-    [Serializable]
     public class CreateBSA : Directive
     {
         public string TempID;
@@ -181,7 +172,6 @@ namespace Wabbajack.Lib
         public List<FileStateObject> FileStates { get; set; }
     }
 
-    [Serializable]
     public class PatchedFromArchive : FromArchive
     {
         /// <summary>
@@ -190,21 +180,18 @@ namespace Wabbajack.Lib
         public string PatchID;
     }
 
-    [Serializable]
     public class SourcePatch
     {
         public string RelativePath;
         public string Hash;
     }
 
-    [Serializable]
     public class MergedPatch : Directive
     {
         public List<SourcePatch> Sources;
         public string PatchID;
     }
 
-    [Serializable]
     public class Archive
     {
         /// <summary>
@@ -225,7 +212,6 @@ namespace Wabbajack.Lib
         public AbstractDownloadState State { get; set; }
     }
 
-    [Serializable]
     public class IndexedArchive
     {
         public dynamic IniData;
@@ -237,7 +223,6 @@ namespace Wabbajack.Lib
     /// <summary>
     ///     A archive entry
     /// </summary>
-    [Serializable]
     public class IndexedEntry
     {
         /// <summary>
@@ -256,7 +241,6 @@ namespace Wabbajack.Lib
         public long Size;
     }
 
-    [Serializable]
     public class IndexedArchiveEntry : IndexedEntry
     {
         public string[] HashPath;
@@ -265,7 +249,6 @@ namespace Wabbajack.Lib
     /// <summary>
     ///     Data found inside a BSA file in an archive
     /// </summary>
-    [Serializable]
     public class BSAIndexedEntry : IndexedEntry
     {
         /// <summary>
diff --git a/Wabbajack.Lib/Downloaders/HTTPDownloader.cs b/Wabbajack.Lib/Downloaders/HTTPDownloader.cs
index 241a35ee..fc86fda3 100644
--- a/Wabbajack.Lib/Downloaders/HTTPDownloader.cs
+++ b/Wabbajack.Lib/Downloaders/HTTPDownloader.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using Newtonsoft.Json;
+using Ceras;
 using Wabbajack.Common;
 using Wabbajack.Lib.Validation;
 using File = Alphaleonis.Win32.Filesystem.File;
@@ -48,14 +48,14 @@ namespace Wabbajack.Lib.Downloaders
         {
         }
 
+        [MemberConfig(TargetMember.All)]
         public class State : AbstractDownloadState
         {
             public string Url { get; set; }
 
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public List<string> Headers { get; set; }
 
-            [JsonIgnore]
+            [Exclude]
             public HttpClient Client { get; set; }
 
             public override bool IsWhitelisted(ServerWhitelist whitelist)