From 6f093ff69c83526279b9f039aca079162c2b68d5 Mon Sep 17 00:00:00 2001
From: Paul Buetow <git@mx.buetow.org>
Date: Fri, 5 Feb 2021 09:32:52 +0000
Subject: refactor

---
 internal/clients/args.go       | 12 +++---------
 internal/clients/baseclient.go | 12 ++++++------
 internal/lcontext/lcontext.go  |  8 ++++++++
 3 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 internal/lcontext/lcontext.go

(limited to 'internal')

diff --git a/internal/clients/args.go b/internal/clients/args.go
index 67d2044..684dadd 100644
--- a/internal/clients/args.go
+++ b/internal/clients/args.go
@@ -1,22 +1,16 @@
 package clients
 
 import (
+	"github.com/mimecast/dtail/internal/lcontext"
 	"github.com/mimecast/dtail/internal/omode"
 
 	gossh "golang.org/x/crypto/ssh"
 )
 
-// LineContext is here to help filtering out only specific lines.
-type LineContext struct {
-	RegexStr      string
-	AfterContext  int
-	BeforeContext int
-	MaxCount      int
-}
-
 // Args is a helper struct to summarize common client arguments.
 type Args struct {
-	LineContext
+	lcontext.LContext
+	RegexStr           string
 	Mode               omode.Mode
 	ServersStr         string
 	UserName           string
diff --git a/internal/clients/baseclient.go b/internal/clients/baseclient.go
index 0bdd62e..f83fcfd 100644
--- a/internal/clients/baseclient.go
+++ b/internal/clients/baseclient.go
@@ -126,14 +126,14 @@ func (c *baseClient) makeCommandOptions() map[string]string {
 	if c.Args.Quiet {
 		options["quiet"] = fmt.Sprintf("%v", c.Args.Quiet)
 	}
-	if c.Args.LineContext.MaxCount != 0 {
-		options["max"] = fmt.Sprintf("%d", c.Args.LineContext.MaxCount)
+	if c.Args.LContext.MaxCount != 0 {
+		options["max"] = fmt.Sprintf("%d", c.Args.LContext.MaxCount)
 	}
-	if c.Args.LineContext.BeforeContext != 0 {
-		options["before"] = fmt.Sprintf("%d", c.Args.LineContext.BeforeContext)
+	if c.Args.LContext.BeforeContext != 0 {
+		options["before"] = fmt.Sprintf("%d", c.Args.LContext.BeforeContext)
 	}
-	if c.Args.LineContext.AfterContext != 0 {
-		options["after"] = fmt.Sprintf("%d", c.Args.LineContext.AfterContext)
+	if c.Args.LContext.AfterContext != 0 {
+		options["after"] = fmt.Sprintf("%d", c.Args.LContext.AfterContext)
 	}
 
 	return options
diff --git a/internal/lcontext/lcontext.go b/internal/lcontext/lcontext.go
new file mode 100644
index 0000000..bd51d94
--- /dev/null
+++ b/internal/lcontext/lcontext.go
@@ -0,0 +1,8 @@
+package lcontext
+
+// LContext stands for line context and is here to help filtering out only specific lines.
+type LContext struct {
+	AfterContext  int
+	BeforeContext int
+	MaxCount      int
+}
-- 
cgit v1.2.3