From ac35b4d71d76b0d12cb4c5a6b9e80d1d7c4f8be6 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Wed, 22 Jan 2025 14:40:11 +0300 Subject: [PATCH 1/6] feat: add new logger and translation --- Makefile | 5 + go.mod | 26 ++--- go.sum | 52 ++++++---- info.go | 132 ++++++++++++++----------- internal/config/config.go | 35 ++++--- internal/logger/log.go | 93 +++++++++++++++++ internal/translations/default.pot | 84 ++++++++++++++++ internal/translations/po/ru/default.po | 88 +++++++++++++++++ internal/translations/translations.go | 27 +++++ main.go | 120 +++++++++++----------- 10 files changed, 502 insertions(+), 160 deletions(-) create mode 100644 internal/logger/log.go create mode 100644 internal/translations/default.pot create mode 100644 internal/translations/po/ru/default.po diff --git a/Makefile b/Makefile index 1f2bb5f..2ce48af 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ INSTALLED_ZSH_COMPLETION := $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_$(NAME ADD_LICENSE_BIN := go run github.com/google/addlicense@4caba19b7ed7818bb86bc4cd20411a246aa4a524 GOLANGCI_LINT_BIN := go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2 +XGOTEXT_BIN := go run github.com/Tom5521/xgotext@v1.2.0 .PHONY: build install clean clear uninstall check-no-root @@ -60,3 +61,7 @@ update-license: fmt: $(GOLANGCI_LINT_BIN) run --fix + +i18n: + $(XGOTEXT_BIN) --output ./internal/translations/default.pot + msgmerge --backup=off -U ./internal/translations/po/ru/default.po ./internal/translations/default.pot \ No newline at end of file diff --git a/go.mod b/go.mod index 4db3d5a..4babd2b 100644 --- a/go.mod +++ b/go.mod @@ -10,11 +10,14 @@ require ( github.com/alecthomas/chroma/v2 v2.9.1 github.com/charmbracelet/bubbles v0.16.1 github.com/charmbracelet/bubbletea v0.24.2 - github.com/charmbracelet/lipgloss v0.8.0 + github.com/charmbracelet/lipgloss v0.10.0 + github.com/charmbracelet/log v0.4.0 github.com/go-git/go-billy/v5 v5.5.0 github.com/go-git/go-git/v5 v5.12.0 github.com/goreleaser/nfpm/v2 v2.41.0 + github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 github.com/jmoiron/sqlx v1.3.5 + github.com/leonelquinteros/gotext v1.7.0 github.com/mattn/go-isatty v0.0.19 github.com/mholt/archiver/v4 v4.0.0-alpha.8 github.com/mitchellh/mapstructure v1.5.0 @@ -27,10 +30,10 @@ require ( go.elara.ws/logger v0.0.0-20230421022458-e80700db2090 go.elara.ws/translate v0.0.0-20230421025926-32ccfcd110e6 go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4 - golang.org/x/crypto v0.23.0 + golang.org/x/crypto v0.27.0 golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb - golang.org/x/sys v0.20.0 - golang.org/x/text v0.15.0 + golang.org/x/sys v0.27.0 + golang.org/x/text v0.21.0 gopkg.in/yaml.v3 v3.0.1 modernc.org/sqlite v1.25.0 mvdan.cc/sh/v3 v3.7.0 @@ -63,6 +66,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.4 // indirect @@ -81,7 +85,7 @@ require ( github.com/klauspost/compress v1.17.11 // indirect github.com/klauspost/pgzip v1.2.6 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect - github.com/mattn/go-colorable v0.1.2 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-localereader v0.0.1 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect @@ -96,7 +100,7 @@ require ( github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect - github.com/rivo/uniseg v0.4.4 // indirect + github.com/rivo/uniseg v0.4.7 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/shopspring/decimal v1.2.0 // indirect @@ -110,11 +114,11 @@ require ( github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect go4.org v0.0.0-20200411211856-f5505b9728dd // indirect - golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/sync v0.5.0 // indirect - golang.org/x/term v0.20.0 // indirect - golang.org/x/tools v0.16.0 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/term v0.24.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gopkg.in/warnings.v0 v0.1.2 // indirect lukechampine.com/uint128 v1.2.0 // indirect modernc.org/cc/v3 v3.40.0 // indirect diff --git a/go.sum b/go.sum index 3580ddc..d249b53 100644 --- a/go.sum +++ b/go.sum @@ -77,8 +77,10 @@ github.com/charmbracelet/bubbles v0.16.1 h1:6uzpAAaT9ZqKssntbvZMlksWHruQLNxg49H5 github.com/charmbracelet/bubbles v0.16.1/go.mod h1:2QCp9LFlEsBQMvIYERr7Ww2H2bA7xen1idUDIzm/+Xc= github.com/charmbracelet/bubbletea v0.24.2 h1:uaQIKx9Ai6Gdh5zpTbGiWpytMU+CfsPp06RaW2cx/SY= github.com/charmbracelet/bubbletea v0.24.2/go.mod h1:XdrNrV4J8GiyshTtx3DNuYkR1FDaJmO3l2nejekbsgg= -github.com/charmbracelet/lipgloss v0.8.0 h1:IS00fk4XAHcf8uZKc3eHeMUTCxUH6NkaTrdyCQk84RU= -github.com/charmbracelet/lipgloss v0.8.0/go.mod h1:p4eYUZZJ/0oXTuCQKFF8mqyKCz0ja6y+7DniDDw5KKU= +github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s= +github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE= +github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM= +github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -127,6 +129,8 @@ github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZt github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= +github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= @@ -199,6 +203,8 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 h1:wMeVzrPO3mfHIWLZtDcSaGAe2I4PW9B/P5nMkRSwCAc= +github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o= github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -224,15 +230,19 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leonelquinteros/gotext v1.7.0 h1:jcJmF4AXqyamP7vuw2MMIKs+O3jAEmvrc5JQiI8Ht/8= +github.com/leonelquinteros/gotext v1.7.0/go.mod h1:qJdoQuERPpccw7L70uoU+K/BvTfRBHYsisCQyFLXyvw= github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= -github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= @@ -287,8 +297,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= -github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= @@ -370,8 +380,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -401,8 +411,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -423,8 +433,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -438,8 +448,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -469,15 +479,15 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -488,8 +498,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -518,8 +528,8 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= -golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/info.go b/info.go index 67eeb76..aad5e12 100644 --- a/info.go +++ b/info.go @@ -21,88 +21,102 @@ package main import ( "fmt" + "log/slog" "os" + "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" "gopkg.in/yaml.v3" "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" "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/loggerctx" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) -var infoCmd = &cli.Command{ - Name: "info", - Usage: "Print information about a package", - Flags: []cli.Flag{ - &cli.BoolFlag{ - Name: "all", - Aliases: []string{"a"}, - Usage: "Show all information, not just for the current distro", +func GetInfoCmd() *cli.Command { + return &cli.Command{ + Name: "info", + Usage: gotext.Get("Print information about a package"), + Flags: []cli.Flag{ + &cli.BoolFlag{ + Name: "all", + Aliases: []string{"a"}, + Usage: gotext.Get("Show all information, not just for the current distro"), + }, }, - }, - Action: func(c *cli.Context) error { - ctx := c.Context - log := loggerctx.From(ctx) + Action: func(c *cli.Context) error { + ctx := c.Context - args := c.Args() - if args.Len() < 1 { - log.Fatalf("Command info expected at least 1 argument, got %d", args.Len()).Send() - } + cfg := config.New() + db := db.New(cfg) + rs := repos.New(cfg, db) - err := repos.Pull(ctx, config.Config(ctx).Repos) - if err != nil { - log.Fatal("Error pulling repositories").Err(err).Send() - } - - found, _, err := repos.FindPkgs(ctx, args.Slice()) - if err != nil { - log.Fatal("Error finding packages").Err(err).Send() - } - - if len(found) == 0 { - os.Exit(1) - } - - pkgs := cliutils.FlattenPkgs(ctx, found, "show", c.Bool("interactive")) - - var names []string - all := c.Bool("all") - - if !all { - info, err := distro.ParseOSRelease(ctx) - if err != nil { - log.Fatal("Error parsing os-release file").Err(err).Send() + args := c.Args() + if args.Len() < 1 { + slog.Error(gotext.Get("Command info expected at least 1 argument, got %d", args.Len())) + os.Exit(1) } - names, err = overrides.Resolve( - info, - overrides.DefaultOpts. - WithLanguages([]string{config.SystemLang()}), - ) - if err != nil { - log.Fatal("Error resolving overrides").Err(err).Send() - } - } - for _, pkg := range pkgs { + err := rs.Pull(ctx, cfg.Repos(ctx)) + if err != nil { + slog.Error(gotext.Get("Error pulling repositories")) + os.Exit(1) + } + + found, _, err := rs.FindPkgs(ctx, args.Slice()) + if err != nil { + slog.Error(gotext.Get("Error finding packages"), "err", err) + os.Exit(1) + } + + if len(found) == 0 { + os.Exit(1) + } + + pkgs := cliutils.FlattenPkgs(ctx, found, "show", c.Bool("interactive")) + + var names []string + all := c.Bool("all") + if !all { - err = yaml.NewEncoder(os.Stdout).Encode(overrides.ResolvePackage(&pkg, names)) + info, err := distro.ParseOSRelease(ctx) if err != nil { - log.Fatal("Error encoding script variables").Err(err).Send() + slog.Error(gotext.Get("Error parsing os-release file"), "err", err) + os.Exit(1) } - } else { - err = yaml.NewEncoder(os.Stdout).Encode(pkg) + names, err = overrides.Resolve( + info, + overrides.DefaultOpts. + WithLanguages([]string{config.SystemLang()}), + ) if err != nil { - log.Fatal("Error encoding script variables").Err(err).Send() + slog.Error(gotext.Get("Error resolving overrides"), "err", err) + os.Exit(1) } } - fmt.Println("---") - } + for _, pkg := range pkgs { + if !all { + err = yaml.NewEncoder(os.Stdout).Encode(overrides.ResolvePackage(&pkg, names)) + if err != nil { + slog.Error(gotext.Get("Error encoding script variables"), "err", err) + os.Exit(1) + } + } else { + err = yaml.NewEncoder(os.Stdout).Encode(pkg) + if err != nil { + slog.Error(gotext.Get("Error encoding script variables"), "err", err) + os.Exit(1) + } + } - return nil - }, + fmt.Println("---") + } + + return nil + }, + } } diff --git a/internal/config/config.go b/internal/config/config.go index 3bea68f..10231d6 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -21,14 +21,16 @@ package config import ( "context" + "log/slog" "os" "path/filepath" "sync" "github.com/pelletier/go-toml/v2" + "github.com/leonelquinteros/gotext" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" ) type ALRConfig struct { @@ -56,10 +58,9 @@ func New() *ALRConfig { } func (c *ALRConfig) Load(ctx context.Context) { - log := loggerctx.From(ctx) cfgFl, err := os.Open(c.GetPaths(ctx).ConfigPath) if err != nil { - log.Warn("Error opening config file, using defaults").Err(err).Send() + slog.Warn(gotext.Get("Error opening config file, using defaults"), "err", err) c.cfg = defaultConfig return } @@ -72,27 +73,28 @@ func (c *ALRConfig) Load(ctx context.Context) { err = toml.NewDecoder(cfgFl).Decode(config) if err != nil { - log.Warn("Error decoding config file, using defaults").Err(err).Send() + slog.Warn(gotext.Get("Error decoding config file, using defaults"), "err", err) c.cfg = defaultConfig return } c.cfg = config } -func (c *ALRConfig) initPaths(ctx context.Context) { - log := loggerctx.From(ctx) +func (c *ALRConfig) initPaths() { paths := &Paths{} cfgDir, err := os.UserConfigDir() if err != nil { - log.Fatal("Unable to detect user config directory").Err(err).Send() + slog.Error(gotext.Get("Unable to detect user config directory"), "err", err) + os.Exit(1) } paths.ConfigDir = filepath.Join(cfgDir, "alr") err = os.MkdirAll(paths.ConfigDir, 0o755) if err != nil { - log.Fatal("Unable to create ALR config directory").Err(err).Send() + slog.Error(gotext.Get("Unable to create ALR config directory"), "err", err) + os.Exit(1) } paths.ConfigPath = filepath.Join(paths.ConfigDir, "alr.toml") @@ -100,12 +102,14 @@ func (c *ALRConfig) initPaths(ctx context.Context) { if _, err := os.Stat(paths.ConfigPath); err != nil { cfgFl, err := os.Create(paths.ConfigPath) if err != nil { - log.Fatal("Unable to create ALR config file").Err(err).Send() + slog.Error(gotext.Get("Unable to create ALR config file"), "err", err) + os.Exit(1) } err = toml.NewEncoder(cfgFl).Encode(&defaultConfig) if err != nil { - log.Fatal("Error encoding default configuration").Err(err).Send() + slog.Error(gotext.Get("Error encoding default configuration"), "err", err) + os.Exit(1) } cfgFl.Close() @@ -113,7 +117,8 @@ func (c *ALRConfig) initPaths(ctx context.Context) { cacheDir, err := os.UserCacheDir() if err != nil { - log.Fatal("Unable to detect cache directory").Err(err).Send() + slog.Error(gotext.Get("Unable to detect cache directory"), "err", err) + os.Exit(1) } paths.CacheDir = filepath.Join(cacheDir, "alr") @@ -122,12 +127,14 @@ func (c *ALRConfig) initPaths(ctx context.Context) { err = os.MkdirAll(paths.RepoDir, 0o755) if err != nil { - log.Fatal("Unable to create repo cache directory").Err(err).Send() + slog.Error(gotext.Get("Unable to create repo cache directory"), "err", err) + os.Exit(1) } err = os.MkdirAll(paths.PkgsDir, 0o755) if err != nil { - log.Fatal("Unable to create package cache directory").Err(err).Send() + slog.Error(gotext.Get("Unable to create package cache directory"), "err", err) + os.Exit(1) } paths.DBPath = filepath.Join(paths.CacheDir, "db") @@ -137,7 +144,7 @@ func (c *ALRConfig) initPaths(ctx context.Context) { func (c *ALRConfig) GetPaths(ctx context.Context) *Paths { c.pathsOnce.Do(func() { - c.initPaths(ctx) + c.initPaths() }) return c.paths } diff --git a/internal/logger/log.go b/internal/logger/log.go new file mode 100644 index 0000000..bea517a --- /dev/null +++ b/internal/logger/log.go @@ -0,0 +1,93 @@ +// 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 logger + +import ( + "context" + "log/slog" + "os" + + "github.com/charmbracelet/lipgloss" + "github.com/charmbracelet/log" + "github.com/leonelquinteros/gotext" +) + +type Logger struct { + lOut slog.Handler + lErr slog.Handler +} + +func setupOutLogger() *log.Logger { + styles := log.DefaultStyles() + logger := log.New(os.Stdout) + logger.SetStyles(styles) + return logger +} + +func setupErrorLogger() *log.Logger { + styles := log.DefaultStyles() + styles.Levels[log.ErrorLevel] = lipgloss.NewStyle(). + SetString(gotext.Get("ERROR")). + Padding(0, 1, 0, 1). + Background(lipgloss.Color("204")). + Foreground(lipgloss.Color("0")) + logger := log.New(os.Stderr) + logger.SetStyles(styles) + return logger +} + +func New() *Logger { + standardLogger := setupOutLogger() + errLogger := setupErrorLogger() + return &Logger{ + lOut: standardLogger, + lErr: errLogger, + } +} + +func (l *Logger) Enabled(ctx context.Context, level slog.Level) bool { + if level <= slog.LevelInfo { + return l.lOut.Enabled(ctx, level) + } + return l.lErr.Enabled(ctx, level) +} + +func (l *Logger) Handle(ctx context.Context, rec slog.Record) error { + if rec.Level <= slog.LevelInfo { + return l.lOut.Handle(ctx, rec) + } + return l.lErr.Handle(ctx, rec) +} + +func (l *Logger) WithAttrs(attrs []slog.Attr) slog.Handler { + sl := *l + sl.lOut = l.lOut.WithAttrs(attrs) + sl.lErr = l.lErr.WithAttrs(attrs) + return &sl +} + +func (l *Logger) WithGroup(name string) slog.Handler { + sl := *l + sl.lOut = l.lOut.WithGroup(name) + sl.lErr = l.lErr.WithGroup(name) + return &sl +} + +func SetupDefault() { + logger := slog.New(New()) + slog.SetDefault(logger) +} diff --git a/internal/translations/default.pot b/internal/translations/default.pot new file mode 100644 index 0000000..debb8ba --- /dev/null +++ b/internal/translations/default.pot @@ -0,0 +1,84 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: en\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: info.go:42 +msgid "Print information about a package" +msgstr "" + +#: info.go:47 +msgid "Show all information, not just for the current distro" +msgstr "" + +#: info.go:59 +msgid "Command info expected at least 1 argument, got %d" +msgstr "" + +#: info.go:65 +msgid "Error pulling repositories" +msgstr "" + +#: info.go:71 +msgid "Error finding packages" +msgstr "" + +#: info.go:87 +msgid "Error parsing os-release file" +msgstr "" + +#: info.go:96 +msgid "Error resolving overrides" +msgstr "" + +#: info.go:105 +#: info.go:111 +msgid "Error encoding script variables" +msgstr "" + +#: internal/config/config.go:63 +msgid "Error opening config file, using defaults" +msgstr "" + +#: internal/config/config.go:76 +msgid "Error decoding config file, using defaults" +msgstr "" + +#: internal/config/config.go:88 +msgid "Unable to detect user config directory" +msgstr "" + +#: internal/config/config.go:96 +msgid "Unable to create ALR config directory" +msgstr "" + +#: internal/config/config.go:105 +msgid "Unable to create ALR config file" +msgstr "" + +#: internal/config/config.go:111 +msgid "Error encoding default configuration" +msgstr "" + +#: internal/config/config.go:120 +msgid "Unable to detect cache directory" +msgstr "" + +#: internal/config/config.go:130 +msgid "Unable to create repo cache directory" +msgstr "" + +#: internal/config/config.go:136 +msgid "Unable to create package cache directory" +msgstr "" + +#: internal/logger/log.go:44 +msgid "ERROR" +msgstr "" + diff --git a/internal/translations/po/ru/default.po b/internal/translations/po/ru/default.po new file mode 100644 index 0000000..e8bd30c --- /dev/null +++ b/internal/translations/po/ru/default.po @@ -0,0 +1,88 @@ +# +# Maxim Slipenko , 2025. +# +msgid "" +msgstr "" +"PO-Revision-Date: 2025-01-22 14:23+0300\n" +"Last-Translator: Maxim Slipenko \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Gtranslator 47.1\n" +"Project-Id-Version: \n" +"Language-Team: Russian\n" + +#: info.go:42 +msgid "Print information about a package" +msgstr "Напечатать информацию о пакете" + +#: info.go:47 +msgid "Show all information, not just for the current distro" +msgstr "Показывать всю информацию, а не только для текущего дистрибутива" + +#: info.go:59 +msgid "Command info expected at least 1 argument, got %d" +msgstr "" + +#: info.go:65 +msgid "Error pulling repositories" +msgstr "" + +#: info.go:71 +msgid "Error finding packages" +msgstr "" + +#: info.go:87 +msgid "Error parsing os-release file" +msgstr "" + +#: info.go:96 +msgid "Error resolving overrides" +msgstr "" + +#: info.go:105 info.go:111 +msgid "Error encoding script variables" +msgstr "" + +#: internal/config/config.go:63 +msgid "Error opening config file, using defaults" +msgstr "" + +#: internal/config/config.go:76 +msgid "Error decoding config file, using defaults" +msgstr "" + +#: internal/config/config.go:88 +msgid "Unable to detect user config directory" +msgstr "" + +#: internal/config/config.go:96 +msgid "Unable to create ALR config directory" +msgstr "" + +#: internal/config/config.go:105 +msgid "Unable to create ALR config file" +msgstr "" + +#: internal/config/config.go:111 +msgid "Error encoding default configuration" +msgstr "" + +#: internal/config/config.go:120 +msgid "Unable to detect cache directory" +msgstr "" + +#: internal/config/config.go:130 +msgid "Unable to create repo cache directory" +msgstr "" + +#: internal/config/config.go:136 +msgid "Unable to create package cache directory" +msgstr "" + +#: internal/logger/log.go:44 +msgid "ERROR" +msgstr "ОШИБКА" diff --git a/internal/translations/translations.go b/internal/translations/translations.go index fddbb19..4e97b2a 100644 --- a/internal/translations/translations.go +++ b/internal/translations/translations.go @@ -22,8 +22,13 @@ package translations import ( "context" "embed" + "io/fs" + "os" + "path" "sync" + "github.com/jeandeaual/go-locale" + "github.com/leonelquinteros/gotext" "go.elara.ws/logger" "go.elara.ws/translate" "golang.org/x/text/language" @@ -56,3 +61,25 @@ func Translator(ctx context.Context) *translate.Translator { func NewLogger(ctx context.Context, l logger.Logger, lang language.Tag) *translate.TranslatedLogger { return translate.NewLogger(l, *Translator(ctx), lang) } + +//go:embed po +var poFS embed.FS + +func Setup() { + userLanguage, err := locale.GetLanguage() + if err != nil { + panic(err) + } + + _, err = fs.Stat(poFS, path.Join("po", userLanguage)) + if err != nil { + if os.IsNotExist(err) { + return + } + panic(err) + } + + loc := gotext.NewLocaleFSWithPath(userLanguage, &poFS, "po") + loc.SetDomain("default") + gotext.SetLocales([]*gotext.Locale{loc}) +} diff --git a/main.go b/main.go index 71dedec..f609daa 100644 --- a/main.go +++ b/main.go @@ -28,68 +28,18 @@ import ( "github.com/mattn/go-isatty" "github.com/urfave/cli/v2" - "go.elara.ws/logger" + + oldLogger "go.elara.ws/logger" "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/loggerctx" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" + + "gitea.plemya-x.ru/Plemya-x/ALR/internal/logger" ) -var app = &cli.App{ - Name: "alr", - Usage: "Any Linux Repository", - Flags: []cli.Flag{ - &cli.StringFlag{ - Name: "pm-args", - Aliases: []string{"P"}, - Usage: "Arguments to be passed on to the package manager", - }, - &cli.BoolFlag{ - Name: "interactive", - Aliases: []string{"i"}, - Value: isatty.IsTerminal(os.Stdin.Fd()), - Usage: "Enable interactive questions and prompts", - }, - }, - Commands: []*cli.Command{ - installCmd, - removeCmd, - upgradeCmd, - infoCmd, - listCmd, - buildCmd, - addrepoCmd, - removerepoCmd, - refreshCmd, - fixCmd, - genCmd, - helperCmd, - versionCmd, - }, - Before: func(c *cli.Context) error { - ctx := c.Context - log := loggerctx.From(ctx) - - cmd := c.Args().First() - if cmd != "helper" && !config.Config(ctx).Unsafe.AllowRunAsRoot && os.Geteuid() == 0 { - log.Fatal("Running ALR as root is forbidden as it may cause catastrophic damage to your system").Send() - } - - if trimmed := strings.TrimSpace(c.String("pm-args")); trimmed != "" { - args := strings.Split(trimmed, " ") - manager.Args = append(manager.Args, args...) - } - - return nil - }, - After: func(ctx *cli.Context) error { - return db.Close() - }, - EnableBashCompletion: true, -} - var versionCmd = &cli.Command{ Name: "version", Usage: "Print the current ALR version and exit", @@ -99,9 +49,69 @@ var versionCmd = &cli.Command{ }, } +func GetApp() *cli.App { + return &cli.App{ + Name: "alr", + Usage: "Any Linux Repository", + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "pm-args", + Aliases: []string{"P"}, + Usage: "Arguments to be passed on to the package manager", + }, + &cli.BoolFlag{ + Name: "interactive", + Aliases: []string{"i"}, + Value: isatty.IsTerminal(os.Stdin.Fd()), + Usage: "Enable interactive questions and prompts", + }, + }, + Commands: []*cli.Command{ + installCmd, + removeCmd, + upgradeCmd, + GetInfoCmd(), + listCmd, + buildCmd, + addrepoCmd, + removerepoCmd, + refreshCmd, + fixCmd, + genCmd, + helperCmd, + versionCmd, + }, + Before: func(c *cli.Context) error { + ctx := c.Context + log := loggerctx.From(ctx) + + cmd := c.Args().First() + if cmd != "helper" && !config.Config(ctx).Unsafe.AllowRunAsRoot && os.Geteuid() == 0 { + log.Fatal("Running ALR as root is forbidden as it may cause catastrophic damage to your system").Send() + } + + if trimmed := strings.TrimSpace(c.String("pm-args")); trimmed != "" { + args := strings.Split(trimmed, " ") + manager.Args = append(manager.Args, args...) + } + + return nil + }, + After: func(ctx *cli.Context) error { + return db.Close() + }, + EnableBashCompletion: true, + } +} + func main() { + translations.Setup() + logger.SetupDefault() + + app := GetApp() + ctx := context.Background() - log := translations.NewLogger(ctx, logger.NewCLI(os.Stderr), config.Language(ctx)) + log := translations.NewLogger(ctx, oldLogger.NewCLI(os.Stderr), config.Language(ctx)) ctx = loggerctx.With(ctx, log) // Set the root command to the one set in the ALR config From a6076b125362ca6c79e293573e9144797e5a744e Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Wed, 22 Jan 2025 16:37:16 +0300 Subject: [PATCH 2/6] chore: replace old logger with new --- Makefile | 1 + build.go | 19 +- fix.go | 19 +- helper.go | 13 +- install.go | 35 ++-- internal/cliutils/prompt.go | 12 +- internal/config/lang.go | 8 +- internal/db/db.go | 8 +- internal/db/db_legacy.go | 8 +- internal/dl/dl.go | 24 ++- internal/translations/default.pot | 255 +++++++++++++++++++++++- internal/translations/po/ru/default.po | 261 ++++++++++++++++++++++++- internal/translations/translations.go | 7 +- list.go | 23 ++- main.go | 13 +- pkg/build/build.go | 73 ++++--- pkg/build/findDeps.go | 17 +- pkg/build/install.go | 17 +- pkg/loggerctx/log.go | 48 ----- pkg/repos/pull.go | 13 +- repo.go | 36 ++-- upgrade.go | 18 +- 22 files changed, 707 insertions(+), 221 deletions(-) delete mode 100644 pkg/loggerctx/log.go diff --git a/Makefile b/Makefile index 2ce48af..5a74638 100644 --- a/Makefile +++ b/Makefile @@ -64,4 +64,5 @@ fmt: i18n: $(XGOTEXT_BIN) --output ./internal/translations/default.pot + msguniq --use-first -o ./internal/translations/default.pot ./internal/translations/default.pot msgmerge --backup=off -U ./internal/translations/po/ru/default.po ./internal/translations/default.pot \ No newline at end of file diff --git a/build.go b/build.go index c110f61..1b686f6 100644 --- a/build.go +++ b/build.go @@ -20,16 +20,17 @@ package main import ( + "log/slog" "os" "path/filepath" + "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" "gitea.plemya-x.ru/Plemya-x/ALR/internal/osutils" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) @@ -57,7 +58,6 @@ var buildCmd = &cli.Command{ }, Action: func(c *cli.Context) error { ctx := c.Context - log := loggerctx.From(ctx) script := c.String("script") if c.String("package") != "" { @@ -66,12 +66,14 @@ var buildCmd = &cli.Command{ err := repos.Pull(ctx, config.Config(ctx).Repos) if err != nil { - log.Fatal("Error pulling repositories").Err(err).Send() + slog.Error(gotext.Get("Error pulling repositories"), "err", err) + os.Exit(1) } mgr := manager.Detect() if mgr == nil { - log.Fatal("Unable to detect a supported package manager on the system").Send() + slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) + os.Exit(1) } pkgPaths, _, err := build.BuildPackage(ctx, types.BuildOpts{ @@ -81,19 +83,22 @@ var buildCmd = &cli.Command{ Interactive: c.Bool("interactive"), }) if err != nil { - log.Fatal("Error building package").Err(err).Send() + slog.Error(gotext.Get("Error building package"), "err", err) + os.Exit(1) } wd, err := os.Getwd() if err != nil { - log.Fatal("Error getting working directory").Err(err).Send() + slog.Error(gotext.Get("Error getting working directory"), "err", err) + os.Exit(1) } for _, pkgPath := range pkgPaths { name := filepath.Base(pkgPath) err = osutils.Move(pkgPath, filepath.Join(wd, name)) if err != nil { - log.Fatal("Error moving the package").Err(err).Send() + slog.Error(gotext.Get("Error moving the package"), "err", err) + os.Exit(1) } } diff --git a/fix.go b/fix.go index b0c8c0f..2f8e669 100644 --- a/fix.go +++ b/fix.go @@ -20,13 +20,14 @@ package main import ( + "log/slog" "os" + "github.com/leonelquinteros/gotext" "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/pkg/loggerctx" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) @@ -35,31 +36,33 @@ var fixCmd = &cli.Command{ Usage: "Attempt to fix problems with ALR", Action: func(c *cli.Context) error { ctx := c.Context - log := loggerctx.From(ctx) db.Close() paths := config.GetPaths(ctx) - log.Info("Removing cache directory").Send() + slog.Info(gotext.Get("Removing cache directory")) err := os.RemoveAll(paths.CacheDir) if err != nil { - log.Fatal("Unable to remove cache directory").Err(err).Send() + slog.Error(gotext.Get("Unable to remove cache directory"), "err", err) + os.Exit(1) } - log.Info("Rebuilding cache").Send() + slog.Info(gotext.Get("Rebuilding cache")) err = os.MkdirAll(paths.CacheDir, 0o755) if err != nil { - log.Fatal("Unable to create new cache directory").Err(err).Send() + slog.Error(gotext.Get("Unable to create new cache directory"), "err", err) + os.Exit(1) } err = repos.Pull(ctx, config.Config(ctx).Repos) if err != nil { - log.Fatal("Error pulling repos").Err(err).Send() + slog.Error(gotext.Get("Error pulling repos"), "err", err) + os.Exit(1) } - log.Info("Done").Send() + slog.Info(gotext.Get("Done")) return nil }, diff --git a/helper.go b/helper.go index e5cd70a..7988399 100644 --- a/helper.go +++ b/helper.go @@ -21,9 +21,11 @@ package main import ( "fmt" + "log/slog" "os" "strings" + "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" "mvdan.cc/sh/v3/expand" "mvdan.cc/sh/v3/interp" @@ -31,7 +33,6 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu" "gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" ) var helperCmd = &cli.Command{ @@ -49,7 +50,6 @@ var helperCmd = &cli.Command{ }, Action: func(c *cli.Context) error { ctx := c.Context - log := loggerctx.From(ctx) if c.Args().Len() < 1 { cli.ShowSubcommandHelpAndExit(c, 1) @@ -57,17 +57,20 @@ var helperCmd = &cli.Command{ helper, ok := helpers.Helpers[c.Args().First()] if !ok { - log.Fatal("No such helper command").Str("name", c.Args().First()).Send() + slog.Error(gotext.Get("No such helper command"), "name", c.Args().First()) + os.Exit(1) } wd, err := os.Getwd() if err != nil { - log.Fatal("Error getting working directory").Err(err).Send() + slog.Error(gotext.Get("Error getting working directory"), "err", err) + os.Exit(1) } info, err := distro.ParseOSRelease(ctx) if err != nil { - log.Fatal("Error getting working directory").Err(err).Send() + slog.Error(gotext.Get("Error getting working directory"), "err", err) + os.Exit(1) } hc := interp.HandlerContext{ diff --git a/install.go b/install.go index 501312b..c4f5a4c 100644 --- a/install.go +++ b/install.go @@ -21,7 +21,10 @@ package main import ( "fmt" + "log/slog" + "os" + "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" @@ -29,7 +32,6 @@ import ( "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/build" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) @@ -47,26 +49,29 @@ var installCmd = &cli.Command{ }, Action: func(c *cli.Context) error { ctx := c.Context - log := loggerctx.From(ctx) args := c.Args() if args.Len() < 1 { - log.Fatalf("Command install expected at least 1 argument, got %d", args.Len()).Send() + slog.Error(gotext.Get("Command install expected at least 1 argument, got %d", args.Len())) + os.Exit(1) } mgr := manager.Detect() if mgr == nil { - log.Fatal("Unable to detect a supported package manager on the system").Send() + slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) + os.Exit(1) } err := repos.Pull(ctx, config.Config(ctx).Repos) if err != nil { - log.Fatal("Error pulling repositories").Err(err).Send() + slog.Error(gotext.Get("Error pulling repositories"), "err", err) + os.Exit(1) } found, notFound, err := repos.FindPkgs(ctx, args.Slice()) if err != nil { - log.Fatal("Error finding packages").Err(err).Send() + slog.Error(gotext.Get("Error finding packages"), "err", err) + os.Exit(1) } pkgs := cliutils.FlattenPkgs(ctx, found, "install", c.Bool("interactive")) @@ -78,10 +83,10 @@ var installCmd = &cli.Command{ return nil }, BashComplete: func(c *cli.Context) { - log := loggerctx.From(c.Context) result, err := db.GetPkgs(c.Context, "true") if err != nil { - log.Fatal("Error getting packages").Err(err).Send() + slog.Error(gotext.Get("Error getting packages"), "err", err) + os.Exit(1) } defer result.Close() @@ -89,7 +94,8 @@ var installCmd = &cli.Command{ var pkg db.Package err = result.StructScan(&pkg) if err != nil { - log.Fatal("Error iterating over packages").Err(err).Send() + slog.Error(gotext.Get("Error iterating over packages"), "err", err) + os.Exit(1) } fmt.Println(pkg.Name) @@ -102,21 +108,22 @@ var removeCmd = &cli.Command{ Usage: "Remove an installed package", Aliases: []string{"rm"}, Action: func(c *cli.Context) error { - log := loggerctx.From(c.Context) - args := c.Args() if args.Len() < 1 { - log.Fatalf("Command remove expected at least 1 argument, got %d", args.Len()).Send() + slog.Error(gotext.Get("Command remove expected at least 1 argument, got %d", args.Len())) + os.Exit(1) } mgr := manager.Detect() if mgr == nil { - log.Fatal("Unable to detect a supported package manager on the system").Send() + slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) + os.Exit(1) } err := mgr.Remove(nil, c.Args().Slice()...) if err != nil { - log.Fatal("Error removing packages").Err(err).Send() + slog.Error(gotext.Get("Error removing packages"), "err", err) + os.Exit(1) } return nil diff --git a/internal/cliutils/prompt.go b/internal/cliutils/prompt.go index b89b80a..4173911 100644 --- a/internal/cliutils/prompt.go +++ b/internal/cliutils/prompt.go @@ -21,16 +21,17 @@ package cliutils import ( "context" + "log/slog" "os" "strings" "github.com/AlecAivazis/survey/v2" + "github.com/leonelquinteros/gotext" "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/pager" "gitea.plemya-x.ru/Plemya-x/ALR/internal/translations" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" ) // YesNoPrompt asks the user a yes or no question, using def as the default answer @@ -54,8 +55,6 @@ func YesNoPrompt(ctx context.Context, msg string, interactive, def bool) (bool, // shows it if they answer yes, then asks if they'd still like to // continue, and exits if they answer no. func PromptViewScript(ctx context.Context, script, name, style string, interactive bool) error { - log := loggerctx.From(ctx) - if !interactive { return nil } @@ -78,7 +77,8 @@ func PromptViewScript(ctx context.Context, script, name, style string, interacti } if !cont { - log.Fatal(translations.Translator(ctx).TranslateTo("User chose not to continue after reading script", config.Language(ctx))).Send() + slog.Error(gotext.Get("User chose not to continue after reading script")) + os.Exit(1) } } @@ -106,13 +106,13 @@ func ShowScript(path, name, style string) error { // FlattenPkgs attempts to flatten the a map of slices of packages into a single slice // of packages by prompting the user if multiple packages match. func FlattenPkgs(ctx context.Context, found map[string][]db.Package, verb string, interactive bool) []db.Package { - log := loggerctx.From(ctx) var outPkgs []db.Package for _, pkgs := range found { if len(pkgs) > 1 && interactive { choice, err := PkgPrompt(ctx, pkgs, verb, interactive) if err != nil { - log.Fatal("Error prompting for choice of package").Send() + slog.Error(gotext.Get("Error prompting for choice of package")) + os.Exit(1) } outPkgs = append(outPkgs, choice) } else if len(pkgs) == 1 || !interactive { diff --git a/internal/config/lang.go b/internal/config/lang.go index e1eaa22..4161775 100644 --- a/internal/config/lang.go +++ b/internal/config/lang.go @@ -21,13 +21,13 @@ package config import ( "context" + "log/slog" "os" "strings" "sync" + "github.com/leonelquinteros/gotext" "golang.org/x/text/language" - - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" ) var ( @@ -43,12 +43,12 @@ var ( func Language(ctx context.Context) language.Tag { langMtx.Lock() defer langMtx.Unlock() - log := loggerctx.From(ctx) if !langSet { syslang := SystemLang() tag, err := language.Parse(syslang) if err != nil { - log.Fatal("Error parsing system language").Err(err).Send() + slog.Error(gotext.Get("Error parsing system language"), "err", err) + os.Exit(1) } base, _ := tag.Base() lang = language.Make(base.String()) diff --git a/internal/db/db.go b/internal/db/db.go index 17f8ddc..05d873f 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -21,11 +21,12 @@ package db import ( "context" + "log/slog" "github.com/jmoiron/sqlx" + "github.com/leonelquinteros/gotext" "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" ) // CurrentVersion is the current version of the database. @@ -94,7 +95,6 @@ func (d *Database) GetConn() *sqlx.DB { } func (d *Database) initDB(ctx context.Context) error { - log := loggerctx.From(ctx) d.conn = d.conn.Unsafe() conn := d.conn _, err := conn.ExecContext(ctx, ` @@ -128,11 +128,11 @@ func (d *Database) initDB(ctx context.Context) error { ver, ok := d.GetVersion(ctx) if ok && ver != CurrentVersion { - log.Warn("Database version mismatch; resetting").Int("version", ver).Int("expected", CurrentVersion).Send() + slog.Warn(gotext.Get("Database version mismatch; resetting"), "version", ver, "expected", CurrentVersion) d.reset(ctx) return d.initDB(ctx) } else if !ok { - log.Warn("Database version does not exist. Run alr fix if something isn't working.").Send() + slog.Warn(gotext.Get("Database version does not exist. Run alr fix if something isn't working."), "version", ver, "expected", CurrentVersion) return d.addVersion(ctx, CurrentVersion) } diff --git a/internal/db/db_legacy.go b/internal/db/db_legacy.go index 4644933..1d6cc7a 100644 --- a/internal/db/db_legacy.go +++ b/internal/db/db_legacy.go @@ -18,12 +18,14 @@ 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" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" ) // DB returns the ALR database. @@ -92,12 +94,12 @@ var ( // Deprecated: For legacy only func GetInstance(ctx context.Context) *Database { dbOnce.Do(func() { - log := loggerctx.From(ctx) cfg := config.GetInstance(ctx) database = New(cfg) err := database.Init(ctx) if err != nil { - log.Fatal("Error opening database").Err(err).Send() + slog.Error(gotext.Get("Error opening database"), "err", err) + os.Exit(1) } }) return database diff --git a/internal/dl/dl.go b/internal/dl/dl.go index a3649f2..a8400bc 100644 --- a/internal/dl/dl.go +++ b/internal/dl/dl.go @@ -31,11 +31,13 @@ import ( "fmt" "hash" "io" + "log/slog" "os" "path/filepath" "strings" "github.com/PuerkitoBio/purell" + "github.com/leonelquinteros/gotext" "github.com/vmihailenco/msgpack/v5" "golang.org/x/crypto/blake2b" "golang.org/x/crypto/blake2s" @@ -43,7 +45,6 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" "gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" ) // Константа для имени файла манифеста кэша @@ -144,7 +145,6 @@ type UpdatingDownloader interface { // Функция Download загружает файл или каталог с использованием указанных параметров func Download(ctx context.Context, opts Options) (err error) { - log := loggerctx.From(ctx) cfg := config.GetInstance(ctx) dc := dlcache.New(cfg) @@ -166,7 +166,11 @@ func Download(ctx context.Context, opts Options) (err error) { if ok { var updated bool if d, ok := d.(UpdatingDownloader); ok { - log.Info("Source can be updated, updating if required").Str("source", opts.Name).Str("downloader", d.Name()).Send() + slog.Info( + gotext.Get("Source can be updated, updating if required"), + "source", opts.Name, + "downloader", d.Name(), + ) updated, err = d.Update(Options{ Hash: opts.Hash, @@ -193,10 +197,18 @@ func Download(ctx context.Context, opts Options) (err error) { } if ok && !updated { - log.Info("Source found in cache and linked to destination").Str("source", opts.Name).Stringer("type", t).Send() + slog.Info( + gotext.Get("Source found in cache and linked to destination"), + "source", opts.Name, + "type", t, + ) return nil } else if ok { - log.Info("Source updated and linked to destination").Str("source", opts.Name).Stringer("type", t).Send() + slog.Info( + gotext.Get("Source updated and linked to destination"), + "source", opts.Name, + "type", t, + ) return nil } } else { @@ -207,7 +219,7 @@ func Download(ctx context.Context, opts Options) (err error) { } } - log.Info("Downloading source").Str("source", opts.Name).Str("downloader", d.Name()).Send() + slog.Info("Downloading source", "source", opts.Name, "downloader", d.Name()) cacheDir, err = dc.New(ctx, opts.URL) if err != nil { diff --git a/internal/translations/default.pot b/internal/translations/default.pot index debb8ba..515ff4b 100644 --- a/internal/translations/default.pot +++ b/internal/translations/default.pot @@ -9,6 +9,54 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: build.go:69 +msgid "Error pulling repositories" +msgstr "" + +#: build.go:75 +msgid "Unable to detect a supported package manager on the system" +msgstr "" + +#: build.go:86 +msgid "Error building package" +msgstr "" + +#: build.go:92 +msgid "Error getting working directory" +msgstr "" + +#: build.go:100 +msgid "Error moving the package" +msgstr "" + +#: fix.go:43 +msgid "Removing cache directory" +msgstr "" + +#: fix.go:47 +msgid "Unable to remove cache directory" +msgstr "" + +#: fix.go:51 +msgid "Rebuilding cache" +msgstr "" + +#: fix.go:55 +msgid "Unable to create new cache directory" +msgstr "" + +#: fix.go:61 +msgid "Error pulling repos" +msgstr "" + +#: fix.go:65 +msgid "Done" +msgstr "" + +#: helper.go:60 +msgid "No such helper command" +msgstr "" + #: info.go:42 msgid "Print information about a package" msgstr "" @@ -21,10 +69,6 @@ msgstr "" msgid "Command info expected at least 1 argument, got %d" msgstr "" -#: info.go:65 -msgid "Error pulling repositories" -msgstr "" - #: info.go:71 msgid "Error finding packages" msgstr "" @@ -37,11 +81,38 @@ msgstr "" msgid "Error resolving overrides" msgstr "" -#: info.go:105 -#: info.go:111 +#: info.go:105 info.go:111 msgid "Error encoding script variables" msgstr "" +#: install.go:55 +msgid "Command install expected at least 1 argument, got %d" +msgstr "" + +#: install.go:88 +msgid "Error getting packages" +msgstr "" + +#: install.go:97 +msgid "Error iterating over packages" +msgstr "" + +#: install.go:113 +msgid "Command remove expected at least 1 argument, got %d" +msgstr "" + +#: install.go:125 +msgid "Error removing packages" +msgstr "" + +#: internal/cliutils/prompt.go:80 +msgid "User chose not to continue after reading script" +msgstr "" + +#: internal/cliutils/prompt.go:114 +msgid "Error prompting for choice of package" +msgstr "" + #: internal/config/config.go:63 msgid "Error opening config file, using defaults" msgstr "" @@ -78,7 +149,179 @@ msgstr "" msgid "Unable to create package cache directory" msgstr "" +#: internal/config/lang.go:50 +msgid "Error parsing system language" +msgstr "" + +#: internal/db/db.go:131 +msgid "Database version mismatch; resetting" +msgstr "" + +#: internal/db/db.go:135 +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 "" + +#: internal/dl/dl.go:201 +msgid "Source found in cache and linked to destination" +msgstr "" + +#: internal/dl/dl.go:208 +msgid "Source updated and linked to destination" +msgstr "" + #: internal/logger/log.go:44 msgid "ERROR" msgstr "" +#: internal/translations/translations.go:52 +msgid "Error creating new translator" +msgstr "" + +#: list.go:53 +msgid "Error initialization database" +msgstr "" + +#: list.go:87 +msgid "Error listing installed packages" +msgstr "" + +#: main.go:88 +msgid "" +"Running ALR as root is forbidden as it may cause catastrophic damage to your " +"system" +msgstr "" + +#: main.go:122 +msgid "Error while running app" +msgstr "" + +#: pkg/build/build.go:104 +msgid "Failed to prompt user to view build script" +msgstr "" + +#: pkg/build/build.go:108 +msgid "Building package" +msgstr "" + +#: pkg/build/build.go:152 +msgid "Downloading sources" +msgstr "" + +#: pkg/build/build.go:164 +msgid "Building package metadata" +msgstr "" + +#: pkg/build/build.go:186 +msgid "Compressing package" +msgstr "" + +#: pkg/build/build.go:323 +msgid "This package is already installed" +msgstr "" + +#: pkg/build/build.go:351 +msgid "Installing build dependencies" +msgstr "" + +#: pkg/build/build.go:393 +msgid "Installing dependencies" +msgstr "" + +#: pkg/build/build.go:435 +msgid "Executing version()" +msgstr "" + +#: pkg/build/build.go:460 +msgid "Executing prepare()" +msgstr "" + +#: pkg/build/build.go:470 +msgid "Executing build()" +msgstr "" + +#: pkg/build/build.go:482 +msgid "Executing package()" +msgstr "" + +#: pkg/build/build.go:557 +msgid "AutoProv is not implemented for this package format, so it's skiped" +msgstr "" + +#: pkg/build/build.go:568 +msgid "AutoReq is not implemented for this package format, so it's skiped" +msgstr "" + +#: pkg/build/build.go:759 +msgid "The checksums array must be the same length as sources" +msgstr "" + +#: pkg/build/findDeps.go:35 +msgid "Command not found on the system" +msgstr "" + +#: pkg/build/findDeps.go:82 +msgid "Provided dependency found" +msgstr "" + +#: pkg/build/findDeps.go:89 +msgid "Required dependency found" +msgstr "" + +#: pkg/build/install.go:42 +msgid "Error installing native packages" +msgstr "" + +#: pkg/build/install.go:79 +msgid "Error installing package" +msgstr "" + +#: pkg/repos/pull.go:75 +msgid "Pulling repository" +msgstr "" + +#: pkg/repos/pull.go:99 +msgid "Repository up to date" +msgstr "" + +#: pkg/repos/pull.go:156 +msgid "Git repository does not appear to be a valid ALR repo" +msgstr "" + +#: pkg/repos/pull.go:172 +msgid "" +"ALR repo's minumum ALR version is greater than the current version. Try " +"updating ALR if something doesn't work." +msgstr "" + +#: repo.go:78 repo.go:133 +msgid "Error opening config file" +msgstr "" + +#: repo.go:84 repo.go:139 +msgid "Error encoding config" +msgstr "" + +#: repo.go:125 +msgid "Repo does not exist" +msgstr "" + +#: repo.go:145 +msgid "Error removing repo directory" +msgstr "" + +#: repo.go:151 +msgid "Error removing packages from database" +msgstr "" + +#: upgrade.go:78 +msgid "Error checking for updates" +msgstr "" diff --git a/internal/translations/po/ru/default.po b/internal/translations/po/ru/default.po index e8bd30c..cad7f13 100644 --- a/internal/translations/po/ru/default.po +++ b/internal/translations/po/ru/default.po @@ -3,17 +3,65 @@ # msgid "" msgstr "" +"Project-Id-Version: \n" "PO-Revision-Date: 2025-01-22 14:23+0300\n" "Last-Translator: Maxim Slipenko \n" +"Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Gtranslator 47.1\n" -"Project-Id-Version: \n" -"Language-Team: Russian\n" + +#: build.go:69 +msgid "Error pulling repositories" +msgstr "" + +#: build.go:75 +msgid "Unable to detect a supported package manager on the system" +msgstr "" + +#: build.go:86 +msgid "Error building package" +msgstr "" + +#: build.go:92 +msgid "Error getting working directory" +msgstr "" + +#: build.go:100 +msgid "Error moving the package" +msgstr "" + +#: fix.go:43 +msgid "Removing cache directory" +msgstr "" + +#: fix.go:47 +msgid "Unable to remove cache directory" +msgstr "" + +#: fix.go:51 +msgid "Rebuilding cache" +msgstr "" + +#: fix.go:55 +msgid "Unable to create new cache directory" +msgstr "" + +#: fix.go:61 +msgid "Error pulling repos" +msgstr "" + +#: fix.go:65 +msgid "Done" +msgstr "" + +#: helper.go:60 +msgid "No such helper command" +msgstr "" #: info.go:42 msgid "Print information about a package" @@ -27,10 +75,6 @@ msgstr "Показывать всю информацию, а не только msgid "Command info expected at least 1 argument, got %d" msgstr "" -#: info.go:65 -msgid "Error pulling repositories" -msgstr "" - #: info.go:71 msgid "Error finding packages" msgstr "" @@ -47,6 +91,34 @@ msgstr "" msgid "Error encoding script variables" msgstr "" +#: install.go:55 +msgid "Command install expected at least 1 argument, got %d" +msgstr "" + +#: install.go:88 +msgid "Error getting packages" +msgstr "" + +#: install.go:97 +msgid "Error iterating over packages" +msgstr "" + +#: install.go:113 +msgid "Command remove expected at least 1 argument, got %d" +msgstr "" + +#: install.go:125 +msgid "Error removing packages" +msgstr "" + +#: internal/cliutils/prompt.go:80 +msgid "User chose not to continue after reading script" +msgstr "" + +#: internal/cliutils/prompt.go:114 +msgid "Error prompting for choice of package" +msgstr "" + #: internal/config/config.go:63 msgid "Error opening config file, using defaults" msgstr "" @@ -83,6 +155,179 @@ msgstr "" msgid "Unable to create package cache directory" msgstr "" +#: internal/config/lang.go:50 +msgid "Error parsing system language" +msgstr "" + +#: internal/db/db.go:131 +msgid "Database version mismatch; resetting" +msgstr "" + +#: internal/db/db.go:135 +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 "" + +#: internal/dl/dl.go:201 +msgid "Source found in cache and linked to destination" +msgstr "" + +#: internal/dl/dl.go:208 +msgid "Source updated and linked to destination" +msgstr "" + #: internal/logger/log.go:44 msgid "ERROR" msgstr "ОШИБКА" + +#: internal/translations/translations.go:52 +msgid "Error creating new translator" +msgstr "" + +#: list.go:53 +msgid "Error initialization database" +msgstr "" + +#: list.go:87 +msgid "Error listing installed packages" +msgstr "" + +#: main.go:88 +msgid "" +"Running ALR as root is forbidden as it may cause catastrophic damage to your " +"system" +msgstr "" + +#: main.go:122 +msgid "Error while running app" +msgstr "" + +#: pkg/build/build.go:104 +msgid "Failed to prompt user to view build script" +msgstr "" + +#: pkg/build/build.go:108 +msgid "Building package" +msgstr "" + +#: pkg/build/build.go:152 +msgid "Downloading sources" +msgstr "" + +#: pkg/build/build.go:164 +msgid "Building package metadata" +msgstr "" + +#: pkg/build/build.go:186 +msgid "Compressing package" +msgstr "" + +#: pkg/build/build.go:323 +msgid "This package is already installed" +msgstr "" + +#: pkg/build/build.go:351 +msgid "Installing build dependencies" +msgstr "" + +#: pkg/build/build.go:393 +msgid "Installing dependencies" +msgstr "" + +#: pkg/build/build.go:435 +msgid "Executing version()" +msgstr "" + +#: pkg/build/build.go:460 +msgid "Executing prepare()" +msgstr "" + +#: pkg/build/build.go:470 +msgid "Executing build()" +msgstr "" + +#: pkg/build/build.go:482 +msgid "Executing package()" +msgstr "" + +#: pkg/build/build.go:557 +msgid "AutoProv is not implemented for this package format, so it's skiped" +msgstr "" + +#: pkg/build/build.go:568 +msgid "AutoReq is not implemented for this package format, so it's skiped" +msgstr "" + +#: pkg/build/build.go:759 +msgid "The checksums array must be the same length as sources" +msgstr "" + +#: pkg/build/findDeps.go:35 +msgid "Command not found on the system" +msgstr "" + +#: pkg/build/findDeps.go:82 +msgid "Provided dependency found" +msgstr "" + +#: pkg/build/findDeps.go:89 +msgid "Required dependency found" +msgstr "" + +#: pkg/build/install.go:42 +msgid "Error installing native packages" +msgstr "" + +#: pkg/build/install.go:79 +msgid "Error installing package" +msgstr "" + +#: pkg/repos/pull.go:75 +msgid "Pulling repository" +msgstr "" + +#: pkg/repos/pull.go:99 +msgid "Repository up to date" +msgstr "" + +#: pkg/repos/pull.go:156 +msgid "Git repository does not appear to be a valid ALR repo" +msgstr "" + +#: pkg/repos/pull.go:172 +msgid "" +"ALR repo's minumum ALR version is greater than the current version. Try " +"updating ALR if something doesn't work." +msgstr "" + +#: repo.go:78 repo.go:133 +msgid "Error opening config file" +msgstr "" + +#: repo.go:84 repo.go:139 +msgid "Error encoding config" +msgstr "" + +#: repo.go:125 +msgid "Repo does not exist" +msgstr "" + +#: repo.go:145 +msgid "Error removing repo directory" +msgstr "" + +#: repo.go:151 +msgid "Error removing packages from database" +msgstr "" + +#: upgrade.go:78 +msgid "Error checking for updates" +msgstr "" diff --git a/internal/translations/translations.go b/internal/translations/translations.go index 4e97b2a..42fc2c7 100644 --- a/internal/translations/translations.go +++ b/internal/translations/translations.go @@ -23,6 +23,7 @@ import ( "context" "embed" "io/fs" + "log/slog" "os" "path" "sync" @@ -32,8 +33,6 @@ import ( "go.elara.ws/logger" "go.elara.ws/translate" "golang.org/x/text/language" - - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" ) //go:embed files @@ -47,11 +46,11 @@ var ( func Translator(ctx context.Context) *translate.Translator { mu.Lock() defer mu.Unlock() - log := loggerctx.From(ctx) if translator == nil { t, err := translate.NewFromFS(translationFS) if err != nil { - log.Fatal("Error creating new translator").Err(err).Send() + slog.Error(gotext.Get("Error creating new translator"), "err", err) + os.Exit(1) } translator = &t } diff --git a/list.go b/list.go index eadf491..e8f0a02 100644 --- a/list.go +++ b/list.go @@ -21,13 +21,15 @@ package main import ( "fmt" + "log/slog" + "os" + "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" "golang.org/x/exp/slices" "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/pkg/loggerctx" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) @@ -44,17 +46,18 @@ var listCmd = &cli.Command{ }, Action: func(c *cli.Context) error { ctx := c.Context - log := loggerctx.From(ctx) cfg := config.New() db := database.New(cfg) err := db.Init(ctx) if err != nil { - log.Fatal("Error initialization database").Err(err).Send() + 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 { - log.Fatal("Error pulling repositories").Err(err).Send() + slog.Error(gotext.Get("Error pulling repositories"), "err", err) + os.Exit(1) } where := "true" @@ -66,7 +69,8 @@ var listCmd = &cli.Command{ result, err := db.GetPkgs(ctx, where, args...) if err != nil { - log.Fatal("Error getting packages").Err(err).Send() + slog.Error(gotext.Get("Error getting packages"), "err", err) + os.Exit(1) } defer result.Close() @@ -74,12 +78,14 @@ var listCmd = &cli.Command{ if c.Bool("installed") { mgr := manager.Detect() if mgr == nil { - log.Fatal("Unable to detect a supported package manager on the system").Send() + slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) + os.Exit(1) } installed, err = mgr.ListInstalled(&manager.Opts{AsRoot: false}) if err != nil { - log.Fatal("Error listing installed packages").Err(err).Send() + slog.Error(gotext.Get("Error listing installed packages"), "err", err) + os.Exit(1) } } @@ -108,7 +114,8 @@ var listCmd = &cli.Command{ } if err != nil { - log.Fatal("Error iterating over packages").Err(err).Send() + slog.Error(gotext.Get("Error iterating over packages"), "err", err) + os.Exit(1) } return nil diff --git a/main.go b/main.go index f609daa..c9b3a05 100644 --- a/main.go +++ b/main.go @@ -21,20 +21,19 @@ package main import ( "context" + "log/slog" "os" "os/signal" "strings" "syscall" + "github.com/leonelquinteros/gotext" "github.com/mattn/go-isatty" "github.com/urfave/cli/v2" - oldLogger "go.elara.ws/logger" - "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/loggerctx" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" "gitea.plemya-x.ru/Plemya-x/ALR/internal/logger" @@ -83,11 +82,11 @@ func GetApp() *cli.App { }, Before: func(c *cli.Context) error { ctx := c.Context - log := loggerctx.From(ctx) cmd := c.Args().First() if cmd != "helper" && !config.Config(ctx).Unsafe.AllowRunAsRoot && os.Geteuid() == 0 { - log.Fatal("Running ALR as root is forbidden as it may cause catastrophic damage to your system").Send() + slog.Error(gotext.Get("Running ALR as root is forbidden as it may cause catastrophic damage to your system")) + os.Exit(1) } if trimmed := strings.TrimSpace(c.String("pm-args")); trimmed != "" { @@ -111,8 +110,6 @@ func main() { app := GetApp() ctx := context.Background() - log := translations.NewLogger(ctx, oldLogger.NewCLI(os.Stderr), config.Language(ctx)) - ctx = loggerctx.With(ctx, log) // Set the root command to the one set in the ALR config manager.DefaultRootCmd = config.Config(ctx).RootCmd @@ -122,6 +119,6 @@ func main() { err := app.RunContext(ctx, os.Args) if err != nil { - log.Error("Error while running app").Err(err).Send() + slog.Error(gotext.Get("Error while running app"), "err", err) } } diff --git a/pkg/build/build.go b/pkg/build/build.go index 74af4a0..249529a 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -25,6 +25,7 @@ import ( "encoding/hex" "fmt" "io" + "log/slog" "os" "path/filepath" "runtime" @@ -38,7 +39,7 @@ import ( _ "github.com/goreleaser/nfpm/v2/arch" _ "github.com/goreleaser/nfpm/v2/deb" _ "github.com/goreleaser/nfpm/v2/rpm" - "go.elara.ws/logger/log" + "github.com/leonelquinteros/gotext" "mvdan.cc/sh/v3/expand" "mvdan.cc/sh/v3/interp" "mvdan.cc/sh/v3/syntax" @@ -56,7 +57,6 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) @@ -64,7 +64,6 @@ import ( // Функция BuildPackage выполняет сборку скрипта по указанному пути. Возвращает два среза. // Один содержит пути к собранным пакетам, другой - имена собранных пакетов. func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string, error) { - log := loggerctx.From(ctx) reposInstance := repos.GetInstance(ctx) info, err := distro.ParseOSRelease(ctx) @@ -102,10 +101,11 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string // Спрашиваем у пользователя, хочет ли он увидеть скрипт сборки. err = cliutils.PromptViewScript(ctx, opts.Script, vars.Name, config.Config(ctx).PagerStyle, opts.Interactive) if err != nil { - log.Fatal("Failed to prompt user to view build script").Err(err).Send() + slog.Error(gotext.Get("Failed to prompt user to view build script"), "err", err) + os.Exit(1) } - log.Info("Building package").Str("name", vars.Name).Str("version", vars.Version).Send() + slog.Info(gotext.Get("Building package"), "name", vars.Name, "version", vars.Version) // Второй проход будет использоваться для выполнения реального кода, // поэтому он не ограничен. Скрипт уже был показан @@ -149,7 +149,7 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string return nil, nil, err } - log.Info("Downloading sources").Send() // Записываем в лог загрузку источников + slog.Info(gotext.Get("Downloading sources")) // Записываем в лог загрузку источников err = getSources(ctx, dirs, vars) // Загружаем исходники if err != nil { @@ -161,7 +161,7 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string return nil, nil, err } - log.Info("Building package metadata").Str("name", vars.Name).Send() // Логгируем сборку метаданных пакета + slog.Info(gotext.Get("Building package metadata"), "name", vars.Name) pkgFormat := getPkgFormat(opts.Manager) // Получаем формат пакета @@ -183,7 +183,7 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string return nil, nil, err } - log.Info("Compressing package").Str("name", pkgName).Send() // Логгируем сжатие пакета + slog.Info(gotext.Get("Compressing package"), "name", pkgName) // Логгируем сжатие пакета err = packager.Package(pkgInfo, pkgFile) // Упаковываем пакет if err != nil { @@ -308,7 +308,6 @@ func prepareDirs(dirs types.Directories) error { // Функция performChecks проверяет различные аспекты в системе, чтобы убедиться, что пакет может быть установлен. func performChecks(ctx context.Context, vars *types.BuildVars, interactive bool, installed map[string]string) (bool, error) { - log := loggerctx.From(ctx) if !cpu.IsCompatibleWith(cpu.Arch(), vars.Architectures) { // Проверяем совместимость архитектуры cont, err := cliutils.YesNoPrompt(ctx, "Your system's CPU architecture doesn't match this package. Do you want to build anyway?", interactive, true) if err != nil { @@ -321,10 +320,10 @@ func performChecks(ctx context.Context, vars *types.BuildVars, interactive bool, } if instVer, ok := installed[vars.Name]; ok { // Если пакет уже установлен, выводим предупреждение - log.Warn("This package is already installed"). - Str("name", vars.Name). - Str("version", instVer). - Send() + slog.Warn(gotext.Get("This package is already installed"), + "name", vars.Name, + "version", instVer, + ) } return true, nil @@ -337,7 +336,6 @@ type PackageFinder interface { // Функция installBuildDeps устанавливает все зависимости сборки, которые еще не установлены, и возвращает // срез, содержащий имена всех установленных пакетов. func installBuildDeps(ctx context.Context, repos PackageFinder, vars *types.BuildVars, opts types.BuildOpts) ([]string, error) { - log := loggerctx.From(ctx) var buildDeps []string if len(vars.BuildDepends) > 0 { deps, err := removeAlreadyInstalled(opts, vars.BuildDepends) @@ -350,7 +348,7 @@ func installBuildDeps(ctx context.Context, repos PackageFinder, vars *types.Buil return nil, err } - log.Info("Installing build dependencies").Send() // Логгируем установку зависимостей + slog.Info(gotext.Get("Installing build dependencies")) // Логгируем установку зависимостей flattened := cliutils.FlattenPkgs(ctx, found, "install", opts.Interactive) // Уплощаем список зависимостей buildDeps = packageNames(flattened) @@ -391,9 +389,8 @@ func installOptDeps(ctx context.Context, repos PackageFinder, vars *types.BuildV // пакетов, которые она собрала, а также все зависимости, которые не были найдены в ALR репозитории, // чтобы они могли быть установлены из системных репозиториев. func buildALRDeps(ctx context.Context, opts types.BuildOpts, vars *types.BuildVars) (builtPaths, builtNames, repoDeps []string, err error) { - log := loggerctx.From(ctx) if len(vars.Depends) > 0 { - log.Info("Installing dependencies").Send() + slog.Info(gotext.Get("Installing dependencies")) found, notFound, err := repos.FindPkgs(ctx, vars.Depends) // Поиск зависимостей if err != nil { @@ -433,10 +430,9 @@ func buildALRDeps(ctx context.Context, opts types.BuildOpts, vars *types.BuildVa // Функция executeFunctions выполняет специальные функции ALR, такие как version(), prepare() и т.д. func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Directories, vars *types.BuildVars) (err error) { - log := loggerctx.From(ctx) version, ok := dec.GetFunc("version") if ok { - log.Info("Executing version()").Send() + slog.Info(gotext.Get("Executing version()")) buf := &bytes.Buffer{} @@ -456,12 +452,12 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire } vars.Version = newVer - log.Info("Updating version").Str("new", newVer).Send() + slog.Info("Updating version", "new", newVer) } prepare, ok := dec.GetFunc("prepare") if ok { - log.Info("Executing prepare()").Send() + slog.Info(gotext.Get("Executing prepare()")) err = prepare(ctx, interp.Dir(dirs.SrcDir)) if err != nil { @@ -471,7 +467,7 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire build, ok := dec.GetFunc("build") if ok { - log.Info("Executing build()").Send() + slog.Info(gotext.Get("Executing build()")) err = build(ctx, interp.Dir(dirs.SrcDir)) if err != nil { @@ -483,24 +479,27 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire for { packageFn, ok := dec.GetFunc("package") if ok { - log.Info("Executing package()").Send() + slog.Info(gotext.Get("Executing package()")) err = packageFn(ctx, interp.Dir(dirs.SrcDir)) if err != nil { return err } } - // Проверка на наличие дополнительных функций package_* - packageFuncName := "package_" - if packageFunc, ok := dec.GetFunc(packageFuncName); ok { - log.Info("Executing " + packageFuncName).Send() - err = packageFunc(ctx, interp.Dir(dirs.SrcDir)) - if err != nil { - return err + /* + // Проверка на наличие дополнительных функций package_* + packageFuncName := "package_" + if packageFunc, ok := dec.GetFunc(packageFuncName); ok { + slog.Info("Executing " + packageFuncName) + err = packageFunc(ctx, interp.Dir(dirs.SrcDir)) + if err != nil { + return err + } + } else { + break // Если больше нет функций package_*, выходим из цикла } - } else { - break // Если больше нет функций package_*, выходим из цикла - } + */ + break } return nil @@ -555,7 +554,7 @@ func buildPkgMetadata(ctx context.Context, vars *types.BuildVars, dirs types.Dir return nil, err } } else { - log.Info("AutoProv is not implemented for this package format, so it's skiped").Send() + slog.Info(gotext.Get("AutoProv is not implemented for this package format, so it's skiped")) } } @@ -566,7 +565,7 @@ func buildPkgMetadata(ctx context.Context, vars *types.BuildVars, dirs types.Dir return nil, err } } else { - log.Info("AutoReq is not implemented for this package format, so it's skiped").Send() + slog.Info(gotext.Get("AutoReq is not implemented for this package format, so it's skiped")) } } @@ -756,9 +755,9 @@ func createBuildEnvVars(info *distro.OSRelease, dirs types.Directories) []string // Функция getSources загружает исходники скрипта. func getSources(ctx context.Context, dirs types.Directories, bv *types.BuildVars) error { - log := loggerctx.From(ctx) if len(bv.Sources) != len(bv.Checksums) { - log.Fatal("The checksums array must be the same length as sources").Send() + slog.Error(gotext.Get("The checksums array must be the same length as sources")) + os.Exit(1) } for i, src := range bv.Sources { diff --git a/pkg/build/findDeps.go b/pkg/build/findDeps.go index 7a40ec9..0090005 100644 --- a/pkg/build/findDeps.go +++ b/pkg/build/findDeps.go @@ -19,21 +19,20 @@ package build import ( "bytes" "context" + "log/slog" "os/exec" "path" "strings" "github.com/goreleaser/nfpm/v2" + "github.com/leonelquinteros/gotext" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" ) func rpmFindDependencies(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories, command string, updateFunc func(string)) error { - log := loggerctx.From(ctx) - if _, err := exec.LookPath(command); err != nil { - log.Info("Command not found on the system").Str("command", command).Send() + slog.Info(gotext.Get("Command not found on the system"), "command", command) return nil } @@ -64,7 +63,7 @@ func rpmFindDependencies(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Dir cmd.Stdout = &out cmd.Stderr = &stderr if err := cmd.Run(); err != nil { - log.Error(stderr.String()).Send() + slog.Error(stderr.String()) return err } @@ -79,19 +78,15 @@ func rpmFindDependencies(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Dir } func rpmFindProvides(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories) error { - log := loggerctx.From(ctx) - return rpmFindDependencies(ctx, pkgInfo, dirs, "/usr/lib/rpm/find-provides", func(dep string) { - log.Info("Provided dependency found").Str("dep", dep).Send() + slog.Info(gotext.Get("Provided dependency found"), "dep", dep) pkgInfo.Overridables.Provides = append(pkgInfo.Overridables.Provides, dep) }) } func rpmFindRequires(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories) error { - log := loggerctx.From(ctx) - return rpmFindDependencies(ctx, pkgInfo, dirs, "/usr/lib/rpm/find-requires", func(dep string) { - log.Info("Required dependency found").Str("dep", dep).Send() + slog.Info(gotext.Get("Required dependency found"), "dep", dep) pkgInfo.Overridables.Depends = append(pkgInfo.Overridables.Depends, dep) }) } diff --git a/pkg/build/install.go b/pkg/build/install.go index ea81eea..902fb93 100644 --- a/pkg/build/install.go +++ b/pkg/build/install.go @@ -21,24 +21,26 @@ package build import ( "context" + "log/slog" + "os" "path/filepath" + "github.com/leonelquinteros/gotext" + "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/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" ) // InstallPkgs устанавливает нативные пакеты с использованием менеджера пакетов, // затем строит и устанавливает пакеты ALR func InstallPkgs(ctx context.Context, alrPkgs []db.Package, nativePkgs []string, opts types.BuildOpts) { - log := loggerctx.From(ctx) // Инициализируем логгер из контекста - if len(nativePkgs) > 0 { err := opts.Manager.Install(nil, nativePkgs...) // Если есть нативные пакеты, выполняем их установку if err != nil { - log.Fatal("Error installing native packages").Err(err).Send() + slog.Error(gotext.Get("Error installing native packages"), "err", err) + os.Exit(1) // Логируем и завершаем выполнение при ошибке } } @@ -61,20 +63,21 @@ func GetScriptPaths(ctx context.Context, pkgs []db.Package) []string { // InstallScripts строит и устанавливает переданные alr скрипты сборки func InstallScripts(ctx context.Context, scripts []string, opts types.BuildOpts) { - log := loggerctx.From(ctx) // Получаем логгер из контекста for _, script := range scripts { opts.Script = script // Устанавливаем текущий скрипт в опции builtPkgs, _, err := BuildPackage(ctx, opts) // Выполняем сборку пакета if err != nil { - log.Fatal("Error building package").Err(err).Send() + slog.Error(gotext.Get("Error building package"), "err", err) + os.Exit(1) // Логируем и завершаем выполнение при ошибке сборки } err = opts.Manager.InstallLocal(nil, builtPkgs...) // Устанавливаем локально собранные пакеты if err != nil { - log.Fatal("Error installing package").Err(err).Send() + slog.Error(gotext.Get("Error installing package"), "err", err) + os.Exit(1) // Логируем и завершаем выполнение при ошибке установки } } diff --git a/pkg/loggerctx/log.go b/pkg/loggerctx/log.go deleted file mode 100644 index 4fc8d8c..0000000 --- a/pkg/loggerctx/log.go +++ /dev/null @@ -1,48 +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 loggerctx - -import ( - "context" - - "go.elara.ws/logger" -) - -// loggerCtxKey is used as the context key for loggers -type loggerCtxKey struct{} - -// With returns a copy of ctx containing log -func With(ctx context.Context, log logger.Logger) context.Context { - return context.WithValue(ctx, loggerCtxKey{}, log) -} - -// From attempts to get a logger from ctx. If ctx doesn't -// contain a logger, it returns a nop logger. -func From(ctx context.Context) logger.Logger { - if val := ctx.Value(loggerCtxKey{}); val != nil { - if log, ok := val.(logger.Logger); ok && log != nil { - return log - } else { - return logger.NewNop() - } - } else { - return logger.NewNop() - } -} diff --git a/pkg/repos/pull.go b/pkg/repos/pull.go index 9a68c8c..fdad00b 100644 --- a/pkg/repos/pull.go +++ b/pkg/repos/pull.go @@ -22,6 +22,7 @@ package repos import ( "context" "errors" + "log/slog" "net/url" "os" "path/filepath" @@ -31,6 +32,7 @@ import ( "github.com/go-git/go-billy/v5/osfs" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" + "github.com/leonelquinteros/gotext" "github.com/pelletier/go-toml/v2" "go.elara.ws/vercmp" "mvdan.cc/sh/v3/expand" @@ -41,7 +43,6 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" "gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" ) type actionType uint8 @@ -61,8 +62,6 @@ type action struct { // 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. func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error { - log := loggerctx.From(ctx) - if repos == nil { repos = rs.cfg.Repos(ctx) } @@ -73,7 +72,7 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error { return err } - log.Info("Pulling repository").Str("name", repo.Name).Send() + slog.Info(gotext.Get("Pulling repository"), "name", repo.Name) repoDir := filepath.Join(config.GetPaths(ctx).RepoDir, repo.Name) var repoFS billy.Filesystem @@ -97,7 +96,7 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error { err = w.PullContext(ctx, &git.PullOptions{Progress: os.Stderr}) if errors.Is(err, git.NoErrAlreadyUpToDate) { - log.Info("Repository up to date").Str("name", repo.Name).Send() + slog.Info(gotext.Get("Repository up to date"), "name", repo.Name) } else if err != nil { return err } @@ -154,7 +153,7 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error { fl, err := repoFS.Open("alr-repo.toml") if err != nil { - log.Warn("Git repository does not appear to be a valid ALR repo").Str("repo", repo.Name).Send() + slog.Warn(gotext.Get("Git repository does not appear to be a valid ALR repo"), "repo", repo.Name) continue } @@ -170,7 +169,7 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error { // to compare it to the repo version, so only compare versions with the "v". if strings.HasPrefix(config.Version, "v") { if vercmp.Compare(config.Version, repoCfg.Repo.MinVersion) == -1 { - log.Warn("ALR repo's minumum ALR version is greater than the current version. Try updating ALR if something doesn't work.").Str("repo", repo.Name).Send() + slog.Warn(gotext.Get("ALR repo's minumum ALR version is greater than the current version. Try updating ALR if something doesn't work."), "repo", repo.Name) } } } diff --git a/repo.go b/repo.go index c96e2ec..53865ed 100644 --- a/repo.go +++ b/repo.go @@ -20,9 +20,11 @@ package main import ( + "log/slog" "os" "path/filepath" + "github.com/leonelquinteros/gotext" "github.com/pelletier/go-toml/v2" "github.com/urfave/cli/v2" "golang.org/x/exp/slices" @@ -30,7 +32,6 @@ import ( "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/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) @@ -54,7 +55,6 @@ var addrepoCmd = &cli.Command{ }, Action: func(c *cli.Context) error { ctx := c.Context - log := loggerctx.From(ctx) name := c.String("name") repoURL := c.String("url") @@ -63,7 +63,8 @@ var addrepoCmd = &cli.Command{ for _, repo := range cfg.Repos { if repo.URL == repoURL { - log.Fatal("Repo already exists").Str("name", repo.Name).Send() + slog.Error("Repo already exists", "name", repo.Name) + os.Exit(1) } } @@ -74,17 +75,20 @@ var addrepoCmd = &cli.Command{ cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath) if err != nil { - log.Fatal("Error opening config file").Err(err).Send() + slog.Error(gotext.Get("Error opening config file"), "err", err) + os.Exit(1) } err = toml.NewEncoder(cfgFl).Encode(cfg) if err != nil { - log.Fatal("Error encoding config").Err(err).Send() + slog.Error(gotext.Get("Error encoding config"), "err", err) + os.Exit(1) } err = repos.Pull(ctx, cfg.Repos) if err != nil { - log.Fatal("Error pulling repos").Err(err).Send() + slog.Error(gotext.Get("Error pulling repos"), "err", err) + os.Exit(1) } return nil @@ -105,7 +109,6 @@ var removerepoCmd = &cli.Command{ }, Action: func(c *cli.Context) error { ctx := c.Context - log := loggerctx.From(ctx) name := c.String("name") cfg := config.Config(ctx) @@ -119,29 +122,34 @@ var removerepoCmd = &cli.Command{ } } if !found { - log.Fatal("Repo does not exist").Str("name", name).Send() + slog.Error(gotext.Get("Repo does not exist"), "name", name) + os.Exit(1) } cfg.Repos = slices.Delete(cfg.Repos, index, index+1) cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath) if err != nil { - log.Fatal("Error opening config file").Err(err).Send() + slog.Error(gotext.Get("Error opening config file"), "err", err) + os.Exit(1) } err = toml.NewEncoder(cfgFl).Encode(&cfg) if err != nil { - log.Fatal("Error encoding config").Err(err).Send() + slog.Error(gotext.Get("Error encoding config"), "err", err) + os.Exit(1) } err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name)) if err != nil { - log.Fatal("Error removing repo directory").Err(err).Send() + slog.Error(gotext.Get("Error removing repo directory"), "err", err) + os.Exit(1) } err = db.DeletePkgs(ctx, "repository = ?", name) if err != nil { - log.Fatal("Error removing packages from database").Err(err).Send() + slog.Error(gotext.Get("Error removing packages from database"), "err", err) + os.Exit(1) } return nil @@ -154,10 +162,10 @@ var refreshCmd = &cli.Command{ Aliases: []string{"ref"}, Action: func(c *cli.Context) error { ctx := c.Context - log := loggerctx.From(ctx) err := repos.Pull(ctx, config.Config(ctx).Repos) if err != nil { - log.Fatal("Error pulling repos").Err(err).Send() + slog.Error(gotext.Get("Error pulling repos"), "err", err) + os.Exit(1) } return nil }, diff --git a/upgrade.go b/upgrade.go index af48c09..c64f33c 100644 --- a/upgrade.go +++ b/upgrade.go @@ -22,8 +22,12 @@ package main import ( "context" "fmt" + "log/slog" + "os" + "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" + "go.elara.ws/logger/log" "go.elara.ws/vercmp" "golang.org/x/exp/maps" "golang.org/x/exp/slices" @@ -33,7 +37,6 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) @@ -51,26 +54,29 @@ var upgradeCmd = &cli.Command{ }, Action: func(c *cli.Context) error { ctx := c.Context - log := loggerctx.From(ctx) info, err := distro.ParseOSRelease(ctx) if err != nil { - log.Fatal("Error parsing os-release file").Err(err).Send() + slog.Error(gotext.Get("Error parsing os-release file"), "err", err) + os.Exit(1) } mgr := manager.Detect() if mgr == nil { - log.Fatal("Unable to detect a supported package manager on the system").Send() + slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) + os.Exit(1) } err = repos.Pull(ctx, config.Config(ctx).Repos) if err != nil { - log.Fatal("Error pulling repos").Err(err).Send() + slog.Error(gotext.Get("Error pulling repos"), "err", err) + os.Exit(1) } updates, err := checkForUpdates(ctx, mgr, info) if err != nil { - log.Fatal("Error checking for updates").Err(err).Send() + slog.Error(gotext.Get("Error checking for updates"), "err", err) + os.Exit(1) } if len(updates) > 0 { From b9bf908007807b398ce98d0149d501a6508068a6 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Wed, 22 Jan 2025 16:53:30 +0300 Subject: [PATCH 3/6] chore: remove legacy translation system --- internal/cliutils/prompt.go | 13 +- internal/dl/dl.go | 2 +- internal/translations/default.pot | 38 ++++- internal/translations/files/lure.en.toml | 174 ----------------------- internal/translations/files/lure.ru.toml | 170 ---------------------- internal/translations/po/ru/default.po | 60 +++++--- internal/translations/translations.go | 32 ----- pkg/build/build.go | 4 +- 8 files changed, 83 insertions(+), 410 deletions(-) delete mode 100644 internal/translations/files/lure.en.toml delete mode 100644 internal/translations/files/lure.ru.toml diff --git a/internal/cliutils/prompt.go b/internal/cliutils/prompt.go index 4173911..19855c6 100644 --- a/internal/cliutils/prompt.go +++ b/internal/cliutils/prompt.go @@ -28,10 +28,8 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/leonelquinteros/gotext" - "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/pager" - "gitea.plemya-x.ru/Plemya-x/ALR/internal/translations" ) // YesNoPrompt asks the user a yes or no question, using def as the default answer @@ -40,7 +38,7 @@ func YesNoPrompt(ctx context.Context, msg string, interactive, def bool) (bool, var answer bool err := survey.AskOne( &survey.Confirm{ - Message: translations.Translator(ctx).TranslateTo(msg, config.Language(ctx)), + Message: msg, Default: def, }, &answer, @@ -59,8 +57,7 @@ func PromptViewScript(ctx context.Context, script, name, style string, interacti return nil } - scriptPrompt := translations.Translator(ctx).TranslateTo("Would you like to view the build script for", config.Language(ctx)) + " " + name - view, err := YesNoPrompt(ctx, scriptPrompt, interactive, false) + view, err := YesNoPrompt(ctx, gotext.Get("Would you like to view the build script for %s", name), interactive, false) if err != nil { return err } @@ -71,7 +68,7 @@ func PromptViewScript(ctx context.Context, script, name, style string, interacti return err } - cont, err := YesNoPrompt(ctx, "Would you still like to continue?", interactive, false) + cont, err := YesNoPrompt(ctx, gotext.Get("Would you still like to continue?"), interactive, false) if err != nil { return err } @@ -135,7 +132,7 @@ func PkgPrompt(ctx context.Context, options []db.Package, verb string, interacti prompt := &survey.Select{ Options: names, - Message: translations.Translator(ctx).TranslateTo("Choose which package to "+verb, config.Language(ctx)), + Message: gotext.Get("Choose which package to %s", verb), } var choice int @@ -156,7 +153,7 @@ func ChooseOptDepends(ctx context.Context, options []string, verb string, intera prompt := &survey.MultiSelect{ Options: options, - Message: translations.Translator(ctx).TranslateTo("Choose which optional package(s) to install", config.Language(ctx)), + Message: gotext.Get("Choose which optional package(s) to install"), } var choices []int diff --git a/internal/dl/dl.go b/internal/dl/dl.go index a8400bc..75e25d1 100644 --- a/internal/dl/dl.go +++ b/internal/dl/dl.go @@ -219,7 +219,7 @@ func Download(ctx context.Context, opts Options) (err error) { } } - slog.Info("Downloading source", "source", opts.Name, "downloader", d.Name()) + slog.Info(gotext.Get("Downloading source"), "source", opts.Name, "downloader", d.Name()) cacheDir, err = dc.New(ctx, opts.URL) if err != nil { diff --git a/internal/translations/default.pot b/internal/translations/default.pot index 515ff4b..5257adb 100644 --- a/internal/translations/default.pot +++ b/internal/translations/default.pot @@ -105,14 +105,30 @@ msgstr "" msgid "Error removing packages" msgstr "" -#: internal/cliutils/prompt.go:80 +#: internal/cliutils/prompt.go:60 +msgid "Would you like to view the build script for %s" +msgstr "" + +#: internal/cliutils/prompt.go:71 +msgid "Would you still like to continue?" +msgstr "" + +#: internal/cliutils/prompt.go:77 msgid "User chose not to continue after reading script" msgstr "" -#: internal/cliutils/prompt.go:114 +#: internal/cliutils/prompt.go:111 msgid "Error prompting for choice of package" msgstr "" +#: internal/cliutils/prompt.go:135 +msgid "Choose which package to %s" +msgstr "" + +#: internal/cliutils/prompt.go:156 +msgid "Choose which optional package(s) to install" +msgstr "" + #: internal/config/config.go:63 msgid "Error opening config file, using defaults" msgstr "" @@ -178,12 +194,12 @@ msgstr "" msgid "Source updated and linked to destination" msgstr "" -#: internal/logger/log.go:44 -msgid "ERROR" +#: internal/dl/dl.go:222 +msgid "Downloading source" msgstr "" -#: internal/translations/translations.go:52 -msgid "Error creating new translator" +#: internal/logger/log.go:44 +msgid "ERROR" msgstr "" #: list.go:53 @@ -224,6 +240,12 @@ msgstr "" msgid "Compressing package" msgstr "" +#: pkg/build/build.go:312 +msgid "" +"Your system's CPU architecture doesn't match this package. Do you want to " +"build anyway?" +msgstr "" + #: pkg/build/build.go:323 msgid "This package is already installed" msgstr "" @@ -260,6 +282,10 @@ msgstr "" msgid "AutoReq is not implemented for this package format, so it's skiped" msgstr "" +#: pkg/build/build.go:653 +msgid "Would you like to remove the build dependencies?" +msgstr "" + #: pkg/build/build.go:759 msgid "The checksums array must be the same length as sources" msgstr "" diff --git a/internal/translations/files/lure.en.toml b/internal/translations/files/lure.en.toml deleted file mode 100644 index 73bb01f..0000000 --- a/internal/translations/files/lure.en.toml +++ /dev/null @@ -1,174 +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 . - -[[translation]] -id = 1228660974 -value = 'Pulling repository' - -[[translation]] -id = 2779805870 -value = 'Repository up to date' - -[[translation]] -id = 1433222829 -value = 'Would you like to view the build script for' - -[[translation]] -id = 2470847050 -value = 'Failed to prompt user to view build script' - -[[translation]] -id = 855659503 -value = 'Would you still like to continue?' - -[[translation]] -id = 1997041569 -value = 'User chose not to continue after reading script' - -[[translation]] -id = 2347700990 -value = 'Building package' - -[[translation]] -id = 2105058868 -value = 'Downloading sources' - -[[translation]] -id = 1884485082 -value = 'Downloading source' - -[[translation]] -id = 1519177982 -value = 'Error building package' - -[[translation]] -id = 2125220917 -value = 'Choose which package(s) to install' - -[[translation]] -id = 812531604 -value = 'Error prompting for choice of package' - -[[translation]] -id = 1040982801 -value = 'Updating version' - -[[translation]] -id = 1014897988 -value = 'Remove build dependencies?' - -[[translation]] -id = 2205430948 -value = 'Installing build dependencies' - -[[translation]] -id = 2522710805 -value = 'Installing dependencies' - -[[translation]] -id = 3602138206 -value = 'Error installing package' - -[[translation]] -id = 2235794125 -value = 'Would you like to remove build dependencies?' - -[[translation]] -id = 2562049386 -value = "Your system's CPU architecture doesn't match this package. Do you want to build anyway?" - -[[translation]] -id = 4006393493 -value = 'The checksums array must be the same length as sources' - -[[translation]] -id = 3759891273 -value = 'The package() function is required' - -[[translation]] -id = 1057080231 -value = 'Executing package()' - -[[translation]] -id = 2687735200 -value = 'Executing prepare()' - -[[translation]] -id = 535572372 -value = 'Executing version()' - -[[translation]] -id = 436644691 -value = 'Executing build()' - -[[translation]] -id = 1393316459 -value = 'This package is already installed' - -[[translation]] -id = 1267660189 -value = 'Source can be updated, updating if required' - -[[translation]] -id = 21753247 -value = 'Source found in cache, linked to destination' - -[[translation]] -id = 257354570 -value = 'Compressing package' - -[[translation]] -id = 2952487371 -value = 'Building package metadata' - -[[translation]] -id = 3121791194 -value = 'Running ALR as root is forbidden as it may cause catastrophic damage to your system' - -[[translation]] -id = 1256604213 -value = 'Waiting for torrent metadata' - -[[translation]] -id = 432261354 -value = 'Downloading torrent file' - -[[translation]] -id = 1579384326 -value = 'name' - -[[translation]] -id = 3206337475 -value = 'version' - -[[translation]] -id = 1810056261 -value = 'new' - -[[translation]] -id = 1602912115 -value = 'source' - -[[translation]] -id = 2363381545 -value = 'type' - -[[translation]] -id = 3419504365 -value = 'downloader' diff --git a/internal/translations/files/lure.ru.toml b/internal/translations/files/lure.ru.toml deleted file mode 100644 index 39d6d41..0000000 --- a/internal/translations/files/lure.ru.toml +++ /dev/null @@ -1,170 +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 . - -[[translation]] -id = 1228660974 -value = 'Скачивание репозитория' - -[[translation]] -id = 2779805870 -value = 'Репозиторий уже обновлен' - -[[translation]] -id = 1433222829 -value = 'Показать скрипт для пакета' - -[[translation]] -id = 2470847050 -value = 'Не удалось предложить просмотреть скрипт' - -[[translation]] -id = 855659503 -value = 'Продолжить?' - -[[translation]] -id = 1997041569 -value = 'Пользователь решил не продолжать после просмотра скрипта' - -[[translation]] -id = 2347700990 -value = 'Сборка пакета' - -[[translation]] -id = 2105058868 -value = 'Скачивание файлов' - -[[translation]] -id = 1884485082 -value = 'Скачивание источника' - -[[translation]] -id = 1519177982 -value = 'Ошибка при сборке пакета' - -[[translation]] -id = 2125220917 -value = 'Выберите, какие пакеты установить' - -[[translation]] -id = 812531604 -value = 'Ошибка при запросе выбора пакета' - -[[translation]] -id = 1040982801 -value = 'Обновление версии' - -[[translation]] -id = 2235794125 -value = 'Удалить зависимости сборки?' - -[[translation]] -id = 2205430948 -value = 'Установка зависимостей сборки' - -[[translation]] -id = 2522710805 -value = 'Установка зависимостей' - -[[translation]] -id = 3602138206 -value = 'Ошибка при установке пакета' - -[[translation]] -id = 1057080231 -value = 'Вызов функции package()' - -[[translation]] -id = 2687735200 -value = 'Вызов функции prepare()' - -[[translation]] -id = 535572372 -value = 'Вызов функции version()' - -[[translation]] -id = 436644691 -value = 'Вызов функции build()' - -[[translation]] -id = 2562049386 -value = "Архитектура процессора вашей системы не соответствует этому пакету. Продолжать несмотря на это?" - -[[translation]] -id = 3759891273 -value = 'Функция package() необходима' - -[[translation]] -id = 4006393493 -value = 'Массив checksums должен быть той же длины, что и sources' - -[[translation]] -id = 1393316459 -value = 'Этот пакет уже установлен' - -[[translation]] -id = 1267660189 -value = 'Источник может быть обновлен, если требуется, обновляем' - -[[translation]] -id = 21753247 -value = 'Источник найден в кэше' - -[[translation]] -id = 257354570 -value = 'Сжатие пакета' - -[[translation]] -id = 2952487371 -value = 'Создание метаданных пакета' - -[[translation]] -id = 3121791194 -value = 'Запуск ALR от имени root запрещен, так как это может привести к катастрофическому повреждению вашей системы' - -[[translation]] -id = 1256604213 -value = 'Ожидание метаданных торрента' - -[[translation]] -id = 432261354 -value = 'Скачивание торрент-файла' - -[[translation]] -id = 1579384326 -value = 'название' - -[[translation]] -id = 3206337475 -value = 'версия' - -[[translation]] -id = 1810056261 -value = 'новая' - -[[translation]] -id = 1602912115 -value = 'источник' - -[[translation]] -id = 2363381545 -value = 'вид' - -[[translation]] -id = 3419504365 -value = 'протокол-скачивание' \ No newline at end of file diff --git a/internal/translations/po/ru/default.po b/internal/translations/po/ru/default.po index cad7f13..df99b01 100644 --- a/internal/translations/po/ru/default.po +++ b/internal/translations/po/ru/default.po @@ -3,16 +3,16 @@ # msgid "" msgstr "" -"Project-Id-Version: \n" -"PO-Revision-Date: 2025-01-22 14:23+0300\n" +"Project-Id-Version: unnamed project\n" +"PO-Revision-Date: 2025-01-22 16:50+0300\n" "Last-Translator: Maxim Slipenko \n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Gtranslator 47.1\n" #: build.go:69 @@ -25,7 +25,7 @@ msgstr "" #: build.go:86 msgid "Error building package" -msgstr "" +msgstr "Ошибка при сборке пакета" #: build.go:92 msgid "Error getting working directory" @@ -111,12 +111,28 @@ msgstr "" msgid "Error removing packages" msgstr "" -#: internal/cliutils/prompt.go:80 +#: internal/cliutils/prompt.go:60 +msgid "Would you like to view the build script for %s" +msgstr "Показать скрипт для пакета %s" + +#: internal/cliutils/prompt.go:71 +msgid "Would you still like to continue?" +msgstr "Продолжить?" + +#: internal/cliutils/prompt.go:77 msgid "User chose not to continue after reading script" +msgstr "Пользователь решил не продолжать после просмотра скрипта" + +#: internal/cliutils/prompt.go:111 +msgid "Error prompting for choice of package" msgstr "" -#: internal/cliutils/prompt.go:114 -msgid "Error prompting for choice of package" +#: internal/cliutils/prompt.go:135 +msgid "Choose which package to %s" +msgstr "" + +#: internal/cliutils/prompt.go:156 +msgid "Choose which optional package(s) to install" msgstr "" #: internal/config/config.go:63 @@ -184,14 +200,14 @@ msgstr "" msgid "Source updated and linked to destination" msgstr "" +#: internal/dl/dl.go:222 +msgid "Downloading source" +msgstr "Скачивание источника" + #: internal/logger/log.go:44 msgid "ERROR" msgstr "ОШИБКА" -#: internal/translations/translations.go:52 -msgid "Error creating new translator" -msgstr "" - #: list.go:53 msgid "Error initialization database" msgstr "" @@ -212,15 +228,15 @@ msgstr "" #: pkg/build/build.go:104 msgid "Failed to prompt user to view build script" -msgstr "" +msgstr "Не удалось предложить просмотреть скрипт" #: pkg/build/build.go:108 msgid "Building package" -msgstr "" +msgstr "Сборка пакета" #: pkg/build/build.go:152 msgid "Downloading sources" -msgstr "" +msgstr "Скачивание файлов" #: pkg/build/build.go:164 msgid "Building package metadata" @@ -230,6 +246,12 @@ msgstr "" msgid "Compressing package" msgstr "" +#: pkg/build/build.go:312 +msgid "" +"Your system's CPU architecture doesn't match this package. Do you want to " +"build anyway?" +msgstr "" + #: pkg/build/build.go:323 msgid "This package is already installed" msgstr "" @@ -266,6 +288,10 @@ msgstr "" msgid "AutoReq is not implemented for this package format, so it's skiped" msgstr "" +#: pkg/build/build.go:653 +msgid "Would you like to remove the build dependencies?" +msgstr "" + #: pkg/build/build.go:759 msgid "The checksums array must be the same length as sources" msgstr "" @@ -292,11 +318,11 @@ msgstr "" #: pkg/repos/pull.go:75 msgid "Pulling repository" -msgstr "" +msgstr "Скачивание репозитория" #: pkg/repos/pull.go:99 msgid "Repository up to date" -msgstr "" +msgstr "Репозиторий уже обновлен" #: pkg/repos/pull.go:156 msgid "Git repository does not appear to be a valid ALR repo" diff --git a/internal/translations/translations.go b/internal/translations/translations.go index 42fc2c7..bb541a9 100644 --- a/internal/translations/translations.go +++ b/internal/translations/translations.go @@ -20,47 +20,15 @@ package translations import ( - "context" "embed" "io/fs" - "log/slog" "os" "path" - "sync" "github.com/jeandeaual/go-locale" "github.com/leonelquinteros/gotext" - "go.elara.ws/logger" - "go.elara.ws/translate" - "golang.org/x/text/language" ) -//go:embed files -var translationFS embed.FS - -var ( - mu sync.Mutex - translator *translate.Translator -) - -func Translator(ctx context.Context) *translate.Translator { - mu.Lock() - defer mu.Unlock() - if translator == nil { - t, err := translate.NewFromFS(translationFS) - if err != nil { - slog.Error(gotext.Get("Error creating new translator"), "err", err) - os.Exit(1) - } - translator = &t - } - return translator -} - -func NewLogger(ctx context.Context, l logger.Logger, lang language.Tag) *translate.TranslatedLogger { - return translate.NewLogger(l, *Translator(ctx), lang) -} - //go:embed po var poFS embed.FS diff --git a/pkg/build/build.go b/pkg/build/build.go index 249529a..293fdca 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -309,7 +309,7 @@ func prepareDirs(dirs types.Directories) error { // Функция performChecks проверяет различные аспекты в системе, чтобы убедиться, что пакет может быть установлен. func performChecks(ctx context.Context, vars *types.BuildVars, interactive bool, installed map[string]string) (bool, error) { if !cpu.IsCompatibleWith(cpu.Arch(), vars.Architectures) { // Проверяем совместимость архитектуры - cont, err := cliutils.YesNoPrompt(ctx, "Your system's CPU architecture doesn't match this package. Do you want to build anyway?", interactive, true) + cont, err := cliutils.YesNoPrompt(ctx, gotext.Get("Your system's CPU architecture doesn't match this package. Do you want to build anyway?"), interactive, true) if err != nil { return false, err } @@ -650,7 +650,7 @@ func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Cont // установленные для сборки. Если да, использует менеджер пакетов для их удаления. func removeBuildDeps(ctx context.Context, buildDeps []string, opts types.BuildOpts) error { if len(buildDeps) > 0 { - remove, err := cliutils.YesNoPrompt(ctx, "Would you like to remove the build dependencies?", opts.Interactive, false) + remove, err := cliutils.YesNoPrompt(ctx, gotext.Get("Would you like to remove the build dependencies?"), opts.Interactive, false) if err != nil { return err } From 30f95a4cbfb0cfc8a7f784dab0aa449cfe04db32 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Wed, 22 Jan 2025 17:16:15 +0300 Subject: [PATCH 4/6] chore: make usage strings translatable --- build.go | 126 +++++++------ fix.go | 56 +++--- gen.go | 71 +++---- helper.go | 130 ++++++------- info.go | 2 +- install.go | 169 +++++++++-------- internal/translations/default.pot | 141 +++++++++++--- internal/translations/po/ru/default.po | 148 ++++++++++++--- list.go | 146 ++++++++------- main.go | 46 ++--- repo.go | 250 +++++++++++++------------ upgrade.go | 88 ++++----- 12 files changed, 789 insertions(+), 584 deletions(-) diff --git a/build.go b/build.go index 1b686f6..b31b5ad 100644 --- a/build.go +++ b/build.go @@ -35,73 +35,75 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) -var buildCmd = &cli.Command{ - Name: "build", - Usage: "Build a local package", - Flags: []cli.Flag{ - &cli.StringFlag{ - Name: "script", - Aliases: []string{"s"}, - Value: "alr.sh", - Usage: "Path to the build script", +func BuildCmd() *cli.Command { + return &cli.Command{ + Name: "build", + Usage: gotext.Get("Build a local package"), + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "script", + Aliases: []string{"s"}, + Value: "alr.sh", + Usage: gotext.Get("Path to the build script"), + }, + &cli.StringFlag{ + Name: "package", + Aliases: []string{"p"}, + Usage: gotext.Get("Name of the package to build and its repo (example: default/go-bin)"), + }, + &cli.BoolFlag{ + Name: "clean", + Aliases: []string{"c"}, + Usage: gotext.Get("Build package from scratch even if there's an already built package available"), + }, }, - &cli.StringFlag{ - Name: "package", - Aliases: []string{"p"}, - Usage: "Name of the package to build and its repo (example: default/go-bin)", - }, - &cli.BoolFlag{ - Name: "clean", - Aliases: []string{"c"}, - Usage: "Build package from scratch even if there's an already built package available", - }, - }, - Action: func(c *cli.Context) error { - ctx := c.Context + Action: func(c *cli.Context) error { + ctx := c.Context - script := c.String("script") - if c.String("package") != "" { - script = filepath.Join(config.GetPaths(ctx).RepoDir, c.String("package"), "alr.sh") - } + script := c.String("script") + if c.String("package") != "" { + script = filepath.Join(config.GetPaths(ctx).RepoDir, c.String("package"), "alr.sh") + } - err := repos.Pull(ctx, config.Config(ctx).Repos) - if err != nil { - slog.Error(gotext.Get("Error pulling repositories"), "err", err) - os.Exit(1) - } - - mgr := manager.Detect() - if mgr == nil { - slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) - os.Exit(1) - } - - pkgPaths, _, err := build.BuildPackage(ctx, types.BuildOpts{ - Script: script, - Manager: mgr, - Clean: c.Bool("clean"), - Interactive: c.Bool("interactive"), - }) - if err != nil { - slog.Error(gotext.Get("Error building package"), "err", err) - os.Exit(1) - } - - wd, err := os.Getwd() - if err != nil { - slog.Error(gotext.Get("Error getting working directory"), "err", err) - os.Exit(1) - } - - for _, pkgPath := range pkgPaths { - name := filepath.Base(pkgPath) - err = osutils.Move(pkgPath, filepath.Join(wd, name)) + err := repos.Pull(ctx, config.Config(ctx).Repos) if err != nil { - slog.Error(gotext.Get("Error moving the package"), "err", err) + slog.Error(gotext.Get("Error pulling repositories"), "err", err) os.Exit(1) } - } - return nil - }, + mgr := manager.Detect() + if mgr == nil { + slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) + os.Exit(1) + } + + pkgPaths, _, err := build.BuildPackage(ctx, types.BuildOpts{ + Script: script, + Manager: mgr, + Clean: c.Bool("clean"), + Interactive: c.Bool("interactive"), + }) + if err != nil { + slog.Error(gotext.Get("Error building package"), "err", err) + os.Exit(1) + } + + wd, err := os.Getwd() + if err != nil { + slog.Error(gotext.Get("Error getting working directory"), "err", err) + os.Exit(1) + } + + for _, pkgPath := range pkgPaths { + name := filepath.Base(pkgPath) + err = osutils.Move(pkgPath, filepath.Join(wd, name)) + if err != nil { + slog.Error(gotext.Get("Error moving the package"), "err", err) + os.Exit(1) + } + } + + return nil + }, + } } diff --git a/fix.go b/fix.go index 2f8e669..3b34bdc 100644 --- a/fix.go +++ b/fix.go @@ -31,39 +31,41 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) -var fixCmd = &cli.Command{ - Name: "fix", - Usage: "Attempt to fix problems with ALR", - Action: func(c *cli.Context) error { - ctx := c.Context +func FixCmd() *cli.Command { + return &cli.Command{ + Name: "fix", + Usage: gotext.Get("Attempt to fix problems with ALR"), + Action: func(c *cli.Context) error { + ctx := c.Context - db.Close() - paths := config.GetPaths(ctx) + db.Close() + paths := config.GetPaths(ctx) - slog.Info(gotext.Get("Removing cache directory")) + slog.Info(gotext.Get("Removing cache directory")) - err := os.RemoveAll(paths.CacheDir) - if err != nil { - slog.Error(gotext.Get("Unable to remove cache directory"), "err", err) - os.Exit(1) - } + err := os.RemoveAll(paths.CacheDir) + if err != nil { + slog.Error(gotext.Get("Unable to remove cache directory"), "err", err) + os.Exit(1) + } - slog.Info(gotext.Get("Rebuilding cache")) + slog.Info(gotext.Get("Rebuilding cache")) - err = os.MkdirAll(paths.CacheDir, 0o755) - if err != nil { - slog.Error(gotext.Get("Unable to create new cache directory"), "err", err) - os.Exit(1) - } + err = os.MkdirAll(paths.CacheDir, 0o755) + if err != nil { + slog.Error(gotext.Get("Unable to create new cache directory"), "err", err) + os.Exit(1) + } - err = repos.Pull(ctx, config.Config(ctx).Repos) - if err != nil { - slog.Error(gotext.Get("Error pulling repos"), "err", err) - os.Exit(1) - } + err = repos.Pull(ctx, config.Config(ctx).Repos) + if err != nil { + slog.Error(gotext.Get("Error pulling repos"), "err", err) + os.Exit(1) + } - slog.Info(gotext.Get("Done")) + slog.Info(gotext.Get("Done")) - return nil - }, + return nil + }, + } } diff --git a/gen.go b/gen.go index adc4f53..20064a5 100644 --- a/gen.go +++ b/gen.go @@ -22,44 +22,45 @@ package main import ( "os" + "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" "gitea.plemya-x.ru/Plemya-x/ALR/pkg/gen" ) -var genCmd = &cli.Command{ - Name: "generate", - Usage: "Generate a ALR script from a template", - Aliases: []string{"gen"}, - Subcommands: []*cli.Command{ - genPipCmd, - }, -} - -var genPipCmd = &cli.Command{ - Name: "pip", - Usage: "Generate a ALR script for a pip module", - Flags: []cli.Flag{ - &cli.StringFlag{ - Name: "name", - Aliases: []string{"n"}, - Required: true, - }, - &cli.StringFlag{ - Name: "version", - Aliases: []string{"v"}, - Required: true, - }, - &cli.StringFlag{ - Name: "description", - Aliases: []string{"d"}, - }, - }, - Action: func(c *cli.Context) error { - return gen.Pip(os.Stdout, gen.PipOptions{ - Name: c.String("name"), - Version: c.String("version"), - Description: c.String("description"), - }) - }, +func GenCmd() *cli.Command { + return &cli.Command{ + Name: "generate", + Usage: gotext.Get("Generate a ALR script from a template"), + Aliases: []string{"gen"}, + Subcommands: []*cli.Command{ + &cli.Command{ + Name: "pip", + Usage: gotext.Get("Generate a ALR script for a pip module"), + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "name", + Aliases: []string{"n"}, + Required: true, + }, + &cli.StringFlag{ + Name: "version", + Aliases: []string{"v"}, + Required: true, + }, + &cli.StringFlag{ + Name: "description", + Aliases: []string{"d"}, + }, + }, + Action: func(c *cli.Context) error { + return gen.Pip(os.Stdout, gen.PipOptions{ + Name: c.String("name"), + Version: c.String("version"), + Description: c.String("description"), + }) + }, + }, + }, + } } diff --git a/helper.go b/helper.go index 7988399..3c2eb17 100644 --- a/helper.go +++ b/helper.go @@ -35,75 +35,77 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" ) -var helperCmd = &cli.Command{ - Name: "helper", - Usage: "Run a ALR helper command", - ArgsUsage: ``, - Subcommands: []*cli.Command{helperListCmd}, - Flags: []cli.Flag{ - &cli.StringFlag{ - Name: "dest-dir", - Aliases: []string{"d"}, - Usage: "The directory that the install commands will install to", - Value: "dest", +func HelperCmd() *cli.Command { + var helperListCmd = &cli.Command{ + Name: "list", + Usage: gotext.Get("List all the available helper commands"), + Aliases: []string{"ls"}, + Action: func(ctx *cli.Context) error { + for name := range helpers.Helpers { + fmt.Println(name) + } + return nil }, - }, - Action: func(c *cli.Context) error { - ctx := c.Context + } - if c.Args().Len() < 1 { - cli.ShowSubcommandHelpAndExit(c, 1) - } + return &cli.Command{ + Name: "helper", + Usage: gotext.Get("Run a ALR helper command"), + ArgsUsage: ``, + Subcommands: []*cli.Command{helperListCmd}, + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "dest-dir", + Aliases: []string{"d"}, + Usage: gotext.Get("The directory that the install commands will install to"), + Value: "dest", + }, + }, + Action: func(c *cli.Context) error { + ctx := c.Context - helper, ok := helpers.Helpers[c.Args().First()] - if !ok { - slog.Error(gotext.Get("No such helper command"), "name", c.Args().First()) - os.Exit(1) - } + if c.Args().Len() < 1 { + cli.ShowSubcommandHelpAndExit(c, 1) + } - wd, err := os.Getwd() - if err != nil { - slog.Error(gotext.Get("Error getting working directory"), "err", err) - os.Exit(1) - } + helper, ok := helpers.Helpers[c.Args().First()] + if !ok { + slog.Error(gotext.Get("No such helper command"), "name", c.Args().First()) + os.Exit(1) + } - info, err := distro.ParseOSRelease(ctx) - if err != nil { - slog.Error(gotext.Get("Error getting working directory"), "err", err) - os.Exit(1) - } + wd, err := os.Getwd() + if err != nil { + slog.Error(gotext.Get("Error getting working directory"), "err", err) + os.Exit(1) + } - hc := interp.HandlerContext{ - Env: expand.ListEnviron( - "pkgdir="+c.String("dest-dir"), - "DISTRO_ID="+info.ID, - "DISTRO_ID_LIKE="+strings.Join(info.Like, " "), - "ARCH="+cpu.Arch(), - ), - Dir: wd, - Stdin: os.Stdin, - Stdout: os.Stdout, - Stderr: os.Stderr, - } + info, err := distro.ParseOSRelease(ctx) + if err != nil { + slog.Error(gotext.Get("Error getting working directory"), "err", err) + os.Exit(1) + } - return helper(hc, c.Args().First(), c.Args().Slice()[1:]) - }, - CustomHelpTemplate: cli.CommandHelpTemplate, - BashComplete: func(ctx *cli.Context) { - for name := range helpers.Helpers { - fmt.Println(name) - } - }, -} - -var helperListCmd = &cli.Command{ - Name: "list", - Usage: "List all the available helper commands", - Aliases: []string{"ls"}, - Action: func(ctx *cli.Context) error { - for name := range helpers.Helpers { - fmt.Println(name) - } - return nil - }, + hc := interp.HandlerContext{ + Env: expand.ListEnviron( + "pkgdir="+c.String("dest-dir"), + "DISTRO_ID="+info.ID, + "DISTRO_ID_LIKE="+strings.Join(info.Like, " "), + "ARCH="+cpu.Arch(), + ), + Dir: wd, + Stdin: os.Stdin, + Stdout: os.Stdout, + Stderr: os.Stderr, + } + + return helper(hc, c.Args().First(), c.Args().Slice()[1:]) + }, + CustomHelpTemplate: cli.CommandHelpTemplate, + BashComplete: func(ctx *cli.Context) { + for name := range helpers.Helpers { + fmt.Println(name) + } + }, + } } diff --git a/info.go b/info.go index aad5e12..b633e40 100644 --- a/info.go +++ b/info.go @@ -36,7 +36,7 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) -func GetInfoCmd() *cli.Command { +func InfoCmd() *cli.Command { return &cli.Command{ Name: "info", Usage: gotext.Get("Print information about a package"), diff --git a/install.go b/install.go index c4f5a4c..d39e3d1 100644 --- a/install.go +++ b/install.go @@ -36,96 +36,101 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) -var installCmd = &cli.Command{ - Name: "install", - Usage: "Install a new package", - Aliases: []string{"in"}, - Flags: []cli.Flag{ - &cli.BoolFlag{ - Name: "clean", - Aliases: []string{"c"}, - Usage: "Build package from scratch even if there's an already built package available", +func InstallCmd() *cli.Command { + + return &cli.Command{ + Name: "install", + Usage: gotext.Get("Install a new package"), + Aliases: []string{"in"}, + Flags: []cli.Flag{ + &cli.BoolFlag{ + Name: "clean", + Aliases: []string{"c"}, + Usage: "Build package from scratch even if there's an already built package available", + }, }, - }, - Action: func(c *cli.Context) error { - ctx := c.Context + Action: func(c *cli.Context) error { + ctx := c.Context - args := c.Args() - if args.Len() < 1 { - slog.Error(gotext.Get("Command install expected at least 1 argument, got %d", args.Len())) - os.Exit(1) - } - - mgr := manager.Detect() - if mgr == nil { - slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) - os.Exit(1) - } - - err := repos.Pull(ctx, config.Config(ctx).Repos) - if err != nil { - slog.Error(gotext.Get("Error pulling repositories"), "err", err) - os.Exit(1) - } - - found, notFound, err := repos.FindPkgs(ctx, args.Slice()) - if err != nil { - slog.Error(gotext.Get("Error finding packages"), "err", err) - os.Exit(1) - } - - pkgs := cliutils.FlattenPkgs(ctx, found, "install", c.Bool("interactive")) - build.InstallPkgs(ctx, pkgs, notFound, types.BuildOpts{ - Manager: mgr, - Clean: c.Bool("clean"), - Interactive: c.Bool("interactive"), - }) - return nil - }, - BashComplete: func(c *cli.Context) { - 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 db.Package - err = result.StructScan(&pkg) - if err != nil { - slog.Error(gotext.Get("Error iterating over packages"), "err", err) + args := c.Args() + if args.Len() < 1 { + slog.Error(gotext.Get("Command install expected at least 1 argument, got %d", args.Len())) os.Exit(1) } - fmt.Println(pkg.Name) - } - }, + mgr := manager.Detect() + if mgr == nil { + slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) + os.Exit(1) + } + + err := repos.Pull(ctx, config.Config(ctx).Repos) + if err != nil { + slog.Error(gotext.Get("Error pulling repositories"), "err", err) + os.Exit(1) + } + + found, notFound, err := repos.FindPkgs(ctx, args.Slice()) + if err != nil { + slog.Error(gotext.Get("Error finding packages"), "err", err) + os.Exit(1) + } + + pkgs := cliutils.FlattenPkgs(ctx, found, "install", c.Bool("interactive")) + build.InstallPkgs(ctx, pkgs, notFound, types.BuildOpts{ + Manager: mgr, + Clean: c.Bool("clean"), + Interactive: c.Bool("interactive"), + }) + return nil + }, + BashComplete: func(c *cli.Context) { + 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 db.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) + } + }, + } } -var removeCmd = &cli.Command{ - Name: "remove", - Usage: "Remove an installed package", - Aliases: []string{"rm"}, - Action: func(c *cli.Context) error { - args := c.Args() - if args.Len() < 1 { - slog.Error(gotext.Get("Command remove expected at least 1 argument, got %d", args.Len())) - os.Exit(1) - } +func RemoveCmd() *cli.Command { + return &cli.Command{ + Name: "remove", + Usage: gotext.Get("Remove an installed package"), + Aliases: []string{"rm"}, + Action: func(c *cli.Context) error { + args := c.Args() + if args.Len() < 1 { + slog.Error(gotext.Get("Command remove expected at least 1 argument, got %d", args.Len())) + os.Exit(1) + } - mgr := manager.Detect() - if mgr == nil { - slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) - os.Exit(1) - } + mgr := manager.Detect() + if mgr == nil { + slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) + os.Exit(1) + } - err := mgr.Remove(nil, c.Args().Slice()...) - if err != nil { - slog.Error(gotext.Get("Error removing packages"), "err", err) - os.Exit(1) - } + err := mgr.Remove(nil, c.Args().Slice()...) + if err != nil { + slog.Error(gotext.Get("Error removing packages"), "err", err) + os.Exit(1) + } - return nil - }, + return nil + }, + } } diff --git a/internal/translations/default.pot b/internal/translations/default.pot index 5257adb..6bbbc32 100644 --- a/internal/translations/default.pot +++ b/internal/translations/default.pot @@ -9,51 +9,92 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: build.go:69 +#: build.go:41 +msgid "Build a local package" +msgstr "" + +#: build.go:47 +msgid "Path to the build script" +msgstr "" + +#: build.go:52 +msgid "Name of the package to build and its repo (example: default/go-bin)" +msgstr "" + +#: build.go:57 +msgid "" +"Build package from scratch even if there's an already built package available" +msgstr "" + +#: build.go:70 msgid "Error pulling repositories" msgstr "" -#: build.go:75 +#: build.go:76 msgid "Unable to detect a supported package manager on the system" msgstr "" -#: build.go:86 +#: build.go:87 msgid "Error building package" msgstr "" -#: build.go:92 +#: build.go:93 msgid "Error getting working directory" msgstr "" -#: build.go:100 +#: build.go:101 msgid "Error moving the package" msgstr "" -#: fix.go:43 +#: fix.go:37 +msgid "Attempt to fix problems with ALR" +msgstr "" + +#: fix.go:44 msgid "Removing cache directory" msgstr "" -#: fix.go:47 +#: fix.go:48 msgid "Unable to remove cache directory" msgstr "" -#: fix.go:51 +#: fix.go:52 msgid "Rebuilding cache" msgstr "" -#: fix.go:55 +#: fix.go:56 msgid "Unable to create new cache directory" msgstr "" -#: fix.go:61 +#: fix.go:62 msgid "Error pulling repos" msgstr "" -#: fix.go:65 +#: fix.go:66 msgid "Done" msgstr "" +#: gen.go:34 +msgid "Generate a ALR script from a template" +msgstr "" + +#: gen.go:39 +msgid "Generate a ALR script for a pip module" +msgstr "" + +#: helper.go:41 +msgid "List all the available helper commands" +msgstr "" + +#: helper.go:53 +msgid "Run a ALR helper command" +msgstr "" + #: helper.go:60 +msgid "The directory that the install commands will install to" +msgstr "" + +#: helper.go:73 msgid "No such helper command" msgstr "" @@ -85,23 +126,27 @@ msgstr "" msgid "Error encoding script variables" msgstr "" -#: install.go:55 +#: install.go:57 msgid "Command install expected at least 1 argument, got %d" msgstr "" -#: install.go:88 +#: install.go:90 msgid "Error getting packages" msgstr "" -#: install.go:97 +#: install.go:99 msgid "Error iterating over packages" msgstr "" -#: install.go:113 +#: install.go:112 +msgid "Remove an installed package" +msgstr "" + +#: install.go:117 msgid "Command remove expected at least 1 argument, got %d" msgstr "" -#: install.go:125 +#: install.go:129 msgid "Error removing packages" msgstr "" @@ -202,21 +247,37 @@ msgstr "" msgid "ERROR" msgstr "" -#: list.go:53 +#: list.go:40 +msgid "List ALR repo packages" +msgstr "" + +#: list.go:54 msgid "Error initialization database" msgstr "" -#: list.go:87 +#: list.go:88 msgid "Error listing installed packages" msgstr "" -#: main.go:88 +#: main.go:45 +msgid "Print the current ALR version and exit" +msgstr "" + +#: main.go:61 +msgid "Arguments to be passed on to the package manager" +msgstr "" + +#: main.go:67 +msgid "Enable interactive questions and prompts" +msgstr "" + +#: main.go:90 msgid "" "Running ALR as root is forbidden as it may cause catastrophic damage to your " "system" msgstr "" -#: main.go:122 +#: main.go:124 msgid "Error while running app" msgstr "" @@ -328,26 +389,54 @@ msgid "" "updating ALR if something doesn't work." msgstr "" -#: repo.go:78 repo.go:133 +#: repo.go:41 +msgid "Add a new repository" +msgstr "" + +#: repo.go:48 +msgid "Name of the new repo" +msgstr "" + +#: repo.go:54 +msgid "URL of the new repo" +msgstr "" + +#: repo.go:79 repo.go:136 msgid "Error opening config file" msgstr "" -#: repo.go:84 repo.go:139 +#: repo.go:85 repo.go:142 msgid "Error encoding config" msgstr "" -#: repo.go:125 +#: repo.go:103 +msgid "Remove an existing repository" +msgstr "" + +#: repo.go:110 +msgid "Name of the repo to be deleted" +msgstr "" + +#: repo.go:128 msgid "Repo does not exist" msgstr "" -#: repo.go:145 +#: repo.go:148 msgid "Error removing repo directory" msgstr "" -#: repo.go:151 +#: repo.go:154 msgid "Error removing packages from database" msgstr "" -#: upgrade.go:78 +#: repo.go:166 +msgid "Pull all repositories that have changed" +msgstr "" + +#: upgrade.go:47 +msgid "Upgrade all installed packages" +msgstr "" + +#: upgrade.go:79 msgid "Error checking for updates" msgstr "" diff --git a/internal/translations/po/ru/default.po b/internal/translations/po/ru/default.po index df99b01..0048e81 100644 --- a/internal/translations/po/ru/default.po +++ b/internal/translations/po/ru/default.po @@ -11,55 +11,98 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Gtranslator 47.1\n" -#: build.go:69 +#: build.go:41 +#, fuzzy +msgid "Build a local package" +msgstr "Сборка пакета" + +#: build.go:47 +#, fuzzy +msgid "Path to the build script" +msgstr "Не удалось предложить просмотреть скрипт" + +#: build.go:52 +msgid "Name of the package to build and its repo (example: default/go-bin)" +msgstr "" + +#: build.go:57 +msgid "" +"Build package from scratch even if there's an already built package available" +msgstr "" + +#: build.go:70 msgid "Error pulling repositories" msgstr "" -#: build.go:75 +#: build.go:76 msgid "Unable to detect a supported package manager on the system" msgstr "" -#: build.go:86 +#: build.go:87 msgid "Error building package" msgstr "Ошибка при сборке пакета" -#: build.go:92 +#: build.go:93 msgid "Error getting working directory" msgstr "" -#: build.go:100 +#: build.go:101 msgid "Error moving the package" msgstr "" -#: fix.go:43 +#: fix.go:37 +msgid "Attempt to fix problems with ALR" +msgstr "" + +#: fix.go:44 msgid "Removing cache directory" msgstr "" -#: fix.go:47 +#: fix.go:48 msgid "Unable to remove cache directory" msgstr "" -#: fix.go:51 +#: fix.go:52 msgid "Rebuilding cache" msgstr "" -#: fix.go:55 +#: fix.go:56 msgid "Unable to create new cache directory" msgstr "" -#: fix.go:61 +#: fix.go:62 msgid "Error pulling repos" msgstr "" -#: fix.go:65 +#: fix.go:66 msgid "Done" msgstr "" +#: gen.go:34 +msgid "Generate a ALR script from a template" +msgstr "" + +#: gen.go:39 +msgid "Generate a ALR script for a pip module" +msgstr "" + +#: helper.go:41 +msgid "List all the available helper commands" +msgstr "" + +#: helper.go:53 +msgid "Run a ALR helper command" +msgstr "" + #: helper.go:60 +msgid "The directory that the install commands will install to" +msgstr "" + +#: helper.go:73 msgid "No such helper command" msgstr "" @@ -91,23 +134,27 @@ msgstr "" msgid "Error encoding script variables" msgstr "" -#: install.go:55 +#: install.go:57 msgid "Command install expected at least 1 argument, got %d" msgstr "" -#: install.go:88 +#: install.go:90 msgid "Error getting packages" msgstr "" -#: install.go:97 +#: install.go:99 msgid "Error iterating over packages" msgstr "" -#: install.go:113 +#: install.go:112 +msgid "Remove an installed package" +msgstr "" + +#: install.go:117 msgid "Command remove expected at least 1 argument, got %d" msgstr "" -#: install.go:125 +#: install.go:129 msgid "Error removing packages" msgstr "" @@ -208,21 +255,37 @@ msgstr "Скачивание источника" msgid "ERROR" msgstr "ОШИБКА" -#: list.go:53 +#: list.go:40 +msgid "List ALR repo packages" +msgstr "" + +#: list.go:54 msgid "Error initialization database" msgstr "" -#: list.go:87 +#: list.go:88 msgid "Error listing installed packages" msgstr "" -#: main.go:88 +#: main.go:45 +msgid "Print the current ALR version and exit" +msgstr "" + +#: main.go:61 +msgid "Arguments to be passed on to the package manager" +msgstr "" + +#: main.go:67 +msgid "Enable interactive questions and prompts" +msgstr "" + +#: main.go:90 msgid "" "Running ALR as root is forbidden as it may cause catastrophic damage to your " "system" msgstr "" -#: main.go:122 +#: main.go:124 msgid "Error while running app" msgstr "" @@ -334,26 +397,55 @@ msgid "" "updating ALR if something doesn't work." msgstr "" -#: repo.go:78 repo.go:133 +#: repo.go:41 +#, fuzzy +msgid "Add a new repository" +msgstr "Скачивание репозитория" + +#: repo.go:48 +msgid "Name of the new repo" +msgstr "" + +#: repo.go:54 +msgid "URL of the new repo" +msgstr "" + +#: repo.go:79 repo.go:136 msgid "Error opening config file" msgstr "" -#: repo.go:84 repo.go:139 +#: repo.go:85 repo.go:142 msgid "Error encoding config" msgstr "" -#: repo.go:125 +#: repo.go:103 +msgid "Remove an existing repository" +msgstr "" + +#: repo.go:110 +msgid "Name of the repo to be deleted" +msgstr "" + +#: repo.go:128 msgid "Repo does not exist" msgstr "" -#: repo.go:145 +#: repo.go:148 msgid "Error removing repo directory" msgstr "" -#: repo.go:151 +#: repo.go:154 msgid "Error removing packages from database" msgstr "" -#: upgrade.go:78 +#: repo.go:166 +msgid "Pull all repositories that have changed" +msgstr "" + +#: upgrade.go:47 +msgid "Upgrade all installed packages" +msgstr "" + +#: upgrade.go:79 msgid "Error checking for updates" msgstr "" diff --git a/list.go b/list.go index e8f0a02..19ad7a6 100644 --- a/list.go +++ b/list.go @@ -34,90 +34,92 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) -var listCmd = &cli.Command{ - Name: "list", - Usage: "List ALR repo packages", - Aliases: []string{"ls"}, - Flags: []cli.Flag{ - &cli.BoolFlag{ - Name: "installed", - Aliases: []string{"I"}, +func ListCmd() *cli.Command { + return &cli.Command{ + Name: "list", + Usage: gotext.Get("List ALR repo packages"), + Aliases: []string{"ls"}, + Flags: []cli.Flag{ + &cli.BoolFlag{ + Name: "installed", + Aliases: []string{"I"}, + }, }, - }, - Action: func(c *cli.Context) error { - 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) - } - rs := repos.New(cfg, db) - err = rs.Pull(ctx, cfg.Repos(ctx)) - if err != nil { - slog.Error(gotext.Get("Error pulling repositories"), "err", err) - os.Exit(1) - } - - where := "true" - args := []any(nil) - if c.NArg() > 0 { - where = "name LIKE ? OR json_array_contains(provides, ?)" - args = []any{c.Args().First(), c.Args().First()} - } - - result, err := db.GetPkgs(ctx, where, args...) - if err != nil { - slog.Error(gotext.Get("Error getting packages"), "err", err) - os.Exit(1) - } - defer result.Close() - - var installed map[string]string - if c.Bool("installed") { - mgr := manager.Detect() - if mgr == nil { - slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) + Action: func(c *cli.Context) error { + 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) + } + rs := repos.New(cfg, db) + err = rs.Pull(ctx, cfg.Repos(ctx)) + if err != nil { + slog.Error(gotext.Get("Error pulling repositories"), "err", err) os.Exit(1) } - installed, err = mgr.ListInstalled(&manager.Opts{AsRoot: false}) + where := "true" + args := []any(nil) + if c.NArg() > 0 { + where = "name LIKE ? OR json_array_contains(provides, ?)" + args = []any{c.Args().First(), c.Args().First()} + } + + result, err := db.GetPkgs(ctx, where, args...) if err != nil { - slog.Error(gotext.Get("Error listing installed packages"), "err", err) + 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 { - return err - } - - if slices.Contains(cfg.IgnorePkgUpdates(ctx), pkg.Name) { - continue - } - - version := pkg.Version + var installed map[string]string if c.Bool("installed") { - instVersion, ok := installed[pkg.Name] - if !ok { - continue - } else { - version = instVersion + mgr := manager.Detect() + if mgr == nil { + slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) + os.Exit(1) + } + + installed, err = mgr.ListInstalled(&manager.Opts{AsRoot: false}) + if err != nil { + slog.Error(gotext.Get("Error listing installed packages"), "err", err) + os.Exit(1) } } - fmt.Printf("%s/%s %s\n", pkg.Repository, pkg.Name, version) - } + for result.Next() { + var pkg database.Package + err := result.StructScan(&pkg) + if err != nil { + return err + } - if err != nil { - slog.Error(gotext.Get("Error iterating over packages"), "err", err) - os.Exit(1) - } + if slices.Contains(cfg.IgnorePkgUpdates(ctx), pkg.Name) { + continue + } - return nil - }, + version := pkg.Version + if c.Bool("installed") { + instVersion, ok := installed[pkg.Name] + if !ok { + continue + } else { + version = instVersion + } + } + + fmt.Printf("%s/%s %s\n", pkg.Repository, pkg.Name, version) + } + + if err != nil { + slog.Error(gotext.Get("Error iterating over packages"), "err", err) + os.Exit(1) + } + + return nil + }, + } } diff --git a/main.go b/main.go index c9b3a05..c62fb5e 100644 --- a/main.go +++ b/main.go @@ -39,13 +39,15 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/logger" ) -var versionCmd = &cli.Command{ - Name: "version", - Usage: "Print the current ALR version and exit", - Action: func(ctx *cli.Context) error { - println(config.Version) - return nil - }, +func VersionCmd() *cli.Command { + return &cli.Command{ + Name: "version", + Usage: gotext.Get("Print the current ALR version and exit"), + Action: func(ctx *cli.Context) error { + println(config.Version) + return nil + }, + } } func GetApp() *cli.App { @@ -56,29 +58,29 @@ func GetApp() *cli.App { &cli.StringFlag{ Name: "pm-args", Aliases: []string{"P"}, - Usage: "Arguments to be passed on to the package manager", + Usage: gotext.Get("Arguments to be passed on to the package manager"), }, &cli.BoolFlag{ Name: "interactive", Aliases: []string{"i"}, Value: isatty.IsTerminal(os.Stdin.Fd()), - Usage: "Enable interactive questions and prompts", + Usage: gotext.Get("Enable interactive questions and prompts"), }, }, Commands: []*cli.Command{ - installCmd, - removeCmd, - upgradeCmd, - GetInfoCmd(), - listCmd, - buildCmd, - addrepoCmd, - removerepoCmd, - refreshCmd, - fixCmd, - genCmd, - helperCmd, - versionCmd, + InstallCmd(), + RemoveCmd(), + UpgradeCmd(), + InfoCmd(), + ListCmd(), + BuildCmd(), + AddRepoCmd(), + RemoveRepoCmd(), + RefreshCmd(), + FixCmd(), + GenCmd(), + HelperCmd(), + VersionCmd(), }, Before: func(c *cli.Context) error { ctx := c.Context diff --git a/repo.go b/repo.go index 53865ed..de18f8a 100644 --- a/repo.go +++ b/repo.go @@ -35,138 +35,144 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) -var addrepoCmd = &cli.Command{ - Name: "addrepo", - Usage: "Add a new repository", - Aliases: []string{"ar"}, - Flags: []cli.Flag{ - &cli.StringFlag{ - Name: "name", - Aliases: []string{"n"}, - Required: true, - Usage: "Name of the new repo", +func AddRepoCmd() *cli.Command { + return &cli.Command{ + Name: "addrepo", + Usage: gotext.Get("Add a new repository"), + Aliases: []string{"ar"}, + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "name", + Aliases: []string{"n"}, + Required: true, + Usage: gotext.Get("Name of the new repo"), + }, + &cli.StringFlag{ + Name: "url", + Aliases: []string{"u"}, + Required: true, + Usage: gotext.Get("URL of the new repo"), + }, }, - &cli.StringFlag{ - Name: "url", - Aliases: []string{"u"}, - Required: true, - Usage: "URL of the new repo", - }, - }, - Action: func(c *cli.Context) error { - ctx := c.Context + Action: func(c *cli.Context) error { + ctx := c.Context - name := c.String("name") - repoURL := c.String("url") + name := c.String("name") + repoURL := c.String("url") - cfg := config.Config(ctx) + cfg := config.Config(ctx) - for _, repo := range cfg.Repos { - if repo.URL == repoURL { - slog.Error("Repo already exists", "name", repo.Name) + for _, repo := range cfg.Repos { + if repo.URL == repoURL { + slog.Error("Repo already exists", "name", repo.Name) + os.Exit(1) + } + } + + cfg.Repos = append(cfg.Repos, types.Repo{ + Name: name, + URL: repoURL, + }) + + cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath) + if err != nil { + slog.Error(gotext.Get("Error opening config file"), "err", err) os.Exit(1) } - } - cfg.Repos = append(cfg.Repos, types.Repo{ - Name: name, - URL: repoURL, - }) - - cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath) - if err != nil { - slog.Error(gotext.Get("Error opening config file"), "err", err) - os.Exit(1) - } - - err = toml.NewEncoder(cfgFl).Encode(cfg) - if err != nil { - slog.Error(gotext.Get("Error encoding config"), "err", err) - os.Exit(1) - } - - err = repos.Pull(ctx, cfg.Repos) - if err != nil { - slog.Error(gotext.Get("Error pulling repos"), "err", err) - os.Exit(1) - } - - return nil - }, -} - -var removerepoCmd = &cli.Command{ - Name: "removerepo", - Usage: "Remove an existing repository", - Aliases: []string{"rr"}, - Flags: []cli.Flag{ - &cli.StringFlag{ - Name: "name", - Aliases: []string{"n"}, - Required: true, - Usage: "Name of the repo to be deleted", - }, - }, - Action: func(c *cli.Context) error { - ctx := c.Context - - name := c.String("name") - cfg := config.Config(ctx) - - found := false - index := 0 - for i, repo := range cfg.Repos { - if repo.Name == name { - index = i - found = true + err = toml.NewEncoder(cfgFl).Encode(cfg) + if err != nil { + slog.Error(gotext.Get("Error encoding config"), "err", err) + os.Exit(1) } - } - if !found { - slog.Error(gotext.Get("Repo does not exist"), "name", name) - os.Exit(1) - } - cfg.Repos = slices.Delete(cfg.Repos, index, index+1) + err = repos.Pull(ctx, cfg.Repos) + if err != nil { + slog.Error(gotext.Get("Error pulling repos"), "err", err) + os.Exit(1) + } - cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath) - if err != nil { - slog.Error(gotext.Get("Error opening config file"), "err", err) - os.Exit(1) - } - - err = toml.NewEncoder(cfgFl).Encode(&cfg) - if err != nil { - slog.Error(gotext.Get("Error encoding config"), "err", err) - os.Exit(1) - } - - err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name)) - if err != nil { - slog.Error(gotext.Get("Error removing repo directory"), "err", err) - os.Exit(1) - } - - err = db.DeletePkgs(ctx, "repository = ?", name) - if err != nil { - slog.Error(gotext.Get("Error removing packages from database"), "err", err) - os.Exit(1) - } - - return nil - }, + return nil + }, + } } -var refreshCmd = &cli.Command{ - Name: "refresh", - Usage: "Pull all repositories that have changed", - Aliases: []string{"ref"}, - Action: func(c *cli.Context) error { - ctx := c.Context - err := repos.Pull(ctx, config.Config(ctx).Repos) - if err != nil { - slog.Error(gotext.Get("Error pulling repos"), "err", err) - os.Exit(1) - } - return nil - }, +func RemoveRepoCmd() *cli.Command { + return &cli.Command{ + Name: "removerepo", + Usage: gotext.Get("Remove an existing repository"), + Aliases: []string{"rr"}, + Flags: []cli.Flag{ + &cli.StringFlag{ + Name: "name", + Aliases: []string{"n"}, + Required: true, + Usage: gotext.Get("Name of the repo to be deleted"), + }, + }, + Action: func(c *cli.Context) error { + ctx := c.Context + + name := c.String("name") + cfg := config.Config(ctx) + + found := false + index := 0 + for i, repo := range cfg.Repos { + if repo.Name == name { + index = i + found = true + } + } + if !found { + slog.Error(gotext.Get("Repo does not exist"), "name", name) + os.Exit(1) + } + + cfg.Repos = slices.Delete(cfg.Repos, index, index+1) + + cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath) + if err != nil { + slog.Error(gotext.Get("Error opening config file"), "err", err) + os.Exit(1) + } + + err = toml.NewEncoder(cfgFl).Encode(&cfg) + if err != nil { + slog.Error(gotext.Get("Error encoding config"), "err", err) + os.Exit(1) + } + + err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name)) + if err != nil { + slog.Error(gotext.Get("Error removing repo directory"), "err", err) + os.Exit(1) + } + + err = db.DeletePkgs(ctx, "repository = ?", name) + if err != nil { + slog.Error(gotext.Get("Error removing packages from database"), "err", err) + os.Exit(1) + } + + return nil + }, + } +} + +func RefreshCmd() *cli.Command { + return &cli.Command{ + Name: "refresh", + Usage: gotext.Get("Pull all repositories that have changed"), + Aliases: []string{"ref"}, + Action: func(c *cli.Context) error { + ctx := c.Context + err := repos.Pull(ctx, config.Config(ctx).Repos) + if err != nil { + slog.Error(gotext.Get("Error pulling repos"), "err", err) + os.Exit(1) + } + return nil + }, + } } diff --git a/upgrade.go b/upgrade.go index c64f33c..3002641 100644 --- a/upgrade.go +++ b/upgrade.go @@ -41,56 +41,58 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) -var upgradeCmd = &cli.Command{ - Name: "upgrade", - Usage: "Upgrade all installed packages", - Aliases: []string{"up"}, - Flags: []cli.Flag{ - &cli.BoolFlag{ - Name: "clean", - Aliases: []string{"c"}, - Usage: "Build package from scratch even if there's an already built package available", +func UpgradeCmd() *cli.Command { + return &cli.Command{ + Name: "upgrade", + Usage: gotext.Get("Upgrade all installed packages"), + Aliases: []string{"up"}, + Flags: []cli.Flag{ + &cli.BoolFlag{ + Name: "clean", + Aliases: []string{"c"}, + Usage: gotext.Get("Build package from scratch even if there's an already built package available"), + }, }, - }, - Action: func(c *cli.Context) error { - ctx := c.Context + Action: func(c *cli.Context) error { + ctx := c.Context - info, err := distro.ParseOSRelease(ctx) - if err != nil { - slog.Error(gotext.Get("Error parsing os-release file"), "err", err) - os.Exit(1) - } + info, err := distro.ParseOSRelease(ctx) + if err != nil { + slog.Error(gotext.Get("Error parsing os-release file"), "err", err) + os.Exit(1) + } - mgr := manager.Detect() - if mgr == nil { - slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) - os.Exit(1) - } + mgr := manager.Detect() + if mgr == nil { + slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) + os.Exit(1) + } - err = repos.Pull(ctx, config.Config(ctx).Repos) - if err != nil { - slog.Error(gotext.Get("Error pulling repos"), "err", err) - os.Exit(1) - } + err = repos.Pull(ctx, config.Config(ctx).Repos) + if err != nil { + slog.Error(gotext.Get("Error pulling repos"), "err", err) + os.Exit(1) + } - updates, err := checkForUpdates(ctx, mgr, info) - if err != nil { - slog.Error(gotext.Get("Error checking for updates"), "err", err) - os.Exit(1) - } + updates, err := checkForUpdates(ctx, mgr, info) + if err != nil { + slog.Error(gotext.Get("Error checking for updates"), "err", err) + os.Exit(1) + } - if len(updates) > 0 { - build.InstallPkgs(ctx, updates, nil, types.BuildOpts{ - Manager: mgr, - Clean: c.Bool("clean"), - Interactive: c.Bool("interactive"), - }) - } else { - log.Info("There is nothing to do.").Send() - } + if len(updates) > 0 { + build.InstallPkgs(ctx, updates, nil, types.BuildOpts{ + Manager: mgr, + Clean: c.Bool("clean"), + Interactive: c.Bool("interactive"), + }) + } else { + log.Info("There is nothing to do.").Send() + } - return nil - }, + return nil + }, + } } func checkForUpdates(ctx context.Context, mgr manager.Manager, info *distro.OSRelease) ([]db.Package, error) { From 309ecf784f99e501c5c1960b9f15c6605d101484 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Wed, 22 Jan 2025 18:10:57 +0300 Subject: [PATCH 5/6] feat: add autoPull in config --- build.go | 10 ++-- info.go | 15 ++++-- install.go | 10 ++-- internal/config/config.go | 8 ++++ internal/translations/default.pot | 64 ++++++++++++++------------ internal/translations/po/ru/default.po | 64 ++++++++++++++------------ internal/types/config.go | 1 + list.go | 11 +++-- upgrade.go | 12 +++-- 9 files changed, 115 insertions(+), 80 deletions(-) diff --git a/build.go b/build.go index b31b5ad..b328975 100644 --- a/build.go +++ b/build.go @@ -65,10 +65,12 @@ func BuildCmd() *cli.Command { script = filepath.Join(config.GetPaths(ctx).RepoDir, c.String("package"), "alr.sh") } - err := repos.Pull(ctx, config.Config(ctx).Repos) - if err != nil { - slog.Error(gotext.Get("Error pulling repositories"), "err", err) - os.Exit(1) + if config.GetInstance(ctx).AutoPull(ctx) { + err := repos.Pull(ctx, config.Config(ctx).Repos) + if err != nil { + slog.Error(gotext.Get("Error pulling repositories"), "err", err) + os.Exit(1) + } } mgr := manager.Detect() diff --git a/info.go b/info.go index b633e40..5a4f290 100644 --- a/info.go +++ b/info.go @@ -52,6 +52,11 @@ func InfoCmd() *cli.Command { cfg := config.New() db := db.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) args := c.Args() @@ -60,10 +65,12 @@ func InfoCmd() *cli.Command { os.Exit(1) } - err := rs.Pull(ctx, cfg.Repos(ctx)) - if err != nil { - slog.Error(gotext.Get("Error pulling repositories")) - os.Exit(1) + if cfg.AutoPull(ctx) { + err := rs.Pull(ctx, cfg.Repos(ctx)) + if err != nil { + slog.Error(gotext.Get("Error pulling repos"), "err", err) + os.Exit(1) + } } found, _, err := rs.FindPkgs(ctx, args.Slice()) diff --git a/install.go b/install.go index d39e3d1..d1fdd1a 100644 --- a/install.go +++ b/install.go @@ -64,10 +64,12 @@ func InstallCmd() *cli.Command { os.Exit(1) } - err := repos.Pull(ctx, config.Config(ctx).Repos) - if err != nil { - slog.Error(gotext.Get("Error pulling repositories"), "err", err) - os.Exit(1) + if config.GetInstance(ctx).AutoPull(ctx) { + err := repos.Pull(ctx, config.Config(ctx).Repos) + if err != nil { + slog.Error(gotext.Get("Error pulling repositories"), "err", err) + os.Exit(1) + } } found, notFound, err := repos.FindPkgs(ctx, args.Slice()) diff --git a/internal/config/config.go b/internal/config/config.go index 10231d6..f8457c6 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -45,6 +45,7 @@ var defaultConfig = &types.Config{ RootCmd: "sudo", PagerStyle: "native", IgnorePkgUpdates: []string{}, + AutoPull: true, Repos: []types.Repo{ { Name: "default", @@ -162,3 +163,10 @@ func (c *ALRConfig) IgnorePkgUpdates(ctx context.Context) []string { }) return c.cfg.IgnorePkgUpdates } + +func (c *ALRConfig) AutoPull(ctx context.Context) bool { + c.cfgOnce.Do(func() { + c.Load(ctx) + }) + return c.cfg.AutoPull +} diff --git a/internal/translations/default.pot b/internal/translations/default.pot index 6bbbc32..56f1c34 100644 --- a/internal/translations/default.pot +++ b/internal/translations/default.pot @@ -26,23 +26,23 @@ msgid "" "Build package from scratch even if there's an already built package available" msgstr "" -#: build.go:70 -msgid "Error pulling repositories" +#: build.go:71 +msgid "Error pulling repos" msgstr "" -#: build.go:76 +#: build.go:78 msgid "Unable to detect a supported package manager on the system" msgstr "" -#: build.go:87 +#: build.go:89 msgid "Error building package" msgstr "" -#: build.go:93 +#: build.go:95 msgid "Error getting working directory" msgstr "" -#: build.go:101 +#: build.go:103 msgid "Error moving the package" msgstr "" @@ -66,10 +66,6 @@ msgstr "" msgid "Unable to create new cache directory" msgstr "" -#: fix.go:62 -msgid "Error pulling repos" -msgstr "" - #: fix.go:66 msgid "Done" msgstr "" @@ -110,43 +106,51 @@ msgstr "" msgid "Command info expected at least 1 argument, got %d" msgstr "" -#: info.go:71 +#: info.go:73 msgid "Error finding packages" msgstr "" -#: info.go:87 +#: info.go:89 msgid "Error parsing os-release file" msgstr "" -#: info.go:96 +#: info.go:98 msgid "Error resolving overrides" msgstr "" -#: info.go:105 info.go:111 +#: info.go:107 info.go:113 msgid "Error encoding script variables" msgstr "" +#: install.go:43 +msgid "Install a new package" +msgstr "" + #: install.go:57 msgid "Command install expected at least 1 argument, got %d" msgstr "" -#: install.go:90 +#: install.go:70 +msgid "Error pulling repositories" +msgstr "" + +#: install.go:92 msgid "Error getting packages" msgstr "" -#: install.go:99 +#: install.go:101 msgid "Error iterating over packages" msgstr "" -#: install.go:112 +#: install.go:114 msgid "Remove an installed package" msgstr "" -#: install.go:117 +#: install.go:119 msgid "Command remove expected at least 1 argument, got %d" msgstr "" -#: install.go:129 +#: install.go:131 msgid "Error removing packages" msgstr "" @@ -174,39 +178,39 @@ msgstr "" msgid "Choose which optional package(s) to install" msgstr "" -#: internal/config/config.go:63 +#: internal/config/config.go:64 msgid "Error opening config file, using defaults" msgstr "" -#: internal/config/config.go:76 +#: internal/config/config.go:77 msgid "Error decoding config file, using defaults" msgstr "" -#: internal/config/config.go:88 +#: internal/config/config.go:89 msgid "Unable to detect user config directory" msgstr "" -#: internal/config/config.go:96 +#: internal/config/config.go:97 msgid "Unable to create ALR config directory" msgstr "" -#: internal/config/config.go:105 +#: internal/config/config.go:106 msgid "Unable to create ALR config file" msgstr "" -#: internal/config/config.go:111 +#: internal/config/config.go:112 msgid "Error encoding default configuration" msgstr "" -#: internal/config/config.go:120 +#: internal/config/config.go:121 msgid "Unable to detect cache directory" msgstr "" -#: internal/config/config.go:130 +#: internal/config/config.go:131 msgid "Unable to create repo cache directory" msgstr "" -#: internal/config/config.go:136 +#: internal/config/config.go:137 msgid "Unable to create package cache directory" msgstr "" @@ -255,7 +259,7 @@ msgstr "" msgid "Error initialization database" msgstr "" -#: list.go:88 +#: list.go:91 msgid "Error listing installed packages" msgstr "" @@ -437,6 +441,6 @@ msgstr "" msgid "Upgrade all installed packages" msgstr "" -#: upgrade.go:79 +#: upgrade.go:83 msgid "Error checking for updates" msgstr "" diff --git a/internal/translations/po/ru/default.po b/internal/translations/po/ru/default.po index 0048e81..a48e177 100644 --- a/internal/translations/po/ru/default.po +++ b/internal/translations/po/ru/default.po @@ -34,23 +34,23 @@ msgid "" "Build package from scratch even if there's an already built package available" msgstr "" -#: build.go:70 -msgid "Error pulling repositories" +#: build.go:71 +msgid "Error pulling repos" msgstr "" -#: build.go:76 +#: build.go:78 msgid "Unable to detect a supported package manager on the system" msgstr "" -#: build.go:87 +#: build.go:89 msgid "Error building package" msgstr "Ошибка при сборке пакета" -#: build.go:93 +#: build.go:95 msgid "Error getting working directory" msgstr "" -#: build.go:101 +#: build.go:103 msgid "Error moving the package" msgstr "" @@ -74,10 +74,6 @@ msgstr "" msgid "Unable to create new cache directory" msgstr "" -#: fix.go:62 -msgid "Error pulling repos" -msgstr "" - #: fix.go:66 msgid "Done" msgstr "" @@ -118,43 +114,51 @@ msgstr "Показывать всю информацию, а не только msgid "Command info expected at least 1 argument, got %d" msgstr "" -#: info.go:71 +#: info.go:73 msgid "Error finding packages" msgstr "" -#: info.go:87 +#: info.go:89 msgid "Error parsing os-release file" msgstr "" -#: info.go:96 +#: info.go:98 msgid "Error resolving overrides" msgstr "" -#: info.go:105 info.go:111 +#: info.go:107 info.go:113 msgid "Error encoding script variables" msgstr "" +#: install.go:43 +msgid "Install a new package" +msgstr "" + #: install.go:57 msgid "Command install expected at least 1 argument, got %d" msgstr "" -#: install.go:90 +#: install.go:70 +msgid "Error pulling repositories" +msgstr "" + +#: install.go:92 msgid "Error getting packages" msgstr "" -#: install.go:99 +#: install.go:101 msgid "Error iterating over packages" msgstr "" -#: install.go:112 +#: install.go:114 msgid "Remove an installed package" msgstr "" -#: install.go:117 +#: install.go:119 msgid "Command remove expected at least 1 argument, got %d" msgstr "" -#: install.go:129 +#: install.go:131 msgid "Error removing packages" msgstr "" @@ -182,39 +186,39 @@ msgstr "" msgid "Choose which optional package(s) to install" msgstr "" -#: internal/config/config.go:63 +#: internal/config/config.go:64 msgid "Error opening config file, using defaults" msgstr "" -#: internal/config/config.go:76 +#: internal/config/config.go:77 msgid "Error decoding config file, using defaults" msgstr "" -#: internal/config/config.go:88 +#: internal/config/config.go:89 msgid "Unable to detect user config directory" msgstr "" -#: internal/config/config.go:96 +#: internal/config/config.go:97 msgid "Unable to create ALR config directory" msgstr "" -#: internal/config/config.go:105 +#: internal/config/config.go:106 msgid "Unable to create ALR config file" msgstr "" -#: internal/config/config.go:111 +#: internal/config/config.go:112 msgid "Error encoding default configuration" msgstr "" -#: internal/config/config.go:120 +#: internal/config/config.go:121 msgid "Unable to detect cache directory" msgstr "" -#: internal/config/config.go:130 +#: internal/config/config.go:131 msgid "Unable to create repo cache directory" msgstr "" -#: internal/config/config.go:136 +#: internal/config/config.go:137 msgid "Unable to create package cache directory" msgstr "" @@ -263,7 +267,7 @@ msgstr "" msgid "Error initialization database" msgstr "" -#: list.go:88 +#: list.go:91 msgid "Error listing installed packages" msgstr "" @@ -446,6 +450,6 @@ msgstr "" msgid "Upgrade all installed packages" msgstr "" -#: upgrade.go:79 +#: upgrade.go:83 msgid "Error checking for updates" msgstr "" diff --git a/internal/types/config.go b/internal/types/config.go index 241cfbe..62a6950 100644 --- a/internal/types/config.go +++ b/internal/types/config.go @@ -26,6 +26,7 @@ type Config struct { IgnorePkgUpdates []string `toml:"ignorePkgUpdates"` Repos []Repo `toml:"repo"` Unsafe Unsafe `toml:"unsafe"` + AutoPull bool `toml:"autoPull"` } // Repo represents a ALR repo within a configuration file diff --git a/list.go b/list.go index 19ad7a6..6552f52 100644 --- a/list.go +++ b/list.go @@ -55,10 +55,13 @@ func ListCmd() *cli.Command { os.Exit(1) } rs := repos.New(cfg, db) - err = rs.Pull(ctx, cfg.Repos(ctx)) - if err != nil { - slog.Error(gotext.Get("Error pulling repositories"), "err", err) - os.Exit(1) + + if cfg.AutoPull(ctx) { + err = rs.Pull(ctx, cfg.Repos(ctx)) + if err != nil { + slog.Error(gotext.Get("Error pulling repositories"), "err", err) + os.Exit(1) + } } where := "true" diff --git a/upgrade.go b/upgrade.go index 3002641..8ba22f6 100644 --- a/upgrade.go +++ b/upgrade.go @@ -56,6 +56,8 @@ func UpgradeCmd() *cli.Command { Action: func(c *cli.Context) error { ctx := c.Context + cfg := config.GetInstance(ctx) + info, err := distro.ParseOSRelease(ctx) if err != nil { slog.Error(gotext.Get("Error parsing os-release file"), "err", err) @@ -68,10 +70,12 @@ func UpgradeCmd() *cli.Command { os.Exit(1) } - err = repos.Pull(ctx, config.Config(ctx).Repos) - if err != nil { - slog.Error(gotext.Get("Error pulling repos"), "err", err) - os.Exit(1) + if cfg.AutoPull(ctx) { + err = repos.Pull(ctx, config.Config(ctx).Repos) + if err != nil { + slog.Error(gotext.Get("Error pulling repos"), "err", err) + os.Exit(1) + } } updates, err := checkForUpdates(ctx, mgr, info) From fd643ea6cd736a6761d469341ce7881f8d676aa9 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Wed, 22 Jan 2025 18:12:26 +0300 Subject: [PATCH 6/6] chore: run `make fmt` and `make i18n` --- gen.go | 2 +- helper.go | 2 +- install.go | 1 - internal/translations/default.pot | 42 +++++++++++++------------- internal/translations/po/ru/default.po | 42 +++++++++++++------------- 5 files changed, 44 insertions(+), 45 deletions(-) diff --git a/gen.go b/gen.go index 20064a5..37ffae6 100644 --- a/gen.go +++ b/gen.go @@ -34,7 +34,7 @@ func GenCmd() *cli.Command { Usage: gotext.Get("Generate a ALR script from a template"), Aliases: []string{"gen"}, Subcommands: []*cli.Command{ - &cli.Command{ + { Name: "pip", Usage: gotext.Get("Generate a ALR script for a pip module"), Flags: []cli.Flag{ diff --git a/helper.go b/helper.go index 3c2eb17..074e702 100644 --- a/helper.go +++ b/helper.go @@ -36,7 +36,7 @@ import ( ) func HelperCmd() *cli.Command { - var helperListCmd = &cli.Command{ + helperListCmd := &cli.Command{ Name: "list", Usage: gotext.Get("List all the available helper commands"), Aliases: []string{"ls"}, diff --git a/install.go b/install.go index d1fdd1a..54982b4 100644 --- a/install.go +++ b/install.go @@ -37,7 +37,6 @@ import ( ) func InstallCmd() *cli.Command { - return &cli.Command{ Name: "install", Usage: gotext.Get("Install a new package"), diff --git a/internal/translations/default.pot b/internal/translations/default.pot index 56f1c34..0f12447 100644 --- a/internal/translations/default.pot +++ b/internal/translations/default.pot @@ -27,7 +27,7 @@ msgid "" msgstr "" #: build.go:71 -msgid "Error pulling repos" +msgid "Error pulling repositories" msgstr "" #: build.go:78 @@ -66,6 +66,10 @@ msgstr "" msgid "Unable to create new cache directory" msgstr "" +#: fix.go:62 +msgid "Error pulling repos" +msgstr "" + #: fix.go:66 msgid "Done" msgstr "" @@ -102,55 +106,55 @@ msgstr "" msgid "Show all information, not just for the current distro" msgstr "" -#: info.go:59 +#: info.go:57 +msgid "Error initialization database" +msgstr "" + +#: info.go:64 msgid "Command info expected at least 1 argument, got %d" msgstr "" -#: info.go:73 +#: info.go:78 msgid "Error finding packages" msgstr "" -#: info.go:89 +#: info.go:94 msgid "Error parsing os-release file" msgstr "" -#: info.go:98 +#: info.go:103 msgid "Error resolving overrides" msgstr "" -#: info.go:107 info.go:113 +#: info.go:112 info.go:118 msgid "Error encoding script variables" msgstr "" -#: install.go:43 +#: install.go:42 msgid "Install a new package" msgstr "" -#: install.go:57 +#: install.go:56 msgid "Command install expected at least 1 argument, got %d" msgstr "" -#: install.go:70 -msgid "Error pulling repositories" -msgstr "" - -#: install.go:92 +#: install.go:91 msgid "Error getting packages" msgstr "" -#: install.go:101 +#: install.go:100 msgid "Error iterating over packages" msgstr "" -#: install.go:114 +#: install.go:113 msgid "Remove an installed package" msgstr "" -#: install.go:119 +#: install.go:118 msgid "Command remove expected at least 1 argument, got %d" msgstr "" -#: install.go:131 +#: install.go:130 msgid "Error removing packages" msgstr "" @@ -255,10 +259,6 @@ msgstr "" msgid "List ALR repo packages" msgstr "" -#: list.go:54 -msgid "Error initialization database" -msgstr "" - #: list.go:91 msgid "Error listing installed packages" msgstr "" diff --git a/internal/translations/po/ru/default.po b/internal/translations/po/ru/default.po index a48e177..be38515 100644 --- a/internal/translations/po/ru/default.po +++ b/internal/translations/po/ru/default.po @@ -35,7 +35,7 @@ msgid "" msgstr "" #: build.go:71 -msgid "Error pulling repos" +msgid "Error pulling repositories" msgstr "" #: build.go:78 @@ -74,6 +74,10 @@ msgstr "" msgid "Unable to create new cache directory" msgstr "" +#: fix.go:62 +msgid "Error pulling repos" +msgstr "" + #: fix.go:66 msgid "Done" msgstr "" @@ -110,55 +114,55 @@ msgstr "Напечатать информацию о пакете" msgid "Show all information, not just for the current distro" msgstr "Показывать всю информацию, а не только для текущего дистрибутива" -#: info.go:59 +#: info.go:57 +msgid "Error initialization database" +msgstr "" + +#: info.go:64 msgid "Command info expected at least 1 argument, got %d" msgstr "" -#: info.go:73 +#: info.go:78 msgid "Error finding packages" msgstr "" -#: info.go:89 +#: info.go:94 msgid "Error parsing os-release file" msgstr "" -#: info.go:98 +#: info.go:103 msgid "Error resolving overrides" msgstr "" -#: info.go:107 info.go:113 +#: info.go:112 info.go:118 msgid "Error encoding script variables" msgstr "" -#: install.go:43 +#: install.go:42 msgid "Install a new package" msgstr "" -#: install.go:57 +#: install.go:56 msgid "Command install expected at least 1 argument, got %d" msgstr "" -#: install.go:70 -msgid "Error pulling repositories" -msgstr "" - -#: install.go:92 +#: install.go:91 msgid "Error getting packages" msgstr "" -#: install.go:101 +#: install.go:100 msgid "Error iterating over packages" msgstr "" -#: install.go:114 +#: install.go:113 msgid "Remove an installed package" msgstr "" -#: install.go:119 +#: install.go:118 msgid "Command remove expected at least 1 argument, got %d" msgstr "" -#: install.go:131 +#: install.go:130 msgid "Error removing packages" msgstr "" @@ -263,10 +267,6 @@ msgstr "ОШИБКА" msgid "List ALR repo packages" msgstr "" -#: list.go:54 -msgid "Error initialization database" -msgstr "" - #: list.go:91 msgid "Error listing installed packages" msgstr ""