bakito/adguardhome-sync
1
1
Fork 0
mirror of https://github.com/bakito/adguardhome-sync.git synced 2025-03-01 17:45:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix filter synch error

Browse source
This commit is contained in:
bakito 2021-04-18 18:04:53 +02:00
parent 04a912fb56
commit 258ecae016
No known key found for this signature in database
GPG key ID: FAF93C1C384DD6B4
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/sync/sync.go
View file

@ -220,10 +220,10 @@ func (w *worker) syncFilters(of *types.FilteringStatus, replica client.Client) e
return err
}
if err = w.syncFilterType(of, rf.Filters, false, replica); err != nil {
if err = w.syncFilterType(of.Filters, rf.Filters, false, replica); err != nil {
return err
}
if err = w.syncFilterType(of, rf.WhitelistFilters, true, replica); err != nil {
if err = w.syncFilterType(of.WhitelistFilters, rf.WhitelistFilters, true, replica); err != nil {
return err
}
@ -239,8 +239,8 @@ func (w *worker) syncFilters(of *types.FilteringStatus, replica client.Client) e
return nil
}
func (w *worker) syncFilterType(of *types.FilteringStatus, rFilters types.Filters, whitelist bool, replica client.Client) error {
fa, fu, fd := rFilters.Merge(of.Filters)
func (w *worker) syncFilterType(of types.Filters, rFilters types.Filters, whitelist bool, replica client.Client) error {
fa, fu, fd := rFilters.Merge(of)
if err := replica.AddFilters(whitelist, fa...); err != nil {
return err

1
pkg/sync/sync_test.go
View file

@ -2,6 +2,7 @@ package sync
import (
"errors"
"github.com/bakito/adguardhome-sync/pkg/client"
. "github.com/onsi/ginkgo"