Merge pull request #13 from luthermonson/clean

Adding Clean Command

Author: luthermonson

cmd/clean.go

@@ -0,0 +1,36 @@
+package cmd
+
+import (
+	"github.com/urfave/cli/v2"
+)
+
+func Clean() *cli.Command {
+	return &cli.Command{
+		Name:    "clean",
+		Aliases: []string{"c"},
+		Usage:   "Clean the hostsfile by combining duplicate ips, sorting and removing duplicate hostnames",
+		Action:  clean,
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:  "dry-run",
+				Usage: "Dry run only, will output contents of new hostsfile without writing the changes.",
+			},
+		},
+	}
+}
+
+func clean(c *cli.Context) error {
+	hf, err := loadHostsfile(c)
+	if err != nil {
+		return err
+	}
+
+	hf.Clean()
+	if c.Bool("dry-run") {
+		outputHostsfile(hf, c.Bool("all"))
+	} else {
+		hf.Flush()
+	}
+
+	return debugFooter(c)
+}

cmd/list.go

@@ -1,9 +1,6 @@
 package cmd
 
 import (
-	"fmt"
-
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -29,20 +26,6 @@ func list(c *cli.Context) error {
 		return err
 	}
 
-	for _, line := range hostsfile.Lines {
-		if !c.Bool("all") {
-			if line.IsComment() || line.Raw == "" {
-				continue
-			}
-		}
-
-		lineOutput := fmt.Sprintf("%s\n", line.Raw)
-		if line.IsMalformed() {
-			lineOutput = fmt.Sprintf("%s # <<< Malformed!\n", lineOutput)
-		}
-
-		logrus.Infof(lineOutput)
-	}
-
+	outputHostsfile(hostsfile, c.Bool("all"))
 	return debugFooter(c)
 }

cmd/main.go

@@ -25,6 +25,7 @@ func Commands() []*cli.Command {
 		Backup(),
 		Restore(),
 		Edit(),
+		Clean(),
 	}
 }
 
@@ -56,6 +57,23 @@ func loadHostsfile(c *cli.Context) (hostsfile.Hosts, error) {
 	return hfile, nil
 }
 
+func outputHostsfile(hf hostsfile.Hosts, all bool) {
+	for _, line := range hf.Lines {
+		if !all {
+			if line.IsComment() || line.Raw == "" {
+				continue
+			}
+		}
+
+		lineOutput := fmt.Sprintf("%s\n", line.Raw)
+		if line.IsMalformed() {
+			lineOutput = fmt.Sprintf("%s # <<< Malformed!\n", lineOutput)
+		}
+
+		logrus.Infof(lineOutput)
+	}
+}
+
 func debugFooter(c *cli.Context) error {
 	if c.Command.Name != "debug" && !c.Bool("debug") {
 		return nil

go.mod

@@ -3,7 +3,7 @@ module github.com/goodhosts/cli
 go 1.13
 
 require (
-	github.com/goodhosts/hostsfile v0.0.4
+	github.com/goodhosts/hostsfile v0.0.5
 	github.com/olekukonko/tablewriter v0.0.4
 	github.com/sirupsen/logrus v1.4.2
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816