diff --git a/hrp/code/code.go b/hrp/code/code.go index bc8e273d..c4c4a457 100644 --- a/hrp/code/code.go +++ b/hrp/code/code.go @@ -69,6 +69,7 @@ var ( DeviceConnectionError = errors.New("device general connection error") // 50 DeviceHTTPDriverError = errors.New("device HTTP driver error") // 51 DeviceUSBDriverError = errors.New("device USB driver error") // 52 + DeviceAppNotInstalled = errors.New("device app not installed") // 59 DeviceGetInfoError = errors.New("device get info error") // 60 DeviceConfigureError = errors.New("device configure error") // 61 DeviceShellExecError = errors.New("device shell exec error") // 62 @@ -168,6 +169,7 @@ var errorsMap = map[error]int{ DeviceConnectionError: 50, DeviceHTTPDriverError: 51, DeviceUSBDriverError: 52, + DeviceAppNotInstalled: 59, DeviceGetInfoError: 60, DeviceConfigureError: 61, DeviceShellExecError: 62, @@ -228,7 +230,7 @@ func GetErrorCode(err error) (errCode int) { return } -func GetErrorByCode(errCode int) (error) { +func GetErrorByCode(errCode int) error { if errCode < 0 { return nil } @@ -239,4 +241,3 @@ func GetErrorByCode(errCode int) (error) { } return nil } - diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index 53031b8d..3b44b471 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v5.0.0+2412231738 +v5.0.0+2412231751 diff --git a/hrp/pkg/uixt/android_device.go b/hrp/pkg/uixt/android_device.go index 0dffdcde..d3ca923a 100644 --- a/hrp/pkg/uixt/android_device.go +++ b/hrp/pkg/uixt/android_device.go @@ -518,7 +518,7 @@ func (dev *AndroidDevice) GetPackageInfo(packageName string) (AppInfo, error) { appInfo.AppBaseInfo.VersionName = appVersion } else { log.Warn().Msg("failed to get package version") - return appInfo, errors.Wrap(code.DeviceGetInfoError, err.Error()) + return appInfo, errors.Wrap(code.DeviceAppNotInstalled, err.Error()) } // get package path @@ -527,7 +527,7 @@ func (dev *AndroidDevice) GetPackageInfo(packageName string) (AppInfo, error) { appInfo.AppBaseInfo.AppPath = packagePath } else { log.Warn().Msg("failed to get package path") - return appInfo, errors.Wrap(code.DeviceGetInfoError, err.Error()) + return appInfo, errors.Wrap(code.DeviceAppNotInstalled, err.Error()) } // get package md5 @@ -536,7 +536,7 @@ func (dev *AndroidDevice) GetPackageInfo(packageName string) (AppInfo, error) { appInfo.AppBaseInfo.AppMD5 = packageMD5 } else { log.Warn().Msg("failed to get package md5") - return appInfo, errors.Wrap(code.DeviceGetInfoError, err.Error()) + return appInfo, errors.Wrap(code.DeviceAppNotInstalled, err.Error()) } return appInfo, nil diff --git a/hrp/pkg/uixt/ios_device.go b/hrp/pkg/uixt/ios_device.go index 57859987..4e3bfd35 100644 --- a/hrp/pkg/uixt/ios_device.go +++ b/hrp/pkg/uixt/ios_device.go @@ -798,13 +798,13 @@ func (dev *IOSDevice) GetCurrentWindow() (WindowInfo, error) { func (dev *IOSDevice) GetPackageInfo(packageName string) (AppInfo, error) { svc, err := installationproxy.New(dev.d) if err != nil { - return AppInfo{}, err + return AppInfo{}, errors.Wrap(code.DeviceGetInfoError, err.Error()) } defer svc.Close() apps, err := svc.BrowseAllApps() if err != nil { - return AppInfo{}, err + return AppInfo{}, errors.Wrap(code.DeviceGetInfoError, err.Error()) } for _, app := range apps { @@ -824,6 +824,6 @@ func (dev *IOSDevice) GetPackageInfo(packageName string) (AppInfo, error) { }, }, nil } - return AppInfo{}, errors.Wrap(code.DeviceGetInfoError, + return AppInfo{}, errors.Wrap(code.DeviceAppNotInstalled, fmt.Sprintf("%s not found", packageName)) }