[Cmii][ImageSync] -Image Function accomplish -1

agent-go/executor/BasicFunction.go

@@ -150,7 +150,7 @@ func BasicFindContentInFile(content string, fileName string) bool {
 	return false
 }
 
-func BasicFindDeleteContendLineInFile(content string, fileName string) bool {
+func BasicFindAndDeleteContendLineInFile(content string, fileName string) bool {
 
 	// Open the file
 	file, err := os.Open(fileName)
@@ -196,6 +196,38 @@ func BasicFindDeleteContendLineInFile(content string, fileName string) bool {
 	return true
 }
 
+func BasicFindContentInCommandOutput(hardCodeCommand string, content string) (bool, []string) {
+	ok, resultLog := HardCodeCommandExecutor(hardCodeCommand)
+	if !ok {
+		log.ErrorF("[BasicFindContentInCommandOutput] - command error ! => %v", resultLog)
+		return false, nil
+	}
+
+	return BasicFindContentInList(content, resultLog), resultLog
+}
+
+func BasicFindContentInList(content string, list []string) bool {
+	for _, item := range list {
+		if strings.Contains(item, content) {
+			return true
+		}
+	}
+	return false
+}
+
+func BasicDockerImageExistByFullName(imageFullName string) bool {
+
+	var imageVersion string
+
+	split := strings.Split(imageFullName, ":")
+	imageVersion = split[len(split)-1]
+
+	imageFullName = strings.TrimSuffix(imageFullName, ":"+imageVersion)
+
+	//log.DebugF("[BasicDockerImageExistByFullName] -- %s  %s", imageFullName, imageVersion)
+	return BasicDockerImageExists(imageFullName, imageVersion)
+}
+
 func BasicDockerImageExists(imageName, imageVersion string) bool {
 
 	if !BasicCommandExistByPath("docker") {
@@ -324,22 +356,33 @@ func BasicFolderExists(folderName string) bool {
 }
 
 func BasicCreateFolder(folderName string) bool {
-	cmd := exec.Command("test", "-d", folderName)
-	err := cmd.Run()
-	if err == nil {
-		log.DebugF("folder %s already exists !", folderName)
-		return true
+	// 检查目录是否存在
+	if _, err := os.Stat(folderName); os.IsNotExist(err) {
+		// 目录不存在，创建目录
+		err := os.MkdirAll(folderName, os.ModePerm)
+		if err != nil {
+			// 如果创建目录失败，返回false
+			return false
+		}
+	}
+	// 目录存在或者成功创建，返回true
+	return true
+}
+
+func BasicRemoveFileOrFolder(folderName string) bool {
+	// Check if the folder exists
+	if _, err := os.Stat(folderName); os.IsNotExist(err) {
+		return true // folder does not exist
 	}
 
-	cmd2 := exec.Command("mkdir", "-p", folderName)
-	err = cmd2.Run()
+	// Folder exists, remove it
+	err := os.Remove(folderName)
 	if err != nil {
-		log.ErrorF("folder %s create error!", folderName)
+		// Handle error
 		return false
-	} else {
-		log.DebugF("folder %s create success!", folderName)
-		return true
 	}
+
+	return true // folder was removed
 }
 
 // BasicPrettyPrint 打印执行结果