Merge pull request 'Добавлена трансляция коротких имён ALR-пакетов при удалении' (#143) from fix/resolve-alr-names-on-remove into master

Reviewed-on: #143

install.go

@@ -21,6 +21,8 @@ package main
 
 import (
 	"fmt"
+	"log/slog"
+	"strings"
 
 	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
@@ -110,26 +112,53 @@ func InstallCmd() *cli.Command {
 			return nil
 		}),
 		BashComplete: cliutils.BashCompleteWithError(func(c *cli.Context) error {
-
 			ctx := c.Context
 			deps, err := appbuilder.
 				New(ctx).
 				WithConfig().
 				WithDB().
+				WithManager().
 				Build()
 			if err != nil {
 				return err
 			}
 			defer deps.Defer()
 
+			seen := make(map[string]struct{})
+
+			var prefix string
+			if c.Args().Len() > 0 {
+				prefix = c.Args().Get(c.Args().Len() - 1)
+				if strings.HasPrefix(prefix, "-") {
+					prefix = ""
+				}
+			}
+
 			result, err := deps.DB.GetPkgs(c.Context, "true")
 			if err != nil {
 				return cliutils.FormatCliExit(gotext.Get("Error getting packages"), err)
 			}
 
 			for _, pkg := range result {
+				if prefix == "" || strings.HasPrefix(pkg.Name, prefix) {
+					if _, ok := seen[pkg.Name]; !ok {
+						seen[pkg.Name] = struct{}{}
 						fmt.Println(pkg.Name)
 					}
+				}
+			}
+
+			sysPkgs, err := deps.Manager.ListAvailable(prefix)
+			if err != nil {
+				slog.Debug("failed to list system packages", "err", err)
+			} else {
+				for _, name := range sysPkgs {
+					if _, ok := seen[name]; !ok {
+						seen[name] = struct{}{}
+						fmt.Println(name)
+					}
+				}
+			}
 
 			return nil
 		}),
@@ -199,9 +228,15 @@ func RemoveCmd() *cli.Command {
 			}
 			defer deps.Defer()
 
+			// Транслируем короткие имена ALR-пакетов в полные (name+repo)
+			resolvedPkgs, err := resolveInstalledALRNames(deps.Manager, c.Args().Slice())
+			if err != nil {
+				return cliutils.FormatCliExit(gotext.Get("Error removing packages"), err)
+			}
+
 			if err := deps.Manager.Remove(&manager.Opts{
 				NoConfirm: !c.Bool("interactive"),
-			}, c.Args().Slice()...); err != nil {
+			}, resolvedPkgs...); err != nil {
 				return cliutils.FormatCliExit(gotext.Get("Error removing packages"), err)
 			}
 
@@ -209,3 +244,33 @@ func RemoveCmd() *cli.Command {
 		}),
 	}
 }
+
+// resolveInstalledALRNames транслирует короткие имена пакетов в полные имена ALR (name+repo).
+// Если ALR-пакет с таким именем не установлен, имя передаётся как есть.
+func resolveInstalledALRNames(mgr manager.Manager, names []string) ([]string, error) {
+	installed, err := mgr.ListInstalled(nil)
+	if err != nil {
+		return nil, err
+	}
+
+	// Строим карту: короткое имя → полное имя (name+repo)
+	shortToFull := make(map[string]string)
+	for fullName := range installed {
+		matches := build.RegexpALRPackageName.FindStringSubmatch(fullName)
+		if matches != nil {
+			pkgName := matches[build.RegexpALRPackageName.SubexpIndex("package")]
+			shortToFull[pkgName] = fullName
+		}
+	}
+
+	resolved := make([]string, len(names))
+	for i, name := range names {
+		if fullName, ok := shortToFull[name]; ok {
+			resolved[i] = fullName
+		} else {
+			resolved[i] = name
+		}
+	}
+
+	return resolved, nil
+}

internal/build/build.go

