clean

api/wingui/cli.go

@@ -58,6 +58,8 @@ type DEVMODE struct {
 	DmPanningHeight    uint32
 }
 
+/***************** Clip Functions *****************/
+
 func (c *Cli) ClipRead() (string, error) {
 	bs, err := c.HttpCli().RawGet(fmt.Sprintf("/ipc/wingui/clip/read"))
 	return string(bs), err
@@ -68,38 +70,34 @@ func (c *Cli) ClipWrite(site string) error {
 	return err
 }
 
+/***************** Mouse Functions *****************/
+
 func (c *Cli) MouseClick() error {
 	err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/mouse/click"), nil)
 	return err
 }
+
 func (c *Cli) MouseMove(x, y int) error {
 	err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/mouse/move?x=%d&y=%d", x, y), nil)
 	return err
 }
+
 func (c *Cli) MouseMoveRelative(x, y int) error {
 	err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/mouse/moverelative?x=%d&y=%d", x, y), nil)
 	return err
 }
+
 func (c *Cli) MouseClickRelative(x, y int) error {
 	err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/mouse/clickatrelative?x=%d&y=%d", x, y), nil)
 	return err
 }
+
 func (c *Cli) MouseClickAt(x, y int) error {
 	err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/mouse/clickat?x=%d&y=%d", x, y), nil)
 	return err
 }
-func (c *Cli) ScreenClick(f string) error {
+
-	err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/screen/click?f=%s", f), nil)
+/***************** KB Functions *****************/
-	return err
-}
-func (c *Cli) ScreenClickCenter(f string) error {
-	err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/screen/clickcenter?f=%s", f), nil)
-	return err
-}
-func (c *Cli) ScreenFind(f string) (ret []interface{}, err error) {
-	err = c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/screen/find?f=%s", f), &ret)
-	return
-}
 
 func (c *Cli) KBTap(t string) (map[string]interface{}, error) {
 	/*Envia uma tecla ou teclas para serem clicadas no componente com foco onde o robo é executado
@@ -210,51 +208,7 @@ func (c *Cli) KBType(t string) (map[string]interface{}, error) {
 	return ret, err
 }
 
-func (c *Cli) ScreenWait(f string, m int) ([]byte, error) {
+/***************** Display Functions *****************/
-	url := fmt.Sprintf("/ipc/wingui/screen/wait?f=%s&m=%d", f, m)
-
-	ret, err := c.HttpCli().RawGet(url)
-	if err != nil {
-		fmt.Printf(err.Error())
-	}
-	fmt.Println(ret)
-	return ret, err
-}
-func (c *Cli) ScreenWaitClick(f string, m int) ([]byte, error) {
-	url := fmt.Sprintf("/ipc/wingui/screen/waitclick?f=%s&m=%d", f, m)
-
-	ret, err := c.HttpCli().RawGet(url)
-	if err != nil {
-		fmt.Printf(err.Error())
-	}
-	fmt.Println(ret)
-	return ret, err
-}
-func (c *Cli) ScreenWaitClickCenter(f string, m int) ([]byte, error) {
-	url := fmt.Sprintf("/ipc/wingui/screen/waitclickcenter?f=%s&m=%d", f, m)
-
-	ret, err := c.HttpCli().RawGet(url)
-	if err != nil {
-		fmt.Printf(err.Error())
-	}
-	fmt.Println(ret)
-	return ret, err
-}
-
-func (c *Cli) ScreenRes() ([]byte, error) {
-	url := fmt.Sprintf("/ipc/wingui/screen/res")
-
-	ret, err := c.HttpCli().RawGet(url)
-	if err != nil {
-		fmt.Printf(err.Error())
-	}
-	return ret, err
-}
-
-func (c *Cli) ScreenSetRes(x, y, cor int) error {
-	err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/screen/setres?x=%d&y=%d&c=%d", x, y, cor), nil)
-	return err
-}
 
 func (c *Cli) DisplayRes() (*DEVMODE, error) {
 	ret := &DEVMODE{}
@@ -363,13 +317,81 @@ func (c *Cli) WindowPostMsg(w, m string) error {
 	return err
 }*/
 
-/***************** Notify Functions *****************/
+/***************** Screen Functions *****************/
 
 func (c *Cli) ScreenCapture(x, y, w, h int, f string) (ret interface{}, err error) {
 	err = c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/screen/capture?x=%d&y=%d&w=%d&h=%d&f=%s", x, y, w, h, f), &ret)
 	return ret, err
 }
 
+func (c *Cli) ScreenFindAll(f string) (ret map[string]int, err error) {
+	err = c.HttpCli().JsonGet("/ipc/wingui/screen/findall?f="+f, &ret)
+	return ret, err
+}
+
+func (c *Cli) ScreenClick(f string) error {
+	err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/screen/click?f=%s", f), nil)
+	return err
+}
+
+func (c *Cli) ScreenClickCenter(f string) error {
+	err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/screen/clickcenter?f=%s", f), nil)
+	return err
+}
+
+func (c *Cli) ScreenFind(f string) (ret []interface{}, err error) {
+	err = c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/screen/find?f=%s", f), &ret)
+	return
+}
+
+func (c *Cli) ScreenWait(f string, m int) ([]byte, error) {
+	url := fmt.Sprintf("/ipc/wingui/screen/wait?f=%s&m=%d", f, m)
+
+	ret, err := c.HttpCli().RawGet(url)
+	if err != nil {
+		fmt.Printf(err.Error())
+	}
+	fmt.Println(ret)
+	return ret, err
+}
+
+func (c *Cli) ScreenWaitClick(f string, m int) ([]byte, error) {
+	url := fmt.Sprintf("/ipc/wingui/screen/waitclick?f=%s&m=%d", f, m)
+
+	ret, err := c.HttpCli().RawGet(url)
+	if err != nil {
+		fmt.Printf(err.Error())
+	}
+	fmt.Println(ret)
+	return ret, err
+}
+
+func (c *Cli) ScreenWaitClickCenter(f string, m int) ([]byte, error) {
+	url := fmt.Sprintf("/ipc/wingui/screen/waitclickcenter?f=%s&m=%d", f, m)
+
+	ret, err := c.HttpCli().RawGet(url)
+	if err != nil {
+		fmt.Printf(err.Error())
+	}
+	fmt.Println(ret)
+	return ret, err
+}
+
+func (c *Cli) ScreenRes() ([]byte, error) {
+	url := fmt.Sprintf("/ipc/wingui/screen/res")
+
+	ret, err := c.HttpCli().RawGet(url)
+	if err != nil {
+		fmt.Printf(err.Error())
+	}
+	return ret, err
+}
+
+func (c *Cli) ScreenSetRes(x, y, cor int) error {
+	err := c.HttpCli().JsonGet(fmt.Sprintf("/ipc/wingui/screen/setres?x=%d&y=%d&c=%d", x, y, cor), nil)
+	return err
+}
+
 func NewCli() *Cli {
 	ret := &Cli{ApiCli: api.NewApiCli()}
 	return ret