Modify the mirroring function

Author: Timo

pkg/app/app_cli.go

@@ -368,7 +368,7 @@ func (app *App) handleCLIInput(choice string, services []*commands.Service, allS
 	case "17":
 		manager.RunVolumeMenu(app.DockerCommand, app.ReadInput)
 	case "18":
-		manager.RunImageMenu(app.DockerCommand, app.ReadInput, app.runInteractiveSubprocess)
+		manager.RunImageMenu(app.DockerCommand, app.ReadInput, app.runInteractiveSubprocess, app.runFzfSelect, app.parseFzfResult)
 	case "100":
 		app.doServiceAction(app.Tr.Fix, services, true, false, func(s *commands.Service) error {
 			if !s.IsLocal {

pkg/commands/image.go

@@ -2,6 +2,7 @@ package commands
 
 import (
 	"context"
+	"os/exec"
 	"strings"
 
 	"github.com/docker/docker/api/types/filters"
@@ -151,3 +152,23 @@ func (i *Image) GetDisplaySize() string {
 func (i *Image) GetDisplayContentSize() string {
 	return utils.FormatBinaryBytes(int(i.Image.VirtualSize))
 }
+
+// Run runs the image with a specific name
+func (i *Image) Run(name string) error {
+	command := "docker run -d"
+	if name != "" {
+		command += " --name " + i.OSCommand.Quote(name)
+	}
+	command += " " + i.ID
+	return i.OSCommand.RunCommand(command)
+}
+
+// GetInteractiveRunCmd returns a command to run the image interactively
+func (i *Image) GetInteractiveRunCmd(name string, shell string) *exec.Cmd {
+	args := []string{"run", "-it", "--rm"}
+	if name != "" {
+		args = append(args, "--name", name)
+	}
+	args = append(args, i.ID, shell)
+	return i.OSCommand.NewCmd("docker", args...)
+}

pkg/i18n/chinese.go

@@ -214,5 +214,22 @@ func chineseSet() TranslationSet {
 		MenuVolumeManagement:  "卷管理",
 		MenuImageManagement:   "镜像管理",
 		MenuRepairService:     "修复服务 (所有/指定) - 重新构建镜像",
+
+		// 镜像管理相关
+		SearchImageTitle:        "搜索所有镜像 (支持名称搜索, Esc 返回)",
+		RunImage:                "运行镜像",
+		InputContainerName:      "输入容器名称 (可选，直接回车使用默认): ",
+		RunImageSuccess:         "容器 %s 已启动",
+		RunImageFailed:          "运行镜像失败: %v",
+		SelectActionForImage:    "选择对镜像 [%s] 执行的操作 (Esc 返回)",
+		ConfirmDeleteImage:      "确定要删除镜像 %s (ID: %s) 吗? (y/n): ",
+		DeletingImage:           "正在删除镜像...",
+		InvalidIndex:            "无效的索引",
+		DangerDeleteAllImages:   "危险: 这将删除所有未被使用的镜像! 是否继续? (y/n): ",
+		CleaningAllUnusedImages: "正在清理所有未使用镜像...",
+		PullImage:               "拉取镜像",
+		DeleteSpecifiedImage:    "删除指定镜像",
+		DeleteAllImages:         "删除所有镜像",
+		DetectingShell:          "正在检测可用 Shell...",
 	}
 }

pkg/i18n/english.go

@@ -218,6 +218,22 @@ type TranslationSet struct {
 	MenuVolumeManagement  string
 	MenuImageManagement   string
 	MenuRepairService     string
+	// Image Management
+	SearchImageTitle        string
+	RunImage                string
+	InputContainerName      string
+	RunImageSuccess         string
+	RunImageFailed          string
+	SelectActionForImage    string
+	ConfirmDeleteImage      string
+	DeletingImage           string
+	InvalidIndex            string
+	DangerDeleteAllImages   string
+	CleaningAllUnusedImages string
+	PullImage               string
+	DeleteSpecifiedImage    string
+	DeleteAllImages         string
+	DetectingShell          string
 }
 
 func englishSet() TranslationSet {
@@ -443,5 +459,22 @@ func englishSet() TranslationSet {
 		MenuVolumeManagement:  "Volume Management",
 		MenuImageManagement:   "Image Management",
 		MenuRepairService:     "Repair Service (All/Specified) - Rebuild Image",
+
+		// Image Management
+		SearchImageTitle:        "Search all images (Supports name search, Esc to return)",
+		RunImage:                "Run Image",
+		InputContainerName:      "Input container name (optional, press Enter for default): ",
+		RunImageSuccess:         "Container %s is running",
+		RunImageFailed:          "Run image failed: %v",
+		SelectActionForImage:    "Select action for image [%s] (Esc to return)",
+		ConfirmDeleteImage:      "Are you sure you want to delete image %s (ID: %s)? (y/n): ",
+		DeletingImage:           "Deleting image...",
+		InvalidIndex:            "Invalid index",
+		DangerDeleteAllImages:   "DANGER: This will delete all unused images! Continue? (y/n): ",
+		CleaningAllUnusedImages: "Cleaning all unused images...",
+		PullImage:               "Pull Image",
+		DeleteSpecifiedImage:    "Delete Specified Image",
+		DeleteAllImages:         "Delete All Images",
+		DetectingShell:          "Detecting available shell...",
 	}
 }

pkg/manager/image.go

@@ -8,24 +8,32 @@ import (
 
 	"github.com/docker/docker/api/types/image"
 	"github.com/yaogh99123/dcli/pkg/commands"
+	"github.com/yaogh99123/dcli/pkg/i18n"
 	"github.com/yaogh99123/dcli/pkg/utils"
 )
 
 // RunImageMenu handles image management CLI interactions
-func RunImageMenu(dockerCmd *commands.DockerCommand, readInput func(string) string, runInteractiveSubprocess func(*exec.Cmd) error) {
+func RunImageMenu(
+	dockerCmd *commands.DockerCommand,
+	readInput func(string) string,
+	runInteractiveSubprocess func(*exec.Cmd) error,
+	runFzfSelect func(string, []string) string,
+	parseFzfResult func(string) string,
+) {
+	tr := dockerCmd.Tr
 	for {
 		images, err := dockerCmd.RefreshImages()
 		if err != nil {
-			fmt.Printf("%s错误: %v%s\n", utils.ColorRed, err, utils.ColorNC)
+			fmt.Printf("%s%s: %v%s\n", utils.ColorRed, tr.ErrorTitle, err, utils.ColorNC)
 			return
 		}
 
-		fmt.Printf("\033[H\033[2J") // 清屏
+		fmt.Printf("\033[H\033[2J") // Clear screen
 		fmt.Printf("%s========================================%s\n", utils.ColorBlue, utils.ColorNC)
-		fmt.Printf("%s      Docker 镜像管理%s\n", utils.ColorBlue, utils.ColorNC)
+		fmt.Printf("%s      %s%s\n", utils.ColorBlue, tr.MenuImageManagement, utils.ColorNC)
 		fmt.Printf("%s========================================%s\n\n", utils.ColorBlue, utils.ColorNC)
 
-		// 打印表头
+		// Print header
 		fmt.Printf("%-50s %-12s %-12s %-12s %-10s\n", "IMAGE", "ID", "DISK USAGE", "CONTENT SIZE", "EXTRA")
 		for i, img := range images {
 			name := img.Name
@@ -42,63 +50,122 @@ func RunImageMenu(dockerCmd *commands.DockerCommand, readInput func(string) stri
 				i+1, name, img.ID[:12], img.GetDisplaySize(), img.GetDisplayContentSize(), extra)
 		}
 
-		fmt.Printf("\n%s镜像操作%s\n", utils.ColorGreen, utils.ColorNC)
+		fmt.Printf("\n%s%s%s\n", utils.ColorGreen, tr.MenuFunction, utils.ColorNC)
 		fmt.Println("------------------------------")
-		fmt.Println("  1. 拉取镜像")
-		fmt.Println("  2. 删除指定镜像")
-		fmt.Println("  3. 删除所有镜像")
+		fmt.Printf("  1. %s\n", tr.PullImage)
+		fmt.Printf("  2. %s\n", tr.DeleteSpecifiedImage)
+		fmt.Printf("  3. %s\n", tr.DeleteAllImages)
 		fmt.Println("------------------------------")
-		fmt.Println("  0. 返回")
+		fmt.Printf("  s. %s\n", tr.SearchImageTitle)
 		fmt.Println("------------------------------")
-		fmt.Print("请选择: ")
+		fmt.Printf("  0. %s\n", tr.Return)
+		fmt.Println("------------------------------")
+		fmt.Print(tr.InputServiceNameIdx) // Using common prompt
 
 		input := readInput("")
 		input = strings.TrimSpace(input)
 
-		if input == "0" || input == "" {
+		if input == "0" || input == "" || input == "q" {
 			break
 		}
 
+		if input == "s" || input == "search" {
+			var lines []string
+			for i, img := range images {
+				lines = append(lines, fmt.Sprintf("%d. %s (%s)", i+1, img.Name, img.ID[:12]))
+			}
+			result := runFzfSelect(tr.SearchImageTitle, lines)
+			selected := parseFzfResult(result)
+			if selected != "" {
+				// Handle selected image
+				var idx int
+				_, _ = fmt.Sscanf(selected, "%d", &idx)
+				if idx > 0 && idx <= len(images) {
+					handleImageAction(images[idx-1], tr, readInput, runInteractiveSubprocess, runFzfSelect, parseFzfResult)
+				}
+			}
+			continue
+		}
+
 		switch input {
 		case "1":
-			fmt.Print("请输入要拉取的镜像名称 (如 nginx:latest): ")
+			fmt.Printf("%s: ", tr.PullImage)
 			name := readInput("")
 			name = strings.TrimSpace(name)
 			if name != "" {
-				fmt.Printf("%s正在拉取镜像 %s...%s\n", utils.ColorYellow, name, utils.ColorNC)
+				fmt.Printf("%s%s %s...%s\n", utils.ColorYellow, tr.PullImage, name, utils.ColorNC)
 				cmd := exec.Command("docker", "pull", name)
 				_ = runInteractiveSubprocess(cmd)
 			}
 		case "2":
-			fmt.Print("请输入要删除的镜像索引: ")
+			fmt.Print(tr.InputServiceNameIdx)
 			idxStr := readInput("")
 			var idx int
 			_, _ = fmt.Sscanf(strings.TrimSpace(idxStr), "%d", &idx)
 			if idx > 0 && idx <= len(images) {
-				img := images[idx-1]
-				fmt.Printf("%s确定要删除镜像 %s (ID: %s) 吗? (y/n): %s", utils.ColorYellow, img.Name, img.ID[:12], utils.ColorNC)
-				confirm := readInput("")
-				if strings.ToLower(strings.TrimSpace(confirm)) == "y" {
-					fmt.Printf("%s正在删除镜像...%s\n", utils.ColorYellow, utils.ColorNC)
-					if err := img.Remove(image.RemoveOptions{Force: true}); err != nil {
-						fmt.Printf("%s失败: %v%s\n", utils.ColorRed, err, utils.ColorNC)
-					} else {
-						fmt.Printf("%s成功%s\n", utils.ColorGreen, utils.ColorNC)
-					}
-					time.Sleep(1 * time.Second)
-				}
+				handleImageAction(images[idx-1], tr, readInput, runInteractiveSubprocess, runFzfSelect, parseFzfResult)
 			} else {
-				fmt.Printf("%s无效的索引%s\n", utils.ColorRed, utils.ColorNC)
+				fmt.Printf("%s%s%s\n", utils.ColorRed, tr.InvalidIndex, utils.ColorNC)
 				time.Sleep(1 * time.Second)
 			}
 		case "3":
-			fmt.Printf("%s危险: 这将删除所有未被使用的镜像! 是否继续? (y/n): %s", utils.ColorRed, utils.ColorNC)
+			fmt.Printf("%s%s%s", utils.ColorRed, tr.DangerDeleteAllImages, utils.ColorNC)
 			confirm := readInput("")
 			if strings.ToLower(strings.TrimSpace(confirm)) == "y" {
-				fmt.Printf("%s正在清理所有未使用镜像...%s\n", utils.ColorYellow, utils.ColorNC)
+				fmt.Printf("%s%s%s\n", utils.ColorYellow, tr.CleaningAllUnusedImages, utils.ColorNC)
 				cmd := exec.Command("docker", "image", "prune", "-af")
 				_ = runInteractiveSubprocess(cmd)
 			}
 		}
 	}
 }
+
+func handleImageAction(
+	img *commands.Image,
+	tr *i18n.TranslationSet,
+	readInput func(string) string,
+	runInteractiveSubprocess func(*exec.Cmd) error,
+	runFzfSelect func(string, []string) string,
+	parseFzfResult func(string) string,
+) {
+	lines := []string{
+		fmt.Sprintf("1: %s", tr.RemoveImage),
+		fmt.Sprintf("2: %s", tr.RunImage),
+	}
+
+	result := runFzfSelect(fmt.Sprintf(tr.SelectActionForImage, img.Name), lines)
+	actionID := parseFzfResult(result)
+
+	switch actionID {
+	case "1": // Remove
+		fmt.Printf("%s%s %s (ID: %s) ? (y/n): %s", utils.ColorYellow, tr.ConfirmDeleteImage, img.Name, img.ID[:12], utils.ColorNC)
+		confirm := readInput("")
+		if strings.ToLower(strings.TrimSpace(confirm)) == "y" {
+			fmt.Printf("%s%s%s\n", utils.ColorYellow, tr.DeletingImage, utils.ColorNC)
+			if err := img.Remove(image.RemoveOptions{Force: true}); err != nil {
+				fmt.Printf("%s%s: %v%s\n", utils.ColorRed, tr.ActionFailed, err, utils.ColorNC)
+			} else {
+				fmt.Printf("%s%s%s\n", utils.ColorGreen, tr.ActionSuccess, utils.ColorNC)
+			}
+			time.Sleep(1 * time.Second)
+		}
+	case "2": // Run (Interactive)
+		fmt.Print(tr.InputContainerName)
+		name := readInput("")
+		name = strings.TrimSpace(name)
+
+		fmt.Printf("%s%s%s\n", utils.ColorBlue, tr.DetectingShell, utils.ColorNC)
+		// 参考进入容器的做法，通过一个临时容器检测 shell
+		checkCmd := exec.Command("docker", "run", "--rm", img.ID, "which", "bash")
+		shell := "sh"
+		if err := checkCmd.Run(); err == nil {
+			shell = "bash"
+		}
+
+		cmd := img.GetInteractiveRunCmd(name, shell)
+		if err := runInteractiveSubprocess(cmd); err != nil {
+			fmt.Printf("%s%s%s\n", utils.ColorRed, fmt.Sprintf(tr.RunImageFailed, err), utils.ColorNC)
+			time.Sleep(1 * time.Second)
+		}
+	}
+}