forked from Plemya-x/ALR
		
	feat: add support for multiple packages in one alr.sh
This commit is contained in:
		
							
								
								
									
										1086
									
								
								pkg/build/build.go
									
									
									
									
									
								
							
							
						
						
									
										1086
									
								
								pkg/build/build.go
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -18,10 +18,18 @@ package build
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"context"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"os"
 | 
			
		||||
	"strings"
 | 
			
		||||
	"testing"
 | 
			
		||||
 | 
			
		||||
	"github.com/stretchr/testify/assert"
 | 
			
		||||
	"mvdan.cc/sh/v3/syntax"
 | 
			
		||||
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
@@ -134,93 +142,145 @@ func (m *TestManager) IsInstalled(pkg string) (bool, error) {
 | 
			
		||||
	return true, nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// TODO: fix test
 | 
			
		||||
func TestInstallBuildDeps(t *testing.T) {
 | 
			
		||||
	type testEnv struct {
 | 
			
		||||
		pf   PackageFinder
 | 
			
		||||
		vars *types.BuildVars
 | 
			
		||||
		opts types.BuildOpts
 | 
			
		||||
type TestConfig struct{}
 | 
			
		||||
 | 
			
		||||
		// Contains pkgs captured by FindPkgsFunc
 | 
			
		||||
		// capturedPkgs []string
 | 
			
		||||
func (c *TestConfig) PagerStyle(ctx context.Context) string {
 | 
			
		||||
	return "native"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (c *TestConfig) GetPaths(ctx context.Context) *config.Paths {
 | 
			
		||||
	return &config.Paths{
 | 
			
		||||
		CacheDir: "/tmp",
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestExecuteFirstPassIsSecure(t *testing.T) {
 | 
			
		||||
	cfg := &TestConfig{}
 | 
			
		||||
	pf := &TestPackageFinder{}
 | 
			
		||||
	info := &distro.OSRelease{}
 | 
			
		||||
	m := &TestManager{}
 | 
			
		||||
 | 
			
		||||
	opts := types.BuildOpts{
 | 
			
		||||
		Manager:     m,
 | 
			
		||||
		Interactive: false,
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ctx := context.Background()
 | 
			
		||||
 | 
			
		||||
	b := NewBuilder(
 | 
			
		||||
		ctx,
 | 
			
		||||
		opts,
 | 
			
		||||
		pf,
 | 
			
		||||
		info,
 | 
			
		||||
		cfg,
 | 
			
		||||
	)
 | 
			
		||||
 | 
			
		||||
	tmpFile, err := os.CreateTemp("", "testfile-")
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
	tmpFilePath := tmpFile.Name()
 | 
			
		||||
	defer os.Remove(tmpFilePath)
 | 
			
		||||
 | 
			
		||||
	_, err = os.Stat(tmpFilePath)
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
 | 
			
		||||
	testScript := fmt.Sprintf(`name='test'
 | 
			
		||||
version=1.0.0
 | 
			
		||||
release=1
 | 
			
		||||
rm -f %s`, tmpFilePath)
 | 
			
		||||
 | 
			
		||||
	fl, err := syntax.NewParser().Parse(strings.NewReader(testScript), "alr.sh")
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
 | 
			
		||||
	_, _, err = b.executeFirstPass(fl)
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
 | 
			
		||||
	_, err = os.Stat(tmpFilePath)
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestExecuteFirstPassIsCorrect(t *testing.T) {
 | 
			
		||||
	type testCase struct {
 | 
			
		||||
		Name     string
 | 
			
		||||
		Prepare  func() *testEnv
 | 
			
		||||
		Expected func(t *testing.T, e *testEnv, res []string, err error)
 | 
			
		||||
		Script   string
 | 
			
		||||
		Opts     types.BuildOpts
 | 
			
		||||
		Expected func(t *testing.T, vars []*types.BuildVars)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for _, tc := range []testCase{
 | 
			
		||||
		/*
 | 
			
		||||
			{
 | 
			
		||||
				Name: "install only needed deps",
 | 
			
		||||
				Prepare: func() *testEnv {
 | 
			
		||||
					pf := TestPackageFinder{}
 | 
			
		||||
					vars := types.BuildVars{}
 | 
			
		||||
					m := TestManager{}
 | 
			
		||||
					opts := types.BuildOpts{
 | 
			
		||||
						Manager:     &m,
 | 
			
		||||
						Interactive: false,
 | 
			
		||||
					}
 | 
			
		||||
	for _, tc := range []testCase{{
 | 
			
		||||
		Name: "single package",
 | 
			
		||||
		Script: `name='test'
 | 
			
		||||
version='1.0.0'
 | 
			
		||||
release=1
 | 
			
		||||
epoch=2
 | 
			
		||||
desc="Test package"
 | 
			
		||||
homepage='https://example.com'
 | 
			
		||||
maintainer='Ivan Ivanov'
 | 
			
		||||
`,
 | 
			
		||||
		Opts: types.BuildOpts{
 | 
			
		||||
			Manager:     &TestManager{},
 | 
			
		||||
			Interactive: false,
 | 
			
		||||
		},
 | 
			
		||||
		Expected: func(t *testing.T, vars []*types.BuildVars) {
 | 
			
		||||
			assert.Equal(t, 1, len(vars))
 | 
			
		||||
			assert.Equal(t, vars[0].Name, "test")
 | 
			
		||||
			assert.Equal(t, vars[0].Version, "1.0.0")
 | 
			
		||||
			assert.Equal(t, vars[0].Release, int(1))
 | 
			
		||||
			assert.Equal(t, vars[0].Epoch, uint(2))
 | 
			
		||||
			assert.Equal(t, vars[0].Description, "Test package")
 | 
			
		||||
		},
 | 
			
		||||
	}, {
 | 
			
		||||
		Name: "multiple packages",
 | 
			
		||||
		Script: `name=(
 | 
			
		||||
	foo
 | 
			
		||||
	bar
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
					env := &testEnv{
 | 
			
		||||
						pf:           &pf,
 | 
			
		||||
						vars:         &vars,
 | 
			
		||||
						opts:         opts,
 | 
			
		||||
						capturedPkgs: []string{},
 | 
			
		||||
					}
 | 
			
		||||
version='0.0.1'
 | 
			
		||||
release=1
 | 
			
		||||
epoch=2
 | 
			
		||||
desc="Test package"
 | 
			
		||||
 | 
			
		||||
					pf.FindPkgsFunc = func(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
 | 
			
		||||
						env.capturedPkgs = append(env.capturedPkgs, pkgs...)
 | 
			
		||||
						result := make(map[string][]db.Package)
 | 
			
		||||
						result["bar"] = []db.Package{{
 | 
			
		||||
							Name: "bar-pkg",
 | 
			
		||||
						}}
 | 
			
		||||
						result["buz"] = []db.Package{{
 | 
			
		||||
							Name: "buz-pkg",
 | 
			
		||||
						}}
 | 
			
		||||
meta_foo() {
 | 
			
		||||
	desc="Foo package"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
						return result, []string{}, nil
 | 
			
		||||
					}
 | 
			
		||||
meta_bar() {
 | 
			
		||||
 | 
			
		||||
					vars.BuildDepends = []string{
 | 
			
		||||
						"foo",
 | 
			
		||||
						"bar",
 | 
			
		||||
						"buz",
 | 
			
		||||
					}
 | 
			
		||||
					m.IsInstalledFunc = func(pkg string) (bool, error) {
 | 
			
		||||
						if pkg == "foo" {
 | 
			
		||||
							return true, nil
 | 
			
		||||
						} else {
 | 
			
		||||
							return false, nil
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
}
 | 
			
		||||
`,
 | 
			
		||||
		Opts: types.BuildOpts{
 | 
			
		||||
			Packages:    []string{"foo"},
 | 
			
		||||
			Manager:     &TestManager{},
 | 
			
		||||
			Interactive: false,
 | 
			
		||||
		},
 | 
			
		||||
		Expected: func(t *testing.T, vars []*types.BuildVars) {
 | 
			
		||||
			assert.Equal(t, 1, len(vars))
 | 
			
		||||
			assert.Equal(t, vars[0].Name, "foo")
 | 
			
		||||
			assert.Equal(t, vars[0].Description, "Foo package")
 | 
			
		||||
		},
 | 
			
		||||
	}} {
 | 
			
		||||
		t.Run(tc.Name, func(t *testing.T) {
 | 
			
		||||
			cfg := &TestConfig{}
 | 
			
		||||
			pf := &TestPackageFinder{}
 | 
			
		||||
			info := &distro.OSRelease{}
 | 
			
		||||
 | 
			
		||||
					return env
 | 
			
		||||
				},
 | 
			
		||||
				Expected: func(t *testing.T, e *testEnv, res []string, err error) {
 | 
			
		||||
					assert.NoError(t, err)
 | 
			
		||||
					assert.Len(t, res, 2)
 | 
			
		||||
					assert.ElementsMatch(t, res, []string{"bar-pkg", "buz-pkg"})
 | 
			
		||||
 | 
			
		||||
					assert.ElementsMatch(t, e.capturedPkgs, []string{"bar", "buz"})
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
		*/
 | 
			
		||||
	} {
 | 
			
		||||
		t.Run(tc.Name, func(tt *testing.T) {
 | 
			
		||||
			ctx := context.Background()
 | 
			
		||||
			env := tc.Prepare()
 | 
			
		||||
 | 
			
		||||
			result, err := installBuildDeps(
 | 
			
		||||
			b := NewBuilder(
 | 
			
		||||
				ctx,
 | 
			
		||||
				env.pf,
 | 
			
		||||
				env.vars,
 | 
			
		||||
				env.opts,
 | 
			
		||||
				tc.Opts,
 | 
			
		||||
				pf,
 | 
			
		||||
				info,
 | 
			
		||||
				cfg,
 | 
			
		||||
			)
 | 
			
		||||
 | 
			
		||||
			tc.Expected(tt, env, result, err)
 | 
			
		||||
			fl, err := syntax.NewParser().Parse(strings.NewReader(tc.Script), "alr.sh")
 | 
			
		||||
			assert.NoError(t, err)
 | 
			
		||||
 | 
			
		||||
			_, allVars, err := b.executeFirstPass(fl)
 | 
			
		||||
			assert.NoError(t, err)
 | 
			
		||||
 | 
			
		||||
			tc.Expected(t, allVars)
 | 
			
		||||
		})
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,84 +0,0 @@
 | 
			
		||||
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
 | 
			
		||||
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
 | 
			
		||||
//
 | 
			
		||||
// ALR - Any Linux Repository
 | 
			
		||||
// Copyright (C) 2025 Евгений Храмов
 | 
			
		||||
//
 | 
			
		||||
// This program is free software: you can redistribute it and/or modify
 | 
			
		||||
// it under the terms of the GNU General Public License as published by
 | 
			
		||||
// the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
// (at your option) any later version.
 | 
			
		||||
//
 | 
			
		||||
// This program is distributed in the hope that it will be useful,
 | 
			
		||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
// GNU General Public License for more details.
 | 
			
		||||
//
 | 
			
		||||
// You should have received a copy of the GNU General Public License
 | 
			
		||||
// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 | 
			
		||||
package build
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"context"
 | 
			
		||||
	"log/slog"
 | 
			
		||||
	"os"
 | 
			
		||||
	"path/filepath"
 | 
			
		||||
 | 
			
		||||
	"github.com/leonelquinteros/gotext"
 | 
			
		||||
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// InstallPkgs устанавливает нативные пакеты с использованием менеджера пакетов,
 | 
			
		||||
// затем строит и устанавливает пакеты ALR
 | 
			
		||||
func InstallPkgs(ctx context.Context, alrPkgs []db.Package, nativePkgs []string, opts types.BuildOpts) {
 | 
			
		||||
	if len(nativePkgs) > 0 {
 | 
			
		||||
		err := opts.Manager.Install(nil, nativePkgs...)
 | 
			
		||||
		// Если есть нативные пакеты, выполняем их установку
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			slog.Error(gotext.Get("Error installing native packages"), "err", err)
 | 
			
		||||
			os.Exit(1)
 | 
			
		||||
			// Логируем и завершаем выполнение при ошибке
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	InstallScripts(ctx, GetScriptPaths(ctx, alrPkgs), opts)
 | 
			
		||||
	// Устанавливаем скрипты сборки через функцию InstallScripts
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// GetScriptPaths возвращает срез путей к скриптам, соответствующий
 | 
			
		||||
// данным пакетам
 | 
			
		||||
func GetScriptPaths(ctx context.Context, pkgs []db.Package) []string {
 | 
			
		||||
	var scripts []string
 | 
			
		||||
	for _, pkg := range pkgs {
 | 
			
		||||
		// Для каждого пакета создаем путь к скрипту сборки
 | 
			
		||||
		scriptPath := filepath.Join(config.GetPaths(ctx).RepoDir, pkg.Repository, pkg.Name, "alr.sh")
 | 
			
		||||
		scripts = append(scripts, scriptPath)
 | 
			
		||||
	}
 | 
			
		||||
	return scripts
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// InstallScripts строит и устанавливает переданные alr скрипты сборки
 | 
			
		||||
func InstallScripts(ctx context.Context, scripts []string, opts types.BuildOpts) {
 | 
			
		||||
	for _, script := range scripts {
 | 
			
		||||
		opts.Script = script // Устанавливаем текущий скрипт в опции
 | 
			
		||||
		builtPkgs, _, err := BuildPackage(ctx, opts)
 | 
			
		||||
		// Выполняем сборку пакета
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			slog.Error(gotext.Get("Error building package"), "err", err)
 | 
			
		||||
			os.Exit(1)
 | 
			
		||||
			// Логируем и завершаем выполнение при ошибке сборки
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		err = opts.Manager.InstallLocal(nil, builtPkgs...)
 | 
			
		||||
		// Устанавливаем локально собранные пакеты
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			slog.Error(gotext.Get("Error installing package"), "err", err)
 | 
			
		||||
			os.Exit(1)
 | 
			
		||||
			// Логируем и завершаем выполнение при ошибке установки
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										423
									
								
								pkg/build/utils.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										423
									
								
								pkg/build/utils.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,423 @@
 | 
			
		||||
// ALR - Any Linux Repository
 | 
			
		||||
// Copyright (C) 2025 Евгений Храмов
 | 
			
		||||
//
 | 
			
		||||
// This program is free software: you can redistribute it and/or modify
 | 
			
		||||
// it under the terms of the GNU General Public License as published by
 | 
			
		||||
// the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
// (at your option) any later version.
 | 
			
		||||
//
 | 
			
		||||
// This program is distributed in the hope that it will be useful,
 | 
			
		||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
// GNU General Public License for more details.
 | 
			
		||||
//
 | 
			
		||||
// You should have received a copy of the GNU General Public License
 | 
			
		||||
// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 | 
			
		||||
package build
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"context"
 | 
			
		||||
	"io"
 | 
			
		||||
	"log/slog"
 | 
			
		||||
	"os"
 | 
			
		||||
	"path/filepath"
 | 
			
		||||
	"runtime"
 | 
			
		||||
	"slices"
 | 
			
		||||
	"strconv"
 | 
			
		||||
	"strings"
 | 
			
		||||
 | 
			
		||||
	// Импортируем пакеты для поддержки различных форматов пакетов (APK, DEB, RPM и ARCH).
 | 
			
		||||
 | 
			
		||||
	_ "github.com/goreleaser/nfpm/v2/apk"
 | 
			
		||||
	_ "github.com/goreleaser/nfpm/v2/arch"
 | 
			
		||||
	_ "github.com/goreleaser/nfpm/v2/deb"
 | 
			
		||||
	_ "github.com/goreleaser/nfpm/v2/rpm"
 | 
			
		||||
	"github.com/leonelquinteros/gotext"
 | 
			
		||||
	"mvdan.cc/sh/v3/syntax"
 | 
			
		||||
 | 
			
		||||
	"github.com/goreleaser/nfpm/v2"
 | 
			
		||||
	"github.com/goreleaser/nfpm/v2/files"
 | 
			
		||||
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// Функция readScript анализирует скрипт сборки с использованием встроенной реализации bash
 | 
			
		||||
func readScript(script string) (*syntax.File, error) {
 | 
			
		||||
	fl, err := os.Open(script) // Открываем файл скрипта
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return nil, err
 | 
			
		||||
	}
 | 
			
		||||
	defer fl.Close() // Закрываем файл после выполнения
 | 
			
		||||
 | 
			
		||||
	file, err := syntax.NewParser().Parse(fl, "alr.sh") // Парсим скрипт с помощью синтаксического анализатора
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return nil, err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return file, nil // Возвращаем синтаксическое дерево
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Функция prepareDirs подготавливает директории для сборки.
 | 
			
		||||
func prepareDirs(dirs types.Directories) error {
 | 
			
		||||
	err := os.RemoveAll(dirs.BaseDir) // Удаляем базовую директорию, если она существует
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	err = os.MkdirAll(dirs.SrcDir, 0o755) // Создаем директорию для источников
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	return os.MkdirAll(dirs.PkgDir, 0o755) // Создаем директорию для пакетов
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Функция buildPkgMetadata создает метаданные для пакета, который будет собран.
 | 
			
		||||
func buildPkgMetadata(
 | 
			
		||||
	ctx context.Context,
 | 
			
		||||
	vars *types.BuildVars,
 | 
			
		||||
	dirs types.Directories,
 | 
			
		||||
	pkgFormat string,
 | 
			
		||||
	info *distro.OSRelease,
 | 
			
		||||
	deps []string,
 | 
			
		||||
	preferedContents *[]string,
 | 
			
		||||
) (*nfpm.Info, error) {
 | 
			
		||||
	pkgInfo := getBasePkgInfo(vars, info)
 | 
			
		||||
	pkgInfo.Description = vars.Description
 | 
			
		||||
	pkgInfo.Platform = "linux"
 | 
			
		||||
	pkgInfo.Homepage = vars.Homepage
 | 
			
		||||
	pkgInfo.License = strings.Join(vars.Licenses, ", ")
 | 
			
		||||
	pkgInfo.Maintainer = vars.Maintainer
 | 
			
		||||
	pkgInfo.Overridables = nfpm.Overridables{
 | 
			
		||||
		Conflicts: vars.Conflicts,
 | 
			
		||||
		Replaces:  vars.Replaces,
 | 
			
		||||
		Provides:  vars.Provides,
 | 
			
		||||
		Depends:   deps,
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if pkgFormat == "apk" {
 | 
			
		||||
		// Alpine отказывается устанавливать пакеты, которые предоставляют сами себя, поэтому удаляем такие элементы
 | 
			
		||||
		pkgInfo.Overridables.Provides = slices.DeleteFunc(pkgInfo.Overridables.Provides, func(s string) bool {
 | 
			
		||||
			return s == pkgInfo.Name
 | 
			
		||||
		})
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if vars.Epoch != 0 {
 | 
			
		||||
		pkgInfo.Epoch = strconv.FormatUint(uint64(vars.Epoch), 10)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	setScripts(vars, pkgInfo, dirs.ScriptDir)
 | 
			
		||||
 | 
			
		||||
	if slices.Contains(vars.Architectures, "all") {
 | 
			
		||||
		pkgInfo.Arch = "all"
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	contents, err := buildContents(vars, dirs, preferedContents)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return nil, err
 | 
			
		||||
	}
 | 
			
		||||
	pkgInfo.Overridables.Contents = contents
 | 
			
		||||
 | 
			
		||||
	if len(vars.AutoProv) == 1 && decoder.IsTruthy(vars.AutoProv[0]) {
 | 
			
		||||
		if pkgFormat == "rpm" {
 | 
			
		||||
			err = rpmFindProvides(ctx, pkgInfo, dirs)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return nil, err
 | 
			
		||||
			}
 | 
			
		||||
		} else {
 | 
			
		||||
			slog.Info(gotext.Get("AutoProv is not implemented for this package format, so it's skipped"))
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if len(vars.AutoReq) == 1 && decoder.IsTruthy(vars.AutoReq[0]) {
 | 
			
		||||
		if pkgFormat == "rpm" {
 | 
			
		||||
			err = rpmFindRequires(ctx, pkgInfo, dirs)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return nil, err
 | 
			
		||||
			}
 | 
			
		||||
		} else {
 | 
			
		||||
			slog.Info(gotext.Get("AutoReq is not implemented for this package format, so it's skipped"))
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return pkgInfo, nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Функция buildContents создает секцию содержимого пакета, которая содержит файлы,
 | 
			
		||||
// которые будут включены в конечный пакет.
 | 
			
		||||
func buildContents(vars *types.BuildVars, dirs types.Directories, preferedContents *[]string) ([]*files.Content, error) {
 | 
			
		||||
	contents := []*files.Content{}
 | 
			
		||||
 | 
			
		||||
	processPath := func(path, trimmed string, prefered bool) error {
 | 
			
		||||
		fi, err := os.Lstat(path)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if fi.IsDir() {
 | 
			
		||||
			f, err := os.Open(path)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
			defer f.Close()
 | 
			
		||||
 | 
			
		||||
			if !prefered {
 | 
			
		||||
				_, err = f.Readdirnames(1)
 | 
			
		||||
				if err != io.EOF {
 | 
			
		||||
					return nil
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			contents = append(contents, &files.Content{
 | 
			
		||||
				Source:      path,
 | 
			
		||||
				Destination: trimmed,
 | 
			
		||||
				Type:        "dir",
 | 
			
		||||
				FileInfo: &files.ContentFileInfo{
 | 
			
		||||
					MTime: fi.ModTime(),
 | 
			
		||||
				},
 | 
			
		||||
			})
 | 
			
		||||
			return nil
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if fi.Mode()&os.ModeSymlink != 0 {
 | 
			
		||||
			link, err := os.Readlink(path)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
			link = strings.TrimPrefix(link, dirs.PkgDir)
 | 
			
		||||
 | 
			
		||||
			contents = append(contents, &files.Content{
 | 
			
		||||
				Source:      link,
 | 
			
		||||
				Destination: trimmed,
 | 
			
		||||
				Type:        "symlink",
 | 
			
		||||
				FileInfo: &files.ContentFileInfo{
 | 
			
		||||
					MTime: fi.ModTime(),
 | 
			
		||||
					Mode:  fi.Mode(),
 | 
			
		||||
				},
 | 
			
		||||
			})
 | 
			
		||||
			return nil
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		fileContent := &files.Content{
 | 
			
		||||
			Source:      path,
 | 
			
		||||
			Destination: trimmed,
 | 
			
		||||
			FileInfo: &files.ContentFileInfo{
 | 
			
		||||
				MTime: fi.ModTime(),
 | 
			
		||||
				Mode:  fi.Mode(),
 | 
			
		||||
				Size:  fi.Size(),
 | 
			
		||||
			},
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if slices.Contains(vars.Backup, trimmed) {
 | 
			
		||||
			fileContent.Type = "config|noreplace"
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		contents = append(contents, fileContent)
 | 
			
		||||
		return nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if preferedContents != nil {
 | 
			
		||||
		for _, trimmed := range *preferedContents {
 | 
			
		||||
			path := filepath.Join(dirs.PkgDir, trimmed)
 | 
			
		||||
			if err := processPath(path, trimmed, true); err != nil {
 | 
			
		||||
				return nil, err
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	} else {
 | 
			
		||||
		err := filepath.Walk(dirs.PkgDir, func(path string, fi os.FileInfo, err error) error {
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
			trimmed := strings.TrimPrefix(path, dirs.PkgDir)
 | 
			
		||||
			return processPath(path, trimmed, false)
 | 
			
		||||
		})
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return nil, err
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return contents, nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Функция checkForBuiltPackage пытается обнаружить ранее собранный пакет и вернуть его путь
 | 
			
		||||
// и true, если нашла. Если нет, возвратит "", false, nil.
 | 
			
		||||
func checkForBuiltPackage(
 | 
			
		||||
	mgr manager.Manager,
 | 
			
		||||
	vars *types.BuildVars,
 | 
			
		||||
	pkgFormat,
 | 
			
		||||
	baseDir string,
 | 
			
		||||
	info *distro.OSRelease,
 | 
			
		||||
) (string, bool, error) {
 | 
			
		||||
	filename, err := pkgFileName(vars, pkgFormat, info)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return "", false, err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	pkgPath := filepath.Join(baseDir, filename)
 | 
			
		||||
 | 
			
		||||
	_, err = os.Stat(pkgPath)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return "", false, nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return pkgPath, true, nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func getBasePkgInfo(vars *types.BuildVars, info *distro.OSRelease) *nfpm.Info {
 | 
			
		||||
	return &nfpm.Info{
 | 
			
		||||
		Name:    vars.Name,
 | 
			
		||||
		Arch:    cpu.Arch(),
 | 
			
		||||
		Version: vars.Version,
 | 
			
		||||
		Release: overrides.ReleasePlatformSpecific(vars.Release, info),
 | 
			
		||||
		Epoch:   strconv.FormatUint(uint64(vars.Epoch), 10),
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// pkgFileName returns the filename of the package if it were to be built.
 | 
			
		||||
// This is used to check if the package has already been built.
 | 
			
		||||
func pkgFileName(vars *types.BuildVars, pkgFormat string, info *distro.OSRelease) (string, error) {
 | 
			
		||||
	pkgInfo := getBasePkgInfo(vars, info)
 | 
			
		||||
 | 
			
		||||
	packager, err := nfpm.Get(pkgFormat)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return "", err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return packager.ConventionalFileName(pkgInfo), nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Функция getPkgFormat возвращает формат пакета из менеджера пакетов,
 | 
			
		||||
// или ALR_PKG_FORMAT, если он установлен.
 | 
			
		||||
func getPkgFormat(mgr manager.Manager) string {
 | 
			
		||||
	pkgFormat := mgr.Format()
 | 
			
		||||
	if format, ok := os.LookupEnv("ALR_PKG_FORMAT"); ok {
 | 
			
		||||
		pkgFormat = format
 | 
			
		||||
	}
 | 
			
		||||
	return pkgFormat
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Функция createBuildEnvVars создает переменные окружения, которые будут установлены
 | 
			
		||||
// в скрипте сборки при его выполнении.
 | 
			
		||||
func createBuildEnvVars(info *distro.OSRelease, dirs types.Directories) []string {
 | 
			
		||||
	env := os.Environ()
 | 
			
		||||
 | 
			
		||||
	env = append(
 | 
			
		||||
		env,
 | 
			
		||||
		"DISTRO_NAME="+info.Name,
 | 
			
		||||
		"DISTRO_PRETTY_NAME="+info.PrettyName,
 | 
			
		||||
		"DISTRO_ID="+info.ID,
 | 
			
		||||
		"DISTRO_VERSION_ID="+info.VersionID,
 | 
			
		||||
		"DISTRO_ID_LIKE="+strings.Join(info.Like, " "),
 | 
			
		||||
		"ARCH="+cpu.Arch(),
 | 
			
		||||
		"NCPU="+strconv.Itoa(runtime.NumCPU()),
 | 
			
		||||
	)
 | 
			
		||||
 | 
			
		||||
	if dirs.ScriptDir != "" {
 | 
			
		||||
		env = append(env, "scriptdir="+dirs.ScriptDir)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if dirs.PkgDir != "" {
 | 
			
		||||
		env = append(env, "pkgdir="+dirs.PkgDir)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if dirs.SrcDir != "" {
 | 
			
		||||
		env = append(env, "srcdir="+dirs.SrcDir)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return env
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Функция setScripts добавляет скрипты-перехватчики к метаданным пакета.
 | 
			
		||||
func setScripts(vars *types.BuildVars, info *nfpm.Info, scriptDir string) {
 | 
			
		||||
	if vars.Scripts.PreInstall != "" {
 | 
			
		||||
		info.Scripts.PreInstall = filepath.Join(scriptDir, vars.Scripts.PreInstall)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if vars.Scripts.PostInstall != "" {
 | 
			
		||||
		info.Scripts.PostInstall = filepath.Join(scriptDir, vars.Scripts.PostInstall)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if vars.Scripts.PreRemove != "" {
 | 
			
		||||
		info.Scripts.PreRemove = filepath.Join(scriptDir, vars.Scripts.PreRemove)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if vars.Scripts.PostRemove != "" {
 | 
			
		||||
		info.Scripts.PostRemove = filepath.Join(scriptDir, vars.Scripts.PostRemove)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if vars.Scripts.PreUpgrade != "" {
 | 
			
		||||
		info.ArchLinux.Scripts.PreUpgrade = filepath.Join(scriptDir, vars.Scripts.PreUpgrade)
 | 
			
		||||
		info.APK.Scripts.PreUpgrade = filepath.Join(scriptDir, vars.Scripts.PreUpgrade)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if vars.Scripts.PostUpgrade != "" {
 | 
			
		||||
		info.ArchLinux.Scripts.PostUpgrade = filepath.Join(scriptDir, vars.Scripts.PostUpgrade)
 | 
			
		||||
		info.APK.Scripts.PostUpgrade = filepath.Join(scriptDir, vars.Scripts.PostUpgrade)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if vars.Scripts.PreTrans != "" {
 | 
			
		||||
		info.RPM.Scripts.PreTrans = filepath.Join(scriptDir, vars.Scripts.PreTrans)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if vars.Scripts.PostTrans != "" {
 | 
			
		||||
		info.RPM.Scripts.PostTrans = filepath.Join(scriptDir, vars.Scripts.PostTrans)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
// Функция setVersion изменяет переменную версии в скрипте runner.
 | 
			
		||||
// Она используется для установки версии на вывод функции version().
 | 
			
		||||
func setVersion(ctx context.Context, r *interp.Runner, to string) error {
 | 
			
		||||
	fl, err := syntax.NewParser().Parse(strings.NewReader("version='"+to+"'"), "")
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	return r.Run(ctx, fl)
 | 
			
		||||
}
 | 
			
		||||
*/
 | 
			
		||||
// Returns not installed dependencies
 | 
			
		||||
func removeAlreadyInstalled(opts types.BuildOpts, dependencies []string) ([]string, error) {
 | 
			
		||||
	filteredPackages := []string{}
 | 
			
		||||
 | 
			
		||||
	for _, dep := range dependencies {
 | 
			
		||||
		installed, err := opts.Manager.IsInstalled(dep)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return nil, err
 | 
			
		||||
		}
 | 
			
		||||
		if installed {
 | 
			
		||||
			continue
 | 
			
		||||
		}
 | 
			
		||||
		filteredPackages = append(filteredPackages, dep)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return filteredPackages, nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Функция packageNames возвращает имена всех предоставленных пакетов.
 | 
			
		||||
func packageNames(pkgs []db.Package) []string {
 | 
			
		||||
	names := make([]string, len(pkgs))
 | 
			
		||||
	for i, p := range pkgs {
 | 
			
		||||
		names[i] = p.Name
 | 
			
		||||
	}
 | 
			
		||||
	return names
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Функция removeDuplicates убирает любые дубликаты из предоставленного среза.
 | 
			
		||||
func removeDuplicates(slice []string) []string {
 | 
			
		||||
	seen := map[string]struct{}{}
 | 
			
		||||
	result := []string{}
 | 
			
		||||
 | 
			
		||||
	for _, s := range slice {
 | 
			
		||||
		if _, ok := seen[s]; !ok {
 | 
			
		||||
			seen[s] = struct{}{}
 | 
			
		||||
			result = append(result, s)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return result
 | 
			
		||||
}
 | 
			
		||||
@@ -22,6 +22,8 @@ package repos
 | 
			
		||||
import (
 | 
			
		||||
	"context"
 | 
			
		||||
	"errors"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"io"
 | 
			
		||||
	"log/slog"
 | 
			
		||||
	"net/url"
 | 
			
		||||
	"os"
 | 
			
		||||
@@ -41,8 +43,10 @@ import (
 | 
			
		||||
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
type actionType uint8
 | 
			
		||||
@@ -177,6 +181,96 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (rs *Repos) updatePkg(ctx context.Context, repo types.Repo, runner *interp.Runner, scriptFl io.ReadCloser) error {
 | 
			
		||||
	parser := syntax.NewParser()
 | 
			
		||||
 | 
			
		||||
	defer scriptFl.Close()
 | 
			
		||||
	fl, err := parser.Parse(scriptFl, "alr.sh")
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	runner.Reset()
 | 
			
		||||
	err = runner.Run(ctx, fl)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	type packages struct {
 | 
			
		||||
		BasePkgName string   `sh:"basepkg_name"`
 | 
			
		||||
		Names       []string `sh:"name"`
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	var pkgs packages
 | 
			
		||||
 | 
			
		||||
	d := decoder.New(&distro.OSRelease{}, runner)
 | 
			
		||||
	d.Overrides = false
 | 
			
		||||
	d.LikeDistros = false
 | 
			
		||||
	err = d.DecodeVars(&pkgs)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if len(pkgs.Names) > 1 {
 | 
			
		||||
		if pkgs.BasePkgName == "" {
 | 
			
		||||
			pkgs.BasePkgName = pkgs.Names[0]
 | 
			
		||||
		}
 | 
			
		||||
		for _, pkgName := range pkgs.Names {
 | 
			
		||||
			pkgInfo := PackageInfo{}
 | 
			
		||||
			funcName := fmt.Sprintf("meta_%s", pkgName)
 | 
			
		||||
			runner.Reset()
 | 
			
		||||
			err = runner.Run(ctx, fl)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
			meta, ok := d.GetFuncWithSubshell(funcName)
 | 
			
		||||
			if !ok {
 | 
			
		||||
				return errors.New("func is missing")
 | 
			
		||||
			}
 | 
			
		||||
			r, err := meta(ctx)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
			d := decoder.New(&distro.OSRelease{}, r)
 | 
			
		||||
			d.Overrides = false
 | 
			
		||||
			d.LikeDistros = false
 | 
			
		||||
			err = d.DecodeVars(&pkgInfo)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
			pkg := pkgInfo.ToPackage(repo.Name)
 | 
			
		||||
			resolveOverrides(r, pkg)
 | 
			
		||||
			pkg.Name = pkgName
 | 
			
		||||
			pkg.BasePkgName = pkgs.BasePkgName
 | 
			
		||||
			err = rs.db.InsertPackage(ctx, *pkg)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		return nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	pkg := EmptyPackage(repo.Name)
 | 
			
		||||
	err = d.DecodeVars(pkg)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	resolveOverrides(runner, pkg)
 | 
			
		||||
	return rs.db.InsertPackage(ctx, *pkg)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (rs *Repos) processRepoChangesRunner(repoDir, scriptDir string) (*interp.Runner, error) {
 | 
			
		||||
	env := append(os.Environ(), "scriptdir="+scriptDir)
 | 
			
		||||
	return interp.New(
 | 
			
		||||
		interp.Env(expand.ListEnviron(env...)),
 | 
			
		||||
		interp.ExecHandler(handlers.NopExec),
 | 
			
		||||
		interp.ReadDirHandler(handlers.RestrictedReadDir(repoDir)),
 | 
			
		||||
		interp.StatHandler(handlers.RestrictedStat(repoDir)),
 | 
			
		||||
		interp.OpenHandler(handlers.RestrictedOpen(repoDir)),
 | 
			
		||||
		interp.StdIO(handlers.NopRWC{}, handlers.NopRWC{}, handlers.NopRWC{}),
 | 
			
		||||
	)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (rs *Repos) processRepoChanges(ctx context.Context, repo types.Repo, r *git.Repository, w *git.Worktree, old, new *plumbing.Reference) error {
 | 
			
		||||
	oldCommit, err := r.CommitObject(old.Hash())
 | 
			
		||||
	if err != nil {
 | 
			
		||||
@@ -235,15 +329,7 @@ func (rs *Repos) processRepoChanges(ctx context.Context, repo types.Repo, r *git
 | 
			
		||||
	parser := syntax.NewParser()
 | 
			
		||||
 | 
			
		||||
	for _, action := range actions {
 | 
			
		||||
		env := append(os.Environ(), "scriptdir="+filepath.Dir(filepath.Join(repoDir, action.File)))
 | 
			
		||||
		runner, err := interp.New(
 | 
			
		||||
			interp.Env(expand.ListEnviron(env...)),
 | 
			
		||||
			interp.ExecHandler(handlers.NopExec),
 | 
			
		||||
			interp.ReadDirHandler(handlers.RestrictedReadDir(repoDir)),
 | 
			
		||||
			interp.StatHandler(handlers.RestrictedStat(repoDir)),
 | 
			
		||||
			interp.OpenHandler(handlers.RestrictedOpen(repoDir)),
 | 
			
		||||
			interp.StdIO(handlers.NopRWC{}, handlers.NopRWC{}, handlers.NopRWC{}),
 | 
			
		||||
		)
 | 
			
		||||
		runner, err := rs.processRepoChangesRunner(repoDir, filepath.Dir(filepath.Join(repoDir, action.File)))
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
@@ -289,23 +375,7 @@ func (rs *Repos) processRepoChanges(ctx context.Context, repo types.Repo, r *git
 | 
			
		||||
				return nil
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			pkg := db.Package{
 | 
			
		||||
				Description:  db.NewJSON(map[string]string{}),
 | 
			
		||||
				Homepage:     db.NewJSON(map[string]string{}),
 | 
			
		||||
				Maintainer:   db.NewJSON(map[string]string{}),
 | 
			
		||||
				Depends:      db.NewJSON(map[string][]string{}),
 | 
			
		||||
				BuildDepends: db.NewJSON(map[string][]string{}),
 | 
			
		||||
				Repository:   repo.Name,
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			err = parseScript(ctx, parser, runner, r, &pkg)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			resolveOverrides(runner, &pkg)
 | 
			
		||||
 | 
			
		||||
			err = rs.db.InsertPackage(ctx, pkg)
 | 
			
		||||
			err = rs.updatePkg(ctx, repo, runner, r)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return err
 | 
			
		||||
			}
 | 
			
		||||
@@ -322,18 +392,8 @@ func (rs *Repos) processRepoFull(ctx context.Context, repo types.Repo, repoDir s
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	parser := syntax.NewParser()
 | 
			
		||||
 | 
			
		||||
	for _, match := range matches {
 | 
			
		||||
		env := append(os.Environ(), "scriptdir="+filepath.Dir(match))
 | 
			
		||||
		runner, err := interp.New(
 | 
			
		||||
			interp.Env(expand.ListEnviron(env...)),
 | 
			
		||||
			interp.ExecHandler(handlers.NopExec),
 | 
			
		||||
			interp.ReadDirHandler(handlers.RestrictedReadDir(repoDir)),
 | 
			
		||||
			interp.StatHandler(handlers.RestrictedStat(repoDir)),
 | 
			
		||||
			interp.OpenHandler(handlers.RestrictedOpen(repoDir)),
 | 
			
		||||
			interp.StdIO(handlers.NopRWC{}, handlers.NopRWC{}, handlers.NopRWC{}),
 | 
			
		||||
		)
 | 
			
		||||
		runner, err := rs.processRepoChangesRunner(repoDir, filepath.Dir(match))
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
@@ -343,23 +403,7 @@ func (rs *Repos) processRepoFull(ctx context.Context, repo types.Repo, repoDir s
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		pkg := db.Package{
 | 
			
		||||
			Description:  db.NewJSON(map[string]string{}),
 | 
			
		||||
			Homepage:     db.NewJSON(map[string]string{}),
 | 
			
		||||
			Maintainer:   db.NewJSON(map[string]string{}),
 | 
			
		||||
			Depends:      db.NewJSON(map[string][]string{}),
 | 
			
		||||
			BuildDepends: db.NewJSON(map[string][]string{}),
 | 
			
		||||
			Repository:   repo.Name,
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		err = parseScript(ctx, parser, runner, scriptFl, &pkg)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		resolveOverrides(runner, &pkg)
 | 
			
		||||
 | 
			
		||||
		err = rs.db.InsertPackage(ctx, pkg)
 | 
			
		||||
		err = rs.updatePkg(ctx, repo, runner, scriptFl)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										173
									
								
								pkg/repos/pull_internal_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										173
									
								
								pkg/repos/pull_internal_test.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,173 @@
 | 
			
		||||
// ALR - Any Linux Repository
 | 
			
		||||
// Copyright (C) 2025 Евгений Храмов
 | 
			
		||||
//
 | 
			
		||||
// This program is free software: you can redistribute it and/or modify
 | 
			
		||||
// it under the terms of the GNU General Public License as published by
 | 
			
		||||
// the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
// (at your option) any later version.
 | 
			
		||||
//
 | 
			
		||||
// This program is distributed in the hope that it will be useful,
 | 
			
		||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
// GNU General Public License for more details.
 | 
			
		||||
//
 | 
			
		||||
// You should have received a copy of the GNU General Public License
 | 
			
		||||
// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 | 
			
		||||
package repos
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"context"
 | 
			
		||||
	"io"
 | 
			
		||||
	"os"
 | 
			
		||||
	"strings"
 | 
			
		||||
	"testing"
 | 
			
		||||
 | 
			
		||||
	"github.com/stretchr/testify/assert"
 | 
			
		||||
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
type TestALRConfig struct{}
 | 
			
		||||
 | 
			
		||||
func (c *TestALRConfig) GetPaths(ctx context.Context) *config.Paths {
 | 
			
		||||
	return &config.Paths{
 | 
			
		||||
		DBPath: ":memory:",
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (c *TestALRConfig) Repos(ctx context.Context) []types.Repo {
 | 
			
		||||
	return []types.Repo{
 | 
			
		||||
		{
 | 
			
		||||
			Name: "test",
 | 
			
		||||
			URL:  "https://test",
 | 
			
		||||
		},
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func createReadCloserFromString(input string) io.ReadCloser {
 | 
			
		||||
	reader := strings.NewReader(input)
 | 
			
		||||
	return struct {
 | 
			
		||||
		io.Reader
 | 
			
		||||
		io.Closer
 | 
			
		||||
	}{
 | 
			
		||||
		Reader: reader,
 | 
			
		||||
		Closer: io.NopCloser(reader),
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestUpdatePkg(t *testing.T) {
 | 
			
		||||
	type testCase struct {
 | 
			
		||||
		name   string
 | 
			
		||||
		file   string
 | 
			
		||||
		verify func(context.Context, *db.Database)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	repo := types.Repo{
 | 
			
		||||
		Name: "test",
 | 
			
		||||
		URL:  "https://test",
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for _, tc := range []testCase{
 | 
			
		||||
		{
 | 
			
		||||
			name: "single package",
 | 
			
		||||
			file: `name=foo
 | 
			
		||||
version='0.0.1'
 | 
			
		||||
release=1
 | 
			
		||||
desc="main desc"
 | 
			
		||||
deps=('sudo')
 | 
			
		||||
build_deps=('golang')
 | 
			
		||||
`,
 | 
			
		||||
			verify: func(ctx context.Context, database *db.Database) {
 | 
			
		||||
				result, err := database.GetPkgs(ctx, "1 = 1")
 | 
			
		||||
				assert.NoError(t, err)
 | 
			
		||||
				pkgCount := 0
 | 
			
		||||
				for result.Next() {
 | 
			
		||||
					var dbPkg db.Package
 | 
			
		||||
					err = result.StructScan(&dbPkg)
 | 
			
		||||
					if err != nil {
 | 
			
		||||
						t.Errorf("Expected no error, got %s", err)
 | 
			
		||||
					}
 | 
			
		||||
 | 
			
		||||
					assert.Equal(t, "foo", dbPkg.Name)
 | 
			
		||||
					assert.Equal(t, db.NewJSON(map[string]string{"": "main desc"}), dbPkg.Description)
 | 
			
		||||
					assert.Equal(t, db.NewJSON(map[string][]string{"": {"sudo"}}), dbPkg.Depends)
 | 
			
		||||
					pkgCount++
 | 
			
		||||
				}
 | 
			
		||||
				assert.Equal(t, 1, pkgCount)
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			name: "multiple package",
 | 
			
		||||
			file: `basepkg_name=foo
 | 
			
		||||
name=(
 | 
			
		||||
	bar
 | 
			
		||||
	buz
 | 
			
		||||
)
 | 
			
		||||
version='0.0.1'
 | 
			
		||||
release=1
 | 
			
		||||
desc="main desc"
 | 
			
		||||
deps=('sudo')
 | 
			
		||||
build_deps=('golang')
 | 
			
		||||
		
 | 
			
		||||
meta_bar() {
 | 
			
		||||
	desc="foo desc"
 | 
			
		||||
}
 | 
			
		||||
			
 | 
			
		||||
meta_buz() {
 | 
			
		||||
	deps+=('doas')
 | 
			
		||||
}
 | 
			
		||||
`,
 | 
			
		||||
			verify: func(ctx context.Context, database *db.Database) {
 | 
			
		||||
				result, err := database.GetPkgs(ctx, "1 = 1")
 | 
			
		||||
				assert.NoError(t, err)
 | 
			
		||||
 | 
			
		||||
				pkgCount := 0
 | 
			
		||||
				for result.Next() {
 | 
			
		||||
					var dbPkg db.Package
 | 
			
		||||
					err = result.StructScan(&dbPkg)
 | 
			
		||||
					if err != nil {
 | 
			
		||||
						t.Errorf("Expected no error, got %s", err)
 | 
			
		||||
					}
 | 
			
		||||
					if dbPkg.Name == "bar" {
 | 
			
		||||
						assert.Equal(t, db.NewJSON(map[string]string{"": "foo desc"}), dbPkg.Description)
 | 
			
		||||
						assert.Equal(t, db.NewJSON(map[string][]string{"": {"sudo"}}), dbPkg.Depends)
 | 
			
		||||
					}
 | 
			
		||||
 | 
			
		||||
					if dbPkg.Name == "buz" {
 | 
			
		||||
						assert.Equal(t, db.NewJSON(map[string]string{"": "main desc"}), dbPkg.Description)
 | 
			
		||||
						assert.Equal(t, db.NewJSON(map[string][]string{"": {"sudo", "doas"}}), dbPkg.Depends)
 | 
			
		||||
					}
 | 
			
		||||
					pkgCount++
 | 
			
		||||
				}
 | 
			
		||||
				assert.Equal(t, 2, pkgCount)
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
	} {
 | 
			
		||||
		t.Run(tc.name, func(t *testing.T) {
 | 
			
		||||
			cfg := &TestALRConfig{}
 | 
			
		||||
			ctx := context.Background()
 | 
			
		||||
 | 
			
		||||
			database := db.New(&TestALRConfig{})
 | 
			
		||||
			database.Init(ctx)
 | 
			
		||||
 | 
			
		||||
			rs := New(cfg, database)
 | 
			
		||||
 | 
			
		||||
			path, err := os.MkdirTemp("", "test-update-pkg")
 | 
			
		||||
			assert.NoError(t, err)
 | 
			
		||||
			defer os.RemoveAll(path)
 | 
			
		||||
 | 
			
		||||
			runner, err := rs.processRepoChangesRunner(path, path)
 | 
			
		||||
			assert.NoError(t, err)
 | 
			
		||||
 | 
			
		||||
			err = rs.updatePkg(ctx, repo, runner, createReadCloserFromString(
 | 
			
		||||
				tc.file,
 | 
			
		||||
			))
 | 
			
		||||
			assert.NoError(t, err)
 | 
			
		||||
 | 
			
		||||
			tc.verify(ctx, database)
 | 
			
		||||
		})
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -21,7 +21,6 @@ import (
 | 
			
		||||
	"sync"
 | 
			
		||||
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 | 
			
		||||
	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 | 
			
		||||
	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 | 
			
		||||
)
 | 
			
		||||
@@ -36,15 +35,6 @@ func Pull(ctx context.Context, repos []types.Repo) error {
 | 
			
		||||
	return GetInstance(ctx).Pull(ctx, repos)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// FindPkgs looks for packages matching the inputs inside the database.
 | 
			
		||||
// It returns a map that maps the package name input to any packages found for it.
 | 
			
		||||
// It also returns a slice that contains the names of all packages that were not found.
 | 
			
		||||
//
 | 
			
		||||
// Deprecated: use struct method
 | 
			
		||||
func FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
 | 
			
		||||
	return GetInstance(ctx).FindPkgs(ctx, pkgs)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// =======================
 | 
			
		||||
// FOR LEGACY ONLY
 | 
			
		||||
// =======================
 | 
			
		||||
 
 | 
			
		||||
@@ -67,6 +67,47 @@ func parseScript(ctx context.Context, parser *syntax.Parser, runner *interp.Runn
 | 
			
		||||
	return d.DecodeVars(pkg)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
type PackageInfo struct {
 | 
			
		||||
	Version       string            `sh:"version,required"`
 | 
			
		||||
	Release       int               `sh:"release,required"`
 | 
			
		||||
	Epoch         uint              `sh:"epoch"`
 | 
			
		||||
	Architectures db.JSON[[]string] `sh:"architectures"`
 | 
			
		||||
	Licenses      db.JSON[[]string] `sh:"license"`
 | 
			
		||||
	Provides      db.JSON[[]string] `sh:"provides"`
 | 
			
		||||
	Conflicts     db.JSON[[]string] `sh:"conflicts"`
 | 
			
		||||
	Replaces      db.JSON[[]string] `sh:"replaces"`
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (inf *PackageInfo) ToPackage(repoName string) *db.Package {
 | 
			
		||||
	return &db.Package{
 | 
			
		||||
		Version:       inf.Version,
 | 
			
		||||
		Release:       inf.Release,
 | 
			
		||||
		Epoch:         inf.Epoch,
 | 
			
		||||
		Architectures: inf.Architectures,
 | 
			
		||||
		Licenses:      inf.Licenses,
 | 
			
		||||
		Provides:      inf.Provides,
 | 
			
		||||
		Conflicts:     inf.Conflicts,
 | 
			
		||||
		Replaces:      inf.Replaces,
 | 
			
		||||
		Description:   db.NewJSON(map[string]string{}),
 | 
			
		||||
		Homepage:      db.NewJSON(map[string]string{}),
 | 
			
		||||
		Maintainer:    db.NewJSON(map[string]string{}),
 | 
			
		||||
		Depends:       db.NewJSON(map[string][]string{}),
 | 
			
		||||
		BuildDepends:  db.NewJSON(map[string][]string{}),
 | 
			
		||||
		Repository:    repoName,
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func EmptyPackage(repoName string) *db.Package {
 | 
			
		||||
	return &db.Package{
 | 
			
		||||
		Description:  db.NewJSON(map[string]string{}),
 | 
			
		||||
		Homepage:     db.NewJSON(map[string]string{}),
 | 
			
		||||
		Maintainer:   db.NewJSON(map[string]string{}),
 | 
			
		||||
		Depends:      db.NewJSON(map[string][]string{}),
 | 
			
		||||
		BuildDepends: db.NewJSON(map[string][]string{}),
 | 
			
		||||
		Repository:   repoName,
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var overridable = map[string]string{
 | 
			
		||||
	"deps":       "Depends",
 | 
			
		||||
	"build_deps": "BuildDepends",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user