From ac35b4d71d76b0d12cb4c5a6b9e80d1d7c4f8be6 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Wed, 22 Jan 2025 14:40:11 +0300 Subject: [PATCH] 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