change: get adb devices in cli

cmd/adb/devices.go

@@ -10,14 +10,9 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/httprunner/httprunner/v5/internal/sdk"
-	"github.com/httprunner/httprunner/v5/pkg/uixt"
+	"github.com/httprunner/httprunner/v5/pkg/gadb"
 )
 
-func format(data map[string]string) string {
-	result, _ := json.MarshalIndent(data, "", "\t")
-	return string(result)
-}
-
 var listAndroidDevicesCmd = &cobra.Command{
 	Use:   "devices",
 	Short: "List all Android devices",
@@ -31,34 +26,36 @@ var listAndroidDevicesCmd = &cobra.Command{
 			})
 		}()
 
-		deviceList, err := uixt.GetAndroidDevices(serial)
+		deviceList, err := getAndroidDevices()
 		if err != nil {
 			fmt.Println(err)
-			os.Exit(0)
+			os.Exit(1)
 		}
 
 		for _, d := range deviceList {
-			if isDetail {
-				fmt.Println(format(d.DeviceInfo()))
-			} else {
-				if usb, err := d.Usb(); err != nil {
-					fmt.Println(d.Serial())
-				} else {
-					fmt.Println(d.Serial(), usb)
-				}
-			}
+			fmt.Println(format(d.DeviceInfo()))
 		}
 		return nil
 	},
 }
 
-var (
-	serial   string
-	isDetail bool
-)
+func format(data map[string]string) string {
+	result, _ := json.MarshalIndent(data, "", "\t")
+	return string(result)
+}
+
+func getAndroidDevices() (devices []*gadb.Device, err error) {
+	var adbClient gadb.Client
+	if adbClient, err = gadb.NewClient(); err != nil {
+		return nil, err
+	}
+
+	if devices, err = adbClient.DeviceList(); err != nil {
+		return nil, err
+	}
+	return devices, nil
+}
 
 func init() {
-	listAndroidDevicesCmd.Flags().StringVarP(&serial, "serial", "s", "", "filter by device's serial")
-	listAndroidDevicesCmd.Flags().BoolVarP(&isDetail, "detail", "d", false, "print device's detail")
 	androidRootCmd.AddCommand(listAndroidDevicesCmd)
 }

cmd/adb/init.go

@@ -1,29 +1,26 @@
 package adb
 
 import (
-	"fmt"
-
 	"github.com/spf13/cobra"
 
-	"github.com/httprunner/httprunner/v5/pkg/gadb"
 	"github.com/httprunner/httprunner/v5/pkg/uixt"
+	"github.com/httprunner/httprunner/v5/pkg/uixt/option"
 )
 
+var serial string
+
 var androidRootCmd = &cobra.Command{
 	Use:              "adb",
 	Short:            "simple utils for android device management",
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {},
 }
 
-func getDevice(serial string) (*gadb.Device, error) {
-	devices, err := uixt.GetAndroidDevices(serial)
+func getDevice(serial string) (*uixt.AndroidDevice, error) {
+	device, err := uixt.NewAndroidDevice(option.WithSerialNumber(serial))
 	if err != nil {
 		return nil, err
 	}
-	if len(devices) > 1 {
-		return nil, fmt.Errorf("found multiple attached devices, please specify android serial")
-	}
-	return devices[0], nil
+	return device, nil
 }
 
 func Init(rootCmd *cobra.Command) {

internal/version/VERSION

@@ -1 +1 @@
-v5.0.0+2502071516
+v5.0.0+2502071620