x1z53/ALR
1
0
Fork 0
forked from Plemya-x/ALR
Code Pull Requests Activity

update config module

Browse Source
This commit is contained in:
Maxim Slipenko
2025-03-22 12:58:10 +03:00
parent 5e7d4033e4
commit 8f4b021a93
30 changed files with 437 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/build/build.go
View File

@ -59,8 +59,8 @@ type PackageFinder interface {
}
type Config interface {
GetPaths(ctx context.Context) *config.Paths
PagerStyle(ctx context.Context) string
GetPaths() *config.Paths
PagerStyle() string
}
type Builder struct {
@ -88,7 +88,7 @@ func NewBuilder(
}
func (b *Builder) UpdateOptsFromPkg(pkg *db.Package, packages []string) {
repodir := b.config.GetPaths(b.ctx).RepoDir
repodir := b.config.GetPaths().RepoDir
b.opts.Repository = pkg.Repository
if pkg.BasePkgName != "" {
b.opts.Script = filepath.Join(repodir, pkg.Repository, pkg.BasePkgName, "alr.sh")
@ -149,7 +149,7 @@ func (b *Builder) BuildPackage(ctx context.Context) ([]string, []string, error)
ctx,
b.opts.Script,
basePkg,
b.config.PagerStyle(ctx),
b.config.PagerStyle(),
b.opts.Interactive,
)
if err != nil {
@ -392,7 +392,7 @@ func (b *Builder) getDirs(basePkg string) (types.Directories, error) {
return types.Directories{}, err
}
baseDir := filepath.Join(b.config.GetPaths(b.ctx).PkgsDir, basePkg) // Определяем базовую директорию
baseDir := filepath.Join(b.config.GetPaths().PkgsDir, basePkg) // Определяем базовую директорию
return types.Directories{
BaseDir: baseDir,
SrcDir: filepath.Join(baseDir, "src"),

4
pkg/build/build_internal_test.go
View File

@ -144,11 +144,11 @@ func (m *TestManager) IsInstalled(pkg string) (bool, error) {
type TestConfig struct{}
func (c *TestConfig) PagerStyle(ctx context.Context) string {
func (c *TestConfig) PagerStyle() string {
return "native"
}
func (c *TestConfig) GetPaths(ctx context.Context) *config.Paths {
func (c *TestConfig) GetPaths() *config.Paths {
return &config.Paths{
CacheDir: "/tmp",
}