feature comment filtering enable, disable

cmd_disable.go

@@ -1,16 +1,20 @@
 package main
 
-import "errors"
+import (
+	"errors"
+)
 
 type disableCmd struct {
-	_    struct{} `help:"change normal entry -> comment if exists"`
-	IP   *string
-	Host *string
+	_ struct{} `help:"change normal entry -> comment if exists"`
+
+	IP      *string
+	Host    *string
+	Comment *string
 }
 
 func (c disableCmd) Run(g globalCmd) error {
-	if c.IP == nil && c.Host == nil {
-		return errors.New("IP or Host is required")
+	if c.IP == nil && c.Host == nil && c.Comment == nil {
+		return errors.New("IP or Host or Comment is required")
 	}
 
 	el, err := readEntries(g.Hosts)
@@ -31,7 +35,7 @@ func (c disableCmd) disable(el []entry) []entry {
 
 	for i, e := range el {
 		found := false
-		if matches(e, c.IP, c.Host) {
+		if matches(e, c.IP, c.Host, c.Comment) {
 			found = true
 		}
 

cmd_disable_test.go

@@ -66,4 +66,19 @@ func TestDisable(t *testing.T) {
 		gotwant.Test(t, result, ``)
 	})
 
+	t.Run("Comment", func(t *testing.T) {
+		comment := "HOST"
+		el := read(hosts)
+		disable := disableCmd{Comment: &comment}
+		el = disable.disable(el)
+		result := list(el)
+		gotwant.Test(t, result, `# 102.54.94.97 rhino.acme.com # source server
+# 38.25.63.10 x.acme.com # x client host
+# 127.0.0.1 localhost # THIS IS LOCALHOST
+::1 localhost
+# 118.151.235.191 example.com
+# 192.168.1.201 server01 # new server
+`)
+	})
+
 }

cmd_enable.go

@@ -7,13 +7,14 @@ import (
 type enableCmd struct {
 	_ struct{} `help:"change comment -> normal entry if exists"`
 
-	IP   *string
-	Host *string
+	IP      *string
+	Host    *string
+	Comment *string
 }
 
 func (c enableCmd) Run(g globalCmd) error {
-	if c.IP == nil && c.Host == nil {
-		return errors.New("IP or Host is required")
+	if c.IP == nil && c.Host == nil && c.Comment == nil {
+		return errors.New("IP or Host or Comment is required")
 	}
 
 	el, err := readEntries(g.Hosts)
@@ -34,7 +35,7 @@ func (c enableCmd) enable(el []entry) []entry {
 
 	for i, e := range el {
 		found := false
-		if matches(e, c.IP, c.Host) {
+		if matches(e, c.IP, c.Host, c.Comment) {
 			found = true
 		}
 

cmd_enable_test.go

@@ -66,4 +66,19 @@ func TestEnable(t *testing.T) {
 		gotwant.Test(t, result, ``)
 	})
 
+	t.Run("Comment", func(t *testing.T) {
+		comment := "server"
+		el := read(hosts)
+		enable := enableCmd{Comment: &comment}
+		el = enable.enable(el)
+		result := list(el)
+		gotwant.Test(t, result, `102.54.94.97 rhino.acme.com # source server
+# 38.25.63.10 x.acme.com # x client host
+127.0.0.1 localhost # THIS IS LOCALHOST
+::1 localhost
+# 118.151.235.191 example.com
+192.168.1.201 server01 # new server
+`)
+	})
+
 }

hosted.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"io"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/shu-go/gli"
@@ -78,15 +79,24 @@ func writeEntriesToWriter(out io.Writer, el []entry) error {
 	return err
 }
 
-func matches(e entry, ip, host *string) bool {
-	if ip != nil && e.IP != *ip {
+func matches(e entry, ip, host, comment *string) bool {
+	if ip == nil && host == nil && comment == nil {
 		return false
 	}
-	if host != nil && e.Host != *host {
-		return false
+
+	matching := true
+
+	if ip != nil {
+		matching = matching && (e.IP == *ip)
+	}
+	if host != nil {
+		matching = matching && (e.Host == *host)
+	}
+	if comment != nil {
+		matching = matching && strings.Contains(e.Comment, *comment)
 	}
 
-	return true
+	return matching
 }
 
 func main() {