forked from AdguardTeam/AdGuardHome
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pull request 2182: AG-20945-rule-list-id
Squashed commit of the following: commit 87bad8c Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Mar 21 16:39:12 2024 +0300 all: imp lint, names, tests commit 284f8c7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Mar 21 15:37:54 2024 +0300 filtering: imp id handling
- Loading branch information
Showing
12 changed files
with
222 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package filtering | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "sync/atomic" | ||
|
|
||
| "github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist" | ||
| "github.com/AdguardTeam/golibs/log" | ||
| ) | ||
|
|
||
| // idGenerator generates filtering-list IDs in a way broadly compatible with the | ||
| // legacy approach of AdGuard Home. | ||
| // | ||
| // TODO(a.garipov): Get rid of this once we switch completely to the new | ||
| // rule-list architecture. | ||
| type idGenerator struct { | ||
| current *atomic.Int32 | ||
| } | ||
|
|
||
| // newIDGenerator returns a new ID generator initialized with the given seed | ||
| // value. | ||
| func newIDGenerator(seed int32) (g *idGenerator) { | ||
| g = &idGenerator{ | ||
| current: &atomic.Int32{}, | ||
| } | ||
|
|
||
| g.current.Store(seed) | ||
|
|
||
| return g | ||
| } | ||
|
|
||
| // next returns the next ID from the generator. It is safe for concurrent use. | ||
| func (g *idGenerator) next() (id rulelist.URLFilterID) { | ||
| id32 := g.current.Add(1) | ||
| if id32 < 0 { | ||
| panic(fmt.Errorf("invalid current id value %d", id32)) | ||
| } | ||
|
|
||
| return rulelist.URLFilterID(id32) | ||
| } | ||
|
|
||
| // fix ensures that flts all have unique IDs. | ||
| func (g *idGenerator) fix(flts []FilterYAML) { | ||
| set := map[rulelist.URLFilterID]struct{}{} | ||
| for i, f := range flts { | ||
| id := f.ID | ||
| if id == 0 { | ||
| id = g.next() | ||
| flts[i].ID = id | ||
| } | ||
|
|
||
| if _, ok := set[id]; !ok { | ||
| set[id] = struct{}{} | ||
|
|
||
| continue | ||
| } | ||
|
|
||
| newID := g.next() | ||
| for _, ok := set[newID]; ok; _, ok = set[newID] { | ||
| newID = g.next() | ||
| } | ||
|
|
||
| log.Info( | ||
| "filtering: warning: filter at index %d has duplicate id %d; reassigning to %d", | ||
| i, | ||
| id, | ||
| newID, | ||
| ) | ||
|
|
||
| flts[i].ID = newID | ||
| set[newID] = struct{}{} | ||
| } | ||
| } |
Oops, something went wrong.