refactor: remove legacy code

2025-02-19 12:12:55 +03:00
parent adc4a42800
commit 356ea7fb9f
21 changed files with 207 additions and 564 deletions
--- 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
+}
--- a/internal/config/config_legacy.go
+++ b/internal/config/config_legacy.go
@@ -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 <http://www.gnu.org/licenses/>.
-
-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
-}
--- 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)
-}
--- a/internal/db/db_legacy.go
+++ b/internal/db/db_legacy.go
@@ -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 <http://www.gnu.org/licenses/>.
-
-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
-}
--- 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
 }
--- 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 {
--- 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
 }

--- 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)
 			}
 		}

--- 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 ""

--- 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 "Исполнение версия()"