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

refactor

Browse Source
This commit is contained in:
Maxim Slipenko
2025-04-13 19:54:04 +03:00
parent f26b72b2a2
commit b8cb7af3bb
14 changed files with 213 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
repo.go
View File

@ -28,6 +28,7 @@ import (
"github.com/urfave/cli/v2"
"golang.org/x/exp/slices"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
@ -69,8 +70,7 @@ func AddRepoCmd() *cli.Command {
cfg := config.New()
err = cfg.Load()
if err != nil {
slog.Error(gotext.Get("Error loading config"), "err", err)
os.Exit(1)
return cliutils.FormatCliExit(gotext.Get("Error loading config"), err)
}
reposSlice := cfg.Repos()
@ -90,8 +90,7 @@ func AddRepoCmd() *cli.Command {
err = cfg.SaveUserConfig()
if err != nil {
slog.Error(gotext.Get("Error saving config"), "err", err)
os.Exit(1)
return cliutils.FormatCliExit(gotext.Get("Error saving config"), err)
}
if utils.DropCapsToAlrUser() != nil {
@ -108,8 +107,7 @@ func AddRepoCmd() *cli.Command {
rs := repos.New(cfg, db)
err = rs.Pull(ctx, cfg.Repos())
if err != nil {
slog.Error(gotext.Get("Error pulling repos"), "err", err)
os.Exit(1)
return cliutils.FormatCliExit(gotext.Get("Error pulling repos"), err)
}
return nil
@ -142,8 +140,7 @@ func RemoveRepoCmd() *cli.Command {
cfg := config.New()
err = cfg.Load()
if err != nil {
slog.Error(gotext.Get("Error loading config"), "err", err)
os.Exit(1)
return cliutils.FormatCliExit(gotext.Get("Error loading config"), err)
}
found := false
@ -164,14 +161,12 @@ func RemoveRepoCmd() *cli.Command {
err = os.RemoveAll(filepath.Join(cfg.GetPaths().RepoDir, name))
if err != nil {
slog.Error(gotext.Get("Error removing repo directory"), "err", err)
os.Exit(1)
return cliutils.FormatCliExit(gotext.Get("Error removing repo directory"), err)
}
err = cfg.SaveUserConfig()
if err != nil {
slog.Error(gotext.Get("Error saving config"), "err", err)
os.Exit(1)
return cliutils.FormatCliExit(gotext.Get("Error saving config"), err)
}
db := database.New(cfg)
@ -181,8 +176,7 @@ func RemoveRepoCmd() *cli.Command {
}
err = db.DeletePkgs(ctx, "repository = ?", name)
if err != nil {
slog.Error(gotext.Get("Error removing packages from database"), "err", err)
os.Exit(1)
return cliutils.FormatCliExit(gotext.Get("Error removing packages from database"), err)
}
return nil