@@ -614,9 +614,9 @@ func (b *Builder) BuildALRDeps(
 		allPkgs = append(allPkgs, p.pkg)
 	}
 
-	slog.Info("DEBUG: allPkgs count", "count", len(allPkgs))
+	slog.Debug("allPkgs count", "count", len(allPkgs))
 	for _, p := range allPkgsWithKeys {
-		slog.Info("DEBUG: package in depTree", "key", p.key, "name", p.pkg.Name, "repo", p.pkg.Repository)
+		slog.Debug("package in depTree", "key", p.key, "name", p.pkg.Name, "repo", p.pkg.Repository)
 	}
 
 	needBuildPkgs, err := b.installerExecutor.FilterPackagesByVersion(ctx, allPkgs, input.OSRelease())
@@ -630,9 +630,9 @@ func (b *Builder) BuildALRDeps(
 		needBuildNames[pkg.Name] = true
 	}
 
-	slog.Info("DEBUG: needBuildPkgs count", "count", len(needBuildPkgs))
+	slog.Debug("needBuildPkgs count", "count", len(needBuildPkgs))
 	for _, pkg := range needBuildPkgs {
-		slog.Info("DEBUG: package needs build", "name", pkg.Name)
+		slog.Debug("package needs build", "name", pkg.Name)
 	}
 
 	// Строим needBuildSet по КЛЮЧАМ depTree, а не по pkg.Name
