From b8e5810103fab005459166e10c3a01498aee4698 Mon Sep 17 00:00:00 2001 From: Leonardo Domingues Date: Mon, 6 Dec 2021 15:15:37 -0300 Subject: [PATCH 1/2] Proc Methods --- api/wingui/cli.go | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/api/wingui/cli.go b/api/wingui/cli.go index 57f01b7..4828920 100644 --- a/api/wingui/cli.go +++ b/api/wingui/cli.go @@ -62,7 +62,7 @@ type DEVMODE struct { /***************** Clip Functions *****************/ func (c *Cli) ClipRead() (string, error) { - bs, err := c.HttpCli().RawGet(fmt.Sprintf("/ipc/wingui/clip/read")) + bs, err := c.HttpCli().RawGet("/ipc/wingui/clip/read") return string(bs), err } @@ -74,7 +74,7 @@ func (c *Cli) ClipWrite(site string) error { /***************** Mouse Functions *****************/ func (c *Cli) MouseClick() error { - err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/mouse/click"), nil) + err := c.HttpCli().JsonGet("/ipc/wingui/mouse/click", nil) return err } @@ -389,7 +389,7 @@ func (c *Cli) ScreenWaitClickCenter(f string, m int) ([]byte, error) { } func (c *Cli) ScreenRes() ([]byte, error) { - url := fmt.Sprintf("/ipc/wingui/screen/res") + url := "/ipc/wingui/screen/res" ret, err := c.HttpCli().RawGet(url) if err != nil { @@ -500,6 +500,38 @@ func (c *Cli) DialogWarn(t, m string) error { return err } +/***************** Process Functions *****************/ + +func (c *Cli) ProcAll() (ret []map[string]interface{}, err error) { + err = c.HttpCli().JsonGet("/ipc/wingui/proc/all", &ret) + return ret, err +} + +func (c *Cli) ProcPids() (ret []int, err error) { + err = c.HttpCli().JsonGet("/ipc/wingui/proc/pids", &ret) + return ret, err +} + +func (c *Cli) ProcKill(cmd int) (ret string, err error) { + err = c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/proc/kill?cmd=%d", cmd), &ret) + return ret, err +} + +func (c *Cli) ProcExec(cmd string) error { + err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/proc/exec?cmd=%s", cmd), nil) + return err +} + +func (c *Cli) ProcName(pid int) (ret string, err error) { + err = c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/proc/name?cmd=%d", pid), &ret) + return ret, err +} + +func (c *Cli) ProcPath(pid int) (ret string, err error) { + err = c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/proc/path?cmd=%d", pid), &ret) + return ret, err +} + func NewCli() *Cli { ret := &Cli{ApiCli: api.NewApiCli()} return ret From f54514a87a76d3d52b91c1554481e71094199423 Mon Sep 17 00:00:00 2001 From: Leonardo Domingues Date: Mon, 6 Dec 2021 15:37:55 -0300 Subject: [PATCH 2/2] ScreenShot method -> Fixed --- api/wingui/cli.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/api/wingui/cli.go b/api/wingui/cli.go index 4828920..511f562 100644 --- a/api/wingui/cli.go +++ b/api/wingui/cli.go @@ -413,8 +413,13 @@ func (c *Cli) ScreenSize() (ret []int, err error) { return ret, err } -func (c *Cli) ScreenShot(fmt string) (ret interface{}, err error) { - err = c.HttpCli().JsonGet("/ipc/wingui/screen/shot?fmt="+fmt, &ret) +func (c *Cli) ScreenShot(frmt string) (ret []byte, err error) { + url := fmt.Sprintf("/ipc/wingui/screen/shot?fmt=%s", frmt) + + ret, err = c.HttpCli().RawGet(url) + if err != nil { + fmt.Print(err.Error()) + } return ret, err }