mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 04:57:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move project to Navidrome GitHub organization

Browse source
This commit is contained in:
Deluan 2021-02-06 21:46:35 -05:00
parent bc609be3c9
commit 6ee45a9ccc
141 changed files with 406 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.goreleaser.yml
View file

@ -18,7 +18,7 @@ builds:
- -tags=embed,netgo - -tags=embed,netgo
ldflags: ldflags:
- "-extldflags '-static -lz'" - "-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 - id: navidrome_linux_386
env: env:
@ -31,7 +31,7 @@ builds:
- -tags=embed,netgo - -tags=embed,netgo
ldflags: ldflags:
- "-extldflags '-static'" - "-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 - id: navidrome_linux_arm
env: env:
@ -50,7 +50,7 @@ builds:
- -tags=embed,netgo - -tags=embed,netgo
ldflags: ldflags:
- "-extldflags '-static'" - "-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 - id: navidrome_linux_arm64
env: env:
@ -65,7 +65,7 @@ builds:
- -tags=embed,netgo - -tags=embed,netgo
ldflags: ldflags:
- "-extldflags '-static'" - "-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 - id: navidrome_windows_i686
env: env:
@ -81,7 +81,7 @@ builds:
- -tags=embed,netgo - -tags=embed,netgo
ldflags: ldflags:
- "-extldflags '-static'" - "-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 - id: navidrome_windows_x64
env: env:
@ -97,7 +97,7 @@ builds:
- -tags=embed,netgo - -tags=embed,netgo
ldflags: ldflags:
- "-extldflags '-static'" - "-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 - id: navidrome_darwin
env: env:
@ -112,7 +112,7 @@ builds:
flags: flags:
- -tags=embed,netgo - -tags=embed,netgo
ldflags: 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: archives:
- format_overrides: - format_overrides:

6
Makefile
View file

