Move mpris out of pkg directory and run gofumpt

This commit is contained in:
Elara 2022-11-24 17:36:25 -08:00
parent b3be8e7027
commit 9f0ca5a7df
7 changed files with 33 additions and 36 deletions

View File

@ -8,7 +8,6 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"go.arsenm.dev/infinitime" "go.arsenm.dev/infinitime"
"go.arsenm.dev/itd/internal/utils" "go.arsenm.dev/itd/internal/utils"
) )
func initCallNotifs(ctx context.Context, dev *infinitime.Device) error { func initCallNotifs(ctx context.Context, dev *infinitime.Device) error {

View File

@ -29,7 +29,7 @@ func init() {
// If config dir is not readable // If config dir is not readable
if _, err = os.ReadDir(cfgDir); err != nil { if _, err = os.ReadDir(cfgDir); err != nil {
// Create config dir with 700 permissions // Create config dir with 700 permissions
err = os.MkdirAll(cfgDir, 0700) err = os.MkdirAll(cfgDir, 0o700)
if err != nil { if err != nil {
panic(err) panic(err)
} }

View File

@ -37,7 +37,7 @@ func initPureMaps(ctx context.Context, dev *infinitime.Device) error {
} }
// Define rules to listen for // Define rules to listen for
var rules = []string{ rules := []string{
"type='signal',interface='io.github.rinigus.PureMaps.navigator'", "type='signal',interface='io.github.rinigus.PureMaps.navigator'",
} }
var flag uint = 0 var flag uint = 0

View File

@ -109,7 +109,6 @@ func Prev() error {
} }
func VolUp(percent uint) error { func VolUp(percent uint) error {
player, err := getPlayerObj() player, err := getPlayerObj()
if err != nil { if err != nil {
return err return err
@ -129,7 +128,6 @@ func VolUp(percent uint) error {
} }
func VolDown(percent uint) error { func VolDown(percent uint) error {
player, err := getPlayerObj() player, err := getPlayerObj()
if err != nil { if err != nil {
return err return err

View File

@ -23,8 +23,8 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"go.arsenm.dev/infinitime" "go.arsenm.dev/infinitime"
"go.arsenm.dev/itd/mpris"
"go.arsenm.dev/itd/translit" "go.arsenm.dev/itd/translit"
"go.arsenm.dev/itd/pkg/mpris"
) )
func initMusicCtrl(ctx context.Context, dev *infinitime.Device) error { func initMusicCtrl(ctx context.Context, dev *infinitime.Device) error {

View File

@ -25,8 +25,8 @@ import (
"github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"go.arsenm.dev/infinitime" "go.arsenm.dev/infinitime"
"go.arsenm.dev/itd/translit"
"go.arsenm.dev/itd/internal/utils" "go.arsenm.dev/itd/internal/utils"
"go.arsenm.dev/itd/translit"
) )
func initNotifRelay(ctx context.Context, dev *infinitime.Device) error { func initNotifRelay(ctx context.Context, dev *infinitime.Device) error {
@ -37,7 +37,7 @@ func initNotifRelay(ctx context.Context, dev *infinitime.Device) error {
} }
// Define rules to listen for // Define rules to listen for
var rules = []string{ rules := []string{
"type='method_call',member='Notify',path='/org/freedesktop/Notifications',interface='org.freedesktop.Notifications'", "type='method_call',member='Notify',path='/org/freedesktop/Notifications',interface='org.freedesktop.Notifications'",
} }
var flag uint = 0 var flag uint = 0

View File

@ -43,7 +43,7 @@ var (
func startSocket(ctx context.Context, dev *infinitime.Device) error { func startSocket(ctx context.Context, dev *infinitime.Device) error {
// Make socket directory if non-existant // Make socket directory if non-existant
err := os.MkdirAll(filepath.Dir(k.String("socket.path")), 0755) err := os.MkdirAll(filepath.Dir(k.String("socket.path")), 0o755)
if err != nil { if err != nil {
return err return err
} }