Pull request: all: replace aghstrings with stringutil

Merge in DNS/adguard-home from add-stringutil to master

Squashed commit of the following:

commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jul 29 17:29:25 2021 +0300

    all: replace aghstrings with stringutil

internal/aghnet/net.go

@@ -13,9 +13,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
 	"github.com/AdguardTeam/golibs/errors"
 	"github.com/AdguardTeam/golibs/log"
+	"github.com/AdguardTeam/golibs/stringutil"
 )
 
 // ErrNoStaticIPInfo is returned by IfaceHasStaticIP when no information about
@@ -371,14 +371,14 @@ func ReverseAddr(ip net.IP) (arpa string) {
 		strLen, suffix = arpaV4MaxLen, arpaV4Suffix[1:]
 		ip = ip4
 		writeByte = func(val byte) {
-			aghstrings.WriteToBuilder(b, strconv.Itoa(int(val)), dot)
+			stringutil.WriteToBuilder(b, strconv.Itoa(int(val)), dot)
 		}
 
 	} else if ip6 := ip.To16(); ip6 != nil {
 		strLen, suffix = arpaV6MaxLen, arpaV6Suffix[1:]
 		ip = ip6
 		writeByte = func(val byte) {
-			aghstrings.WriteToBuilder(
+			stringutil.WriteToBuilder(
 				b,
 				strconv.FormatUint(uint64(val&0xF), 16),
 				dot,
@@ -395,7 +395,7 @@ func ReverseAddr(ip net.IP) (arpa string) {
 	for i := len(ip) - 1; i >= 0; i-- {
 		writeByte(ip[i])
 	}
-	aghstrings.WriteToBuilder(b, suffix)
+	stringutil.WriteToBuilder(b, suffix)
 
 	return b.String()
 }

internal/aghnet/net_linux.go

@@ -14,8 +14,8 @@ import (
 
 	"github.com/AdguardTeam/AdGuardHome/internal/aghio"
 	"github.com/AdguardTeam/AdGuardHome/internal/aghos"
-	"github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
 	"github.com/AdguardTeam/golibs/errors"
+	"github.com/AdguardTeam/golibs/stringutil"
 	"github.com/google/renameio/maybe"
 	"golang.org/x/sys/unix"
 )
@@ -70,7 +70,7 @@ func (rc *recurrentChecker) checkFile(sourcePath, desired string) (
 }
 
 // handlePatterns parses the patterns and takes care of duplicates.
-func (rc *recurrentChecker) handlePatterns(sourcesSet *aghstrings.Set, patterns []string) (
+func (rc *recurrentChecker) handlePatterns(sourcesSet *stringutil.Set, patterns []string) (
 	subsources []string,
 	err error,
 ) {
@@ -111,7 +111,7 @@ func (rc *recurrentChecker) check(desired string) (has bool, err error) {
 	var patterns, subsources []string
 	// The slice of sources is separate from the set of sources to keep the
 	// order in which the files are walked.
-	for sourcesSet := aghstrings.NewSet(rc.initPath); i < len(sources); i++ {
+	for sourcesSet := stringutil.NewSet(rc.initPath); i < len(sources); i++ {
 		patterns, has, err = rc.checkFile(sources[i], desired)
 		if err != nil {
 			if errors.Is(err, os.ErrNotExist) {
@@ -217,7 +217,7 @@ func ifacesStaticConfig(r io.Reader, ifaceName string) (subsources []string, has
 	s := bufio.NewScanner(r)
 	for s.Scan() {
 		line := strings.TrimSpace(s.Text())
-		if aghstrings.IsCommentOrEmpty(line) {
+		if len(line) == 0 || line[0] == '#' {
 			continue
 		}
 

internal/aghnet/systemresolvers_others.go

@@ -11,8 +11,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
 	"github.com/AdguardTeam/golibs/errors"
+	"github.com/AdguardTeam/golibs/stringutil"
 )
 
 // defaultHostGen is the default method of generating host for Refresh.
@@ -27,7 +27,7 @@ type systemResolvers struct {
 	hostGenFunc HostGenFunc
 
 	// addrs is the set that contains cached local resolvers' addresses.
-	addrs     *aghstrings.Set
+	addrs     *stringutil.Set
 	addrsLock sync.RWMutex
 }
 
@@ -64,7 +64,7 @@ func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr S
 			PreferGo: true,
 		},
 		hostGenFunc: hostGenFunc,
-		addrs:       aghstrings.NewSet(),
+		addrs:       stringutil.NewSet(),
 	}
 	s.resolver.Dial = s.dialFunc