feat: Add clean command and refactor profile handling in build command

Author: Hayao0819

alteriso/go.mod

@@ -5,6 +5,8 @@ go 1.25.1
 require (
 	github.com/Hayao0819/nahi v0.0.4-0.20250226153401-b90a5060c85a
 	github.com/m-mizutani/clog v0.1.0
+	github.com/moby/sys/mount v0.3.4
+	github.com/moby/sys/mountinfo v0.7.2
 	github.com/otiai10/copy v1.14.1
 	github.com/samber/lo v1.51.0
 	github.com/spf13/cobra v1.8.1

alteriso/go.sum

@@ -28,6 +28,10 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/moby/sys/mount v0.3.4 h1:yn5jq4STPztkkzSKpZkLcmjue+bZJ0u2AuQY1iNI1Ww=
+github.com/moby/sys/mount v0.3.4/go.mod h1:KcQJMbQdJHPlq5lcYT+/CjatWM4PuxKe+XLSVS4J6Os=
+github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
+github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
 github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8=
 github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I=
 github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=

alteriso/src/internal/cmd/clean.go

@@ -0,0 +1,87 @@
+package cmd
+
+import (
+	"log/slog"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/FascodeNet/alterlinux/src/internal/errors"
+	"github.com/Hayao0819/nahi/futils"
+	"github.com/moby/sys/mount"
+	"github.com/moby/sys/mountinfo"
+	"github.com/spf13/cobra"
+)
+
+func correctWorkDir(dir string) (string, bool) {
+	if !futils.IsDir(dir) {
+		return "", false
+	}
+
+	// TODO: 適切に判断する
+	return dir, true
+}
+
+func mountedDirsIn(dir string) []string {
+	mounts, err := mountinfo.GetMounts(func(i *mountinfo.Info) (skip bool, stop bool) {
+		mp := filepath.Clean(i.Mountpoint)
+		parentDir := filepath.Clean(dir) + string(filepath.Separator)
+		if mp == parentDir || strings.HasPrefix(mp+string(filepath.Separator), parentDir) {
+			return false, false
+		}
+		return true, false
+	})
+	if err != nil {
+		return nil
+	}
+
+	var mountedDirs []string
+	for _, m := range mounts {
+		mountedDirs = append(mountedDirs, m.Mountpoint)
+	}
+	return mountedDirs
+}
+
+func cleanCmd() *cobra.Command {
+	workDir := "./work"
+	cmd := cobra.Command{
+		Use:   "clean",
+		Short: "Clean up working directories",
+		RunE: func(cmd *cobra.Command, args []string) error {
+
+			correctedWorkDir, ok := correctWorkDir(workDir)
+			if !ok {
+				return errors.Newf("workdir %s is not a valid directory", workDir)
+			}
+			workDir = correctedWorkDir
+
+			var failed bool
+			mountedDirs := mountedDirsIn(correctedWorkDir)
+			for _, dir := range mountedDirs {
+				if err := mount.Unmount(dir); err != nil {
+					slog.Error("Failed to unmount dir", "dir", dir, "error", err)
+					failed = true
+				}
+			}
+			if failed {
+				return errors.Newf("failed to unmount some directories in %s", workDir)
+			}
+
+			slog.Info("Removing working directory...", "dir", workDir)
+			if err := os.RemoveAll(workDir); err != nil {
+				return err
+			}
+			return nil
+
+		},
+	}
+
+	// archisoの作業ディレクトリ
+	cmd.Flags().StringVarP(&workDir, "workdir", "w", workDir, "Path to working directory of archiso")
+
+	return &cmd
+}
+
+func init() {
+	rootReg.Add(cleanCmd())
+}

alteriso/src/internal/cmd/profile/build.go

@@ -1,55 +1,100 @@
 package profile
 
 import (
-	"fmt"
 	"log/slog"
 	"os"
 	"path"
+	"path/filepath"
 
 	"github.com/FascodeNet/alterlinux/src/internal/archiso"
 	"github.com/FascodeNet/alterlinux/src/internal/errors"
 	"github.com/Hayao0819/nahi/exutils"
 	"github.com/spf13/cobra"
 )
 
+func getProfileFromArg(cmd *cobra.Command, configDir string) (*archiso.Profile, error) {
+	bootloadersPath := cmd.Parent().PersistentFlags().Lookup("bootloaders").Value.String()
+	modulesPath := cmd.Parent().PersistentFlags().Lookup("modules").Value.String()
+
+	profile, err := archiso.NewProfile(configDir,
+		archiso.WithModulesPath(modulesPath),
+		archiso.WithbootloadersPath(bootloadersPath),
+	)
+	if err != nil {
+		return nil, errors.Wrap(err)
+	}
+
+	return profile, nil
+}
+
 func buildCmd() *cobra.Command {
 	outDir := "./out"
+	workDir := "./work"
 	cmd := cobra.Command{
 		Use:   "build",
 		Short: "Build the ISO from generated profile",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			configDir := args[0]
-			configName := path.Base(configDir)
-
-			bootloadersPath := cmd.Parent().PersistentFlags().Lookup("bootloaders").Value.String()
-			modulesPath := cmd.Parent().PersistentFlags().Lookup("modules").Value.String()
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			// TODO: 権限チェック
 
-			profile, err := archiso.NewProfile(configDir,
-				archiso.WithModulesPath(modulesPath),
-				archiso.WithbootloadersPath(bootloadersPath),
-			)
-			if err != nil {
-				return err
+			return nil
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// Load profile
+			var configDir string
+			if len(args) < 1 {
+				configDir = "./configs/xfce"
+			} else {
+				configDir = args[0]
 			}
 
-			profileDir, err := os.MkdirTemp("", fmt.Sprintf("alteriso-%s-*", configName))
+			configName := path.Base(configDir)
+			slog.Info("Loading profile...", "config", configDir)
+			profile, err := getProfileFromArg(cmd, configDir)
 			if err != nil {
 				return errors.Wrap(err)
 			}
-			defer os.RemoveAll(profileDir)
+			slog.Info("Using profile", "name", configName)
+
+			// Setup directories
+			for _, dir := range []*string{&outDir, &workDir} {
+				absDir, err := filepath.Abs(*dir)
+				if err != nil {
+					return errors.Wrap(err)
+				}
+				*dir = absDir
+				if err := os.MkdirAll(*dir, 0o755); err != nil {
+					return errors.Wrap(err)
+				}
+			}
+			slog.Info("Output directory", "dir", outDir)
+			slog.Info("Working directory", "dir", workDir)
 
-			if err := profile.GenArchisoProfile(profileDir); err != nil {
+			// Generate archiso profile
+			archisoprofileDir := path.Join(workDir, "profile")
+			if err := profile.GenArchisoProfile(archisoprofileDir); err != nil {
 				return errors.Wrap(err)
 			}
+			slog.Info("Generated archiso profile", "dir", archisoprofileDir)
 
-			slog.Info("Generated archiso profile", "dir", profileDir)
-
-			mkarchiso, err := archiso.MkarchisoPath()
+			// Build ISO with mkarchiso
+			// TODO: 権限昇格
+			archisoWorkDir := path.Join(workDir, "archiso")
+			if err := os.MkdirAll(archisoWorkDir, 0o755); err != nil {
+				return errors.Wrap(err)
+			}
+			archisoPacmanCacheDir := path.Join(workDir, "pacman_cache")
+			if err := os.MkdirAll(archisoPacmanCacheDir, 0o755); err != nil {
+				return errors.Wrap(err)
+			}
+			mkarchisoPath, err := archiso.MkarchisoPath()
 			if err != nil {
 				return errors.Wrap(err)
 			}
+			mkarchisoCmd := exutils.CommandWithStdio(mkarchisoPath, "-v", "-w", archisoWorkDir, "-o", outDir, archisoprofileDir)
+			mkarchisoCmd.Env = append(mkarchisoCmd.Env, "ALTERISO_PACMAN_CACHE="+archisoPacmanCacheDir)
+			slog.Info("Building ISO image...", "command", mkarchisoCmd.String())
 
-			if err := exutils.CommandWithStdio(mkarchiso, "-v", "-w", "work", "-o", outDir, profileDir).Run(); err != nil {
+			if err := mkarchisoCmd.Run(); err != nil {
 				return errors.Wrap(err)
 			}
 
@@ -59,6 +104,7 @@ func buildCmd() *cobra.Command {
 	}
 
 	cmd.Flags().StringVarP(&outDir, "out", "o", outDir, "Output directory")
+	cmd.Flags().StringVar(&workDir, "work", workDir, "Working directory")
 
 	return &cmd
 

alteriso/src/internal/cmd/profile/format.go

@@ -1,7 +1,6 @@
 package profile
 
 import (
-	"github.com/FascodeNet/alterlinux/src/internal/archiso"
 	"github.com/FascodeNet/alterlinux/src/internal/errors"
 	"github.com/Hayao0819/nahi/futils"
 	"github.com/spf13/cobra"
@@ -18,13 +17,7 @@ func profileFormatCmd() *cobra.Command {
 				return errors.Newf("directory %s does not exist", configPath)
 			}
 
-			bootloadersPath := cmd.Parent().PersistentFlags().Lookup("bootloaders").Value.String()
-			modulesPath := cmd.Parent().PersistentFlags().Lookup("modules").Value.String()
-
-			profile, err := archiso.NewProfile(configPath,
-				archiso.WithModulesPath(modulesPath),
-				archiso.WithbootloadersPath(bootloadersPath),
-			)
+			profile, err := getProfileFromArg(cmd, configPath)
 			if err != nil {
 				return err
 			}