public/AdGuardHome
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/AdGuardHome.git synced 2026-07-28 23:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ADG-10291' into ADG-10294

Browse Source
This commit is contained in:
Ildar Kamalov
2025-08-27 19:07:40 +03:00
parent c44404835f be27c06481
commit 2eadc630c7
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -21,7 +21,7 @@ GO.MACRO = $${GO:-go}
VERBOSE.MACRO = $${VERBOSE:-0}
CHANNEL = development
# TODO: Update CLIENT_DIR to client_v2 for new frontend migration
# TODO(ik): Update CLIENT_DIR to client_v2 for new frontend migration
CLIENT_DIR = client
DEPLOY_SCRIPT_PATH = not/a/real/path
DIST_DIR = dist

2
scripts/companiesdb/download.sh
View File

@@ -6,7 +6,7 @@ set -e -f -u -x
# for this database is https://github.com/AdguardTeam/companiesdb.
#
trackers_url='https://raw.githubusercontent.com/AdguardTeam/companiesdb/main/dist/trackers.json'
# TODO: Update output path to './client_v2/src/helpers/trackers/trackers.json' for new frontend migration
# TODO(ik): Update output path to './client_v2/src/helpers/trackers/trackers.json' for new frontend migration
output='./client/src/helpers/trackers/trackers.json'
readonly trackers_url output

10
scripts/translations/main.go
View File

@@ -25,13 +25,12 @@ import (
"github.com/AdguardTeam/golibs/osutil"
)
// TODO(ik): Update localesDir and srcDir to "./client_v2/src/" for new frontend migration
const (
twoskyConfFile = "./.twosky.json"
// TODO: Update localesDir to "./client_v2/src/__locales" for new frontend migration
localesDir = "./client/src/__locales"
defaultBaseFile = "en.json"
defaultProjectID = "home"
// TODO: Update srcDir to "./client_v2/src" for new frontend migration
srcDir = "./client/src"
twoskyURI = "https://twosky.int.agrd.dev/api/v1"
@@ -79,8 +78,7 @@ func main() {
usage("")
}
// TODO: Support multiple projects in .twosky.json - add PROJECT_ID env var to select between 'home' and 'home_v2'
// TODO: Modify readTwoskyConfig() to return all configs and add selectProject() function
// TODO(ik): Support multiple projects in .twosky.json - add PROJECT_ID env var to select between 'home' and 'home_v2'
conf := errors.Must(readTwoskyConfig())
var cli *twoskyClient
@@ -110,7 +108,7 @@ func main() {
// usage prints usage. If addStr is not empty print addStr and exit with code
// 1, otherwise exit with code 0.
func usage(addStr string) {
// TODO: Add PROJECT_ID environment variable documentation when multi-project support is implemented
// TODO(ik): Add PROJECT_ID environment variable documentation when multi-project support is implemented
const usageStr = `Usage: go run main.go <command> [<args>]
Commands:
help
@@ -166,7 +164,7 @@ func readTwoskyConfig() (t *twoskyConfig, err error) {
return nil, fmt.Errorf("%q is empty", twoskyConfFile)
}
// TODO: Currently only uses first project - modify to support project selection
// TODO(ik): Currently only uses first project - modify to support project selection
conf := tsc[0]
for _, lang := range conf.Languages {

2
scripts/vetted-filters/main.go
View File

@@ -95,7 +95,7 @@ func main() {
errors.Check(enc.Encode(aghFlt))
// TODO: Update output path to "client_v2/src/helpers/filters/filters.ts" for new frontend migration
// TODO(ik): Update output path to "client_v2/src/helpers/filters/filters.ts" for new frontend migration
err = maybe.WriteFile("client/src/helpers/filters/filters.ts", buf.Bytes(), 0o644)
errors.Check(err)
}