change: log all to textarea.

Author: cangzhang

cmd.go

@@ -31,7 +31,6 @@ const (
 func startCmd(config *Config) {
 	dir, err := os.Getwd()
 	if err != nil {
-		log.Println(err)
 		config.logToTextarea(err.Error())
 		return
 	}
@@ -41,10 +40,11 @@ func startCmd(config *Config) {
 	binPath := ""
 	if binPath, err = getBinPath(dir); err != nil {
 		log.Println("get local binary file failed, ", err)
+		config.logToTextarea("try to download from github.com")
 
 		binPath, err = download(config)
 		if err != nil {
-			log.Println(err)
+			config.logToTextarea(err.Error())
 			return
 		}
 	}
@@ -115,7 +115,7 @@ func runCmd(bin string, config *Config) {
 }
 
 func download(config *Config) (string, error) {
-	log.Println("[fetch] fetching latest binary...")
+	config.logToTextarea("[fetch] fetching latest binary...")
 	resp, err := http.Get(latestReleaseUrl)
 	if err != nil {
 		return "", err
@@ -136,7 +136,9 @@ func download(config *Config) (string, error) {
 			break
 		}
 	}
-	log.Printf("[fetch] got latest version %s", result.TagName)
+
+	config.logToTextarea("[fetch] got latest version " + result.TagName)
+
 	r, err := http.Get(obj.BrowserDownloadURL)
 	if err != nil {
 		return "", err
@@ -157,14 +159,15 @@ func download(config *Config) (string, error) {
 	if _, err = io.Copy(out, r.Body); err != nil {
 		return "", err
 	}
-	log.Printf("[fetch] downloaded: %s", obj.Name)
+	config.logToTextarea("[fetch] downloaded: " + obj.Name)
 
 	file, err := os.Open(p)
 	if err != nil {
 		return "", err
 	}
 
-	log.Printf("[fetch] prepare to decompress %s", obj.Name)
+	config.logToTextarea("[fetch] prepare to decompress " + obj.Name)
+
 	p, err = extractTar(file, config)
 	defer file.Close()
 	if err != nil {
@@ -177,7 +180,7 @@ func download(config *Config) (string, error) {
 		}
 	}
 
-	log.Printf("[fetch] decompressed")
+	config.logToTextarea("[fetch] decompressed")
 	return p, nil
 }
 

kill_win.go

@@ -3,15 +3,13 @@
 package main
 
 import (
-	"log"
 	"os"
 	"os/exec"
 	"strconv"
 )
 
 func killCmd(config *Config) {
 	if config.cmd == nil {
-		log.Println("[kcptun] not running")
 		config.logToTextarea("[kcptun] not running")
 		return
 	}
@@ -20,7 +18,6 @@ func killCmd(config *Config) {
 	kill.Stderr = os.Stderr
 	kill.Stdout = os.Stdout
 	if err := kill.Run(); err != nil {
-		log.Println(err.Error())
 		config.logToTextarea("kill cmd: " + err.Error())
 		return
 	}

main.go

@@ -33,6 +33,7 @@ var (
 var appIcon []byte
 
 func (config *Config) logToTextarea(text string) {
+	log.Println(text)
 	config.textEdit.AppendText(text + "\r\n")
 }
 
@@ -66,7 +67,7 @@ func main() {
 				Text: "Run",
 				OnClicked: func() {
 					if config.cmd != nil {
-						log.Println("current pid is ", config.cmd.Process.Pid)
+						config.logToTextarea("current pid is " + string(rune(config.cmd.Process.Pid)))
 						config.logToTextarea("[kcptun] already running.")
 						return
 					}