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

* filter: refactor

This commit is contained in:
Simon Zolin 2019-03-15 16:02:48 +03:00
parent 6f56eb4c12
commit 783ac967a1
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
filter.go
View File

@ -139,13 +139,19 @@ func parseFilterContents(contents []byte) (int, string, []string) {
// Count lines in the filter // Count lines in the filter
for _, line := range lines { for _, line := range lines {
line = strings.TrimSpace(line) line = strings.TrimSpace(line)
if len(line) > 0 && line[0] == '!' { if len(line) == 0 {
if m := filterTitleRegexp.FindAllStringSubmatch(line, -1); len(m) > 0 && len(m[0]) >= 2 && !seenTitle { continue
}
if line[0] == '!' {
m := filterTitleRegexp.FindAllStringSubmatch(line, -1)
if len(m) > 0 && len(m[0]) >= 2 && !seenTitle {
name = m[0][1] name = m[0][1]
seenTitle = true seenTitle = true
} }
} else if len(line) != 0 { } else {
rulesCount++ rulesCount++
} }
} }
@ -266,12 +272,12 @@ func (filter *filter) Path() string {
// LastTimeUpdated returns the time when the filter was last time updated // LastTimeUpdated returns the time when the filter was last time updated
func (filter *filter) LastTimeUpdated() time.Time { func (filter *filter) LastTimeUpdated() time.Time {
filterFilePath := filter.Path() filterFilePath := filter.Path()
if _, err := os.Stat(filterFilePath); os.IsNotExist(err) { s, err := os.Stat(filterFilePath)
if os.IsNotExist(err) {
// if the filter file does not exist, return 0001-01-01 // if the filter file does not exist, return 0001-01-01
return time.Time{} return time.Time{}
} }
s, err := os.Stat(filterFilePath)
if err != nil { if err != nil {
// if the filter file does not exist, return 0001-01-01 // if the filter file does not exist, return 0001-01-01
return time.Time{} return time.Time{}