From 0d06098af8cb7dacc06667839437b1140fc81f03 Mon Sep 17 00:00:00 2001 From: onyx-and-iris <75868496+onyx-and-iris@users.noreply.github.com> Date: Thu, 29 Sep 2022 18:02:11 +0100 Subject: [PATCH] now using logrus package logrus added to go.mod --- base.go | 6 ++++-- go.mod | 3 ++- go.sum | 7 +++++-- remote.go | 24 ++++++++++++++++-------- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/base.go b/base.go index 3b003bd..f2fe98b 100644 --- a/base.go +++ b/base.go @@ -8,6 +8,8 @@ import ( "syscall" "time" "unsafe" + + log "github.com/sirupsen/logrus" ) var ( @@ -52,7 +54,7 @@ func login(kindId string) error { err := fmt.Errorf("VBVMR_Login returned %d", res) return err } - fmt.Printf("Logged into Voicemeeter %s\n", kindId) + log.Info("Logged into Voicemeeter ", kindId) for pdirty() || mdirty() { } return nil @@ -67,7 +69,7 @@ func logout(kindId string) error { err := fmt.Errorf("VBVMR_Logout returned %d", res) return err } - fmt.Printf("Logged out of Voicemeeter %s\n", kindId) + log.Info("Logged out of Voicemeeter ", kindId) return nil } diff --git a/go.mod b/go.mod index 8146314..a13ba57 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,9 @@ go 1.18 retract [v1.0.0, v1.1.0] require ( + github.com/sirupsen/logrus v1.9.0 github.com/stretchr/testify v1.8.0 - golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d + golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 ) require ( diff --git a/go.sum b/go.sum index 34f7d2f..fbdf025 100644 --- a/go.sum +++ b/go.sum @@ -3,13 +3,16 @@ 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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d h1:/m5NbqQelATgoSPVC2Z23sR4kVNokFwDDyWh/3rGY+I= -golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/remote.go b/remote.go index c5e258c..710821f 100644 --- a/remote.go +++ b/remote.go @@ -2,7 +2,10 @@ package voicemeeter import ( "fmt" + "os" "time" + + log "github.com/sirupsen/logrus" ) // A Remote type represents the API for a kind @@ -197,7 +200,7 @@ func (b *genericBuilder) setKind() remoteBuilder { // makeStrip makes a strip slice and assigns it to remote.Strip // []iStrip comprises of both physical and virtual strip types func (b *genericBuilder) makeStrip() remoteBuilder { - fmt.Println("building strip") + log.Info("building strip") _strip := make([]iStrip, b.k.NumStrip()) for i := 0; i < b.k.NumStrip(); i++ { if i < b.k.PhysIn { @@ -213,7 +216,7 @@ func (b *genericBuilder) makeStrip() remoteBuilder { // makeBus makes a bus slice and assigns it to remote.Bus // []t_bus comprises of both physical and virtual bus types func (b *genericBuilder) makeBus() remoteBuilder { - fmt.Println("building bus") + log.Info("building bus") _bus := make([]iBus, b.k.NumBus()) for i := 0; i < b.k.NumBus(); i++ { if i < b.k.PhysOut { @@ -228,7 +231,7 @@ func (b *genericBuilder) makeBus() remoteBuilder { // makeButton makes a button slice and assigns it to remote.Button func (b *genericBuilder) makeButton() remoteBuilder { - fmt.Println("building button") + log.Info("building button") _button := make([]button, 80) for i := 0; i < 80; i++ { _button[i] = newButton(i) @@ -239,35 +242,35 @@ func (b *genericBuilder) makeButton() remoteBuilder { // makeCommand makes a command type and assigns it to remote.Command func (b *genericBuilder) makeCommand() remoteBuilder { - fmt.Println("building command") + log.Info("building command") b.r.Command = newCommand() return b } // makeVban makes a vban type and assigns it to remote.Vban func (b *genericBuilder) makeVban() remoteBuilder { - fmt.Println("building vban") + log.Info("building vban") b.r.Vban = newVban(b.k) return b } // makeDevice makes a device type and assigns it to remote.Device func (b *genericBuilder) makeDevice() remoteBuilder { - fmt.Println("building device") + log.Info("building device") b.r.Device = newDevice() return b } // makeRecorder makes a recorder type and assigns it to remote.Recorder func (b *genericBuilder) makeRecorder() remoteBuilder { - fmt.Println("building recorder") + log.Info("building recorder") b.r.Recorder = newRecorder() return b } // makeMidi makes a midi type and assigns it to remote.Midi func (b *genericBuilder) makeMidi() remoteBuilder { - fmt.Println("building midi") + log.Info("building midi") b.r.Midi = newMidi() return b } @@ -335,6 +338,11 @@ var ( vmdelay int ) +func init() { + log.SetOutput(os.Stdout) + log.SetLevel(log.WarnLevel) +} + // NewRemote returns a Remote type for a kind // this is the interface entry point func NewRemote(kindId string, delay int) (*Remote, error) {