优化更新进度显示

Jrohy · Jan 17, 2022 · 141fd43 · 141fd43
1 parent 03b1a43
commit 141fd43
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/data.go b/data.go
@@ -49,7 +49,11 @@ func checkCfw() *cfwInfo {
 			if len(child) > 1 {
 				info, _ := item.Cmdline()
 				ci.rootPath = strings.Trim(path.Dir(strings.Replace(info, "\\", "/", -1)), "\"")
-				ci.version = getExeVersion(strings.Replace(info, "\"", "", -1))
+				info = strings.Replace(info, "\"", "", -1)
+				if !IsExists(info) {
+					exit("请尝试以管理员身份运行此程序")
+				}
+				ci.version = getExeVersion(info)
 				ci.process = item
 				if IsExists(fmt.Sprintf("%s/Uninstall Clash for Windows.exe", ci.rootPath)) {
 					ci.installVersion = true

diff --git a/main.go b/main.go
@@ -86,8 +86,14 @@ func downloadPack() []*downloadInfo {
 }
 
 func updateCfw(cfw *cfwInfo, diList []*downloadInfo) {
+	var stopCh chan struct{}
+	closeChan := func() {
+		close(stopCh)
+		fmt.Printf("\n\n")
+	}
 	if updateCore || updateTrans {
-		fmt.Println("更新cfw中...")
+		stopCh = make(chan struct{})
+		go showProgress("更新cfw中", stopCh)
 		cfw.process.Kill()
 	}
 	if updateTrans {
@@ -98,13 +104,15 @@ func updateCfw(cfw *cfwInfo, diList []*downloadInfo) {
 			err = copy.Copy(fullPath(path.Join(diList[0].fileName, "app.asar")), path.Join(cfw.rootPath, "resources/app.asar"))
 		}
 		if err != nil {
+			closeChan()
 			fmt.Println("请尝试以管理员身份运行此程序:")
 			exit(err.Error())
 		}
 	}
 	if updateCore {
 		if cfw.portableData {
 			if err := copy.Copy(cfw.rootPath+"/data", fullPath(diList[0].fileName+"/data")); err != nil {
+				closeChan()
 				exit(err.Error())
 			}
 		}
@@ -114,6 +122,7 @@ func updateCfw(cfw *cfwInfo, diList []*downloadInfo) {
 			}
 		}
 		if err := copy.Copy(fullPath(diList[0].fileName), cfw.rootPath); err != nil {
+			closeChan()
 			exit(err.Error())
 		}
 	}
@@ -125,6 +134,7 @@ func updateCfw(cfw *cfwInfo, diList []*downloadInfo) {
 				break
 			}
 		}
+		closeChan()
 		fmt.Printf("更新成功!\n\n")
 	}
 }
@@ -139,8 +149,10 @@ func checkEnv() *cfwInfo {
 	proxyUrl := fmt.Sprintf("127.0.0.1:%s", cfwInfo.mixPort)
 	os.Setenv("HTTP_PROXY", proxyUrl)
 	os.Setenv("HTTPS_PROXY", proxyUrl)
-	fmt.Println("正在获取cfw最新的版本号..")
-	cfwVersionList = recentlyTag("https://github.com/Fndroid/clash_for_windows_pkg/tags")
+	if !cfwInfo.installVersion {
+		fmt.Println("正在获取cfw最新的版本号..")
+		cfwVersionList = recentlyTag("https://github.com/Fndroid/clash_for_windows_pkg/tags")
+	}
 	updateUpdater()
 	if !cfwInfo.installVersion {
 		cfwSelect()

diff --git a/utils.go b/utils.go
@@ -334,3 +334,20 @@ func startBackground() {
 		exit(err.Error())
 	}
 }
+
+func showProgress(tip string, stopCh chan struct{}) {
+	count := 1
+	for {
+		select {
+		case <-stopCh:
+			return
+		default:
+			if count > 3 {
+				count = 1
+			}
+			fmt.Printf("\r%s%-3s", tip, strings.Repeat(".", count))
+			time.Sleep(time.Millisecond * 500)
+			count++
+		}
+	}
+}