refactor: 改进代码写法，增强可读性

Co-authored-by: Open-KFC <[email protected]>

Author: wyc-26

Plain Craft Launcher 2/Modules/Base/ModValidate.vb

@@ -219,18 +219,18 @@ Public Class ValidateFolderName
     Inherits Validate
     Public Property Path As String
     Public Property UseMinecraftCharCheck As Boolean = True
-    Public Property IgnoreCase As Boolean = True
-    Private ReadOnly PathIgnore As IEnumerable(Of DirectoryInfo)
-    Public Property IgnoreFolderName As String = Nothing
+    Private ReadOnly PathDirs As IEnumerable(Of DirectoryInfo) = {}
+    Public Property OldName As String = Nothing
     Public Sub New()
     End Sub
-    Public Sub New(Path As String, Optional UseMinecraftCharCheck As Boolean = True, Optional IgnoreCase As Boolean = True, Optional IgnoreFolderName As String = Nothing)
+    Public Sub New(Path As String, Optional UseMinecraftCharCheck As Boolean = True, Optional OldName As String = Nothing)
         Me.Path = Path
-        Me.IgnoreCase = IgnoreCase
         Me.UseMinecraftCharCheck = UseMinecraftCharCheck
-        On Error Resume Next
-        PathIgnore = New DirectoryInfo(Path).EnumerateDirectories
-        Me.IgnoreFolderName = IgnoreFolderName
+        Try
+            PathDirs = New DirectoryInfo(Path).EnumerateDirectories
+        Catch ex As Exception
+        End Try
+        Me.OldName = OldName
     End Sub
     Public Overrides Function Validate(Str As String) As String
         Try
@@ -254,16 +254,17 @@ Public Class ValidateFolderName
             '检查 NTFS 8.3 文件名（#4505）
             If RegexCheck(Str, ".{2,}~\d") Then Return "文件夹名不能包含这一特殊格式！"
             '检查文件夹重名
-            Dim Arr As New List(Of String)
-            If PathIgnore IsNot Nothing Then
-                For Each Folder As DirectoryInfo In PathIgnore
-                    If IgnoreFolderName Is Nothing OrElse Not Folder.Name.ToLower = IgnoreFolderName.ToLower OrElse Folder.Name = Str Then
-                        Arr.Add(Folder.Name)
+            Dim SameNameCheck = New ValidateExceptSame(PathDirs.Select(Function(di As DirectoryInfo) di.Name).ToArray(), "不可与现有文件夹重名！", IgnoreCase:=True).Validate(Str)
+            If Not SameNameCheck = "" Then
+                '进行重命名相关的特判
+                If OldName?.Equals(Str, StringComparison.OrdinalIgnoreCase) Then
+                    If OldName.Equals(Str) Then
+                        Return "请输入一个不同的名称！"
                     End If
-                Next
+                Else
+                    Return SameNameCheck
+                End If
             End If
-            Dim SameNameCheck = New ValidateExceptSame(Arr, "不可与现有文件夹重名！", IgnoreCase).Validate(Str)
-            If Not SameNameCheck = "" Then Return SameNameCheck
             Return ""
         Catch ex As Exception
             Log(ex, "检查文件夹名出错")
@@ -380,4 +381,4 @@ Fin:
         Next
         Return ""
     End Function
-End Class
+End Class

Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb

@@ -109,7 +109,7 @@
             Dim OldName As String = PageVersionLeft.Version.Name
             Dim OldPath As String = PageVersionLeft.Version.Path
             '修改此部分的同时修改快速安装的版本名检测*
-            Dim NewName As String = MyMsgBoxInput("重命名版本", "", OldName, New ObjectModel.Collection(Of Validate) From {New ValidateFolderName(PathMcFolder & "versions", IgnoreFolderName:=OldName)})
+            Dim NewName As String = MyMsgBoxInput("重命名版本", "", OldName, New ObjectModel.Collection(Of Validate) From {New ValidateFolderName(PathMcFolder & "versions", OldName:=OldName)})
             If String.IsNullOrWhiteSpace(NewName) Then Exit Sub
             Dim NewPath As String = PathMcFolder & "versions\" & NewName & "\"
             '获取临时中间名，以防止仅修改大小写的重命名失败