diff --git a/.golangci.yml b/.golangci.yml index 863d443..5682194 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -47,4 +47,4 @@ issues: # TODO: remove - linters: - staticcheck - text: "SA1019:" \ No newline at end of file + text: "SA1019: interp.ExecHandler" \ No newline at end of file diff --git a/coverage-badge.svg b/coverage-badge.svg index b686468..a9e856e 100644 --- a/coverage-badge.svg +++ b/coverage-badge.svg @@ -11,7 +11,7 @@ coverage coverage - 20.8% - 20.8% + 19.3% + 19.3% diff --git a/fix.go b/fix.go index 3b34bdc..8c1bb59 100644 --- a/fix.go +++ b/fix.go @@ -27,7 +27,7 @@ import ( "github.com/urfave/cli/v2" "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/pkg/repos" ) @@ -37,9 +37,8 @@ func FixCmd() *cli.Command { Usage: gotext.Get("Attempt to fix problems with ALR"), Action: func(c *cli.Context) error { ctx := c.Context - - db.Close() - paths := config.GetPaths(ctx) + cfg := config.New() + paths := cfg.GetPaths(ctx) slog.Info(gotext.Get("Removing cache directory")) @@ -57,7 +56,15 @@ func FixCmd() *cli.Command { os.Exit(1) } - err = repos.Pull(ctx, config.Config(ctx).Repos) + cfg = config.New() + db := database.New(cfg) + err = db.Init(ctx) + if err != nil { + slog.Error(gotext.Get("Error initialization database"), "err", err) + os.Exit(1) + } + rs := repos.New(cfg, db) + err = rs.Pull(ctx, cfg.Repos(ctx)) if err != nil { slog.Error(gotext.Get("Error pulling repos"), "err", err) os.Exit(1) diff --git a/info.go b/info.go index 5a4f290..6fcebbe 100644 --- a/info.go +++ b/info.go @@ -30,7 +30,7 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" "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/overrides" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" @@ -47,11 +47,39 @@ func InfoCmd() *cli.Command { Usage: gotext.Get("Show all information, not just for the current distro"), }, }, + BashComplete: func(c *cli.Context) { + ctx := c.Context + cfg := config.New() + db := database.New(cfg) + err := db.Init(ctx) + if err != nil { + slog.Error(gotext.Get("Error initialization database"), "err", err) + os.Exit(1) + } + + result, err := db.GetPkgs(c.Context, "true") + if err != nil { + slog.Error(gotext.Get("Error getting packages"), "err", err) + os.Exit(1) + } + defer result.Close() + + for result.Next() { + var pkg database.Package + err = result.StructScan(&pkg) + if err != nil { + slog.Error(gotext.Get("Error iterating over packages"), "err", err) + os.Exit(1) + } + + fmt.Println(pkg.Name) + } + }, Action: func(c *cli.Context) error { ctx := c.Context cfg := config.New() - db := db.New(cfg) + db := database.New(cfg) err := db.Init(ctx) if err != nil { slog.Error(gotext.Get("Error initialization database"), "err", err) diff --git a/internal/config/config.go b/internal/config/config.go index 11c69b8..ff400c3 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -152,6 +152,13 @@ func (c *ALRConfig) Repos(ctx context.Context) []types.Repo { return c.cfg.Repos } +func (c *ALRConfig) SetRepos(ctx context.Context, repos []types.Repo) { + c.cfgOnce.Do(func() { + c.Load(ctx) + }) + c.cfg.Repos = repos +} + func (c *ALRConfig) IgnorePkgUpdates(ctx context.Context) []string { c.cfgOnce.Do(func() { c.Load(ctx) @@ -172,3 +179,17 @@ func (c *ALRConfig) PagerStyle(ctx context.Context) string { }) return c.cfg.PagerStyle } + +func (c *ALRConfig) AllowRunAsRoot(ctx context.Context) bool { + c.cfgOnce.Do(func() { + c.Load(ctx) + }) + return c.cfg.Unsafe.AllowRunAsRoot +} + +func (c *ALRConfig) RootCmd(ctx context.Context) string { + c.cfgOnce.Do(func() { + c.Load(ctx) + }) + return c.cfg.RootCmd +} diff --git a/internal/config/config_legacy.go b/internal/config/config_legacy.go deleted file mode 100644 index 5be9bae..0000000 --- a/internal/config/config_legacy.go +++ /dev/null @@ -1,52 +0,0 @@ -// 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 . - -package config - -import ( - "context" - "sync" - - "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" -) - -// Config returns a ALR configuration struct. -// The first time it's called, it'll load the config from a file. -// Subsequent calls will just return the same value. -// -// Deprecated: use struct method -func Config(ctx context.Context) *types.Config { - return GetInstance(ctx).cfg -} - -// ======================= -// FOR LEGACY ONLY -// ======================= - -var ( - alrConfig *ALRConfig - alrConfigOnce sync.Once -) - -// Deprecated: For legacy only -func GetInstance(ctx context.Context) *ALRConfig { - alrConfigOnce.Do(func() { - alrConfig = New() - alrConfig.Load(ctx) - }) - - return alrConfig -} diff --git a/internal/config/paths.go b/internal/config/paths.go index 78c5bde..9b350d0 100644 --- a/internal/config/paths.go +++ b/internal/config/paths.go @@ -19,10 +19,6 @@ package config -import ( - "context" -) - // Paths contains various paths used by ALR type Paths struct { ConfigDir string @@ -32,14 +28,3 @@ type Paths struct { PkgsDir string DBPath string } - -// GetPaths returns a Paths struct. -// The first time it's called, it'll generate the struct -// using information from the system. -// Subsequent calls will return the same value. -// -// Deprecated: use struct API -func GetPaths(ctx context.Context) *Paths { - alrConfig := GetInstance(ctx) - return alrConfig.GetPaths(ctx) -} diff --git a/internal/db/db_legacy.go b/internal/db/db_legacy.go deleted file mode 100644 index 1d6cc7a..0000000 --- a/internal/db/db_legacy.go +++ /dev/null @@ -1,106 +0,0 @@ -// 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 . - -package db - -import ( - "context" - "log/slog" - "os" - "sync" - - "github.com/jmoiron/sqlx" - "github.com/leonelquinteros/gotext" - - "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" -) - -// DB returns the ALR database. -// The first time it's called, it opens the SQLite database file. -// Subsequent calls return the same connection. -// -// Deprecated: use struct method -func DB(ctx context.Context) *sqlx.DB { - return GetInstance(ctx).GetConn() -} - -// Close closes the database -// -// Deprecated: use struct method -func Close() error { - if database != nil { - return database.Close() - } - return nil -} - -// IsEmpty returns true if the database has no packages in it, otherwise it returns false. -// -// Deprecated: use struct method -func IsEmpty(ctx context.Context) bool { - return GetInstance(ctx).IsEmpty(ctx) -} - -// InsertPackage adds a package to the database -// -// Deprecated: use struct method -func InsertPackage(ctx context.Context, pkg Package) error { - return GetInstance(ctx).InsertPackage(ctx, pkg) -} - -// GetPkgs returns a result containing packages that match the where conditions -// -// Deprecated: use struct method -func GetPkgs(ctx context.Context, where string, args ...any) (*sqlx.Rows, error) { - return GetInstance(ctx).GetPkgs(ctx, where, args...) -} - -// GetPkg returns a single package that matches the where conditions -// -// Deprecated: use struct method -func GetPkg(ctx context.Context, where string, args ...any) (*Package, error) { - return GetInstance(ctx).GetPkg(ctx, where, args...) -} - -// DeletePkgs deletes all packages matching the where conditions -// -// Deprecated: use struct method -func DeletePkgs(ctx context.Context, where string, args ...any) error { - return GetInstance(ctx).DeletePkgs(ctx, where, args...) -} - -// ======================= -// FOR LEGACY ONLY -// ======================= - -var ( - dbOnce sync.Once - database *Database -) - -// Deprecated: For legacy only -func GetInstance(ctx context.Context) *Database { - dbOnce.Do(func() { - cfg := config.GetInstance(ctx) - database = New(cfg) - err := database.Init(ctx) - if err != nil { - slog.Error(gotext.Get("Error opening database"), "err", err) - os.Exit(1) - } - }) - return database -} diff --git a/internal/dlcache/dlcache_test.go b/internal/dlcache/dlcache_test.go index e9c0832..087c4cc 100644 --- a/internal/dlcache/dlcache_test.go +++ b/internal/dlcache/dlcache_test.go @@ -32,14 +32,6 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache" ) -func init() { - dir, err := os.MkdirTemp("/tmp", "alr-dlcache-test.*") - if err != nil { - panic(err) - } - config.GetPaths(context.Background()).RepoDir = dir -} - type TestALRConfig struct { CacheDir string } diff --git a/internal/pager/pager.go b/internal/pager/pager.go index f3aef28..55a7bad 100644 --- a/internal/pager/pager.go +++ b/internal/pager/pager.go @@ -41,7 +41,7 @@ func init() { b2 := lipgloss.RoundedBorder() b2.Left = "\u2524" - infoStyle = titleStyle.Copy().BorderStyle(b2) + infoStyle = titleStyle.BorderStyle(b2) } type Pager struct { diff --git a/internal/shutils/handlers/nop.go b/internal/shutils/handlers/nop.go index f8013d0..dfd4045 100644 --- a/internal/shutils/handlers/nop.go +++ b/internal/shutils/handlers/nop.go @@ -22,10 +22,11 @@ package handlers import ( "context" "io" + "io/fs" "os" ) -func NopReadDir(context.Context, string) ([]os.FileInfo, error) { +func NopReadDir(context.Context, string) ([]fs.DirEntry, error) { return nil, os.ErrNotExist } diff --git a/internal/shutils/handlers/restricted.go b/internal/shutils/handlers/restricted.go index 760df98..557c5fe 100644 --- a/internal/shutils/handlers/restricted.go +++ b/internal/shutils/handlers/restricted.go @@ -31,12 +31,12 @@ import ( "mvdan.cc/sh/v3/interp" ) -func RestrictedReadDir(allowedPrefixes ...string) interp.ReadDirHandlerFunc { - return func(ctx context.Context, s string) ([]fs.FileInfo, error) { +func RestrictedReadDir(allowedPrefixes ...string) interp.ReadDirHandlerFunc2 { + return func(ctx context.Context, s string) ([]fs.DirEntry, error) { path := filepath.Clean(s) for _, allowedPrefix := range allowedPrefixes { if strings.HasPrefix(path, allowedPrefix) { - return interp.DefaultReadDirHandler()(ctx, s) + return interp.DefaultReadDirHandler2()(ctx, s) } } diff --git a/internal/translations/default.pot b/internal/translations/default.pot index 13eeea8..c59c207 100644 --- a/internal/translations/default.pot +++ b/internal/translations/default.pot @@ -66,27 +66,31 @@ msgstr "" msgid "Attempt to fix problems with ALR" msgstr "" -#: fix.go:44 +#: fix.go:43 msgid "Removing cache directory" msgstr "" -#: fix.go:48 +#: fix.go:47 msgid "Unable to remove cache directory" msgstr "" -#: fix.go:52 +#: fix.go:51 msgid "Rebuilding cache" msgstr "" -#: fix.go:56 +#: fix.go:55 msgid "Unable to create new cache directory" msgstr "" -#: fix.go:62 +#: fix.go:63 +msgid "Error initialization database" +msgstr "" + +#: fix.go:69 msgid "Error pulling repos" msgstr "" -#: fix.go:66 +#: fix.go:73 msgid "Done" msgstr "" @@ -122,27 +126,31 @@ msgstr "" msgid "Show all information, not just for the current distro" msgstr "" -#: info.go:57 -msgid "Error initialization database" +#: info.go:62 +msgid "Error getting packages" msgstr "" -#: info.go:64 +#: info.go:71 +msgid "Error iterating over packages" +msgstr "" + +#: info.go:92 msgid "Command info expected at least 1 argument, got %d" msgstr "" -#: info.go:78 +#: info.go:106 msgid "Error finding packages" msgstr "" -#: info.go:94 +#: info.go:122 msgid "Error parsing os-release file" msgstr "" -#: info.go:103 +#: info.go:131 msgid "Error resolving overrides" msgstr "" -#: info.go:112 info.go:118 +#: info.go:140 info.go:146 msgid "Error encoding script variables" msgstr "" @@ -154,14 +162,6 @@ msgstr "" msgid "Command install expected at least 1 argument, got %d" msgstr "" -#: install.go:124 -msgid "Error getting packages" -msgstr "" - -#: install.go:133 -msgid "Error iterating over packages" -msgstr "" - #: install.go:146 msgid "Remove an installed package" msgstr "" @@ -247,10 +247,6 @@ msgid "" "Database version does not exist. Run alr fix if something isn't working." msgstr "" -#: internal/db/db_legacy.go:101 -msgid "Error opening database" -msgstr "" - #: internal/dl/dl.go:170 msgid "Source can be updated, updating if required" msgstr "" @@ -287,15 +283,15 @@ msgstr "" msgid "Error listing installed packages" msgstr "" -#: main.go:45 +#: main.go:44 msgid "Print the current ALR version and exit" msgstr "" -#: main.go:61 +#: main.go:60 msgid "Arguments to be passed on to the package manager" msgstr "" -#: main.go:67 +#: main.go:66 msgid "Enable interactive questions and prompts" msgstr "" @@ -305,7 +301,7 @@ msgid "" "system" msgstr "" -#: main.go:124 +#: main.go:122 msgid "Error while running app" msgstr "" @@ -329,49 +325,49 @@ msgstr "" msgid "Compressing package" msgstr "" -#: pkg/build/build.go:419 +#: pkg/build/build.go:421 msgid "" "Your system's CPU architecture doesn't match this package. Do you want to " "build anyway?" msgstr "" -#: pkg/build/build.go:433 +#: pkg/build/build.go:435 msgid "This package is already installed" msgstr "" -#: pkg/build/build.go:457 +#: pkg/build/build.go:459 msgid "Installing build dependencies" msgstr "" -#: pkg/build/build.go:498 +#: pkg/build/build.go:500 msgid "Installing dependencies" msgstr "" -#: pkg/build/build.go:533 +#: pkg/build/build.go:535 msgid "The checksums array must be the same length as sources" msgstr "" -#: pkg/build/build.go:584 +#: pkg/build/build.go:586 msgid "Would you like to remove the build dependencies?" msgstr "" -#: pkg/build/build.go:647 +#: pkg/build/build.go:649 msgid "Executing prepare()" msgstr "" -#: pkg/build/build.go:657 +#: pkg/build/build.go:659 msgid "Executing build()" msgstr "" -#: pkg/build/build.go:687 pkg/build/build.go:707 +#: pkg/build/build.go:689 pkg/build/build.go:709 msgid "Executing %s()" msgstr "" -#: pkg/build/build.go:766 +#: pkg/build/build.go:768 msgid "Error installing native packages" msgstr "" -#: pkg/build/build.go:790 +#: pkg/build/build.go:792 msgid "Error installing package" msgstr "" @@ -425,35 +421,35 @@ msgstr "" msgid "URL of the new repo" msgstr "" -#: repo.go:79 repo.go:136 +#: repo.go:82 repo.go:142 msgid "Error opening config file" msgstr "" -#: repo.go:85 repo.go:142 +#: repo.go:88 repo.go:148 msgid "Error encoding config" msgstr "" -#: repo.go:103 +#: repo.go:108 msgid "Remove an existing repository" msgstr "" -#: repo.go:110 +#: repo.go:115 msgid "Name of the repo to be deleted" msgstr "" -#: repo.go:128 +#: repo.go:134 msgid "Repo does not exist" msgstr "" -#: repo.go:148 +#: repo.go:154 msgid "Error removing repo directory" msgstr "" -#: repo.go:154 +#: repo.go:165 msgid "Error removing packages from database" msgstr "" -#: repo.go:166 +#: repo.go:177 msgid "Pull all repositories that have changed" msgstr "" diff --git a/internal/translations/po/ru/default.po b/internal/translations/po/ru/default.po index 88c2415..01ef1ac 100644 --- a/internal/translations/po/ru/default.po +++ b/internal/translations/po/ru/default.po @@ -74,27 +74,31 @@ msgstr "Ошибка при перемещении пакета" msgid "Attempt to fix problems with ALR" msgstr "Попытка устранить проблемы с ALR" -#: fix.go:44 +#: fix.go:43 msgid "Removing cache directory" msgstr "Удаление каталога кэша" -#: fix.go:48 +#: fix.go:47 msgid "Unable to remove cache directory" msgstr "Не удалось удалить каталог кэша" -#: fix.go:52 +#: fix.go:51 msgid "Rebuilding cache" msgstr "Восстановление кэша" -#: fix.go:56 +#: fix.go:55 msgid "Unable to create new cache directory" msgstr "Не удалось создать новый каталог кэша" -#: fix.go:62 +#: fix.go:63 +msgid "Error initialization database" +msgstr "Ошибка инициализации базы данных" + +#: fix.go:69 msgid "Error pulling repos" msgstr "Ошибка при извлечении репозиториев" -#: fix.go:66 +#: fix.go:73 msgid "Done" msgstr "Сделано" @@ -130,27 +134,31 @@ msgstr "Отобразить информацию о пакете" msgid "Show all information, not just for the current distro" msgstr "Показывать всю информацию, не только для текущего дистрибутива" -#: info.go:57 -msgid "Error initialization database" -msgstr "Ошибка инициализации базы данных" +#: info.go:62 +msgid "Error getting packages" +msgstr "Ошибка при получении пакетов" -#: info.go:64 +#: info.go:71 +msgid "Error iterating over packages" +msgstr "Ошибка при переборе пакетов" + +#: info.go:92 msgid "Command info expected at least 1 argument, got %d" msgstr "Для команды info ожидался хотя бы 1 аргумент, получено %d" -#: info.go:78 +#: info.go:106 msgid "Error finding packages" msgstr "Ошибка при поиске пакетов" -#: info.go:94 +#: info.go:122 msgid "Error parsing os-release file" msgstr "Ошибка при разборе файла выпуска операционной системы" -#: info.go:103 +#: info.go:131 msgid "Error resolving overrides" msgstr "Ошибка устранения переорпеделений" -#: info.go:112 info.go:118 +#: info.go:140 info.go:146 msgid "Error encoding script variables" msgstr "Ошибка кодирования переменных скрита" @@ -162,14 +170,6 @@ msgstr "Установить новый пакет" msgid "Command install expected at least 1 argument, got %d" msgstr "Для команды install ожидался хотя бы 1 аргумент, получено %d" -#: install.go:124 -msgid "Error getting packages" -msgstr "Ошибка при получении пакетов" - -#: install.go:133 -msgid "Error iterating over packages" -msgstr "Ошибка при переборе пакетов" - #: install.go:146 msgid "Remove an installed package" msgstr "Удалить установленный пакет" @@ -260,10 +260,6 @@ msgid "" msgstr "" "Версия базы данных не существует. Запустите alr fix, если что-то не работает." -#: internal/db/db_legacy.go:101 -msgid "Error opening database" -msgstr "Ошибка при открытии базы данных" - #: internal/dl/dl.go:170 msgid "Source can be updated, updating if required" msgstr "Исходный код можно обновлять, обновляя при необходимости" @@ -300,15 +296,15 @@ msgstr "Список пакетов репозитория ALR" msgid "Error listing installed packages" msgstr "Ошибка при составлении списка установленных пакетов" -#: main.go:45 +#: main.go:44 msgid "Print the current ALR version and exit" msgstr "Показать текущую версию ALR и выйти" -#: main.go:61 +#: main.go:60 msgid "Arguments to be passed on to the package manager" msgstr "Аргументы, которые будут переданы менеджеру пакетов" -#: main.go:67 +#: main.go:66 msgid "Enable interactive questions and prompts" msgstr "Включение интерактивных вопросов и запросов" @@ -320,7 +316,7 @@ msgstr "" "Запуск ALR от имени root запрещён, так как это может привести к " "катастрофическому повреждению вашей системы" -#: main.go:124 +#: main.go:122 msgid "Error while running app" msgstr "Ошибка при запуске приложения" @@ -344,7 +340,7 @@ msgstr "Сборка метаданных пакета" msgid "Compressing package" msgstr "Сжатие пакета" -#: pkg/build/build.go:419 +#: pkg/build/build.go:421 msgid "" "Your system's CPU architecture doesn't match this package. Do you want to " "build anyway?" @@ -352,44 +348,44 @@ msgstr "" "Архитектура процессора вашей системы не соответствует этому пакету. Вы все " "равно хотите выполнить сборку?" -#: pkg/build/build.go:433 +#: pkg/build/build.go:435 msgid "This package is already installed" msgstr "Этот пакет уже установлен" -#: pkg/build/build.go:457 +#: pkg/build/build.go:459 msgid "Installing build dependencies" msgstr "Установка зависимостей сборки" -#: pkg/build/build.go:498 +#: pkg/build/build.go:500 msgid "Installing dependencies" msgstr "Установка зависимостей" -#: pkg/build/build.go:533 +#: pkg/build/build.go:535 msgid "The checksums array must be the same length as sources" msgstr "Массив контрольных сумм должен быть той же длины, что и источники" -#: pkg/build/build.go:584 +#: pkg/build/build.go:586 msgid "Would you like to remove the build dependencies?" msgstr "Хотели бы вы удалить зависимости сборки?" -#: pkg/build/build.go:647 +#: pkg/build/build.go:649 msgid "Executing prepare()" msgstr "Исполнение prepare()" -#: pkg/build/build.go:657 +#: pkg/build/build.go:659 msgid "Executing build()" msgstr "Исполнение build()" -#: pkg/build/build.go:687 pkg/build/build.go:707 +#: pkg/build/build.go:689 pkg/build/build.go:709 #, fuzzy msgid "Executing %s()" msgstr "Исполнение files()" -#: pkg/build/build.go:766 +#: pkg/build/build.go:768 msgid "Error installing native packages" msgstr "Ошибка при установке нативных пакетов" -#: pkg/build/build.go:790 +#: pkg/build/build.go:792 msgid "Error installing package" msgstr "Ошибка при установке пакета" @@ -447,35 +443,35 @@ msgstr "Название нового репозитория" msgid "URL of the new repo" msgstr "URL-адрес нового репозитория" -#: repo.go:79 repo.go:136 +#: repo.go:82 repo.go:142 msgid "Error opening config file" msgstr "Ошибка при открытии конфигурационного файла" -#: repo.go:85 repo.go:142 +#: repo.go:88 repo.go:148 msgid "Error encoding config" msgstr "Ошибка при кодировании конфигурации" -#: repo.go:103 +#: repo.go:108 msgid "Remove an existing repository" msgstr "Удалить существующий репозиторий" -#: repo.go:110 +#: repo.go:115 msgid "Name of the repo to be deleted" msgstr "Название репозитория удалён" -#: repo.go:128 +#: repo.go:134 msgid "Repo does not exist" msgstr "Репозитория не существует" -#: repo.go:148 +#: repo.go:154 msgid "Error removing repo directory" msgstr "Ошибка при удалении каталога репозитория" -#: repo.go:154 +#: repo.go:165 msgid "Error removing packages from database" msgstr "Ошибка при удалении пакетов из базы данных" -#: repo.go:166 +#: repo.go:177 msgid "Pull all repositories that have changed" msgstr "Скачать все изменённые репозитории" @@ -491,6 +487,9 @@ msgstr "Ошибка при проверке обновлений" msgid "There is nothing to do." msgstr "Здесь нечего делать." +#~ msgid "Error opening database" +#~ msgstr "Ошибка при открытии базы данных" + #~ msgid "Executing version()" #~ msgstr "Исполнение версия()" diff --git a/main.go b/main.go index c62fb5e..1039bca 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,6 @@ import ( "github.com/urfave/cli/v2" "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/translations" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" @@ -84,9 +83,10 @@ func GetApp() *cli.App { }, Before: func(c *cli.Context) error { ctx := c.Context + cfg := config.New() cmd := c.Args().First() - if cmd != "helper" && !config.Config(ctx).Unsafe.AllowRunAsRoot && os.Geteuid() == 0 { + if cmd != "helper" && !cfg.AllowRunAsRoot(ctx) && os.Geteuid() == 0 { slog.Error(gotext.Get("Running ALR as root is forbidden as it may cause catastrophic damage to your system")) os.Exit(1) } @@ -98,9 +98,6 @@ func GetApp() *cli.App { return nil }, - After: func(ctx *cli.Context) error { - return db.Close() - }, EnableBashCompletion: true, } } @@ -110,11 +107,12 @@ func main() { logger.SetupDefault() app := GetApp() + cfg := config.New() ctx := context.Background() // Set the root command to the one set in the ALR config - manager.DefaultRootCmd = config.Config(ctx).RootCmd + manager.DefaultRootCmd = cfg.RootCmd(ctx) ctx, cancel := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM) defer cancel() diff --git a/pkg/build/build.go b/pkg/build/build.go index 0ecd9b3..38d91a5 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -306,7 +306,7 @@ func (b *Builder) executeFirstPass( interp.Env(expand.ListEnviron(env...)), // Устанавливаем окружение interp.StdIO(os.Stdin, os.Stdout, os.Stderr), // Устанавливаем стандартный ввод-вывод interp.ExecHandler(helpers.Restricted.ExecHandler(handlers.NopExec)), // Ограничиваем выполнение - interp.ReadDirHandler(handlers.RestrictedReadDir(scriptDir)), // Ограничиваем чтение директорий + interp.ReadDirHandler2(handlers.RestrictedReadDir(scriptDir)), // Ограничиваем чтение директорий interp.StatHandler(handlers.RestrictedStat(scriptDir)), // Ограничиваем доступ к статистике файлов interp.OpenHandler(handlers.RestrictedOpen(scriptDir)), // Ограничиваем открытие файлов ) @@ -395,9 +395,11 @@ func (b *Builder) executeSecondPass( fakeroot := handlers.FakerootExecHandler(2 * time.Second) // Настраиваем "fakeroot" для выполнения runner, err := interp.New( - interp.Env(expand.ListEnviron(env...)), // Устанавливаем окружение - interp.StdIO(os.Stdin, os.Stdout, os.Stderr), // Устанавливаем стандартный ввод-вывод - interp.ExecHandler(helpers.Helpers.ExecHandler(fakeroot)), // Обрабатываем выполнение через fakeroot + interp.Env(expand.ListEnviron(env...)), // Устанавливаем окружение + interp.StdIO(os.Stdin, os.Stdout, os.Stderr), // Устанавливаем стандартный ввод-вывод + interp.ExecHandlers(func(next interp.ExecHandlerFunc) interp.ExecHandlerFunc { + return helpers.Helpers.ExecHandler(fakeroot) + }), // Обрабатываем выполнение через fakeroot ) if err != nil { return nil, err diff --git a/pkg/distro/osrelease.go b/pkg/distro/osrelease.go index 4a9e2c3..8320f94 100644 --- a/pkg/distro/osrelease.go +++ b/pkg/distro/osrelease.go @@ -79,7 +79,7 @@ func ParseOSRelease(ctx context.Context) (*OSRelease, error) { runner, err := interp.New( interp.OpenHandler(handlers.NopOpen), interp.ExecHandler(handlers.NopExec), - interp.ReadDirHandler(handlers.NopReadDir), + interp.ReadDirHandler2(handlers.NopReadDir), interp.StatHandler(handlers.NopStat), interp.Env(expand.ListEnviron()), ) diff --git a/pkg/repos/pull.go b/pkg/repos/pull.go index 98a86fd..e1bad05 100644 --- a/pkg/repos/pull.go +++ b/pkg/repos/pull.go @@ -77,7 +77,7 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error { } slog.Info(gotext.Get("Pulling repository"), "name", repo.Name) - repoDir := filepath.Join(config.GetPaths(ctx).RepoDir, repo.Name) + repoDir := filepath.Join(rs.cfg.GetPaths(ctx).RepoDir, repo.Name) var repoFS billy.Filesystem gitDir := filepath.Join(repoDir, ".git") @@ -264,7 +264,7 @@ func (rs *Repos) processRepoChangesRunner(repoDir, scriptDir string) (*interp.Ru return interp.New( interp.Env(expand.ListEnviron(env...)), interp.ExecHandler(handlers.NopExec), - interp.ReadDirHandler(handlers.RestrictedReadDir(repoDir)), + interp.ReadDirHandler2(handlers.RestrictedReadDir(repoDir)), interp.StatHandler(handlers.RestrictedStat(repoDir)), interp.OpenHandler(handlers.RestrictedOpen(repoDir)), interp.StdIO(handlers.NopRWC{}, handlers.NopRWC{}, handlers.NopRWC{}), diff --git a/pkg/repos/repos_legacy.go b/pkg/repos/repos_legacy.go deleted file mode 100644 index 81b3bb6..0000000 --- a/pkg/repos/repos_legacy.go +++ /dev/null @@ -1,60 +0,0 @@ -// 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 . - -package repos - -import ( - "context" - "sync" - - "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" - database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" - "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" -) - -// Pull pulls the provided repositories. If a repo doesn't exist, it will be cloned -// and its packages will be written to the DB. If it does exist, it will be pulled. -// In this case, only changed packages will be processed if possible. -// If repos is set to nil, the repos in the ALR config will be used. -// -// Deprecated: use struct method -func Pull(ctx context.Context, repos []types.Repo) error { - return GetInstance(ctx).Pull(ctx, repos) -} - -// ======================= -// FOR LEGACY ONLY -// ======================= - -var ( - reposInstance *Repos - alrConfigOnce sync.Once -) - -// Deprecated: For legacy only -func GetInstance(ctx context.Context) *Repos { - alrConfigOnce.Do(func() { - cfg := config.GetInstance(ctx) - db := database.GetInstance(ctx) - - reposInstance = New( - cfg, - db, - ) - }) - - return reposInstance -} diff --git a/pkg/search/search.go b/pkg/search/search.go deleted file mode 100644 index 9716df9..0000000 --- a/pkg/search/search.go +++ /dev/null @@ -1,186 +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 . - -package search - -import ( - "context" - "errors" - "io" - "io/fs" - "os" - "path/filepath" - "strconv" - "strings" - - "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" - "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" -) - -// Filter represents search filters. -type Filter int - -// Filters -const ( - FilterNone Filter = iota - FilterInRepo - FilterSupportsArch -) - -// SoryBy represents a value that packages can be sorted by. -type SortBy int - -// Sort values -const ( - SortByNone = iota - SortByName - SortByRepo - SortByVersion -) - -// Package represents a package from ALR's database -type Package struct { - Name string - Version string - Release int - Epoch uint - Description map[string]string - Homepage map[string]string - Maintainer map[string]string - Architectures []string - Licenses []string - Provides []string - Conflicts []string - Replaces []string - Depends map[string][]string - BuildDepends map[string][]string - OptDepends map[string][]string - Repository string -} - -func convertPkg(p db.Package) Package { - return Package{ - Name: p.Name, - Version: p.Version, - Release: p.Release, - Epoch: p.Epoch, - Description: p.Description.Val, - Homepage: p.Homepage.Val, - Maintainer: p.Maintainer.Val, - Architectures: p.Architectures.Val, - Licenses: p.Licenses.Val, - Provides: p.Provides.Val, - Conflicts: p.Conflicts.Val, - Replaces: p.Replaces.Val, - Depends: p.Depends.Val, - BuildDepends: p.BuildDepends.Val, - OptDepends: p.OptDepends.Val, - Repository: p.Repository, - } -} - -// Options contains the options for a search. -type Options struct { - Filter Filter - FilterValue string - SortBy SortBy - Limit int64 - Query string -} - -// Search searches for packages in the database based on the given options. -func Search(ctx context.Context, opts Options) ([]Package, error) { - query := "(name LIKE ? OR description LIKE ? OR json_array_contains(provides, ?))" - args := []any{"%" + opts.Query + "%", "%" + opts.Query + "%", opts.Query} - - if opts.Filter != FilterNone { - switch opts.Filter { - case FilterInRepo: - query += " AND repository = ?" - case FilterSupportsArch: - query += " AND json_array_contains(architectures, ?)" - } - args = append(args, opts.FilterValue) - } - - if opts.SortBy != SortByNone { - switch opts.SortBy { - case SortByName: - query += " ORDER BY name" - case SortByRepo: - query += " ORDER BY repository" - case SortByVersion: - query += " ORDER BY version" - } - } - - if opts.Limit != 0 { - query += " LIMIT " + strconv.FormatInt(opts.Limit, 10) - } - - result, err := db.GetPkgs(ctx, query, args...) - if err != nil { - return nil, err - } - - var out []Package - for result.Next() { - pkg := db.Package{} - err = result.StructScan(&pkg) - if err != nil { - return nil, err - } - out = append(out, convertPkg(pkg)) - } - - return out, err -} - -// GetPkg gets a single package from the database and returns it. -func GetPkg(ctx context.Context, repo, name string) (Package, error) { - pkg, err := db.GetPkg(ctx, "name = ? AND repository = ?", name, repo) - return convertPkg(*pkg), err -} - -var ( - // ErrInvalidArgument is an error returned by GetScript when one of its arguments - // contain invalid characters - ErrInvalidArgument = errors.New("name and repository must not contain . or /") - - // ErrScriptNotFound is returned by GetScript if it can't find the script requested - // by the user. - ErrScriptNotFound = errors.New("requested script not found") -) - -// GetScript returns a reader containing the build script for a given package. -func GetScript(ctx context.Context, repo, name string) (io.ReadCloser, error) { - if strings.Contains(name, "./") || strings.ContainsAny(repo, "./") { - return nil, ErrInvalidArgument - } - - scriptPath := filepath.Join(config.GetPaths(ctx).RepoDir, repo, name, "alr.sh") - fl, err := os.Open(scriptPath) - if errors.Is(err, fs.ErrNotExist) { - return nil, ErrScriptNotFound - } else if err != nil { - return nil, err - } - - return fl, nil -} diff --git a/repo.go b/repo.go index de18f8a..d97cd1d 100644 --- a/repo.go +++ b/repo.go @@ -30,7 +30,7 @@ import ( "golang.org/x/exp/slices" "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" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) @@ -60,21 +60,24 @@ func AddRepoCmd() *cli.Command { name := c.String("name") repoURL := c.String("url") - cfg := config.Config(ctx) + cfg := config.New() + reposSlice := cfg.Repos(ctx) - for _, repo := range cfg.Repos { + for _, repo := range reposSlice { if repo.URL == repoURL { slog.Error("Repo already exists", "name", repo.Name) os.Exit(1) } } - cfg.Repos = append(cfg.Repos, types.Repo{ + reposSlice = append(reposSlice, types.Repo{ Name: name, URL: repoURL, }) - cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath) + cfg.SetRepos(ctx, reposSlice) + + cfgFl, err := os.Create(cfg.GetPaths(ctx).ConfigPath) if err != nil { slog.Error(gotext.Get("Error opening config file"), "err", err) os.Exit(1) @@ -86,7 +89,9 @@ func AddRepoCmd() *cli.Command { os.Exit(1) } - err = repos.Pull(ctx, cfg.Repos) + db := database.New(cfg) + rs := repos.New(cfg, db) + err = rs.Pull(ctx, cfg.Repos(ctx)) if err != nil { slog.Error(gotext.Get("Error pulling repos"), "err", err) os.Exit(1) @@ -114,11 +119,12 @@ func RemoveRepoCmd() *cli.Command { ctx := c.Context name := c.String("name") - cfg := config.Config(ctx) + cfg := config.New() found := false index := 0 - for i, repo := range cfg.Repos { + reposSlice := cfg.Repos(ctx) + for i, repo := range reposSlice { if repo.Name == name { index = i found = true @@ -129,9 +135,9 @@ func RemoveRepoCmd() *cli.Command { os.Exit(1) } - cfg.Repos = slices.Delete(cfg.Repos, index, index+1) + cfg.SetRepos(ctx, slices.Delete(reposSlice, index, index+1)) - cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath) + cfgFl, err := os.Create(cfg.GetPaths(ctx).ConfigPath) if err != nil { slog.Error(gotext.Get("Error opening config file"), "err", err) os.Exit(1) @@ -143,12 +149,17 @@ func RemoveRepoCmd() *cli.Command { os.Exit(1) } - err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name)) + err = os.RemoveAll(filepath.Join(cfg.GetPaths(ctx).RepoDir, name)) if err != nil { slog.Error(gotext.Get("Error removing repo directory"), "err", err) os.Exit(1) } + db := database.New(cfg) + err = db.Init(ctx) + if err != nil { + os.Exit(1) + } err = db.DeletePkgs(ctx, "repository = ?", name) if err != nil { slog.Error(gotext.Get("Error removing packages from database"), "err", err) @@ -167,7 +178,14 @@ func RefreshCmd() *cli.Command { Aliases: []string{"ref"}, Action: func(c *cli.Context) error { ctx := c.Context - err := repos.Pull(ctx, config.Config(ctx).Repos) + cfg := config.New() + db := database.New(cfg) + err := db.Init(ctx) + if err != nil { + os.Exit(1) + } + rs := repos.New(cfg, db) + err = rs.Pull(ctx, cfg.Repos(ctx)) if err != nil { slog.Error(gotext.Get("Error pulling repos"), "err", err) os.Exit(1)