refactor(plugin): rename to service and cleanup interface

pkg/cli/generate.go

@@ -32,15 +32,16 @@ func Generate() Action {
 
 			serviceRouter := router.ServiceRouter{}
 
-			if service, err := serviceRouter.Locate(serviceSchema); err != nil {
+			service, err := serviceRouter.Locate(serviceSchema)
+			if err != nil {
 				fmt.Printf("invalid service schema '%s'\n", serviceSchema)
 				return 2
-			} else {
-				config := service.GetConfig()
-				configFormat := format.GetConfigMap(config) // TODO: GetConfigFormat
-				for key, format := range configFormat {
-					fmt.Printf("%s: %s", key, format)
-				}
+			}
+
+			config := service.GetConfig()
+			configFormat := format.GetConfigMap(config) // TODO: GetConfigFormat
+			for key, format := range configFormat {
+				fmt.Printf("%s: %s", key, format)
 			}
 
 			return 1

pkg/cli/send.go

@@ -4,7 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/containrrr/shoutrrr"
-	"github.com/containrrr/shoutrrr/pkg/plugin"
+	"github.com/containrrr/shoutrrr/pkg/services"
 	"log"
 	"os"
 	"strings"
@@ -36,15 +36,18 @@ func Send() Action {
 			fmt.Printf("Message: %s\n", message)
 
 
-			logger := plugin.DiscardLogger
+			var logger *log.Logger
+
 			if verbose {
 				logger = log.New(os.Stderr, "SHOUTRRR ", log.LstdFlags)
+			}  else {
+				logger = services.DiscardLogger
 			}
 
-			opts := plugin.PluginOpts{
-				Verbose: verbose,
-				Logger: logger,
-			}
+			opts := services.CreateServiceOpts(
+				logger,
+				verbose,
+				map[string]string {})
 
 			shoutrrr.Send(url, message, opts)
 

pkg/format/enum_formatter.go

@@ -0,0 +1,39 @@
+package format
+
+import (
+	"github.com/containrrr/shoutrrr/pkg/types"
+	"strings"
+)
+
+const EnumInvalid = -1
+
+type EnumFormatter struct {
+	names []string
+}
+
+func (ef EnumFormatter) Names() []string {
+	return ef.names
+}
+
+func (ef EnumFormatter) Print(e int) string {
+	if e >= len(ef.names) || e < 0 {
+		return "Invalid"
+	}
+	return ef.names[e]
+}
+
+func (ef EnumFormatter) Parse(s string) int {
+	target := strings.ToLower(s)
+	for index, name := range ef.names {
+		if target == strings.ToLower(name) {
+			return index
+		}
+	}
+	return EnumInvalid
+}
+
+func CreateEnumFormatter(names []string) types.EnumFormatter {
+	return &EnumFormatter{
+		names,
+	}
+}

pkg/format/format.go

@@ -25,9 +25,10 @@ func ParseBool(value string, defaultValue bool)  bool {
 }
 
 func PrintBool(value bool) string {
-    if(value) {
+    if value {
         return "Yes"
-    } else {
-        return "No"
     }
+
+    return "No"
+
 }

pkg/format/format_query.go

@@ -0,0 +1,22 @@
+package format
+
+import (
+	"fmt"
+	"github.com/containrrr/shoutrrr/pkg/types"
+)
+
+// BuildQuery converts the fields of a config object to a delimited query string
+func BuildQuery(c types.ServiceConfig) string {
+	query := ""
+	fields := c.QueryFields()
+	format := "%s=%s"
+	for index, key := range fields {
+		value, _ := c.Get(key)
+		if index == 1 {
+			format = "&%s=%s"
+		}
+		query += fmt.Sprintf(format, key, value)
+	}
+
+	return query
+}

pkg/format/formatter.go

@@ -2,13 +2,13 @@ package format
 
 import (
 	"fmt"
-	"github.com/containrrr/shoutrrr/pkg/plugin"
+	"github.com/containrrr/shoutrrr/pkg/types"
     "github.com/fatih/color"
 	"reflect"
 	"strings"
 )
 
-func GetConfigMap(config plugin.PluginConfig) map[string]string {
+func GetConfigMap(config types.ServiceConfig) map[string]string {
 	formatter := Formatter{
 		EnumFormatters: config.Enums(),
 		MaxDepth: 10,
@@ -23,7 +23,7 @@ var colorizeNumber = color.New(color.FgHiCyan).SprintFunc()
 var colorizeString = color.New(color.FgHiYellow).SprintFunc()
 
 type Formatter struct {
-	EnumFormatters map[string]plugin.EnumFormatter
+	EnumFormatters map[string]types.EnumFormatter
 	MaxDepth uint8
 	Errors []error
 }
@@ -87,9 +87,9 @@ func (fmtr *Formatter) getFieldValueString(field reflect.Value, depth uint8) str
 		val := field.Bool()
 		if val {
 			return colorizeTrue(PrintBool(val))
-		} else {
-			return colorizeFalse(PrintBool(val))
 		}
+		return colorizeFalse(PrintBool(val))
+
 
 	case reflect.Slice:
 		fallthrough