解压时加入过程动画

Jrohy · Jan 25, 2022 · 864ff10 · 864ff10
1 parent d0e3cde
commit 864ff10
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/main.go b/main.go
@@ -149,7 +149,7 @@ func updateProcess(diList []*downloadInfo, stopCh chan struct{}) {
 }
 
 func updateCfw(diList []*downloadInfo) {
-	var stopCh chan struct{}
+	stopCh := make(chan struct{})
 	if updateCore || updateTrans {
 		stopCh = make(chan struct{})
 		go showProgress("更新cfw中", stopCh)

diff --git a/utils.go b/utils.go
@@ -176,19 +176,27 @@ func recentlyTag(url string) []string {
 }
 
 func extract7z(name string) {
-	fmt.Println(fmt.Sprintf("解压%s中..", name))
+	stopCh := make(chan struct{})
+	closeChan := func() {
+		close(stopCh)
+		fmt.Println("")
+	}
+	go showProgress(fmt.Sprintf("解压%s中", name), stopCh)
 	extractPath := fullPath(strings.TrimSuffix(name, path.Ext(name)))
 	if !IsExists(extractPath) {
 		a, err := unarr.NewArchive(fullPath(name))
 		if err != nil {
+			closeChan()
 			exit(err.Error())
 		}
 		defer a.Close()
 		_, err = a.Extract(extractPath)
 		if err != nil {
+			closeChan()
 			exit(err.Error())
 		}
 	}
+	closeChan()
 }
 
 func getExeVersion(exePath string) string {