refactor(plc4xbrowser): put ui parts into a ui package

plc4go/tools/plc4xbrowser/main.go

@@ -20,68 +20,16 @@
 package main
 
 import (
-	"io"
-	"sync"
-	"time"
-
-	plc4go "github.com/apache/plc4x/plc4go/pkg/api"
-	plc4goModel "github.com/apache/plc4x/plc4go/pkg/api/model"
-)
-
-var driverManager plc4go.PlcDriverManager
-var driverAdded func(string)
-var connections map[string]plc4go.PlcConnection
-var connectionsChanged func()
-
-var messageReceived func(messageNumber int, receiveTime time.Time, message plc4goModel.PlcMessage)
-var numberOfMessagesReceived int
-var messageOutput io.Writer
-var messageOutputClear func()
-
-var consoleOutput io.Writer
-var consoleOutputClear func()
-
-var commandsExecuted int
-var commandOutput io.Writer
-var commandOutputClear func()
-
-type inputMode int
-
-const (
-	normalMode inputMode = iota
-	readEditMode
-	writeEditMode
-	subscribeEditMode
+	"github.com/apache/plc4x/plc4go/tools/plc4xbrowser/ui"
 )
 
-func init() {
-	hasShutdown = false
-	connections = make(map[string]plc4go.PlcConnection)
-}
-
-var shutdownMutex sync.Mutex
-var hasShutdown bool
-
-func shutdown() {
-	shutdownMutex.Lock()
-	defer shutdownMutex.Unlock()
-	if hasShutdown {
-		return
-	}
-	for _, connection := range connections {
-		connection.Close()
-	}
-	saveConfig()
-	hasShutdown = true
-}
-
 func main() {
-	loadConfig()
-	application := setupApplication()
-	initSubsystem()
+	ui.LoadConfig()
+	application := ui.SetupApplication()
+	ui.InitSubsystem()
 
 	if err := application.Run(); err != nil {
 		panic(err)
 	}
-	shutdown()
+	ui.Shutdown()
 }

plc4go/tools/plc4xbrowser/actions.go → plc4go/tools/plc4xbrowser/ui/actions.go

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package main
+package ui
 
 import (
 	"fmt"
@@ -33,7 +33,7 @@ import (
 	"github.com/sruehl/tview"
 )
 
-func initSubsystem() {
+func InitSubsystem() {
 	logLevel := zerolog.InfoLevel
 	if configuredLevel := config.LogLevel; configuredLevel != "" {
 		if parsedLevel, err := zerolog.ParseLevel(configuredLevel); err != nil {

plc4go/tools/plc4xbrowser/commands.go → plc4go/tools/plc4xbrowser/ui/commands.go

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package main
+package ui
 
 import (
 	"fmt"

plc4go/tools/plc4xbrowser/ui/common.go

@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package ui
+
+import (
+	plc4go "github.com/apache/plc4x/plc4go/pkg/api"
+	plc4goModel "github.com/apache/plc4x/plc4go/pkg/api/model"
+	"github.com/rs/zerolog"
+	"io"
+	"strings"
+	"sync"
+	"time"
+)
+
+const protocols = "ads,bacnetip,c-bus,s7"
+
+var protocolList = strings.Split(protocols, ",")
+
+var plc4xBrowserLog = zerolog.Nop()
+
+var driverManager plc4go.PlcDriverManager
+var driverAdded func(string)
+var connections map[string]plc4go.PlcConnection
+var connectionsChanged func()
+
+var messageReceived func(messageNumber int, receiveTime time.Time, message plc4goModel.PlcMessage)
+var numberOfMessagesReceived int
+var messageOutput io.Writer
+var messageOutputClear func()
+
+var consoleOutput io.Writer
+var consoleOutputClear func()
+
+var commandsExecuted int
+var commandOutput io.Writer
+var commandOutputClear func()
+
+type inputMode int
+
+const (
+	normalMode inputMode = iota
+	readEditMode
+	writeEditMode
+	subscribeEditMode
+)
+
+func init() {
+	hasShutdown = false
+	connections = make(map[string]plc4go.PlcConnection)
+}
+
+var shutdownMutex sync.Mutex
+var hasShutdown bool
+
+func Shutdown() {
+	shutdownMutex.Lock()
+	defer shutdownMutex.Unlock()
+	if hasShutdown {
+		return
+	}
+	for _, connection := range connections {
+		connection.Close()
+	}
+	saveConfig()
+	hasShutdown = true
+}

plc4go/tools/plc4xbrowser/config.go → plc4go/tools/plc4xbrowser/ui/config.go

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package main
+package ui
 
 import (
 	"github.com/pkg/errors"
@@ -60,7 +60,7 @@ func init() {
 	configFile = path.Join(plc4xBrowserConfigDir, "config.yml")
 }
 
-func loadConfig() {
+func LoadConfig() {
 	f, err := os.Open(configFile)
 	if err != nil {
 		log.Info().Err(err).Msg("No config file found")

plc4go/tools/plc4xbrowser/ui.go → plc4go/tools/plc4xbrowser/ui/ui.go

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package main
+package ui
 
 import (
 	"fmt"
@@ -30,7 +30,7 @@ import (
 	"time"
 )
 
-func setupApplication() *tview.Application {
+func SetupApplication() *tview.Application {
 	application := tview.NewApplication()
 
 	newPrimitive := func(text string) tview.Primitive {