refactor: keep only one struct for package
This commit is contained in:
@ -38,7 +38,7 @@ import (
|
||||
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
|
||||
)
|
||||
|
||||
type ALRSh struct {
|
||||
type ScriptFile struct {
|
||||
file *syntax.File
|
||||
path string
|
||||
}
|
||||
@ -72,97 +72,134 @@ func createBuildEnvVars(info *distro.OSRelease, dirs types.Directories) []string
|
||||
return env
|
||||
}
|
||||
|
||||
func (s *ALRSh) ParseBuildVars(ctx context.Context, info *distro.OSRelease, packages []string) (string, []*types.BuildVars, error) {
|
||||
varsOfPackages := []*types.BuildVars{}
|
||||
|
||||
scriptDir := filepath.Dir(s.path)
|
||||
env := createBuildEnvVars(info, types.Directories{ScriptDir: scriptDir})
|
||||
|
||||
runner, err := interp.New(
|
||||
interp.Env(expand.ListEnviron(env...)), // Устанавливаем окружение
|
||||
interp.StdIO(os.Stdin, os.Stderr, os.Stderr), // Устанавливаем стандартный ввод-вывод
|
||||
interp.ExecHandler(helpers.Restricted.ExecHandler(handlers.NopExec)), // Ограничиваем выполнение
|
||||
interp.ReadDirHandler2(handlers.RestrictedReadDir(scriptDir)), // Ограничиваем чтение директорий
|
||||
interp.StatHandler(handlers.RestrictedStat(scriptDir)), // Ограничиваем доступ к статистике файлов
|
||||
interp.OpenHandler(handlers.RestrictedOpen(scriptDir)), // Ограничиваем открытие файлов
|
||||
interp.Dir(scriptDir),
|
||||
)
|
||||
func (s *ScriptFile) ParseBuildVars(ctx context.Context, info *distro.OSRelease, packages []string) (string, []*Package, error) {
|
||||
runner, err := s.createRunner(info)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
}
|
||||
|
||||
err = runner.Run(ctx, s.file) // Запускаем скрипт
|
||||
if err := runScript(ctx, runner, s.file); err != nil {
|
||||
return "", nil, err
|
||||
}
|
||||
|
||||
dec := newDecoder(info, runner)
|
||||
|
||||
pkgNames, err := ParseNames(dec)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
}
|
||||
|
||||
dec := decoder.New(info, runner) // Создаём новый декодер
|
||||
|
||||
type Packages struct {
|
||||
BasePkgName string `sh:"basepkg_name"`
|
||||
Names []string `sh:"name"`
|
||||
}
|
||||
|
||||
var pkgs Packages
|
||||
err = dec.DecodeVars(&pkgs)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
}
|
||||
|
||||
if len(pkgs.Names) == 0 {
|
||||
if len(pkgNames.Names) == 0 {
|
||||
return "", nil, errors.New("package name is missing")
|
||||
}
|
||||
|
||||
var vars types.BuildVars
|
||||
|
||||
if len(pkgs.Names) == 1 {
|
||||
err = dec.DecodeVars(&vars)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
}
|
||||
varsOfPackages = append(varsOfPackages, &vars)
|
||||
|
||||
return vars.Name, varsOfPackages, nil
|
||||
targetPackages := packages
|
||||
if len(targetPackages) == 0 {
|
||||
targetPackages = pkgNames.Names
|
||||
}
|
||||
|
||||
var pkgNames []string
|
||||
|
||||
if len(packages) != 0 {
|
||||
pkgNames = packages
|
||||
} else {
|
||||
pkgNames = pkgs.Names
|
||||
varsOfPackages, err := s.createPackagesForBuildVars(ctx, dec, pkgNames, targetPackages)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
}
|
||||
|
||||
for _, pkgName := range pkgNames {
|
||||
var preVars types.BuildVarsPre
|
||||
funcName := fmt.Sprintf("meta_%s", pkgName)
|
||||
meta, ok := dec.GetFuncWithSubshell(funcName)
|
||||
if !ok {
|
||||
return "", nil, fmt.Errorf("func %s is missing", funcName)
|
||||
}
|
||||
r, err := meta(ctx)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
}
|
||||
d := decoder.New(&distro.OSRelease{}, r)
|
||||
err = d.DecodeVars(&preVars)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
}
|
||||
vars := preVars.ToBuildVars()
|
||||
vars.Name = pkgName
|
||||
vars.Base = pkgs.BasePkgName
|
||||
|
||||
varsOfPackages = append(varsOfPackages, &vars)
|
||||
baseName := pkgNames.BasePkgName
|
||||
if len(pkgNames.Names) == 1 {
|
||||
baseName = pkgNames.Names[0]
|
||||
}
|
||||
|
||||
return pkgs.BasePkgName, varsOfPackages, nil
|
||||
return baseName, varsOfPackages, nil
|
||||
}
|
||||
|
||||
func (a *ALRSh) Path() string {
|
||||
func (s *ScriptFile) createRunner(info *distro.OSRelease) (*interp.Runner, error) {
|
||||
scriptDir := filepath.Dir(s.path)
|
||||
env := createBuildEnvVars(info, types.Directories{ScriptDir: scriptDir})
|
||||
|
||||
return interp.New(
|
||||
interp.Env(expand.ListEnviron(env...)),
|
||||
interp.StdIO(os.Stdin, os.Stderr, os.Stderr),
|
||||
interp.ExecHandler(helpers.Restricted.ExecHandler(handlers.NopExec)),
|
||||
interp.ReadDirHandler2(handlers.RestrictedReadDir(scriptDir)),
|
||||
interp.StatHandler(handlers.RestrictedStat(scriptDir)),
|
||||
interp.OpenHandler(handlers.RestrictedOpen(scriptDir)),
|
||||
interp.Dir(scriptDir),
|
||||
)
|
||||
}
|
||||
|
||||
func (s *ScriptFile) createPackagesForBuildVars(
|
||||
ctx context.Context,
|
||||
dec *decoder.Decoder,
|
||||
pkgNames *PackageNames,
|
||||
targetPackages []string,
|
||||
) ([]*Package, error) {
|
||||
var varsOfPackages []*Package
|
||||
|
||||
if len(pkgNames.Names) == 1 {
|
||||
var pkg Package
|
||||
pkg.Name = pkgNames.Names[0]
|
||||
if err := dec.DecodeVars(&pkg); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
varsOfPackages = append(varsOfPackages, &pkg)
|
||||
return varsOfPackages, nil
|
||||
}
|
||||
|
||||
for _, pkgName := range targetPackages {
|
||||
pkg, err := s.createPackageFromMeta(ctx, dec, pkgName, pkgNames.BasePkgName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
varsOfPackages = append(varsOfPackages, pkg)
|
||||
}
|
||||
|
||||
return varsOfPackages, nil
|
||||
}
|
||||
|
||||
func (s *ScriptFile) createPackageFromMeta(
|
||||
ctx context.Context,
|
||||
dec *decoder.Decoder,
|
||||
pkgName, basePkgName string,
|
||||
) (*Package, error) {
|
||||
funcName := fmt.Sprintf("meta_%s", pkgName)
|
||||
meta, ok := dec.GetFuncWithSubshell(funcName)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("func %s is missing", funcName)
|
||||
}
|
||||
|
||||
metaRunner, err := meta(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
metaDecoder := decoder.New(&distro.OSRelease{}, metaRunner)
|
||||
|
||||
var vars Package
|
||||
if err := metaDecoder.DecodeVars(&vars); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
vars.Name = pkgName
|
||||
vars.BasePkgName = basePkgName
|
||||
|
||||
return &vars, nil
|
||||
}
|
||||
|
||||
func runScript(ctx context.Context, runner *interp.Runner, fl *syntax.File) error {
|
||||
runner.Reset()
|
||||
return runner.Run(ctx, fl)
|
||||
}
|
||||
|
||||
func newDecoder(info *distro.OSRelease, runner *interp.Runner) *decoder.Decoder {
|
||||
d := decoder.New(info, runner)
|
||||
// d.Overrides = false
|
||||
// d.LikeDistros = false
|
||||
return d
|
||||
}
|
||||
|
||||
func (a *ScriptFile) Path() string {
|
||||
return a.path
|
||||
}
|
||||
|
||||
func (a *ALRSh) File() *syntax.File {
|
||||
func (a *ScriptFile) File() *syntax.File {
|
||||
return a.file
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user