feat: ios unmount

cmd/ios/mount.go

@@ -2,13 +2,14 @@ package ios
 
 import (
 	"fmt"
+	"os"
+	"path"
 	"strings"
 	"time"
 
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 
-	"github.com/httprunner/httprunner/v5/internal/builtin"
 	"github.com/httprunner/httprunner/v5/internal/sdk"
 )
 
@@ -31,6 +32,14 @@ var mountCmd = &cobra.Command{
 			return err
 		}
 
+		if unmountDeveloperDiskImage {
+			err := device.UnmountImage()
+			if err != nil {
+				return fmt.Errorf("unmount developer disk image failed: %v", err)
+			}
+			return nil
+		}
+
 		images, errImage := device.ListImages()
 		if err != nil {
 			return fmt.Errorf("list device images failed: %v", err)
@@ -47,12 +56,6 @@ var mountCmd = &cobra.Command{
 			return nil
 		}
 
-		log.Info().Str("dir", developerDiskImageDir).Msg("start to mount ios developer image")
-
-		if !builtin.IsFolderPathExists(developerDiskImageDir) {
-			return fmt.Errorf("developer disk image directory not exist: %s", developerDiskImageDir)
-		}
-
 		if err = device.AutoMountImage(developerDiskImageDir); err != nil {
 			return fmt.Errorf("mount developer disk image failed: %s", err)
 		}
@@ -62,15 +65,18 @@ var mountCmd = &cobra.Command{
 	},
 }
 
-const defaultDeveloperDiskImageDir = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/DeviceSupport/"
-
 var (
-	developerDiskImageDir  string
+	developerDiskImageDir     string
-	listDeveloperDiskImage bool
+	listDeveloperDiskImage    bool
+	unmountDeveloperDiskImage bool
 )
 
 func init() {
+	home, _ := os.UserHomeDir()
+	defaultDeveloperDiskImageDir := path.Join(home, ".devimages")
+
 	mountCmd.Flags().BoolVar(&listDeveloperDiskImage, "list", false, "list developer disk images")
+	mountCmd.Flags().BoolVar(&unmountDeveloperDiskImage, "reset", false, "unmount developer disk images")
 	mountCmd.Flags().StringVarP(&developerDiskImageDir, "dir", "d", defaultDeveloperDiskImageDir, "specify developer disk image directory")
 	mountCmd.Flags().StringVarP(&udid, "udid", "u", "", "specify device by udid")
 	iosRootCmd.AddCommand(mountCmd)

internal/version/VERSION

@@ -1 +1 @@
-v5.0.0-beta-2503071209
+v5.0.0-beta-2503072308

uixt/ios_device.go

@@ -24,6 +24,7 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"github.com/httprunner/httprunner/v5/code"
+	"github.com/httprunner/httprunner/v5/internal/builtin"
 	"github.com/httprunner/httprunner/v5/uixt/option"
 	"github.com/httprunner/httprunner/v5/uixt/types"
 )
@@ -387,13 +388,7 @@ func (dev *IOSDevice) ListImages() (images []string, err error) {
 
 func (dev *IOSDevice) MountImage(imagePath string) (err error) {
 	log.Info().Str("imagePath", imagePath).Msg("mount ios developer image")
-	conn, err := imagemounter.NewImageMounter(dev.DeviceEntry)
+	err = imagemounter.MountImage(dev.DeviceEntry, imagePath)
-	if err != nil {
-		return errors.Wrap(code.DeviceConnectionError, err.Error())
-	}
-	defer conn.Close()
-
-	err = conn.MountImage(imagePath)
 	if err != nil {
 		return errors.Wrapf(code.DeviceConnectionError,
 			"mount ios developer image failed: %v", err)
@@ -402,8 +397,23 @@ func (dev *IOSDevice) MountImage(imagePath string) (err error) {
 	return nil
 }
 
+func (dev *IOSDevice) UnmountImage() (err error) {
+	log.Info().Msg("unmount ios developer image")
+	err = imagemounter.UnmountImage(dev.DeviceEntry)
+	if err != nil {
+		return errors.Wrapf(code.DeviceConnectionError,
+			"unmount ios developer image failed: %v", err)
+	}
+	log.Info().Msg("unmount ios developer image success")
+	return nil
+}
+
 func (dev *IOSDevice) AutoMountImage(baseDir string) (err error) {
 	log.Info().Str("baseDir", baseDir).Msg("auto mount ios developer image")
+	if err := builtin.EnsureFolderExists(baseDir); err != nil {
+		return errors.Wrap(err, "create developer disk image directory failed")
+	}
+
 	imagePath, err := imagemounter.DownloadImageFor(dev.DeviceEntry, baseDir)
 	if err != nil {
 		return errors.Wrapf(code.DeviceConnectionError,