log: finish logger

Author: Geniucker

config.yaml

@@ -2,3 +2,4 @@ v: 3.3
 routeConfig: "route.txt"
 libimobiledeviceDir: "libimobiledevice"
 imageDir: "DeveloperDiskImage"
+log-level: error

internal/config/config.go

@@ -2,9 +2,9 @@ package config
 
 import (
 	"os"
+	"runtime"
 	"strings"
 
-	"github.com/iosRealRun-cli/iOSRealRun-cli/internal/utils"
 	"gopkg.in/yaml.v3"
 )
 
@@ -13,6 +13,7 @@ type config struct {
 	RouteConfig         string  `yaml:"routeConfig"`
 	LibimobiledeviceDir string  `yaml:"libimobiledeviceDir"`
 	ImageDir            string  `yaml:"imageDir"`
+	LogLevel            string  `yaml:"log-level"`
 }
 
 func SetupConfig() (conf config) {
@@ -26,8 +27,18 @@ func SetupConfig() (conf config) {
 		panic(err)
 	}
 
-	// set imageDir
-	OS := utils.GetOS()
+	var OS string
+	switch runtime.GOOS {
+	case "windows":
+		OS = "win"
+	case "darwin":
+		OS = "darwin"
+	case "linux":
+		OS = "linux"
+	default:
+		OS = "unknown"
+	}
+
 	conf.LibimobiledeviceDir = strings.Join([]string{conf.LibimobiledeviceDir, OS}, "/")
 
 	return

internal/device/device.go

@@ -6,25 +6,34 @@ import (
 	"strings"
 
 	"github.com/iosRealRun-cli/iOSRealRun-cli/internal/config"
+	"github.com/iosRealRun-cli/iOSRealRun-cli/internal/logger"
 	"github.com/iosRealRun-cli/iOSRealRun-cli/internal/utils"
 )
 
+var myLogger = logger.NewMyLogger("log.log", config.Config.LogLevel)
+
 func Pair() int {
+	myLogger.Infoln("Start pairing ...")
 	conf := config.Config
 	resp := utils.CmdWithlibimobidevice([]string{"idevicepair", "pair"}, conf.LibimobiledeviceDir)
+	myLogger.Debugln("resp:", resp)
 	if strings.Contains(resp, "SUCCESS") {
+		myLogger.Infoln("Pair success")
 		return 0
 	}
 	if strings.Contains(resp, "No device found") {
+		myLogger.Warnln("No device found")
 		return 1
 	}
 	if strings.Contains(resp, "passcode") {
 		for strings.Contains(resp, "passcode") {
 			fmt.Println("请解锁手机后按回车")
 			fmt.Scanln()
 			resp = utils.CmdWithlibimobidevice([]string{"idevicepair", "pair"}, conf.LibimobiledeviceDir)
+			myLogger.Debugln("resp:", resp)
 		}
 		if strings.Contains(resp, "SUCCESS") {
+			myLogger.Infoln("Pair success")
 			return 0
 		}
 	}
@@ -33,13 +42,17 @@ func Pair() int {
 			fmt.Println("请在你的手机/或平板上按提示信任此电脑并按回车")
 			fmt.Scanln()
 			resp = utils.CmdWithlibimobidevice([]string{"idevicepair", "pair"}, conf.LibimobiledeviceDir)
+			myLogger.Debugln("resp:", resp)
 		}
 		if strings.Contains(resp, "SUCCESS") {
+			myLogger.Infoln("Pair success")
 			return 0
 		} else {
+			myLogger.Errorln("Unknown error")
 			return -1
 		}
 	} else {
+		myLogger.Errorln("Unknown error")
 		return -1
 	}
 }
