diff --git a/README.md b/README.md index 4313fcc..b1b981d 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ password can then be changed from the web interface ``` $ apt install build-essential git sqlite libtag1-dev ffmpeg # for debian like $ pacman -S base-devel git sqlite taglib ffmpeg # for arch like -$ go get senan.xyz/g/gonic/cmd/gonic +$ go get go.senan.xyz/gonic/cmd/gonic $ export PATH=$PATH:$HOME/go/bin $ gonic -h # or see "configuration options below" ``` diff --git a/cmd/gonic/main.go b/cmd/gonic/main.go index aa2e82b..c74890b 100644 --- a/cmd/gonic/main.go +++ b/cmd/gonic/main.go @@ -11,9 +11,9 @@ import ( _ "github.com/jinzhu/gorm/dialects/sqlite" "github.com/peterbourgon/ff" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/server" - "senan.xyz/g/gonic/version" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server" + "go.senan.xyz/gonic/version" ) func main() { diff --git a/cmd/gonicembed/main.go b/cmd/gonicembed/main.go index d5c8074..c31e69f 100644 --- a/cmd/gonicembed/main.go +++ b/cmd/gonicembed/main.go @@ -12,7 +12,7 @@ import ( "github.com/peterbourgon/ff" "github.com/pkg/errors" - "senan.xyz/g/gonic/version" + "go.senan.xyz/gonic/version" ) // once i had this written with ~100% text/template but it was very diff --git a/cmd/gonicscan/main.go b/cmd/gonicscan/main.go index 0ed5fb1..d1dad1c 100644 --- a/cmd/gonicscan/main.go +++ b/cmd/gonicscan/main.go @@ -8,9 +8,9 @@ import ( _ "github.com/jinzhu/gorm/dialects/sqlite" "github.com/peterbourgon/ff" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/scanner" - "senan.xyz/g/gonic/version" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/scanner" + "go.senan.xyz/gonic/version" ) func main() { diff --git a/db/model.go b/db/model.go index 2a4e0e7..9ec2f68 100644 --- a/db/model.go +++ b/db/model.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "senan.xyz/g/gonic/mime" + "go.senan.xyz/gonic/mime" ) func splitInt(in, sep string) []int { diff --git a/go.mod b/go.mod index ca7d611..257de3f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module senan.xyz/g/gonic +module go.senan.xyz/gonic require ( cloud.google.com/go v0.40.0 // indirect diff --git a/scanner/scanner.go b/scanner/scanner.go index 5350fd8..b51c0bd 100644 --- a/scanner/scanner.go +++ b/scanner/scanner.go @@ -15,10 +15,10 @@ import ( "github.com/pkg/errors" "github.com/rainycape/unidecode" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/mime" - "senan.xyz/g/gonic/scanner/stack" - "senan.xyz/g/gonic/scanner/tags" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/mime" + "go.senan.xyz/gonic/scanner/stack" + "go.senan.xyz/gonic/scanner/tags" ) // isScanning acts as an atomic boolean semaphore. we don't diff --git a/scanner/scanner_test.go b/scanner/scanner_test.go index b7785de..6f285d0 100644 --- a/scanner/scanner_test.go +++ b/scanner/scanner_test.go @@ -7,7 +7,7 @@ import ( _ "github.com/jinzhu/gorm/dialects/sqlite" - "senan.xyz/g/gonic/db" + "go.senan.xyz/gonic/db" ) var testScanner *Scanner diff --git a/scanner/stack/stack.go b/scanner/stack/stack.go index 4e90075..f1c9c6d 100644 --- a/scanner/stack/stack.go +++ b/scanner/stack/stack.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "senan.xyz/g/gonic/db" + "go.senan.xyz/gonic/db" ) type item struct { diff --git a/scanner/stack/stack_test.go b/scanner/stack/stack_test.go index 864d207..c8d004b 100644 --- a/scanner/stack/stack_test.go +++ b/scanner/stack/stack_test.go @@ -3,7 +3,7 @@ package stack import ( "testing" - "senan.xyz/g/gonic/db" + "go.senan.xyz/gonic/db" ) func TestFolderStack(t *testing.T) { diff --git a/server/assets/layouts/base.tmpl b/server/assets/layouts/base.tmpl index 29e20c9..f7478e8 100644 --- a/server/assets/layouts/base.tmpl +++ b/server/assets/layouts/base.tmpl @@ -23,7 +23,7 @@ {{ .Version }} senan kelly, 2020 | - github + github diff --git a/server/ctrladmin/ctrl.go b/server/ctrladmin/ctrl.go index e42441c..f811453 100644 --- a/server/ctrladmin/ctrl.go +++ b/server/ctrladmin/ctrl.go @@ -18,10 +18,10 @@ import ( "github.com/oxtoacart/bpool" "github.com/wader/gormstore" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/server/assets" - "senan.xyz/g/gonic/server/ctrlbase" - "senan.xyz/g/gonic/version" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/assets" + "go.senan.xyz/gonic/server/ctrlbase" + "go.senan.xyz/gonic/version" ) type CtxKey int diff --git a/server/ctrladmin/handlers.go b/server/ctrladmin/handlers.go index 3ec668e..61a18e1 100644 --- a/server/ctrladmin/handlers.go +++ b/server/ctrladmin/handlers.go @@ -7,10 +7,10 @@ import ( "strconv" "time" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/scanner" - "senan.xyz/g/gonic/server/encode" - "senan.xyz/g/gonic/server/lastfm" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/scanner" + "go.senan.xyz/gonic/server/encode" + "go.senan.xyz/gonic/server/lastfm" ) func firstExisting(or string, strings ...string) string { diff --git a/server/ctrladmin/handlers_playlist.go b/server/ctrladmin/handlers_playlist.go index 7b1dbe7..e075a16 100644 --- a/server/ctrladmin/handlers_playlist.go +++ b/server/ctrladmin/handlers_playlist.go @@ -10,7 +10,7 @@ import ( "github.com/jinzhu/gorm" "github.com/pkg/errors" - "senan.xyz/g/gonic/db" + "go.senan.xyz/gonic/db" ) func playlistParseLine(c *Controller, path string) (int, error) { diff --git a/server/ctrladmin/middleware.go b/server/ctrladmin/middleware.go index 48f32d0..548552f 100644 --- a/server/ctrladmin/middleware.go +++ b/server/ctrladmin/middleware.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/sessions" - "senan.xyz/g/gonic/db" + "go.senan.xyz/gonic/db" ) func (c *Controller) WithSession(next http.Handler) http.Handler { diff --git a/server/ctrlbase/ctrl.go b/server/ctrlbase/ctrl.go index cfcbb49..194ccc0 100644 --- a/server/ctrlbase/ctrl.go +++ b/server/ctrlbase/ctrl.go @@ -6,8 +6,8 @@ import ( "net/http" "path" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/scanner" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/scanner" ) type statusWriter struct { diff --git a/server/ctrlsubsonic/ctrl.go b/server/ctrlsubsonic/ctrl.go index d9ae912..8548bbb 100644 --- a/server/ctrlsubsonic/ctrl.go +++ b/server/ctrlsubsonic/ctrl.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" - "senan.xyz/g/gonic/server/ctrlbase" - "senan.xyz/g/gonic/server/ctrlsubsonic/params" - "senan.xyz/g/gonic/server/ctrlsubsonic/spec" + "go.senan.xyz/gonic/server/ctrlbase" + "go.senan.xyz/gonic/server/ctrlsubsonic/params" + "go.senan.xyz/gonic/server/ctrlsubsonic/spec" ) type CtxKey int diff --git a/server/ctrlsubsonic/ctrl_test.go b/server/ctrlsubsonic/ctrl_test.go index df1a2ec..fc3445c 100644 --- a/server/ctrlsubsonic/ctrl_test.go +++ b/server/ctrlsubsonic/ctrl_test.go @@ -13,9 +13,9 @@ import ( jd "github.com/josephburnett/jd/lib" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/server/ctrlbase" - "senan.xyz/g/gonic/server/ctrlsubsonic/params" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/ctrlbase" + "go.senan.xyz/gonic/server/ctrlsubsonic/params" ) var ( diff --git a/server/ctrlsubsonic/handlers_by_folder.go b/server/ctrlsubsonic/handlers_by_folder.go index 27001b9..d5b78cc 100644 --- a/server/ctrlsubsonic/handlers_by_folder.go +++ b/server/ctrlsubsonic/handlers_by_folder.go @@ -8,9 +8,9 @@ import ( "github.com/jinzhu/gorm" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/server/ctrlsubsonic/params" - "senan.xyz/g/gonic/server/ctrlsubsonic/spec" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/ctrlsubsonic/params" + "go.senan.xyz/gonic/server/ctrlsubsonic/spec" ) // the subsonic spec metions "artist" a lot when talking about the diff --git a/server/ctrlsubsonic/handlers_by_tags.go b/server/ctrlsubsonic/handlers_by_tags.go index 7399a42..73ef57d 100644 --- a/server/ctrlsubsonic/handlers_by_tags.go +++ b/server/ctrlsubsonic/handlers_by_tags.go @@ -8,10 +8,10 @@ import ( "github.com/jinzhu/gorm" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/server/ctrlsubsonic/params" - "senan.xyz/g/gonic/server/ctrlsubsonic/spec" - "senan.xyz/g/gonic/server/lastfm" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/ctrlsubsonic/params" + "go.senan.xyz/gonic/server/ctrlsubsonic/spec" + "go.senan.xyz/gonic/server/lastfm" ) func (c *Controller) ServeGetArtists(r *http.Request) *spec.Response { diff --git a/server/ctrlsubsonic/handlers_common.go b/server/ctrlsubsonic/handlers_common.go index 47c491d..b64ab7a 100644 --- a/server/ctrlsubsonic/handlers_common.go +++ b/server/ctrlsubsonic/handlers_common.go @@ -10,11 +10,11 @@ import ( "github.com/jinzhu/gorm" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/scanner" - "senan.xyz/g/gonic/server/ctrlsubsonic/params" - "senan.xyz/g/gonic/server/ctrlsubsonic/spec" - "senan.xyz/g/gonic/server/lastfm" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/scanner" + "go.senan.xyz/gonic/server/ctrlsubsonic/params" + "go.senan.xyz/gonic/server/ctrlsubsonic/spec" + "go.senan.xyz/gonic/server/lastfm" ) func lowerUDecOrHash(in string) string { diff --git a/server/ctrlsubsonic/handlers_raw.go b/server/ctrlsubsonic/handlers_raw.go index 5053143..58dc290 100644 --- a/server/ctrlsubsonic/handlers_raw.go +++ b/server/ctrlsubsonic/handlers_raw.go @@ -9,10 +9,10 @@ import ( "github.com/jinzhu/gorm" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/server/ctrlsubsonic/params" - "senan.xyz/g/gonic/server/ctrlsubsonic/spec" - "senan.xyz/g/gonic/server/encode" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/server/ctrlsubsonic/params" + "go.senan.xyz/gonic/server/ctrlsubsonic/spec" + "go.senan.xyz/gonic/server/encode" ) // "raw" handlers are ones that don't always return a spec response. diff --git a/server/ctrlsubsonic/middleware.go b/server/ctrlsubsonic/middleware.go index cfdb9fa..c301a5a 100644 --- a/server/ctrlsubsonic/middleware.go +++ b/server/ctrlsubsonic/middleware.go @@ -7,8 +7,8 @@ import ( "fmt" "net/http" - "senan.xyz/g/gonic/server/ctrlsubsonic/params" - "senan.xyz/g/gonic/server/ctrlsubsonic/spec" + "go.senan.xyz/gonic/server/ctrlsubsonic/params" + "go.senan.xyz/gonic/server/ctrlsubsonic/spec" ) func checkCredsToken(password, token, salt string) bool { diff --git a/server/ctrlsubsonic/spec/construct.go b/server/ctrlsubsonic/spec/construct.go index 1aa4cc9..047133a 100644 --- a/server/ctrlsubsonic/spec/construct.go +++ b/server/ctrlsubsonic/spec/construct.go @@ -1,6 +1,6 @@ package spec -import "senan.xyz/g/gonic/db" +import "go.senan.xyz/gonic/db" func NewPlaylist(p *db.Playlist) *Playlist { return &Playlist{ diff --git a/server/ctrlsubsonic/spec/construct_by_folder.go b/server/ctrlsubsonic/spec/construct_by_folder.go index ad77bbe..5b0b45a 100644 --- a/server/ctrlsubsonic/spec/construct_by_folder.go +++ b/server/ctrlsubsonic/spec/construct_by_folder.go @@ -3,7 +3,7 @@ package spec import ( "path" - "senan.xyz/g/gonic/db" + "go.senan.xyz/gonic/db" ) func NewAlbumByFolder(f *db.Album) *Album { diff --git a/server/ctrlsubsonic/spec/construct_by_tags.go b/server/ctrlsubsonic/spec/construct_by_tags.go index 5da76c5..eca7766 100644 --- a/server/ctrlsubsonic/spec/construct_by_tags.go +++ b/server/ctrlsubsonic/spec/construct_by_tags.go @@ -3,7 +3,7 @@ package spec import ( "path" - "senan.xyz/g/gonic/db" + "go.senan.xyz/gonic/db" ) func NewAlbumByTags(a *db.Album, artist *db.Artist) *Album { diff --git a/server/ctrlsubsonic/spec/spec.go b/server/ctrlsubsonic/spec/spec.go index bfc71d0..8a8dcbe 100644 --- a/server/ctrlsubsonic/spec/spec.go +++ b/server/ctrlsubsonic/spec/spec.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "senan.xyz/g/gonic/version" + "go.senan.xyz/gonic/version" ) var ( diff --git a/server/lastfm/lastfm.go b/server/lastfm/lastfm.go index ce44923..cfe8fa1 100644 --- a/server/lastfm/lastfm.go +++ b/server/lastfm/lastfm.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "senan.xyz/g/gonic/db" + "go.senan.xyz/gonic/db" ) var ( diff --git a/server/server.go b/server/server.go index d5f9964..38b0528 100644 --- a/server/server.go +++ b/server/server.go @@ -10,12 +10,12 @@ import ( "github.com/gorilla/mux" - "senan.xyz/g/gonic/db" - "senan.xyz/g/gonic/scanner" - "senan.xyz/g/gonic/server/assets" - "senan.xyz/g/gonic/server/ctrladmin" - "senan.xyz/g/gonic/server/ctrlbase" - "senan.xyz/g/gonic/server/ctrlsubsonic" + "go.senan.xyz/gonic/db" + "go.senan.xyz/gonic/scanner" + "go.senan.xyz/gonic/server/assets" + "go.senan.xyz/gonic/server/ctrladmin" + "go.senan.xyz/gonic/server/ctrlbase" + "go.senan.xyz/gonic/server/ctrlsubsonic" ) type Options struct {