2.12.5

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

@@ -14,13 +14,13 @@ Public Module ModBase
 #Region "声明"
 
     '下列版本信息由更新器自动修改
-    Public Const VersionBaseName As String = "2.12.4" '不含分支前缀的显示用版本名
-    Public Const VersionStandardCode As String = "2.12.4." & VersionBranchCode '标准格式的四段式版本号
+    Public Const VersionBaseName As String = "2.12.5" '不含分支前缀的显示用版本名
+    Public Const VersionStandardCode As String = "2.12.5." & VersionBranchCode '标准格式的四段式版本号
     Public Const CommitHash As String = "" 'Commit Hash，由 GitHub Workflow 自动替换
 #If BETA Then
     Public Const VersionCode As Integer = 383 'Release
 #Else
-    Public Const VersionCode As Integer = 384 'Snapshot
+    Public Const VersionCode As Integer = 385 'Snapshot
 #End If
     '自动生成的版本信息
     Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName
@@ -1336,11 +1336,12 @@ Re:
         Dim Files As String()
         Try
             Files = Directory.GetFiles(Path)
-        Catch ex As DirectoryNotFoundException '#4549
-            If Not Directory.Exists(Path) Then Return 0 '可能已被其他线程删除
-            Log(ex, $"疑似为孤立符号链接，尝试直接删除（{Path}）", LogLevel.Developer)
-            Directory.Delete(Path)
-            Return 0
+        Catch ex As DirectoryNotFoundException '#4549，也可能已被其他线程删除
+            If Directory.Exists(Path) Then
+                Log(ex, $"疑似为孤立符号链接，尝试直接删除（{Path}）", LogLevel.Developer)
+                Directory.Delete(Path)
+            End If
+            Return DeletedCount
         End Try
         For Each FilePath As String In Files
             Dim RetriedFile As Boolean = False
@@ -1348,6 +1349,8 @@ RetryFile:
             Try
                 File.Delete(FilePath)
                 DeletedCount += 1
+            Catch ex As DirectoryNotFoundException
+                Return DeletedCount
             Catch ex As Exception
                 If Not RetriedFile Then
                     RetriedFile = True

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

@@ -182,10 +182,19 @@ RequestFinished:
             Throw New Exception($"预处理下载文件路径失败（{LocalPath}）", ex)
         End Try
         '下载
+        Dim RetryCount As Integer = 0
+Retry:
         Try
             File.WriteAllBytes(LocalPath, SendRequest(Url, HttpMethod.Get, SimulateBrowserHeaders:=SimulateBrowserHeaders))
+        Catch ex As ThreadInterruptedException
+            File.Delete(LocalPath)
+            Throw
         Catch ex As Exception
             File.Delete(LocalPath)
+            If RetryCount < 2 Then
+                RetryCount += 1
+                GoTo Retry
+            End If
             Throw New WebException($"通过网络请求直接下载小文件失败（{LocalPath}）", ex)
         End Try
     End Sub
@@ -284,6 +293,9 @@ RequestFinished:
             Throw
         Catch ex As ResponsedWebException
             Throw
+        Catch ex As FileNotFoundException
+            '由于 CacheCow 读取缓存失败，然后系统调用不存在的 System.Net.Http.Formatting.resources 抛出（#8150）
+            Throw New Exception($"网络请求时读取缓存失败", ex)
         Catch ex As Exception
             RecordIPReliability(HostIp, -1)
             If TypeOf ex Is OperationCanceledException OrElse TypeOf ex Is TimeoutException Then 'CancellationToken 超时
@@ -416,7 +428,7 @@ RequestFinished:
     Public ReadOnly Property NetTaskSpeedLimitHigh As Long
         Get
             If _NetTaskSpeedLimitHigh Is Nothing Then
-                Dim Setting = PCL.Settings.Get("ToolDownloadSpeed")
+                Dim Setting As Integer = Settings.Get("ToolDownloadSpeed")
                 If Setting <= 14 Then
                     _NetTaskSpeedLimitHigh = (Setting + 1) * 0.1 * 1024 * 1024L
                 ElseIf Setting <= 31 Then
@@ -1959,13 +1971,9 @@ Retry:
     ''' 是否有正在进行中、需要在下载管理页面显示的下载任务？
     ''' </summary>
     Public Function HasDownloadingTask(Optional IgnoreCustomDownload As Boolean = False) As Boolean
-        For Each Task In LoaderTaskbar.ToList()
-            If (Task.Show AndAlso Task.State = LoadState.Loading) AndAlso
-               (Not IgnoreCustomDownload OrElse Not Task.Name.ToString.Contains("自定义下载")) Then
-                Return True
-            End If
-        Next
-        Return False
+        Return LoaderTaskbar.Any(
+        Function(Task) Task.Show AndAlso Task.State = LoadState.Loading AndAlso
+                       (Not IgnoreCustomDownload OrElse Not Task.Name.ToString.Contains("自定义下载")))
     End Function
 
 #End Region