Replaced all instances of ModList file serialize/deserialize with GetModList/SaveModList

Lunaretic · Lunaretic · commit 39be78124b7d · 2020-07-30T17:53:36.000-04:00
diff --git a/xivModdingFramework/Mods/FileTypes/TTMP.cs b/xivModdingFramework/Mods/FileTypes/TTMP.cs
@@ -421,7 +421,7 @@ public string GetVersion(DirectoryInfo modPackDirectory)
             var dat = new Dat(gameDirectory);
             var modding = new Modding(gameDirectory);
             var modListFullPaths = new List<string>();
-            var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(modListDirectory.FullName));
+            var modList = modding.GetModList();
             var modCount = 1;
             var importErrors = "";
 
@@ -530,7 +530,7 @@ await dat.WriteToDat(new List<byte>(data), null, modJson.FullPath,
 
                 if (modsJson[0].ModPackEntry != null)
                 {
-                    modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(modListDirectory.FullName));
+                    modList = modding.GetModList();
 
                     // TODO - Probably need to look at keying this off more than just the name.
                     var modPackExists = modList.ModPacks.Any(modpack => modpack.name == modsJson[0].ModPackEntry.name);
@@ -540,7 +540,7 @@ await dat.WriteToDat(new List<byte>(data), null, modJson.FullPath,
                         modList.ModPacks.Add(modsJson[0].ModPackEntry);
                     }
 
-                    File.WriteAllText(modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));
+                    modding.SaveModList(modList);
                 }
             } finally
             {
diff --git a/xivModdingFramework/Mods/Modding.cs b/xivModdingFramework/Mods/Modding.cs
@@ -56,9 +56,15 @@ public ModList GetModList()
         {
             return JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));
         }
+
+        public void SaveModList(ModList ml)
+        {
+            SaveModList(modList);
+        }
+
         public async Task DeleteAllFilesAddedByTexTools()
         {
-            var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));
+            var modList = GetModList();
             var modsToRemove = modList.Mods.Where(it => it.source == "FilesAddedByTexTools");
             foreach(var mod in modsToRemove)
             {
@@ -85,7 +91,7 @@ public void CreateModlist()
                 Mods = new List<Mod>()
             };
 
-            File.WriteAllText(ModListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));
+            SaveModList(modList);
         }
 
         /// <summary>
@@ -99,7 +105,7 @@ public Task<Mod> TryGetModEntry(string internalFilePath)
             {
                 internalFilePath = internalFilePath.Replace("\\", "/");
 
-                var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));
+                var modList = GetModList();
 
                 if (modList == null) return null;
 
@@ -218,15 +224,15 @@ public async Task ToggleModStatus(string internalFilePath, bool enable)
 
             var modListDirectory = new DirectoryInfo(Path.Combine(_gameDirectory.Parent.Parent.FullName, XivStrings.ModlistFilePath));
 
-            var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(modListDirectory.FullName));
+            var modList = GetModList();
 
             var entryEnableUpdate = (from entry in modList.Mods
                 where entry.fullPath.Equals(modEntry.fullPath)
                 select entry).FirstOrDefault();
 
             entryEnableUpdate.enabled = enable;
 
-            File.WriteAllText(modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));
+            SaveModList(modList);
         }
 
         /// <summary>
@@ -238,7 +244,7 @@ public async Task ToggleModPackStatus(string modPackName, bool enable)
         {
             var index = new Index(_gameDirectory);
 
-            var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));
+            var modList = GetModList();
             var modListDirectory = new DirectoryInfo(Path.Combine(_gameDirectory.Parent.Parent.FullName, XivStrings.ModlistFilePath));
             List<Mod> mods = null;
 
@@ -279,7 +285,7 @@ public async Task ToggleModPackStatus(string modPackName, bool enable)
                 }
             }
 
-            File.WriteAllText(modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));
+            SaveModList(modList);
         }
 
         /// <summary>
@@ -290,9 +296,9 @@ public async Task ToggleAllMods(bool enable, IProgress<(int current, int total,
         {
             var index = new Index(_gameDirectory);
 
-            var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));
+            var modList = GetModList();
 
-            if(modList == null || modList.modCount == 0) return;
+            if (modList == null || modList.modCount == 0) return;
 
             var modNum = 0;
             foreach (var modEntry in modList.Mods)
@@ -359,7 +365,7 @@ public async Task DisableOldModList(DirectoryInfo oldModListDirectory)
         /// <param name="modItemPath">The mod item path of the mod to delete</param>
         public async Task DeleteMod(string modItemPath)
         {
-            var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));
+            var modList = GetModList();
 
             var modToRemove = (from mod in modList.Mods
                 where mod.fullPath.Equals(modItemPath)
@@ -396,7 +402,7 @@ where mod.fullPath.Equals(modItemPath)
             modList.modCount -= 1;
 
 
-            File.WriteAllText(ModListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));
+            SaveModList(modList);
         }
 
         /// <summary>
