daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request 2302: upd-all

Browse Source 
Squashed commit of the following:

commit f920006277f39b74c803139af2a9039aa45effae
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Nov 8 16:14:41 2024 +0300

    all: fix pre-commit; upd dnsproxy

commit 391f79b244348c6075f5ba0fccfb8882791bf3f1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Nov 7 18:53:28 2024 +0300

    scripts: imp install

commit 35324db80b591831c32b7ea45930eefee82a6320
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Nov 7 18:20:23 2024 +0300

    all: imp docs, scripts

commit d2724cfaefdb8659efbdb5bf181a28721a909f07
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Nov 7 17:26:23 2024 +0300

    all: upd go, deps, tools, scripts
This commit is contained in:
Ainar Garipov
2024-11-08 17:18:16 +03:00
parent 6673bb175a
commit ac5a96fada
40 changed files with 834 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
scripts/translations/main.go
View File

@@ -10,6 +10,7 @@ import (
"encoding/json"
"fmt"
"log/slog"
"maps"
"net/url"
"os"
"os/exec"
@@ -21,7 +22,6 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/aghos"
"github.com/AdguardTeam/golibs/errors"
"github.com/AdguardTeam/golibs/logutil/slogutil"
"golang.org/x/exp/maps"
)
const (
@@ -76,40 +76,30 @@ func main() {
usage("")
}
conf, err := readTwoskyConfig()
check(err)
conf := errors.Must(readTwoskyConfig())
var cli *twoskyClient
switch os.Args[1] {
case "summary":
err = summary(conf.Languages)
errors.Check(summary(conf.Languages))
case "download":
cli, err = conf.toClient()
check(err)
cli = errors.Must(conf.toClient())
err = cli.download(ctx, l)
errors.Check(cli.download(ctx, l))
case "unused":
err = unused(ctx, l, conf.LocalizableFiles[0])
err := unused(ctx, l, conf.LocalizableFiles[0])
errors.Check(err)
case "upload":
cli, err = conf.toClient()
check(err)
cli = errors.Must(conf.toClient())
err = cli.upload()
errors.Check(cli.upload())
case "auto-add":
err = autoAdd(conf.LocalizableFiles[0])
err := autoAdd(conf.LocalizableFiles[0])
errors.Check(err)
default:
usage("unknown command")
}
check(err)
}
// check is a simple error-checking helper for scripts.
func check(err error) {
if err != nil {
panic(err)
}
}
// usage prints usage. If addStr is not empty print addStr and exit with code
@@ -163,15 +153,11 @@ func readTwoskyConfig() (t *twoskyConfig, err error) {
var tsc []twoskyConfig
err = json.Unmarshal(b, &tsc)
if err != nil {
err = fmt.Errorf("unmarshalling %q: %w", twoskyConfFile, err)
return nil, err
return nil, fmt.Errorf("unmarshalling %q: %w", twoskyConfFile, err)
}
if len(tsc) == 0 {
err = fmt.Errorf("%q is empty", twoskyConfFile)
return nil, err
return nil, fmt.Errorf("%q is empty", twoskyConfFile)
}
conf := tsc[0]
@@ -224,7 +210,8 @@ func (t *twoskyConfig) toClient() (cli *twoskyClient, err error) {
baseLang = langCode(uLangStr)
}
langs := maps.Keys(t.Languages)
langs := slices.Sorted(maps.Keys(t.Languages))
dlLangStr := os.Getenv("DOWNLOAD_LANGUAGES")
if dlLangStr == "blocker" {
langs = blockerLangCodes
@@ -295,8 +282,7 @@ func summary(langs languages) (err error) {
size := float64(len(baseLoc))
keys := maps.Keys(langs)
slices.Sort(keys)
keys := slices.Sorted(maps.Keys(langs))
for _, lang := range keys {
name := filepath.Join(localesDir, string(lang)+".json")
@@ -399,10 +385,7 @@ func findUnused(fileNames []string, loc locales) (err error) {
}
}
keys := maps.Keys(loc)
slices.Sort(keys)
for _, v := range keys {
for _, v := range slices.Sorted(maps.Keys(loc)) {
fmt.Println(v)
}