Updates

Author: djthorpe

cmd/cli/main.go

@@ -12,7 +12,7 @@ import (
 
 func main() {
 	name := path.Base(os.Args[0])
-	flags, err := NewFlags(name, os.Args[1:], ElevenlabsFlags, OpenAIFlags)
+	flags, err := NewFlags(name, os.Args[1:], OpenAIFlags)
 	if err != nil {
 		if err != flag.ErrHelp {
 			fmt.Fprintln(os.Stderr, err)
@@ -38,11 +38,11 @@ func main() {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
-	cmd, err = ElevenlabsRegister(cmd, opts, flags)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
+	/*	cmd, err = ElevenlabsRegister(cmd, opts, flags)
+		if err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			os.Exit(1)
+		}*/
 	cmd, err = OpenAIRegister(cmd, opts, flags)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)

go.mod

@@ -13,7 +13,9 @@ require (
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -2,10 +2,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/djthorpe/go-errors v1.0.3 h1:GZeMPkC1mx2vteXLI/gvxZS0Ee9zxzwD1mcYyKU5jD0=
 github.com/djthorpe/go-errors v1.0.3/go.mod h1:HtfrZnMd6HsX75Mtbv9Qcnn0BqOrrFArvCaj3RMnZhY=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/veandco/go-sdl2 v0.4.36 h1:Ltydev536rRQodmIrTWFZ3dRp5A+/6t5CYvbi4Kvia0=

pkg/elevenlabs/opts.go renamed to pkg/elevenlabs/opts.go_old

@@ -0,0 +1,79 @@
+package tablewriter
+
+import (
+	"fmt"
+	"reflect"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// TYPES
+
+type iterator struct {
+	slice reflect.Value
+	index int
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// CONSTRUCTOR
+
+// NewTableMeta returns a new table metadata object, from a single struct
+// value or an array of one or more struct values which are of the same type
+func NewIterator(v any) (*iterator, error) {
+	self := new(iterator)
+
+	// Get the type
+	rt, isSlice, err := typeOf(v)
+	if err != nil {
+		return nil, err
+	}
+	// Set the slice parameter
+	if isSlice {
+		self.slice = reflect.ValueOf(v)
+	} else {
+		self.slice = reflect.MakeSlice(reflect.SliceOf(rt), 1, 1)
+		rv := reflect.ValueOf(v)
+		if rv.Kind() == reflect.Ptr {
+			self.slice.Index(0).Set(rv.Elem())
+		} else {
+			self.slice.Index(0).Set(rv)
+		}
+	}
+	// Set the index parameter
+	self.index = 0
+
+	// Return success
+	return self, nil
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// STRINGIFY
+
+func (i *iterator) String() string {
+	str := "<iterator"
+	str += fmt.Sprint(" len=", i.slice.Len())
+	str += fmt.Sprint(" i=", i.index)
+	return str + ">"
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS
+
+// Return the number of elements
+func (i *iterator) Reset() {
+	i.index = 0
+}
+
+// Return the number of elements
+func (i *iterator) Len() int {
+	return i.slice.Len()
+}
+
+// Return the next element, or nil
+func (i *iterator) Next() any {
+	if i.index >= i.slice.Len() {
+		return nil
+	}
+	v := i.slice.Index(i.index).Interface()
+	i.index++
+	return v
+}

pkg/elevenlabs/text-to-speech.go renamed to pkg/elevenlabs/text-to-speech.go_old

@@ -0,0 +1,56 @@
+package tablewriter_test
+
+import (
+	"testing"
+
+	// Packages
+	writer "github.com/mutablelogic/go-client/pkg/tablewriter"
+	assert "github.com/stretchr/testify/assert"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// TEST CASES
+
+func Test_iterator_000(t *testing.T) {
+	assert := assert.New(t)
+	iterator, err := writer.NewIterator(TestAB{})
+	assert.NoError(err)
+	assert.NotNil(iterator)
+	assert.Equal(1, iterator.Len())
+	t.Log(iterator)
+}
+
+func Test_iterator_001(t *testing.T) {
+	assert := assert.New(t)
+	iterator, err := writer.NewIterator([]TestAB{})
+	assert.NoError(err)
+	assert.NotNil(iterator)
+	assert.Equal(0, iterator.Len())
+}
+
+func Test_iterator_002(t *testing.T) {
+	assert := assert.New(t)
+	iterator, err := writer.NewIterator([]TestAB{{}, {}, {}})
+	assert.NoError(err)
+	assert.NotNil(iterator)
+	assert.Equal(3, iterator.Len())
+}
+
+func Test_iterator_003(t *testing.T) {
+	assert := assert.New(t)
+	iterator, err := writer.NewIterator([]TestAB{{A: "1"}, {A: "2"}, {A: "3"}})
+	assert.NoError(err)
+	assert.NotNil(iterator)
+	assert.Equal(3, iterator.Len())
+	i1 := iterator.Next()
+	assert.NotNil(i1)
+	assert.Equal("1", i1.(TestAB).A)
+	i2 := iterator.Next()
+	assert.NotNil(i2)
+	assert.Equal("2", i2.(TestAB).A)
+	i3 := iterator.Next()
+	assert.NotNil(i3)
+	assert.Equal("3", i3.(TestAB).A)
+	i4 := iterator.Next()
+	assert.Nil(i4)
+}