Add: Move files

Author: Hayao0819

alteriso5/cmd/build.go

@@ -6,5 +6,5 @@ import (
 )
 
 func init() {
-	cobrautils.AddSubCmds(build.Cmd())
+	cobrautils.RegisterSubCmd(build.Cmd())
 }

alteriso5/cmd/build/cmd.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"path"
 
-	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/config"
-	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work"
+	"github.com/FascodeNet/alterlinux/alteriso5/config"
+	"github.com/FascodeNet/alterlinux/alteriso5/work"
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/check"
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 	"github.com/spf13/cobra"

alteriso5/cmd/build/config/pkg/package.go

@@ -2,9 +2,8 @@ package cmd
 
 import (
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/check"
-	"github.com/Hayao0819/nahi/cobrautils"
 )
 
 func init() {
-	cobrautils.AddSubCmds(check.Cmd())
+	rootSubCmds.RegisterSubCmd(check.Cmd())
 }

alteriso5/cmd/check.go

@@ -2,9 +2,8 @@ package cmd
 
 import (
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/clean"
-	"github.com/Hayao0819/nahi/cobrautils"
 )
 
 func init() {
-	cobrautils.AddSubCmds(clean.Cmd())
+	rootSubCmds.RegisterSubCmd(clean.Cmd())
 }

alteriso5/cmd/clean.go

@@ -0,0 +1,7 @@
+package cmd
+
+import "github.com/FascodeNet/alterlinux/alteriso5/cmd/profile"
+
+func init() {
+	rootSubCmds.RegisterSubCmd(profile.Cmd())
+}

alteriso5/cmd/profile.go

@@ -0,0 +1,30 @@
+package profile
+
+import (
+	"github.com/FascodeNet/alterlinux/alteriso5/config/pkg"
+	"github.com/spf13/cobra"
+)
+
+func pkgListCmd() *cobra.Command {
+	cmd := cobra.Command{
+		Use:   "pkglist profile arch",
+		Short: "List packages in the profile",
+		Args:  cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			files, err := pkg.FindPkgListFiles(profile.Base, args[1])
+			if err != nil{
+				return err
+			}
+
+			cmd.Println(files)
+			return nil
+			
+		},
+	}
+
+	return &cmd
+}
+
+func init() {
+	subCmds.RegisterSubCmd(pkgListCmd())
+}

alteriso5/cmd/profile/pkglist.go

@@ -0,0 +1,32 @@
+package profile
+
+import (
+	"github.com/FascodeNet/alterlinux/alteriso5/config"
+	"github.com/FascodeNet/alterlinux/alteriso5/utils"
+	"github.com/Hayao0819/nahi/cobrautils"
+	"github.com/spf13/cobra"
+)
+
+var subCmds = cobrautils.Registory{}
+var profile *config.Profile
+
+func Cmd() *cobra.Command {
+	cmd := cobra.Command{
+		Use:   "profile",
+		Short: "Debug your profile",
+		PersistentPreRunE: utils.WithParentPersistentPreRunE(func(cmd *cobra.Command, args []string) error {
+			p, err := config.ReadProfile(args[0])
+			if err != nil {
+				return err
+			}
+
+			profile = p
+
+			return nil
+		}),
+	}
+
+	subCmds.BindSubCmds(&cmd)
+
+	return &cmd
+}

alteriso5/cmd/profile/root.go

@@ -1,18 +1,26 @@
 package cmd
 
 import (
+	"github.com/FascodeNet/alterlinux/alteriso5/log"
+	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 	"github.com/Hayao0819/nahi/cobrautils"
 	"github.com/spf13/cobra"
 )
 
+var rootSubCmds = cobrautils.Registory{}
+
 func Root() *cobra.Command {
 	root := cobra.Command{
 		Use:   "alteriso5",
 		Short: "AlterISO5 is a tool to build Arch Linux live ISO images",
+		PersistentPreRunE: utils.WithParentPersistentPreRunE(func(cmd *cobra.Command, args []string) error {
+			log.Setup()
+			return nil
+		}),
 		SilenceUsage: true,
 	}
 
-	cobrautils.AddSubCmdsToRoot(&root)
+	rootSubCmds.BindSubCmds(&root)
 
 	return &root
 }

alteriso5/cmd/root.go

@@ -0,0 +1,56 @@
+package pkg
+
+import (
+	"log/slog"
+	"os"
+	"path"
+
+	"github.com/Hayao0819/nahi/osutils"
+)
+
+// 指定されたプロファイルとアーキテクチャに対応するパッケージリストファイルを検索し、そのファイルのパスを返します。
+func FindPkgListFiles(profile string, arch string) ([]string, error) {
+	findFiles := []string{
+		"packages." + arch,
+		"packages.any",
+	}
+
+	findDirs := []string{
+		"packages." + arch + ".d",
+		"packages.any.d",
+	}
+
+	// パッケージリストファイルを検索
+	for _, d := range findDirs {
+		dir := path.Join(profile, d)
+		slog.Debug("Check pkglist", "subdir", dir)
+		if !osutils.IsDir(dir) {
+			continue
+		}
+
+		slog.Debug("Found pkglist", "subdir", dir)
+
+		files, err := os.ReadDir(dir)
+		if err != nil {
+			slog.Warn("Failed to list directory", "dir", dir, "error", err)
+			continue
+		}
+		slog.Debug("Found pkglist", "files", files)
+		for _, f := range files {
+			p := path.Join(profile, d, f.Name())
+			slog.Info("Found pkglist", "file",p)
+			findFiles = append(findFiles, p)
+		}
+	}
+
+	retunPaths := []string{}
+
+	for _, f := range findFiles {
+		slog.Debug("Check pkglist", "file", path.Join(profile, f))
+		if osutils.IsFile(path.Join(profile, f)) {
+			retunPaths = append(retunPaths, path.Join(profile, f))
+		}
+	}
+
+	return retunPaths, nil
+}