diff options
| author | Tiger Feng <tigerfyj@gmail.com> | 2020-06-22 22:55:41 +0800 |
|---|---|---|
| committer | Tiger Feng <tigerfyj@gmail.com> | 2020-06-22 22:55:41 +0800 |
| commit | 79867c09adba44b9e684341a0e6d540f642d8ae5 (patch) | |
| tree | cee97a538db8fc344abcdf8ebe384eb91c67c5af | |
| parent | cc42059b2e5ae5062bb29288e39f133f0868dd2a (diff) | |
| parent | 81424fb000eaf1b6cd8c1d5bb4d476cb4b3b32db (diff) | |
Merge remote-tracking branch 'upstream/i18n' into i18n
| -rw-r--r-- | cmd/gotop/main.go | 3 | ||||
| -rw-r--r-- | go.sum | 1 | ||||
| -rw-r--r-- | widgets/proc_windows.go | 20 |
3 files changed, 17 insertions, 7 deletions
diff --git a/cmd/gotop/main.go b/cmd/gotop/main.go index 1f9f0a5..9c228b8 100644 --- a/cmd/gotop/main.go +++ b/cmd/gotop/main.go @@ -362,8 +362,7 @@ func run() int { } lang, err := jj.DetectIETF() if err != nil { - fmt.Printf("failed to get language setting from environment: %s\n", err) - return 2 + lang = "en_US" } lang = strings.Replace(lang, "-", "_", -1) // Get the locale from the os @@ -13,6 +13,7 @@ github.com/distatus/battery v0.9.0 h1:8NS5o00/j3Oh2xgocA6pQROTp5guoR+s8CZlWzHC4Q github.com/distatus/battery v0.9.0/go.mod h1:gGO7GxHTi1zlRT+cAj8uGG0/8HFiqAeH0TJvoipnuPs= github.com/gizak/termui/v3 v3.1.0 h1:ZZmVDgwHl7gR7elfKf1xc4IudXZ5qqfDh4wExk4Iajc= github.com/gizak/termui/v3 v3.1.0/go.mod h1:bXQEBkJpzxUAKf0+xq9MSWAvWZlE7c+aidmyFlkYTrY= +github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= diff --git a/widgets/proc_windows.go b/widgets/proc_windows.go index d34ef5e..1d8bffc 100644 --- a/widgets/proc_windows.go +++ b/widgets/proc_windows.go @@ -3,12 +3,13 @@ package widgets import ( "fmt" "log" + "strconv" - psProc "github.com/shirou/gopsutil/process" + "github.com/shirou/gopsutil/process" ) func getProcs() ([]Proc, error) { - psProcs, err := psProc.Processes() + psProcs, err := process.Processes() if err != nil { return nil, fmt.Errorf(tr.Value("widget.proc.err.gopsutil", err.Error())) } @@ -18,15 +19,24 @@ func getProcs() ([]Proc, error) { pid := psProc.Pid command, err := psProc.Name() if err != nil { - log.Println(tr.Value("widget.proc.err.getcmd", err, psProc, i, pid)) + sps := fmt.Sprintf("%v", psProc) + si := strconv.Itoa(i) + spid := fmt.Sprintf("%d", pid) + log.Println(tr.Value("widget.proc.err.getcmd", err.Error(), sps, si, spid)) } cpu, err := psProc.CPUPercent() if err != nil { - log.Println(tr.Value("widget.proc.err.cpupercent", err, psProc, i, pid)) + sps := fmt.Sprintf("%v", psProc) + si := strconv.Itoa(i) + spid := fmt.Sprintf("%d", pid) + log.Println(tr.Value("widget.proc.err.cpupercent", err.Error(), sps, si, spid)) } mem, err := psProc.MemoryPercent() if err != nil { - log.Println(tr.Value("widget.proc.err.mempercent", err, psProc, i, pid)) + sps := fmt.Sprintf("%v", psProc) + si := strconv.Itoa(i) + spid := fmt.Sprintf("%d", pid) + log.Println(tr.Value("widget.proc.err.mempercent", err.Error(), sps, si, spid)) } procs[i] = Proc{ |