update module import paths

This commit is contained in:
Drew Weymouth
2023-05-07 09:53:34 -07:00
parent 060d65e939
commit 2ef0282c0b
34 changed files with 157 additions and 126 deletions
+4 -3
View File
@@ -7,11 +7,12 @@ import (
"log" "log"
"os" "os"
"path" "path"
"supersonic/backend/util"
"supersonic/player"
"supersonic/sharedutil"
"time" "time"
"github.com/dweymouth/supersonic/backend/util"
"github.com/dweymouth/supersonic/player"
"github.com/dweymouth/supersonic/sharedutil"
"github.com/20after4/configdir" "github.com/20after4/configdir"
"github.com/zalando/go-keyring" "github.com/zalando/go-keyring"
) )
+4 -3
View File
@@ -4,11 +4,12 @@ import (
"context" "context"
"log" "log"
"strconv" "strconv"
"supersonic/backend/util"
"supersonic/player"
"supersonic/sharedutil"
"time" "time"
"github.com/dweymouth/supersonic/backend/util"
"github.com/dweymouth/supersonic/player"
"github.com/dweymouth/supersonic/sharedutil"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+3 -2
View File
@@ -3,10 +3,11 @@ package main
import ( import (
"log" "log"
"runtime" "runtime"
"supersonic/backend"
"supersonic/ui"
"time" "time"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/ui"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/app" "fyne.io/fyne/v2/app"
) )
+6 -5
View File
@@ -4,13 +4,14 @@ import (
"fmt" "fmt"
"image" "image"
"log" "log"
"supersonic/backend"
"supersonic/player"
"supersonic/ui/controller"
"supersonic/ui/layouts"
"supersonic/ui/widgets"
"time" "time"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/player"
"github.com/dweymouth/supersonic/ui/controller"
"github.com/dweymouth/supersonic/ui/layouts"
"github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
+9 -7
View File
@@ -3,19 +3,21 @@ package browsing
import ( import (
"fmt" "fmt"
"log" "log"
"supersonic/backend"
"supersonic/sharedutil" "github.com/dweymouth/supersonic/backend"
"supersonic/ui/controller" "github.com/dweymouth/supersonic/sharedutil"
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/ui/controller"
myTheme "supersonic/ui/theme" "github.com/dweymouth/supersonic/ui/layouts"
"supersonic/ui/util" myTheme "github.com/dweymouth/supersonic/ui/theme"
"supersonic/ui/widgets" "github.com/dweymouth/supersonic/ui/util"
"github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/canvas"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+5 -5
View File
@@ -1,11 +1,11 @@
package browsing package browsing
import ( import (
"supersonic/backend" "github.com/dweymouth/supersonic/backend"
"supersonic/sharedutil" "github.com/dweymouth/supersonic/sharedutil"
"supersonic/ui/controller" "github.com/dweymouth/supersonic/ui/controller"
"supersonic/ui/util" "github.com/dweymouth/supersonic/ui/util"
"supersonic/ui/widgets" "github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
+10 -8
View File
@@ -4,20 +4,22 @@ import (
"log" "log"
"strconv" "strconv"
"strings" "strings"
"supersonic/backend"
"supersonic/res" "github.com/dweymouth/supersonic/backend"
"supersonic/sharedutil" "github.com/dweymouth/supersonic/res"
"supersonic/ui/controller" "github.com/dweymouth/supersonic/sharedutil"
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/ui/controller"
myTheme "supersonic/ui/theme" "github.com/dweymouth/supersonic/ui/layouts"
"supersonic/ui/util" myTheme "github.com/dweymouth/supersonic/ui/theme"
"supersonic/ui/widgets" "github.com/dweymouth/supersonic/ui/util"
"github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+7 -5
View File
@@ -3,18 +3,20 @@ package browsing
import ( import (
"log" "log"
"strings" "strings"
"supersonic/backend"
"supersonic/sharedutil"
"supersonic/ui/controller"
"supersonic/ui/layouts"
"supersonic/ui/widgets"
"time" "time"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/sharedutil"
"github.com/dweymouth/supersonic/ui/controller"
"github.com/dweymouth/supersonic/ui/layouts"
"github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+5 -4
View File
@@ -1,16 +1,17 @@
package browsing package browsing
import ( import (
"supersonic/backend" "github.com/dweymouth/supersonic/backend"
"supersonic/ui/controller" "github.com/dweymouth/supersonic/ui/controller"
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/ui/layouts"
myTheme "supersonic/ui/theme" myTheme "github.com/dweymouth/supersonic/ui/theme"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+8 -6
View File
@@ -2,19 +2,21 @@ package browsing
import ( import (
"log" "log"
"supersonic/backend"
"supersonic/ui/controller"
"supersonic/ui/layouts"
myTheme "supersonic/ui/theme"
"supersonic/ui/util"
"supersonic/ui/widgets"
"time" "time"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/ui/controller"
"github.com/dweymouth/supersonic/ui/layouts"
myTheme "github.com/dweymouth/supersonic/ui/theme"
"github.com/dweymouth/supersonic/ui/util"
"github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+6 -5
View File
@@ -1,17 +1,18 @@
package browsing package browsing
import ( import (
"supersonic/backend" "github.com/dweymouth/supersonic/backend"
"supersonic/ui/controller" "github.com/dweymouth/supersonic/ui/controller"
myTheme "supersonic/ui/theme" myTheme "github.com/dweymouth/supersonic/ui/theme"
"supersonic/ui/util" "github.com/dweymouth/supersonic/ui/util"
"supersonic/ui/widgets" "github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+6 -5
View File
@@ -1,15 +1,16 @@
package browsing package browsing
import ( import (
"supersonic/backend" "github.com/dweymouth/supersonic/backend"
"supersonic/sharedutil" "github.com/dweymouth/supersonic/sharedutil"
"supersonic/ui/controller" "github.com/dweymouth/supersonic/ui/controller"
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/ui/layouts"
"supersonic/ui/widgets" "github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+10 -8
View File
@@ -3,19 +3,21 @@ package browsing
import ( import (
"fmt" "fmt"
"log" "log"
"supersonic/backend"
"supersonic/res" "github.com/dweymouth/supersonic/backend"
"supersonic/sharedutil" "github.com/dweymouth/supersonic/res"
"supersonic/ui/controller" "github.com/dweymouth/supersonic/sharedutil"
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/ui/controller"
myTheme "supersonic/ui/theme" "github.com/dweymouth/supersonic/ui/layouts"
"supersonic/ui/util" myTheme "github.com/dweymouth/supersonic/ui/theme"
"supersonic/ui/widgets" "github.com/dweymouth/supersonic/ui/util"
"github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+8 -6
View File
@@ -5,18 +5,20 @@ import (
"log" "log"
"strconv" "strconv"
"strings" "strings"
"supersonic/backend"
"supersonic/res" "github.com/dweymouth/supersonic/backend"
"supersonic/sharedutil" "github.com/dweymouth/supersonic/res"
"supersonic/ui/controller" "github.com/dweymouth/supersonic/sharedutil"
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/ui/controller"
"supersonic/ui/widgets" "github.com/dweymouth/supersonic/ui/layouts"
"github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+2 -2
View File
@@ -1,8 +1,8 @@
package browsing package browsing
import ( import (
"supersonic/backend" "github.com/dweymouth/supersonic/backend"
"supersonic/ui/controller" "github.com/dweymouth/supersonic/ui/controller"
) )
type NavigationHandler interface { type NavigationHandler interface {
+7 -6
View File
@@ -1,17 +1,18 @@
package browsing package browsing
import ( import (
"supersonic/backend" "github.com/dweymouth/supersonic/backend"
"supersonic/sharedutil" "github.com/dweymouth/supersonic/sharedutil"
"supersonic/ui/controller" "github.com/dweymouth/supersonic/ui/controller"
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/ui/layouts"
"supersonic/ui/theme" "github.com/dweymouth/supersonic/ui/theme"
"supersonic/ui/widgets" "github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+8 -6
View File
@@ -5,20 +5,22 @@ import (
"log" "log"
"math" "math"
"strconv" "strconv"
"supersonic/backend"
"supersonic/player"
"supersonic/sharedutil"
"supersonic/ui/dialogs"
"supersonic/ui/util"
"supersonic/ui/widgets"
"sync" "sync"
"time" "time"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/player"
"github.com/dweymouth/supersonic/sharedutil"
"github.com/dweymouth/supersonic/ui/dialogs"
"github.com/dweymouth/supersonic/ui/util"
"github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/canvas"
"fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/dialog"
"fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )
+3 -2
View File
@@ -3,8 +3,9 @@ package dialogs
import ( import (
"fmt" "fmt"
"net/url" "net/url"
"supersonic/res"
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/res"
"github.com/dweymouth/supersonic/ui/layouts"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/canvas"
+1 -1
View File
@@ -1,7 +1,7 @@
package dialogs package dialogs
import ( import (
"supersonic/backend" "github.com/dweymouth/supersonic/backend"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
+1 -1
View File
@@ -1,7 +1,7 @@
package dialogs package dialogs
import ( import (
"supersonic/backend" "github.com/dweymouth/supersonic/backend"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
+7 -6
View File
@@ -6,14 +6,15 @@ import (
"os" "os"
"strconv" "strconv"
"strings" "strings"
"supersonic/backend"
"supersonic/player"
"supersonic/ui/layouts"
myTheme "supersonic/ui/theme"
"supersonic/ui/util"
"supersonic/ui/widgets"
"unicode" "unicode"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/player"
"github.com/dweymouth/supersonic/ui/layouts"
myTheme "github.com/dweymouth/supersonic/ui/theme"
"github.com/dweymouth/supersonic/ui/util"
"github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/data/binding" "fyne.io/fyne/v2/data/binding"
+7 -6
View File
@@ -2,12 +2,13 @@ package ui
import ( import (
"fmt" "fmt"
"supersonic/backend"
"supersonic/res" "github.com/dweymouth/supersonic/backend"
"supersonic/ui/browsing" "github.com/dweymouth/supersonic/res"
"supersonic/ui/controller" "github.com/dweymouth/supersonic/ui/browsing"
"supersonic/ui/os" "github.com/dweymouth/supersonic/ui/controller"
"supersonic/ui/theme" "github.com/dweymouth/supersonic/ui/os"
"github.com/dweymouth/supersonic/ui/theme"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
+4 -3
View File
@@ -6,9 +6,10 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"strings" "strings"
"supersonic/backend"
"supersonic/res" "github.com/dweymouth/supersonic/backend"
"supersonic/sharedutil" "github.com/dweymouth/supersonic/res"
"github.com/dweymouth/supersonic/sharedutil"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/theme"
+2 -1
View File
@@ -2,7 +2,8 @@ package widgets
import ( import (
"strconv" "strconv"
"supersonic/ui/layouts"
"github.com/dweymouth/supersonic/ui/layouts"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
+2 -2
View File
@@ -1,8 +1,8 @@
package widgets package widgets
import ( import (
"supersonic/res" "github.com/dweymouth/supersonic/res"
"supersonic/ui/theme" "github.com/dweymouth/supersonic/ui/theme"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
+4 -3
View File
@@ -4,11 +4,12 @@ import (
"context" "context"
"image" "image"
"log" "log"
"supersonic/backend"
"supersonic/res"
"supersonic/sharedutil"
"sync" "sync"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/res"
"github.com/dweymouth/supersonic/sharedutil"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"context" "context"
"image" "image"
"supersonic/res" "github.com/dweymouth/supersonic/res"
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/ui/layouts"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/canvas"
+3 -2
View File
@@ -2,8 +2,9 @@ package widgets
import ( import (
"log" "log"
"supersonic/ui/layouts"
myTheme "supersonic/ui/theme" "github.com/dweymouth/supersonic/ui/layouts"
myTheme "github.com/dweymouth/supersonic/ui/theme"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
+2 -1
View File
@@ -2,7 +2,8 @@ package widgets
import ( import (
"image" "image"
"supersonic/ui/layouts"
"github.com/dweymouth/supersonic/ui/layouts"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/canvas"
+1 -1
View File
@@ -1,7 +1,7 @@
package widgets package widgets
import ( import (
"supersonic/ui/util" "github.com/dweymouth/supersonic/ui/util"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
+3 -2
View File
@@ -2,8 +2,9 @@ package widgets
import ( import (
"math" "math"
"supersonic/res"
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/res"
"github.com/dweymouth/supersonic/ui/layouts"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/canvas"
+1 -1
View File
@@ -1,7 +1,7 @@
package widgets package widgets
import ( import (
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/ui/layouts"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
+5 -5
View File
@@ -7,11 +7,11 @@ import (
"sync" "sync"
"time" "time"
"supersonic/sharedutil" "github.com/dweymouth/supersonic/sharedutil"
"supersonic/ui/layouts" "github.com/dweymouth/supersonic/ui/layouts"
"supersonic/ui/os" "github.com/dweymouth/supersonic/ui/os"
myTheme "supersonic/ui/theme" myTheme "github.com/dweymouth/supersonic/ui/theme"
"supersonic/ui/util" "github.com/dweymouth/supersonic/ui/util"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
+1 -1
View File
@@ -1,7 +1,7 @@
package widgets package widgets
import ( import (
"supersonic/backend" "github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/go-subsonic/subsonic" "github.com/dweymouth/go-subsonic/subsonic"
) )