cmd/itctl/filesystem/read.go

@@ -46,11 +46,9 @@ var readCmd = &cobra.Command{
 			log.Fatal().Err(err).Msg("Error moving file or directory")
 		}
 
-		var suffix string
 		var out *os.File
 		if args[1] == "-" {
 			out = os.Stdout
-			suffix = "\n"
 		} else {
 			out, err = os.Create(args[1])
 			if err != nil {
@@ -62,8 +60,6 @@ var readCmd = &cobra.Command{
 		if err != nil {
 			log.Fatal().Err(err).Msg("Error writing to local file")
 		}
-		out.WriteString(suffix)
-		
 		log.Info().Msgf("Read %d bytes in %s", n, time.Since(start))
 	},
 }

go.mod

@@ -2,8 +2,6 @@ module go.arsenm.dev/itd
 
 go 1.16
 
-replace go.arsenm.dev/infinitime => /home/arsen/Code/infinitime
-
 require (
 	fyne.io/fyne/v2 v2.1.0
 	github.com/VividCortex/ewma v1.2.0 // indirect
@@ -27,7 +25,7 @@ require (
 	github.com/srwiley/oksvg v0.0.0-20210519022825-9fc0c575d5fe // indirect
 	github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780 // indirect
 	github.com/yuin/goldmark v1.4.1 // indirect
-	go.arsenm.dev/infinitime v0.0.0-20211125203943-58d5036f208b
+	go.arsenm.dev/infinitime v0.0.0-20211125012112-9966880bc8be
 	golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d // indirect
 	golang.org/x/net v0.0.0-20211011170408-caeb26a5c8c0 // indirect
 	golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect

go.sum

@@ -367,8 +367,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.3.8/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1 h1:/vn0k+RBvwlxEmP5E7SZMqNxPhfMVFEJiykr15/0XKM=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.arsenm.dev/infinitime v0.0.0-20211125203943-58d5036f208b h1:spIoyjxLUhzZQ9pno629l9gU/tPjz6MAYhVfHffGUYg=
+go.arsenm.dev/infinitime v0.0.0-20211125012112-9966880bc8be h1:WBD4szNWt5o9z/qEAPKZsTrk9j9uSeNxC0hjw0fQgWc=
-go.arsenm.dev/infinitime v0.0.0-20211125203943-58d5036f208b/go.mod h1:TzAhsz7TAqEm/vWhgMvmIxHS5jt46hqKkPvr6cqvVyA=
+go.arsenm.dev/infinitime v0.0.0-20211125012112-9966880bc8be/go.mod h1:TzAhsz7TAqEm/vWhgMvmIxHS5jt46hqKkPvr6cqvVyA=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=

socket.go

@@ -33,7 +33,6 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 	"go.arsenm.dev/infinitime"
-	"go.arsenm.dev/infinitime/blefs"
 	"go.arsenm.dev/itd/internal/types"
 	"go.arsenm.dev/itd/translit"
 )
@@ -80,11 +79,6 @@ func startSocket(dev *infinitime.Device) error {
 		return err
 	}
 
-	fs, err := dev.FS()
-	if err != nil {
-		log.Warn().Err(err).Msg("Error getting BLE filesystem")
-	}
-
 	go func() {
 		for {
 			// Accept socket connection
@@ -94,7 +88,7 @@ func startSocket(dev *infinitime.Device) error {
 			}
 
 			// Concurrently handle connection
-			go handleConnection(conn, dev, fs)
+			go handleConnection(conn, dev)
 		}
 	}()
 
@@ -104,9 +98,14 @@ func startSocket(dev *infinitime.Device) error {
 	return nil
 }
 
-func handleConnection(conn net.Conn, dev *infinitime.Device, fs *blefs.FS) {
+func handleConnection(conn net.Conn, dev *infinitime.Device) {
 	defer conn.Close()
 
+	fs, err := dev.FS()
+	if err != nil {
+		connErr(conn, 0, nil, "Error getting device filesystem")
+	}
+
 	// Create new scanner on connection
 	scanner := bufio.NewScanner(conn)
 	for scanner.Scan() {
@@ -439,10 +438,6 @@ func handleConnection(conn net.Conn, dev *infinitime.Device, fs *blefs.FS) {
 			}
 			firmwareUpdating = false
 		case types.ReqTypeFS:
-			if fs == nil {
-				connErr(conn, req.Type, nil, "BLE filesystem is not available")
-				break
-			}
 			// If no data, return error
 			if req.Data == nil {
 				connErr(conn, req.Type, nil, "Data required for firmware upgrade request")
@@ -464,7 +459,6 @@ func handleConnection(conn net.Conn, dev *infinitime.Device, fs *blefs.FS) {
 						break
 					}
 				}
-				json.NewEncoder(conn).Encode(types.Response{Type: req.Type})
 			case types.FSTypeMove:
 				if len(reqData.Files) != 2 {
 					connErr(conn, req.Type, nil, "Move FS command requires an old path and new path in the files list")
@@ -475,7 +469,6 @@ func handleConnection(conn net.Conn, dev *infinitime.Device, fs *blefs.FS) {
 					connErr(conn, req.Type, err, "Error moving file")
 					break
 				}
-				json.NewEncoder(conn).Encode(types.Response{Type: req.Type})
 			case types.FSTypeMkdir:
 				for _, file := range reqData.Files {
 					err := fs.Mkdir(file)
@@ -484,7 +477,6 @@ func handleConnection(conn net.Conn, dev *infinitime.Device, fs *blefs.FS) {
 						break
 					}
 				}
-				json.NewEncoder(conn).Encode(types.Response{Type: req.Type})
 			case types.FSTypeList:
 				if len(reqData.Files) != 1 {
 					connErr(conn, req.Type, nil, "List FS command requires a path to list in the files list")