fix:optimize installation

Author: VirtualHotBar

resources/config.json

@@ -7,6 +7,6 @@ Vdr=aomei
 Spd=pa
 ProductName=Windows 10 Enterprise x64
 fdate=20220106
-ldate=20230723
+ldate=20230730
 Lang=cn
 Ver=9.13.0

resources/tools/PACMDforUSB/cfg.ini

@@ -2,6 +2,7 @@ import { app, BrowserWindow, ipcMain, shell } from 'electron'
 import { dialog } from 'electron';
 import path from 'path'
 
+
 //是否为开发模式
 import isDev from 'electron-is-dev'
 
@@ -24,7 +25,6 @@ app.on('ready', () => {
       preload: path.join(__dirname, './preload.js')
     }
   })
-
 
   //窗口加载html文件
   //mainWindow.loadFile('./src/main.html')

src/main/index.ts

@@ -1,5 +1,6 @@
 import { Notification } from "@douyinfe/semi-ui";
 import { isClientReady } from "../init";
+import { config } from "../../services/config";
 
 
 
@@ -14,3 +15,29 @@ export function checkIsReady(){
     }
     return isReady
 }
+
+//获取PE版本
+export function getHotPEDriveVer(diskIndex: Number) {
+    //console.log(config.environment.HotPEDrive.all);
+
+    for (let i in config.environment.HotPEDrive.all) {
+        if (config.environment.HotPEDrive.all[i].diskIndex == diskIndex) {
+            return config.environment.HotPEDrive.all[i].version
+        }
+    }
+
+    return ''
+}
+
+//获取PE数据分区盘符
+export function getHotPEDriveLetter(diskIndex: Number) {
+    //console.log(config.environment.HotPEDrive.all);
+
+    for (let i in config.environment.HotPEDrive.all) {
+        if (config.environment.HotPEDrive.all[i].diskIndex == diskIndex) {
+            return config.environment.HotPEDrive.all[i].letter
+        }
+    }
+
+    return ''
+}

src/view/controller/Install/check.ts

