浏览代码

chore(ModMain): 优化代码

wyc-26 1 年之前
父节点
当前提交
f2b6ef27ed
共有 1 个文件被更改,包括 4 次插入 和 11 次删除
  1. 4 11
      Plain Craft Launcher 2/Modules/ModMain.vb

+ 4 - 11
Plain Craft Launcher 2/Modules/ModMain.vb

@@ -880,17 +880,10 @@ NextFile:
     ''' <param name="RequireSlash">是否要求路径包含斜杠。</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, Optional RequireSlash As Boolean = True) As String
         TryClearTaskTemp()
         TryClearTaskTemp()
-        If RequireSlash Then
-            RequestTaskTempFolder = $"{PathTemp}TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}\"
-            If RequireNonSpace AndAlso RequestTaskTempFolder.Contains(" ") Then
-                RequestTaskTempFolder = $"{OsDrive}ProgramData\PCL\TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}\"
-            End If
-        Else
-            RequestTaskTempFolder = $"{PathTemp}TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}"
-            If RequireNonSpace AndAlso RequestTaskTempFolder.Contains(" ") Then
-                RequestTaskTempFolder = $"{OsDrive}ProgramData\PCL\TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}"
-            End If
-        End If
+        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)
         Directory.CreateDirectory(RequestTaskTempFolder)
         Directory.CreateDirectory(RequestTaskTempFolder)
     End Function
     End Function