From c7ce55023a6eb8fe3a1a55fe4ce90949b8565185 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Tue, 14 Apr 2020 13:56:40 -0400 Subject: [PATCH] move gops code to ps.go --- ps.go | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ robotgo.go | 60 --------------------------------------------- 2 files changed, 72 insertions(+), 60 deletions(-) create mode 100644 ps.go diff --git a/ps.go b/ps.go new file mode 100644 index 0000000..e6eddc1 --- /dev/null +++ b/ps.go @@ -0,0 +1,72 @@ +// Copyright 2016 The go-vgo Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// https://github.com/go-vgo/robotgo/blob/master/LICENSE +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +package robotgo + +import ps "github.com/vcaesar/gops" + +// Nps process struct +type Nps struct { + Pid int32 + Name string +} + +// Pids get the all process id +func Pids() ([]int32, error) { + return ps.Pids() +} + +// PidExists determine whether the process exists +func PidExists(pid int32) (bool, error) { + return ps.PidExists(pid) +} + +// Process get the all process struct +func Process() ([]Nps, error) { + var npsArr []Nps + nps, err := ps.Process() + for i := 0; i < len(nps); i++ { + np := Nps{ + nps[i].Pid, + nps[i].Name, + } + + npsArr = append(npsArr, np) + } + + return npsArr, err +} + +// FindName find the process name by the process id +func FindName(pid int32) (string, error) { + return ps.FindName(pid) +} + +// FindNames find the all process name +func FindNames() ([]string, error) { + return ps.FindNames() +} + +// FindIds finds the all processes named with a subset +// of "name" (case insensitive), +// return matched IDs. +func FindIds(name string) ([]int32, error) { + return ps.FindIds(name) +} + +// FindPath find the process path by the process pid +func FindPath(pid int32) (string, error) { + return ps.FindPath(pid) +} + +// Kill kill the process by PID +func Kill(pid int32) error { + return ps.Kill(pid) +} diff --git a/robotgo.go b/robotgo.go index 6b6d803..43523b2 100644 --- a/robotgo.go +++ b/robotgo.go @@ -63,7 +63,6 @@ import ( "os/exec" "github.com/go-vgo/robotgo/clipboard" - ps "github.com/vcaesar/gops" "github.com/vcaesar/imgo" "github.com/vcaesar/tt" ) @@ -1512,66 +1511,12 @@ func internalGetBounds(pid int32, hwnd int) (int, int, int, int) { return int(bounds.X), int(bounds.Y), int(bounds.W), int(bounds.H) } -// Pids get the all process id -func Pids() ([]int32, error) { - return ps.Pids() -} - -// PidExists determine whether the process exists -func PidExists(pid int32) (bool, error) { - return ps.PidExists(pid) -} - // Is64Bit determine whether the sys is 64bit func Is64Bit() bool { b := C.Is64Bit() return bool(b) } -// Nps process struct -type Nps struct { - Pid int32 - Name string -} - -// Process get the all process struct -func Process() ([]Nps, error) { - var npsArr []Nps - nps, err := ps.Process() - for i := 0; i < len(nps); i++ { - np := Nps{ - nps[i].Pid, - nps[i].Name, - } - - npsArr = append(npsArr, np) - } - - return npsArr, err -} - -// FindName find the process name by the process id -func FindName(pid int32) (string, error) { - return ps.FindName(pid) -} - -// FindNames find the all process name -func FindNames() ([]string, error) { - return ps.FindNames() -} - -// FindIds finds the all processes named with a subset -// of "name" (case insensitive), -// return matched IDs. -func FindIds(name string) ([]int32, error) { - return ps.FindIds(name) -} - -// FindPath find the process path by the process pid -func FindPath(pid int32) (string, error) { - return ps.FindPath(pid) -} - func internalActive(pid int32, hwnd int) { C.active_PID(C.uintptr(pid), C.uintptr(hwnd)) } @@ -1596,8 +1541,3 @@ func ActiveName(name string) error { return err } - -// Kill kill the process by PID -func Kill(pid int32) error { - return ps.Kill(pid) -}