mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-20 22:11:50 +03:00
d32832735c
Updates #6545. Squashed commit of the following: commit b1969128a99ff21c97feb4e7805b4b8133d7122f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 15 20:04:37 2023 +0300 home: fix import commit 872ccea1491a8da76cc24db79247438d0ce4d256 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 15 20:01:15 2023 +0300 all: output schema version
77 lines
1.2 KiB
Go
77 lines
1.2 KiB
Go
package configmigrate
|
|
|
|
// migrateTo27 performs the following changes:
|
|
//
|
|
// # BEFORE:
|
|
// 'querylog':
|
|
// 'ignored':
|
|
// - '.'
|
|
// - # …
|
|
// # …
|
|
// 'statistics':
|
|
// 'ignored':
|
|
// - '.'
|
|
// - # …
|
|
// # …
|
|
// # …
|
|
//
|
|
// # AFTER:
|
|
// 'querylog':
|
|
// 'ignored':
|
|
// - '|.^'
|
|
// - # …
|
|
// # …
|
|
// 'statistics':
|
|
// 'ignored':
|
|
// - '|.^'
|
|
// - # …
|
|
// # …
|
|
// # …
|
|
func migrateTo27(diskConf yobj) (err error) {
|
|
diskConf["schema_version"] = 27
|
|
|
|
keys := []string{"querylog", "statistics"}
|
|
for _, k := range keys {
|
|
err = replaceDot(diskConf, k)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// replaceDot replaces rules blocking root domain "." with AdBlock style syntax
|
|
// "|.^".
|
|
func replaceDot(diskConf yobj, key string) (err error) {
|
|
var obj yobj
|
|
var ok bool
|
|
obj, ok, err = fieldVal[yobj](diskConf, key)
|
|
if err != nil {
|
|
return err
|
|
} else if !ok {
|
|
return nil
|
|
}
|
|
|
|
var ignored yarr
|
|
ignored, ok, err = fieldVal[yarr](obj, "ignored")
|
|
if err != nil {
|
|
return err
|
|
} else if !ok {
|
|
return nil
|
|
}
|
|
|
|
for i, hostVal := range ignored {
|
|
var host string
|
|
host, ok = hostVal.(string)
|
|
if !ok {
|
|
continue
|
|
}
|
|
|
|
if host == "." {
|
|
ignored[i] = "|.^"
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|