@@ -405,7 +411,7 @@ where mod.fullPath.Equals(modItemPath)
         /// <param name="modPackName">The name of the Mod Pack to be deleted</param>
         public async Task DeleteModPack(string modPackName)
         {
-            var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));
+            var modList = GetModList();
 
             var modPackItem = (from modPack in modList.ModPacks
                 where modPack.name.Equals(modPackName)
@@ -454,7 +460,7 @@ where modPack.name.Equals(modPackName)
             modList.modCount -= modRemoveCount;
             modList.modPackCount -= 1;
 
-            File.WriteAllText(ModListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));
+            SaveModList(modList);
         }
     }
 }
diff --git a/xivModdingFramework/SqPack/FileTypes/Dat.cs b/xivModdingFramework/SqPack/FileTypes/Dat.cs
@@ -1351,7 +1351,8 @@ public async Task<int> WriteToDat(List<byte> importData, Mod modEntry, string in
 
                     dataOverwritten = true;
 
-                    var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(_modListDirectory.FullName));
+                    var modding = new Modding(_gameDirectory);
+                    var modList = modding.GetModList();
 
                     var entryEnableUpdate = (from entry in modList.Mods
                         where entry.fullPath.Equals(modEntry.fullPath)
@@ -1364,7 +1365,7 @@ where entry.fullPath.Equals(modEntry.fullPath)
                         entryEnableUpdate.modPack = modPack;
                     }
 
-                    File.WriteAllText(_modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));
+                    modding.SaveModList(modList);
                 }
             }
             else
@@ -1374,7 +1375,8 @@ where entry.fullPath.Equals(modEntry.fullPath)
                 *  write the compressed data in the existing space.
                 */
 
-                var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(_modListDirectory.FullName));
+                var modding = new Modding(_gameDirectory);
+                var modList = modding.GetModList();
 
                 if (modList != null && modList.emptyCount > 0)
                 {
@@ -1452,7 +1454,7 @@ where entry.fullPath.Equals(modEntry.fullPath)
                             modList.emptyCount -= 1;
                             modList.modCount += 1;
 
-                            File.WriteAllText(_modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));
+                            modding.SaveModList(modList);
 
                             offset = mod.data.modOffset;
 
@@ -1528,7 +1530,8 @@ where entry.fullPath.Equals(modEntry.fullPath)
             {
                 if (offset != 0)
                 {
-                    var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(_modListDirectory.FullName));
+                    var modding = new Modding(_gameDirectory);
+                    var modList = modding.GetModList();
                     if (NewFilesNeedToBeAdded)
                     {
                         var success = true;
@@ -1589,7 +1592,7 @@ where entry.fullPath.Equals(modEntry.fullPath)
 
                     modList.modCount += 1;
 
-                    File.WriteAllText(_modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));
+                    modding.SaveModList(modList);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ public string GetVersion(DirectoryInfo modPackDirectory)`
`421`	`421`	`var dat = new Dat(gameDirectory);`
`422`	`422`	`var modding = new Modding(gameDirectory);`
`423`	`423`	`var modListFullPaths = new List<string>();`
`424`		`- var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(modListDirectory.FullName));`
	`424`	`+ var modList = modding.GetModList();`
`425`	`425`	`var modCount = 1;`
`426`	`426`	`var importErrors = "";`
`427`	`427`
`@@ -530,7 +530,7 @@ await dat.WriteToDat(new List<byte>(data), null, modJson.FullPath,`
`530`	`530`
`531`	`531`	`if (modsJson[0].ModPackEntry != null)`
`532`	`532`	`{`
`533`		`- modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(modListDirectory.FullName));`
	`533`	`+ modList = modding.GetModList();`
`534`	`534`
`535`	`535`	`// TODO - Probably need to look at keying this off more than just the name.`
`536`	`536`	`var modPackExists = modList.ModPacks.Any(modpack => modpack.name == modsJson[0].ModPackEntry.name);`
`@@ -540,7 +540,7 @@ await dat.WriteToDat(new List<byte>(data), null, modJson.FullPath,`
`540`	`540`	`modList.ModPacks.Add(modsJson[0].ModPackEntry);`
`541`	`541`	`}`
`542`	`542`
`543`		`- File.WriteAllText(modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));`
	`543`	`+ modding.SaveModList(modList);`
`544`	`544`	`}`
`545`	`545`	`} finally`
`546`	`546`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,15 @@ public ModList GetModList()`
`56`	`56`	`{`
`57`	`57`	`return JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+ public void SaveModList(ModList ml)`
	`61`	`+ {`
	`62`	`+ SaveModList(modList);`
	`63`	`+ }`
	`64`	`+`
`59`	`65`	`public async Task DeleteAllFilesAddedByTexTools()`
`60`	`66`	`{`
`61`		`- var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));`
	`67`	`+ var modList = GetModList();`
`62`	`68`	`var modsToRemove = modList.Mods.Where(it => it.source == "FilesAddedByTexTools");`
`63`	`69`	`foreach(var mod in modsToRemove)`
`64`	`70`	`{`
`@@ -85,7 +91,7 @@ public void CreateModlist()`
`85`	`91`	`Mods = new List<Mod>()`
`86`	`92`	`};`
`87`	`93`
`88`		`- File.WriteAllText(ModListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));`
	`94`	`+ SaveModList(modList);`
`89`	`95`	`}`
`90`	`96`
`91`	`97`	`/// <summary>`
`@@ -99,7 +105,7 @@ public Task<Mod> TryGetModEntry(string internalFilePath)`
`99`	`105`	`{`
`100`	`106`	`internalFilePath = internalFilePath.Replace("\\", "/");`
`101`	`107`
`102`		`- var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));`
	`108`	`+ var modList = GetModList();`
