Skip to content

fix(mod-modpack): 修复安装整合包时将只含有隐藏文件的文件夹识别为非空 #7067

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
pynickle wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(mod-modpack): 修复安装整合包时将只含有隐藏文件的文件夹识别为非空 #7067

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 35 additions & 2 deletions Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,19 @@ Public Module ModModpack
Try
Retry:
Loader.Progress = InitialProgress
DeleteDirectory(InstallTemp)
' 只删除非隐藏/非系统文件和文件夹
If Directory.Exists(InstallTemp) Then
For Each entry In Directory.GetFileSystemEntries(InstallTemp)
Dim attr = File.GetAttributes(entry)
If (attr And FileAttributes.Hidden) = 0 AndAlso (attr And FileAttributes.System) = 0 Then
If Directory.Exists(entry) Then
DeleteDirectory(entry)
Else
File.Delete(entry)
End If
End If
Next
End If
ExtractFile(FileAddress, InstallTemp, Encode, ProgressIncrementHandler:=Sub(Delta) Loader.Progress += Delta * ProgressIncrement)
Catch ex As Exception
Log(ex, "第 " & RetryCount & " 次解压尝试失败")
Expand Down Expand Up @@ -757,7 +769,7 @@ Retry:
MyMsgBox("接下来请选择一个空文件夹，它会被安装到这个文件夹里。", "安装", "继续", ForceWait:=True)
Dim TargetFolder As String = SelectFolder("选择安装目标（必须是一个空文件夹）")
If String.IsNullOrEmpty(TargetFolder) Then Throw New CancelledException
If Directory.GetFileSystemEntries(TargetFolder).Length > 0 Then Hint("请选择一个空文件夹作为安装目标！", HintType.Critical) : Throw New CancelledException
If Not IsDirectoryReallyEmpty(TargetFolder) Then Hint("请选择一个空文件夹作为安装目标！", HintType.Critical) : Throw New CancelledException
'解压
Dim Loader As New LoaderCombo(Of String)("解压压缩包", {
New LoaderTask(Of String, Integer)("解压压缩包",
Expand Down Expand Up @@ -856,4 +868,25 @@ Retry:

#End Region

' 判断文件夹是否只包含隐藏/系统文件
Private Function IsDirectoryReallyEmpty(path As String) As Boolean
For Each entry In Directory.GetFileSystemEntries(path)
Dim attr = File.GetAttributes(entry)
If (attr And FileAttributes.Hidden) = 0 AndAlso (attr And FileAttributes.System) = 0 Then
Return False
End If
Next
Return True
End Function

' 判断文件夹是否只包含隐藏/系统文件（不递归）
Private Function IsDirectoryOnlyHidden(path As String) As Boolean
For Each entry In Directory.GetFileSystemEntries(path)
Dim attr = File.GetAttributes(entry)
If (attr And FileAttributes.Hidden) = 0 AndAlso (attr And FileAttributes.System) = 0 Then
Return False
End If
Next
Return Directory.GetFileSystemEntries(path).Length > 0
End Function
End Module
Loading