From 54ab598602423a86e114c9cd34268e7274d8b595 Mon Sep 17 00:00:00 2001 From: andig Date: Wed, 1 Nov 2023 23:39:08 +0100 Subject: [PATCH] chore: prune folder structure --- cmd/detect.go | 5 ++--- {detect => cmd/detect}/analyze.go | 2 +- {detect => cmd/detect}/definitions.go | 2 +- {detect => cmd/detect}/tasklist.go | 2 +- {detect => cmd/detect}/tasks/const.go | 0 {detect => cmd/detect}/tasks/http.go | 0 {detect => cmd/detect}/tasks/keba.go | 0 {detect => cmd/detect}/tasks/modbus.go | 0 {detect => cmd/detect}/tasks/mqtt.go | 0 {detect => cmd/detect}/tasks/ping.go | 0 {detect => cmd/detect}/tasks/registry.go | 0 {detect => cmd/detect}/tasks/sma.go | 0 {detect => cmd/detect}/tasks/tcp.go | 0 {detect => cmd/detect}/tasks/types.go | 0 {detect => cmd/detect}/work.go | 2 +- 15 files changed, 6 insertions(+), 7 deletions(-) rename {detect => cmd/detect}/analyze.go (97%) rename {detect => cmd/detect}/definitions.go (99%) rename {detect => cmd/detect}/tasklist.go (98%) rename {detect => cmd/detect}/tasks/const.go (100%) rename {detect => cmd/detect}/tasks/http.go (100%) rename {detect => cmd/detect}/tasks/keba.go (100%) rename {detect => cmd/detect}/tasks/modbus.go (100%) rename {detect => cmd/detect}/tasks/mqtt.go (100%) rename {detect => cmd/detect}/tasks/ping.go (100%) rename {detect => cmd/detect}/tasks/registry.go (100%) rename {detect => cmd/detect}/tasks/sma.go (100%) rename {detect => cmd/detect}/tasks/tcp.go (100%) rename {detect => cmd/detect}/tasks/types.go (100%) rename {detect => cmd/detect}/work.go (97%) diff --git a/cmd/detect.go b/cmd/detect.go index e4a759bd6..7a3c9be63 100644 --- a/cmd/detect.go +++ b/cmd/detect.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/evcc-io/evcc/detect" - "github.com/evcc-io/evcc/detect/tasks" + "github.com/evcc-io/evcc/cmd/detect" + "github.com/evcc-io/evcc/cmd/detect/tasks" "github.com/evcc-io/evcc/util" "github.com/korylprince/ipnetgen" "github.com/olekukonko/tablewriter" @@ -53,7 +53,6 @@ func ParseHostIPNet(arg string) (res []string) { } _, ipnet, err := net.ParseCIDR(arg) - // simple host if err != nil { return []string{arg} diff --git a/detect/analyze.go b/cmd/detect/analyze.go similarity index 97% rename from detect/analyze.go rename to cmd/detect/analyze.go index 0201a7734..5c9e7ff62 100644 --- a/detect/analyze.go +++ b/cmd/detect/analyze.go @@ -1,6 +1,6 @@ package detect -import "github.com/evcc-io/evcc/detect/tasks" +import "github.com/evcc-io/evcc/cmd/detect/tasks" type Criteria map[string]interface{} diff --git a/detect/definitions.go b/cmd/detect/definitions.go similarity index 99% rename from detect/definitions.go rename to cmd/detect/definitions.go index 8224303e4..f3c025923 100644 --- a/detect/definitions.go +++ b/cmd/detect/definitions.go @@ -1,7 +1,7 @@ package detect import ( - "github.com/evcc-io/evcc/detect/tasks" + "github.com/evcc-io/evcc/cmd/detect/tasks" ) var ( diff --git a/detect/tasklist.go b/cmd/detect/tasklist.go similarity index 98% rename from detect/tasklist.go rename to cmd/detect/tasklist.go index 21ce15ff0..df170987f 100644 --- a/detect/tasklist.go +++ b/cmd/detect/tasklist.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/evcc-io/evcc/detect/tasks" + "github.com/evcc-io/evcc/cmd/detect/tasks" "github.com/evcc-io/evcc/util" ) diff --git a/detect/tasks/const.go b/cmd/detect/tasks/const.go similarity index 100% rename from detect/tasks/const.go rename to cmd/detect/tasks/const.go diff --git a/detect/tasks/http.go b/cmd/detect/tasks/http.go similarity index 100% rename from detect/tasks/http.go rename to cmd/detect/tasks/http.go diff --git a/detect/tasks/keba.go b/cmd/detect/tasks/keba.go similarity index 100% rename from detect/tasks/keba.go rename to cmd/detect/tasks/keba.go diff --git a/detect/tasks/modbus.go b/cmd/detect/tasks/modbus.go similarity index 100% rename from detect/tasks/modbus.go rename to cmd/detect/tasks/modbus.go diff --git a/detect/tasks/mqtt.go b/cmd/detect/tasks/mqtt.go similarity index 100% rename from detect/tasks/mqtt.go rename to cmd/detect/tasks/mqtt.go diff --git a/detect/tasks/ping.go b/cmd/detect/tasks/ping.go similarity index 100% rename from detect/tasks/ping.go rename to cmd/detect/tasks/ping.go diff --git a/detect/tasks/registry.go b/cmd/detect/tasks/registry.go similarity index 100% rename from detect/tasks/registry.go rename to cmd/detect/tasks/registry.go diff --git a/detect/tasks/sma.go b/cmd/detect/tasks/sma.go similarity index 100% rename from detect/tasks/sma.go rename to cmd/detect/tasks/sma.go diff --git a/detect/tasks/tcp.go b/cmd/detect/tasks/tcp.go similarity index 100% rename from detect/tasks/tcp.go rename to cmd/detect/tasks/tcp.go diff --git a/detect/tasks/types.go b/cmd/detect/tasks/types.go similarity index 100% rename from detect/tasks/types.go rename to cmd/detect/tasks/types.go diff --git a/detect/work.go b/cmd/detect/work.go similarity index 97% rename from detect/work.go rename to cmd/detect/work.go index d5d3d4d78..ac8c1c568 100644 --- a/detect/work.go +++ b/cmd/detect/work.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/evcc-io/evcc/detect/tasks" + "github.com/evcc-io/evcc/cmd/detect/tasks" "github.com/evcc-io/evcc/util" "github.com/fatih/structs" "github.com/jeremywohl/flatten"