`103`	`109`
`104`	`110`	`if (modList == null) return null;`
`105`	`111`
`@@ -218,15 +224,15 @@ public async Task ToggleModStatus(string internalFilePath, bool enable)`
`218`	`224`
`219`	`225`	`var modListDirectory = new DirectoryInfo(Path.Combine(_gameDirectory.Parent.Parent.FullName, XivStrings.ModlistFilePath));`
`220`	`226`
`221`		`- var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(modListDirectory.FullName));`
	`227`	`+ var modList = GetModList();`
`222`	`228`
`223`	`229`	`var entryEnableUpdate = (from entry in modList.Mods`
`224`	`230`	`where entry.fullPath.Equals(modEntry.fullPath)`
`225`	`231`	`select entry).FirstOrDefault();`
`226`	`232`
`227`	`233`	`entryEnableUpdate.enabled = enable;`
`228`	`234`
`229`		`- File.WriteAllText(modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));`
	`235`	`+ SaveModList(modList);`
`230`	`236`	`}`
`231`	`237`
`232`	`238`	`/// <summary>`
`@@ -238,7 +244,7 @@ public async Task ToggleModPackStatus(string modPackName, bool enable)`
`238`	`244`	`{`
`239`	`245`	`var index = new Index(_gameDirectory);`
`240`	`246`
`241`		`- var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));`
	`247`	`+ var modList = GetModList();`
`242`	`248`	`var modListDirectory = new DirectoryInfo(Path.Combine(_gameDirectory.Parent.Parent.FullName, XivStrings.ModlistFilePath));`
`243`	`249`	`List<Mod> mods = null;`
`244`	`250`
`@@ -279,7 +285,7 @@ public async Task ToggleModPackStatus(string modPackName, bool enable)`
`279`	`285`	`}`
`280`	`286`	`}`
`281`	`287`
`282`		`- File.WriteAllText(modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));`
	`288`	`+ SaveModList(modList);`
`283`	`289`	`}`
`284`	`290`
`285`	`291`	`/// <summary>`
`@@ -290,9 +296,9 @@ public async Task ToggleAllMods(bool enable, IProgress<(int current, int total,`
`290`	`296`	`{`
`291`	`297`	`var index = new Index(_gameDirectory);`
`292`	`298`
`293`		`- var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));`
	`299`	`+ var modList = GetModList();`
`294`	`300`
`295`		`- if(modList == null \|\| modList.modCount == 0) return;`
	`301`	`+ if (modList == null \|\| modList.modCount == 0) return;`
`296`	`302`
`297`	`303`	`var modNum = 0;`
`298`	`304`	`foreach (var modEntry in modList.Mods)`
`@@ -359,7 +365,7 @@ public async Task DisableOldModList(DirectoryInfo oldModListDirectory)`
`359`	`365`	`/// <param name="modItemPath">The mod item path of the mod to delete</param>`
`360`	`366`	`public async Task DeleteMod(string modItemPath)`
`361`	`367`	`{`
`362`		`- var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));`
	`368`	`+ var modList = GetModList();`
