a/badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* filters: refactor: remove unused if-branches

Browse Source 
filter.ID == 0:
Useless, because filter ID is assigned either on application load
 or on filter add.

len(filter.Rules) == 0:
Useless, because rules are added either on application load
 or on filter add or on filter enable.
This commit is contained in:
Simon Zolin 2019-03-18 14:57:10 +03:00
parent ae2c7d00a9
commit eefdf8449a
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
filter.go
View File

@ -147,16 +147,6 @@ func refreshFiltersIfNecessary(force bool) int {
continue continue
} }
if filter.ID == 0 { // protect against users modifying the yaml and removing the ID
filter.ID = assignUniqueFilterID()
}
if len(filter.Rules) == 0 {
// Try reloading filter from the disk before updating
// This is useful for the case when we simply enable a previously downloaded filter
_ = filter.load()
}
updated, err := filter.update(force) updated, err := filter.update(force)
if err != nil { if err != nil {
log.Printf("Failed to update filter %s: %s\n", filter.URL, err) log.Printf("Failed to update filter %s: %s\n", filter.URL, err)
@ -218,9 +208,6 @@ func parseFilterContents(contents []byte) (int, string, []string) {
// If "force" is true -- does not check the filter's LastUpdated field // If "force" is true -- does not check the filter's LastUpdated field
// Call "save" to persist the filter contents // Call "save" to persist the filter contents
func (filter *filter) update(force bool) (bool, error) { func (filter *filter) update(force bool) (bool, error) {
if filter.ID == 0 { // protect against users deleting the ID
filter.ID = assignUniqueFilterID()
}
if !force && time.Since(filter.LastUpdated) <= updatePeriod { if !force && time.Since(filter.LastUpdated) <= updatePeriod {
return false, nil return false, nil
} }