Просмотр исходного кода

fix: NTFS 8.3 文件名检查应校验各路径段而非整个路径

qinghuayuci 3 месяцев назад
Родитель
Сommit
d6c8266c58
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      Plain Craft Launcher 2/Modules/Base/ModValidate.vb

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

@@ -291,7 +291,7 @@ Public Class ValidateFolderName
             Dim InvalidStrCheck As String = New ValidateExceptSame({"CON", "PRN", "AUX", "CLOCK$", "NUL", "COM0", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT0", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"}, "文件夹名不可为 %!", True).Validate(Str)
             If InvalidStrCheck <> "" Then Return InvalidStrCheck
             '检查 NTFS 8.3 文件名(#4505)
-            If Str.RegexCheck(".{2,}~\d") Then Return "文件夹名不能包含这一特殊格式!"
+            If Str.RegexCheck(".{2,}~\d") Then Return "文件夹名不可包含这一特殊格式!"
             '检查文件夹重名
             Dim Arr As New List(Of String)
             If PathIgnore IsNot Nothing Then
@@ -414,7 +414,7 @@ Fin:
             Dim InvalidStrCheck As String = New ValidateExceptSame({"CON", "PRN", "AUX", "CLOCK$", "NUL", "COM0", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT0", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"}, "文件夹名不可为 %!").Validate(SubStr)
             If Not InvalidStrCheck = "" Then Return InvalidStrCheck
             '检查 NTFS 8.3 文件名(#4505)
-            If Str.RegexCheck(".{2,}~\d") Then Return "文件夹名不能包含这一特殊格式!"
+            If SubStr.RegexCheck(".{2,}~\d") Then Return "文件夹名不可包含这一特殊格式!"
         Next
         Return ""
     End Function