diff --git a/.goreleaser.yml b/.goreleaser.yml index e1ae133ea..161b5dc62 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -18,7 +18,7 @@ builds: - -tags=embed,netgo ldflags: - "-extldflags '-static -lz'" - - -s -w -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Version}} + - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}} - id: navidrome_linux_386 env: @@ -31,7 +31,7 @@ builds: - -tags=embed,netgo ldflags: - "-extldflags '-static'" - - -s -w -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Version}} + - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}} - id: navidrome_linux_arm env: @@ -50,7 +50,7 @@ builds: - -tags=embed,netgo ldflags: - "-extldflags '-static'" - - -s -w -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Version}} + - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}} - id: navidrome_linux_arm64 env: @@ -65,7 +65,7 @@ builds: - -tags=embed,netgo ldflags: - "-extldflags '-static'" - - -s -w -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Version}} + - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}} - id: navidrome_windows_i686 env: @@ -81,7 +81,7 @@ builds: - -tags=embed,netgo ldflags: - "-extldflags '-static'" - - -s -w -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Version}} + - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}} - id: navidrome_windows_x64 env: @@ -97,7 +97,7 @@ builds: - -tags=embed,netgo ldflags: - "-extldflags '-static'" - - -s -w -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Version}} + - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}} - id: navidrome_darwin env: @@ -112,7 +112,7 @@ builds: flags: - -tags=embed,netgo ldflags: - - -s -w -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Version}} + - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}} archives: - format_overrides: diff --git a/Makefile b/Makefile index 5c26f9bd5..96cc88d4b 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ GIT_TAG=$(shell git describe --tags `git rev-list --tags --max-count=1`) ## Default target just build the Go project. default: - go build -ldflags="-X github.com/deluan/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/deluan/navidrome/consts.gitTag=master" + go build -ldflags="-X github.com/navidrome/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/navidrome/navidrome/consts.gitTag=master" .PHONY: default dev: check_env @@ -81,14 +81,14 @@ check_node_env: .PHONY: check_node_env build: check_go_env - go build -ldflags="-X github.com/deluan/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/deluan/navidrome/consts.gitTag=$(GIT_TAG)-SNAPSHOT" + go build -ldflags="-X github.com/navidrome/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/navidrome/navidrome/consts.gitTag=$(GIT_TAG)-SNAPSHOT" .PHONY: build buildall: check_env @(cd ./ui && npm run build) go run github.com/go-bindata/go-bindata/go-bindata -fs -prefix "resources" -tags embed -ignore="\\\*.go" -pkg resources -o resources/embedded_gen.go resources/... go run github.com/go-bindata/go-bindata/go-bindata -fs -prefix "ui/build" -tags embed -nocompress -pkg assets -o assets/embedded_gen.go ui/build/... - go build -ldflags="-X github.com/deluan/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/deluan/navidrome/consts.gitTag=$(GIT_TAG)-SNAPSHOT" -tags=embed,netgo + go build -ldflags="-X github.com/navidrome/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/navidrome/navidrome/consts.gitTag=$(GIT_TAG)-SNAPSHOT" -tags=embed,netgo .PHONY: buildall pre-push: lint test diff --git a/README.md b/README.md index 3f7a8e810..75599ea95 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Navidrome Music Server -[![Last Release](https://img.shields.io/github/v/release/deluan/navidrome?label=latest&style=flat-square)](https://github.com/deluan/navidrome/releases) -[![Build](https://img.shields.io/github/workflow/status/deluan/navidrome/Build?style=flat-square)](https://github.com/deluan/navidrome/actions) -[![Downloads](https://img.shields.io/github/downloads/deluan/navidrome/total?style=flat-square)](https://github.com/deluan/navidrome/releases/latest) -[![Docker Pulls](https://img.shields.io/docker/pulls/deluan/navidrome?style=flat-square)](https://hub.docker.com/r/deluan/navidrome) +[![Last Release](https://img.shields.io/github/v/release/navidrome/navidrome?label=latest&style=flat-square)](https://github.com/navidrome/navidrome/releases) +[![Build](https://img.shields.io/github/workflow/status/navidrome/navidrome/Build?style=flat-square)](https://github.com/navidrome/navidrome/actions) +[![Downloads](https://img.shields.io/github/downloads/navidrome/navidrome/total?style=flat-square)](https://github.com/navidrome/navidrome/releases/latest) +[![Docker Pulls](https://img.shields.io/docker/pulls/navidrome/navidrome?style=flat-square)](https://hub.docker.com/r/deluan/navidrome) [![Dev Chat](https://img.shields.io/discord/671335427726114836?label=chat&style=flat-square)](https://discord.gg/xh7j7yF) [![Subreddit](https://img.shields.io/reddit/subreddit-subscribers/navidrome?style=flat-square)](https://www.reddit.com/r/navidrome/) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0-ff69b4.svg?style=flat-square)](code_of_conduct.md) @@ -14,7 +14,7 @@ Navidrome is an open source web-based music collection server and streamer. It g music collection from any browser or mobile device. It's like your personal Spotify! __Any feedback is welcome!__ If you need/want a new feature, find a bug or think of any way to improve Navidrome, -please file a [GitHub issue](https://github.com/deluan/navidrome/issues) or join the discussion in our +please file a [GitHub issue](https://github.com/navidrome/navidrome/issues) or join the discussion in our [Subreddit](https://www.reddit.com/r/navidrome/). If you want to contribute to the project in any other way ([ui/backend dev](https://www.navidrome.org/docs/developers/), [translations](https://www.navidrome.org/docs/developers/translations/), @@ -56,8 +56,8 @@ Here are some useful direct links: ## Screenshots

- - - - + + + +

