docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
<mask> }
<mask>
<mask> // AddStaticLease adds a static lease (thread-safe)
<mask> func (s *Server) AddStaticLease(l Lease) error {
<mask> if s.IPpool == nil {
<mask> return fmt.Errorf("DHCP server isn't started")
<mask> }
<mask>
<mask> if len(l.IP) != 4 {
<mask> return fmt.Errorf("Invalid IP")
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b9c0b5535694fea37fad8fc85e3b1e897860f6ea | dhcpd/dhcpd.go | |
<mask> }
<mask>
<mask> // RemoveStaticLease removes a static lease (thread-safe)
<mask> func (s *Server) RemoveStaticLease(l Lease) error {
<mask> if s.IPpool == nil {
<mask> return fmt.Errorf("DHCP server isn't started")
<mask> }
<mask>
<mask> if len(l.IP) != 4 {
<mask> return fmt.Errorf("Invalid IP... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b9c0b5535694fea37fad8fc85e3b1e897860f6ea | dhcpd/dhcpd.go | |
<mask> func (s *Server) StaticLeases() []Lease {
<mask> s.leasesLock.Lock()
<mask> defer s.leasesLock.Unlock()
<mask>
<mask> if s.IPpool == nil {
<mask> s.dbLoad()
<mask> }
<mask>
<mask> var result []Lease
<mask> for _, lease := range s.leases {
<mask> if lease.Expiry.Unix() == 1 {
<mask> res... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/b9c0b5535694fea37fad8fc85e3b1e897860f6ea | dhcpd/dhcpd.go | |
diskConf := yobj{} | <mask>
<mask> // Performs necessary upgrade operations if needed
<mask> func upgradeConfig() error {
<mask> // read a config file into an interface map, so we can manipulate values without losing any
<mask> diskConfig := yobj{}
<mask> body, err := readConfigFile()
<mask> if err != nil {
<mask> return err... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
err = yaml.Unmarshal(body, &diskConf) | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> err = yaml.Unmarshal(body, &diskConfig)
<mask> if err != nil {
<mask> log.Printf("Couldn't parse config file: %s", err)
<mask> return err
<mask> }
<mask>
</s> Pull request: home: fix migration, imp code
Updates #1401.
Updates #2646... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
schemaVersionInterface, ok := diskConf["schema_version"] | <mask> log.Printf("Couldn't parse config file: %s", err)
<mask> return err
<mask> }
<mask>
<mask> schemaVersionInterface, ok := diskConfig["schema_version"]
<mask> log.Tracef("got schema version %v", schemaVersionInterface)
<mask> if !ok {
<mask> // no schema version, set it to 0
<mask> schemaVers... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
return upgradeConfigSchema(schemaVersion, diskConf) | <mask> // do nothing
<mask> return nil
<mask> }
<mask>
<mask> return upgradeConfigSchema(schemaVersion, &diskConfig)
<mask> }
<mask>
<mask> // Upgrade from oldVersion to newVersion
<mask> func upgradeConfigSchema(oldVersion int, diskConfig *yobj) error {
<mask> switch oldVersion {
</s> Pull request:... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
// upgradeFunc is a function that upgrades a config and returns an error.
type upgradeFunc = func(diskConf yobj) (err error)
| <mask>
<mask> return upgradeConfigSchema(schemaVersion, diskConf)
<mask> }
<mask>
<mask> // Upgrade from oldVersion to newVersion
<mask> func upgradeConfigSchema(oldVersion int, diskConf yobj) (err error) {
<mask> upgrades := []upgradeFunc{
<mask> upgradeSchema0to1,
</s> Pull request: home: fix migration... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
func upgradeConfigSchema(oldVersion int, diskConf yobj) (err error) {
upgrades := []upgradeFunc{
upgradeSchema0to1,
upgradeSchema1to2,
upgradeSchema2to3,
upgradeSchema3to4,
upgradeSchema4to5,
upgradeSchema5to6,
upgradeSchema6to7,
upgradeSchema7to8,
}
n := 0
for i, u := range upgrades {
if i >= ol... | <mask> return upgradeConfigSchema(schemaVersion, &diskConfig)
<mask> }
<mask>
<mask> // Upgrade from oldVersion to newVersion
<mask> func upgradeConfigSchema(oldVersion int, diskConfig *yobj) error {
<mask> switch oldVersion {
<mask> case 0:
<mask> err := upgradeSchema0to1(diskConfig)
<mask> if err != ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
<mask> err := upgradeSchema7to8(diskConfig)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> default:
<mask> err := fmt.Errorf("configuration file contains unknown schema_version, abort")
<mask> log.Println(err)
<mask> return err
<mask> }
<mask>
<mask> configFile := config.getConfi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go | |
if n == 0 {
return fmt.Errorf("unknown configuration schema version %d", oldVersion)
}
body, err := yaml.Marshal(diskConf) | <mask> log.Println(err)
<mask> return err
<mask> }
<mask>
<mask> configFile := config.getConfigFilename()
<mask> body, err := yaml.Marshal(diskConfig)
<mask> if err != nil {
<mask> log.Printf("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
<mask>
</s> Pull request: home: fi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
return fmt.Errorf("generating new config: %w", err) | <mask>
<mask> configFile := config.getConfigFilename()
<mask> body, err := yaml.Marshal(diskConfig)
<mask> if err != nil {
<mask> log.Printf("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
<mask>
<mask> config.fileData = body
<mask> err = file.SafeWrite(configFile, body)
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
confFile := config.getConfigFilename()
err = file.SafeWrite(confFile, body) | <mask> return err
<mask> }
<mask>
<mask> config.fileData = body
<mask> err = file.SafeWrite(configFile, body)
<mask> if err != nil {
<mask> log.Printf("Couldn't save YAML config: %s", err)
<mask> return err
<mask> }
<mask>
</s> Pull request: home: fix migration, imp code
Updates #1401.
Updates ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
return fmt.Errorf("saving new config: %w", err) | <mask>
<mask> config.fileData = body
<mask> err = file.SafeWrite(configFile, body)
<mask> if err != nil {
<mask> log.Printf("Couldn't save YAML config: %s", err)
<mask> return err
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request: home: fix migration, imp code
Updates #1401.
U... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
func upgradeSchema0to1(diskConf yobj) error { | <mask> }
<mask>
<mask> // The first schema upgrade:
<mask> // No more "dnsfilter.txt", filters are now kept in data/filters/
<mask> func upgradeSchema0to1(diskConfig *yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> dnsFilterPath := filepath.Join(Context.workDir, "dnsfilter.txt")
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
diskConf["schema_version"] = 1 | <mask> // not fatal, move on
<mask> }
<mask> }
<mask>
<mask> (*diskConfig)["schema_version"] = 1
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // Second schema upgrade:
</s> Pull request: home: fix migration, imp code
Updates #1401.
Updates #2646.
Squashed commit of the following:
commit 93b0... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
func upgradeSchema1to2(diskConf yobj) error { | <mask>
<mask> // Second schema upgrade:
<mask> // coredns is now dns in config
<mask> // delete 'Corefile', since we don't use that anymore
<mask> func upgradeSchema1to2(diskConfig *yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> coreFilePath := filepath.Join(Context.workDir, "Core... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
if _, ok := diskConf["dns"]; !ok {
diskConf["dns"] = diskConf["coredns"]
delete(diskConf, "coredns") | <mask> // not fatal, move on
<mask> }
<mask> }
<mask>
<mask> if _, ok := (*diskConfig)["dns"]; !ok {
<mask> (*diskConfig)["dns"] = (*diskConfig)["coredns"]
<mask> delete((*diskConfig), "coredns")
<mask> }
<mask> (*diskConfig)["schema_version"] = 2
<mask>
<mask> return nil
<mask> }
</s> Pull... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
diskConf["schema_version"] = 2 | <mask> if _, ok := (*diskConfig)["dns"]; !ok {
<mask> (*diskConfig)["dns"] = (*diskConfig)["coredns"]
<mask> delete((*diskConfig), "coredns")
<mask> }
<mask> (*diskConfig)["schema_version"] = 2
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // Third schema upgrade:
</s> Pull request: home: fix mig... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
func upgradeSchema2to3(diskConf yobj) error { | <mask> }
<mask>
<mask> // Third schema upgrade:
<mask> // Bootstrap DNS becomes an array
<mask> func upgradeSchema2to3(diskConfig *yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> // Let's read dns configuration from diskConfig
<mask> dnsConfig, ok := (*diskConfig)["dns"]
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
// Let's read dns configuration from diskConf
dnsConfig, ok := diskConf["dns"] | <mask> // Bootstrap DNS becomes an array
<mask> func upgradeSchema2to3(diskConfig *yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> // Let's read dns configuration from diskConfig
<mask> dnsConfig, ok := (*diskConfig)["dns"]
<mask> if !ok {
<mask> return fmt.Errorf("no DNS config... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
diskConf["dns"] = newDNSConfig | <mask> }
<mask>
<mask> newBootstrapConfig := []string{fmt.Sprint(bootstrapDNS)}
<mask> newDNSConfig["bootstrap_dns"] = newBootstrapConfig
<mask> (*diskConfig)["dns"] = newDNSConfig
<mask>
<mask> // Bump schema version
<mask> (*diskConfig)["schema_version"] = 3
<mask>
<mask> return nil
</s> Pull req... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
diskConf["schema_version"] = 3 | <mask> newDNSConfig["bootstrap_dns"] = newBootstrapConfig
<mask> (*diskConfig)["dns"] = newDNSConfig
<mask>
<mask> // Bump schema version
<mask> (*diskConfig)["schema_version"] = 3
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // Add use_global_blocked_services=true setting for existing "clients" ar... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
func upgradeSchema3to4(diskConf yobj) error { | <mask> return nil
<mask> }
<mask>
<mask> // Add use_global_blocked_services=true setting for existing "clients" array
<mask> func upgradeSchema3to4(diskConfig *yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> (*diskConfig)["schema_version"] = 4
<mask>
<mask> clients, ok := (*di... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
diskConf["schema_version"] = 4 | <mask> // Add use_global_blocked_services=true setting for existing "clients" array
<mask> func upgradeSchema3to4(diskConfig *yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> (*diskConfig)["schema_version"] = 4
<mask>
<mask> clients, ok := (*diskConfig)["clients"]
<mask> if !ok {
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
clients, ok := diskConf["clients"] | <mask> log.Printf("%s(): called", funcName())
<mask>
<mask> (*diskConfig)["schema_version"] = 4
<mask>
<mask> clients, ok := (*diskConfig)["clients"]
<mask> if !ok {
<mask> return nil
<mask> }
<mask>
<mask> switch arr := clients.(type) {
</s> Pull request: home: fix migration, imp code
Updates #1... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
func upgradeSchema4to5(diskConf yobj) error { | <mask> // users:
<mask> // - name: "..."
<mask> // password: "..."
<mask> // ...
<mask> func upgradeSchema4to5(diskConfig *yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> (*diskConfig)["schema_version"] = 5
<mask>
<mask> name, ok := (*diskConfig)["auth_name"]
</s> Pull reques... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
diskConf["schema_version"] = 5 | <mask> // ...
<mask> func upgradeSchema4to5(diskConfig *yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> (*diskConfig)["schema_version"] = 5
<mask>
<mask> name, ok := (*diskConfig)["auth_name"]
<mask> if !ok {
<mask> return nil
<mask> }
</s> Pull request: home: fix migration... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
name, ok := diskConf["auth_name"] | <mask> log.Printf("%s(): called", funcName())
<mask>
<mask> (*diskConfig)["schema_version"] = 5
<mask>
<mask> name, ok := (*diskConfig)["auth_name"]
<mask> if !ok {
<mask> return nil
<mask> }
<mask> nameStr, ok := name.(string)
<mask> if !ok {
</s> Pull request: home: fix migration, imp code
Upda... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
pass, ok := diskConf["auth_pass"] | <mask> log.Fatal("Please use double quotes in your user name in \"auth_name\" and restart AdGuardHome")
<mask> return nil
<mask> }
<mask>
<mask> pass, ok := (*diskConfig)["auth_pass"]
<mask> if !ok {
<mask> return nil
<mask> }
<mask> passStr, ok := pass.(string)
<mask> if !ok {
</s> Pull request... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
diskConf["users"] = users | <mask> Name: nameStr,
<mask> PasswordHash: string(hash),
<mask> }
<mask> users := []User{u}
<mask> (*diskConfig)["users"] = users
<mask> return nil
<mask> }
<mask>
<mask> // clients:
<mask> // ...
</s> Pull request: home: fix migration, imp code
Updates #1401.
Updates #2646.
Squashed commi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
func upgradeSchema5to6(diskConf yobj) error { | <mask> // ...
<mask> // ids:
<mask> // - 127.0.0.1
<mask> // - ...
<mask> func upgradeSchema5to6(diskConfig *yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> (*diskConfig)["schema_version"] = 6
<mask>
<mask> clients, ok := (*diskConfig)["clients"]
</s> Pull request: home: ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
diskConf["schema_version"] = 6 | <mask> // - ...
<mask> func upgradeSchema5to6(diskConfig *yobj) error {
<mask> log.Printf("%s(): called", funcName())
<mask>
<mask> (*diskConfig)["schema_version"] = 6
<mask>
<mask> clients, ok := (*diskConfig)["clients"]
<mask> if !ok {
<mask> return nil
<mask> }
</s> Pull request: home: fix migr... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
clients, ok := diskConf["clients"] | <mask> log.Printf("%s(): called", funcName())
<mask>
<mask> (*diskConfig)["schema_version"] = 6
<mask>
<mask> clients, ok := (*diskConfig)["clients"]
<mask> if !ok {
<mask> return nil
<mask> }
<mask>
<mask> switch arr := clients.(type) {
</s> Pull request: home: fix migration, imp code
Updates #1... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
func upgradeSchema6to7(diskConf yobj) error { | <mask> // interface_name: vboxnet0
<mask> // dhcpv4:
<mask> // gateway_ip: 192.168.56.1
<mask> // ...
<mask> func upgradeSchema6to7(diskConfig *yobj) error {
<mask> log.Printf("Upgrade yaml: 6 to 7")
<mask>
<mask> (*diskConfig)["schema_version"] = 7
<mask>
<mask> dhcpVal, ok := (*diskConfig)[... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
diskConf["schema_version"] = 7 | <mask> // ...
<mask> func upgradeSchema6to7(diskConfig *yobj) error {
<mask> log.Printf("Upgrade yaml: 6 to 7")
<mask>
<mask> (*diskConfig)["schema_version"] = 7
<mask>
<mask> dhcpVal, ok := (*diskConfig)["dhcp"]
<mask> if !ok {
<mask> return nil
<mask> }
</s> Pull request: home: fix migration, ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
dhcpVal, ok := diskConf["dhcp"] | <mask> log.Printf("Upgrade yaml: 6 to 7")
<mask>
<mask> (*diskConfig)["schema_version"] = 7
<mask>
<mask> dhcpVal, ok := (*diskConfig)["dhcp"]
<mask> if !ok {
<mask> return nil
<mask> }
<mask>
<mask> switch dhcp := dhcpVal.(type) {
</s> Pull request: home: fix migration, imp code
Updates #1401.
U... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
func upgradeSchema7to8(diskConf yobj) (err error) { | <mask> // 'dns':
<mask> // 'bind_hosts':
<mask> // - '127.0.0.1'
<mask> //
<mask> func upgradeSchema7to8(diskConfig *yobj) (err error) {
<mask> log.Printf("Upgrade yaml: 7 to 8")
<mask>
<mask> (*diskConfig)["schema_version"] = 8
<mask>
<mask> dnsVal, ok := (*diskConfig)["dns"]
</s> Pull reques... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
diskConf["schema_version"] = 8 | <mask> //
<mask> func upgradeSchema7to8(diskConfig *yobj) (err error) {
<mask> log.Printf("Upgrade yaml: 7 to 8")
<mask>
<mask> (*diskConfig)["schema_version"] = 8
<mask>
<mask> dnsVal, ok := (*diskConfig)["dns"]
<mask> if !ok {
<mask> return nil
<mask> }
</s> Pull request: home: fix migration, imp ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
dnsVal, ok := diskConf["dns"] | <mask> log.Printf("Upgrade yaml: 7 to 8")
<mask>
<mask> (*diskConfig)["schema_version"] = 8
<mask>
<mask> dnsVal, ok := (*diskConfig)["dns"]
<mask> if !ok {
<mask> return nil
<mask> }
<mask>
<mask> dns, ok := dnsVal.(yobj)
</s> Pull request: home: fix migration, imp code
Updates #1401.
Updates #2... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade.go |
err := upgradeSchema1to2(diskConf) | <mask>
<mask> func TestUpgradeSchema1to2(t *testing.T) {
<mask> diskConf := testDiskConf(1)
<mask>
<mask> err := upgradeSchema1to2(&diskConf)
<mask> require.Nil(t, err)
<mask>
<mask> require.Equal(t, diskConf["schema_version"], 2)
<mask>
<mask> _, ok := diskConf["coredns"]
</s> Pull request: home: f... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade_test.go |
err := upgradeSchema2to3(diskConf) | <mask>
<mask> func TestUpgradeSchema2to3(t *testing.T) {
<mask> diskConf := testDiskConf(2)
<mask>
<mask> err := upgradeSchema2to3(&diskConf)
<mask> require.Nil(t, err)
<mask>
<mask> require.Equal(t, diskConf["schema_version"], 3)
<mask>
<mask> dnsMap, ok := diskConf["dns"]
</s> Pull request: home: ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade_test.go |
err := upgradeSchema7to8(oldConf) | <mask> },
<mask> "schema_version": 7,
<mask> }
<mask>
<mask> err := upgradeSchema7to8(&oldConf)
<mask> require.Nil(t, err)
<mask>
<mask> require.Equal(t, oldConf["schema_version"], 8)
<mask>
<mask> dnsVal, ok := oldConf["dns"]
</s> Pull request: home: fix migration, imp code
Updates #1401.
Updat... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba3fc242ab8a0e52eeec6498c218ab84208531a6 | internal/home/upgrade_test.go |
"location": "Location",
"orgname": "Organisation name",
"netname": "Network name",
"descr": "Description", | <mask> "sign_in": "Sign in",
<mask> "sign_out": "Sign out",
<mask> "forgot_password": "Forgot password?",
<mask> "forgot_password_desc": "Please follow <0>these steps</0> to create a new password for your user account.",
<mask> "city": "<0>City:</0> {{value}}",
<mask> "country": "<0>Countr... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/__locales/en.json |
const clientCell = (clients, autoClients, t) => | <mask>
<mask> return <Cell value={value} percent={percent} color={percentColor} />;
<mask> };
<mask>
<mask> const clientCell = (clients, autoClients) =>
<mask> function cell(row) {
<mask> const { value } = row;
<mask>
<mask> return (
<mask> <div className="logs__... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Dashboard/Clients.js |
{formatClientCell(value, clients, autoClients, t)} | <mask> const { value } = row;
<mask>
<mask> return (
<mask> <div className="logs__row logs__row--overflow logs__row--column">
<mask> {formatClientCell(value, clients, autoClients)}
<mask> </div>
<mask> );
<mask> };
<mask>
<mask> const Clien... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Dashboard/Clients.js |
Cell: clientCell(clients, autoClients, t), | <mask> Header: 'IP',
<mask> accessor: 'ip',
<mask> sortMethod: (a, b) =>
<mask> parseInt(a.replace(/\./g, ''), 10) - parseInt(b.replace(/\./g, ''), 10),
<mask> Cell: clientCell(clients, autoClients),
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Dashboard/Clients.js |
minWidth: 180,
maxWidth: 200, | <mask> {
<mask> Header: <Trans>requests_count</Trans>,
<mask> accessor: 'count',
<mask> Cell: countCell(dnsQueries),
<mask> },
<mask> ]}
<mask> showPagination={false}
</s> + client: add icons to t... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Dashboard/Clients.js |
const { dashboard, t } = this.props; | <mask> );
<mask> };
<mask>
<mask> getClientCell = ({ original, value }) => {
<mask> const { dashboard } = this.props;
<mask> const { clients, autoClients } = dashboard;
<mask> const { reason, domain } = original;
<mask> const isFiltered = this.checkFiltered(reaso... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Logs/index.js |
{formatClientCell(value, clients, autoClients, t)} | <mask>
<mask> return (
<mask> <Fragment>
<mask> <div className="logs__row logs__row--overflow logs__row--column">
<mask> {formatClientCell(value, clients, autoClients)}
<mask> </div>
<mask> {isRewrite ? (
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Logs/index.js |
import whoisCell from './whoisCell';
import wrapCell from './wrapCell'; | <mask> import { withNamespaces } from 'react-i18next';
<mask> import ReactTable from 'react-table';
<mask>
<mask> import Card from '../../ui/Card';
<mask> import WhoisCell from './WhoisCell';
<mask> import WrapCell from './WrapCell';
<mask>
<mask> class AutoClients extends Component {
<mask> getStats = (... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Settings/Clients/AutoClients.js |
minWidth: 200,
Cell: wrapCell, | <mask> columns = [
<mask> {
<mask> Header: this.props.t('table_client'),
<mask> accessor: 'ip',
<mask> Cell: WrapCell,
<mask> },
<mask> {
<mask> Header: this.props.t('table_name'),
<mask> accessor: 'name',
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Settings/Clients/AutoClients.js |
minWidth: 200,
Cell: wrapCell, | <mask> },
<mask> {
<mask> Header: this.props.t('table_name'),
<mask> accessor: 'name',
<mask> Cell: WrapCell,
<mask> },
<mask> {
<mask> Header: this.props.t('source_label'),
<mask> accessor: 'source',
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Settings/Clients/AutoClients.js |
minWidth: 200,
Cell: wrapCell, | <mask> },
<mask> {
<mask> Header: this.props.t('source_label'),
<mask> accessor: 'source',
<mask> Cell: WrapCell,
<mask> },
<mask> {
<mask> Header: this.props.t('whois'),
<mask> accessor: 'whois_info',
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Settings/Clients/AutoClients.js |
minWidth: 200,
Cell: whoisCell(this.props.t), | <mask> },
<mask> {
<mask> Header: this.props.t('whois'),
<mask> accessor: 'whois_info',
<mask> Cell: WhoisCell,
<mask> },
<mask> {
<mask> Header: this.props.t('requests_count'),
<mask> accessor: 'statistics',
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Settings/Clients/AutoClients.js |
minWidth: 200, | <mask> },
<mask> {
<mask> Header: this.props.t('requests_count'),
<mask> accessor: 'statistics',
<mask> Cell: (row) => {
<mask> const clientIP = row.original.ip;
<mask> const clientStats = clientIP && this.getStats(clientIP, this... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Settings/Clients/AutoClients.js |
import wrapCell from './wrapCell';
import whoisCell from './whoisCell'; | <mask>
<mask> import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
<mask> import Card from '../../ui/Card';
<mask> import Modal from './Modal';
<mask> import WrapCell from './WrapCell';
<mask> import WhoisCell from './WhoisCell';
<mask>
<mask> class ClientsTable extends Component {
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Settings/Clients/ClientsTable.js |
Cell: wrapCell, | <mask> {
<mask> Header: this.props.t('table_name'),
<mask> accessor: 'name',
<mask> minWidth: 120,
<mask> Cell: WrapCell,
<mask> },
<mask> {
<mask> Header: this.props.t('settings'),
<mask> accessor: 'use_global_sett... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Settings/Clients/ClientsTable.js |
Cell: whoisCell(this.props.t), | <mask> {
<mask> Header: this.props.t('whois'),
<mask> accessor: 'whois_info',
<mask> minWidth: 200,
<mask> Cell: WhoisCell,
<mask> },
<mask> {
<mask> Header: this.props.t('requests_count'),
<mask> accessor: 'statist... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/Settings/Clients/ClientsTable.js |
<symbol id="question" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<circle cx="12" cy="12" r="10" /><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3" /><line x1="12" y1="17" x2="12" y2="17" />
</symbol>
<symbol id="... | <mask> <symbol id="question" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <circle cx="12" cy="12" r="10" /><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3" /><line x1="12" y1="17" x2="12" y2="17" />
<mask> </symbo... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/components/ui/Icons.js |
import { getClientInfo, normalizeWhois } from './helpers';
import { WHOIS_ICONS } from './constants'; | <mask> import React, { Fragment } from 'react';
<mask> import { getClientInfo } from './helpers';
<mask>
<mask> export const formatClientCell = (value, clients, autoClients) => {
<mask> const clientInfo = getClientInfo(clients, value) || getClientInfo(autoClients, value);
<mask> const { name, whois } = c... | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/helpers/formatClientCell.js |
const getFormattedWhois = (whois, t) => {
const whoisInfo = normalizeWhois(whois);
return (
Object.keys(whoisInfo).map((key) => {
const icon = WHOIS_ICONS[key];
return (
<span className="logs__whois text-muted" key={key} title={t(key)}>
{icon &... | <mask> import React, { Fragment } from 'react';
<mask> import { getClientInfo } from './helpers';
<mask>
<mask> export const formatClientCell = (value, clients, autoClients) => {
<mask> const clientInfo = getClientInfo(clients, value) || getClientInfo(autoClients, value);
<mask> const { name, whois } = c... | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/helpers/formatClientCell.js |
let whoisContainer = '';
let nameContainer = value; | <mask> export const formatClientCell = (value, clients, autoClients, t) => {
<mask> const clientInfo = getClientInfo(clients, value) || getClientInfo(autoClients, value);
<mask> const { name, whois } = clientInfo;
<mask>
<mask> if (name) {
<mask> nameContainer = (
<mask> <span cl... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/helpers/formatClientCell.js |
if (name) {
nameContainer = ( | <mask> export const formatClientCell = (value, clients, autoClients) => {
<mask> const clientInfo = getClientInfo(clients, value) || getClientInfo(autoClients, value);
<mask> const { name, whois } = clientInfo;
<mask>
<mask> if (whois && name) {
<mask> return (
<mask> <Fragment>
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/helpers/formatClientCell.js |
if (whois) {
whoisContainer = (
<div className="logs__text logs__text--wrap mt-1">
{getFormattedWhois(whois, t)}
</div>
);
}
| <mask> </span>
<mask> );
<mask> }
<mask>
<mask> return (
<mask> <span className="logs__text">
<mask> <Fragment>
<mask> {nameContainer}
<mask> {whoisContainer}
</s> + client: add icons to the whois info </s> remove <span c... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/helpers/formatClientCell.js |
<span className="logs__text">
<Fragment>
{nameContainer}
{whoisContainer}
</Fragment> | <mask> );
<mask> }
<mask>
<mask> return (
<mask> <span className="logs__text" title={value}>
<mask> {value}
<mask> </span>
<mask> );
<mask> };
</s> + client: add icons to the whois info </s> remove if (whois && name) {
return (
<Fragment... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/helpers/formatClientCell.js |
<mask> };
<mask>
<mask> export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
<mask>
<mask> const formatWhois = (whois) => {
<mask> if (!whois) {
<mask> return '';
<mask> }
<mask>
<mask> const keys = Object.keys(whois);
<mask> if ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/helpers/helpers.js | |
const whois = Object.keys(whois_info).length > 0 ? whois_info : ''; | <mask> return '';
<mask> }
<mask>
<mask> const { name, whois_info } = client;
<mask> const formattedWhois = formatWhois(whois_info);
<mask> const whois = formattedWhois && formattedWhois.length > 0 && formattedWhois.join(' | ');
<mask>
<mask> return { name, whois };
<mask> };
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ba62d42949db49fa049fdce41b16fcac629e0066 | client/src/helpers/helpers.js |
const coreDNSConfigTemplate = `.:{{.Port}} { | <mask> }
<mask> return nil
<mask> }
<mask>
<mask> const coreDNSConfigTemplate = `. {
<mask> {{if .ProtectionEnabled}}dnsfilter {{if .FilteringEnabled}}{{.FilterFile}}{{end}} {
<mask> {{if .SafeBrowsingEnabled}}safebrowsing{{end}}
<mask> {{if .ParentalEnabled}}parental {{.ParentalSensitivi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bad88961e93bf81668ea3eafe58ff2be64d71342 | config.go |
<mask> "log"
<mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "os/exec"
<mask> "path/filepath"
<mask> "regexp"
<mask> "strconv"
<mask> "strings"
<mask> "syscall"
</s> WIP -- single binary -- works, replies to DNS, but need to check what got broken </s> remove "syscall"
</s> add </s> remove ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bad88961e93bf81668ea3eafe58ff2be64d71342 | control.go | |
<mask> "path/filepath"
<mask> "regexp"
<mask> "strconv"
<mask> "strings"
<mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdguardDNS/dnsfilter"
<mask> "github.com/miekg/dns"
<mask> "gopkg.in/asaskevich/govalidator.v4"
</s> WIP -- single binary -- works, replies to DNS, but need ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bad88961e93bf81668ea3eafe58ff2be64d71342 | control.go | |
coredns_plugin "github.com/AdguardTeam/AdguardDNS/coredns_plugin" | <mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdguardDNS/dnsfilter"
<mask> "github.com/miekg/dns"
<mask> "gopkg.in/asaskevich/govalidator.v4"
<mask> )
<mask>
</s> WIP -- single binary -- works, replies to DNS, but need to check what got broken </s> remove "syscall"
</s> add </s... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bad88961e93bf81668ea3eafe58ff2be64d71342 | control.go |
<mask> )
<mask>
<mask> const updatePeriod = time.Minute * 30
<mask>
<mask> var coreDNSCommand *exec.Cmd
<mask>
<mask> var filterTitle = regexp.MustCompile(`^! Title: +(.*)$`)
<mask>
<mask> // cached version.json to avoid hammering github.io for each page reload
<mask> var versionCheckJSON []byte
<mask> v... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bad88961e93bf81668ea3eafe58ff2be64d71342 | control.go | |
coredns_plugin.Reload <- true | <mask> // -------------------
<mask> // coredns run control
<mask> // -------------------
<mask> func tellCoreDNSToReload() {
<mask> // not running -- cheap check
<mask> if coreDNSCommand == nil && coreDNSCommand.Process == nil {
<mask> return
<mask> }
<mask> // not running -- more expensive check
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"... | https://github.com/AdguardTeam/AdGuardHome/commit/bad88961e93bf81668ea3eafe58ff2be64d71342 | control.go |
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask> }
<mask>
<mask> func isRunning() bool {
<mask> if coreDNSCommand != nil && coreDNSCommand.Process != nil {
<mask> pid := coreDNSCommand.Process.Pid
<mask> process, err := os.FindProcess(pid)
<mask> if err != nil {
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/bad88961e93bf81668ea3eafe58ff2be64d71342 | control.go | |
<mask> }
<mask> }
<mask>
<mask> func registerControlHandlers() {
<mask> http.HandleFunc("/control/start", optionalAuth(ensurePOST(handleStart)))
<mask> http.HandleFunc("/control/stop", optionalAuth(ensurePOST(handleStop)))
<mask> http.HandleFunc("/control/restart", optionalAuth(ensurePOST(handleRestart)))
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bad88961e93bf81668ea3eafe58ff2be64d71342 | control.go | |
onceHook.Do(func() {
caddy.RegisterEventHook("dnsfilter-reload", hook)
})
| <mask> }
<mask>
<mask> p.upstream, err = upstream.New(nil)
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> WIP -- single binary -- works, replies to DNS, but need to check what got broken </s> remove func isRunning() bool {
if coreDNSCommand != nil && coreDNSCommand.Process != nil {
pid := ... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bad88961e93bf81668ea3eafe58ff2be64d71342 | coredns_plugin/coredns_plugin.go |
<mask> -
<mask> name: safesearch
<mask> description: 'Enforce family-friendly results in search engines'
<mask> paths:
<mask> /start:
<mask> post:
<mask> tags:
<mask> - global
<mask> operationId: start
<mask> summary: 'Start D... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/bad88961e93bf81668ea3eafe58ff2be64d71342 | openapi.yaml | |
"table_statistics": "Statistics (last 24 hours)",
"clients_not_found": "No clients found" | <mask> "client_global_settings": "Use global settings",
<mask> "client_deleted": "Client \"{{key}}\" successfully deleted",
<mask> "client_added": "Client \"{{key}}\" successfully added",
<mask> "client_updated": "Client \"{{key}}\" successfully updated",
<mask> "table_statistics": "Statistic... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb34381a0d73a85b798122e940ae5c9fc1a255ff | client/src/__locales/en.json |
<mask> <Fragment>
<mask> <ReactTable
<mask> data={clients || []}
<mask> columns={this.columns}
<mask> noDataText={t('dhcp_leases_not_found')}
<mask> className="-striped -highlight ca... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb34381a0d73a85b798122e940ae5c9fc1a255ff | client/src/components/Settings/Clients/index.js | |
noDataText={t('clients_not_found')} | <mask> pageText={t('page_table_footer_text')}
<mask> ofText={t('of_table_footer_text')}
<mask> rowsText={t('rows_table_footer_text')}
<mask> />
<mask> <button
<mask> type="button... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb34381a0d73a85b798122e940ae5c9fc1a255ff | client/src/components/Settings/Clients/index.js |
"updated_upstream_dns_toast": "Upstream-servere er gemt", | <mask> "example_upstream_doq": "krypteret <0>DNS-over-QUIC</0>",
<mask> "example_upstream_sdns": "du kan bruge <0>DNS Stamps</0> til <1>DNSCrypt</1> eller <2>DNS-over-HTTPS</2>-resolvers",
<mask> "example_upstream_tcp": "almindelig DNS (over TCP)",
<mask> "all_lists_up_to_date_toast": "Alle lister e... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb4cd312c28954266b57487fb322c521dcea4f2b | client/src/__locales/da.json |
"dhcp_form_range_title": "Intervallo di indirizzi IP",
"dhcp_form_range_start": "Intervallo iniziale",
"dhcp_form_range_end": "Intervallo finale", | <mask> "form_error_negative": "Deve essere maggiore o uguale a 0 (zero)",
<mask> "range_end_error": "Deve essere maggiore dell'intervallo di inizio",
<mask> "dhcp_form_gateway_input": "IP Gateway",
<mask> "dhcp_form_subnet_input": "Maschera di sottorete",
<mask> "dhcp_form_range_title": "Range ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb4cd312c28954266b57487fb322c521dcea4f2b | client/src/__locales/it.json |
"updated_custom_filtering_toast": "Le regole personalizzate sono state correttamente salvate", | <mask> "next_btn": "Successivo",
<mask> "loading_table_status": "Caricamento...",
<mask> "page_table_footer_text": "Pagina",
<mask> "rows_table_footer_text": "righe",
<mask> "updated_custom_filtering_toast": "Le regole dei filtri personalizzate sono state aggiornate",
<mask> "rule_removed_... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb4cd312c28954266b57487fb322c521dcea4f2b | client/src/__locales/it.json |
"updated_upstream_dns_toast": "Upstream-servers succesvol opgeslagen", | <mask> "example_upstream_doq": "versleutelde <0>DNS-via-QUIC</0>",
<mask> "example_upstream_sdns": "je kunt <0>DNS Stamps</0> voor <1>DNSCrypt</1> of <2>DNS-via-HTTPS</2> oplossingen gebruiken",
<mask> "example_upstream_tcp": "standaard DNS (over TCP)",
<mask> "all_lists_up_to_date_toast": "Alle lij... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb4cd312c28954266b57487fb322c521dcea4f2b | client/src/__locales/nl.json |
"updated_custom_filtering_toast": "Aangepaste regels succesvol opgeslagen", | <mask> "next_btn": "Volgende",
<mask> "loading_table_status": "Laden...",
<mask> "page_table_footer_text": "Pagina",
<mask> "rows_table_footer_text": "rijen",
<mask> "updated_custom_filtering_toast": "Aangepaste filter regels zijn bijgewerkt",
<mask> "rule_removed_from_custom_filtering_toa... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb4cd312c28954266b57487fb322c521dcea4f2b | client/src/__locales/nl.json |
"experimental": "Experimenteel",
"use_saved_key": "De eerder opgeslagen sleutel gebruiken" | <mask> "click_to_view_queries": "Klik om queries te bekijken",
<mask> "port_53_faq_link": "Poort 53 wordt vaak gebruikt door services als DNSStubListener- of de systeem DNS-resolver. Lees a.u.b. <0>deze instructie</0> hoe dit is op te lossen.",
<mask> "adg_will_drop_dns_queries": "AdGuard Home zal alle D... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb4cd312c28954266b57487fb322c521dcea4f2b | client/src/__locales/nl.json |
return fmt.Errorf("getting version info from %s: %w", vcu, err) | <mask>
<mask> if err != nil {
<mask> vcu := Context.updater.VersionCheckURL()
<mask>
<mask> return fmt.Errorf("getting version info from %s: %s", vcu, err)
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request 1752: 5373-mips-autoupdate
Updates #5270.
Updates #5373.
Squashed commit... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/home/controlupdate.go |
"github.com/AdguardTeam/golibs/log"
"golang.org/x/exp/maps"
"golang.org/x/exp/slices" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalg"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghio"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> )
<mask>
<mask> // TODO(a.garipov): Make configurable.
<mask> const versionCheckPeriod = 8 * time.Hour
<mask>
<mask> // Versi... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/check.go |
for k, v := range versionJSON { | <mask> if err != nil {
<mask> return info, fmt.Errorf("version.json: %w", err)
<mask> }
<mask>
<mask> for _, v := range versionJSON {
<mask> if v == "" {
<mask> return info, fmt.Errorf("version.json: invalid data")
<mask> }
<mask> }
<mask>
</s> Pull request 1752: 5373-mips-autoupdate
Updates ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/check.go |
return info, fmt.Errorf("version.json: bad data: value for key %q is empty", k) | <mask> }
<mask>
<mask> for _, v := range versionJSON {
<mask> if v == "" {
<mask> return info, fmt.Errorf("version.json: invalid data")
<mask> }
<mask> }
<mask>
<mask> info.NewVersion = versionJSON["version"]
<mask> info.Announcement = versionJSON["announcement"]
</s> Pull request 1752: 5373-mi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/check.go |
packageURL, key, found := u.downloadURL(versionJSON)
if !found {
return info, fmt.Errorf("version.json: no package URL: key %q not found in object", key) | <mask> info.NewVersion = versionJSON["version"]
<mask> info.Announcement = versionJSON["announcement"]
<mask> info.AnnouncementURL = versionJSON["announcement_url"]
<mask>
<mask> packageURL, ok := u.downloadURL(versionJSON)
<mask> if !ok {
<mask> return info, fmt.Errorf("version.json: packageURL not foun... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/check.go |
// downloadURL returns the download URL for current build as well as its key in
// versionObj. If the key is not found, it additionally prints an informative
// log message.
func (u *Updater) downloadURL(versionObj map[string]string) (dlURL, key string, ok bool) { | <mask>
<mask> return info, nil
<mask> }
<mask>
<mask> // downloadURL returns the download URL for current build.
<mask> func (u *Updater) downloadURL(json map[string]string) (string, bool) {
<mask> var key string
<mask>
<mask> if u.goarch == "arm" && u.goarm != "" {
<mask> key = fmt.Sprintf("download_... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/check.go |
} else if isMIPS(u.goarch) && u.gomips != "" { | <mask> var key string
<mask>
<mask> if u.goarch == "arm" && u.goarm != "" {
<mask> key = fmt.Sprintf("download_%s_%sv%s", u.goos, u.goarch, u.goarm)
<mask> } else if u.goarch == "mips" && u.gomips != "" {
<mask> key = fmt.Sprintf("download_%s_%s_%s", u.goos, u.goarch, u.gomips)
<mask> }
<mask>
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/check.go |
} else { | <mask> if u.goarch == "arm" && u.goarm != "" {
<mask> key = fmt.Sprintf("download_%s_%sv%s", u.goos, u.goarch, u.goarm)
<mask> } else if u.goarch == "mips" && u.gomips != "" {
<mask> key = fmt.Sprintf("download_%s_%s_%s", u.goos, u.goarch, u.gomips)
<mask> }
<mask>
<mask> val, ok := json[key]
<mask> i... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/check.go |
<mask>
<mask> val, ok := json[key]
<mask> if !ok {
<mask> key = fmt.Sprintf("download_%s_%s", u.goos, u.goarch)
<mask> val, ok = json[key]
<mask> }
<mask>
<mask> if !ok {
<mask> return "", false
<mask> }
</s> Pull request 1752: 5373-mips-autoupdate
Updates #5270.
Updates #5373.
Squashed commit... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/check.go | |
dlURL, ok = versionObj[key]
if ok {
return dlURL, key, true | <mask> key = fmt.Sprintf("download_%s_%s", u.goos, u.goarch)
<mask> val, ok = json[key]
<mask> }
<mask>
<mask> if !ok {
<mask> return "", false
<mask> }
<mask>
<mask> return val, true
<mask> }
</s> Pull request 1752: 5373-mips-autoupdate
Updates #5270.
Updates #5373.
Squashed commit of the foll... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/check.go |
keys := maps.Keys(versionObj)
slices.Sort(keys)
log.Error("updater: key %q not found; got keys %q", key, keys)
return "", key, false
}
// isMIPS returns true if arch is any MIPS architecture.
func isMIPS(arch string) (ok bool) {
switch arch {
case
"mips",
"mips64",
"mips64le",
"mipsle":
return true
d... | <mask> if !ok {
<mask> return "", false
<mask> }
<mask>
<mask> return val, true
<mask> }
</s> Pull request 1752: 5373-mips-autoupdate
Updates #5270.
Updates #5373.
Squashed commit of the following:
commit ad4654fa63beac13c4fbb38aa8fd06eaec25cb5e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/check.go |
return fmt.Errorf("copySupportingFiles(%s, %s) failed: %w", wd, u.backupDir, err) | <mask>
<mask> wd := u.workDir
<mask> err = copySupportingFiles(u.unpackedFiles, wd, u.backupDir)
<mask> if err != nil {
<mask> return fmt.Errorf("copySupportingFiles(%s, %s) failed: %s", wd, u.backupDir, err)
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request 1752: 5373-mips-autoup... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/updater.go |
return fmt.Errorf("copySupportingFiles(%s, %s) failed: %w", u.updateDir, u.workDir, err) | <mask> // supporting files.
<mask> func (u *Updater) replace() error {
<mask> err := copySupportingFiles(u.unpackedFiles, u.updateDir, u.workDir)
<mask> if err != nil {
<mask> return fmt.Errorf("copySupportingFiles(%s, %s) failed: %s", u.updateDir, u.workDir, err)
<mask> }
<mask>
<mask> log.Debug("update... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/bb80a7c2159c25189ec9940f20c4436a86e81968 | internal/updater/updater.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.