Refactor

Author: CodingOctocat

IPConfig/Models/IDeepCloneable.cs

@@ -0,0 +1,10 @@
+namespace IPConfig.Models;
+
+/// <summary>
+/// 支持深层克隆。
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public interface IDeepCloneable<T>
+{
+    T DeepClone();
+}

IPConfig/Models/IPConfigBase.cs

@@ -6,7 +6,8 @@
 
 namespace IPConfig.Models;
 
-public abstract partial class IPConfigBase<T> : ObservableValidator, IDeepCloneTo<T> where T : IPConfigBase<T>
+public abstract partial class IPConfigBase<T> : ObservableValidator,
+    IDeepCloneable<T>, IDeepCloneTo<T> where T : IPConfigBase<T>, new()
 {
     protected bool _allowAutoDisableAutoDns;
 
@@ -131,7 +132,24 @@ public void AllowAutoDisableDhcp(bool allow = true)
         _allowAutoDisableDhcp = allow;
     }
 
-    public abstract void DeepCloneTo(T other);
+    public virtual T DeepClone()
+    {
+        T clone = new();
+        DeepCloneTo(clone);
+
+        return clone;
+    }
+
+    public virtual void DeepCloneTo(T other)
+    {
+        other.IP = IP;
+        other.IsDhcpEnabled = IsDhcpEnabled;
+        other.Mask = Mask;
+        other.Gateway = Gateway;
+        other.IsAutoDns = IsAutoDns;
+        other.Dns1 = Dns1;
+        other.Dns2 = Dns2;
+    }
 
     public virtual void FormatProperties()
     {

IPConfig/Models/IPConfigModel.cs

@@ -122,15 +122,9 @@ public void DeepCloneTo(IPConfigModel other)
 
     public bool PropertyEquals(IPConfigModel other)
     {
-        if (Name == other.Name
-            && IPv4Config.IP == other.IPv4Config.IP
-            && IPv4Config.IsDhcpEnabled == other.IPv4Config.IsDhcpEnabled
-            && IPv4Config.Mask == other.IPv4Config.Mask
-            && IPv4Config.Gateway == other.IPv4Config.Gateway
-            && IPv4Config.IsAutoDns == other.IPv4Config.IsAutoDns
-            && IPv4Config.Dns1 == other.IPv4Config.Dns1
-            && IPv4Config.Dns2 == other.IPv4Config.Dns2
-            && Remark == other.Remark)
+        bool iPv4ConfigEquals = IPv4Config.PropertyEquals(other.IPv4Config);
+
+        if (iPv4ConfigEquals && Name == other.Name && Remark == other.Remark)
         {
             return true;
         }

IPConfig/Models/IPv4Config.cs

@@ -40,15 +40,20 @@ public class IPv4Config : IPConfigBase<IPv4Config>
         base.ClearErrors(propertyName);
     }
 
-    public override void DeepCloneTo(IPv4Config other)
+    public bool PropertyEquals(IPv4Config other)
     {
-        other.IP = IP;
-        other.IsDhcpEnabled = IsDhcpEnabled;
-        other.Mask = Mask;
-        other.Gateway = Gateway;
-        other.IsAutoDns = IsAutoDns;
-        other.Dns1 = Dns1;
-        other.Dns2 = Dns2;
+        if (IP == other.IP
+            && IsDhcpEnabled == other.IsDhcpEnabled
+            && Mask == other.Mask
+            && Gateway == other.Gateway
+            && IsAutoDns == other.IsAutoDns
+            && Dns1 == other.Dns1
+            && Dns2 == other.Dns2)
+        {
+            return true;
+        }
+
+        return false;
     }
 
     public override string ToString()