eacelmar/itd
1
0
Fork 0
forked from Elara6331/itd
Code Pull Requests Activity

Move mpris out of pkg directory and run gofumpt

Browse Source
This commit is contained in:
Elara
2022-11-24 17:36:25 -08:00
parent d475c6905e
commit 73a679d10b
7 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
calls.go
View File

@@ -7,8 +7,7 @@ import (
"github.com/godbus/dbus/v5"
"github.com/rs/zerolog/log"
"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 {

2
config.go
View File

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

2
maps.go
View File

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

42
pkg/mpris/mpris.go → mpris/mpris.go
View File

@@ -109,42 +109,40 @@ func Prev() error {
}
func VolUp(percent uint) error {
player, err := getPlayerObj()
if err != nil {
return err
}
if player != nil {
currentVal, err := player.GetProperty("org.mpris.MediaPlayer2.Player.Volume")
if err != nil {
return err
}
newVal := currentVal.Value().(float64) + (float64(percent) / 100)
err = player.SetProperty("org.mpris.MediaPlayer2.Player.Volume", newVal)
if err != nil {
return err
}
}
currentVal, err := player.GetProperty("org.mpris.MediaPlayer2.Player.Volume")
if err != nil {
return err
}
newVal := currentVal.Value().(float64) + (float64(percent) / 100)
err = player.SetProperty("org.mpris.MediaPlayer2.Player.Volume", newVal)
if err != nil {
return err
}
}
return nil
}
func VolDown(percent uint) error {
player, err := getPlayerObj()
if err != nil {
return err
}
if player != nil {
currentVal, err := player.GetProperty("org.mpris.MediaPlayer2.Player.Volume")
if err != nil {
return err
}
newVal := currentVal.Value().(float64) - (float64(percent) / 100)
err = player.SetProperty("org.mpris.MediaPlayer2.Player.Volume", newVal)
if err != nil {
return err
}
}
currentVal, err := player.GetProperty("org.mpris.MediaPlayer2.Player.Volume")
if err != nil {
return err
}
newVal := currentVal.Value().(float64) - (float64(percent) / 100)
err = player.SetProperty("org.mpris.MediaPlayer2.Player.Volume", newVal)
if err != nil {
return err
}
}
return nil
}

14
music.go
View File

@@ -19,30 +19,30 @@
package main
import (
"context"
"context"
"github.com/rs/zerolog/log"
"go.arsenm.dev/infinitime"
"go.arsenm.dev/itd/mpris"
"go.arsenm.dev/itd/translit"
"go.arsenm.dev/itd/pkg/mpris"
)
func initMusicCtrl(ctx context.Context, dev *infinitime.Device) error {
mpris.Init(ctx)
mpris.Init(ctx)
maps := k.Strings("notifs.translit.use")
translit.Transliterators["custom"] = translit.Map(k.Strings("notifs.translit.custom"))
mpris.OnChange(func(ct mpris.ChangeType, val string) {
mpris.OnChange(func(ct mpris.ChangeType, val string) {
newVal := translit.Transliterate(val, maps...)
if !firmwareUpdating {
switch ct {
case mpris.ChangeTypeStatus:
dev.Music.SetStatus(val == "Playing")
dev.Music.SetStatus(val == "Playing")
case mpris.ChangeTypeTitle:
dev.Music.SetTrack(newVal)
dev.Music.SetTrack(newVal)
case mpris.ChangeTypeAlbum:
dev.Music.SetAlbum(newVal)
dev.Music.SetAlbum(newVal)
case mpris.ChangeTypeArtist:
dev.Music.SetArtist(newVal)
}

4
notifs.go
View File

@@ -25,8 +25,8 @@ import (
"github.com/godbus/dbus/v5"
"github.com/rs/zerolog/log"
"go.arsenm.dev/infinitime"
"go.arsenm.dev/itd/translit"
"go.arsenm.dev/itd/internal/utils"
"go.arsenm.dev/itd/translit"
)
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
var rules = []string{
rules := []string{
"type='method_call',member='Notify',path='/org/freedesktop/Notifications',interface='org.freedesktop.Notifications'",
}
var flag uint = 0

2
socket.go
View File

@@ -43,7 +43,7 @@ var (
func startSocket(ctx context.Context, dev *infinitime.Device) error {
// 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 {
return err
}