From 9a98117384b8f38aa0e196b6af216434db6852d9 Mon Sep 17 00:00:00 2001
From: saji <champ189@umn.edu>
Date: Wed, 28 Feb 2024 14:01:44 -0600
Subject: [PATCH] clean up dead code

---
 cmd/gotelem/cli/root.go   |   2 -
 cmd/gotelem/cli/server.go | 104 --------------------------------------
 internal/db/db.go         |   8 +--
 3 files changed, 1 insertion(+), 113 deletions(-)

diff --git a/cmd/gotelem/cli/root.go b/cmd/gotelem/cli/root.go
index 5ca29d9..e3540d1 100644
--- a/cmd/gotelem/cli/root.go
+++ b/cmd/gotelem/cli/root.go
@@ -15,8 +15,6 @@ var subCmds = []*cli.Command{
 	xbeeCmd,
 }
 
-var f os.File
-
 func Execute() {
 	app := &cli.App{
 		Name:  "gotelem",
diff --git a/cmd/gotelem/cli/server.go b/cmd/gotelem/cli/server.go
index df4edae..5699ce4 100644
--- a/cmd/gotelem/cli/server.go
+++ b/cmd/gotelem/cli/server.go
@@ -4,11 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"net"
 	"net/http"
 	"os"
 	"sync"
-	"time"
 
 	"log/slog"
 
@@ -134,108 +132,6 @@ func serve(cCtx *cli.Context) error {
 	return nil
 }
 
-type rpcService struct {
-}
-
-func (r *rpcService) Status() {
-}
-func (r *rpcService) String() string {
-	return "rpcService"
-}
-
-func (r *rpcService) Start(ctx *cli.Context, deps svcDeps) error {
-	logger := deps.Logger
-	broker := deps.Broker
-	// TODO: extract port/ip from cli context.
-	ln, err := net.Listen("tcp", "0.0.0.0:8082")
-	if err != nil {
-		logger.Warn("error listening", "err", err)
-		return err
-	}
-	for {
-		conn, err := ln.Accept()
-		if err != nil {
-			logger.Warn("error accepting connection", "err", err)
-		}
-		go handleCon(conn, broker, logger.With("addr", conn.RemoteAddr()), ctx.Done())
-	}
-}
-
-func handleCon(conn net.Conn, broker *gotelem.Broker, l *slog.Logger, done <-chan struct{}) {
-
-	subname := fmt.Sprint("tcp", conn.RemoteAddr().String())
-
-	l.Info("started handling", "name", subname)
-	defer conn.Close()
-
-	rxCh, err := broker.Subscribe(subname)
-	if err != nil {
-		l.Error("error subscribing to connection", "err", err)
-		return
-	}
-	defer broker.Unsubscribe(subname)
-
-	jEncode := json.NewEncoder(conn)
-	for {
-		select {
-		case msg := <-rxCh:
-			l.Info("got packet")
-			// FIXME: poorly optimized
-			err := jEncode.Encode(msg)
-			if err != nil {
-				l.Warn("error encoding json", "err", err)
-			}
-		case <-done:
-			return
-
-		}
-	}
-}
-
-// this spins up a new can socket on vcan0 and broadcasts a packet every second. for testing.
-
-type canLoggerService struct {
-}
-
-func (c *canLoggerService) String() string {
-	return "CanLoggerService"
-}
-
-func (c *canLoggerService) Status() {
-}
-
-func (c *canLoggerService) Start(cCtx *cli.Context, deps svcDeps) (err error) {
-	broker := deps.Broker
-	l := deps.Logger
-	rxCh, err := broker.Subscribe("canDump")
-	if err != nil {
-		return err
-	}
-	t := time.Now()
-	fname := fmt.Sprintf("candump_%d-%02d-%02dT%02d.%02d.%02d.txt",
-		t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second())
-
-	l.Info("logging to file", "filename", fname)
-
-	f, err := os.Create(fname)
-	if err != nil {
-		l.Error("error opening file", "filename", fname, "err", err)
-		return
-	}
-	enc := json.NewEncoder(f)
-
-	for {
-		select {
-		case msg := <-rxCh:
-
-			enc.Encode(msg)
-
-		case <-cCtx.Done():
-			f.Close()
-			return
-		}
-	}
-}
 
 // xBeeService provides data over an Xbee device, either by serial or TCP
 // based on the url provided in the xbee flag. see the description for details.
diff --git a/internal/db/db.go b/internal/db/db.go
index e436001..da4eb43 100644
--- a/internal/db/db.go
+++ b/internal/db/db.go
@@ -4,7 +4,6 @@ package db
 
 import (
 	"context"
-	"database/sql"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -12,14 +11,9 @@ import (
 
 	"github.com/jmoiron/sqlx"
 	"github.com/kschamplin/gotelem/skylab"
-	sqlite3 "github.com/mattn/go-sqlite3"
+	_ "github.com/mattn/go-sqlite3"
 )
 
-func init() {
-	sql.Register("custom_sqlite3", &sqlite3.SQLiteDriver{
-		// TODO: add helper that convert between unix milliseconds and sqlite times?
-	})
-}
 
 type TelemDb struct {
 	db *sqlx.DB