Skip to content

fix: 修改版本名时未验证是否有不同大小写字母的文件夹名 #6087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wyc-26 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: 修改版本名时未验证是否有不同大小写字母的文件夹名 #6087

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f75a0a0
fix: 修改版本名时未验证是否有不同大小写字母的文件夹名
wyc-26 Apr 7, 2025
fbdff13
fix(ModValidate): 重命名版本时填入相同的名称时也可重命名
wyc-26 Apr 8, 2025
0135c2a
refactor: 改进代码写法，增强可读性
wyc-26 Apr 11, 2025
ed20907
Merge branch 'main' into fix#6083
wyc-26 Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Plain Craft Launcher 2/Modules/Base/ModValidate.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,16 @@ Public Class ValidateFolderName
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
Public Sub New()
End Sub
Public Sub New(Path As String, Optional UseMinecraftCharCheck As Boolean = True, Optional IgnoreCase As Boolean = True)
Public Sub New(Path As String, Optional UseMinecraftCharCheck As Boolean = True, Optional IgnoreCase As Boolean = True, Optional IgnoreFolderName As String = Nothing)
Me.Path = Path
Me.IgnoreCase = IgnoreCase
Me.UseMinecraftCharCheck = UseMinecraftCharCheck
On Error Resume Next
PathIgnore = New DirectoryInfo(Path).EnumerateDirectories
Me.IgnoreFolderName = IgnoreFolderName
End Sub
Public Overrides Function Validate(Str As String) As String
Try
Expand All @@ -255,7 +257,9 @@ Public Class ValidateFolderName
Dim Arr As New List(Of String)
If PathIgnore IsNot Nothing Then
For Each Folder As DirectoryInfo In PathIgnore
Arr.Add(Folder.Name)
If IgnoreFolderName Is Nothing OrElse Not Folder.Name.ToLower = IgnoreFolderName.ToLower OrElse Folder.Name = Str Then
Arr.Add(Folder.Name)
End If
Next
End If
Dim SameNameCheck = New ValidateExceptSame(Arr, "不可与现有文件夹重名！", IgnoreCase).Validate(Str)
Expand Down
2 changes: 1 addition & 1 deletion Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", IgnoreCase:=False)})
Dim NewName As String = MyMsgBoxInput("重命名版本", "", OldName, New ObjectModel.Collection(Of Validate) From {New ValidateFolderName(PathMcFolder & "versions", IgnoreFolderName:=OldName)})
If String.IsNullOrWhiteSpace(NewName) Then Exit Sub
Dim NewPath As String = PathMcFolder & "versions\" & NewName & "\"
'获取临时中间名，以防止仅修改大小写的重命名失败
Expand Down