From 99989159597a6e7de43ff5f57eae25349ee6f914 Mon Sep 17 00:00:00 2001 From: Elara Musayelyan Date: Thu, 20 Apr 2023 19:54:58 -0700 Subject: [PATCH] Update domain --- api/api.go | 4 ++-- api/firmware.go | 2 +- api/fs.go | 2 +- api/get.go | 2 +- api/notify.go | 2 +- api/resources.go | 4 ++-- api/set.go | 2 +- api/update.go | 2 +- api/watch.go | 2 +- calls.go | 6 +++--- cmd/itctl/firmware.go | 4 ++-- cmd/itctl/main.go | 6 +++--- cmd/itctl/resources.go | 2 +- cmd/itgui/firmware.go | 2 +- cmd/itgui/fs.go | 4 ++-- cmd/itgui/graph.go | 2 +- cmd/itgui/info.go | 2 +- cmd/itgui/main.go | 2 +- cmd/itgui/motion.go | 2 +- cmd/itgui/notify.go | 2 +- cmd/itgui/time.go | 2 +- config.go | 4 ++-- fuse.go | 6 +++--- go.mod | 6 +++--- go.sum | 11 ++++++----- internal/fusefs/fuse.go | 6 +++--- internal/fusefs/syscallerr.go | 2 +- main.go | 6 +++--- maps.go | 6 +++--- metrics.go | 4 ++-- mpris/mpris.go | 2 +- music.go | 8 ++++---- notifs.go | 8 ++++---- socket.go | 10 +++++----- waitgroup.go | 2 +- weather.go | 6 +++--- 36 files changed, 73 insertions(+), 72 deletions(-) diff --git a/api/api.go b/api/api.go index 0f59e48..996e29b 100644 --- a/api/api.go +++ b/api/api.go @@ -4,8 +4,8 @@ import ( "io" "net" - "go.arsenm.dev/drpc/muxconn" - "go.arsenm.dev/itd/internal/rpc" + "go.elara.ws/drpc/muxconn" + "go.elara.ws/itd/internal/rpc" "storj.io/drpc" ) diff --git a/api/firmware.go b/api/firmware.go index 4d13caf..0af58e0 100644 --- a/api/firmware.go +++ b/api/firmware.go @@ -3,7 +3,7 @@ package api import ( "context" - "go.arsenm.dev/itd/internal/rpc" + "go.elara.ws/itd/internal/rpc" ) type DFUProgress struct { diff --git a/api/fs.go b/api/fs.go index f9b6988..6d5d178 100644 --- a/api/fs.go +++ b/api/fs.go @@ -5,7 +5,7 @@ import ( "errors" "io" - "go.arsenm.dev/itd/internal/rpc" + "go.elara.ws/itd/internal/rpc" ) type FSClient struct { diff --git a/api/get.go b/api/get.go index ce944a2..3008349 100644 --- a/api/get.go +++ b/api/get.go @@ -3,7 +3,7 @@ package api import ( "context" - "go.arsenm.dev/itd/internal/rpc" + "go.elara.ws/itd/internal/rpc" ) func (c *Client) HeartRate(ctx context.Context) (uint8, error) { diff --git a/api/notify.go b/api/notify.go index baf8ff5..be4e413 100644 --- a/api/notify.go +++ b/api/notify.go @@ -3,7 +3,7 @@ package api import ( "context" - "go.arsenm.dev/itd/internal/rpc" + "go.elara.ws/itd/internal/rpc" ) func (c *Client) Notify(ctx context.Context, title, body string) error { diff --git a/api/resources.go b/api/resources.go index adc04b8..14ef8a7 100644 --- a/api/resources.go +++ b/api/resources.go @@ -3,8 +3,8 @@ package api import ( "context" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/itd/internal/rpc" + "go.elara.ws/infinitime" + "go.elara.ws/itd/internal/rpc" ) type ResourceOperation uint8 diff --git a/api/set.go b/api/set.go index 9e10f32..88cbba5 100644 --- a/api/set.go +++ b/api/set.go @@ -4,7 +4,7 @@ import ( "context" "time" - "go.arsenm.dev/itd/internal/rpc" + "go.elara.ws/itd/internal/rpc" ) func (c *Client) SetTime(ctx context.Context, t time.Time) error { diff --git a/api/update.go b/api/update.go index 0fad720..9f42fef 100644 --- a/api/update.go +++ b/api/update.go @@ -3,7 +3,7 @@ package api import ( "context" - "go.arsenm.dev/itd/internal/rpc" + "go.elara.ws/itd/internal/rpc" ) func (c *Client) WeatherUpdate(ctx context.Context) error { diff --git a/api/watch.go b/api/watch.go index 488f8ee..6d41388 100644 --- a/api/watch.go +++ b/api/watch.go @@ -3,7 +3,7 @@ package api import ( "context" - "go.arsenm.dev/itd/internal/rpc" + "go.elara.ws/itd/internal/rpc" ) func (c *Client) WatchHeartRate(ctx context.Context) (<-chan uint8, error) { diff --git a/calls.go b/calls.go index 6f55b66..1489c19 100644 --- a/calls.go +++ b/calls.go @@ -5,9 +5,9 @@ import ( "sync" "github.com/godbus/dbus/v5" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/itd/internal/utils" - "go.arsenm.dev/logger/log" + "go.elara.ws/infinitime" + "go.elara.ws/itd/internal/utils" + "go.elara.ws/logger/log" ) func initCallNotifs(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error { diff --git a/cmd/itctl/firmware.go b/cmd/itctl/firmware.go index f8ed914..2790e26 100644 --- a/cmd/itctl/firmware.go +++ b/cmd/itctl/firmware.go @@ -7,8 +7,8 @@ import ( "github.com/cheggaaa/pb/v3" "github.com/urfave/cli/v2" - "go.arsenm.dev/itd/api" - "go.arsenm.dev/logger/log" + "go.elara.ws/itd/api" + "go.elara.ws/logger/log" ) func fwUpgrade(c *cli.Context) error { diff --git a/cmd/itctl/main.go b/cmd/itctl/main.go index a1912c1..a0048b8 100644 --- a/cmd/itctl/main.go +++ b/cmd/itctl/main.go @@ -8,9 +8,9 @@ import ( "time" "github.com/urfave/cli/v2" - "go.arsenm.dev/itd/api" - "go.arsenm.dev/logger" - "go.arsenm.dev/logger/log" + "go.elara.ws/itd/api" + "go.elara.ws/logger" + "go.elara.ws/logger/log" ) var client *api.Client diff --git a/cmd/itctl/resources.go b/cmd/itctl/resources.go index db4e213..93f2933 100644 --- a/cmd/itctl/resources.go +++ b/cmd/itctl/resources.go @@ -6,7 +6,7 @@ import ( "github.com/cheggaaa/pb/v3" "github.com/urfave/cli/v2" - "go.arsenm.dev/infinitime" + "go.elara.ws/infinitime" ) func resourcesLoad(c *cli.Context) error { diff --git a/cmd/itgui/firmware.go b/cmd/itgui/firmware.go index b3f9ff1..db8a3bf 100644 --- a/cmd/itgui/firmware.go +++ b/cmd/itgui/firmware.go @@ -9,7 +9,7 @@ import ( "fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/storage" "fyne.io/fyne/v2/widget" - "go.arsenm.dev/itd/api" + "go.elara.ws/itd/api" ) func firmwareTab(ctx context.Context, client *api.Client, w fyne.Window) fyne.CanvasObject { diff --git a/cmd/itgui/fs.go b/cmd/itgui/fs.go index faa5dbe..8cb3325 100644 --- a/cmd/itgui/fs.go +++ b/cmd/itgui/fs.go @@ -11,8 +11,8 @@ import ( "fyne.io/fyne/v2/storage" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/itd/api" + "go.elara.ws/infinitime" + "go.elara.ws/itd/api" ) func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan struct{}) fyne.CanvasObject { diff --git a/cmd/itgui/graph.go b/cmd/itgui/graph.go index 9f2cf85..189d5ad 100644 --- a/cmd/itgui/graph.go +++ b/cmd/itgui/graph.go @@ -11,7 +11,7 @@ import ( "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/theme" "fyne.io/x/fyne/widget/charts" - "go.arsenm.dev/itd/api" + "go.elara.ws/itd/api" _ "modernc.org/sqlite" ) diff --git a/cmd/itgui/info.go b/cmd/itgui/info.go index ab92528..8665bb0 100644 --- a/cmd/itgui/info.go +++ b/cmd/itgui/info.go @@ -6,7 +6,7 @@ import ( "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" - "go.arsenm.dev/itd/api" + "go.elara.ws/itd/api" ) func infoTab(ctx context.Context, client *api.Client, w fyne.Window) fyne.CanvasObject { diff --git a/cmd/itgui/main.go b/cmd/itgui/main.go index dfbc515..082ab12 100644 --- a/cmd/itgui/main.go +++ b/cmd/itgui/main.go @@ -6,7 +6,7 @@ import ( "fyne.io/fyne/v2/app" "fyne.io/fyne/v2/container" - "go.arsenm.dev/itd/api" + "go.elara.ws/itd/api" ) func main() { diff --git a/cmd/itgui/motion.go b/cmd/itgui/motion.go index ff1cd3d..3cdf8d1 100644 --- a/cmd/itgui/motion.go +++ b/cmd/itgui/motion.go @@ -7,7 +7,7 @@ import ( "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/widget" - "go.arsenm.dev/itd/api" + "go.elara.ws/itd/api" ) func motionTab(ctx context.Context, client *api.Client, w fyne.Window) fyne.CanvasObject { diff --git a/cmd/itgui/notify.go b/cmd/itgui/notify.go index f4b5d4b..d3ec7a0 100644 --- a/cmd/itgui/notify.go +++ b/cmd/itgui/notify.go @@ -7,7 +7,7 @@ import ( "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/widget" - "go.arsenm.dev/itd/api" + "go.elara.ws/itd/api" ) func notifyTab(ctx context.Context, client *api.Client, w fyne.Window) fyne.CanvasObject { diff --git a/cmd/itgui/time.go b/cmd/itgui/time.go index 30c1836..9496d5a 100644 --- a/cmd/itgui/time.go +++ b/cmd/itgui/time.go @@ -8,7 +8,7 @@ import ( "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/widget" - "go.arsenm.dev/itd/api" + "go.elara.ws/itd/api" ) func timeTab(ctx context.Context, client *api.Client, w fyne.Window) fyne.CanvasObject { diff --git a/config.go b/config.go index f7ec797..ba47c09 100644 --- a/config.go +++ b/config.go @@ -9,8 +9,8 @@ import ( "github.com/knadh/koanf/providers/confmap" "github.com/knadh/koanf/providers/env" "github.com/knadh/koanf/providers/file" - "go.arsenm.dev/logger" - "go.arsenm.dev/logger/log" + "go.elara.ws/logger" + "go.elara.ws/logger/log" ) var cfgDir string diff --git a/fuse.go b/fuse.go index b15dac3..1e9aa1d 100644 --- a/fuse.go +++ b/fuse.go @@ -6,9 +6,9 @@ import ( "github.com/hanwen/go-fuse/v2/fs" "github.com/hanwen/go-fuse/v2/fuse" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/itd/internal/fusefs" - "go.arsenm.dev/logger/log" + "go.elara.ws/infinitime" + "go.elara.ws/itd/internal/fusefs" + "go.elara.ws/logger/log" ) func startFUSE(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error { diff --git a/go.mod b/go.mod index d4c994d..3cd785f 100644 --- a/go.mod +++ b/go.mod @@ -15,9 +15,9 @@ require ( github.com/mattn/go-isatty v0.0.17 github.com/mozillazg/go-pinyin v0.19.0 github.com/urfave/cli/v2 v2.23.7 - go.arsenm.dev/drpc v0.0.0-20230328202554-c1f2aa71e794 - go.arsenm.dev/infinitime v0.0.0-20230104230015-512d48bc2469 - go.arsenm.dev/logger v0.0.0-20230104225304-d706171ea6df + go.elara.ws/drpc v0.0.0-20230421021209-fe4c05460a3d + go.elara.ws/infinitime v0.0.0-20230421025334-f2640203e9e9 + go.elara.ws/logger v0.0.0-20230421022458-e80700db2090 golang.org/x/text v0.5.0 google.golang.org/protobuf v1.28.1 modernc.org/sqlite v1.20.1 diff --git a/go.sum b/go.sum index fb8fe69..ac8e522 100644 --- a/go.sum +++ b/go.sum @@ -529,12 +529,13 @@ github.com/yuin/goldmark v1.5.3/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5ta github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/errs v1.3.0 h1:hmiaKqgYZzcVgRL1Vkc1Mn2914BbzB0IBxs+ebeutGs= github.com/zeebo/errs v1.3.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4= -go.arsenm.dev/drpc v0.0.0-20230328202554-c1f2aa71e794 h1:8KQpRoQmCTgDvyHFStaIiz5NUNNqMHqVlZoGvIk+OwQ= -go.arsenm.dev/drpc v0.0.0-20230328202554-c1f2aa71e794/go.mod h1:K5cFls42m5q1RIphTVojRdXLaoCknq/kBqQt8Ow3XuA= -go.arsenm.dev/infinitime v0.0.0-20230104230015-512d48bc2469 h1:LsJHg+8rQSYnTE1sSCjBCACxUUVMZIOQani8J6wF2/E= -go.arsenm.dev/infinitime v0.0.0-20230104230015-512d48bc2469/go.mod h1:scUyDmLmCHn6CanGbau8yjTjzyhUbLJcsjmDCCKMIII= -go.arsenm.dev/logger v0.0.0-20230104225304-d706171ea6df h1:8mBHvEe7BJmpOeKSMA5YLqrGo9dCpePocTeR0C1+/2w= go.arsenm.dev/logger v0.0.0-20230104225304-d706171ea6df/go.mod h1:RV2qydKDdoyaRkhAq8JEGvojR8eJ6bjq5WnSIlH7gYw= +go.elara.ws/drpc v0.0.0-20230421021209-fe4c05460a3d h1:ANb8YPtcxPipwKgmnW688e5PGpNaLh+22nO2LBpIPOU= +go.elara.ws/drpc v0.0.0-20230421021209-fe4c05460a3d/go.mod h1:NDprjiVqKXQKVGzX7jp2g/jctsUbvOxz1nN15QOBEGk= +go.elara.ws/infinitime v0.0.0-20230421025334-f2640203e9e9 h1:HczkQCAHHmOHHdzTxFC1tEGzBJ7F/fuOWNUGrYQhMOg= +go.elara.ws/infinitime v0.0.0-20230421025334-f2640203e9e9/go.mod h1:fu3+jGNBBtRQ1lcywtdZzoQgDFtqvvxBHvLw+XgPrFg= +go.elara.ws/logger v0.0.0-20230421022458-e80700db2090 h1:RVC8XvWo6Yw4HUshqx4TSzuBDScDghafU6QFRJ4xPZg= +go.elara.ws/logger v0.0.0-20230421022458-e80700db2090/go.mod h1:qng49owViqsW5Aey93lwBXONw20oGbJIoLVscB16mPM= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= diff --git a/internal/fusefs/fuse.go b/internal/fusefs/fuse.go index dc0a298..f0d1420 100644 --- a/internal/fusefs/fuse.go +++ b/internal/fusefs/fuse.go @@ -9,9 +9,9 @@ import ( "github.com/hanwen/go-fuse/v2/fs" "github.com/hanwen/go-fuse/v2/fuse" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/infinitime/blefs" - "go.arsenm.dev/logger/log" + "go.elara.ws/infinitime" + "go.elara.ws/infinitime/blefs" + "go.elara.ws/logger/log" ) type ITProperty struct { diff --git a/internal/fusefs/syscallerr.go b/internal/fusefs/syscallerr.go index b2a4f47..fcf8ccd 100644 --- a/internal/fusefs/syscallerr.go +++ b/internal/fusefs/syscallerr.go @@ -3,7 +3,7 @@ package fusefs import ( "syscall" - "go.arsenm.dev/infinitime/blefs" + "go.elara.ws/infinitime/blefs" ) func syscallErr(err error) syscall.Errno { diff --git a/main.go b/main.go index 2803d99..6afe2ca 100644 --- a/main.go +++ b/main.go @@ -34,9 +34,9 @@ import ( "github.com/gen2brain/dlgs" "github.com/knadh/koanf" "github.com/mattn/go-isatty" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/logger" - "go.arsenm.dev/logger/log" + "go.elara.ws/infinitime" + "go.elara.ws/logger" + "go.elara.ws/logger/log" ) var k = koanf.New(".") diff --git a/maps.go b/maps.go index 4178343..2c1e2fc 100644 --- a/maps.go +++ b/maps.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/godbus/dbus/v5" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/itd/internal/utils" - "go.arsenm.dev/logger/log" + "go.elara.ws/infinitime" + "go.elara.ws/itd/internal/utils" + "go.elara.ws/logger/log" ) const ( diff --git a/metrics.go b/metrics.go index 42aad6f..6165a31 100644 --- a/metrics.go +++ b/metrics.go @@ -7,8 +7,8 @@ import ( "time" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/logger/log" + "go.elara.ws/infinitime" + "go.elara.ws/logger/log" _ "modernc.org/sqlite" ) diff --git a/mpris/mpris.go b/mpris/mpris.go index 740d61a..679b915 100644 --- a/mpris/mpris.go +++ b/mpris/mpris.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/godbus/dbus/v5" - "go.arsenm.dev/itd/internal/utils" + "go.elara.ws/itd/internal/utils" ) var ( diff --git a/music.go b/music.go index dcf3a50..3d3e9de 100644 --- a/music.go +++ b/music.go @@ -22,10 +22,10 @@ import ( "context" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/itd/mpris" - "go.arsenm.dev/itd/translit" - "go.arsenm.dev/logger/log" + "go.elara.ws/infinitime" + "go.elara.ws/itd/mpris" + "go.elara.ws/itd/translit" + "go.elara.ws/logger/log" ) func initMusicCtrl(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error { diff --git a/notifs.go b/notifs.go index aaf33c3..489bb87 100644 --- a/notifs.go +++ b/notifs.go @@ -23,10 +23,10 @@ import ( "fmt" "github.com/godbus/dbus/v5" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/itd/internal/utils" - "go.arsenm.dev/itd/translit" - "go.arsenm.dev/logger/log" + "go.elara.ws/infinitime" + "go.elara.ws/itd/internal/utils" + "go.elara.ws/itd/translit" + "go.elara.ws/logger/log" ) func initNotifRelay(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error { diff --git a/socket.go b/socket.go index 6d59244..7afd97f 100644 --- a/socket.go +++ b/socket.go @@ -28,11 +28,11 @@ import ( "time" - "go.arsenm.dev/drpc/muxserver" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/infinitime/blefs" - "go.arsenm.dev/itd/internal/rpc" - "go.arsenm.dev/logger/log" + "go.elara.ws/drpc/muxserver" + "go.elara.ws/infinitime" + "go.elara.ws/infinitime/blefs" + "go.elara.ws/itd/internal/rpc" + "go.elara.ws/logger/log" "storj.io/drpc/drpcmux" ) diff --git a/waitgroup.go b/waitgroup.go index 8d9f734..777a692 100644 --- a/waitgroup.go +++ b/waitgroup.go @@ -3,7 +3,7 @@ package main import ( "sync" - "go.arsenm.dev/logger/log" + "go.elara.ws/logger/log" ) type WaitGroup struct { diff --git a/weather.go b/weather.go index 9825c26..23ef3bb 100644 --- a/weather.go +++ b/weather.go @@ -12,9 +12,9 @@ import ( "time" - "go.arsenm.dev/infinitime" - "go.arsenm.dev/infinitime/weather" - "go.arsenm.dev/logger/log" + "go.elara.ws/infinitime" + "go.elara.ws/infinitime/weather" + "go.elara.ws/logger/log" ) // METResponse represents a response from