add api to mare, change all to file scoped namespace

2022-09-29 15:52:33 +02:00
parent b10a02f228
commit ac6c46390c
27 changed files with 4436 additions and 4373 deletions
--- a/MareSynchronos/Models/CharacterData.cs
+++ b/MareSynchronos/Models/CharacterData.cs
@@ -6,83 +6,82 @@ using MareSynchronos.API;
 using MareSynchronos.Utils;
 using Lumina.Excel.GeneratedSheets;

-namespace MareSynchronos.Models
+namespace MareSynchronos.Models;
+
+[JsonObject(MemberSerialization.OptIn)]
+public class CharacterData
 {
-    [JsonObject(MemberSerialization.OptIn)]
-    public class CharacterData
+    [JsonProperty]
+    public Dictionary<ObjectKind, List<FileReplacement>> FileReplacements { get; set; } = new();
+
+    [JsonProperty]
+    public Dictionary<ObjectKind, string> GlamourerString { get; set; } = new();
+
+    public bool IsReady => FileReplacements.SelectMany(k => k.Value).All(f => f.Computed);
+
+    [JsonProperty]
+    public string ManipulationString { get; set; } = string.Empty;
+
+    [JsonProperty]
+    public float HeelsOffset { get; set; } = 0f;
+
+    public void AddFileReplacement(ObjectKind objectKind, FileReplacement fileReplacement)
    {
-        [JsonProperty]
-        public Dictionary<ObjectKind, List<FileReplacement>> FileReplacements { get; set; } = new();
+        if (!fileReplacement.HasFileReplacement) return;

-        [JsonProperty]
-        public Dictionary<ObjectKind, string> GlamourerString { get; set; } = new();
+        if (!FileReplacements.ContainsKey(objectKind)) FileReplacements.Add(objectKind, new List<FileReplacement>());

-        public bool IsReady => FileReplacements.SelectMany(k => k.Value).All(f => f.Computed);
-
-        [JsonProperty]
-        public string ManipulationString { get; set; } = string.Empty;
-
-        [JsonProperty]
-        public float HeelsOffset { get; set; } = 0f;
-
-        public void AddFileReplacement(ObjectKind objectKind, FileReplacement fileReplacement)
+        var existingReplacement = FileReplacements[objectKind].SingleOrDefault(f => f.ResolvedPath == fileReplacement.ResolvedPath);
+        if (existingReplacement != null)
        {
-            if (!fileReplacement.HasFileReplacement) return;
-
-            if (!FileReplacements.ContainsKey(objectKind)) FileReplacements.Add(objectKind, new List<FileReplacement>());
-
-            var existingReplacement = FileReplacements[objectKind].SingleOrDefault(f => f.ResolvedPath == fileReplacement.ResolvedPath);
-            if (existingReplacement != null)
-            {
-                existingReplacement.GamePaths.AddRange(fileReplacement.GamePaths.Where(e => !existingReplacement.GamePaths.Contains(e)));
-            }
-            else
-            {
-                FileReplacements[objectKind].Add(fileReplacement);
-            }
+            existingReplacement.GamePaths.AddRange(fileReplacement.GamePaths.Where(e => !existingReplacement.GamePaths.Contains(e)));
        }
-
-        public CharacterCacheDto ToCharacterCacheDto()
+        else
        {
-            var fileReplacements = FileReplacements.ToDictionary(k => k.Key, k => k.Value.Where(f => f.HasFileReplacement && !f.IsFileSwap).GroupBy(f => f.Hash).Select(g =>
-            {
-                return new FileReplacementDto()
-                {
-                    GamePaths = g.SelectMany(f => f.GamePaths).Distinct().ToArray(),
-                    Hash = g.First().Hash,
-                };
-            }).ToList());
-
-            Logger.Debug("Adding fileSwaps");
-            foreach (var item in FileReplacements)
-            {
-                Logger.Debug("Checking fileSwaps for " + item.Key);
-                var fileSwapsToAdd = item.Value.Where(f => f.IsFileSwap).Select(f => f.ToFileReplacementDto());
-                Logger.Debug("Adding " + fileSwapsToAdd.Count() + " file swaps");
-                foreach (var swap in fileSwapsToAdd)
-                {
-                    Logger.Debug("Adding: " + swap.GamePaths.First() + ":" + swap.FileSwapPath);
-                }
-                fileReplacements[item.Key].AddRange(fileSwapsToAdd);
-            }
-
-            return new CharacterCacheDto()
-            {
-                FileReplacements = fileReplacements,
-                GlamourerData = GlamourerString.ToDictionary(d => d.Key, d => d.Value),
-                ManipulationData = ManipulationString,
-                HeelsOffset = HeelsOffset
-            };
-        }
-
-        public override string ToString()
-        {
-            StringBuilder stringBuilder = new();
-            foreach (var fileReplacement in FileReplacements.SelectMany(k => k.Value).OrderBy(a => a.GamePaths[0]))
-            {
-                stringBuilder.AppendLine(fileReplacement.ToString());
-            }
-            return stringBuilder.ToString();
+            FileReplacements[objectKind].Add(fileReplacement);
        }
    }
+
+    public CharacterCacheDto ToCharacterCacheDto()
+    {
+        var fileReplacements = FileReplacements.ToDictionary(k => k.Key, k => k.Value.Where(f => f.HasFileReplacement && !f.IsFileSwap).GroupBy(f => f.Hash).Select(g =>
+        {
+            return new FileReplacementDto()
+            {
+                GamePaths = g.SelectMany(f => f.GamePaths).Distinct().ToArray(),
+                Hash = g.First().Hash,
+            };
+        }).ToList());
+
+        Logger.Debug("Adding fileSwaps");
+        foreach (var item in FileReplacements)
+        {
+            Logger.Debug("Checking fileSwaps for " + item.Key);
+            var fileSwapsToAdd = item.Value.Where(f => f.IsFileSwap).Select(f => f.ToFileReplacementDto());
+            Logger.Debug("Adding " + fileSwapsToAdd.Count() + " file swaps");
+            foreach (var swap in fileSwapsToAdd)
+            {
+                Logger.Debug("Adding: " + swap.GamePaths.First() + ":" + swap.FileSwapPath);
+            }
+            fileReplacements[item.Key].AddRange(fileSwapsToAdd);
+        }
+
+        return new CharacterCacheDto()
+        {
+            FileReplacements = fileReplacements,
+            GlamourerData = GlamourerString.ToDictionary(d => d.Key, d => d.Value),
+            ManipulationData = ManipulationString,
+            HeelsOffset = HeelsOffset
+        };
+    }
+
+    public override string ToString()
+    {
+        StringBuilder stringBuilder = new();
+        foreach (var fileReplacement in FileReplacements.SelectMany(k => k.Value).OrderBy(a => a.GamePaths[0]))
+        {
+            stringBuilder.AppendLine(fileReplacement.ToString());
+        }
+        return stringBuilder.ToString();
+    }
 }