1e8c9484d2
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
moved dbus.go to an internal utils package added context function parameter to initMusicCtrl and updated main.go to pass it updated calls.go, maps.go, music.go, and notifs.go to use utils package for getting a dus connection
42 lines
735 B
Go
42 lines
735 B
Go
package utils
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/godbus/dbus/v5"
|
|
)
|
|
|
|
func NewSystemBusConn(ctx context.Context) (*dbus.Conn, error) {
|
|
// Connect to dbus session bus
|
|
conn, err := dbus.SystemBusPrivate(dbus.WithContext(ctx))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
err = conn.Auth(nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
err = conn.Hello()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return conn, nil
|
|
}
|
|
|
|
func NewSessionBusConn(ctx context.Context) (*dbus.Conn, error) {
|
|
// Connect to dbus session bus
|
|
conn, err := dbus.SessionBusPrivate(dbus.WithContext(ctx))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
err = conn.Auth(nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
err = conn.Hello()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return conn, nil
|
|
}
|