@ -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 target just build the Go project.
default: 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 .PHONY: default
dev: check_env dev: check_env
@ -81,14 +81,14 @@ check_node_env:
.PHONY: check_node_env .PHONY: check_node_env
build: check_go_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 .PHONY: build
buildall: check_env buildall: check_env
@(cd ./ui && npm run build) @(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 "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 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 .PHONY: buildall
pre-push: lint test pre-push: lint test

18
README.md
View file

@ -1,9 +1,9 @@
# Navidrome Music Server # 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) [![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/deluan/navidrome/Build?style=flat-square)](https://github.com/deluan/navidrome/actions) [![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/deluan/navidrome/total?style=flat-square)](https://github.com/deluan/navidrome/releases/latest) [![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/deluan/navidrome?style=flat-square)](https://hub.docker.com/r/deluan/navidrome) [![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) [![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/) [![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) [![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! 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, __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 [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/), ([ui/backend dev](https://www.navidrome.org/docs/developers/),
[translations](https://www.navidrome.org/docs/developers/translations/), [translations](https://www.navidrome.org/docs/developers/translations/),
@ -56,8 +56,8 @@ Here are some useful direct links:
## Screenshots ## Screenshots
<p align="left"> <p align="left">
<img height="550" src="https://raw.githubusercontent.com/deluan/navidrome/master/.github/screenshots/ss-mobile-login.png"> <img height="550" src="https://raw.githubusercontent.com/navidrome/navidrome/master/.github/screenshots/ss-mobile-login.png">
<img height="550" src="https://raw.githubusercontent.com/deluan/navidrome/master/.github/screenshots/ss-mobile-player.png"> <img height="550" src="https://raw.githubusercontent.com/navidrome/navidrome/master/.github/screenshots/ss-mobile-player.png">
<img height="550" src="https://raw.githubusercontent.com/deluan/navidrome/master/.github/screenshots/ss-mobile-album-view.png"> <img height="550" src="https://raw.githubusercontent.com/navidrome/navidrome/master/.github/screenshots/ss-mobile-album-view.png">
<img width="550" src="https://raw.githubusercontent.com/deluan/navidrome/master/.github/screenshots/ss-desktop-player.png"> <img width="550" src="https://raw.githubusercontent.com/navidrome/navidrome/master/.github/screenshots/ss-desktop-player.png">
</p> </p>

2
assets/external.go
View file

@ -6,7 +6,7 @@ import (
"net/http" "net/http"
"sync" "sync"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
) )
var once sync.Once var once sync.Once

8
cmd/root.go
View file

@ -6,10 +6,10 @@ import (
"os" "os"
"time" "time"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/consts" "github.com/navidrome/navidrome/consts"
"github.com/deluan/navidrome/db" "github.com/navidrome/navidrome/db"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/oklog/run" "github.com/oklog/run"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"

4
cmd/scan.go
View file

@ -1,8 +1,8 @@
package cmd package cmd
import ( import (
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"golang.org/x/net/context" "golang.org/x/net/context"
) )

16
cmd/wire_gen.go
View file

@ -6,15 +6,15 @@
package cmd package cmd
import ( 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/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" "sync"
) )

14
cmd/wire_injectors.go
View file

@ -5,14 +5,14 @@ package cmd
import ( import (
"sync" "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/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( var allProviders = wire.NewSet(

4
conf/configuration.go
View file

@ -7,9 +7,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/deluan/navidrome/consts"
"github.com/deluan/navidrome/log"
"github.com/kr/pretty" "github.com/kr/pretty"
"github.com/navidrome/navidrome/consts"
"github.com/navidrome/navidrome/log"
"github.com/spf13/viper" "github.com/spf13/viper"
) )

2
consts/banner.go
View file

@ -5,7 +5,7 @@ import (
"strings" "strings"
"unicode" "unicode"
"github.com/deluan/navidrome/resources" "github.com/navidrome/navidrome/resources"
) )
func getBanner() string { func getBanner() string {

4
core/archiver.go
View file

@ -9,8 +9,8 @@ import (
"path/filepath" "path/filepath"
"github.com/Masterminds/squirrel" "github.com/Masterminds/squirrel"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
) )
type Archiver interface { type Archiver interface {

17
core/artwork.go
View file

@ -16,17 +16,16 @@ import (
"sync" "sync"
"time" "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/dhowden/tag"
"github.com/disintegration/imaging" "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 { type Artwork interface {

8
core/artwork_test.go
View file

@ -5,10 +5,10 @@ import (
"image" "image"
"io/ioutil" "io/ioutil"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

8
core/auth/auth.go
View file

@ -6,12 +6,12 @@ import (
"sync" "sync"
"time" "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/dgrijalva/jwt-go"
"github.com/go-chi/jwtauth" "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 ( var (

4
core/auth/auth_test.go
View file

@ -4,9 +4,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/deluan/navidrome/core/auth"
"github.com/deluan/navidrome/log"
"github.com/dgrijalva/jwt-go" "github.com/dgrijalva/jwt-go"
"github.com/navidrome/navidrome/core/auth"
"github.com/navidrome/navidrome/log"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

4
core/cache/cache_suite_test.go vendored
View file

@ -3,8 +3,8 @@ package cache
import ( import (
"testing" "testing"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

6
core/cache/file_caches.go vendored
View file

@ -8,11 +8,11 @@ import (
"sync" "sync"
"time" "time"
"github.com/deluan/navidrome/conf"
"github.com/deluan/navidrome/consts"
"github.com/deluan/navidrome/log"
"github.com/djherbis/fscache" "github.com/djherbis/fscache"
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"
"github.com/navidrome/navidrome/conf"
"github.com/navidrome/navidrome/consts"
"github.com/navidrome/navidrome/log"
) )
type Item interface { type Item interface {

2
core/cache/file_caches_test.go vendored
View file

@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

6
core/cache_warmer.go
View file

@ -6,9 +6,9 @@ import (
"io/ioutil" "io/ioutil"
"time" "time"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/core/pool" "github.com/navidrome/navidrome/core/pool"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
) )
type CacheWarmer interface { type CacheWarmer interface {

2
core/common.go
View file

@ -3,7 +3,7 @@ package core
import ( import (
"context" "context"
"github.com/deluan/navidrome/model/request" "github.com/navidrome/navidrome/model/request"
) )
func userName(ctx context.Context) string { func userName(ctx context.Context) string {

4
core/core_suite_test.go
View file

@ -3,8 +3,8 @@ package core
import ( import (
"testing" "testing"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

10
core/external_info.go
View file

@ -9,12 +9,12 @@ import (
"time" "time"
"github.com/Masterminds/squirrel" "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/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" "github.com/xrash/smetrics"
) )

2
core/get_entity.go
View file

@ -3,7 +3,7 @@ package core
import ( import (
"context" "context"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
) )
// TODO: Should the type be encoded in the ID? // TODO: Should the type be encoded in the ID?

2
core/gravatar/gravatar.go
View file

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/deluan/navidrome/utils" "github.com/navidrome/navidrome/utils"
) )
const baseUrl = "https://www.gravatar.com/avatar" const baseUrl = "https://www.gravatar.com/avatar"

6
core/gravatar/gravatar_test.go
View file

@ -3,9 +3,9 @@ package gravatar_test
import ( import (
"testing" "testing"
"github.com/deluan/navidrome/core/gravatar" "github.com/navidrome/navidrome/core/gravatar"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

4
core/lastfm/lastfm_suite_test.go
View file

@ -3,8 +3,8 @@ package lastfm
import ( import (
"testing" "testing"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

14
core/media_streamer.go
View file

@ -9,13 +9,13 @@ import (
"sync" "sync"
"time" "time"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/consts" "github.com/navidrome/navidrome/consts"
"github.com/deluan/navidrome/core/cache" "github.com/navidrome/navidrome/core/cache"
"github.com/deluan/navidrome/core/transcoder" "github.com/navidrome/navidrome/core/transcoder"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/model/request" "github.com/navidrome/navidrome/model/request"
) )
type MediaStreamer interface { type MediaStreamer interface {

10
core/media_streamer_test.go
View file

@ -6,11 +6,11 @@ import (
"io/ioutil" "io/ioutil"
"strings" "strings"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/model/request" "github.com/navidrome/navidrome/model/request"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

6
core/players.go
View file

@ -5,10 +5,10 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/deluan/navidrome/log"
"github.com/deluan/navidrome/model"
"github.com/deluan/navidrome/model/request"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/model/request"
) )
type Players interface { type Players interface {

8
core/players_test.go
View file

@ -4,10 +4,10 @@ import (
"context" "context"
"time" "time"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/model/request" "github.com/navidrome/navidrome/model/request"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

2
core/pool/pool.go
View file

@ -3,7 +3,7 @@ package pool
import ( import (
"time" "time"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
) )
type Executor func(workload interface{}) type Executor func(workload interface{})

4
core/pool/pool_test.go
View file

@ -3,8 +3,8 @@ package pool
import ( import (
"testing" "testing"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

2
core/spotify/client.go
View file

@ -12,7 +12,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
) )
const apiBaseUrl = "https://api.spotify.com/v1/" const apiBaseUrl = "https://api.spotify.com/v1/"

4
core/spotify/spotify_suite_test.go
View file

@ -3,8 +3,8 @@ package spotify
import ( import (
"testing" "testing"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

2
core/transcoder/ffmpeg.go
View file

@ -8,7 +8,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
) )
type Transcoder interface { type Transcoder interface {

4
core/transcoder/ffmpeg_test.go
View file

@ -3,8 +3,8 @@ package transcoder
import ( import (
"testing" "testing"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

8
core/wire_providers.go
View file

@ -3,11 +3,11 @@ package core
import ( import (
"net/http" "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/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( var Set = wire.NewSet(

6
db/db.go
View file

@ -5,10 +5,10 @@ import (
"os" "os"
"sync" "sync"
"github.com/deluan/navidrome/conf"
_ "github.com/deluan/navidrome/db/migration"
"github.com/deluan/navidrome/log"
_ "github.com/mattn/go-sqlite3" _ "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" "github.com/pressly/goose"
) )

2
db/migration/20200130083147_create_schema.go
View file

@ -3,7 +3,7 @@ package migration
import ( import (
"database/sql" "database/sql"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/pressly/goose" "github.com/pressly/goose"
) )

2
db/migration/20200516140647_add_playlist_tracks_table.go
View file

@ -4,7 +4,7 @@ import (
"database/sql" "database/sql"
"strings" "strings"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/pressly/goose" "github.com/pressly/goose"
) )

2
db/migration/20200706231659_add_default_transcodings.go
View file

@ -3,8 +3,8 @@ package migration
import ( import (
"database/sql" "database/sql"
"github.com/deluan/navidrome/consts"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/navidrome/navidrome/consts"
"github.com/pressly/goose" "github.com/pressly/goose"
) )

4
db/migration/20201213124814_add_all_artist_ids_to_album.go
View file

@ -3,8 +3,8 @@ package migration
import ( import (
"database/sql" "database/sql"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/utils" "github.com/navidrome/navidrome/utils"
"github.com/pressly/goose" "github.com/pressly/goose"
) )

2
db/migration/migration.go
View file

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"sync" "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...) // Use this in migrations that need to communicate something important (braking changes, forced reindexes, etc...)

2
go.mod
View file

@ -1,4 +1,4 @@
module github.com/deluan/navidrome module github.com/navidrome/navidrome
go 1.15 go 1.15

2
main.go
View file

@ -3,7 +3,7 @@ package main
import ( import (
"runtime" "runtime"
"github.com/deluan/navidrome/cmd" "github.com/navidrome/navidrome/cmd"
) )
func main() { func main() {

2
model/request/request.go
View file

@ -3,7 +3,7 @@ package request
import ( import (
"context" "context"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
) )
type contextKey string type contextKey string

10
persistence/album_repository.go
View file

@ -12,12 +12,12 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "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/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 { type albumRepository struct {

8
persistence/album_repository_test.go
View file

@ -7,10 +7,10 @@ import (
"path/filepath" "path/filepath"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/model/request" "github.com/navidrome/navidrome/model/request"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

8
persistence/artist_repository.go
View file

@ -9,11 +9,11 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "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/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 { type artistRepository struct {

6
persistence/artist_repository_test.go
View file

@ -4,9 +4,9 @@ import (
"context" "context"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/model/request" "github.com/navidrome/navidrome/model/request"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
. "github.com/onsi/gomega/gstruct" . "github.com/onsi/gomega/gstruct"

2
persistence/genre_repository.go
View file

@ -5,7 +5,7 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
) )
type genreRepository struct { type genreRepository struct {

6
persistence/genre_repository_test.go
View file

@ -4,9 +4,9 @@ import (
"context" "context"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/persistence" "github.com/navidrome/navidrome/persistence"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

8
persistence/helpers.go
View file

@ -8,10 +8,10 @@ import (
"strings" "strings"
"github.com/Masterminds/squirrel" "github.com/Masterminds/squirrel"
"github.com/deluan/navidrome/consts" "github.com/navidrome/navidrome/consts"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/utils" "github.com/navidrome/navidrome/utils"
) )
func toSqlArgs(rec interface{}) (map[string]interface{}, error) { func toSqlArgs(rec interface{}) (map[string]interface{}, error) {

4
persistence/mediafile_repository.go
View file

@ -10,9 +10,9 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/log"
"github.com/deluan/navidrome/model"
"github.com/deluan/rest" "github.com/deluan/rest"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
) )
type mediaFileRepository struct { type mediaFileRepository struct {

6
persistence/mediafile_repository_test.go
View file

@ -5,10 +5,10 @@ import (
"time" "time"
"github.com/astaxie/beego/orm" "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/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/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

4
persistence/mediafolders_repository.go
View file

@ -4,8 +4,8 @@ import (
"context" "context"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
) )
type mediaFolderRepository struct { type mediaFolderRepository struct {

6
persistence/persistence.go
View file

@ -5,9 +5,9 @@ import (
"reflect" "reflect"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/db" "github.com/navidrome/navidrome/db"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
) )
type SQLStore struct { type SQLStore struct {

12
persistence/persistence_suite_test.go
View file

@ -6,13 +6,13 @@ import (
"testing" "testing"
"github.com/astaxie/beego/orm" "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/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/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

2
persistence/player_repository.go
View file

@ -5,8 +5,8 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/model"
"github.com/deluan/rest" "github.com/deluan/rest"
"github.com/navidrome/navidrome/model"
) )
type playerRepository struct { type playerRepository struct {

4
persistence/playlist_repository.go
View file

@ -6,9 +6,9 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/log"
"github.com/deluan/navidrome/model"
"github.com/deluan/rest" "github.com/deluan/rest"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
) )
type playlistRepository struct { type playlistRepository struct {

6
persistence/playlist_repository_test.go
View file

@ -4,9 +4,9 @@ import (
"context" "context"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/model/request" "github.com/navidrome/navidrome/model/request"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

6
persistence/playlist_track_repository.go
View file

@ -4,10 +4,10 @@ import (
"time" "time"
. "github.com/Masterminds/squirrel" . "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/deluan/rest"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/utils"
) )
type playlistTrackRepository struct { type playlistTrackRepository struct {

6
persistence/playqueue_repository.go
View file

@ -7,9 +7,9 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/utils" "github.com/navidrome/navidrome/utils"
) )
type playQueueRepository struct { type playQueueRepository struct {

6
persistence/playqueue_repository_test.go
View file

@ -6,10 +6,10 @@ import (
"github.com/Masterminds/squirrel" "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "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/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/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

2
persistence/property_repository.go
View file

@ -5,7 +5,7 @@ import (
"github.com/Masterminds/squirrel" "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
) )
type propertyRepository struct { type propertyRepository struct {

4
persistence/property_repository_test.go
View file

@ -4,8 +4,8 @@ import (
"context" "context"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

4
persistence/sql_annotations.go
View file

@ -5,9 +5,9 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/log"
"github.com/deluan/navidrome/model"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
) )
const annotationTable = "annotation" const annotationTable = "annotation"

6
persistence/sql_base_repository.go
View file

@ -8,10 +8,10 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "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/google/uuid"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/model/request"
) )
type sqlRepository struct { type sqlRepository struct {

2
persistence/sql_base_repository_test.go
View file

@ -2,7 +2,7 @@ package persistence
import ( import (
"github.com/Masterminds/squirrel" "github.com/Masterminds/squirrel"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

6
persistence/sql_bookmarks.go
View file

@ -5,9 +5,9 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/model/request" "github.com/navidrome/navidrome/model/request"
) )
const bookmarkTable = "bookmark" const bookmarkTable = "bookmark"

6
persistence/sql_bookmarks_test.go
View file

@ -4,9 +4,9 @@ import (
"context" "context"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/model/request" "github.com/navidrome/navidrome/model/request"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

2
persistence/sql_restful.go
View file

@ -5,8 +5,8 @@ import (
"strings" "strings"
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/deluan/navidrome/model"
"github.com/deluan/rest" "github.com/deluan/rest"
"github.com/navidrome/navidrome/model"
) )
type filterFunc = func(field string, value interface{}) Sqlizer type filterFunc = func(field string, value interface{}) Sqlizer

4
persistence/sql_search.go
View file

@ -4,8 +4,8 @@ import (
"strings" "strings"
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/utils" "github.com/navidrome/navidrome/utils"
) )
func getFullText(text ...string) string { func getFullText(text ...string) string {

2
persistence/transcoding_repository.go
View file

@ -5,8 +5,8 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/model"
"github.com/deluan/rest" "github.com/deluan/rest"
"github.com/navidrome/navidrome/model"
) )
type transcodingRepository struct { type transcodingRepository struct {

2
persistence/user_repository.go
View file

@ -6,9 +6,9 @@ import (
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/model"
"github.com/deluan/rest" "github.com/deluan/rest"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/navidrome/navidrome/model"
) )
type userRepository struct { type userRepository struct {

4
persistence/user_repository_test.go
View file

@ -4,8 +4,8 @@ import (
"context" "context"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

2
resources/external.go
View file

@ -7,7 +7,7 @@ import (
"net/http" "net/http"
"sync" "sync"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
) )
var once sync.Once var once sync.Once

8
scanner/mapping.go
View file

@ -7,12 +7,12 @@ import (
"path/filepath" "path/filepath"
"strings" "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/kennygrant/sanitize"
"github.com/microcosm-cc/bluemonday" "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 { type mediaFileMapper struct {

2
scanner/mapping_test.go
View file

@ -1,7 +1,7 @@
package scanner package scanner
import ( import (
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

4
scanner/metadata/ffmpeg.go
View file

@ -8,8 +8,8 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
) )
type ffmpegMetadata struct { type ffmpegMetadata struct {

4
scanner/metadata/metadata.go
View file

@ -9,9 +9,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/deluan/navidrome/conf"
"github.com/deluan/navidrome/log"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/navidrome/navidrome/conf"
"github.com/navidrome/navidrome/log"
) )
type Extractor interface { type Extractor interface {

4
scanner/metadata/metadata_suite_test.go
View file

@ -3,8 +3,8 @@ package metadata
import ( import (
"testing" "testing"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

4
scanner/metadata/taglib.go
View file

@ -4,9 +4,9 @@ import (
"errors" "errors"
"os" "os"
"github.com/deluan/navidrome/log"
"github.com/deluan/navidrome/scanner/metadata/taglib"
"github.com/dhowden/tag" "github.com/dhowden/tag"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/scanner/metadata/taglib"
) )
type taglibMetadata struct { type taglibMetadata struct {

2
scanner/metadata/taglib/taglib_parser.go
View file

@ -17,7 +17,7 @@ import (
"sync" "sync"
"unsafe" "unsafe"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
) )
func Read(filename string) (map[string]string, error) { func Read(filename string) (map[string]string, error) {

8
scanner/playlist_sync.go
View file

@ -10,10 +10,10 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/model/request" "github.com/navidrome/navidrome/model/request"
"github.com/deluan/navidrome/utils" "github.com/navidrome/navidrome/utils"
) )
type playlistSync struct { type playlistSync struct {

4
scanner/playlist_sync_test.go
View file

@ -3,8 +3,8 @@ package scanner
import ( import (
"context" "context"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

4
scanner/refresh_buffer.go
View file

@ -4,8 +4,8 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
) )
type refreshBuffer struct { type refreshBuffer struct {

10
scanner/scanner.go
View file

@ -8,11 +8,11 @@ import (
"sync" "sync"
"time" "time"
"github.com/deluan/navidrome/core" "github.com/navidrome/navidrome/core"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/server/events" "github.com/navidrome/navidrome/server/events"
"github.com/deluan/navidrome/utils" "github.com/navidrome/navidrome/utils"
) )
type Scanner interface { type Scanner interface {

4
scanner/scanner_suite_test.go
View file

@ -3,8 +3,8 @@ package scanner
import ( import (
"testing" "testing"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

14
scanner/tag_scanner.go
View file

@ -8,13 +8,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/core" "github.com/navidrome/navidrome/core"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/model/request" "github.com/navidrome/navidrome/model/request"
"github.com/deluan/navidrome/scanner/metadata" "github.com/navidrome/navidrome/scanner/metadata"
"github.com/deluan/navidrome/utils" "github.com/navidrome/navidrome/utils"
) )
type TagScanner struct { type TagScanner struct {

6
scanner/walk_dir_tree.go
View file

@ -8,9 +8,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/deluan/navidrome/consts" "github.com/navidrome/navidrome/consts"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/utils" "github.com/navidrome/navidrome/utils"
) )
type ( type (

12
server/app/app.go
View file

@ -6,16 +6,16 @@ import (
"net/url" "net/url"
"strings" "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/deluan/rest"
"github.com/go-chi/chi" "github.com/go-chi/chi"
"github.com/go-chi/httprate" "github.com/go-chi/httprate"
"github.com/go-chi/jwtauth" "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 { type Router struct {

4
server/app/app_suite_test.go
View file

@ -3,8 +3,8 @@ package app
import ( import (
"testing" "testing"
"github.com/deluan/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

14
server/app/auth.go
View file

@ -8,17 +8,17 @@ import (
"strings" "strings"
"time" "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/deluan/rest"
"github.com/dgrijalva/jwt-go" "github.com/dgrijalva/jwt-go"
"github.com/go-chi/jwtauth" "github.com/go-chi/jwtauth"
"github.com/google/uuid" "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 ( var (

2
server/app/auth_test.go
View file

@ -4,7 +4,7 @@ import (
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"github.com/deluan/navidrome/consts" "github.com/navidrome/navidrome/consts"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

6
server/app/playlists.go
View file

@ -9,11 +9,11 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/deluan/navidrome/log"
"github.com/deluan/navidrome/model"
"github.com/deluan/navidrome/utils"
"github.com/deluan/rest" "github.com/deluan/rest"
"github.com/go-chi/chi" "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 { func getPlaylist(ds model.DataStore) http.HandlerFunc {

8
server/app/serve_index.go
View file

@ -7,11 +7,11 @@ import (
"net/http" "net/http"
"strings" "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/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 // Injects the config in the `index.html` template

8
server/app/serve_index_test.go
View file

@ -8,10 +8,10 @@ import (
"regexp" "regexp"
"strconv" "strconv"
"github.com/deluan/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/deluan/navidrome/consts" "github.com/navidrome/navidrome/consts"
"github.com/deluan/navidrome/model" "github.com/navidrome/navidrome/model"
"github.com/deluan/navidrome/tests" "github.com/navidrome/navidrome/tests"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

10
server/app/translations.go
View file

@ -10,12 +10,12 @@ import (
"strings" "strings"
"sync" "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/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 { type translation struct {

4
server/app/translations_test.go
View file

@ -6,8 +6,8 @@ import (
"net/http" "net/http"
"path/filepath" "path/filepath"
"github.com/deluan/navidrome/consts" "github.com/navidrome/navidrome/consts"
"github.com/deluan/navidrome/resources" "github.com/navidrome/navidrome/resources"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )

Some files were not shown because too many files have changed in this diff Show more