@@ -48,6 +61,9 @@ func GetDeviceInfo() (deviceName string, version string) {
 	info := utils.CmdWithlibimobidevice([]string{"ideviceinfo"}, config.Config.LibimobiledeviceDir)
 	deviceName = regexp.MustCompile(`DeviceName: (.*)`).FindStringSubmatch(info)[1]
 	version = regexp.MustCompile(`ProductVersion: (.*)`).FindStringSubmatch(info)[1]
+	myLogger.Debugln("deviceName:", deviceName)
+	myLogger.Debugln("version:", version)
+	myLogger.Debugln("info:", info)
 	// strip
 	deviceName = strings.Trim(deviceName, " \n\r\t")
 	version = strings.Trim(version, " \n\r\t")

internal/device/location.go

@@ -8,8 +8,7 @@ import (
 )
 
 func SetLoc(loc map[string]float64) {
-	// python: utils.CmdWithlibimobidevice(["idevicesetlocation", "--", str(loc["lat"]-0.00389), str(loc["lng"]-0.01075)], config.Config.LibimobiledeviceDir, False)
-	// go version
+	myLogger.Debugln("loc:", loc)
 	lat := loc["lat"]
 	lng := loc["lng"]
 	utils.CmdWithlibimobidevice([]string{"idevicesetlocation", "--", strconv.FormatFloat(lat-0.00389, 'f', -1, 64), strconv.FormatFloat(lng-0.01075, 'f', -1, 64)}, config.Config.LibimobiledeviceDir, false)

internal/initialize/initialize.go

@@ -8,17 +8,21 @@ import (
 
 	"github.com/iosRealRun-cli/iOSRealRun-cli/internal/config"
 	"github.com/iosRealRun-cli/iOSRealRun-cli/internal/device"
+	"github.com/iosRealRun-cli/iOSRealRun-cli/internal/logger"
 	"github.com/iosRealRun-cli/iOSRealRun-cli/internal/parseRoute"
 	"github.com/iosRealRun-cli/iOSRealRun-cli/internal/utils"
 )
 
+var myLogger = logger.NewMyLogger("log.log", config.Config.LogLevel)
+
 func Connect() {
 	conf := config.Config
 	OS := utils.GetOS()
 
 	if OS != "win" {
 		utils.Cmd([]string{"chmod", "-R", "+rx", conf.LibimobiledeviceDir}, false)
 		if OS == "linux" {
+			// check if usbmuxd is installed
 			path := strings.Split(os.Getenv("PATH"), ":")
 			check := false
 			for _, i := range path {
@@ -33,35 +37,47 @@ func Connect() {
 				fmt.Scanln()
 			}
 		} else {
+			// check if libimobiledevice is quarantined
 			quarantine := strings.Contains(utils.Cmd([]string{"xattr", "libimobiledevice/darwin/ideviceinfo"}), "quarantine")
+			myLogger.Debugln("quarantine:", quarantine)
 			if quarantine {
 				utils.Cmd([]string{"sudo", "xattr", "-d", "-r", "com.apple.quarantine", "."}, false)
 			}
 		}
 	}
 
+	myLogger.Infoln("Start connecting to device ...")
 	fmt.Println("请解锁手机或iPad，然后按回车键继续")
 	fmt.Scanln()
 	status := device.Pair()
+	myLogger.Debugln("status:", status)
 	for status == 1 {
+		myLogger.Warnln("No device connected to computer")
 		fmt.Println("无设备连接，Windows需要安装iTunes，也可尝试解锁手机并插拔数据线，如果还是不行Mac和Windows请打开iTunes并在跑完前不要关闭")
 		fmt.Println("确定连接后按回车键继续")
 		fmt.Scanln()
 		status = device.Pair()
+		myLogger.Debugln("status:", status)
 	}
 	if status == -1 {
-		fmt.Println("遇到了位置的问题")
+		myLogger.Error("Connect to device failed")
+		fmt.Println("遇到了未知的问题")
 		fmt.Println("按回车退出")
-		os.Exit(1)
+		panic("未知错误")
 	}
+	myLogger.Infoln("Connected to device")
 
 	deviceName, version := device.GetDeviceInfo()
+	myLogger.Debugln("deviceName:", deviceName)
+	myLogger.Debugln("version:", version)
 	fmt.Printf("已连接到: %s\n", deviceName)
 	fmt.Printf("系统版本：%s\n", version)
 
 	majorVersion, _ := strconv.ParseInt(strings.Split(version, ".")[0], 10, 64)
+	myLogger.Debugln("majorVersion:", majorVersion)
 	if majorVersion >= 16 {
 		developerMode := !strings.Contains(utils.Cmd([]string{"idevicedevmodectl", "list"}), "disabled")
+		myLogger.Debugln("developerMode:", developerMode)
 		if !developerMode {
 			utils.Cmd([]string{"idevicedevmodectl", "reveal"})
 			fmt.Println("请在系统设置-隐私与安全性-开发者模式中打开开发者模式")
@@ -72,6 +88,7 @@ func Connect() {
 			os.Exit(0)
 		}
 
+		myLogger.Infoln("Start importing DeveloperDiskImage ...")
 		imageStatus := utils.FileExists(fmt.Sprintf("%s/%s/DeveloperDiskImage.dmg", conf.ImageDir, version)) &&
 			utils.FileExists(fmt.Sprintf("%s/%s/DeveloperDiskImage.dmg.signature", conf.ImageDir, version))
 		if !imageStatus {
@@ -81,25 +98,29 @@ func Connect() {
 		}
 
 		if !imageStatus {
+			myLogger.Warnln("DeveloperDiskImage.dmg not found")
 			fmt.Printf("没有在 %s 下找到 %s 版本的开发者镜像\n", conf.ImageDir, version)
 			fmt.Println("请添加完后再次运行本脚本")
 			fmt.Println("现在按回车退出")
 			fmt.Scanln()
 			os.Exit(0)
 		}
 
+		myLogger.Infoln("Verifying the signature of the DeveloperDiskImage.dmg ...")
 		imageCMD := []string{
 			"ideviceimagemounter",
 			fmt.Sprintf("%s/%s/DeveloperDiskImage.dmg", conf.ImageDir, version),
 			fmt.Sprintf("%s/%s/DeveloperDiskImage.dmg.signature", conf.ImageDir, version),
 		}
 		if strings.Contains(utils.Cmd(imageCMD), "-3") {
+			myLogger.Errorln("DeveloperDiskImage.dmg signature verification failed")
 			fmt.Println("开发者镜像签名验证失败，你要重新下一遍")
 			fmt.Println("完成后再次运行本脚本")
 			fmt.Println("现在按回车退出")
 			fmt.Scanln()
 			os.Exit(0)
 		}
+		myLogger.Infoln("Import DeveloperDiskImage successfully")
 	}
 }
 
@@ -110,5 +131,5 @@ func Init() []map[string]float64 {
 	if err != nil {
 		panic(err)
 	}
-	return parseRoute.Split(content)
+	return parseRoute.ParseRoute(content)
 }