@@ -647,13 +647,13 @@ func (b *Builder) BuildALRDeps(
 
 	// Шаг 3: Группируем подпакеты по basePkgName для оптимизации сборки
 	// Если несколько подпакетов из одного мультипакета, собираем их вместе
-	slog.Info("DEBUG: sortedPkgs", "pkgs", sortedPkgs)
+	slog.Debug("sortedPkgs", "pkgs", sortedPkgs)
 
 	// Шаг 4: Собираем пакеты в правильном порядке, проверяя кеш
 	for _, pkgName := range sortedPkgs {
 		node := depTree[pkgName]
 		if node == nil {
-			slog.Info("DEBUG: node is nil", "pkgName", pkgName)
+			slog.Debug("node is nil", "pkgName", pkgName)
 			continue
 		}
 
@@ -662,7 +662,7 @@ func (b *Builder) BuildALRDeps(
 
 		// Пропускаем уже установленные пакеты
 		if !needBuildSet[pkgName] {
-			slog.Info("DEBUG: skipping (not in needBuildSet)", "pkgName", pkgName)
+			slog.Debug("skipping (not in needBuildSet)", "pkgName", pkgName)
 			continue
 		}
 
@@ -687,12 +687,12 @@ func (b *Builder) BuildALRDeps(
 
 		if allInCache {
 			// Подпакет в кеше, используем его
-			slog.Info("DEBUG: using cached package", "pkgName", pkgName)
+			slog.Debug("using cached package", "pkgName", pkgName)
 			buildDeps = append(buildDeps, cachedDeps...)
 			continue
 		}
 
-		slog.Info("DEBUG: building package", "pkgName", pkgName)
+		slog.Debug("building package", "pkgName", pkgName)
 
 		// Собираем только запрошенный подпакет
 		// SkipDepsBuilding: true предотвращает рекурсивный вызов BuildALRDeps

internal/manager/apk.go

@@ -116,6 +116,48 @@ func (a *APK) UpgradeAll(opts *Opts) error {
 	return a.Upgrade(opts)
 }
 
+func (a *APK) ListAvailable(prefix string) ([]string, error) {
+	cmd := exec.Command("apk", "search", "-q", prefix)
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, fmt.Errorf("apk: listavailable: %w", err)
+	}
+
+	if err := cmd.Start(); err != nil {
+		return nil, fmt.Errorf("apk: listavailable: %w", err)
+	}
+
+	seen := make(map[string]struct{})
+	var pkgs []string
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if line == "" {
+			continue
+		}
+		// apk search -q returns "name-version", extract name
+		lastDash := strings.LastIndex(line, "-")
+		name := line
+		if lastDash > 0 {
+			name = line[:lastDash]
+		}
+		if _, ok := seen[name]; !ok {
+			seen[name] = struct{}{}
+			pkgs = append(pkgs, name)
+		}
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, fmt.Errorf("apk: listavailable: %w", err)
+	}
+
+	if err := cmd.Wait(); err != nil {
+		return nil, fmt.Errorf("apk: listavailable: %w", err)
+	}
+
+	return pkgs, nil
+}
+
 func (a *APK) ListInstalled(opts *Opts) (map[string]string, error) {
 	out := map[string]string{}
 	cmd := exec.Command("apk", "list", "-I")

internal/manager/apt.go

@@ -196,6 +196,10 @@ func (a *APT) IsInstalled(pkg string) (bool, error) {
 	return strings.Contains(status, "install ok installed"), nil
 }
 
+func (a *APT) ListAvailable(prefix string) ([]string, error) {
+	return aptCacheListAvailable(prefix)
+}
+
 func (a *APT) GetInstalledVersion(pkg string) (string, error) {
 	resolved := a.resolvePackageName(pkg)
 	cmd := exec.Command("dpkg-query", "-f", "${Version}", "-W", resolved)

internal/manager/apt_common.go

@@ -0,0 +1,51 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// 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 manager
+
+import (
+	"bufio"
+	"fmt"
+	"os/exec"
+)
+
+func aptCacheListAvailable(prefix string) ([]string, error) {
+	cmd := exec.Command("apt-cache", "pkgnames", prefix)
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, fmt.Errorf("apt-cache: listavailable: %w", err)
+	}
+
+	if err := cmd.Start(); err != nil {
+		return nil, fmt.Errorf("apt-cache: listavailable: %w", err)
+	}
+
+	var pkgs []string
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		pkgs = append(pkgs, scanner.Text())
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, fmt.Errorf("apt-cache: listavailable: %w", err)
+	}
+
+	if err := cmd.Wait(); err != nil {
+		return nil, fmt.Errorf("apt-cache: listavailable: %w", err)
+	}
+
+	return pkgs, nil
+}

internal/manager/apt_rpm.go

@@ -100,6 +100,10 @@ func (a *APTRpm) Upgrade(opts *Opts, pkgs ...string) error {
 	return a.Install(opts, pkgs...)
 }
 
+func (a *APTRpm) ListAvailable(prefix string) ([]string, error) {
+	return aptCacheListAvailable(prefix)
+}
+
 func (a *APTRpm) UpgradeAll(opts *Opts) error {
 	opts = ensureOpts(opts)
 	cmd := a.getCmd(opts, "apt-get", "dist-upgrade")

internal/manager/dnf.go

@@ -20,6 +20,7 @@
 package manager
 
 import (
+	"bufio"
 	"fmt"
 	"os/exec"
 )
@@ -107,6 +108,42 @@ func (d *DNF) Upgrade(opts *Opts, pkgs ...string) error {
 	return nil
 }
 
+func (d *DNF) ListAvailable(prefix string) ([]string, error) {
+	cmd := exec.Command("dnf", "repoquery", "--qf", "%{name}\n", "--quiet", prefix+"*")
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, fmt.Errorf("dnf: listavailable: %w", err)
+	}
+
+	if err := cmd.Start(); err != nil {
+		return nil, fmt.Errorf("dnf: listavailable: %w", err)
+	}
+
+	seen := make(map[string]struct{})
+	var pkgs []string
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		name := scanner.Text()
+		if name == "" {
+			continue
+		}
+		if _, ok := seen[name]; !ok {
+			seen[name] = struct{}{}
+			pkgs = append(pkgs, name)
+		}
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, fmt.Errorf("dnf: listavailable: %w", err)
+	}
+
+	if err := cmd.Wait(); err != nil {
+		return nil, fmt.Errorf("dnf: listavailable: %w", err)
+	}
+
+	return pkgs, nil
+}
+
 // UpgradeAll обновляет все установленные пакеты
 func (d *DNF) UpgradeAll(opts *Opts) error {
 	opts = ensureOpts(opts)

internal/manager/managers.go

@@ -79,6 +79,9 @@ type Manager interface {
 	// GetInstalledVersion returns the version of an installed package.
 	// Returns empty string and no error if package is not installed.
 	GetInstalledVersion(string) (string, error)
+	// ListAvailable returns names of available packages matching the given prefix.
+	// The prefix is used for filtering to avoid returning all packages.
+	ListAvailable(prefix string) ([]string, error)
 }
 
 // Detect returns the package manager detected on the system

internal/manager/pacman.go

@@ -115,6 +115,42 @@ func (p *Pacman) UpgradeAll(opts *Opts) error {
 	return nil
 }
 
+func (p *Pacman) ListAvailable(prefix string) ([]string, error) {
+	cmd := exec.Command("pacman", "-Ssq", "^"+prefix)
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, fmt.Errorf("pacman: listavailable: %w", err)
+	}
+
+	if err := cmd.Start(); err != nil {
+		return nil, fmt.Errorf("pacman: listavailable: %w", err)
+	}
+
+	seen := make(map[string]struct{})
+	var pkgs []string
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		name := scanner.Text()
+		if _, ok := seen[name]; !ok {
+			seen[name] = struct{}{}
+			pkgs = append(pkgs, name)
+		}
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, fmt.Errorf("pacman: listavailable: %w", err)
+	}
+
+	if err := cmd.Wait(); err != nil {
+		if exitErr, ok := err.(*exec.ExitError); ok && exitErr.ExitCode() == 1 {
+			return nil, nil
+		}
+		return nil, fmt.Errorf("pacman: listavailable: %w", err)
+	}
+
+	return pkgs, nil
+}
+
 func (p *Pacman) ListInstalled(opts *Opts) (map[string]string, error) {
 	out := map[string]string{}
 	cmd := exec.Command("pacman", "-Q")

internal/manager/yum.go

@@ -20,6 +20,7 @@
 package manager
 
 import (
+	"bufio"
 	"fmt"
 	"os/exec"
 )
@@ -103,6 +104,42 @@ func (y *YUM) Upgrade(opts *Opts, pkgs ...string) error {
 	return nil
 }
 
+func (y *YUM) ListAvailable(prefix string) ([]string, error) {
+	cmd := exec.Command("yum", "repoquery", "--qf", "%{name}\n", "--quiet", prefix+"*")
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, fmt.Errorf("yum: listavailable: %w", err)
+	}
+
+	if err := cmd.Start(); err != nil {
+		return nil, fmt.Errorf("yum: listavailable: %w", err)
+	}
+
+	seen := make(map[string]struct{})
+	var pkgs []string
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		name := scanner.Text()
+		if name == "" {
+			continue
+		}
+		if _, ok := seen[name]; !ok {
+			seen[name] = struct{}{}
+			pkgs = append(pkgs, name)
+		}
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, fmt.Errorf("yum: listavailable: %w", err)
+	}
+
+	if err := cmd.Wait(); err != nil {
+		return nil, fmt.Errorf("yum: listavailable: %w", err)
+	}
+
+	return pkgs, nil
+}
+
 func (y *YUM) UpgradeAll(opts *Opts) error {
 	opts = ensureOpts(opts)
 	cmd := y.getCmd(opts, "yum", "upgrade")

internal/manager/zypper.go

@@ -20,8 +20,10 @@
 package manager
 
 import (
+	"bufio"
 	"fmt"
 	"os/exec"
+	"strings"
 )
 
 // Zypper represents the Zypper package manager
@@ -103,6 +105,55 @@ func (z *Zypper) Upgrade(opts *Opts, pkgs ...string) error {
 	return nil
 }
 
+func (z *Zypper) ListAvailable(prefix string) ([]string, error) {
+	cmd := exec.Command("zypper", "--quiet", "search", "--type", "package", prefix+"*")
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, fmt.Errorf("zypper: listavailable: %w", err)
+	}
+
+	if err := cmd.Start(); err != nil {
+		return nil, fmt.Errorf("zypper: listavailable: %w", err)
+	}
+
+	seen := make(map[string]struct{})
+	var pkgs []string
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		line := scanner.Text()
+		// zypper table format: "S | Name | Summary | Type"
+		// Skip separator lines and headers
+		if !strings.Contains(line, "|") {
+			continue
+		}
+		fields := strings.Split(line, "|")
+		if len(fields) < 2 {
+			continue
+		}
+		name := strings.TrimSpace(fields[1])
+		if name == "" || name == "Name" {
+			continue
+		}
+		if _, ok := seen[name]; !ok {
+			seen[name] = struct{}{}
+			pkgs = append(pkgs, name)
+		}
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, fmt.Errorf("zypper: listavailable: %w", err)
+	}
+
+	if err := cmd.Wait(); err != nil {
+		if exitErr, ok := err.(*exec.ExitError); ok && exitErr.ExitCode() == 104 {
+			return nil, nil
+		}
+		return nil, fmt.Errorf("zypper: listavailable: %w", err)
+	}
+
+	return pkgs, nil
+}
+
 func (z *Zypper) UpgradeAll(opts *Opts) error {
 	opts = ensureOpts(opts)
 	cmd := z.getCmd(opts, "zypper", "update", "-y")

main.go

@@ -122,7 +122,7 @@ func GetApp() *cli.App {
 
 func setLogLevel(newLevel string) {
 	level := slog.LevelInfo
-	switch newLevel {
+	switch strings.ToUpper(newLevel) {
 	case "DEBUG":
 		level = slog.LevelDebug
 	case "INFO":
@@ -131,6 +131,10 @@ func setLogLevel(newLevel string) {
 		level = slog.LevelWarn
 	case "ERROR":
 		level = slog.LevelError
+	default:
+		if newLevel != "" {
+			slog.Warn("unknown logLevel value, falling back to INFO", "value", newLevel)
+		}
 	}
 	logger, ok := slog.Default().Handler().(*logger.Logger)
 	if !ok {

pkg/alrsh/alrsh.go

@@ -172,14 +172,13 @@ func (s *ScriptFile) createPackageFromMeta(
 		return nil, err
 	}
 
-	// DEBUG: Выводим что в metaRunner.Vars и dec.Runner.Vars для deps_debian
 	if depsDebianMeta, ok := metaRunner.Vars["deps_debian"]; ok {
-		slog.Info("DEBUG createPackageFromMeta: metaRunner.Vars[deps_debian]", "value", depsDebianMeta.String(), "list", depsDebianMeta.List)
+		slog.Debug("createPackageFromMeta: metaRunner.Vars[deps_debian]", "value", depsDebianMeta.String(), "list", depsDebianMeta.List)
 	} else {
-		slog.Info("DEBUG createPackageFromMeta: metaRunner.Vars[deps_debian] NOT FOUND")
+		slog.Debug("createPackageFromMeta: metaRunner.Vars[deps_debian] NOT FOUND")
 	}
 	if depsDebianParent, ok := dec.Runner.Vars["deps_debian"]; ok {
-		slog.Info("DEBUG createPackageFromMeta: parent Vars[deps_debian]", "value", depsDebianParent.String(), "list", depsDebianParent.List)
+		slog.Debug("createPackageFromMeta: parent Vars[deps_debian]", "value", depsDebianParent.String(), "list", depsDebianParent.List)
 	}
 
 	// Сливаем переменные родительского runner'а с переменными мета-функции.