Update logging

Author: djthorpe

cmd/server/main.go

@@ -15,7 +15,6 @@ import (
 	httpserver "github.com/mutablelogic/go-server/pkg/httpserver"
 	whisper "github.com/mutablelogic/go-whisper/pkg/whisper"
 	api "github.com/mutablelogic/go-whisper/pkg/whisper/api"
-	sys "github.com/mutablelogic/go-whisper/sys/whisper"
 )
 
 func main() {
@@ -29,14 +28,6 @@ func main() {
 		os.Exit(-1)
 	}
 
-	// Set logging
-	sys.Whisper_log_set(func(level sys.LogLevel, text string) {
-		if flags.Debug() && (level == sys.LogLevelDebug || level == sys.LogLevelInfo || level == sys.LogLevelWarn) {
-			return
-		}
-		log.Println(level, strings.TrimSpace(text))
-	})
-
 	// Determine the directory for models
 	dir := flags.Dir()
 	if dir == "" {
@@ -56,7 +47,15 @@ func main() {
 
 	// Create a whisper service
 	log.Println("Storing models at", dir)
-	whisper, err := whisper.New(dir, whisper.OptMaxConcurrent(1))
+	opts := []whisper.Opt{
+		whisper.OptLog(func(line string) {
+			log.Println(line)
+		}),
+	}
+	if flags.Debug() {
+		opts = append(opts, whisper.OptDebug())
+	}
+	whisper, err := whisper.New(dir, opts...)
 	if err != nil {
 		log.Println(err)
 		os.Exit(-2)

go.mod

@@ -8,8 +8,8 @@ require (
 	github.com/djthorpe/go-tablewriter v0.0.8
 	github.com/go-audio/wav v1.1.0
 	github.com/mutablelogic/go-client v1.0.9
-	github.com/mutablelogic/go-media v1.6.9
-	github.com/mutablelogic/go-server v1.4.14
+	github.com/mutablelogic/go-media v1.6.10
+	github.com/mutablelogic/go-server v1.4.15
 	github.com/stretchr/testify v1.9.0
 )
 

go.sum

@@ -26,10 +26,10 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mutablelogic/go-client v1.0.9 h1:Eh4sjQOFDldP/L3IizqkcOD3WigZR+u1VaHTUM4ujYw=
 github.com/mutablelogic/go-client v1.0.9/go.mod h1:VLyB8j8IBJSK/FXvvqhmq93PRWDKkyLu8R7V2Vudb6A=
-github.com/mutablelogic/go-media v1.6.9 h1:jkmqrMo7yKXaYXkALBeyVGpV6tNNEf36tmxdOX06VXI=
-github.com/mutablelogic/go-media v1.6.9/go.mod h1:HulNT0yyH63a3FRlbuzNDakhOypYrmtFVkHEXZjDgAY=
-github.com/mutablelogic/go-server v1.4.14 h1:MsYyS9MjBoYtWfJo/iw6DnZ8slnhakWhPPqVCuzuaV8=
-github.com/mutablelogic/go-server v1.4.14/go.mod h1:9nenPAohKu8bFoRgwHJh+3s8h0kLFjUAb8KZvT1TQNU=
+github.com/mutablelogic/go-media v1.6.10 h1:LJCNGiAJHFETtATbktTpe38lquUDiLjgeaWXsi1fzI8=
+github.com/mutablelogic/go-media v1.6.10/go.mod h1:HulNT0yyH63a3FRlbuzNDakhOypYrmtFVkHEXZjDgAY=
+github.com/mutablelogic/go-server v1.4.15 h1:jOvVdDmVK+PGCMBAk5atKHVonnccwy/b4dWwWFAOTso=
+github.com/mutablelogic/go-server v1.4.15/go.mod h1:9nenPAohKu8bFoRgwHJh+3s8h0kLFjUAb8KZvT1TQNU=
 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/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=

pkg/whisper/whisper.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	// Packages
+	"github.com/mutablelogic/go-media/pkg/ffmpeg"
 	model "github.com/mutablelogic/go-whisper/pkg/whisper/model"
 	pool "github.com/mutablelogic/go-whisper/pkg/whisper/pool"
 	"github.com/mutablelogic/go-whisper/pkg/whisper/schema"
@@ -80,6 +81,9 @@ func New(path string, opt ...Opt) (*Whisper, error) {
 			}
 			o.logfn(fmt.Sprintf("[%s] %s", level, strings.TrimSpace(text)))
 		})
+		ffmpeg.SetLogging(o.debug, func(text string) {
+			o.logfn(text)
+		})
 	}
 
 	// Return success