`363`	`369`
`364`	`370`	`var modToRemove = (from mod in modList.Mods`
`365`	`371`	`where mod.fullPath.Equals(modItemPath)`
`@@ -396,7 +402,7 @@ where mod.fullPath.Equals(modItemPath)`
`396`	`402`	`modList.modCount -= 1;`
`397`	`403`
`398`	`404`
`399`		`- File.WriteAllText(ModListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));`
	`405`	`+ SaveModList(modList);`
`400`	`406`	`}`
`401`	`407`
`402`	`408`	`/// <summary>`
`@@ -405,7 +411,7 @@ where mod.fullPath.Equals(modItemPath)`
`405`	`411`	`/// <param name="modPackName">The name of the Mod Pack to be deleted</param>`
`406`	`412`	`public async Task DeleteModPack(string modPackName)`
`407`	`413`	`{`
`408`		`- var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(ModListDirectory.FullName));`
	`414`	`+ var modList = GetModList();`
`409`	`415`
`410`	`416`	`var modPackItem = (from modPack in modList.ModPacks`
`411`	`417`	`where modPack.name.Equals(modPackName)`
`@@ -454,7 +460,7 @@ where modPack.name.Equals(modPackName)`
`454`	`460`	`modList.modCount -= modRemoveCount;`
`455`	`461`	`modList.modPackCount -= 1;`
`456`	`462`
`457`		`- File.WriteAllText(ModListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));`
	`463`	`+ SaveModList(modList);`
`458`	`464`	`}`
`459`	`465`	`}`
`460`	`466`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1351,7 +1351,8 @@ public async Task<int> WriteToDat(List<byte> importData, Mod modEntry, string in`
`1351`	`1351`
`1352`	`1352`	`dataOverwritten = true;`
`1353`	`1353`
`1354`		`- var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(_modListDirectory.FullName));`
	`1354`	`+ var modding = new Modding(_gameDirectory);`
	`1355`	`+ var modList = modding.GetModList();`
`1355`	`1356`
`1356`	`1357`	`var entryEnableUpdate = (from entry in modList.Mods`
`1357`	`1358`	`where entry.fullPath.Equals(modEntry.fullPath)`
`@@ -1364,7 +1365,7 @@ where entry.fullPath.Equals(modEntry.fullPath)`
`1364`	`1365`	`entryEnableUpdate.modPack = modPack;`
`1365`	`1366`	`}`
`1366`	`1367`
`1367`		`- File.WriteAllText(_modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));`
	`1368`	`+ modding.SaveModList(modList);`
`1368`	`1369`	`}`
`1369`	`1370`	`}`
`1370`	`1371`	`else`
`@@ -1374,7 +1375,8 @@ where entry.fullPath.Equals(modEntry.fullPath)`
`1374`	`1375`	`* write the compressed data in the existing space.`
`1375`	`1376`	`*/`
`1376`	`1377`
`1377`		`- var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(_modListDirectory.FullName));`
	`1378`	`+ var modding = new Modding(_gameDirectory);`
	`1379`	`+ var modList = modding.GetModList();`
`1378`	`1380`
`1379`	`1381`	`if (modList != null && modList.emptyCount > 0)`
`1380`	`1382`	`{`
`@@ -1452,7 +1454,7 @@ where entry.fullPath.Equals(modEntry.fullPath)`
`1452`	`1454`	`modList.emptyCount -= 1;`
`1453`	`1455`	`modList.modCount += 1;`
`1454`	`1456`
`1455`		`- File.WriteAllText(_modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));`
	`1457`	`+ modding.SaveModList(modList);`
`1456`	`1458`
`1457`	`1459`	`offset = mod.data.modOffset;`
`1458`	`1460`
`@@ -1528,7 +1530,8 @@ where entry.fullPath.Equals(modEntry.fullPath)`
`1528`	`1530`	`{`
`1529`	`1531`	`if (offset != 0)`
`1530`	`1532`	`{`
`1531`		`- var modList = JsonConvert.DeserializeObject<ModList>(File.ReadAllText(_modListDirectory.FullName));`
	`1533`	`+ var modding = new Modding(_gameDirectory);`
	`1534`	`+ var modList = modding.GetModList();`
`1532`	`1535`	`if (NewFilesNeedToBeAdded)`
`1533`	`1536`	`{`
`1534`	`1537`	`var success = true;`
`@@ -1589,7 +1592,7 @@ where entry.fullPath.Equals(modEntry.fullPath)`
`1589`	`1592`
`1590`	`1593`	`modList.modCount += 1;`
`1591`	`1594`
`1592`		`- File.WriteAllText(_modListDirectory.FullName, JsonConvert.SerializeObject(modList, Formatting.Indented));`
	`1595`	`+ modding.SaveModList(modList);`
`1593`	`1596`	`}`
`1594`	`1597`	`}`
`1595`	`1598`