Listing now supports multiple patchers per repo

Mutagen-Modding · Sep 30, 2020 · 69a6a07 · 69a6a07
1 parent 6b8d0fe
commit 69a6a07
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 46 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
-    <Version>0.8.3</Version>
+    <Version>0.8.5</Version>
   </PropertyGroup>
 </Project>
diff --git a/Mutagen.Bethesda.Synthesis/DTO/PatcherMeta.cs b/Mutagen.Bethesda.Synthesis/DTO/PatcherMeta.cs
diff --git a/Mutagen.Bethesda.Synthesis/DTO/PatchersListing.cs b/Mutagen.Bethesda.Synthesis/DTO/PatchersListing.cs
diff --git a/Synthesis.Bethesda.GUI/ViewModels/Config/SolutionPatcherVM.cs b/Synthesis.Bethesda.GUI/ViewModels/Config/SolutionPatcherVM.cs
@@ -10,7 +10,6 @@
 using System.IO;
 using System.Reactive.Linq;
 using System.Text;
-using Synthesis.Bethesda.Execution.Patchers;
 using Buildalyzer;
 using System.Linq;
 using DynamicData.Binding;
@@ -20,14 +19,9 @@
 using System.Diagnostics;
 using Buildalyzer.Environment;
 using System.Reactive;
-using Microsoft.Build.Evaluation;
 using System.Threading;
-using Serilog.Context;
-using Serilog;
-using Serilog.Events;
 using Newtonsoft.Json;
-using Mutagen.Bethesda.Synthesis;
-using Mutagen.Bethesda.Synthesis.DTO;
+using Synthesis.Bethesda.DTO;
 
 namespace Synthesis.Bethesda.GUI
 {
@@ -183,7 +177,7 @@ public SolutionPatcherVM(ProfileVM parent, SolutionPatcherSettings? settings = n
                 {
                     try
                     {
-                        return Path.Combine(Path.GetDirectoryName(projPath)!, "SynthesisMeta.json");
+                        return Path.Combine(Path.GetDirectoryName(projPath)!, Constants.MetaFileName);
                     }
                     catch (Exception)
                     {
@@ -203,13 +197,13 @@ public SolutionPatcherVM(ProfileVM parent, SolutionPatcherSettings? settings = n
                         {
                             try
                             {
-                                return JsonConvert.DeserializeObject<PatcherInfo>(File.ReadAllText(path));
+                                return JsonConvert.DeserializeObject<PatcherCustomization>(File.ReadAllText(path));
                             }
                             catch (Exception ex)
                             {
                                 Logger.Error(ex, "Error reading in meta");
                             }
-                            return default(PatcherInfo?);
+                            return default(PatcherCustomization?);
                         });
                 })
                 .Switch()
@@ -242,7 +236,7 @@ public SolutionPatcherVM(ProfileVM parent, SolutionPatcherSettings? settings = n
                         if (string.IsNullOrWhiteSpace(x.meta)) return;
                         File.WriteAllText(x.meta,
                             JsonConvert.SerializeObject(
-                                new PatcherInfo()
+                                new PatcherCustomization()
                                 {
                                     Description = x.desc,
                                     HideByDefault = x.hidden,

diff --git a/Synthesis.Bethesda.UnitTests/CodeSnippetTests.cs b/Synthesis.Bethesda.UnitTests/CodeSnippetTests.cs
@@ -1,7 +1,6 @@
 using Synthesis.Bethesda.Execution.Patchers;
 using Synthesis.Bethesda.Execution.Settings;
 using Noggog;
-using Noggog.Utility;
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/Synthesis.Bethesda.UnitTests/RunnerTests.cs b/Synthesis.Bethesda.UnitTests/RunnerTests.cs
@@ -1,7 +1,6 @@
 using Synthesis.Bethesda.Execution.Patchers;
 using Synthesis.Bethesda.Execution.Runner;
 using Noggog;
-using Noggog.Utility;
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/Synthesis.Bethesda/Constants.cs b/Synthesis.Bethesda/Constants.cs
@@ -1,4 +1,4 @@
-using Mutagen.Bethesda;
+using Mutagen.Bethesda;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -9,5 +9,6 @@ public static class Constants
     {
         public static readonly string SynthesisName = "Synthesis";
         public static readonly ModKey SynthesisModKey = new ModKey(SynthesisName, ModType.Plugin);
+        public static readonly string MetaFileName = "SynthesisMeta.json";
     }
 }
diff --git a/Synthesis.Bethesda/DTO/MutagenPatchersListing.cs b/Synthesis.Bethesda/DTO/MutagenPatchersListing.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Synthesis.Bethesda.DTO
+{
+    public class MutagenPatchersListing
+    {
+        public RepositoryListing[] Repositories { get; set; } = Array.Empty<RepositoryListing>();
+    }
+}
diff --git a/...gen.Bethesda.Synthesis/DTO/PatcherInfo.cs → ...esis.Bethesda/DTO/PatcherCustomization.cs b/...gen.Bethesda.Synthesis/DTO/PatcherInfo.cs → ...esis.Bethesda/DTO/PatcherCustomization.cs
@@ -2,20 +2,20 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Mutagen.Bethesda.Synthesis.DTO
+namespace Synthesis.Bethesda.DTO
 {
-    public class PatcherInfo : IEquatable<PatcherInfo>
+    public class PatcherCustomization : IEquatable<PatcherCustomization>
     {
         public string? Nickname { get; set; }
         public bool HideByDefault { get; set; } = false;
         public string? Description { get; set; }
 
         public override bool Equals(object obj)
         {
-            return obj is PatcherInfo info && this.Equals(info);
+            return obj is PatcherCustomization info && this.Equals(info);
         }
 
-        public bool Equals(PatcherInfo other)
+        public bool Equals(PatcherCustomization other)
         {
             if (HideByDefault != other.HideByDefault) return false;
             if (!string.Equals(this.Description, other.Description)) return false;

diff --git a/Synthesis.Bethesda/DTO/PatcherListing.cs b/Synthesis.Bethesda/DTO/PatcherListing.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Synthesis.Bethesda.DTO
+{
+    public class PatcherListing
+    {
+        public PatcherCustomization? Customization { get; set; }
+        public string ProjectPath { get; set; } = string.Empty;
+    }
+}
diff --git a/...Bethesda.Synthesis/DTO/PatcherRepoInfo.cs → Synthesis.Bethesda/DTO/RepositoryListing.cs b/...Bethesda.Synthesis/DTO/PatcherRepoInfo.cs → Synthesis.Bethesda/DTO/RepositoryListing.cs
@@ -2,10 +2,11 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Mutagen.Bethesda.Synthesis.DTO
+namespace Synthesis.Bethesda.DTO
 {
-    public class PatcherRepoInfo
+    public class RepositoryListing
     {
+        public PatcherListing[] Patchers { get; set; } = Array.Empty<PatcherListing>();
         public string? AvatarURL { get; set; }
         public string? User { get; set; }
         public string? Repository { get; set; }

diff --git a/Synthesis.Bethesda/RunSynthesisPatcher.cs b/Synthesis.Bethesda/RunSynthesisPatcher.cs
@@ -1,8 +1,7 @@
-using CommandLine;
+using CommandLine;
 using Mutagen.Bethesda;
 using System;
 using System.Collections.Generic;
-using System.Net.NetworkInformation;
 using System.Text;
 
 namespace Synthesis.Bethesda