better error handling

Author: th-sabik

CHANGELOG.md

@@ -1,5 +1,16 @@
 # TCOBS Changelog
 
+## v0.9.2
+
+* not needed project files & foldes removed
+* demo binaries added
+* Folders Cv1 & Cv2 renamed into v1 & v2
+* goreleaser config file added
+
+## v0.9.1
+
+* module tagged with version number
+
 ## v0.9.0
 
 * ReadMe.md file extended and restructured a bit.

cmd/TCOBSv1CDecode/main.go

@@ -0,0 +1,65 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"os"
+
+	tcobs "github.com/rokath/tcobs/v1"
+	"github.com/spf13/afero"
+)
+
+var (
+	// do not initialize, goreleaser will handle that
+	version string
+
+	// do not initialize, goreleaser will handle that
+	commit string
+
+	// do not initialize, goreleaser will handle that
+	date string
+)
+
+// main is the entry point.
+func main() {
+	fSys := &afero.Afero{Fs: afero.NewOsFs()} // os.DirFS("")
+	doit(os.Stdout, fSys)
+}
+
+func doit(w io.Writer, fSys *afero.Afero) {
+
+	if len(os.Args) != 1 {
+		fmt.Fprintln(w, version, commit, date)
+		fmt.Fprintln(w, "Feed with a space separated byte sequence to decode a TCOBSv1 sequence.")
+		fmt.Fprintln(w, "Example: `echo 64 1 2 18 88 25 88 161 | TCOBSv1Decode` will return `0 0 1 2 2 2 2 88 88 88 88 88 88`")
+		return
+	}
+
+	var i []byte
+	o := make([]byte, 16*1024)
+	var pos int
+	for {
+		var n byte
+		_, err := fmt.Scan(&n)
+		if err == io.EOF {
+			if len(i)+31/len(i) > len(o) {
+				log.Fatal("len of internal buffer too small")
+			}
+			count := tcobs.CDecode(o, i)
+			if count < 0 {
+				log.Fatal("invalid input data, error code ", count)
+			}
+			o = o[len(o)-count:]
+			for _, b := range o {
+				fmt.Fprintf(w, "%d ", b)
+			}
+			return
+		}
+		if err != nil {
+			log.Fatal(err, " at position ", pos)
+		}
+		i = append(i, n)
+		pos++
+	}
+}

cmd/TCOBSv1Encode/main.go renamed to cmd/TCOBSv1CEncode/main.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"os"
 
-	tcobs "github.com/rokath/tcobs/Cv1"
+	tcobs "github.com/rokath/tcobs/v1"
 	"github.com/spf13/afero"
 )
 

cmd/TCOBSv1Decode/main.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"os"
 
-	tcobs "github.com/rokath/tcobs/Cv1"
+	tcobs "github.com/rokath/tcobs/v1"
 	"github.com/spf13/afero"
 )
 
@@ -46,7 +46,10 @@ func doit(w io.Writer, fSys *afero.Afero) {
 			if len(i)+31/len(i) > len(o) {
 				log.Fatal("len of internal buffer too small")
 			}
-			count := tcobs.CDecode(o, i)
+			count, e := tcobs.Decode(o, i)
+			if e != nil {
+				log.Fatal(e)
+			}
 			o = o[len(o)-count:]
 			for _, b := range o {
 				fmt.Fprintf(w, "%d ", b)

cmd/TCOBSv2Decode/main.go renamed to cmd/TCOBSv2CDecode/main.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"os"
 
-	tcobs "github.com/rokath/tcobs/Cv2"
+	tcobs "github.com/rokath/tcobs/v2"
 	"github.com/spf13/afero"
 )
 
@@ -47,6 +47,9 @@ func doit(w io.Writer, fSys *afero.Afero) {
 				log.Fatal("len of internal buffer too small")
 			}
 			count := tcobs.CDecode(o, i)
+			if count < 0 {
+				log.Fatal("invalid input data, error code ", count)
+			}
 			o = o[len(o)-count:]
 			for _, b := range o {
 				fmt.Fprintf(w, "%d ", b)

cmd/TCOBSv2Encode/main.go renamed to cmd/TCOBSv2CEncode/main.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"os"
 
-	tcobs "github.com/rokath/tcobs/Cv2"
+	tcobs "github.com/rokath/tcobs/v2"
 	"github.com/spf13/afero"
 )
 

v1/read_test.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"testing"
 
-	tcobs "github.com/rokath/tcobs/Cv1"
+	tcobs "github.com/rokath/tcobs/v1"
 	"github.com/stretchr/testify/assert"
 )
 

v1/tcobs_test.go

@@ -8,7 +8,7 @@ import (
 	"math/rand"
 	"testing"
 
-	tcobs "github.com/rokath/tcobs/Cv1"
+	tcobs "github.com/rokath/tcobs/v1"
 	"github.com/tj/assert"
 )
 

v1/write_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	tcobs "github.com/rokath/tcobs/Cv1"
+	tcobs "github.com/rokath/tcobs/v1"
 	"github.com/stretchr/testify/assert"
 )
 

v2/data_test.go

@@ -3,7 +3,7 @@ package tcobsv2_test
 import (
 	"testing"
 
-	tcobs "github.com/rokath/tcobs/Cv2"
+	tcobs "github.com/rokath/tcobs/v2"
 	"github.com/stretchr/testify/assert"
 )