fix mount

cmd/app/install.go

@@ -34,8 +34,7 @@ var installCmd = &cobra.Command{
 		}
 		errInstall := device.AppInstall(path)
 		if errInstall != nil {
-			fmt.Printf("install failed: %s", errInstall)
-			os.Exit(0)
+			return util.NewErrorPrint(util.ErrSendCommand, "install", errInstall)
 		}
 		fmt.Println("install successful")
 		return nil

cmd/app/launch.go

@@ -17,7 +17,6 @@
 package app
 
 import (
-	"fmt"
 	"github.com/SonicCloudOrg/sonic-ios-bridge/src/util"
 	"os"
 
@@ -35,8 +34,7 @@ var launchCmd = &cobra.Command{
 		}
 		_, errLaunch := device.AppLaunch(bundleId)
 		if errLaunch != nil {
-			fmt.Println("launch failed")
-			os.Exit(0)
+			return util.NewErrorPrint(util.ErrSendCommand, "launch", errLaunch)
 		}
 		return nil
 	},

cmd/app/list.go

@@ -33,58 +33,33 @@ var listCmd = &cobra.Command{
 	Short: "show app list",
 	Long:  "show app list",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		usbMuxClient, err := giDevice.NewUsbmux()
-		if err != nil {
-			return util.NewErrorPrint(util.ErrConnect, "usbMux", err)
+		device := util.GetDeviceByUdId(udid)
+		if device == nil {
+			os.Exit(0)
 		}
-		list, err1 := usbMuxClient.Devices()
-		if err1 != nil {
-			return util.NewErrorPrint(util.ErrSendCommand, "listDevices", err1)
+		result, errList := device.InstallationProxyBrowse(
+			giDevice.WithApplicationType(giDevice.ApplicationTypeUser),
+			giDevice.WithReturnAttributes("CFBundleVersion", "CFBundleDisplayName", "CFBundleIdentifier"))
+		if errList != nil {
+			return util.NewErrorPrint(util.ErrSendCommand, "app list", errList)
 		}
-		if len(list) != 0 {
-			var device giDevice.Device
-			if len(udid) != 0 {
-				for i, d := range list {
-					if d.Properties().SerialNumber == udid {
-						device = list[i]
-						break
-					}
-				}
-			} else {
-				device = list[0]
-			}
-			if device.Properties().SerialNumber != "" {
-				result, errList := device.InstallationProxyBrowse(
-					giDevice.WithApplicationType(giDevice.ApplicationTypeUser),
-					giDevice.WithReturnAttributes("CFBundleVersion", "CFBundleDisplayName", "CFBundleIdentifier"))
-				if errList != nil {
-					return util.NewErrorPrint(util.ErrSendCommand, "appList", errList)
-				}
-				var appList entity.AppList
-				for _, app := range result {
-					a := entity.Application{}
-					mapstructure.Decode(app, &a)
-					if a.CFBundleIdentifier != "" && a.CFBundleDisplayName != "" && a.CFBundleVersion != "" {
-						if showIcon {
-							icon, errIcon := device.GetIconPNGData(a.CFBundleIdentifier)
-							if errIcon == nil {
-								data, _ := ioutil.ReadAll(icon)
-								a.IconBase64 = base64.StdEncoding.EncodeToString(data)
-							}
-						}
-						appList.ApplicationList = append(appList.ApplicationList, a)
+		var appList entity.AppList
+		for _, app := range result {
+			a := entity.Application{}
+			mapstructure.Decode(app, &a)
+			if a.CFBundleIdentifier != "" && a.CFBundleDisplayName != "" && a.CFBundleVersion != "" {
+				if showIcon {
+					icon, errIcon := device.GetIconPNGData(a.CFBundleIdentifier)
+					if errIcon == nil {
+						data, _ := ioutil.ReadAll(icon)
+						a.IconBase64 = base64.StdEncoding.EncodeToString(data)
 					}
 				}
-				data := util.ResultData(appList)
-				fmt.Println(util.Format(data, isFormat, isJson))
-			} else {
-				fmt.Println("device no found")
-				os.Exit(0)
+				appList.ApplicationList = append(appList.ApplicationList, a)
 			}
-		} else {
-			fmt.Println("no device connected")
-			os.Exit(0)
 		}
+		data := util.ResultData(appList)
+		fmt.Println(util.Format(data, isFormat, isJson))
 		return nil
 	},
 }

cmd/app/uninstall.go

@@ -32,11 +32,9 @@ var uninstallCmd = &cobra.Command{
 		if device == nil {
 			os.Exit(0)
 		}
-		util.CheckMount(device)
 		errUninstall := device.AppUninstall(bundleId)
 		if errUninstall != nil {
-			fmt.Println("uninstall failed")
-			os.Exit(0)
+			return util.NewErrorPrint(util.ErrSendCommand, "uninstall", errUninstall)
 		}
 		fmt.Println("uninstall successful")
 		return nil

cmd/crash.go

@@ -49,7 +49,7 @@ var crashCmd = &cobra.Command{
 			}),
 		)
 		if err != nil {
-			fmt.Println("move crash files failed.")
+			return util.NewErrorPrint(util.ErrUnknown, "move crash files", err)
 		}
 		fmt.Println("All done.")
 		return nil

cmd/location/set.go

@@ -34,7 +34,6 @@ var locationSetCmd = &cobra.Command{
 		if device == nil {
 			os.Exit(0)
 		}
-		util.CheckMount(device)
 		err := device.SimulateLocationUpdate(long, lat, giDevice.CoordinateSystemBD09)
 		if err != nil {
 			return util.NewErrorPrint(util.ErrSendCommand, "location set", err)

cmd/reboot.go

@@ -40,8 +40,7 @@ var rebootCmd = &cobra.Command{
 			errReboot = device.Reboot()
 		}
 		if errReboot != nil {
-			fmt.Println("reboot failed")
-			os.Exit(0)
+			return util.NewErrorPrint(util.ErrSendCommand, "reboot", errReboot)
 		}
 		fmt.Println("reboot successful")
 		return nil

cmd/run/wda.go

@@ -28,6 +28,7 @@ import (
 	"net"
 	"os"
 	"os/signal"
+	"regexp"
 	"strings"
 	"syscall"
 	"time"
@@ -49,13 +50,15 @@ var wdaCmd = &cobra.Command{
 			giDevice.WithApplicationType(giDevice.ApplicationTypeUser),
 			giDevice.WithReturnAttributes("CFBundleVersion", "CFBundleDisplayName", "CFBundleIdentifier"))
 		if errList != nil {
-			return util.NewErrorPrint(util.ErrSendCommand, "appList", errList)
+			return util.NewErrorPrint(util.ErrSendCommand, "app list", errList)
 		}
 		var hasWda = false
+		re, _ := regexp.Compile(strings.ReplaceAll(wdaBundleID, "*", "/*"))
 		for _, d := range appList {
 			a := entity.Application{}
 			mapstructure.Decode(d, &a)
-			if a.CFBundleIdentifier == wdaBundleID {
+			if re.MatchString(a.CFBundleIdentifier) {
+				wdaBundleID = a.CFBundleIdentifier
 				hasWda = true
 				break
 			}

cmd/run/xctest.go

@@ -25,6 +25,7 @@ import (
 	"log"
 	"os"
 	"os/signal"
+	"regexp"
 	"strings"
 	"syscall"
 
@@ -44,13 +45,15 @@ var xctestCmd = &cobra.Command{
 			giDevice.WithApplicationType(giDevice.ApplicationTypeUser),
 			giDevice.WithReturnAttributes("CFBundleVersion", "CFBundleDisplayName", "CFBundleIdentifier"))
 		if errList != nil {
-			return util.NewErrorPrint(util.ErrSendCommand, "appList", errList)
+			return util.NewErrorPrint(util.ErrSendCommand, "app list", errList)
 		}
 		var hasApp = false
+		re, _ := regexp.Compile(strings.ReplaceAll(wdaBundleID, "*", "/*"))
 		for _, d := range appList {
 			a := entity.Application{}
 			mapstructure.Decode(d, &a)
-			if a.CFBundleIdentifier == xcTestBundleID {
+			if re.MatchString(a.CFBundleIdentifier) {
+				wdaBundleID = a.CFBundleIdentifier
 				hasApp = true
 				break
 			}

cmd/screenshot.go

@@ -37,7 +37,6 @@ var screenshotCmd = &cobra.Command{
 		if device == nil {
 			os.Exit(0)
 		}
-		util.CheckMount(device)
 		bytes, err := device.Screenshot()
 		if err != nil {
 			return util.NewErrorPrint(util.ErrSendCommand, "screenshot", err)

cmd/syslog.go

@@ -38,7 +38,7 @@ var syslogCmd = &cobra.Command{
 		}
 		output, err := device.Syslog()
 		if err != nil {
-			fmt.Printf("Get syslog failed: %s", err)
+			return util.NewErrorPrint(util.ErrSendCommand, "syslog", err)
 		}
 		defer device.SyslogStop()
 		done := make(chan os.Signal, syscall.SIGTERM)

cmd/version.go

@@ -27,7 +27,7 @@ var versionCmd = &cobra.Command{
 	Short: "Version code of sib",
 	Long:  "Version code of sib",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("1.1.6")
+		fmt.Println("1.1.7")
 	},
 }
 

src/util/errprint.go

@@ -19,22 +19,23 @@ package util
 import "fmt"
 
 const (
-	ErrConnect     = "failed connecting to "
-	ErrReadingMsg  = "failed reading msg "
-	ErrSendCommand = "failed send the command "
+	ErrConnect     = "failed connecting to"
+	ErrReadingMsg  = "failed reading msg"
+	ErrSendCommand = "failed send the command"
 	ErrMissingArgs = "missing arg(s)"
 	ErrUnknown     = "unknown error"
+	MountTips      = "you use [sib mount] command to fix it and retry"
 )
 
 func NewErrorPrint(t string, msg string, err error) error {
 	if len(msg) == 0 && err == nil {
-		return fmt.Errorf("%s", t)
+		return fmt.Errorf("%s, %s", t, MountTips)
 	}
 	if len(msg) == 0 {
-		return fmt.Errorf("%s : %w", t, err)
+		return fmt.Errorf("%s, %s : %w", t, MountTips, err)
 	}
 	if err == nil {
-		return fmt.Errorf("%s %s", t, msg)
+		return fmt.Errorf("%s [%s], %s", t, msg, MountTips)
 	}
-	return fmt.Errorf("%s %s : %w", t, msg, err)
+	return fmt.Errorf("%s [%s], %s, err : %w", t, msg, MountTips, err)
 }