diff --git a/assets/external.go b/assets/external.go index 856f03bb9..f43178cd7 100644 --- a/assets/external.go +++ b/assets/external.go @@ -6,7 +6,7 @@ import ( "net/http" "sync" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/log" ) var once sync.Once diff --git a/cmd/root.go b/cmd/root.go index 6be877b36..02a2792a7 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,10 +6,10 @@ import ( "os" "time" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/db" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/db" + "github.com/navidrome/navidrome/log" "github.com/oklog/run" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/scan.go b/cmd/scan.go index cec2f9e1e..fd1e01f07 100644 --- a/cmd/scan.go +++ b/cmd/scan.go @@ -1,8 +1,8 @@ package cmd import ( - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/log" "github.com/spf13/cobra" "golang.org/x/net/context" ) diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go index 12ccc4afd..8fad19975 100644 --- a/cmd/wire_gen.go +++ b/cmd/wire_gen.go @@ -6,15 +6,15 @@ package cmd import ( - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/core/transcoder" - "github.com/deluan/navidrome/persistence" - "github.com/deluan/navidrome/scanner" - "github.com/deluan/navidrome/server" - "github.com/deluan/navidrome/server/app" - "github.com/deluan/navidrome/server/events" - "github.com/deluan/navidrome/server/subsonic" "github.com/google/wire" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/core/transcoder" + "github.com/navidrome/navidrome/persistence" + "github.com/navidrome/navidrome/scanner" + "github.com/navidrome/navidrome/server" + "github.com/navidrome/navidrome/server/app" + "github.com/navidrome/navidrome/server/events" + "github.com/navidrome/navidrome/server/subsonic" "sync" ) diff --git a/cmd/wire_injectors.go b/cmd/wire_injectors.go index 6c45181d0..fa543b5a0 100644 --- a/cmd/wire_injectors.go +++ b/cmd/wire_injectors.go @@ -5,14 +5,14 @@ package cmd import ( "sync" - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/persistence" - "github.com/deluan/navidrome/scanner" - "github.com/deluan/navidrome/server" - "github.com/deluan/navidrome/server/app" - "github.com/deluan/navidrome/server/events" - "github.com/deluan/navidrome/server/subsonic" "github.com/google/wire" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/persistence" + "github.com/navidrome/navidrome/scanner" + "github.com/navidrome/navidrome/server" + "github.com/navidrome/navidrome/server/app" + "github.com/navidrome/navidrome/server/events" + "github.com/navidrome/navidrome/server/subsonic" ) var allProviders = wire.NewSet( diff --git a/conf/configuration.go b/conf/configuration.go index f41b3ae36..f0ec0d152 100644 --- a/conf/configuration.go +++ b/conf/configuration.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" "github.com/kr/pretty" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/log" "github.com/spf13/viper" ) diff --git a/consts/banner.go b/consts/banner.go index b78b8f209..15436fa3f 100644 --- a/consts/banner.go +++ b/consts/banner.go @@ -5,7 +5,7 @@ import ( "strings" "unicode" - "github.com/deluan/navidrome/resources" + "github.com/navidrome/navidrome/resources" ) func getBanner() string { diff --git a/core/archiver.go b/core/archiver.go index cea107697..bd0798488 100644 --- a/core/archiver.go +++ b/core/archiver.go @@ -9,8 +9,8 @@ import ( "path/filepath" "github.com/Masterminds/squirrel" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" ) type Archiver interface { diff --git a/core/artwork.go b/core/artwork.go index cfdf8f9d6..e303a91a4 100644 --- a/core/artwork.go +++ b/core/artwork.go @@ -16,17 +16,16 @@ import ( "sync" "time" - "github.com/deluan/navidrome/core/cache" - _ "golang.org/x/image/webp" - - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/resources" - "github.com/deluan/navidrome/utils" "github.com/dhowden/tag" "github.com/disintegration/imaging" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/core/cache" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/resources" + "github.com/navidrome/navidrome/utils" + _ "golang.org/x/image/webp" ) type Artwork interface { diff --git a/core/artwork_test.go b/core/artwork_test.go index 125931b37..bae5f7d7b 100644 --- a/core/artwork_test.go +++ b/core/artwork_test.go @@ -5,10 +5,10 @@ import ( "image" "io/ioutil" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/auth/auth.go b/core/auth/auth.go index 2bc42b285..4a58edd4c 100644 --- a/core/auth/auth.go +++ b/core/auth/auth.go @@ -6,12 +6,12 @@ import ( "sync" "time" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" "github.com/dgrijalva/jwt-go" "github.com/go-chi/jwtauth" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" ) var ( diff --git a/core/auth/auth_test.go b/core/auth/auth_test.go index fc8f0b796..b84c98ab2 100644 --- a/core/auth/auth_test.go +++ b/core/auth/auth_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/deluan/navidrome/core/auth" - "github.com/deluan/navidrome/log" "github.com/dgrijalva/jwt-go" + "github.com/navidrome/navidrome/core/auth" + "github.com/navidrome/navidrome/log" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/cache/cache_suite_test.go b/core/cache/cache_suite_test.go index d781ebf84..b669ce83b 100644 --- a/core/cache/cache_suite_test.go +++ b/core/cache/cache_suite_test.go @@ -3,8 +3,8 @@ package cache import ( "testing" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/cache/file_caches.go b/core/cache/file_caches.go index 21063a214..687d245c2 100644 --- a/core/cache/file_caches.go +++ b/core/cache/file_caches.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" "github.com/djherbis/fscache" "github.com/dustin/go-humanize" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/log" ) type Item interface { diff --git a/core/cache/file_caches_test.go b/core/cache/file_caches_test.go index 133b1538f..8332af67f 100644 --- a/core/cache/file_caches_test.go +++ b/core/cache/file_caches_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/deluan/navidrome/conf" + "github.com/navidrome/navidrome/conf" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/cache_warmer.go b/core/cache_warmer.go index a3c3454cb..6d63479b0 100644 --- a/core/cache_warmer.go +++ b/core/cache_warmer.go @@ -6,9 +6,9 @@ import ( "io/ioutil" "time" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/core/pool" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/core/pool" + "github.com/navidrome/navidrome/log" ) type CacheWarmer interface { diff --git a/core/common.go b/core/common.go index f2d048ba6..0619772d6 100644 --- a/core/common.go +++ b/core/common.go @@ -3,7 +3,7 @@ package core import ( "context" - "github.com/deluan/navidrome/model/request" + "github.com/navidrome/navidrome/model/request" ) func userName(ctx context.Context) string { diff --git a/core/core_suite_test.go b/core/core_suite_test.go index 2fdc7c669..5f2c709d8 100644 --- a/core/core_suite_test.go +++ b/core/core_suite_test.go @@ -3,8 +3,8 @@ package core import ( "testing" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/external_info.go b/core/external_info.go index 33e4f5277..c8fb0e3cf 100644 --- a/core/external_info.go +++ b/core/external_info.go @@ -9,12 +9,12 @@ import ( "time" "github.com/Masterminds/squirrel" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/core/lastfm" - "github.com/deluan/navidrome/core/spotify" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" "github.com/microcosm-cc/bluemonday" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/core/lastfm" + "github.com/navidrome/navidrome/core/spotify" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" "github.com/xrash/smetrics" ) diff --git a/core/get_entity.go b/core/get_entity.go index 6d5e253fd..341a1d3c1 100644 --- a/core/get_entity.go +++ b/core/get_entity.go @@ -3,7 +3,7 @@ package core import ( "context" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/model" ) // TODO: Should the type be encoded in the ID? diff --git a/core/gravatar/gravatar.go b/core/gravatar/gravatar.go index e0ac6cb68..efbc57048 100644 --- a/core/gravatar/gravatar.go +++ b/core/gravatar/gravatar.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/utils" ) const baseUrl = "https://www.gravatar.com/avatar" diff --git a/core/gravatar/gravatar_test.go b/core/gravatar/gravatar_test.go index 230f65193..2462f55a5 100644 --- a/core/gravatar/gravatar_test.go +++ b/core/gravatar/gravatar_test.go @@ -3,9 +3,9 @@ package gravatar_test import ( "testing" - "github.com/deluan/navidrome/core/gravatar" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/core/gravatar" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/lastfm/lastfm_suite_test.go b/core/lastfm/lastfm_suite_test.go index b32bdc3a5..9be5fabe9 100644 --- a/core/lastfm/lastfm_suite_test.go +++ b/core/lastfm/lastfm_suite_test.go @@ -3,8 +3,8 @@ package lastfm import ( "testing" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/media_streamer.go b/core/media_streamer.go index b83eb8f49..e39be251f 100644 --- a/core/media_streamer.go +++ b/core/media_streamer.go @@ -9,13 +9,13 @@ import ( "sync" "time" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/core/cache" - "github.com/deluan/navidrome/core/transcoder" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/core/cache" + "github.com/navidrome/navidrome/core/transcoder" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" ) type MediaStreamer interface { diff --git a/core/media_streamer_test.go b/core/media_streamer_test.go index ec1be95bd..6dbbe0d9b 100644 --- a/core/media_streamer_test.go +++ b/core/media_streamer_test.go @@ -6,11 +6,11 @@ import ( "io/ioutil" "strings" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/players.go b/core/players.go index 9a8611efa..01d6b69d2 100644 --- a/core/players.go +++ b/core/players.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" "github.com/google/uuid" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" ) type Players interface { diff --git a/core/players_test.go b/core/players_test.go index 1f7d28224..07b4fe8b9 100644 --- a/core/players_test.go +++ b/core/players_test.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/pool/pool.go b/core/pool/pool.go index c94d546c2..09ceaeffd 100644 --- a/core/pool/pool.go +++ b/core/pool/pool.go @@ -3,7 +3,7 @@ package pool import ( "time" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/log" ) type Executor func(workload interface{}) diff --git a/core/pool/pool_test.go b/core/pool/pool_test.go index 7bdd59e4c..345f484cc 100644 --- a/core/pool/pool_test.go +++ b/core/pool/pool_test.go @@ -3,8 +3,8 @@ package pool import ( "testing" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/spotify/client.go b/core/spotify/client.go index d8547d148..60f3cb92d 100644 --- a/core/spotify/client.go +++ b/core/spotify/client.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/log" ) const apiBaseUrl = "https://api.spotify.com/v1/" diff --git a/core/spotify/spotify_suite_test.go b/core/spotify/spotify_suite_test.go index 6e38633b2..aa1999077 100644 --- a/core/spotify/spotify_suite_test.go +++ b/core/spotify/spotify_suite_test.go @@ -3,8 +3,8 @@ package spotify import ( "testing" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/transcoder/ffmpeg.go b/core/transcoder/ffmpeg.go index 4108889f4..a654ae583 100644 --- a/core/transcoder/ffmpeg.go +++ b/core/transcoder/ffmpeg.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/log" ) type Transcoder interface { diff --git a/core/transcoder/ffmpeg_test.go b/core/transcoder/ffmpeg_test.go index 6acf1a147..23adfd1f4 100644 --- a/core/transcoder/ffmpeg_test.go +++ b/core/transcoder/ffmpeg_test.go @@ -3,8 +3,8 @@ package transcoder import ( "testing" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/core/wire_providers.go b/core/wire_providers.go index 32c955b5e..1d3ebaa4f 100644 --- a/core/wire_providers.go +++ b/core/wire_providers.go @@ -3,11 +3,11 @@ package core import ( "net/http" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/core/lastfm" - "github.com/deluan/navidrome/core/spotify" - "github.com/deluan/navidrome/core/transcoder" "github.com/google/wire" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/core/lastfm" + "github.com/navidrome/navidrome/core/spotify" + "github.com/navidrome/navidrome/core/transcoder" ) var Set = wire.NewSet( diff --git a/db/db.go b/db/db.go index e9743e110..79c8fa322 100644 --- a/db/db.go +++ b/db/db.go @@ -5,10 +5,10 @@ import ( "os" "sync" - "github.com/deluan/navidrome/conf" - _ "github.com/deluan/navidrome/db/migration" - "github.com/deluan/navidrome/log" _ "github.com/mattn/go-sqlite3" + "github.com/navidrome/navidrome/conf" + _ "github.com/navidrome/navidrome/db/migration" + "github.com/navidrome/navidrome/log" "github.com/pressly/goose" ) diff --git a/db/migration/20200130083147_create_schema.go b/db/migration/20200130083147_create_schema.go index 56babb343..f06a2876b 100644 --- a/db/migration/20200130083147_create_schema.go +++ b/db/migration/20200130083147_create_schema.go @@ -3,7 +3,7 @@ package migration import ( "database/sql" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/log" "github.com/pressly/goose" ) diff --git a/db/migration/20200516140647_add_playlist_tracks_table.go b/db/migration/20200516140647_add_playlist_tracks_table.go index 6cbdebe74..1539a9a50 100644 --- a/db/migration/20200516140647_add_playlist_tracks_table.go +++ b/db/migration/20200516140647_add_playlist_tracks_table.go @@ -4,7 +4,7 @@ import ( "database/sql" "strings" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/log" "github.com/pressly/goose" ) diff --git a/db/migration/20200706231659_add_default_transcodings.go b/db/migration/20200706231659_add_default_transcodings.go index 93ad0cbd6..76681b6c7 100644 --- a/db/migration/20200706231659_add_default_transcodings.go +++ b/db/migration/20200706231659_add_default_transcodings.go @@ -3,8 +3,8 @@ package migration import ( "database/sql" - "github.com/deluan/navidrome/consts" "github.com/google/uuid" + "github.com/navidrome/navidrome/consts" "github.com/pressly/goose" ) diff --git a/db/migration/20201213124814_add_all_artist_ids_to_album.go b/db/migration/20201213124814_add_all_artist_ids_to_album.go index b43c37d5d..2af114624 100644 --- a/db/migration/20201213124814_add_all_artist_ids_to_album.go +++ b/db/migration/20201213124814_add_all_artist_ids_to_album.go @@ -3,8 +3,8 @@ package migration import ( "database/sql" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/utils" "github.com/pressly/goose" ) diff --git a/db/migration/migration.go b/db/migration/migration.go index 1e1ef8006..3aea3c3e5 100644 --- a/db/migration/migration.go +++ b/db/migration/migration.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/deluan/navidrome/consts" + "github.com/navidrome/navidrome/consts" ) // Use this in migrations that need to communicate something important (braking changes, forced reindexes, etc...) diff --git a/go.mod b/go.mod index cb7f081dc..962bf2860 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/deluan/navidrome +module github.com/navidrome/navidrome go 1.15 diff --git a/main.go b/main.go index 2b2aedd2e..0c2d0fafa 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "runtime" - "github.com/deluan/navidrome/cmd" + "github.com/navidrome/navidrome/cmd" ) func main() { diff --git a/model/request/request.go b/model/request/request.go index 16b3a9333..bfcc0520b 100644 --- a/model/request/request.go +++ b/model/request/request.go @@ -3,7 +3,7 @@ package request import ( "context" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/model" ) type contextKey string diff --git a/persistence/album_repository.go b/persistence/album_repository.go index c2179e6f2..66ec4b67d 100644 --- a/persistence/album_repository.go +++ b/persistence/album_repository.go @@ -12,12 +12,12 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/utils" "github.com/deluan/rest" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/utils" ) type albumRepository struct { diff --git a/persistence/album_repository_test.go b/persistence/album_repository_test.go index 8b700a0e1..561551f62 100644 --- a/persistence/album_repository_test.go +++ b/persistence/album_repository_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/persistence/artist_repository.go b/persistence/artist_repository.go index 77d72af22..252fdc4bb 100644 --- a/persistence/artist_repository.go +++ b/persistence/artist_repository.go @@ -9,11 +9,11 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/utils" "github.com/deluan/rest" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/utils" ) type artistRepository struct { diff --git a/persistence/artist_repository_test.go b/persistence/artist_repository_test.go index 625dd21e3..45196c33c 100644 --- a/persistence/artist_repository_test.go +++ b/persistence/artist_repository_test.go @@ -4,9 +4,9 @@ import ( "context" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/persistence/genre_repository.go b/persistence/genre_repository.go index e858eb7a0..312f36d8b 100644 --- a/persistence/genre_repository.go +++ b/persistence/genre_repository.go @@ -5,7 +5,7 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/model" ) type genreRepository struct { diff --git a/persistence/genre_repository_test.go b/persistence/genre_repository_test.go index b76d07a60..e1e8aabd6 100644 --- a/persistence/genre_repository_test.go +++ b/persistence/genre_repository_test.go @@ -4,9 +4,9 @@ import ( "context" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/persistence" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/persistence" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/persistence/helpers.go b/persistence/helpers.go index f281a5367..5b6dc8066 100644 --- a/persistence/helpers.go +++ b/persistence/helpers.go @@ -8,10 +8,10 @@ import ( "strings" "github.com/Masterminds/squirrel" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/utils" ) func toSqlArgs(rec interface{}) (map[string]interface{}, error) { diff --git a/persistence/mediafile_repository.go b/persistence/mediafile_repository.go index 887b79ad2..1d5b03163 100644 --- a/persistence/mediafile_repository.go +++ b/persistence/mediafile_repository.go @@ -10,9 +10,9 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" "github.com/deluan/rest" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" ) type mediaFileRepository struct { diff --git a/persistence/mediafile_repository_test.go b/persistence/mediafile_repository_test.go index 7a5825a31..834bb77f3 100644 --- a/persistence/mediafile_repository_test.go +++ b/persistence/mediafile_repository_test.go @@ -5,10 +5,10 @@ import ( "time" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" "github.com/google/uuid" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/persistence/mediafolders_repository.go b/persistence/mediafolders_repository.go index 552be65ec..410d9238d 100644 --- a/persistence/mediafolders_repository.go +++ b/persistence/mediafolders_repository.go @@ -4,8 +4,8 @@ import ( "context" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/model" ) type mediaFolderRepository struct { diff --git a/persistence/persistence.go b/persistence/persistence.go index eabe52d9f..e66da1370 100644 --- a/persistence/persistence.go +++ b/persistence/persistence.go @@ -5,9 +5,9 @@ import ( "reflect" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/db" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/db" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" ) type SQLStore struct { diff --git a/persistence/persistence_suite_test.go b/persistence/persistence_suite_test.go index ade7e3e2c..3aeb39a3b 100644 --- a/persistence/persistence_suite_test.go +++ b/persistence/persistence_suite_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/db" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/tests" _ "github.com/mattn/go-sqlite3" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/db" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/persistence/player_repository.go b/persistence/player_repository.go index a1e87d0fd..2c0321ffd 100644 --- a/persistence/player_repository.go +++ b/persistence/player_repository.go @@ -5,8 +5,8 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/model" "github.com/deluan/rest" + "github.com/navidrome/navidrome/model" ) type playerRepository struct { diff --git a/persistence/playlist_repository.go b/persistence/playlist_repository.go index 650386c00..1db5684d3 100644 --- a/persistence/playlist_repository.go +++ b/persistence/playlist_repository.go @@ -6,9 +6,9 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" "github.com/deluan/rest" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" ) type playlistRepository struct { diff --git a/persistence/playlist_repository_test.go b/persistence/playlist_repository_test.go index 9983358d1..ebbf07eee 100644 --- a/persistence/playlist_repository_test.go +++ b/persistence/playlist_repository_test.go @@ -4,9 +4,9 @@ import ( "context" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/persistence/playlist_track_repository.go b/persistence/playlist_track_repository.go index 3955fc241..6a2054f69 100644 --- a/persistence/playlist_track_repository.go +++ b/persistence/playlist_track_repository.go @@ -4,10 +4,10 @@ import ( "time" . "github.com/Masterminds/squirrel" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/utils" "github.com/deluan/rest" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/utils" ) type playlistTrackRepository struct { diff --git a/persistence/playqueue_repository.go b/persistence/playqueue_repository.go index 31e91e6bc..66dd8b4ad 100644 --- a/persistence/playqueue_repository.go +++ b/persistence/playqueue_repository.go @@ -7,9 +7,9 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/utils" ) type playQueueRepository struct { diff --git a/persistence/playqueue_repository_test.go b/persistence/playqueue_repository_test.go index 299976416..f2adb76f2 100644 --- a/persistence/playqueue_repository_test.go +++ b/persistence/playqueue_repository_test.go @@ -6,10 +6,10 @@ import ( "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" "github.com/google/uuid" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/persistence/property_repository.go b/persistence/property_repository.go index 4bf5fcdcb..d2a6ddc09 100644 --- a/persistence/property_repository.go +++ b/persistence/property_repository.go @@ -5,7 +5,7 @@ import ( "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/model" ) type propertyRepository struct { diff --git a/persistence/property_repository_test.go b/persistence/property_repository_test.go index de1222c33..d4a589c8a 100644 --- a/persistence/property_repository_test.go +++ b/persistence/property_repository_test.go @@ -4,8 +4,8 @@ import ( "context" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/persistence/sql_annotations.go b/persistence/sql_annotations.go index dc5a9e96a..f15d9e837 100644 --- a/persistence/sql_annotations.go +++ b/persistence/sql_annotations.go @@ -5,9 +5,9 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" "github.com/google/uuid" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" ) const annotationTable = "annotation" diff --git a/persistence/sql_base_repository.go b/persistence/sql_base_repository.go index 1368d7425..53cb22383 100644 --- a/persistence/sql_base_repository.go +++ b/persistence/sql_base_repository.go @@ -8,10 +8,10 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" "github.com/google/uuid" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" ) type sqlRepository struct { diff --git a/persistence/sql_base_repository_test.go b/persistence/sql_base_repository_test.go index 7181af633..81aea4974 100644 --- a/persistence/sql_base_repository_test.go +++ b/persistence/sql_base_repository_test.go @@ -2,7 +2,7 @@ package persistence import ( "github.com/Masterminds/squirrel" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/model" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/persistence/sql_bookmarks.go b/persistence/sql_bookmarks.go index 897270d0d..7dfef990d 100644 --- a/persistence/sql_bookmarks.go +++ b/persistence/sql_bookmarks.go @@ -5,9 +5,9 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" ) const bookmarkTable = "bookmark" diff --git a/persistence/sql_bookmarks_test.go b/persistence/sql_bookmarks_test.go index ce35610ed..4112b91b7 100644 --- a/persistence/sql_bookmarks_test.go +++ b/persistence/sql_bookmarks_test.go @@ -4,9 +4,9 @@ import ( "context" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/persistence/sql_restful.go b/persistence/sql_restful.go index d4d90dbc1..5729dc6c9 100644 --- a/persistence/sql_restful.go +++ b/persistence/sql_restful.go @@ -5,8 +5,8 @@ import ( "strings" . "github.com/Masterminds/squirrel" - "github.com/deluan/navidrome/model" "github.com/deluan/rest" + "github.com/navidrome/navidrome/model" ) type filterFunc = func(field string, value interface{}) Sqlizer diff --git a/persistence/sql_search.go b/persistence/sql_search.go index c5b829c43..0ef0d623e 100644 --- a/persistence/sql_search.go +++ b/persistence/sql_search.go @@ -4,8 +4,8 @@ import ( "strings" . "github.com/Masterminds/squirrel" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/utils" ) func getFullText(text ...string) string { diff --git a/persistence/transcoding_repository.go b/persistence/transcoding_repository.go index b4f19ae84..03dc78412 100644 --- a/persistence/transcoding_repository.go +++ b/persistence/transcoding_repository.go @@ -5,8 +5,8 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/model" "github.com/deluan/rest" + "github.com/navidrome/navidrome/model" ) type transcodingRepository struct { diff --git a/persistence/user_repository.go b/persistence/user_repository.go index 9fd6d805a..a86913be8 100644 --- a/persistence/user_repository.go +++ b/persistence/user_repository.go @@ -6,9 +6,9 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/model" "github.com/deluan/rest" "github.com/google/uuid" + "github.com/navidrome/navidrome/model" ) type userRepository struct { diff --git a/persistence/user_repository_test.go b/persistence/user_repository_test.go index 1feab6915..87e2aec58 100644 --- a/persistence/user_repository_test.go +++ b/persistence/user_repository_test.go @@ -4,8 +4,8 @@ import ( "context" "github.com/astaxie/beego/orm" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/resources/external.go b/resources/external.go index f240408a0..859e2d120 100644 --- a/resources/external.go +++ b/resources/external.go @@ -7,7 +7,7 @@ import ( "net/http" "sync" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/log" ) var once sync.Once diff --git a/scanner/mapping.go b/scanner/mapping.go index 5deba3cdd..2963f1ea6 100644 --- a/scanner/mapping.go +++ b/scanner/mapping.go @@ -7,12 +7,12 @@ import ( "path/filepath" "strings" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/scanner/metadata" - "github.com/deluan/navidrome/utils" "github.com/kennygrant/sanitize" "github.com/microcosm-cc/bluemonday" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/scanner/metadata" + "github.com/navidrome/navidrome/utils" ) type mediaFileMapper struct { diff --git a/scanner/mapping_test.go b/scanner/mapping_test.go index f288a4862..1141d946c 100644 --- a/scanner/mapping_test.go +++ b/scanner/mapping_test.go @@ -1,7 +1,7 @@ package scanner import ( - "github.com/deluan/navidrome/conf" + "github.com/navidrome/navidrome/conf" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/scanner/metadata/ffmpeg.go b/scanner/metadata/ffmpeg.go index 8acb3ba75..d2d6e8011 100644 --- a/scanner/metadata/ffmpeg.go +++ b/scanner/metadata/ffmpeg.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/log" ) type ffmpegMetadata struct { diff --git a/scanner/metadata/metadata.go b/scanner/metadata/metadata.go index 8b3b33096..137482adc 100644 --- a/scanner/metadata/metadata.go +++ b/scanner/metadata/metadata.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/log" "github.com/google/uuid" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/log" ) type Extractor interface { diff --git a/scanner/metadata/metadata_suite_test.go b/scanner/metadata/metadata_suite_test.go index d8186e14c..c9c201dc9 100644 --- a/scanner/metadata/metadata_suite_test.go +++ b/scanner/metadata/metadata_suite_test.go @@ -3,8 +3,8 @@ package metadata import ( "testing" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/scanner/metadata/taglib.go b/scanner/metadata/taglib.go index 7c4843b2c..e2d154638 100644 --- a/scanner/metadata/taglib.go +++ b/scanner/metadata/taglib.go @@ -4,9 +4,9 @@ import ( "errors" "os" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/scanner/metadata/taglib" "github.com/dhowden/tag" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/scanner/metadata/taglib" ) type taglibMetadata struct { diff --git a/scanner/metadata/taglib/taglib_parser.go b/scanner/metadata/taglib/taglib_parser.go index 4225c4af5..239532569 100644 --- a/scanner/metadata/taglib/taglib_parser.go +++ b/scanner/metadata/taglib/taglib_parser.go @@ -17,7 +17,7 @@ import ( "sync" "unsafe" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/log" ) func Read(filename string) (map[string]string, error) { diff --git a/scanner/playlist_sync.go b/scanner/playlist_sync.go index 1e3d51af2..955e0ab7d 100644 --- a/scanner/playlist_sync.go +++ b/scanner/playlist_sync.go @@ -10,10 +10,10 @@ import ( "path/filepath" "strings" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/utils" ) type playlistSync struct { diff --git a/scanner/playlist_sync_test.go b/scanner/playlist_sync_test.go index a0aed99d8..b211c94ba 100644 --- a/scanner/playlist_sync_test.go +++ b/scanner/playlist_sync_test.go @@ -3,8 +3,8 @@ package scanner import ( "context" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/scanner/refresh_buffer.go b/scanner/refresh_buffer.go index 0aca43f57..e6a1f221e 100644 --- a/scanner/refresh_buffer.go +++ b/scanner/refresh_buffer.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" ) type refreshBuffer struct { diff --git a/scanner/scanner.go b/scanner/scanner.go index dac9bfe13..4cd569d77 100644 --- a/scanner/scanner.go +++ b/scanner/scanner.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/server/events" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/server/events" + "github.com/navidrome/navidrome/utils" ) type Scanner interface { diff --git a/scanner/scanner_suite_test.go b/scanner/scanner_suite_test.go index 8e4d14907..09691ddbd 100644 --- a/scanner/scanner_suite_test.go +++ b/scanner/scanner_suite_test.go @@ -3,8 +3,8 @@ package scanner import ( "testing" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/scanner/tag_scanner.go b/scanner/tag_scanner.go index 3b575a622..00437b3a9 100644 --- a/scanner/tag_scanner.go +++ b/scanner/tag_scanner.go @@ -8,13 +8,13 @@ import ( "strings" "time" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/scanner/metadata" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/scanner/metadata" + "github.com/navidrome/navidrome/utils" ) type TagScanner struct { diff --git a/scanner/walk_dir_tree.go b/scanner/walk_dir_tree.go index 6a819c7cb..aa7fee464 100644 --- a/scanner/walk_dir_tree.go +++ b/scanner/walk_dir_tree.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/utils" ) type ( diff --git a/server/app/app.go b/server/app/app.go index 0269211fe..143e0ae60 100644 --- a/server/app/app.go +++ b/server/app/app.go @@ -6,16 +6,16 @@ import ( "net/url" "strings" - "github.com/deluan/navidrome/assets" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/core/auth" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/server/events" "github.com/deluan/rest" "github.com/go-chi/chi" "github.com/go-chi/httprate" "github.com/go-chi/jwtauth" + "github.com/navidrome/navidrome/assets" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/core/auth" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/server/events" ) type Router struct { diff --git a/server/app/app_suite_test.go b/server/app/app_suite_test.go index d602d449c..10f1a37a5 100644 --- a/server/app/app_suite_test.go +++ b/server/app/app_suite_test.go @@ -3,8 +3,8 @@ package app import ( "testing" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/app/auth.go b/server/app/auth.go index 042b80d1e..789b8abaf 100644 --- a/server/app/auth.go +++ b/server/app/auth.go @@ -8,17 +8,17 @@ import ( "strings" "time" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/core/auth" - "github.com/deluan/navidrome/core/gravatar" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" "github.com/deluan/rest" "github.com/dgrijalva/jwt-go" "github.com/go-chi/jwtauth" "github.com/google/uuid" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/core/auth" + "github.com/navidrome/navidrome/core/gravatar" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" ) var ( diff --git a/server/app/auth_test.go b/server/app/auth_test.go index 0edc1a299..074175992 100644 --- a/server/app/auth_test.go +++ b/server/app/auth_test.go @@ -4,7 +4,7 @@ import ( "net/http" "net/http/httptest" - "github.com/deluan/navidrome/consts" + "github.com/navidrome/navidrome/consts" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/app/playlists.go b/server/app/playlists.go index e72a16f73..19410549a 100644 --- a/server/app/playlists.go +++ b/server/app/playlists.go @@ -9,11 +9,11 @@ import ( "strconv" "strings" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/utils" "github.com/deluan/rest" "github.com/go-chi/chi" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/utils" ) func getPlaylist(ds model.DataStore) http.HandlerFunc { diff --git a/server/app/serve_index.go b/server/app/serve_index.go index 3c38d2cca..544dddfc8 100644 --- a/server/app/serve_index.go +++ b/server/app/serve_index.go @@ -7,11 +7,11 @@ import ( "net/http" "strings" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" "github.com/microcosm-cc/bluemonday" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" ) // Injects the config in the `index.html` template diff --git a/server/app/serve_index_test.go b/server/app/serve_index_test.go index 8c9b0d3ee..7ebb86c8d 100644 --- a/server/app/serve_index_test.go +++ b/server/app/serve_index_test.go @@ -8,10 +8,10 @@ import ( "regexp" "strconv" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/app/translations.go b/server/app/translations.go index 3e8ab28b8..c6fd17c9b 100644 --- a/server/app/translations.go +++ b/server/app/translations.go @@ -10,12 +10,12 @@ import ( "strings" "sync" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/resources" - "github.com/deluan/navidrome/utils" "github.com/deluan/rest" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/resources" + "github.com/navidrome/navidrome/utils" ) type translation struct { diff --git a/server/app/translations_test.go b/server/app/translations_test.go index aa49cb787..f4513f69b 100644 --- a/server/app/translations_test.go +++ b/server/app/translations_test.go @@ -6,8 +6,8 @@ import ( "net/http" "path/filepath" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/resources" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/resources" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/events/events_suite_test.go b/server/events/events_suite_test.go index 7ee42804f..8487745a6 100644 --- a/server/events/events_suite_test.go +++ b/server/events/events_suite_test.go @@ -3,8 +3,8 @@ package events import ( "testing" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/events/sse.go b/server/events/sse.go index d0b6d3a4e..8ce5a678b 100644 --- a/server/events/sse.go +++ b/server/events/sse.go @@ -9,10 +9,10 @@ import ( "time" "code.cloudfoundry.org/go-diodes" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model/request" "github.com/google/uuid" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model/request" ) type Broker interface { diff --git a/server/initial_setup.go b/server/initial_setup.go index 8b70cfeba..b74dcb786 100644 --- a/server/initial_setup.go +++ b/server/initial_setup.go @@ -6,11 +6,11 @@ import ( "os/exec" "time" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" "github.com/google/uuid" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" ) func initialSetup(ds model.DataStore) { diff --git a/server/middlewares.go b/server/middlewares.go index f4b335f8b..eed711844 100644 --- a/server/middlewares.go +++ b/server/middlewares.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/deluan/navidrome/log" "github.com/go-chi/chi/middleware" + "github.com/navidrome/navidrome/log" "github.com/unrolled/secure" ) diff --git a/server/server.go b/server/server.go index d04744f60..ced732f83 100644 --- a/server/server.go +++ b/server/server.go @@ -4,14 +4,14 @@ import ( "net/http" "path" - "github.com/deluan/navidrome/assets" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" "github.com/go-chi/cors" + "github.com/navidrome/navidrome/assets" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" ) type Handler interface { diff --git a/server/server_suite_test.go b/server/server_suite_test.go index 5786824c0..05bc6e47b 100644 --- a/server/server_suite_test.go +++ b/server/server_suite_test.go @@ -3,8 +3,8 @@ package server import ( "testing" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/subsonic/album_lists.go b/server/subsonic/album_lists.go index 47de92f4b..8085dcb8e 100644 --- a/server/subsonic/album_lists.go +++ b/server/subsonic/album_lists.go @@ -6,12 +6,12 @@ import ( "net/http" "time" - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/server/subsonic/filter" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/server/subsonic/filter" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) type AlbumListController struct { diff --git a/server/subsonic/album_lists_test.go b/server/subsonic/album_lists_test.go index 72c17b01f..41a478aa8 100644 --- a/server/subsonic/album_lists_test.go +++ b/server/subsonic/album_lists_test.go @@ -4,9 +4,9 @@ import ( "context" "net/http/httptest" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/subsonic/api.go b/server/subsonic/api.go index 9fda8e6fd..5eb056cd5 100644 --- a/server/subsonic/api.go +++ b/server/subsonic/api.go @@ -7,15 +7,15 @@ import ( "net/http" "runtime" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/scanner" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/scanner" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) const Version = "1.16.1" diff --git a/server/subsonic/api_suite_test.go b/server/subsonic/api_suite_test.go index aca136f84..1f7d07777 100644 --- a/server/subsonic/api_suite_test.go +++ b/server/subsonic/api_suite_test.go @@ -3,7 +3,7 @@ package subsonic import ( "testing" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/log" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/subsonic/bookmarks.go b/server/subsonic/bookmarks.go index dd7f5d151..0b2dac933 100644 --- a/server/subsonic/bookmarks.go +++ b/server/subsonic/bookmarks.go @@ -4,10 +4,10 @@ import ( "net/http" "time" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) type BookmarksController struct { diff --git a/server/subsonic/browsing.go b/server/subsonic/browsing.go index 4803c8908..66990d815 100644 --- a/server/subsonic/browsing.go +++ b/server/subsonic/browsing.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) type BrowsingController struct { diff --git a/server/subsonic/filter/filters.go b/server/subsonic/filter/filters.go index d3be40b47..c5d3387de 100644 --- a/server/subsonic/filter/filters.go +++ b/server/subsonic/filter/filters.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Masterminds/squirrel" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/model" ) type Options model.QueryOptions diff --git a/server/subsonic/helpers.go b/server/subsonic/helpers.go index 6ce14cf47..030b1c550 100644 --- a/server/subsonic/helpers.go +++ b/server/subsonic/helpers.go @@ -6,11 +6,11 @@ import ( "mime" "net/http" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) func newResponse() *responses.Subsonic { diff --git a/server/subsonic/library_scanning.go b/server/subsonic/library_scanning.go index f3bb4bdbf..58066a702 100644 --- a/server/subsonic/library_scanning.go +++ b/server/subsonic/library_scanning.go @@ -4,12 +4,12 @@ import ( "net/http" "time" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/scanner" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/scanner" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) type LibraryScanningController struct { diff --git a/server/subsonic/media_annotation.go b/server/subsonic/media_annotation.go index aabf55581..370a05d18 100644 --- a/server/subsonic/media_annotation.go +++ b/server/subsonic/media_annotation.go @@ -6,12 +6,12 @@ import ( "net/http" "time" - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) type MediaAnnotationController struct { diff --git a/server/subsonic/media_retrieval.go b/server/subsonic/media_retrieval.go index fa5fa17f1..a2c90e759 100644 --- a/server/subsonic/media_retrieval.go +++ b/server/subsonic/media_retrieval.go @@ -4,15 +4,15 @@ import ( "io" "net/http" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/consts" - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/core/gravatar" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/resources" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/consts" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/core/gravatar" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/resources" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) type MediaRetrievalController struct { diff --git a/server/subsonic/media_retrieval_test.go b/server/subsonic/media_retrieval_test.go index dd643b6d2..dee1c1fe4 100644 --- a/server/subsonic/media_retrieval_test.go +++ b/server/subsonic/media_retrieval_test.go @@ -8,8 +8,8 @@ import ( "io/ioutil" "net/http/httptest" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/subsonic/middlewares.go b/server/subsonic/middlewares.go index 4c02bcb05..f80db9191 100644 --- a/server/subsonic/middlewares.go +++ b/server/subsonic/middlewares.go @@ -10,13 +10,13 @@ import ( "net/url" "strings" - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/core/auth" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/core/auth" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) const ( diff --git a/server/subsonic/middlewares_test.go b/server/subsonic/middlewares_test.go index beb076a2d..3d40d94f7 100644 --- a/server/subsonic/middlewares_test.go +++ b/server/subsonic/middlewares_test.go @@ -7,12 +7,12 @@ import ( "net/http/httptest" "strings" - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/core/auth" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/tests" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/core/auth" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/subsonic/playlists.go b/server/subsonic/playlists.go index 193de7b56..6b304a281 100644 --- a/server/subsonic/playlists.go +++ b/server/subsonic/playlists.go @@ -6,10 +6,10 @@ import ( "fmt" "net/http" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) type PlaylistsController struct { diff --git a/server/subsonic/responses/responses_suite_test.go b/server/subsonic/responses/responses_suite_test.go index dcfb44b19..bf1ff1e45 100644 --- a/server/subsonic/responses/responses_suite_test.go +++ b/server/subsonic/responses/responses_suite_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/bradleyjkemp/cupaloy" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/log" "github.com/onsi/ginkgo" "github.com/onsi/gomega" "github.com/onsi/gomega/types" diff --git a/server/subsonic/responses/responses_test.go b/server/subsonic/responses/responses_test.go index 8fce11a1a..b5c28c971 100644 --- a/server/subsonic/responses/responses_test.go +++ b/server/subsonic/responses/responses_test.go @@ -10,8 +10,8 @@ import ( "encoding/xml" "time" - "github.com/deluan/navidrome/consts" - . "github.com/deluan/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/consts" + . "github.com/navidrome/navidrome/server/subsonic/responses" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/subsonic/searching.go b/server/subsonic/searching.go index 138992e85..a156d7860 100644 --- a/server/subsonic/searching.go +++ b/server/subsonic/searching.go @@ -5,11 +5,11 @@ import ( "net/http" "strings" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" "github.com/kennygrant/sanitize" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) type SearchingController struct { diff --git a/server/subsonic/stream.go b/server/subsonic/stream.go index 33bf12866..462ccee4f 100644 --- a/server/subsonic/stream.go +++ b/server/subsonic/stream.go @@ -8,13 +8,13 @@ import ( "strconv" "strings" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/core" - "github.com/deluan/navidrome/log" - "github.com/deluan/navidrome/model" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/server/subsonic/responses" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/core" + "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/utils" ) type StreamController struct { diff --git a/server/subsonic/system.go b/server/subsonic/system.go index b2f66eb2f..e51a1f785 100644 --- a/server/subsonic/system.go +++ b/server/subsonic/system.go @@ -3,7 +3,7 @@ package subsonic import ( "net/http" - "github.com/deluan/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/server/subsonic/responses" ) type SystemController struct{} diff --git a/server/subsonic/users.go b/server/subsonic/users.go index a7c720df1..a79b71968 100644 --- a/server/subsonic/users.go +++ b/server/subsonic/users.go @@ -3,8 +3,8 @@ package subsonic import ( "net/http" - "github.com/deluan/navidrome/model/request" - "github.com/deluan/navidrome/server/subsonic/responses" + "github.com/navidrome/navidrome/model/request" + "github.com/navidrome/navidrome/server/subsonic/responses" ) type UsersController struct{} diff --git a/server/subsonic/wire_gen.go b/server/subsonic/wire_gen.go index 9fbf8c7c3..0717fbc9a 100644 --- a/server/subsonic/wire_gen.go +++ b/server/subsonic/wire_gen.go @@ -6,8 +6,8 @@ package subsonic import ( - "github.com/deluan/navidrome/core" "github.com/google/wire" + "github.com/navidrome/navidrome/core" ) // Injectors from wire_injectors.go: diff --git a/server/subsonic/wire_injectors.go b/server/subsonic/wire_injectors.go index 99e76d843..0b20f9e32 100644 --- a/server/subsonic/wire_injectors.go +++ b/server/subsonic/wire_injectors.go @@ -3,8 +3,8 @@ package subsonic import ( - "github.com/deluan/navidrome/core" "github.com/google/wire" + "github.com/navidrome/navidrome/core" ) var allProviders = wire.NewSet( diff --git a/tests/init_tests.go b/tests/init_tests.go index 7552ce411..4b18db766 100644 --- a/tests/init_tests.go +++ b/tests/init_tests.go @@ -7,8 +7,8 @@ import ( "sync" "testing" - "github.com/deluan/navidrome/conf" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/conf" + "github.com/navidrome/navidrome/log" ) var once sync.Once diff --git a/tests/mock_album_repo.go b/tests/mock_album_repo.go index 661114463..be050eeb1 100644 --- a/tests/mock_album_repo.go +++ b/tests/mock_album_repo.go @@ -3,7 +3,7 @@ package tests import ( "errors" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/model" ) func CreateMockAlbumRepo() *MockAlbum { diff --git a/tests/mock_artist_repo.go b/tests/mock_artist_repo.go index 0e228fa65..114f0a376 100644 --- a/tests/mock_artist_repo.go +++ b/tests/mock_artist_repo.go @@ -3,7 +3,7 @@ package tests import ( "errors" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/model" ) func CreateMockArtistRepo() *MockArtist { diff --git a/tests/mock_mediafile_repo.go b/tests/mock_mediafile_repo.go index 044332ac3..e90d523ba 100644 --- a/tests/mock_mediafile_repo.go +++ b/tests/mock_mediafile_repo.go @@ -3,7 +3,7 @@ package tests import ( "errors" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/model" ) func CreateMockMediaFileRepo() *MockMediaFile { diff --git a/tests/mock_persistence.go b/tests/mock_persistence.go index 24ee16990..789cdd56d 100644 --- a/tests/mock_persistence.go +++ b/tests/mock_persistence.go @@ -3,7 +3,7 @@ package tests import ( "context" - "github.com/deluan/navidrome/model" + "github.com/navidrome/navidrome/model" ) type MockDataStore struct { diff --git a/tests/mock_transcoding_repo.go b/tests/mock_transcoding_repo.go index f9fdf4aa4..2df2e0905 100644 --- a/tests/mock_transcoding_repo.go +++ b/tests/mock_transcoding_repo.go @@ -1,6 +1,6 @@ package tests -import "github.com/deluan/navidrome/model" +import "github.com/navidrome/navidrome/model" type MockTranscodingRepository struct { model.TranscodingRepository diff --git a/ui/src/dialogs/AboutDialog.js b/ui/src/dialogs/AboutDialog.js index fa2be42c8..e68d7c4b2 100644 --- a/ui/src/dialogs/AboutDialog.js +++ b/ui/src/dialogs/AboutDialog.js @@ -21,8 +21,8 @@ const links = { reddit: 'reddit.com/r/Navidrome', twitter: 'twitter.com/navidrome', discord: 'discord.gg/xh7j7yF', - source: 'github.com/deluan/navidrome', - featureRequests: 'github.com/deluan/navidrome/issues', + source: 'github.com/navidrome/navidrome', + featureRequests: 'github.com/navidrome/navidrome/issues', } const AboutDialog = ({ open, onClose }) => { diff --git a/utils/atomic_test.go b/utils/atomic_test.go index 91ef318ae..cf11ed5cd 100644 --- a/utils/atomic_test.go +++ b/utils/atomic_test.go @@ -1,7 +1,7 @@ package utils_test import ( - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/utils/merge_fs_test.go b/utils/merge_fs_test.go index 2ab34e69f..43edfcfe8 100644 --- a/utils/merge_fs_test.go +++ b/utils/merge_fs_test.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/deluan/navidrome/utils" + "github.com/navidrome/navidrome/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/utils/paths.go b/utils/paths.go index 84a45eb98..ad2443622 100644 --- a/utils/paths.go +++ b/utils/paths.go @@ -3,7 +3,7 @@ package utils import ( "os" - "github.com/deluan/navidrome/log" + "github.com/navidrome/navidrome/log" ) func IsDirReadable(path string) (bool, error) { diff --git a/utils/strings.go b/utils/strings.go index 94a27642b..6f5295cb5 100644 --- a/utils/strings.go +++ b/utils/strings.go @@ -3,7 +3,7 @@ package utils import ( "strings" - "github.com/deluan/navidrome/conf" + "github.com/navidrome/navidrome/conf" ) func NoArticle(name string) string { diff --git a/utils/strings_test.go b/utils/strings_test.go index 17461f4c4..d85283136 100644 --- a/utils/strings_test.go +++ b/utils/strings_test.go @@ -1,7 +1,7 @@ package utils import ( - "github.com/deluan/navidrome/conf" + "github.com/navidrome/navidrome/conf" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" )