Plemya-x/ALR
2
1
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases 27 Wiki Activity

Update config module #56

Merged
xpamych merged 2 commits from Maks1mS/ALR:fix/update-config-module into master 2025-03-22 12:47:17 +00:00
Conversation 0 Commits 2 Files Changed 30 +38 -21
6 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c705c25613 - Show all commits

4
assets/coverage-badge.svg
View File

@@ -11,7 +11,7 @@
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="33.5" y="15" fill="#010101" fill-opacity=".3">coverage</text>
<text x="33.5" y="14">coverage</text>
<text x="86" y="15" fill="#010101" fill-opacity=".3">19.5%</text>
<text x="86" y="14">19.5%</text>
<text x="86" y="15" fill="#010101" fill-opacity=".3">19.4%</text>
<text x="86" y="14">19.4%</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 926 B

After

Width:  |  Height:  |  Size: 926 B

4
assets/i18n-ru-badge.svg
View File

@@ -12,7 +12,7 @@
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="37" y="15" fill="#010101" fill-opacity=".3">ru translate</text>
<text x="37" y="14">ru translate</text>
<text x="100" y="15" fill="#010101" fill-opacity=".3">98.00%</text>
<text x="100" y="14">98.00%</text>
<text x="100" y="15" fill="#010101" fill-opacity=".3">97.00%</text>
<text x="100" y="14">97.00%</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 940 B

After

Width:  |  Height:  |  Size: 940 B

8
internal/config/config.go
View File

@@ -171,7 +171,13 @@ func (c *ALRConfig) GetPaths() *Paths {
}
func (c *ALRConfig) initPaths() {
err := os.MkdirAll(c.paths.RepoDir, 0o755)
err := os.MkdirAll(filepath.Dir(c.paths.UserConfigPath), 0o755)
if err != nil {
slog.Error(gotext.Get("Unable to create config directory"), "err", err)
os.Exit(1)
}
err = os.MkdirAll(c.paths.RepoDir, 0o755)
if err != nil {
slog.Error(gotext.Get("Unable to create repo cache directory"), "err", err)
os.Exit(1)

16
internal/translations/default.pot
View File

@@ -255,10 +255,14 @@ msgid "OPTIONS"
msgstr ""
#: internal/config/config.go:176
msgid "Unable to create repo cache directory"
msgid "Unable to create config directory"
msgstr ""
#: internal/config/config.go:182
msgid "Unable to create repo cache directory"
msgstr ""
#: internal/config/config.go:188
msgid "Unable to create package cache directory"
msgstr ""
@@ -449,7 +453,7 @@ msgstr ""
msgid "URL of the new repo"
msgstr ""
#: repo.go:86 repo.go:151
#: repo.go:86 repo.go:156
msgid "Error saving config"
msgstr ""
@@ -461,19 +465,19 @@ msgstr ""
msgid "Name of the repo to be deleted"
msgstr ""
#: repo.go:137
#: repo.go:142
msgid "Repo does not exist"
msgstr ""
#: repo.go:145
#: repo.go:150
msgid "Error removing repo directory"
msgstr ""
#: repo.go:162
#: repo.go:167
msgid "Error removing packages from database"
msgstr ""
#: repo.go:174
#: repo.go:179
msgid "Pull all repositories that have changed"
msgstr ""

20
internal/translations/po/ru/default.po
View File

@@ -263,10 +263,15 @@ msgid "OPTIONS"
msgstr "ПАРАМЕТРЫ"
#: internal/config/config.go:176
#, fuzzy
msgid "Unable to create config directory"
msgstr "Не удалось создать каталог конфигурации ALR"
#: internal/config/config.go:182
msgid "Unable to create repo cache directory"
msgstr "Не удалось создать каталог кэша репозитория"
#: internal/config/config.go:182
#: internal/config/config.go:188
msgid "Unable to create package cache directory"
msgstr "Не удалось создать каталог кэша пакетов"
@@ -466,7 +471,7 @@ msgstr "Название нового репозитория"
msgid "URL of the new repo"
msgstr "URL-адрес нового репозитория"
#: repo.go:86 repo.go:151
#: repo.go:86 repo.go:156
#, fuzzy
msgid "Error saving config"
msgstr "Ошибка при кодировании конфигурации"
@@ -479,19 +484,19 @@ msgstr "Удалить существующий репозиторий"
msgid "Name of the repo to be deleted"
msgstr "Название репозитория удалён"
#: repo.go:137
#: repo.go:142
msgid "Repo does not exist"
msgstr "Репозитория не существует"
#: repo.go:145
#: repo.go:150
msgid "Error removing repo directory"
msgstr "Ошибка при удалении каталога репозитория"
#: repo.go:162
#: repo.go:167
msgid "Error removing packages from database"
msgstr "Ошибка при удалении пакетов из базы данных"
#: repo.go:174
#: repo.go:179
msgid "Pull all repositories that have changed"
msgstr "Скачать все изменённые репозитории"
@@ -552,9 +557,6 @@ msgstr "Здесь нечего делать."
#~ msgid "Unable to detect user config directory"
#~ msgstr "Не удалось обнаружить каталог конфигурации пользователя"
#~ msgid "Unable to create ALR config directory"
#~ msgstr "Не удалось создать каталог конфигурации ALR"
#~ msgid "Unable to create ALR config file"
#~ msgstr "Не удалось создать конфигурационный файл ALR"

7
repo.go
View File

@@ -123,6 +123,11 @@ func RemoveRepoCmd() *cli.Command {
name := c.String("name")
cfg := config.New()
err := cfg.Load()
if err != nil {
slog.Error(gotext.Get("Error loading config"), "err", err)
os.Exit(1)
}
found := false
index := 0
@@ -140,7 +145,7 @@ func RemoveRepoCmd() *cli.Command {
cfg.SetRepos(slices.Delete(reposSlice, index, index+1))
err := os.RemoveAll(filepath.Join(cfg.GetPaths().RepoDir, name))
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)