moved the service layer to its own package

tui/internal/controllers/device.go

@@ -4,7 +4,7 @@ package controllers
 import (
 	"fmt"
 
-	serv "esdi/tui/internal/services"
+	serv "esdi/services"
 	"esdi/tui/internal/views"
 
 	"github.com/gdamore/tcell/v2"

tui/internal/controllers/layout.go

@@ -7,7 +7,7 @@ import (
 
 	"esdi/cdashdisplay"
 	helper "esdi/helpers"
-	"esdi/tui/internal/services"
+	"esdi/services"
 	"esdi/tui/internal/views"
 
 	"github.com/gdamore/tcell/v2"

tui/internal/controllers/streaming.go

@@ -7,9 +7,9 @@ import (
 
 	"esdi/config"
 	"esdi/providers"
+	"esdi/services"
 	"esdi/telemetry"
 	"esdi/tui/internal/models"
-	"esdi/tui/internal/services"
 	"esdi/tui/internal/views"
 
 	"github.com/gdamore/tcell/v2"

tui/internal/services/cdashdisplay.go

@@ -1,115 +0,0 @@
-package services
-
-import (
-	"fmt"
-	"log/slog"
-	"sync/atomic"
-
-	"esdi/cdashdisplay"
-	helper "esdi/helpers"
-	"esdi/peripheral"
-	"esdi/telemetry"
-)
-
-type CDashService struct {
-	Logger *slog.Logger
-	CDash  *cdashdisplay.CDashDisplay
-	// iRacingTelemetry *IRacingService
-	DevClerk *peripheral.PeripheralDeviceClerk
-	Messages chan string
-}
-
-func NewCDashService(logger *slog.Logger) *CDashService {
-	sharedChannel := make(chan string, 10)
-	return &CDashService{
-		Logger:   logger,
-		CDash:    nil,
-		DevClerk: peripheral.NewPeripheralDeviceClerk(),
-		Messages: sharedChannel,
-	}
-}
-
-func (cds *CDashService) FindDevice() {
-	cds.Messages <- "looking for cdash display...\n"
-	cds.Logger.Info("Looking for CDashDisplay")
-
-	cdashdisplay.SetLogger(cds.Logger.With("[device]", "cdashdisplay"))
-
-	display, err := cdashdisplay.NewCDashDisplay()
-	if err != nil {
-		cds.Logger.Info("didn't find cdashdisplay")
-		cds.Messages <- "didn't find cdash display\n"
-		return
-	}
-
-	cds.CDash = display
-	cds.Logger.Info("found cdashdisplay on: " + display.WT.Cfg.Name)
-	cds.Messages <- "found cdashdisplay on: " + display.WT.Cfg.Name + "\n"
-}
-
-func (cds *CDashService) CreateWindow(
-	win *cdashdisplay.DesktopUIWindow,
-) (*cdashdisplay.DesktopUIWindow, error) {
-	updatedWindow, err := cds.CDash.CreateWindow(win)
-	if err != nil {
-		return nil, err
-	}
-
-	return updatedWindow, nil
-}
-
-func (cds *CDashService) LoadLayout(layoutPath string) error {
-	return cds.CDash.LoadLayout(layoutPath)
-}
-
-func (cds *CDashService) SaveLayout(layoutPath string) error {
-	return cds.CDash.SaveLayout(layoutPath)
-}
-
-func (cds *CDashService) UnloadLayout() error {
-	return cds.CDash.UnloadLayout()
-}
-
-func (cds *CDashService) UpdateWindow(win *cdashdisplay.DesktopUIWindow) error {
-	cds.Messages <- fmt.Sprintf("Updating a window:\n%+v\n", win)
-	return cds.CDash.UpdateWindow(win)
-}
-
-func (cds *CDashService) DeleteWindow(idx int16) error {
-	return cds.CDash.DestroyWindow(idx)
-}
-
-func (cds *CDashService) ResizeWindow(idx int16, vec *helper.Vector) error {
-	err := cds.CDash.ResizeWindow(idx, vec)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (cds *CDashService) MoveWindow(idx int16, vec *helper.Vector) error {
-	err := cds.CDash.MoveWindow(idx, vec)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (cds *CDashService) StreamData(stream <-chan telemetry.TelemetryData) {
-	var isSending atomic.Bool
-
-	go func() {
-		for msg := range stream {
-			if isSending.Load() {
-				continue
-			}
-
-			isSending.Store(true)
-
-			cds.CDash.SendData(&msg)
-			isSending.Store(false)
-		}
-	}()
-}

tui/internal/services/device.go

@@ -1,9 +0,0 @@
-package services
-
-// DeviceService will handle sending the data from the telemetry service to the
-// actual devices
-// NOTE: create a virtual device and make it be the output window or something so
-// we can just add it as a device or whatever instead of being a custom made thing
-// that would be pretty cool I think
-type DeviceService struct {
-}

tui/internal/services/services.go

@@ -1,2 +0,0 @@
-// Package services interacts with the other libraries required for this UI
-package services

tui/internal/services/telemetry.go

@@ -1,61 +0,0 @@
-package services
-
-import (
-	"log/slog"
-
-	providerir "esdi/providers/iracing"
-
-	telemetry "esdi/telemetry"
-)
-
-// TelemetryService will be our base struct to handle telemetry data
-// It should hook to a data sink and handle it like iRacing, BeamNG, AC and so on
-type TelemetryService struct {
-	logger         *slog.Logger
-	cdash          *CDashService
-	ActiveProvider telemetry.TelemetryProvider
-}
-
-func NewTelemetryService(logger *slog.Logger, cdash *CDashService) *TelemetryService {
-	return &TelemetryService{
-		logger: logger,
-		cdash:  cdash,
-	}
-}
-
-func (t *TelemetryService) setIRacingProvider() {
-	path := "/home/esilva/Desktop/projetos/simracing_peripherals/testTelemetry/gt3_mustang_bathurst.ibt"
-	provider, _ := providerir.NewIRacingProvider(t.logger, path, "", "")
-
-	t.ActiveProvider = provider
-}
-
-func (t *TelemetryService) SetProvider(provider string) *TelemetryService {
-	if t.ActiveProvider != nil {
-		// Gotta do something here to clean up before switching
-	}
-
-	switch provider {
-	case "iRacing":
-		// Set up iRacing
-		t.setIRacingProvider()
-	default:
-		return nil
-	}
-
-	return t
-}
-
-func (t *TelemetryService) StartStream() <-chan telemetry.TelemetryData {
-	stream, _ := t.ActiveProvider.Stream()
-
-	// NOTE: we don't want to just send data to the cdashdisplay. We want to support
-	// multiple devices at the same time
-	t.cdash.StreamData(stream)
-
-	return stream
-}
-
-func (t *TelemetryService) StopStream() {
-	t.ActiveProvider.StopStream()
-}

tui/tui.go

@@ -2,10 +2,11 @@
 package tui
 
 import (
-	"esdi/tui/internal/controllers"
-	"esdi/tui/internal/services"
 	"log/slog"
 
+	"esdi/services"
+	"esdi/tui/internal/controllers"
+
 	"github.com/rivo/tview"
 )
 
@@ -16,6 +17,7 @@ type ControlPanel struct {
 }
 
 func NewControlPanel(logger *slog.Logger) *ControlPanel {
+	// NOTE: given the services should not be only for the TUI should this be here?
 	baseController := &controllers.Controller{
 		Logger: logger,
 		App:    tview.NewApplication(),