add more command

codeskyblue · codeskyblue · commit 5b53d7582476 · 2019-01-07T08:50:10.000+08:00
diff --git a/adb/client.go b/adb/client.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"net"
 	"strconv"
+	"strings"
 )
 
 const (
@@ -131,17 +132,58 @@ func (c *Client) Version() (string, error) {
 	return reader.DecodeString()
 }
 
+func (c *Client) Devices() (devs []*ADevice, err error) {
+	conn, err := net.Dial("tcp", c.Addr)
+	if err != nil {
+		return nil, err
+	}
+	defer conn.Close()
+	dconn := DebugProxyConn{
+		R: bufio.NewReader(conn),
+		W: conn}
+
+	writer := ADBEncoder{dconn}
+	writer.Encode([]byte("host:devices"))
+	reader := ADBDecoder{dconn}
+	if err := reader.respCheck(); err != nil {
+		return nil, err
+	}
+	lines, err := reader.DecodeString()
+	if err != nil {
+		return nil, err
+	}
+	devs = make([]*ADevice, 0)
+	for _, line := range strings.Split(lines, "\n") {
+		parts := strings.SplitN(line, "\t", 2)
+		if len(parts) != 2 {
+			continue
+		}
+		devs = append(devs, &ADevice{
+			Serial: parts[0],
+			Type:   parts[1],
+		})
+		// devs[parts[0]] = parts[1]
+	}
+	return
+	// regexp.MustCompile(`([\s]+)\t([\w]+)`)
+}
+
 func (c *Client) DeviceWithSerial(serial string) *ADevice {
 	return &ADevice{
 		client: c,
-		serial: serial,
+		Serial: serial,
 	}
 }
 
 // Device
 type ADevice struct {
 	client *Client
-	serial string
+	Serial string
+	Type   string
+}
+
+func (ad *ADevice) String() string {
+	return ad.Serial + ":" + ad.Type
 }
 
 func (ad *ADevice) OpenShell(cmd string) (rwc io.ReadWriteCloser, err error) {
diff --git a/adb/client_test.go b/adb/client_test.go
@@ -2,10 +2,20 @@ package adb
 
 import "testing"
 
+var client = NewClient("127.0.0.1:5037")
+
 func TestVersion(t *testing.T) {
-	version, err := NewClient("127.0.0.1:5037").Version()
+	version, err := client.Version()
 	if err != nil {
 		t.Fatal(err)
 	}
 	t.Log(version)
 }
+
+func TestDevices(t *testing.T) {
+	devs, err := client.Devices()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(devs)
+}
diff --git a/main.go b/main.go
@@ -252,6 +252,44 @@ func main() {
 				return nil
 			},
 		},
+		{
+			Name:  "app",
+			Usage: "app view and managerment",
+			Subcommands: []cli.Command{
+				{
+					Name:  "list",
+					Usage: "list app",
+					Flags: []cli.Flag{
+						cli.BoolFlag{
+							Name:  "f",
+							Usage: "see their associated file",
+						},
+						cli.BoolFlag{
+							Name:  "s",
+							Usage: "filter to only show system packages",
+						},
+						cli.BoolFlag{
+							Name:  "3",
+							Usage: "filter to only show third party packages",
+						},
+					},
+					Action: func(ctx *cli.Context) error {
+						args := []string{"shell", "pm", "list", "packages"}
+						if ctx.Bool("s") {
+							args = append(args, "-s")
+						}
+						if ctx.Bool("f") {
+							args = append(args, "-f")
+						}
+						if ctx.Bool("3") {
+							args = append(args, "-3")
+						}
+						adbWrap(args...)
+						return nil
+					},
+				},
+			},
+		},
 		{
 			Name:  "screenshot",
 			Usage: "take screenshot",
