Ver Fonte

chore(ModDownloadLib): 按意见进行修改

wyc-26 há 1 ano atrás
pai
commit
d546528904

+ 6 - 7
Plain Craft Launcher 2/Modules/ModMain.vb

@@ -873,17 +873,16 @@ NextFile:
     End Sub
 
     ''' <summary>
-    ''' 申请一个可用于任务缓存的临时文件夹。
+    ''' 申请一个可用于任务缓存的临时文件夹,以 \ 结尾。
     ''' 这些文件夹无需进行后续清理。
     ''' </summary>
     ''' <param name="RequireNonSpace">是否要求路径不包含空格。</param>
-    ''' <param name="RequireSlash">是否要求路径包含斜杠。</param>
-    Public Function RequestTaskTempFolder(Optional RequireNonSpace As Boolean = False, Optional RequireSlash As Boolean = True) As String
+    Public Function RequestTaskTempFolder(Optional RequireNonSpace As Boolean = False) As String
         TryClearTaskTemp()
-        Dim RequestTaskTempFolderWithoutSlash As String = If(RequireNonSpace AndAlso $"{PathTemp}TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}".Contains(" "), 
-                                  $"{OsDrive}ProgramData\PCL\TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}", 
-                                  $"{PathTemp}TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}")
-        RequestTaskTempFolder = If(RequireSlash, $"{RequestTaskTempFolderWithoutSlash}\", RequestTaskTempFolderWithoutSlash)
+        RequestTaskTempFolder = $"{PathTemp}TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}\"
+        If RequireNonSpace AndAlso RequestTaskTempFolder.Contains(" ") Then
+            RequestTaskTempFolder = $"{OsDrive}ProgramData\PCL\TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}\"
+        End If
         Directory.CreateDirectory(RequestTaskTempFolder)
     End Function
 

+ 1 - 1
Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb

@@ -613,7 +613,7 @@ pause"
             Log("[Download] 检测为新版 OptiFine:" & DownloadInfo.Inherit)
             Loaders.Add(New LoaderTask(Of List(Of NetFile), Boolean)("安装 OptiFine(方式 A)",
             Sub(Task As LoaderTask(Of List(Of NetFile), Boolean))
-                Dim BaseMcFolderHome As String = RequestTaskTempFolder(False, False)
+                Dim BaseMcFolderHome As String = BaseMcFolderHome.TrimEnd("\")
                 Dim BaseMcFolder As String = BaseMcFolderHome & "\.minecraft\"
                 Try
                     '准备安装环境