feat: New API for profile initialization

Author: Hayao0819

alteriso/src/internal/archiso/profile_new.go

@@ -0,0 +1,63 @@
+package archiso
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path"
+)
+
+type profileOption func(*Profile) error
+
+func WithPacmanCacheDir(dir string) profileOption {
+	return func(p *Profile) error {
+		p.PacmanCacheDir = dir
+		return nil
+	}
+}
+
+func WithModulesPath(dir string) profileOption {
+	return func(p *Profile) error {
+		p.ModulesPath = dir
+		return nil
+	}
+}
+
+func WithbootloadersPath(dir string) profileOption {
+	return func(p *Profile) error {
+		p.BootloadersPath = dir
+		return nil
+	}
+}
+
+func NewProfile(dir string, opts ...profileOption) (*Profile, error) {
+	configFile, err := os.ReadFile(path.Join(dir, "profiledef.json"))
+	if err != nil {
+		return nil, fmt.Errorf("failed to read profile config: %w", err)
+	}
+
+	profile := Profile{
+		Path: dir,
+	}
+	if err := json.Unmarshal(configFile, &profile.Config); err != nil {
+		return nil, fmt.Errorf("failed to parse profile config: %w", err)
+	}
+
+	for _, opt := range opts {
+		if err := opt(&profile); err != nil {
+			return nil, err
+		}
+	}
+
+	// Load modules
+	for _, modName := range profile.Config.Modules {
+		modDir := path.Join(profile.ModulesPath, modName)
+		mod, err := NewModule(modDir)
+		if err != nil {
+			return nil, fmt.Errorf("failed to load module %s: %w", modName, err)
+		}
+		profile.modules = append(profile.modules, *mod)
+	}
+
+	return &profile, nil
+}

alteriso/src/internal/archiso/profile_struct.go

@@ -1,17 +1,11 @@
 package archiso
 
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"path"
-)
-
 type Profile struct {
 	Config          ProfileDef
 	modules         []Module
 	Path            string
 	BootloadersPath string
+	ModulesPath     string
 }
 
 type ProfileDef struct {
@@ -23,30 +17,3 @@ type ProfileDef struct {
 	Injects      map[string][]string `json:"injects"`
 	COWSpaceSize string              `json:"cow_spacesize"`
 }
-
-func NewProfile(dir, bootloadersPath, modulesPath string) (*Profile, error) {
-	configFile, err := os.ReadFile(path.Join(dir, "profiledef.json"))
-	if err != nil {
-		return nil, fmt.Errorf("failed to read profile config: %w", err)
-	}
-
-	profile := Profile{}
-
-	if err := json.Unmarshal(configFile, &profile.Config); err != nil {
-		return nil, fmt.Errorf("failed to parse profile config: %w", err)
-	}
-
-	profile.Path = dir
-	profile.BootloadersPath = bootloadersPath
-
-	for _, modName := range profile.Config.Modules {
-		modDir := path.Join(modulesPath, modName)
-		mod, err := NewModule(modDir)
-		if err != nil {
-			return nil, fmt.Errorf("failed to load module %s: %w", modName, err)
-		}
-		profile.modules = append(profile.modules, *mod)
-	}
-
-	return &profile, nil
-}

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

@@ -24,7 +24,10 @@ func buildCmd() *cobra.Command {
 			bootloadersPath := cmd.Parent().PersistentFlags().Lookup("bootloaders").Value.String()
 			modulesPath := cmd.Parent().PersistentFlags().Lookup("modules").Value.String()
 
-			profile, err := archiso.NewProfile(configDir, bootloadersPath, modulesPath)
+			profile, err := archiso.NewProfile(configDir,
+				archiso.WithModulesPath(modulesPath),
+				archiso.WithbootloadersPath(bootloadersPath),
+			)
 			if err != nil {
 				return err
 			}

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

@@ -21,7 +21,10 @@ func profileFormatCmd() *cobra.Command {
 			bootloadersPath := cmd.Parent().PersistentFlags().Lookup("bootloaders").Value.String()
 			modulesPath := cmd.Parent().PersistentFlags().Lookup("modules").Value.String()
 
-			profile, err := archiso.NewProfile(configPath, bootloadersPath, modulesPath)
+			profile, err := archiso.NewProfile(configPath,
+				archiso.WithModulesPath(modulesPath),
+				archiso.WithbootloadersPath(bootloadersPath),
+			)
 			if err != nil {
 				return err
 			}

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

@@ -39,12 +39,17 @@ func generateCmd() *cobra.Command {
 			bootloadersPath := cmd.Parent().PersistentFlags().Lookup("bootloaders").Value.String()
 			modulesPath := cmd.Parent().PersistentFlags().Lookup("modules").Value.String()
 
-			profile, err := archiso.NewProfile(configDir, bootloadersPath, modulesPath)
+			profile, err := archiso.NewProfile(configDir,
+				archiso.WithModulesPath(modulesPath),
+				archiso.WithbootloadersPath(bootloadersPath),
+				// archiso.WithPacmanCacheDir(pacmanCacheDir),
+			)
 			if err != nil {
 				return err
 			}
 
-			dstDir := path.Join(outDir, configName)
+			// dstDir := path.Join(outDir, configName)
+			dstDir := path.Join(outDir)
 			if futils.Exists(dstDir) {
 				return errors.New("output directory already exists")
 			}