forked from Plemya-x/ALR
refactor
This commit is contained in:
@ -92,6 +92,16 @@ func (b *AppBuilder) WithDB() *AppBuilder {
|
||||
}
|
||||
|
||||
func (b *AppBuilder) WithRepos() *AppBuilder {
|
||||
b.withRepos(false)
|
||||
return b
|
||||
}
|
||||
|
||||
func (b *AppBuilder) WithReposForcePull() *AppBuilder {
|
||||
b.withRepos(true)
|
||||
return b
|
||||
}
|
||||
|
||||
func (b *AppBuilder) withRepos(forcePull bool) *AppBuilder {
|
||||
if b.err != nil {
|
||||
return b
|
||||
}
|
||||
@ -105,7 +115,7 @@ func (b *AppBuilder) WithRepos() *AppBuilder {
|
||||
|
||||
rs := repos.New(cfg, db)
|
||||
|
||||
if cfg.AutoPull() {
|
||||
if forcePull || cfg.AutoPull() {
|
||||
if err := rs.Pull(b.ctx, cfg.Repos()); err != nil {
|
||||
slog.Error(gotext.Get("Error pulling repositories"), "err", err)
|
||||
b.err = cli.Exit("", 1)
|
||||
|
48
internal/cliutils/utils.go
Normal file
48
internal/cliutils/utils.go
Normal file
@ -0,0 +1,48 @@
|
||||
// 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 cliutils
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log/slog"
|
||||
|
||||
"github.com/urfave/cli/v2"
|
||||
)
|
||||
|
||||
type BashCompleteWithErrorFunc func(c *cli.Context) error
|
||||
|
||||
func BashCompleteWithError(f BashCompleteWithErrorFunc) cli.BashCompleteFunc {
|
||||
return func(c *cli.Context) { HandleExitCoder(f(c)) }
|
||||
}
|
||||
|
||||
func HandleExitCoder(err error) {
|
||||
if err == nil {
|
||||
return
|
||||
}
|
||||
|
||||
if exitErr, ok := err.(cli.ExitCoder); ok {
|
||||
if err.Error() != "" {
|
||||
if _, ok := exitErr.(cli.ErrorFormatter); ok {
|
||||
slog.Error(fmt.Sprintf("%+v\n", err))
|
||||
} else {
|
||||
slog.Error(err.Error())
|
||||
}
|
||||
}
|
||||
cli.OsExiter(exitErr.ExitCode())
|
||||
return
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user