@@ -134,7 +134,10 @@ export async function uninstallToSystem(setIsUninstalling: Function, setLockMuen
     await runCmdAsync(bcdeditPath + ' /delete ' + GUID1 + ' /f')
 
     await delDir(roConfig.environment.sysLetter + 'HotPE\\')
-    await delDir(roConfig.environment.sysLetter + 'HotPEModule\\')
+    if (!isUpdate) {
+        await delDir(roConfig.environment.sysLetter + 'HotPEModule\\')
+    }
+    
 
     //更新PE安装状态
     await checkPEDrive()

src/view/controller/Install/toSystem.ts

@@ -3,7 +3,7 @@ import { config, roConfig } from "../../services/config"
 import { runCmdAsync } from "../../utils/command"
 import { copyDir, copyFile, delDir, delFiles, getUsableLetter, isHotPEDrive, letterIsExist, moveFiles, readHotPEConfig, takeLeftStr, unZipFile, writeHotPEConfig } from "../../utils/utils"
 import { checkPEDrive } from "../condition"
-import { checkIsReady } from "./check"
+import { checkIsReady, getHotPEDriveLetter } from "./check"
 import { ReactNode } from "react"
 const fs = window.require('fs')
 
@@ -206,8 +206,6 @@ export async function updatePEForUDisk(diskIndex: string, setStep: Function, set
     setStepStr('正在解压文件')
     await unZipFile(roConfig.path.resources.pe + config.resources.pe.new, tempPath)
 
-
-
     setStep(1)
 
     //清理EFI分区
@@ -221,25 +219,31 @@ export async function updatePEForUDisk(diskIndex: string, setStep: Function, set
     isSucceed = isSucceed && await runPacmd(' /hd:' + diskIndex + ' /whide:1 /src:' + roConfig.path.execDir + tempEFIPath.substring(2, tempEFIPath.length - 1))//去路径末'\'
 
     setStepStr('正在更新数据分区')
+    let dataLetter = getHotPEDriveLetter(Number(diskIndex))
+
+    //let dataLetter = (await getUsableLetter() as string).substring(0, 2)
+    //await runPacmd(' /hd:' + diskIndex + ' /setletter:0 /letter:' + dataLetter)
+    if (dataLetter != '') {
+        //if (await letterIsExist(dataLetter)) {
+        //复制数据区文件
+        await copyDir(tempDataPath, dataLetter + '\\')
+
+        //pe配置文件
+        let HotPEConfig = readHotPEConfig(dataLetter + '\\')
+        HotPEConfig.information.Installation_Method = 'UDisk'
+        HotPEConfig.information.ReleaseVersion = takeLeftStr(config.resources.pe.new, '.')
+        writeHotPEConfig(dataLetter + '\\', HotPEConfig)
+
+        await runCmdAsync('attrib ' + dataLetter + '\\HotPE +S +H /S /D')
+        await runCmdAsync('attrib ' + dataLetter + '\\HotPE\\* +S +H /S /D')
+        await runCmdAsync('attrib ' + dataLetter + '\\AUTORUN.INF +S +H /S /D')
+        await runCmdAsync('attrib ' + dataLetter + '\\HotPE.ico +S +H /S /D')
+        //}
+    }else{
+        isSucceed = isSucceed && false
+    }
 
-    let dataLetter = (await getUsableLetter() as string).substring(0, 2)
-    await runPacmd(' /hd:' + diskIndex + ' /setletter:0 /letter:' + dataLetter)
-
-    //if (await letterIsExist(dataLetter)) {
-    //复制数据区文件
-    await copyDir(tempDataPath, dataLetter + '\\')
-
-    //pe配置文件
-    let HotPEConfig = readHotPEConfig(dataLetter + '\\')
-    HotPEConfig.information.Installation_Method = 'UDisk'
-    HotPEConfig.information.ReleaseVersion = takeLeftStr(config.resources.pe.new, '.')
-    writeHotPEConfig(dataLetter + '\\', HotPEConfig)
 
-    await runCmdAsync('attrib ' + dataLetter + '\\HotPE +S +H /S /D')
-    await runCmdAsync('attrib ' + dataLetter + '\\HotPE\\* +S +H /S /D')
-    await runCmdAsync('attrib ' + dataLetter + '\\AUTORUN.INF +S +H /S /D')
-    await runCmdAsync('attrib ' + dataLetter + '\\HotPE.ico +S +H /S /D')
-    //}
 
     setStep(2)
     setStepStr('正在清理退出')

src/view/controller/Install/toUDisk.ts

@@ -21,6 +21,7 @@ export async function checkPERes() {
         config.resources.pe.new = ''
     }
 
+
     //删除旧的PE资源
     for (let i in config.resources.pe.all) {
         if (config.resources.pe.all[i] != config.resources.pe.new) {

src/view/controller/condition.ts

@@ -11,10 +11,13 @@ import { checkHPMFiles } from "./hpm/checkHpmFiles"
 import { errorDialog } from "./log"
 import { exitapp } from "../layout/header"
 import { HotPEDriveChoose } from "../page/setting"
+import { runCmdAsync } from "../utils/command"
 
 let isInitDone = false
 
 export async function initClient(setStartStr: Function) {
+    //结束傲慢
+    await runCmdAsync('taskkill /IM PartAssist.exe /F')
 
 
     await initDir()

src/view/controller/init.ts

@@ -30,7 +30,7 @@ export default function SetupToSys(props:any) {
                                 <h2 >已安装到系统</h2>
                                 <h3 style={{color:'var(--semi-color-text-1)'}}>你已将HotPE安装到系统中，你可以进行</h3>
                                 {//更新按钮
-                                    config.state.setupToSys < Number(takeLeftStr(config.resources.pe.new, '.')) ? <Button onClick={() => { updatePEForSys(setIsUninstalling, setCurrentStep, setStepStr,props.setLockMuen) }} type='primary' style={{ marginLeft: 8 }}>更新</Button> : <></>}
+                                    config.state.setupToSys < Number(takeLeftStr(config.resources.pe.new, '.')) ? <Button onClick={() => { updatePEForSys(setIsUninstalling, setCurrentStep, setStepStr,props.setLockMuen) }} type='primary' style={{ marginRight: 8 }}>更新</Button> : <></>}
                                 <Button onClick={() => { uninstallToSystem(setIsUninstalling,props.setLockMuen) }} type='danger'>卸载</Button>
                             </div>
                             : <div style={{ textAlign: "center", marginTop: "70px", width: "100%" }}>

src/view/page/setup/setupToSys.tsx

@@ -8,6 +8,7 @@ import { IconRefresh } from '@douyinfe/semi-icons';
 import { getEnvironment } from '../../controller/init';
 import { UnInstallToUDisk, installToUDisk, updatePEForUDisk } from '../../controller/Install/toUDisk';
 import { checkPEDrive } from '../../controller/condition';
+import { getHotPEDriveVer } from '../../controller/Install/check';
 
 
 //let uDiskRefreshing =false
@@ -29,19 +30,6 @@ async function UDiskRefres(steUDiskRefreshing: Function, setLockMuen: Function)
     setLockMuen(false)
 }
 
-//获取PE版本
-function getHotPEDriveVer(diskIndex: Number) {
-    //console.log(config.environment.HotPEDrive.all);
-
-    for (let i in config.environment.HotPEDrive.all) {
-        if (config.environment.HotPEDrive.all[i].diskIndex == diskIndex) {
-            return config.environment.HotPEDrive.all[i].version
-        }
-    }
-
-    return ''
-}
-
 export default function SetupToUDisk(props: any) {
     const [ignored, forceUpdate] = useReducer(x => x + 1, 0);//刷新页面
     const [uDiskRefreshing, steUDiskRefreshing] = useState(false)