Refactor included handling

Based on Aura and JSONAPI

.devcontainer/devcontainer.json

@@ -4,10 +4,10 @@
 		"dockerfile": "Dockerfile",
 		"args": {
 			// Update the VARIANT arg to pick a version of Go: 1, 1.15, 1.14
-			"VARIANT": "1.19",
+			"VARIANT": "1.20",
 			// Options
 			"INSTALL_NODE": "true",
-			"NODE_VERSION": "v16"
+			"NODE_VERSION": "v18"
 		}
 	},
 	"workspaceMount": "",

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,37 +0,0 @@
----
-name: Bug Report
-about: Use this template for submitting a bug report.
-title: ""
-labels: bug
-assignees: ""
----
-<!-- Please check that another issue for the same bug has not been already made by searching the [issues](https://github.com/navidrome/navidrome/issues) -->
-
-### Description
-
-A clear and concise description of what the bug is.
-
-### Expected Behaviour
-
-What you would have expected to happen instead.
-
-### Steps to reproduce
-
-1. Open the '...'
-2. Click on '...'
-3. Scroll down to '...'
-4. See error
-
-### Platform information
-
- - Navidrome version: <!-- e.g. v0.40.0 -->
- - Browser and version: <!-- e.g. Firefox v87.0b9 -->
- - Operating System: <!-- e.g. Ubuntu 20.04 and whether using a binary, docker or built from source  -->
-
-### Additional information
-
-Any other information that may be relevant or give context to the problem.
-
- - Screenshots (if applicable)?
- - Logs? <!-- Turn the log level up to trace -->
- - Client used? <!-- e.g. DSub v5.5.2R2 -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,103 @@
+name: Bug Report
+description: Before opening a new issue, please search to see if an issue already exists for the bug you encountered.
+title: "[Bug]: "
+labels: ["bug", "triage"]
+#assignees:
+#  - deluan
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ### Thanks for taking the time to fill out this bug report!
+  - type: checkboxes
+    id: requirements
+    attributes:
+      label: "I confirm that:"
+      options:
+        - label: I have searched the existing [open AND closed issues](https://github.com/navidrome/navidrome/issues?q=is%3Aissue) to see if an issue already exists for the bug I've encountered
+          required: true
+        - label: I'm using the latest version (your issue may have been fixed already)
+          required: false
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of Navidrome are you running? (please try upgrading first, as your issue may have been fixed already).
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: A concise description of what you're experiencing.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this scenario...
+        2. With this config...
+        3. Click (or Execute) '...'
+        4. See error...
+    validations:
+      required: false
+  - type: textarea
+    id: env
+    attributes:
+      label: Environment
+      description: |
+        examples:
+          - **OS**: Ubuntu 20.04
+          - **Browser**: Chrome 110.0.5481.177 on Windows 11
+          - **Client**: DSub 5.5.1
+      value: |
+        - OS:
+        - Browser:
+        - Client:
+      render: markdown
+  - type: dropdown
+    id: distribution
+    attributes:
+      label: How Navidrome is installed?
+      multiple: false
+      options:
+        - Docker
+        - Binary (from downloads page)
+        - Package
+        - Built from sources
+    validations:
+      required: true
+  - type: textarea
+    id: config
+    attributes:
+      label: Configuration
+      description: Please copy and paste your `navidrome.toml` (and/or `docker-compose.yml`) configuration. This will be automatically formatted into code, so no need for backticks.
+      render: toml
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output (change your `LogLevel` (`ND_LOGLEVEL`) to debug). This will be automatically formatted into code, so no need for backticks. ([Where I can find the logs?](https://www.navidrome.org/docs/faq/#where-are-the-logs))
+      render: shell
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach screenshots by clicking this area to highlight it and then dragging files in.
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/navidrome/navidrome/blob/master/CODE_OF_CONDUCT.md).
+      options:
+        - label: I agree to follow Navidrome's Code of Conduct
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Ideas for new features
+    url: https://github.com/navidrome/navidrome/discussions/categories/ideas
+    about: This is the place to share and discuss new ideas and potentially new features.
+  - name: Support requests
+    url: https://github.com/navidrome/navidrome/discussions/categories/q-a
+    about: This is the place to ask questions.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,24 +0,0 @@
----
-name: Feature Request
-about: Use this template to request for a feature.
-title: ""
-labels: enhancement
-assignees: ""
----
-<!-- Please check that another issue for the same feature request has not been already made by searching the [issues](https://github.com/navidrome/navidrome/issues) -->
-
-### Is your feature request related to a problem? Please describe.
-
-A clear and concise description of what the problem is. For e.g. I'm always frustrated when '...'
-
-### Describe the solution you'd like
-
-A clear and concise description of what you would like to happen.
-
-### Describe alternative solutions that would also satisfy this problem
-
-A clear and concise description of any alternative solutions or features you've considered.
-
-### Additional context
-
-Add any other context or screenshots about the feature request here.

.github/workflows/docker-tags.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-GIT_TAG="${GITHUB_REF##refs/tags/}"
-GIT_BRANCH="${GITHUB_REF##refs/heads/}"
-GIT_SHA=$(git rev-parse --short HEAD)
-PR_NUM=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")
-
-DOCKER_IMAGE_TAG="--tag ${DOCKER_IMAGE}:sha-${GIT_SHA}"
-
-if [[ $PR_NUM != "null" ]]; then
-  DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG} --tag ${DOCKER_IMAGE}:pr-${PR_NUM}"
-fi
-
-if [[ $GITHUB_REF != "$GIT_TAG" ]]; then
-    DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG} --tag ${DOCKER_IMAGE}:${GIT_TAG#v}  --tag ${DOCKER_IMAGE}:latest"
-elif [[ $GITHUB_REF == "refs/heads/master" ]]; then
-    DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG} --tag ${DOCKER_IMAGE}:develop"
-elif [[ $GIT_BRANCH = feature/* ]]; then
-    DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG} --tag ${DOCKER_IMAGE}:$(echo $GIT_BRANCH | tr / -)"
-fi
-
-echo ${DOCKER_IMAGE_TAG}

.github/workflows/download-link-on-pr.yml

@@ -1,7 +1,7 @@
 name: Add download link to PR
 on:
   workflow_run:
-    workflows: ['Pipeline']
+    workflows: ['Pipeline: Test, Lint, Build']
     types: [completed]
 jobs:
   pr_comment:

.github/workflows/pipeline.yml

@@ -1,4 +1,4 @@
-name: Pipeline
+name: 'Pipeline: Test, Lint, Build'
 on:
   push:
     branches:
@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
       - master
+
 jobs:
   go-lint:
     name: Lint Go code
@@ -16,10 +17,10 @@ jobs:
       - name: Install taglib
         run: sudo apt-get install libtag1-dev
 
-      - name: Set up Go 1.19
+      - name: Set up Go 1.20
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20.x
 
       - uses: actions/checkout@v3
 
@@ -39,10 +40,32 @@ jobs:
         run: |
           git status --porcelain
           if [ -n "$(git status --porcelain)" ]; then
-            echo "To fix this check, run: goimports -w $(find . -name '*.go' | grep -v '_gen.go$') && go mod tidy"
+            echo 'To fix this check, run "goimports -w $(find . -name '*.go' | grep -v '_gen.go$') && go mod tidy"'
             exit 1
           fi
 
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+
+      - name: Build and Lint OpenAPI spec
+        run: make lintapi gen
+
+      - name: Verify no changes
+        run: |
+          git status --porcelain
+          if [ -n "$(git status --porcelain)" ]; then
+            echo 'Changes to OpenAPI spec caused changes to the code. Please review and commit the changes.'
+            exit 1
+          fi
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: openapi.yaml
+          path: api/openapi.yaml
+
   go:
     name: Test with Go ${{ matrix.go_version }}
     runs-on: ubuntu-latest
@@ -69,7 +92,7 @@ jobs:
 
       - name: Test
         continue-on-error: ${{contains(matrix.go_version, 'beta') || contains(matrix.go_version, 'rc')}}
-        run: go test -race -cover ./... -v
+        run: go test -shuffle=on -race -cover ./... -v
 
   js:
     name: Build JS bundle
@@ -80,7 +103,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
@@ -108,7 +131,6 @@ jobs:
         with:
           name: js-bundle
           path: ui/build
-          retention-days: 7
 
   binaries:
     name: Build binaries
@@ -126,7 +148,7 @@ jobs:
           path: ui/build
 
       - name: Config /github/workspace folder as trusted
-        uses: docker://deluan/ci-goreleaser:1.19.5-1
+        uses: docker://deluan/ci-goreleaser:1.20.3-1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -134,7 +156,7 @@ jobs:
 
       - name: Run GoReleaser - SNAPSHOT
         if: startsWith(github.ref, 'refs/tags/') != true
-        uses: docker://deluan/ci-goreleaser:1.19.5-1
+        uses: docker://deluan/ci-goreleaser:1.20.3-1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -142,7 +164,7 @@ jobs:
 
       - name: Run GoReleaser - RELEASE
         if: startsWith(github.ref, 'refs/tags/')
-        uses: docker://deluan/ci-goreleaser:1.19.5-1
+        uses: docker://deluan/ci-goreleaser:1.20.3-1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -155,10 +177,9 @@ jobs:
             dist
             !dist/*.tar.gz
             !dist/*.zip
-          retention-days: 7
 
   docker:
-    name: Build Docker images
+    name: Build and publish Docker images
     needs: [binaries]
     runs-on: ubuntu-latest
     env:
@@ -183,11 +204,42 @@ jobs:
           name: binaries
           path: dist
 
-      - name: Build the Docker image and push
+      - name: Login to Docker Hub
         if: env.DOCKER_IMAGE != ''
-        env:
-          DOCKER_IMAGE: ${{secrets.DOCKER_IMAGE}}
-          DOCKER_PLATFORM: linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64
-        run: |
-          echo ${{secrets.DOCKER_PASSWORD}} | docker login -u ${{secrets.DOCKER_USERNAME}} --password-stdin
-          docker buildx build --platform ${DOCKER_PLATFORM} `.github/workflows/docker-tags.sh` -f .github/workflows/pipeline.dockerfile --push .
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        if: env.DOCKER_IMAGE != ''
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        if: env.DOCKER_IMAGE != ''
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          labels: |
+            maintainer=deluan
+          images: |
+            name=${{secrets.DOCKER_IMAGE}},enable=${{env.GITHUB_REF_TYPE == 'tag' || github.ref == format('refs/heads/{0}', 'master')}}
+            name=ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=raw,value=develop,enable={{is_default_branch}}
+
+      - name: Build and Push
+        if: env.DOCKER_IMAGE != ''
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: .github/workflows/pipeline.dockerfile
+          platforms: linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/stale.yml

@@ -0,0 +1,55 @@
+name: 'Close stale issues and PRs'
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '30 1 * * *'
+permissions:
+  contents: read
+jobs:
+  stale:
+    permissions:
+      issues: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v4.0.0
+        with:
+          issue-inactive-days: 120
+          pr-inactive-days: 120
+          log-output: true
+          add-issue-labels: 'frozen-due-to-age'
+          add-pr-labels: 'frozen-due-to-age'
+          issue-comment: >
+            This issue has been automatically locked since there
+            has not been any recent activity after it was closed.
+            Please open a new issue for related bugs.
+          pr-comment: >
+            This pull request has been automatically locked since there
+            has not been any recent activity after it was closed.
+            Please open a new issue for related bugs.
+      - uses: actions/stale@v7
+        with:
+          operations-per-run: 999
+          days-before-issue-stale: 180
+          days-before-pr-stale: 180
+          days-before-issue-close: 30
+          days-before-pr-close: 30
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. The resources of the Navidrome team are limited, and so we are asking for your help.
+
+            If this is a **bug** and you can still reproduce this error on the <code>master</code> branch, please reply with all of the information you have about it in order to keep the issue open.
+
+            If this is a **feature request**, and you feel that it is still relevant and valuable, please tell us why.
+
+            This issue will automatically be closed in the near future if no further activity occurs. Thank you for all your contributions.
+          stale-pr-message: This PR has been automatically marked as stale because it has not had
+            recent activity. The resources of the Navidrome team are limited, and so we are asking for your help.
+
+            Please check https://github.com/navidrome/navidrome/blob/master/CONTRIBUTING.md#pull-requests and verify that this code contribution fits with the description. If yes, tell it in a comment.
+
+            This PR will automatically be closed in the near future if no further activity occurs. Thank you for all your contributions.
+          stale-issue-label: 'stale'
+          exempt-issue-labels: 'keep,security'
+          stale-pr-label: 'stale'
+          exempt-pr-labels: 'keep,security'

.github/workflows/update-translations.yml

@@ -1,4 +1,4 @@
-name: Update Translations
+name: POEditor import
 on:
   workflow_dispatch:
   schedule:
@@ -6,6 +6,7 @@ on:
 jobs:
   update-translations:
     runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'navidrome' }}
     steps:
       - uses: actions/checkout@v3
       - name: Get updated translations
@@ -14,6 +15,10 @@ jobs:
           POEDITOR_APIKEY: ${{ secrets.POEDITOR_APIKEY }}
         run: |
           ./update-translations.sh
+      - name: Show changes, if any
+        run: |
+          git status --porcelain
+          git diff
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4
         with:

.gitignore

@@ -14,12 +14,15 @@ navidrome.toml
 master.zip
 testDB
 navidrome.db
+cache/*
 *.swp
 embedded_gen.go
 dist
 music
-docker-compose.yml
 navidrome.db-shm
 navidrome.db-wal
 tags
 .gitinfo
+docker-compose.yml
+!contrib/docker-compose.yml
+/api/openapi.yaml

.golangci.yml

@@ -7,7 +7,6 @@ linters:
     - asciicheck
     - bidichk
     - bodyclose
-    - depguard
     - dogsled
     - durationcheck
     - errcheck

.nvmrc

@@ -1 +1 @@
-v16
+v18

CONTRIBUTING.md

@@ -2,12 +2,15 @@
 
 Navidrome is a streaming service which allows you to enjoy your music collection from anywhere. We'd welcome you to contribute to our open source project and make Navidrome even better. There are some basic guidelines which you need to follow if you like to contribute to Navidrome.
 
+- [Asking Support Questions](#asking-support-questions)
 - [Code of Conduct](#code-of-conduct)
 - [Issues](#issues)
-- [Questions](#questions)
 - [Pull Requests](#pull-requests)
 
 
+## Asking Support Questions
+We have an active [discussion forum](https://github.com/navidrome/navidrome/discussions) where users and developers can ask questions. Please don't use the GitHub issue tracker to ask questions.
+
 ## Code of Conduct
 Please read the following [Code of Conduct](https://github.com/navidrome/navidrome/blob/master/CODE_OF_CONDUCT.md).
 
@@ -19,9 +22,6 @@ to the GitHub repository.
 **Before opening a new issue, please check if the issue has not been already made by searching 
 the [issues](https://github.com/navidrome/navidrome/issues)**
 
-## Questions
-We would like to have discussions and general queries related to Navidrome on our [Discord channel](https://discord.gg/2qMuMyHfSV).
-
 ## Pull requests
 Before submitting a pull request, ensure that you go through the following:
 - Open a corresponding issue for the Pull Request, if not existing. The issue can be opened following [these guidelines](#issues)

Makefile

@@ -9,7 +9,7 @@ GIT_SHA=source_archive
 GIT_TAG=$(patsubst navidrome-%,v%,$(notdir $(PWD)))
 endif
 
-CI_RELEASER_VERSION=1.19.5-1 ## https://github.com/navidrome/ci-goreleaser
+CI_RELEASER_VERSION=1.20.3-1 ## https://github.com/navidrome/ci-goreleaser
 
 setup: check_env download-deps setup-git ##@1_Run_First Install dependencies and prepare development environment
 	@echo Downloading Node dependencies...
@@ -21,40 +21,59 @@ dev: check_env   ##@Development Start Navidrome in development mode, with hot-re
 .PHONY: dev
 
 server: check_go_env  ##@Development Start the backend in development mode
-	@go run github.com/cespare/reflex -d none -c reflex.conf
+	@go run github.com/cespare/reflex@latest -d none -c reflex.conf
 .PHONY: server
 
 watch: ##@Development Start Go tests in watch mode (re-run when code changes)
-	go run github.com/onsi/ginkgo/v2/ginkgo watch -notify ./...
+	go run github.com/onsi/ginkgo/v2/ginkgo@latest watch -notify ./...
 .PHONY: watch
 
 test: ##@Development Run Go tests
-	go test -race ./...
+	go test -race -shuffle=on ./...
 .PHONY: test
 
-testall: test ##@Development Run Go and JS tests
+testall: test ##@Development Run Go and JS tests, and validate OpenAPI spec
 	@(cd ./ui && npm test -- --watchAll=false)
 .PHONY: testall
 
 lint: ##@Development Lint Go code
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint run -v --timeout 5m
+	go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run -v --timeout 5m
 .PHONY: lint
 
-lintall: lint ##@Development Lint Go and JS code
-	@(cd ./ui && npm run check-formatting && npm run lint)
+lintapi: api/openapi.yaml ##@Development Lint OpenAPI spec
+	npx @redocly/cli lint api/openapi.yaml
+.PHONY: lintapi
+
+lintall: lint lintapi ##@Development Lint Go and JS code
+	@(cd ./ui && npm run check-formatting) || (echo "\n\nPlease run 'npm run prettier' to fix formatting issues." && exit 1)
+	@(cd ./ui && npm run lint)
 .PHONY: lintall
 
-wire: check_go_env ##@Development Update Dependency Injection
-	go run github.com/google/wire/cmd/wire ./...
+gen: check_go_env api ##@Development Update Generated Code (wire, mocks, openapi, etc)
+	go run github.com/google/wire/cmd/wire@latest ./...
 .PHONY: wire
 
+api: check_go_env api/openapi.yaml
+	go generate ./server/api/...
+.PHONY: api
+
+spec_parts=$(shell find api -name '*.yml')
+api/openapi.yaml: $(spec_parts)
+	@echo "Bundling OpenAPI spec..."
+	npx @redocly/cli bundle api/spec.yml -o api/openapi.yaml
+
 snapshots: ##@Development Update (GoLang) Snapshot tests
-	UPDATE_SNAPSHOTS=true go run github.com/onsi/ginkgo/v2/ginkgo ./server/subsonic/...
+	UPDATE_SNAPSHOTS=true go run github.com/onsi/ginkgo/v2/ginkgo@latest ./server/subsonic/...
 .PHONY: snapshots
 
-migration: ##@Development Create an empty migration file
-	@if [ -z "${name}" ]; then echo "Usage: make migration name=name_of_migration_file"; exit 1; fi
-	go run github.com/pressly/goose/cmd/goose -dir db/migration create ${name}
+migration-sql: ##@Development Create an empty SQL migration file
+	@if [ -z "${name}" ]; then echo "Usage: make migration-sql name=name_of_migration_file"; exit 1; fi
+	go run github.com/pressly/goose/v3/cmd/goose@latest -dir db/migration create ${name} sql
+.PHONY: migration
+
+migration-go: ##@Development Create an empty Go migration file
+	@if [ -z "${name}" ]; then echo "Usage: make migration-go name=name_of_migration_file"; exit 1; fi
+	go run github.com/pressly/goose/v3/cmd/goose@latest -dir db/migration create ${name}
 .PHONY: migration
 
 setup-dev: setup
@@ -102,9 +121,9 @@ get-music: ##@Development Download some free music from Navidrome's demo instanc
 	mkdir -p music
 	( cd music; \
 	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=dev_download&id=ec2093ec4801402f1e17cc462195cdbb" > brock.zip; \
-	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=NavidromeUI&id=b376eeb4652d2498aa2b25ba0696725e" > back_on_earth.zip; \
-	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=NavidromeUI&id=e49c609b542fc51899ee8b53aa858cb4" > ugress.zip; \
-	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=NavidromeUI&id=350bcab3a4c1d93869e39ce496464f03" > voodoocuts.zip; \
+	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=dev_download&id=b376eeb4652d2498aa2b25ba0696725e" > back_on_earth.zip; \
+	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=dev_download&id=e49c609b542fc51899ee8b53aa858cb4" > ugress.zip; \
+	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=dev_download&id=350bcab3a4c1d93869e39ce496464f03" > voodoocuts.zip; \
 	for file in *.zip; do unzip -n $${file}; done )
 	@echo "Done. Remember to set your MusicFolder to ./music"
 .PHONY: get-music

Procfile.dev

@@ -1,2 +1,2 @@
 JS: sh -c "cd ./ui && npm start"
-GO: go run github.com/cespare/reflex -d none -c reflex.conf
+GO: go run github.com/cespare/reflex@latest -d none -c reflex.conf

README.md

@@ -1,6 +1,6 @@
 <a href="https://www.navidrome.org"><img src="resources/logo-192x192.png" alt="Navidrome logo" title="navidrome" align="right" height="60px" /></a>
 
-# Navidrome Music Server
+# Navidrome Music Server &nbsp;[![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Tired%20of%20paying%20for%20music%20subscriptions%2C%20and%20not%20finding%20what%20you%20really%20like%3F%20Roll%20your%20own%20streaming%20service%21&url=https://navidrome.org&via=navidrome)
 
 [![Last Release](https://img.shields.io/github/v/release/navidrome/navidrome?logo=github&label=latest&style=flat-square)](https://github.com/navidrome/navidrome/releases)
 [![Build](https://img.shields.io/github/actions/workflow/status/navidrome/navidrome/pipeline.yml?branch=master&logo=github&style=flat-square)](https://nightly.link/navidrome/navidrome/workflows/pipeline/master)
@@ -30,11 +30,15 @@ please file a [GitHub issue](https://github.com/navidrome/navidrome/issues) or j
 
 ## Installation
 
-See instructions in the [project's website](https://www.navidrome.org/docs/installation/)
+See instructions on the [project's website](https://www.navidrome.org/docs/installation/)
 
-If you plan to host Navidrome in the cloud, a great option is to get a virtual server at [BuyVM](https://my.frantech.ca/aff.php?aff=4605). 
-They have plans that start at $3.50/month! If you decide to sign up, please consider using our [affliliate link](https://my.frantech.ca/aff.php?aff=4605),
-to help support the project <3
+## Cloud Hosting
+
+[PikaPods](https://www.pikapods.com) has partnered with us to offer you an 
+[officially supported, cloud-hosted solution](https://www.navidrome.org/docs/installation/managed/#pikapods). 
+A share of the revenue helps fund the development of Navidrome at no additional cost for you.
+
+[![PikaPods](https://www.pikapods.com/static/run-button.svg)](https://www.pikapods.com/pods?run=navidrome)
 
 ## Features
  

api/parameters/_index.yml

@@ -0,0 +1,28 @@
+pageOffset:
+  $ref: './query/pageOffset.yml'
+pageLimit:
+  $ref: './query/pageLimit.yml'
+filterEquals:
+  $ref: './query/filterEquals.yml'
+filterLessThan:
+  $ref: './query/filterLessThan.yml'
+filterLessOrEqual:
+  $ref: './query/filterLessOrEqual.yml'
+filterGreaterThan:
+  $ref: './query/filterGreaterThan.yml'
+filterGreaterOrEqual:
+  $ref: './query/filterGreaterOrEqual.yml'
+filterContains:
+  $ref: './query/filterContains.yml'
+filterStartsWith:
+  $ref: './query/filterStartsWith.yml'
+filterEndsWith:
+  $ref: './query/filterEndsWith.yml'
+sort:
+  $ref: './query/sort.yml'
+include:
+  $ref: './query/include.yml'
+includeForTracks:
+  $ref: './query/includeForTracks.yml'
+includeForAlbums:
+  $ref: './query/includeForAlbums.yml'

api/parameters/query/filterContains.yml

@@ -0,0 +1,9 @@
+name: filter[contains]
+in: query
+description: 'Filter by any property containing text. Usage: filter[contains]=property:value'
+required: false
+schema:
+  type: array
+  items:
+    type: string
+    pattern: '^\w+:\w+'

api/parameters/query/filterEndsWith.yml

@@ -0,0 +1,9 @@
+name: filter[endsWith]
+in: query
+description: 'Filter by any property that ends with text. Usage: filter[endsWith]=property:value'
+required: false
+schema:
+  type: array
+  items:
+    type: string
+    pattern: '^\w+:\w+'

api/parameters/query/filterEquals.yml

@@ -0,0 +1,9 @@
+name: filter[equals]
+in: query
+description: 'Filter by any property with an exact match. Usage: filter[equals]=property:value'
+required: false
+schema:
+  type: array
+  items:
+    type: string
+    pattern: '^\w+:\w+'

api/parameters/query/filterGreaterOrEqual.yml

@@ -0,0 +1,9 @@
+name: filter[greaterOrEqual]
+in: query
+description: 'Filter by any numeric property greater than or equal to a value. Usage: filter[greaterOrEqual]=property:value'
+required: false
+schema:
+  type: array
+  items:
+    type: string
+    pattern: '^\w+:\d+'

api/parameters/query/filterGreaterThan.yml

@@ -0,0 +1,9 @@
+name: filter[greaterThan]
+in: query
+description: 'Filter by any numeric property greater than a value. Usage: filter[greaterThan]=property:value'
+required: false
+schema:
+  type: array
+  items:
+    type: string
+    pattern: '^\w+:\d+'

api/parameters/query/filterLessOrEqual.yml

@@ -0,0 +1,9 @@
+name: filter[lessOrEqual]
+in: query
+description: 'Filter by any numeric property less than or equal to a value. Usage: filter[lessOrEqual]=property:value'
+required: false
+schema:
+  type: array
+  items:
+    type: string
+    pattern: '^\w+:\d+'

api/parameters/query/filterLessThan.yml

@@ -0,0 +1,9 @@
+name: filter[lessThan]
+in: query
+description: 'Filter by any numeric property less than a value. Usage: filter[lessThan]=property:value'
+required: false
+schema:
+  type: array
+  items:
+    type: string
+    pattern: '^\w+:\d+'

api/parameters/query/filterStartsWith.yml

@@ -0,0 +1,9 @@
+  name: filter[startsWith]
+  in: query
+  description: 'Filter by any property that starts with text. Usage: filter[startsWith]=property:value'
+  required: false
+  schema:
+    type: array
+    items:
+      type: string
+      pattern: '^\w+:\w+'

api/parameters/query/include.yml

@@ -0,0 +1,6 @@
+name: include
+in: query
+description: Related resources to include in the response, separated by commas
+required: false
+schema:
+  type: string

api/parameters/query/includeForAlbum.yml

@@ -0,0 +1,13 @@
+name: include
+in: query
+description: Related resources to include in the response, separated by commas
+required: false
+explode: false
+schema:
+  type: array
+  x-go-type: includeSlice
+  items:
+    type: string
+    enum:
+      - track
+      - artist

api/parameters/query/includeForAlbums.yml

@@ -0,0 +1,12 @@
+name: include
+in: query
+description: Related resources to include in the response, separated by commas
+required: false
+explode: false
+schema:
+  type: array
+  x-go-type: includeSlice
+  items:
+    type: string
+    enum:
+      - artist

api/parameters/query/includeForTracks.yml

@@ -0,0 +1,13 @@
+name: include
+in: query
+description: Related resources to include in the response, separated by commas
+required: false
+explode: false
+schema:
+  type: array
+  x-go-type: includeSlice
+  items:
+    type: string
+    enum:
+      - album
+      - artist

api/parameters/query/pageLimit.yml

@@ -0,0 +1,9 @@
+name: page[limit]
+in: query
+description: The number of items per page
+required: false
+schema:
+  type: integer
+  format: int32
+  minimum: 0
+  default: 10

api/parameters/query/pageOffset.yml

@@ -0,0 +1,9 @@
+name: page[offset]
+in: query
+description: The offset for pagination
+required: false
+schema:
+  type: integer
+  format: int32
+  minimum: 0
+  default: 0

api/parameters/query/sort.yml

@@ -0,0 +1,6 @@
+name: sort
+in: query
+description: Sort the results by one or more properties, separated by commas. Prefix the property with '-' for descending order.
+required: false
+schema:
+  type: string

api/resources/album.yml

@@ -0,0 +1,33 @@
+get:
+  summary: Retrieve an individual album
+  operationId: getAlbum
+  parameters:
+    - $ref: '../parameters/query/includeForAlbum.yml'
+    - name: albumId
+      in: path
+      description: The unique identifier of the album
+      required: true
+      schema:
+        type: string
+  responses:
+    '200':
+      description: An album object
+      content:
+        application/vnd.api+json:
+          schema:
+            type: object
+            required: [data]
+            properties:
+              data:
+                $ref: '../schemas/Album.yml'
+              included:
+                description: Included resources, as requested by the `include` query parameter
+                type: array
+                items:
+                  $ref: '../schemas/IncludedResource.yml'
+    '403':
+      $ref: '../responses/NotAuthorized.yml'
+    '404':
+      $ref: '../responses/NotFound.yml'
+    '500':
+      $ref: '../responses/InternalServerError.yml'

api/resources/albums.yml

@@ -0,0 +1,44 @@
+get:
+  summary: Retrieve a list of albums
+  operationId: getAlbums
+  parameters:
+    - $ref: '../parameters/query/pageLimit.yml'
+    - $ref: '../parameters/query/pageOffset.yml'
+    - $ref: '../parameters/query/filterEquals.yml'
+    - $ref: '../parameters/query/filterContains.yml'
+    - $ref: '../parameters/query/filterLessThan.yml'
+    - $ref: '../parameters/query/filterLessOrEqual.yml'
+    - $ref: '../parameters/query/filterGreaterThan.yml'
+    - $ref: '../parameters/query/filterGreaterOrEqual.yml'
+    - $ref: '../parameters/query/filterStartsWith.yml'
+    - $ref: '../parameters/query/filterEndsWith.yml'
+    - $ref: '../parameters/query/sort.yml'
+    - $ref: '../parameters/query/includeForAlbums.yml'
+  responses:
+    '200':
+      description: A list of albums
+      content:
+        application/vnd.api+json:
+          schema:
+            type: object
+            required: [data, links]
+            properties:
+              data:
+                type: array
+                items:
+                  $ref: '../schemas/Album.yml'
+              links:
+                $ref: '../schemas/PaginationLinks.yml'
+              meta:
+                $ref: '../schemas/PaginationMeta.yml'
+              included:
+                description: Included resources, as requested by the `include` query parameter
+                type: array
+                items:
+                  $ref: '../schemas/IncludedResource.yml'
+    '400':
+      $ref: '../responses/BadRequest.yml'
+    '403':
+      $ref: '../responses/NotAuthorized.yml'
+    '500':
+      $ref: '../responses/InternalServerError.yml'

api/resources/artist.yml

@@ -0,0 +1,28 @@
+get:
+  summary: Retrieve an individual artist
+  operationId: getArtist
+  parameters:
+    - $ref: '../parameters/query/include.yml'
+    - name: artistId
+      in: path
+      description: The unique identifier of the artist
+      required: true
+      schema:
+        type: string
+  responses:
+    '200':
+      description: An artist object
+      content:
+        application/vnd.api+json:
+          schema:
+            type: object
+            required: [data]
+            properties:
+              data:
+                $ref: '../schemas/Artist.yml'
+    '403':
+      $ref: '../responses/NotAuthorized.yml'
+    '404':
+      $ref: '../responses/NotFound.yml'
+    '500':
+      $ref: '../responses/InternalServerError.yml'

api/resources/artists.yml

@@ -0,0 +1,39 @@
+get:
+  summary: Retrieve a list of artists
+  operationId: getArtists
+  parameters:
+    - $ref: '../parameters/query/pageLimit.yml'
+    - $ref: '../parameters/query/pageOffset.yml'
+    - $ref: '../parameters/query/filterEquals.yml'
+    - $ref: '../parameters/query/filterContains.yml'
+    - $ref: '../parameters/query/filterLessThan.yml'
+    - $ref: '../parameters/query/filterLessOrEqual.yml'
+    - $ref: '../parameters/query/filterGreaterThan.yml'
+    - $ref: '../parameters/query/filterGreaterOrEqual.yml'
+    - $ref: '../parameters/query/filterStartsWith.yml'
+    - $ref: '../parameters/query/filterEndsWith.yml'
+    - $ref: '../parameters/query/sort.yml'
+    - $ref: '../parameters/query/include.yml'
+  responses:
+    '200':
+      description: A list of artists
+      content:
+        application/vnd.api+json:
+          schema:
+            type: object
+            required: [data, links]
+            properties:
+              data:
+                type: array
+                items:
+                  $ref: '../schemas/Artist.yml'
+              links:
+                $ref: '../schemas/PaginationLinks.yml'
+              meta:
+                $ref: '../schemas/PaginationMeta.yml'
+    '400':
+      $ref: '../responses/BadRequest.yml'
+    '403':
+      $ref: '../responses/NotAuthorized.yml'
+    '500':
+      $ref: '../responses/InternalServerError.yml'

api/resources/server.yml

@@ -0,0 +1,18 @@
+get:
+  summary: Get server's global info
+  operationId: getServerInfo
+  responses:
+    '200':
+      description: The response’s data key maps to a resource object dictionary representing the server.
+      content:
+        application/vnd.api+json:
+          schema:
+            type: object
+            required: [data]
+            properties:
+              data:
+                $ref: '../schemas/ServerInfo.yml'
+    '403':
+      $ref: '../responses/NotAuthorized.yml'
+    '500':
+      $ref: '../responses/InternalServerError.yml'

api/resources/track.yml

@@ -0,0 +1,33 @@
+get:
+  summary: Retrieve an individual track
+  operationId: getTrack
+  parameters:
+    - $ref: '../parameters/query/includeForTracks.yml'
+    - name: trackId
+      in: path
+      description: The unique identifier of the track
+      required: true
+      schema:
+        type: string
+  responses:
+    '200':
+      description: A track object
+      content:
+        application/vnd.api+json:
+          schema:
+            type: object
+            required: [data]
+            properties:
+              data:
+                $ref: '../schemas/Track.yml'
+              included:
+                description: Included resources, as requested by the `include` query parameter
+                type: array
+                items:
+                  $ref: '../schemas/IncludedResource.yml'
+    '403':
+      $ref: '../responses/NotAuthorized.yml'
+    '404':
+      $ref: '../responses/NotFound.yml'
+    '500':
+      $ref: '../responses/InternalServerError.yml'

api/resources/tracks.yml

@@ -0,0 +1,44 @@
+get:
+  summary: Retrieve a list of tracks
+  operationId: getTracks
+  parameters:
+    - $ref: '../parameters/query/pageLimit.yml'
+    - $ref: '../parameters/query/pageOffset.yml'
+    - $ref: '../parameters/query/filterEquals.yml'
+    - $ref: '../parameters/query/filterContains.yml'
+    - $ref: '../parameters/query/filterLessThan.yml'
+    - $ref: '../parameters/query/filterLessOrEqual.yml'
+    - $ref: '../parameters/query/filterGreaterThan.yml'
+    - $ref: '../parameters/query/filterGreaterOrEqual.yml'
+    - $ref: '../parameters/query/filterStartsWith.yml'
+    - $ref: '../parameters/query/filterEndsWith.yml'
+    - $ref: '../parameters/query/sort.yml'
+    - $ref: '../parameters/query/includeForTracks.yml'
+  responses:
+    '200':
+      description: A list of tracks
+      content:
+        application/vnd.api+json:
+          schema:
+            type: object
+            required: [data, links]
+            properties:
+              data:
+                type: array
+                items:
+                  $ref: '../schemas/Track.yml'
+              links:
+                $ref: '../schemas/PaginationLinks.yml'
+              meta:
+                $ref: '../schemas/PaginationMeta.yml'
+              included:
+                description: Included resources, as requested by the `include` query parameter
+                type: array
+                items:
+                  $ref: '../schemas/IncludedResource.yml'
+    '400':
+      $ref: '../responses/BadRequest.yml'
+    '403':
+      $ref: '../responses/NotAuthorized.yml'
+    '500':
+      $ref: '../responses/InternalServerError.yml'

api/responses/BadRequest.yml

@@ -0,0 +1,5 @@
+description: Bad Request
+content:
+  application/vnd.api+json:
+    schema:
+      $ref: '../schemas/ErrorList.yml'

api/responses/InternalServerError.yml

@@ -0,0 +1,5 @@
+description: Internal Server Error
+content:
+  application/vnd.api+json:
+    schema:
+      $ref: '../schemas/ErrorList.yml'

api/responses/NotAuthorized.yml

@@ -0,0 +1,5 @@
+description: Not Authorized
+content:
+  application/vnd.api+json:
+    schema:
+      $ref: '../schemas/ErrorList.yml'

api/responses/NotFound.yml

@@ -0,0 +1,5 @@
+description: Not Found
+content:
+  application/vnd.api+json:
+    schema:
+      $ref: '../schemas/ErrorList.yml'

api/responses/_index.yml

@@ -0,0 +1,8 @@
+NotFound:
+  $ref: './NotFound.yml'
+NotAuthorized:
+  $ref: './NotAuthorized.yml'
+BadRequest:
+  $ref: './BadRequest.yml'
+InternalServerError:
+  $ref: './InternalServerError.yml'

api/schemas/Album.yml

@@ -0,0 +1,20 @@
+allOf:
+  - $ref: './ResourceObject.yml'
+  - type: object
+    properties:
+      attributes:
+        $ref: './AlbumAttributes.yml'
+      relationships:
+        type: object
+        properties:
+          artists:
+            type: array
+            items:
+              $ref: './AlbumArtistRelationship.yml'
+          tracks:
+            type: array
+            items:
+              $ref: './AlbumTrackRelationship.yml'
+        required:
+          - artists
+          - tracks

api/schemas/AlbumArtistRelationship.yml

@@ -0,0 +1,9 @@
+type: object
+properties:
+  meta:
+    $ref: './ArtistMetaObject.yml'
+  data:
+    $ref: './ResourceObject.yml'
+required:
+  - meta
+  - data

api/schemas/AlbumAttributes.yml

@@ -0,0 +1,23 @@
+type: object
+properties:
+  title:
+    type: string
+    description: The title of the album
+  artist:
+    type: string
+    description: The artist of the album
+  releaseDate:
+    type: string
+    description: The release date of the album
+  tracktotal:
+    type: integer
+    description: The number of tracks on the album
+  disctotal:
+    type: integer
+    description: The number of discs in the album
+  genre:
+    type: string
+    description: The genre of the album
+required:
+  - title
+  - artist

api/schemas/AlbumTrackRelationship.yml

@@ -0,0 +1,6 @@
+type: object
+properties:
+  data:
+    $ref: './ResourceObject.yml'
+required:
+  - data

api/schemas/Artist.yml

@@ -0,0 +1,27 @@
+allOf:
+  - $ref: './ResourceObject.yml'
+  - type: object
+    properties:
+      attributes:
+        $ref: './ArtistAttributes.yml'
+      relationships:
+        type: object
+        properties:
+          tracks:
+            type: object
+            properties:
+              data:
+                type: array
+                items:
+                  $ref: './ArtistTrackRelationship.yml'
+            required:
+              - data
+          albums:
+            type: object
+            properties:
+              data:
+                type: array
+                items:
+                  $ref: './ArtistAlbumRelationship.yml'
+            required:
+              - data

api/schemas/ArtistAlbumRelationship.yml

@@ -0,0 +1,9 @@
+type: object
+properties:
+  meta:
+    $ref: './ArtistMetaObject.yml'
+  data:
+    $ref: './ResourceObject.yml'
+required:
+  - meta
+  - data

api/schemas/ArtistAttributes.yml

@@ -0,0 +1,10 @@
+type: object
+properties:
+  name:
+    type: string
+    description: The name of the artist
+  bio:
+    type: string
+    description: A short biography of the artist
+required:
+  - name

api/schemas/ArtistMetaObject.yml

@@ -0,0 +1,6 @@
+type: object
+properties:
+  role:
+    $ref: './ArtistRole.yml'
+required:
+  - role

api/schemas/ArtistRole.yml

@@ -0,0 +1,5 @@
+type: string
+enum:
+  - artist
+  - albumArtist
+description: The role of an artist in a track or album

api/schemas/ArtistTrackRelationship.yml

@@ -0,0 +1,14 @@
+type: object
+properties:
+  meta:
+    type: object
+    properties:
+      role:
+        $ref: './ArtistRole.yml'
+    required:
+      - role
+  data:
+    $ref: './ResourceObject.yml'
+required:
+  - meta
+  - data

api/schemas/ErrorList.yml

@@ -0,0 +1,7 @@
+type: object
+required: [errors]
+properties:
+  errors:
+    type: array
+    items:
+      $ref: './ErrorObject.yml'

api/schemas/ErrorObject.yml

@@ -0,0 +1,10 @@
+type: object
+properties:
+  id:
+    type: string
+  status:
+    type: string
+  title:
+    type: string
+  detail:
+    type: string

api/schemas/IncludedResource.yml

@@ -0,0 +1,10 @@
+oneOf:
+  - $ref: './Track.yml'
+  - $ref: './Album.yml'
+  - $ref: './Artist.yml'
+discriminator:
+  propertyName: type
+  mapping:
+    track: './Track.yml'
+    album: './Album.yml'
+    artist: './Artist.yml'

api/schemas/PaginationLinks.yml

@@ -0,0 +1,14 @@
+type: object
+properties:
+  first:
+    type: string
+    format: uri
+  prev:
+    type: string
+    format: uri
+  next:
+    type: string
+    format: uri
+  last:
+    type: string
+    format: uri

api/schemas/PaginationMeta.yml

@@ -0,0 +1,14 @@
+type: object
+properties:
+  currentPage:
+    type: integer
+    format: int32
+    description: The current page in the collection
+  totalPages:
+    type: integer
+    format: int32
+    description: The total number of pages in the collection
+  totalItems:
+    type: integer
+    format: int32
+    description: The total number of items in the collection

api/schemas/ResourceList.yml

@@ -0,0 +1,18 @@
+type: object
+properties:
+  data:
+    oneOf:
+      - $ref: './Track.yml'
+      - $ref: './Album.yml'
+      - $ref: './Artist.yml'
+      - type: array
+        items:
+          $ref: './ResourceObject.yml'
+  included:
+    type: array
+    items:
+      $ref: './IncludedResource.yml'
+  links:
+    $ref: './PaginationLinks.yml'
+  meta:
+    $ref: './PaginationMeta.yml'

api/schemas/ResourceObject.yml

@@ -0,0 +1,8 @@
+type: object
+required: [id, type]
+properties:
+  id:
+    type: string
+    description: The unique identifier for the resource
+  type:
+    $ref: './ResourceType.yml'

api/schemas/ResourceType.yml

@@ -0,0 +1,6 @@
+type: string
+description: The type of the resource
+enum:
+  - album
+  - artist
+  - track

api/schemas/ServerInfo.yml

@@ -0,0 +1,24 @@
+type: object
+required: [server, serverVersion, authRequired, features]
+properties:
+  server:
+    type: string
+    description: The name of the server software.
+    example: "navidrome"
+  serverVersion:
+    type: string
+    description: The version number of the server.
+    example: "0.60.0"
+  authRequired:
+    type: boolean
+    description: Whether the user has access to the server.
+    example: true
+  features:
+    type: array
+    description: A list of optional features the server supports.
+    items:
+      type: string
+      enum:
+        - albums
+        - artists
+        - images

api/schemas/Track.yml

@@ -0,0 +1,8 @@
+allOf:
+  - $ref: './ResourceObject.yml'
+  - type: object
+    properties:
+      attributes:
+        $ref: './TrackAttributes.yml'
+      relationships:
+        $ref: './TrackRelationships.yml'

api/schemas/TrackArtistRelationship.yml

@@ -0,0 +1,9 @@
+type: object
+properties:
+  meta:
+    $ref: './ArtistMetaObject.yml'
+  data:
+    $ref: './ResourceObject.yml'
+required:
+  - meta
+  - data

api/schemas/TrackAttributes.yml

@@ -0,0 +1,55 @@
+type: object
+required: [title, artist, album, albumartist, track, mimetype, duration, channels, bitrate, size]
+properties:
+  title:
+    type: string
+    description: The title of the track
+  artist: # TODO: Remove
+    type: string
+    description: The name of the artist who performed the track
+  albumartist: # TODO: Remove
+    type: string
+    description: The primary artist of the album the track belongs to.
+  album: # TODO Remove
+    type: string
+    description: The name of the album the track belongs to
+  genre: # TODO Remove
+    type: string
+    description: The genre of the track.
+  track:
+    type: integer
+    description: The track number within the album.
+  disc:
+    type: integer
+    description: The disc number within a multi-disc album.
+  year:
+    type: integer
+    description: The release year of the track or album.
+  bpm:
+    type: integer
+    description: The beats per minute (BPM) of the track.
+  recording-mbid:
+    type: string
+    description: The MusicBrainz identifier for the recording of the track.
+  track-mbid:
+    type: string
+    description: The MusicBrainz identifier for the track.
+  comments:
+    type: string
+    description: Any additional comments or notes about the track.
+  mimetype:
+    type: string
+    description: The MIME type of the audio file.
+  duration:
+    type: number
+    format: float
+    description: The duration of the track in seconds
+  channels:
+    type: integer
+    description: The number of audio channels in the track.
+  bitrate:
+    type: integer
+    description: The bitrate of the audio file in kilobits per second (kbps).
+  size:
+    type: integer
+    description: The size of the audio file in bytes.

api/schemas/TrackRelationships.yml

@@ -0,0 +1,12 @@
+type: object
+properties:
+  artists:
+    type: array
+    items:
+      $ref: './TrackArtistRelationship.yml'
+  albums:
+    type: array
+    items:
+      $ref: './AlbumTrackRelationship.yml'
+required:
+  - artists

api/schemas/_index.yml

@@ -0,0 +1,46 @@
+ServerInfo:
+  $ref: './ServerInfo.yml'
+ResourceObject:
+  $ref: './ResourceObject.yml'
+ResourceType:
+  $ref: './ResourceType.yml'
+ResourceList:
+  $ref: './ResourceList.yml'
+IncludedResource:
+  $ref: './IncludedResource.yml'
+Track:
+  $ref: './Track.yml'
+TrackAttributes:
+  $ref: './TrackAttributes.yml'
+TrackRelationships:
+  $ref: './TrackRelationships.yml'
+TrackArtistRelationship:
+  $ref: './TrackArtistRelationship.yml'
+ArtistRole:
+  $ref: './ArtistRole.yml'
+Artist:
+  $ref: './Artist.yml'
+ArtistAttributes:
+  $ref: './ArtistAttributes.yml'
+ArtistAlbumRelationship:
+  $ref: './ArtistAlbumRelationship.yml'
+ArtistTrackRelationship:
+  $ref: './ArtistTrackRelationship.yml'
+ArtistMetaObject:
+  $ref: './ArtistMetaObject.yml'
+Album:
+  $ref: './Album.yml'
+AlbumAttributes:
+  $ref: './AlbumAttributes.yml'
+AlbumArtistRelationship:
+  $ref: './AlbumArtistRelationship.yml'
+AlbumTrackRelationship:
+  $ref: './AlbumTrackRelationship.yml'
+PaginationLinks:
+  $ref: './PaginationLinks.yml'
+PaginationMeta:
+  $ref: './PaginationMeta.yml'
+ErrorList:
+  $ref: './ErrorList.yml'
+ErrorObject:
+  $ref: './ErrorObject.yml'

api/spec.yml

@@ -0,0 +1,52 @@
+openapi: 3.0.0
+info:
+  version: 0.2.0
+  title: Navidrome API
+  description: >
+    This spec describes the Navidrome API, which allows users to browse and manage their music library via a JSON:API 
+    based interface. The API provides endpoints for albums, tracks, artists, playlists and images, along with their 
+    relationships. Clients can retrieve information about the items in the library, filter and sort results, and 
+    perform actions such as creating and deleting playlists. With this API, developers can build music apps and 
+    services that integrate with Navidrome music server, providing a seamless experience for users to access and 
+    manage their music collection.
+  contact:
+    name: Navidrome
+    url: https://navidrome.org
+  license:
+    name: GNU General Public License v3.0
+    url: https://github.com/navidrome/navidrome/blob/master/LICENSE
+
+servers:
+  - url: /api/v2
+
+security:
+  - bearerAuth: []
+
+paths:
+  /server:
+    $ref: './resources/server.yml'
+  /tracks:
+    $ref: './resources/tracks.yml'
+  /tracks/{trackId}:
+    $ref: './resources/track.yml'
+  /artists:
+    $ref: './resources/artists.yml'
+  /artists/{artistId}:
+    $ref: './resources/artist.yml'
+  /albums:
+    $ref: './resources/albums.yml'
+  /albums/{albumId}:
+    $ref: './resources/album.yml'
+
+components:
+  parameters:
+    $ref: './parameters/_index.yml'
+  schemas:
+    $ref: './schemas/_index.yml'
+  responses:
+    $ref: './responses/_index.yml'
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT

cmd/root.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/go-chi/chi/v5/middleware"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/core"
@@ -60,7 +61,7 @@ func preRun() {
 }
 
 func runNavidrome() {
-	db.EnsureLatestVersion()
+	db.Init()
 	defer func() {
 		if err := db.Close(); err != nil {
 			log.Error("Error closing DB", err)
@@ -96,10 +97,14 @@ func startServer(ctx context.Context) func() error {
 			core.WriteInitialMetrics()
 			a.MountRouter("Prometheus metrics", conf.Server.Prometheus.MetricsPath, promhttp.Handler())
 		}
+		if conf.Server.DevEnableProfiler {
+			a.MountRouter("Profiling", "/debug", middleware.Profiler())
+		}
 		if strings.HasPrefix(conf.Server.UILoginBackgroundURL, "/") {
 			a.MountRouter("Background images", consts.DefaultUILoginBackgroundURL, backgrounds.NewHandler())
 		}
-		return a.Run(ctx, fmt.Sprintf("%s:%d", conf.Server.Address, conf.Server.Port))
+		a.MountRouter("New Native API", consts.URLPathAPI, CreateNewNativeAPIRouter())
+		return a.Run(ctx, conf.Server.Address, conf.Server.Port, conf.Server.TLSCert, conf.Server.TLSKey)
 	}
 }
 
@@ -151,18 +156,23 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "configfile", "c", "", `config file (default "./navidrome.toml")`)
 	rootCmd.PersistentFlags().BoolVarP(&noBanner, "nobanner", "n", false, `don't show banner`)
 	rootCmd.PersistentFlags().String("musicfolder", viper.GetString("musicfolder"), "folder where your music is stored")
-	rootCmd.PersistentFlags().String("datafolder", viper.GetString("datafolder"), "folder to store application data (DB, cache...), needs write access")
+	rootCmd.PersistentFlags().String("datafolder", viper.GetString("datafolder"), "folder to store application data (DB), needs write access")
+	rootCmd.PersistentFlags().String("cachefolder", viper.GetString("cachefolder"), "folder to store cache data (transcoding, images...), needs write access")
 	rootCmd.PersistentFlags().StringP("loglevel", "l", viper.GetString("loglevel"), "log level, possible values: error, info, debug, trace")
 
 	_ = viper.BindPFlag("musicfolder", rootCmd.PersistentFlags().Lookup("musicfolder"))
 	_ = viper.BindPFlag("datafolder", rootCmd.PersistentFlags().Lookup("datafolder"))
+	_ = viper.BindPFlag("cachefolder", rootCmd.PersistentFlags().Lookup("cachefolder"))
 	_ = viper.BindPFlag("loglevel", rootCmd.PersistentFlags().Lookup("loglevel"))
 
-	rootCmd.Flags().StringP("address", "a", viper.GetString("address"), "IP address to bind")
-	rootCmd.Flags().IntP("port", "p", viper.GetInt("port"), "HTTP port Navidrome will use")
+	rootCmd.Flags().StringP("address", "a", viper.GetString("address"), "IP address to bind to")
+	rootCmd.Flags().IntP("port", "p", viper.GetInt("port"), "HTTP port Navidrome will listen to")
+	rootCmd.Flags().String("baseurl", viper.GetString("baseurl"), "base URL to configure Navidrome behind a proxy (ex: /music or http://my.server.com)")
+	rootCmd.Flags().String("tlscert", viper.GetString("tlscert"), "optional path to a TLS cert file (enables HTTPS listening)")
+	rootCmd.Flags().String("tlskey", viper.GetString("tlskey"), "optional path to a TLS key file (enables HTTPS listening)")
+
 	rootCmd.Flags().Duration("sessiontimeout", viper.GetDuration("sessiontimeout"), "how long Navidrome will wait before closing web ui idle sessions")
 	rootCmd.Flags().Duration("scaninterval", viper.GetDuration("scaninterval"), "how frequently to scan for changes in your music library")
-	rootCmd.Flags().String("baseurl", viper.GetString("baseurl"), "base URL (only the path part) to configure Navidrome behind a proxy (ex: /music)")
 	rootCmd.Flags().String("uiloginbackgroundurl", viper.GetString("uiloginbackgroundurl"), "URL to a backaground image used in the Login page")
 	rootCmd.Flags().Bool("enabletranscodingconfig", viper.GetBool("enabletranscodingconfig"), "enables transcoding configuration in the UI")
 	rootCmd.Flags().String("transcodingcachesize", viper.GetString("transcodingcachesize"), "size of transcoding cache")
@@ -174,9 +184,12 @@ func init() {
 
 	_ = viper.BindPFlag("address", rootCmd.Flags().Lookup("address"))
 	_ = viper.BindPFlag("port", rootCmd.Flags().Lookup("port"))
+	_ = viper.BindPFlag("tlscert", rootCmd.Flags().Lookup("tlscert"))
+	_ = viper.BindPFlag("tlskey", rootCmd.Flags().Lookup("tlskey"))
+	_ = viper.BindPFlag("baseurl", rootCmd.Flags().Lookup("baseurl"))
+
 	_ = viper.BindPFlag("sessiontimeout", rootCmd.Flags().Lookup("sessiontimeout"))
 	_ = viper.BindPFlag("scaninterval", rootCmd.Flags().Lookup("scaninterval"))
-	_ = viper.BindPFlag("baseurl", rootCmd.Flags().Lookup("baseurl"))
 	_ = viper.BindPFlag("uiloginbackgroundurl", rootCmd.Flags().Lookup("uiloginbackgroundurl"))
 
 	_ = viper.BindPFlag("prometheus.enabled", rootCmd.Flags().Lookup("prometheus.enabled"))

cmd/wire_gen.go

@@ -19,6 +19,7 @@ import (
 	"github.com/navidrome/navidrome/persistence"
 	"github.com/navidrome/navidrome/scanner"
 	"github.com/navidrome/navidrome/server"
+	"github.com/navidrome/navidrome/server/api"
 	"github.com/navidrome/navidrome/server/events"
 	"github.com/navidrome/navidrome/server/nativeapi"
 	"github.com/navidrome/navidrome/server/public"
@@ -31,16 +32,23 @@ import (
 func CreateServer(musicFolder string) *server.Server {
 	sqlDB := db.Db()
 	dataStore := persistence.New(sqlDB)
-	serverServer := server.New(dataStore)
+	broker := events.GetBroker()
+	serverServer := server.New(dataStore, broker)
 	return serverServer
 }
 
 func CreateNativeAPIRouter() *nativeapi.Router {
 	sqlDB := db.Db()
 	dataStore := persistence.New(sqlDB)
-	broker := events.GetBroker()
 	share := core.NewShare(dataStore)
-	router := nativeapi.New(dataStore, broker, share)
+	router := nativeapi.New(dataStore, share)
+	return router
+}
+
+func CreateNewNativeAPIRouter() *api.Router {
+	sqlDB := db.Db()
+	dataStore := persistence.New(sqlDB)
+	router := api.New(dataStore)
 	return router
 }
 
@@ -54,13 +62,13 @@ func CreateSubsonicAPIRouter() *subsonic.Router {
 	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, externalMetadata)
 	transcodingCache := core.GetTranscodingCache()
 	mediaStreamer := core.NewMediaStreamer(dataStore, fFmpeg, transcodingCache)
-	archiver := core.NewArchiver(mediaStreamer, dataStore)
+	share := core.NewShare(dataStore)
+	archiver := core.NewArchiver(mediaStreamer, dataStore, share)
 	players := core.NewPlayers(dataStore)
 	scanner := GetScanner()
 	broker := events.GetBroker()
 	playlists := core.NewPlaylists(dataStore)
 	playTracker := scrobbler.GetPlayTracker(dataStore, broker)
-	share := core.NewShare(dataStore)
 	router := subsonic.New(dataStore, artworkArtwork, mediaStreamer, archiver, players, externalMetadata, scanner, broker, playlists, playTracker, share)
 	return router
 }
@@ -76,7 +84,8 @@ func CreatePublicRouter() *public.Router {
 	transcodingCache := core.GetTranscodingCache()
 	mediaStreamer := core.NewMediaStreamer(dataStore, fFmpeg, transcodingCache)
 	share := core.NewShare(dataStore)
-	router := public.New(dataStore, artworkArtwork, mediaStreamer, share)
+	archiver := core.NewArchiver(mediaStreamer, dataStore, share)
+	router := public.New(dataStore, artworkArtwork, mediaStreamer, share, archiver)
 	return router
 }
 
@@ -111,7 +120,7 @@ func createScanner() scanner.Scanner {
 
 // wire_injectors.go:
 
-var allProviders = wire.NewSet(core.Set, artwork.Set, subsonic.New, nativeapi.New, public.New, persistence.New, lastfm.NewRouter, listenbrainz.NewRouter, events.GetBroker, db.Db)
+var allProviders = wire.NewSet(core.Set, artwork.Set, subsonic.New, nativeapi.New, api.New, public.New, persistence.New, lastfm.NewRouter, listenbrainz.NewRouter, events.GetBroker, db.Db)
 
 // Scanner must be a Singleton
 var (

cmd/wire_injectors.go

@@ -14,6 +14,7 @@ import (
 	"github.com/navidrome/navidrome/persistence"
 	"github.com/navidrome/navidrome/scanner"
 	"github.com/navidrome/navidrome/server"
+	"github.com/navidrome/navidrome/server/api"
 	"github.com/navidrome/navidrome/server/events"
 	"github.com/navidrome/navidrome/server/nativeapi"
 	"github.com/navidrome/navidrome/server/public"
@@ -25,6 +26,7 @@ var allProviders = wire.NewSet(
 	artwork.Set,
 	subsonic.New,
 	nativeapi.New,
+	api.New,
 	public.New,
 	persistence.New,
 	lastfm.NewRouter,
@@ -46,6 +48,12 @@ func CreateNativeAPIRouter() *nativeapi.Router {
 	))
 }
 
+func CreateNewNativeAPIRouter() *api.Router {
+	panic(wire.Build(
+		allProviders,
+	))
+}
+
 func CreateSubsonicAPIRouter() *subsonic.Router {
 	panic(wire.Build(
 		allProviders,

conf/configuration.go

@@ -2,6 +2,7 @@ package conf
 
 import (
 	"fmt"
+	"net/url"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -22,12 +23,18 @@ type configOptions struct {
 	Port                         int
 	MusicFolder                  string
 	DataFolder                   string
+	CacheFolder                  string
 	DbPath                       string
 	LogLevel                     string
 	ScanInterval                 time.Duration
 	ScanSchedule                 string
 	SessionTimeout               time.Duration
 	BaseURL                      string
+	BasePath                     string
+	BaseHost                     string
+	BaseScheme                   string
+	TLSCert                      string
+	TLSKey                       string
 	UILoginBackgroundURL         string
 	UIWelcomeMessage             string
 	MaxSidebarPlaylists          int
@@ -50,11 +57,13 @@ type configOptions struct {
 	FFmpegPath                   string
 	CoverArtPriority             string
 	CoverJpegQuality             int
+	ArtistArtPriority            string
 	EnableGravatar               bool
 	EnableFavourites             bool
 	EnableStarRating             bool
 	EnableUserEditing            bool
 	EnableSharing                bool
+	DefaultDownloadableShare     bool
 	DefaultTheme                 string
 	DefaultLanguage              string
 	DefaultUIVolume              int
@@ -78,6 +87,7 @@ type configOptions struct {
 	// DevFlags. These are used to enable/disable debugging and incomplete features
 	DevLogSourceLine                 bool
 	DevLogLevels                     map[string]string
+	DevEnableProfiler                bool
 	DevAutoCreateAdminPassword       string
 	DevAutoLoginUsername             string
 	DevActivityPanel                 bool
@@ -92,8 +102,9 @@ type configOptions struct {
 }
 
 type scannerOptions struct {
-	Extractor       string
-	GenreSeparators string
+	Extractor          string
+	GenreSeparators    string
+	GroupAlbumReleases bool
 }
 
 type lastfmOptions struct {
@@ -125,6 +136,11 @@ var (
 
 func LoadFromFile(confFile string) {
 	viper.SetConfigFile(confFile)
+	err := viper.ReadInConfig()
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error reading config file:", err)
+		os.Exit(1)
+	}
 	Load()
 }
 
@@ -139,6 +155,16 @@ func Load() {
 		_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error creating data path:", "path", Server.DataFolder, err)
 		os.Exit(1)
 	}
+
+	if Server.CacheFolder == "" {
+		Server.CacheFolder = filepath.Join(Server.DataFolder, "cache")
+	}
+	err = os.MkdirAll(Server.CacheFolder, os.ModePerm)
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error creating cache path:", "path", Server.CacheFolder, err)
+		os.Exit(1)
+	}
+
 	Server.ConfigFile = viper.GetViper().ConfigFileUsed()
 	if Server.DbPath == "" {
 		Server.DbPath = filepath.Join(Server.DataFolder, consts.DefaultDbPath)
@@ -153,6 +179,19 @@ func Load() {
 		os.Exit(1)
 	}
 
+	if Server.BaseURL != "" {
+		u, err := url.Parse(Server.BaseURL)
+		if err != nil {
+			_, _ = fmt.Fprintf(os.Stderr, "FATAL: Invalid BaseURL %s: %s\n", Server.BaseURL, err.Error())
+			os.Exit(1)
+		}
+		Server.BasePath = u.Path
+		u.Path = ""
+		u.RawQuery = ""
+		Server.BaseHost = u.Host
+		Server.BaseScheme = u.Scheme
+	}
+
 	// Print current configuration if log level is Debug
 	if log.CurrentLevel() >= log.LevelDebug {
 		prettyConf := pretty.Sprintf("Loaded configuration from '%s': %# v", Server.ConfigFile, Server)
@@ -219,6 +258,7 @@ func AddHook(hook func()) {
 
 func init() {
 	viper.SetDefault("musicfolder", filepath.Join(".", "music"))
+	viper.SetDefault("cachefolder", "")
 	viper.SetDefault("datafolder", ".")
 	viper.SetDefault("loglevel", "info")
 	viper.SetDefault("address", "0.0.0.0")
@@ -227,6 +267,8 @@ func init() {
 	viper.SetDefault("scaninterval", -1)
 	viper.SetDefault("scanschedule", "@every 1m")
 	viper.SetDefault("baseurl", "")
+	viper.SetDefault("tlscert", "")
+	viper.SetDefault("tlskey", "")
 	viper.SetDefault("uiloginbackgroundurl", consts.DefaultUILoginBackgroundURL)
 	viper.SetDefault("uiwelcomemessage", "")
 	viper.SetDefault("maxsidebarplaylists", consts.DefaultMaxSidebarPlaylists)
@@ -249,6 +291,7 @@ func init() {
 	viper.SetDefault("ffmpegpath", "")
 	viper.SetDefault("coverartpriority", "cover.*, folder.*, front.*, embedded, external")
 	viper.SetDefault("coverjpegquality", 75)
+	viper.SetDefault("artistartpriority", "artist.*, album/artist.*, external")
 	viper.SetDefault("enablegravatar", false)
 	viper.SetDefault("enablefavourites", true)
 	viper.SetDefault("enablestarrating", true)
@@ -272,6 +315,7 @@ func init() {
 
 	viper.SetDefault("scanner.extractor", consts.DefaultScannerExtractor)
 	viper.SetDefault("scanner.genreseparators", ";/,")
+	viper.SetDefault("scanner.groupalbumreleases", false)
 
 	viper.SetDefault("agents", "lastfm,spotify")
 	viper.SetDefault("lastfm.enabled", true)
@@ -285,10 +329,12 @@ func init() {
 
 	// DevFlags. These are used to enable/disable debugging and incomplete features
 	viper.SetDefault("devlogsourceline", false)
+	viper.SetDefault("devenableprofiler", false)
 	viper.SetDefault("devautocreateadminpassword", "")
 	viper.SetDefault("devautologinusername", "")
 	viper.SetDefault("devactivitypanel", true)
 	viper.SetDefault("enablesharing", false)
+	viper.SetDefault("defaultdownloadableshare", false)
 	viper.SetDefault("devenablebufferedscrobble", true)
 	viper.SetDefault("devsidebarplaylists", true)
 	viper.SetDefault("devshowartistpage", true)

consts/consts.go

@@ -32,6 +32,7 @@ const (
 
 	URLPathUI           = "/app"
 	URLPathNativeAPI    = "/api"
+	URLPathAPI          = "/api/v2"
 	URLPathSubsonicAPI  = "/rest"
 	URLPathPublic       = "/share"
 	URLPathPublicImages = URLPathPublic + "/img"
@@ -71,10 +72,10 @@ const (
 
 // Cache options
 const (
-	TranscodingCacheDir             = "cache/transcoding"
+	TranscodingCacheDir             = "transcoding"
 	DefaultTranscodingCacheMaxItems = 0 // Unlimited
 
-	ImageCacheDir             = "cache/images"
+	ImageCacheDir             = "images"
 	DefaultImageCacheMaxItems = 0 // Unlimited
 
 	DefaultCacheSize            = 100 * 1024 * 1024 // 100MB
@@ -94,19 +95,19 @@ var (
 			"name":           "mp3 audio",
 			"targetFormat":   "mp3",
 			"defaultBitRate": 192,
-			"command":        "ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -f mp3 -",
+			"command":        "ffmpeg -i %s -map 0:a:0 -b:a %bk -v 0 -f mp3 -",
 		},
 		{
 			"name":           "opus audio",
 			"targetFormat":   "opus",
 			"defaultBitRate": 128,
-			"command":        "ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -c:a libopus -f opus -",
+			"command":        "ffmpeg -i %s -map 0:a:0 -b:a %bk -v 0 -c:a libopus -f opus -",
 		},
 		{
 			"name":           "aac audio",
 			"targetFormat":   "aac",
 			"defaultBitRate": 256,
-			"command":        "ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -c:a aac -f adts -",
+			"command":        "ffmpeg -i %s -map 0:a:0 -b:a %bk -v 0 -c:a aac -f adts -",
 		},
 	}
 

contrib/docker-compose/Caddyfile

@@ -0,0 +1,7 @@
+https://your.website {
+  reverse_proxy * navidrome:4533 {
+    header_up Host {http.reverse_proxy.upstream.hostport}
+    header_up X-Forwarded-For {http.request.remote}
+    header_up X-Real-IP {http.reverse_proxy.upstream.port}
+  }
+}

contrib/docker-compose/docker-compose-caddy.yml

@@ -0,0 +1,31 @@
+version: '3.6'
+
+volumes:
+  caddy_data:
+  navidrome_data:
+
+services:
+
+  caddy:
+    container_name: "caddy"
+    image: caddy:2.6-alpine
+    restart: unless-stopped
+    read_only: true
+    volumes:
+      - "caddy_data:/data:rw"
+      - "./Caddyfile:/etc/caddy/Caddyfile:ro"
+    ports:
+      - "80:80"
+      - "443:443"
+
+  navidrome:
+    container_name: "navidrome"
+    image: deluan/navidrome:latest
+    restart: unless-stopped
+    read_only: true
+    # user: 1000:1000
+    ports:
+      - "4533:4533"
+    volumes:
+      - "navidrome_data:/data"
+      #- "/mnt/music:/music:ro"

contrib/docker-compose/docker-compose-traefik.yml

@@ -0,0 +1,51 @@
+version: "3.6"
+
+volumes:
+  traefik_data:
+  navidrome_data:
+
+services:
+
+  traefik:
+    container_name: "traefik"
+    image: traefik:2.9
+    restart: unless-stopped
+    read_only: true
+    command:
+      - "--log.level=ERROR"
+      - "--providers.docker=true"
+      - "--providers.docker.exposedbydefault=false"
+      - "--entrypoints.websecure.address=:443"
+      - "--certificatesresolvers.tc.acme.tlschallenge=true"
+      #- "--certificatesresolvers.tc.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
+      - "--certificatesresolvers.tc.acme.email=foo@foo.com"
+      - "--certificatesresolvers.tc.acme.storage=/letsencrypt/acme.json"
+    ports:
+      - "443:443"
+    volumes:
+      - "traefik_data:/letsencrypt"
+      #- "/var/run/docker.sock:/var/run/docker.sock:ro"
+
+  navidrome:
+    container_name: "navidrome"
+    image: deluan/navidrome:latest
+    restart: unless-stopped
+    read_only: true
+    # user: 1000:1000
+    ports:
+      - "4533:4533"
+    environment:
+      ND_SCANINTERVAL: 6h
+      ND_LOGLEVEL: info
+      ND_SESSIONTIMEOUT: 168h
+      ND_BASEURL: ""
+    volumes:
+      - "navidrome_data:/data"
+      #- "/mnt/music:/music:ro"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.navidrome.rule=Host(`foo.com`)"
+      - "traefik.http.routers.navidrome.entrypoints=websecure"
+      - "traefik.http.routers.navidrome.tls=true"
+      - "traefik.http.routers.navidrome.tls.certresolver=tc"
+      - "traefik.http.services.navidrome.loadbalancer.server.port=4533"

contrib/docker-compose/docker-compose.yml

@@ -0,0 +1,18 @@
+version: '3.6'
+
+volumes:
+  navidrome_data:
+
+services:
+
+  navidrome:
+    container_name: "navidrome"
+    image: deluan/navidrome:latest
+    restart: unless-stopped
+    read_only: true
+    # user: 1000:1000
+    ports:
+      - "4533:4533"
+    volumes:
+      - "navidrome_data:/data"
+      #- "/mnt/music:/music:ro"

contrib/k8s/README.md

@@ -0,0 +1,11 @@
+# Kubernetes
+
+A couple things to keep in mind with this manifest:
+
+1. This creates a namespace called `navidrome`. Adjust this as needed.
+1. This manifest was created on [K3s](https://github.com/k3s-io/k3s), which uses its own storage provisioner called [local-path-provisioner](https://github.com/rancher/local-path-provisioner). Be sure to change the `storageClassName` of the `PersistentVolumeClaim` as needed.
+1. The `PersistentVolumeClaim` sets up a 2Gi volume for Navidrome's database. Adjust this as needed.
+1. Be sure to change the `image` tag from `ghcr.io/navidrome/navidrome:0.49.3` to whatever the newest version is.
+1. This assumes your music is mounted on the host using `hostPath` at `/path/to/your/music/on/the/host`. Adjust this as needed.
+1. The `Ingress` is already configured for `cert-manager` to obtain a Let's Encrypt TLS certificate and uses Traefik for routing. Adjust this as needed. 
+1. The `Ingress` presents the service at `navidrome.${SECRET_INTERNAL_DOMAIN_NAME}`, which needs to already be setup in DNS.

contrib/k8s/manifest.yml

@@ -0,0 +1,111 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: navidrome
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: navidrome-data-pvc
+  namespace: navidrome
+  annotations:
+    volumeType: local
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 2Gi
+  storageClassName: local-path
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: navidrome-deployment
+  namespace: navidrome
+spec:
+  replicas: 1
+  revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      app: navidrome
+  template:
+    metadata:
+      labels:
+        app: navidrome
+    spec:
+      containers:
+        - name: navidrome
+          image: ghcr.io/navidrome/navidrome:0.49.3
+          ports:
+            - containerPort: 4533
+          env:
+            - name: ND_SCANSCHEDULE
+              value: "12h"
+            - name: ND_SESSIONTIMEOUT
+              value: "24h"
+            - name: ND_LOGLEVEL
+              value: "info"
+            - name: ND_ENABLETRANSCODINGCONFIG
+              value: "false"
+            - name: ND_TRANSCODINGCACHESIZE
+              value: "512MB"
+            - name: ND_ENABLESTARRATING
+              value: "false"
+            - name: ND_ENABLEFAVOURITES
+              value: "false"
+          volumeMounts:
+            - name: data
+              mountPath: /data
+            - name: music
+              mountPath: /music
+              readOnly: true
+      volumes:
+        - name: data
+          persistentVolumeClaim:
+            claimName: navidrome-data-pvc
+        - name: music
+          hostPath:
+            path: /path/to/your/music/on/the/host
+            type: Directory
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: navidrome-service
+  namespace: navidrome
+spec:
+  type: ClusterIP
+  ports:
+    - name: http
+      targetPort: 4533
+      port: 4533
+      protocol: TCP
+  selector:
+    app: navidrome
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: navidrome-ingress
+  namespace: navidrome
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production
+    traefik.ingress.kubernetes.io/router.tls: "true"
+spec:
+  rules:
+    - host: navidrome.${SECRET_INTERNAL_DOMAIN_NAME}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: navidrome-service
+                port:
+                  number: 4533
+  tls:
+    - hosts:
+        - navidrome.${SECRET_INTERNAL_DOMAIN_NAME}
+      secretName: navidrome-tls

contrib/navidrome.service

@@ -38,6 +38,7 @@ RestrictNamespaces=yes
 RestrictRealtime=yes
 SystemCallFilter=@system-service
 SystemCallFilter=~@privileged @resources
+SystemCallFilter=setrlimit
 SystemCallArchitectures=native
 UMask=0066
 

core/archiver.go

@@ -18,16 +18,18 @@ import (
 type Archiver interface {
 	ZipAlbum(ctx context.Context, id string, format string, bitrate int, w io.Writer) error
 	ZipArtist(ctx context.Context, id string, format string, bitrate int, w io.Writer) error
+	ZipShare(ctx context.Context, id string, w io.Writer) error
 	ZipPlaylist(ctx context.Context, id string, format string, bitrate int, w io.Writer) error
 }
 
-func NewArchiver(ms MediaStreamer, ds model.DataStore) Archiver {
-	return &archiver{ds: ds, ms: ms}
+func NewArchiver(ms MediaStreamer, ds model.DataStore, shares Share) Archiver {
+	return &archiver{ds: ds, ms: ms, shares: shares}
 }
 
 type archiver struct {
-	ds model.DataStore
-	ms MediaStreamer
+	ds     model.DataStore
+	ms     MediaStreamer
+	shares Share
 }
 
 func (a *archiver) ZipAlbum(ctx context.Context, id string, format string, bitrate int, out io.Writer) error {
@@ -69,7 +71,7 @@ func (a *archiver) zipAlbums(ctx context.Context, id string, format string, bitr
 func createZipWriter(out io.Writer, format string, bitrate int) *zip.Writer {
 	z := zip.NewWriter(out)
 	comment := "Downloaded from Navidrome"
-	if format != "raw" {
+	if format != "raw" && format != "" {
 		comment = fmt.Sprintf("%s, transcoded to %s %dbps", comment, format, bitrate)
 	}
 	_ = z.SetComment(comment)
@@ -84,7 +86,19 @@ func (a *archiver) albumFilename(mf model.MediaFile, format string, isMultDisc b
 	if isMultDisc {
 		file = fmt.Sprintf("Disc %02d/%s", mf.DiscNumber, file)
 	}
-	return fmt.Sprintf("%s/%s", mf.Album, file)
+	return fmt.Sprintf("%s/%s", sanitizeName(mf.Album), file)
+}
+
+func (a *archiver) ZipShare(ctx context.Context, id string, out io.Writer) error {
+	s, err := a.shares.Load(ctx, id)
+	if !s.Downloadable {
+		return model.ErrNotAuthorized
+	}
+	if err != nil {
+		return err
+	}
+	log.Debug(ctx, "Zipping share", "name", s.ID, "format", s.Format, "bitrate", s.MaxBitRate, "numTracks", len(s.Tracks))
+	return a.zipMediaFiles(ctx, id, s.Format, s.MaxBitRate, out, s.Tracks)
 }
 
 func (a *archiver) ZipPlaylist(ctx context.Context, id string, format string, bitrate int, out io.Writer) error {
@@ -93,13 +107,13 @@ func (a *archiver) ZipPlaylist(ctx context.Context, id string, format string, bi
 		log.Error(ctx, "Error loading mediafiles from playlist", "id", id, err)
 		return err
 	}
-	return a.zipPlaylist(ctx, id, format, bitrate, out, pls)
-}
-
-func (a *archiver) zipPlaylist(ctx context.Context, id string, format string, bitrate int, out io.Writer, pls *model.Playlist) error {
-	z := createZipWriter(out, format, bitrate)
 	mfs := pls.MediaFiles()
 	log.Debug(ctx, "Zipping playlist", "name", pls.Name, "format", format, "bitrate", bitrate, "numTracks", len(mfs))
+	return a.zipMediaFiles(ctx, id, format, bitrate, out, mfs)
+}
+
+func (a *archiver) zipMediaFiles(ctx context.Context, id string, format string, bitrate int, out io.Writer, mfs model.MediaFiles) error {
+	z := createZipWriter(out, format, bitrate)
 	for idx, mf := range mfs {
 		file := a.playlistFilename(mf, format, idx)
 		_ = a.addFileToZip(ctx, z, mf, format, bitrate, file)
@@ -113,11 +127,14 @@ func (a *archiver) zipPlaylist(ctx context.Context, id string, format string, bi
 
 func (a *archiver) playlistFilename(mf model.MediaFile, format string, idx int) string {
 	ext := mf.Suffix
-	if format != "raw" {
+	if format != "" && format != "raw" {
 		ext = format
 	}
-	file := fmt.Sprintf("%02d - %s - %s.%s", idx+1, mf.Artist, mf.Title, ext)
-	return file
+	return fmt.Sprintf("%02d - %s - %s.%s", idx+1, sanitizeName(mf.Artist), sanitizeName(mf.Title), ext)
+}
+
+func sanitizeName(target string) string {
+	return strings.ReplaceAll(target, "/", "_")
 }
 
 func (a *archiver) addFileToZip(ctx context.Context, z *zip.Writer, mf model.MediaFile, format string, bitrate int, filename string) error {
@@ -132,7 +149,7 @@ func (a *archiver) addFileToZip(ctx context.Context, z *zip.Writer, mf model.Med
 	}
 
 	var r io.ReadCloser
-	if format != "raw" {
+	if format != "raw" && format != "" {
 		r, err = a.ms.DoStream(ctx, &mf, format, bitrate)
 	} else {
 		r, err = os.Open(mf.Path)

core/archiver_test.go

@@ -0,0 +1,211 @@
+package core_test
+
+import (
+	"archive/zip"
+	"bytes"
+	"context"
+	"io"
+	"strings"
+
+	"github.com/Masterminds/squirrel"
+	"github.com/navidrome/navidrome/core"
+	"github.com/navidrome/navidrome/model"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"github.com/stretchr/testify/mock"
+)
+
+var _ = Describe("Archiver", func() {
+	var (
+		arch core.Archiver
+		ms   *mockMediaStreamer
+		ds   *mockDataStore
+		sh   *mockShare
+	)
+
+	BeforeEach(func() {
+		ms = &mockMediaStreamer{}
+		ds = &mockDataStore{}
+		sh = &mockShare{}
+		arch = core.NewArchiver(ms, ds, sh)
+	})
+
+	Context("ZipAlbum", func() {
+		It("zips an album correctly", func() {
+			mfs := model.MediaFiles{
+				{Path: "test_data/01 - track1.mp3", Suffix: "mp3", AlbumID: "1", Album: "Album/Promo", DiscNumber: 1},
+				{Path: "test_data/02 - track2.mp3", Suffix: "mp3", AlbumID: "1", Album: "Album/Promo", DiscNumber: 1},
+			}
+
+			mfRepo := &mockMediaFileRepository{}
+			mfRepo.On("GetAll", []model.QueryOptions{{
+				Filters: squirrel.Eq{"album_id": "1"},
+				Sort:    "album",
+			}}).Return(mfs, nil)
+
+			ds.On("MediaFile", mock.Anything).Return(mfRepo)
+			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128).Return(io.NopCloser(strings.NewReader("test")), nil).Times(3)
+
+			out := new(bytes.Buffer)
+			err := arch.ZipAlbum(context.Background(), "1", "mp3", 128, out)
+			Expect(err).To(BeNil())
+
+			zr, err := zip.NewReader(bytes.NewReader(out.Bytes()), int64(out.Len()))
+			Expect(err).To(BeNil())
+
+			Expect(len(zr.File)).To(Equal(2))
+			Expect(zr.File[0].Name).To(Equal("Album_Promo/01 - track1.mp3"))
+			Expect(zr.File[1].Name).To(Equal("Album_Promo/02 - track2.mp3"))
+		})
+	})
+
+	Context("ZipArtist", func() {
+		It("zips an artist's albums correctly", func() {
+			mfs := model.MediaFiles{
+				{Path: "test_data/01 - track1.mp3", Suffix: "mp3", AlbumArtistID: "1", AlbumID: "1", Album: "Album 1", DiscNumber: 1},
+				{Path: "test_data/02 - track2.mp3", Suffix: "mp3", AlbumArtistID: "1", AlbumID: "1", Album: "Album 1", DiscNumber: 1},
+			}
+
+			mfRepo := &mockMediaFileRepository{}
+			mfRepo.On("GetAll", []model.QueryOptions{{
+				Filters: squirrel.Eq{"album_artist_id": "1"},
+				Sort:    "album",
+			}}).Return(mfs, nil)
+
+			ds.On("MediaFile", mock.Anything).Return(mfRepo)
+			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128).Return(io.NopCloser(strings.NewReader("test")), nil).Times(2)
+
+			out := new(bytes.Buffer)
+			err := arch.ZipArtist(context.Background(), "1", "mp3", 128, out)
+			Expect(err).To(BeNil())
+
+			zr, err := zip.NewReader(bytes.NewReader(out.Bytes()), int64(out.Len()))
+			Expect(err).To(BeNil())
+
+			Expect(len(zr.File)).To(Equal(2))
+			Expect(zr.File[0].Name).To(Equal("Album 1/01 - track1.mp3"))
+			Expect(zr.File[1].Name).To(Equal("Album 1/02 - track2.mp3"))
+		})
+	})
+
+	Context("ZipShare", func() {
+		It("zips a share correctly", func() {
+			mfs := model.MediaFiles{
+				{ID: "1", Path: "test_data/01 - track1.mp3", Suffix: "mp3", Artist: "Artist 1", Title: "track1"},
+				{ID: "2", Path: "test_data/02 - track2.mp3", Suffix: "mp3", Artist: "Artist 2", Title: "track2"},
+			}
+
+			share := &model.Share{
+				ID:           "1",
+				Downloadable: true,
+				Format:       "mp3",
+				MaxBitRate:   128,
+				Tracks:       mfs,
+			}
+
+			sh.On("Load", mock.Anything, "1").Return(share, nil)
+			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128).Return(io.NopCloser(strings.NewReader("test")), nil).Times(2)
+
+			out := new(bytes.Buffer)
+			err := arch.ZipShare(context.Background(), "1", out)
+			Expect(err).To(BeNil())
+
+			zr, err := zip.NewReader(bytes.NewReader(out.Bytes()), int64(out.Len()))
+			Expect(err).To(BeNil())
+
+			Expect(len(zr.File)).To(Equal(2))
+			Expect(zr.File[0].Name).To(Equal("01 - Artist 1 - track1.mp3"))
+			Expect(zr.File[1].Name).To(Equal("02 - Artist 2 - track2.mp3"))
+
+		})
+	})
+
+	Context("ZipPlaylist", func() {
+		It("zips a playlist correctly", func() {
+			tracks := []model.PlaylistTrack{
+				{MediaFile: model.MediaFile{Path: "test_data/01 - track1.mp3", Suffix: "mp3", AlbumID: "1", Album: "Album 1", DiscNumber: 1, Artist: "AC/DC", Title: "track1"}},
+				{MediaFile: model.MediaFile{Path: "test_data/02 - track2.mp3", Suffix: "mp3", AlbumID: "1", Album: "Album 1", DiscNumber: 1, Artist: "Artist 2", Title: "track2"}},
+			}
+
+			pls := &model.Playlist{
+				ID:     "1",
+				Name:   "Test Playlist",
+				Tracks: tracks,
+			}
+
+			plRepo := &mockPlaylistRepository{}
+			plRepo.On("GetWithTracks", "1", true).Return(pls, nil)
+			ds.On("Playlist", mock.Anything).Return(plRepo)
+			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128).Return(io.NopCloser(strings.NewReader("test")), nil).Times(2)
+
+			out := new(bytes.Buffer)
+			err := arch.ZipPlaylist(context.Background(), "1", "mp3", 128, out)
+			Expect(err).To(BeNil())
+
+			zr, err := zip.NewReader(bytes.NewReader(out.Bytes()), int64(out.Len()))
+			Expect(err).To(BeNil())
+
+			Expect(len(zr.File)).To(Equal(2))
+			Expect(zr.File[0].Name).To(Equal("01 - AC_DC - track1.mp3"))
+			Expect(zr.File[1].Name).To(Equal("02 - Artist 2 - track2.mp3"))
+		})
+	})
+})
+
+type mockDataStore struct {
+	mock.Mock
+	model.DataStore
+}
+
+func (m *mockDataStore) MediaFile(ctx context.Context) model.MediaFileRepository {
+	args := m.Called(ctx)
+	return args.Get(0).(model.MediaFileRepository)
+}
+
+func (m *mockDataStore) Playlist(ctx context.Context) model.PlaylistRepository {
+	args := m.Called(ctx)
+	return args.Get(0).(model.PlaylistRepository)
+}
+
+type mockMediaFileRepository struct {
+	mock.Mock
+	model.MediaFileRepository
+}
+
+func (m *mockMediaFileRepository) GetAll(options ...model.QueryOptions) (model.MediaFiles, error) {
+	args := m.Called(options)
+	return args.Get(0).(model.MediaFiles), args.Error(1)
+}
+
+type mockPlaylistRepository struct {
+	mock.Mock
+	model.PlaylistRepository
+}
+
+func (m *mockPlaylistRepository) GetWithTracks(id string, includeTracks bool) (*model.Playlist, error) {
+	args := m.Called(id, includeTracks)
+	return args.Get(0).(*model.Playlist), args.Error(1)
+}
+
+type mockMediaStreamer struct {
+	mock.Mock
+	core.MediaStreamer
+}
+
+func (m *mockMediaStreamer) DoStream(ctx context.Context, mf *model.MediaFile, format string, bitrate int) (*core.Stream, error) {
+	args := m.Called(ctx, mf, format, bitrate)
+	if args.Error(1) != nil {
+		return nil, args.Error(1)
+	}
+	return &core.Stream{ReadCloser: args.Get(0).(io.ReadCloser)}, nil
+}
+
+type mockShare struct {
+	mock.Mock
+	core.Share
+}
+
+func (m *mockShare) Load(ctx context.Context, id string) (*model.Share, error) {
+	args := m.Called(ctx, id)
+	return args.Get(0).(*model.Share), args.Error(1)
+}

core/artwork/artwork_internal_test.go

@@ -22,7 +22,8 @@ var _ = Describe("Artwork", func() {
 	var ffmpeg *tests.MockFFmpeg
 	ctx := log.NewContext(context.TODO())
 	var alOnlyEmbed, alEmbedNotFound, alOnlyExternal, alExternalNotFound, alMultipleCovers model.Album
-	var mfWithEmbed, mfWithoutEmbed, mfCorruptedCover model.MediaFile
+	var arMultipleCovers model.Artist
+	var mfWithEmbed, mfAnotherWithEmbed, mfWithoutEmbed, mfCorruptedCover model.MediaFile
 
 	BeforeEach(func() {
 		DeferCleanup(configtest.SetupConfig())
@@ -30,14 +31,23 @@ var _ = Describe("Artwork", func() {
 		conf.Server.CoverArtPriority = "folder.*, cover.*, embedded , front.*"
 
 		ds = &tests.MockDataStore{MockedTranscoding: &tests.MockTranscodingRepo{}}
-		alOnlyEmbed = model.Album{ID: "222", Name: "Only embed", EmbedArtPath: "tests/fixtures/test.mp3"}
+		alOnlyEmbed = model.Album{ID: "222", Name: "Only embed", EmbedArtPath: "tests/fixtures/artist/an-album/test.mp3"}
 		alEmbedNotFound = model.Album{ID: "333", Name: "Embed not found", EmbedArtPath: "tests/fixtures/NON_EXISTENT.mp3"}
-		alOnlyExternal = model.Album{ID: "444", Name: "Only external", ImageFiles: "tests/fixtures/front.png"}
+		alOnlyExternal = model.Album{ID: "444", Name: "Only external", ImageFiles: "tests/fixtures/artist/an-album/front.png"}
 		alExternalNotFound = model.Album{ID: "555", Name: "External not found", ImageFiles: "tests/fixtures/NON_EXISTENT.png"}
-		alMultipleCovers = model.Album{ID: "666", Name: "All options", EmbedArtPath: "tests/fixtures/test.mp3",
-			ImageFiles: "tests/fixtures/cover.jpg" + consts.Zwsp + "tests/fixtures/front.png",
+		arMultipleCovers = model.Artist{ID: "777", Name: "All options"}
+		alMultipleCovers = model.Album{
+			ID:           "666",
+			Name:         "All options",
+			EmbedArtPath: "tests/fixtures/artist/an-album/test.mp3",
+			Paths:        "tests/fixtures/artist/an-album",
+			ImageFiles: "tests/fixtures/artist/an-album/cover.jpg" + consts.Zwsp +
+				"tests/fixtures/artist/an-album/front.png" + consts.Zwsp +
+				"tests/fixtures/artist/an-album/artist.png",
+			AlbumArtistID: "777",
 		}
 		mfWithEmbed = model.MediaFile{ID: "22", Path: "tests/fixtures/test.mp3", HasCoverArt: true, AlbumID: "222"}
+		mfAnotherWithEmbed = model.MediaFile{ID: "23", Path: "tests/fixtures/artist/an-album/test.mp3", HasCoverArt: true, AlbumID: "666"}
 		mfWithoutEmbed = model.MediaFile{ID: "44", Path: "tests/fixtures/test.ogg", AlbumID: "444"}
 		mfCorruptedCover = model.MediaFile{ID: "45", Path: "tests/fixtures/test.ogg", HasCoverArt: true, AlbumID: "444"}
 
@@ -65,7 +75,7 @@ var _ = Describe("Artwork", func() {
 				Expect(err).ToNot(HaveOccurred())
 				_, path, err := aw.Reader(ctx)
 				Expect(err).ToNot(HaveOccurred())
-				Expect(path).To(Equal("tests/fixtures/test.mp3"))
+				Expect(path).To(Equal("tests/fixtures/artist/an-album/test.mp3"))
 			})
 			It("returns ErrUnavailable if embed path is not available", func() {
 				ffmpeg.Error = errors.New("not available")
@@ -87,7 +97,7 @@ var _ = Describe("Artwork", func() {
 				Expect(err).ToNot(HaveOccurred())
 				_, path, err := aw.Reader(ctx)
 				Expect(err).ToNot(HaveOccurred())
-				Expect(path).To(Equal("tests/fixtures/front.png"))
+				Expect(path).To(Equal("tests/fixtures/artist/an-album/front.png"))
 			})
 			It("returns ErrUnavailable if external file is not available", func() {
 				aw, err := newAlbumArtworkReader(ctx, aw, alExternalNotFound.CoverArtID(), nil)
@@ -111,9 +121,36 @@ var _ = Describe("Artwork", func() {
 					Expect(err).ToNot(HaveOccurred())
 					Expect(path).To(Equal(expected))
 				},
-				Entry(nil, " folder.* , cover.*,embedded,front.*", "tests/fixtures/cover.jpg"),
-				Entry(nil, "front.* , cover.*, embedded ,folder.*", "tests/fixtures/front.png"),
-				Entry(nil, " embedded , front.* , cover.*,folder.*", "tests/fixtures/test.mp3"),
+				Entry(nil, " folder.* , cover.*,embedded,front.*", "tests/fixtures/artist/an-album/cover.jpg"),
+				Entry(nil, "front.* , cover.*, embedded ,folder.*", "tests/fixtures/artist/an-album/front.png"),
+				Entry(nil, " embedded , front.* , cover.*,folder.*", "tests/fixtures/artist/an-album/test.mp3"),
+			)
+		})
+	})
+	Describe("artistArtworkReader", func() {
+		Context("Multiple covers", func() {
+			BeforeEach(func() {
+				ds.Artist(ctx).(*tests.MockArtistRepo).SetData(model.Artists{
+					arMultipleCovers,
+				})
+				ds.Album(ctx).(*tests.MockAlbumRepo).SetData(model.Albums{
+					alMultipleCovers,
+				})
+				ds.MediaFile(ctx).(*tests.MockMediaFileRepo).SetData(model.MediaFiles{
+					mfAnotherWithEmbed,
+				})
+			})
+			DescribeTable("ArtistArtPriority",
+				func(priority string, expected string) {
+					conf.Server.ArtistArtPriority = priority
+					aw, err := newArtistReader(ctx, aw, arMultipleCovers.CoverArtID(), nil)
+					Expect(err).ToNot(HaveOccurred())
+					_, path, err := aw.Reader(ctx)
+					Expect(err).ToNot(HaveOccurred())
+					Expect(path).To(Equal(expected))
+				},
+				Entry(nil, " folder.* , artist.*,album/artist.*", "tests/fixtures/artist/artist.jpg"),
+				Entry(nil, "album/artist.*, folder.*,artist.*", "tests/fixtures/artist/an-album/artist.png"),
 			)
 		})
 	})

core/artwork/reader_artist.go

@@ -79,11 +79,24 @@ func (a *artistReader) LastUpdated() time.Time {
 }
 
 func (a *artistReader) Reader(ctx context.Context) (io.ReadCloser, string, error) {
-	return selectImageReader(ctx, a.artID,
-		fromArtistFolder(ctx, a.artistFolder, "artist.*"),
-		fromExternalFile(ctx, a.files, "artist.*"),
-		fromArtistExternalSource(ctx, a.artist, a.em),
-	)
+	var ff = a.fromArtistArtPriority(ctx, conf.Server.ArtistArtPriority)
+	return selectImageReader(ctx, a.artID, ff...)
+}
+
+func (a *artistReader) fromArtistArtPriority(ctx context.Context, priority string) []sourceFunc {
+	var ff []sourceFunc
+	for _, pattern := range strings.Split(strings.ToLower(priority), ",") {
+		pattern = strings.TrimSpace(pattern)
+		switch {
+		case pattern == "external":
+			ff = append(ff, fromArtistExternalSource(ctx, a.artist, a.em))
+		case strings.HasPrefix(pattern, "album/"):
+			ff = append(ff, fromExternalFile(ctx, a.files, strings.TrimPrefix(pattern, "album/")))
+		default:
+			ff = append(ff, fromArtistFolder(ctx, a.artistFolder, pattern))
+		}
+	}
+	return ff
 }
 
 func fromArtistFolder(ctx context.Context, artistFolder string, pattern string) sourceFunc {
@@ -97,12 +110,18 @@ func fromArtistFolder(ctx context.Context, artistFolder string, pattern string)
 		if len(matches) == 0 {
 			return nil, "", fmt.Errorf(`no matches for '%s' in '%s'`, pattern, artistFolder)
 		}
-		filePath := filepath.Join(artistFolder, matches[0])
-		f, err := os.Open(filePath)
-		if err != nil {
-			log.Warn(ctx, "Could not open cover art file", "file", filePath, err)
-			return nil, "", err
+		for _, m := range matches {
+			filePath := filepath.Join(artistFolder, m)
+			if !model.IsImageFile(m) {
+				continue
+			}
+			f, err := os.Open(filePath)
+			if err != nil {
+				log.Warn(ctx, "Could not open cover art file", "file", filePath, err)
+				return nil, "", err
+			}
+			return f, filePath, nil
 		}
-		return f, filePath, err
+		return nil, "", nil
 	}
 }

core/media_streamer.go

@@ -129,11 +129,11 @@ func (s *Stream) EstimatedContentLength() int {
 func selectTranscodingOptions(ctx context.Context, ds model.DataStore, mf *model.MediaFile, reqFormat string, reqBitRate int) (format string, bitRate int) {
 	format = "raw"
 	if reqFormat == "raw" {
-		return
+		return format, 0
 	}
 	if reqFormat == mf.Suffix && reqBitRate == 0 {
 		bitRate = mf.BitRate
-		return
+		return format, bitRate
 	}
 	trc, hasDefault := request.TranscodingFrom(ctx)
 	var cFormat string
@@ -159,7 +159,7 @@ func selectTranscodingOptions(ctx context.Context, ds model.DataStore, mf *model
 		cBitRate = reqBitRate
 	}
 	if cBitRate == 0 && cFormat == "" {
-		return
+		return format, bitRate
 	}
 	t, err := ds.Transcoding(ctx).FindByFormat(cFormat)
 	if err == nil {
@@ -184,22 +184,26 @@ var (
 
 func GetTranscodingCache() TranscodingCache {
 	onceTranscodingCache.Do(func() {
-		instanceTranscodingCache = cache.NewFileCache("Transcoding", conf.Server.TranscodingCacheSize,
-			consts.TranscodingCacheDir, consts.DefaultTranscodingCacheMaxItems,
-			func(ctx context.Context, arg cache.Item) (io.Reader, error) {
-				job := arg.(*streamJob)
-				t, err := job.ms.ds.Transcoding(ctx).FindByFormat(job.format)
-				if err != nil {
-					log.Error(ctx, "Error loading transcoding command", "format", job.format, err)
-					return nil, os.ErrInvalid
-				}
-				out, err := job.ms.transcoder.Transcode(ctx, t.Command, job.mf.Path, job.bitRate)
-				if err != nil {
-					log.Error(ctx, "Error starting transcoder", "id", job.mf.ID, err)
-					return nil, os.ErrInvalid
-				}
-				return out, nil
-			})
+		instanceTranscodingCache = NewTranscodingCache()
 	})
 	return instanceTranscodingCache
 }
+
+func NewTranscodingCache() TranscodingCache {
+	return cache.NewFileCache("Transcoding", conf.Server.TranscodingCacheSize,
+		consts.TranscodingCacheDir, consts.DefaultTranscodingCacheMaxItems,
+		func(ctx context.Context, arg cache.Item) (io.Reader, error) {
+			job := arg.(*streamJob)
+			t, err := job.ms.ds.Transcoding(ctx).FindByFormat(job.format)
+			if err != nil {
+				log.Error(ctx, "Error loading transcoding command", "format", job.format, err)
+				return nil, os.ErrInvalid
+			}
+			out, err := job.ms.transcoder.Transcode(ctx, t.Command, job.mf.Path, job.bitRate)
+			if err != nil {
+				log.Error(ctx, "Error starting transcoder", "id", job.mf.ID, err)
+				return nil, os.ErrInvalid
+			}
+			return out, nil
+		})
+}

core/media_streamer_Internal_test.go

@@ -2,10 +2,8 @@ package core
 
 import (
 	"context"
-	"os"
 
 	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/conf/configtest"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
@@ -16,21 +14,10 @@ import (
 
 var _ = Describe("MediaStreamer", func() {
 	var ds model.DataStore
-	ctx := log.NewContext(context.TODO())
+	ctx := log.NewContext(context.Background())
 
 	BeforeEach(func() {
-		DeferCleanup(configtest.SetupConfig())
-		conf.Server.DataFolder, _ = os.MkdirTemp("", "file_caches")
-		conf.Server.TranscodingCacheSize = "100MB"
 		ds = &tests.MockDataStore{MockedTranscoding: &tests.MockTranscodingRepo{}}
-		ds.MediaFile(ctx).(*tests.MockMediaFileRepo).SetData(model.MediaFiles{
-			{ID: "123", Path: "tests/fixtures/test.mp3", Suffix: "mp3", BitRate: 128, Duration: 257.0},
-		})
-		testCache := GetTranscodingCache()
-		Eventually(func() bool { return testCache.Available(context.TODO()) }).Should(BeTrue())
-	})
-	AfterEach(func() {
-		_ = os.RemoveAll(conf.Server.DataFolder)
 	})
 
 	Context("selectTranscodingOptions", func() {

core/media_streamer_test.go

@@ -23,18 +23,18 @@ var _ = Describe("MediaStreamer", func() {
 
 	BeforeEach(func() {
 		DeferCleanup(configtest.SetupConfig())
-		conf.Server.DataFolder, _ = os.MkdirTemp("", "file_caches")
+		conf.Server.CacheFolder, _ = os.MkdirTemp("", "file_caches")
 		conf.Server.TranscodingCacheSize = "100MB"
 		ds = &tests.MockDataStore{MockedTranscoding: &tests.MockTranscodingRepo{}}
 		ds.MediaFile(ctx).(*tests.MockMediaFileRepo).SetData(model.MediaFiles{
 			{ID: "123", Path: "tests/fixtures/test.mp3", Suffix: "mp3", BitRate: 128, Duration: 257.0},
 		})
-		testCache := core.GetTranscodingCache()
+		testCache := core.NewTranscodingCache()
 		Eventually(func() bool { return testCache.Available(context.TODO()) }).Should(BeTrue())
 		streamer = core.NewMediaStreamer(ds, ffmpeg, testCache)
 	})
 	AfterEach(func() {
-		_ = os.RemoveAll(conf.Server.DataFolder)
+		_ = os.RemoveAll(conf.Server.CacheFolder)
 	})
 
 	Context("NewStream", func() {

core/share.go

@@ -35,7 +35,7 @@ func (s *shareService) Load(ctx context.Context, id string) (*model.Share, error
 		return nil, err
 	}
 	if !share.ExpiresAt.IsZero() && share.ExpiresAt.Before(time.Now()) {
-		return nil, model.ErrNotAvailable
+		return nil, model.ErrExpired
 	}
 	share.LastVisitedAt = time.Now()
 	share.VisitCount++
@@ -125,7 +125,7 @@ func (r *shareRepositoryWrapper) Save(entity interface{}) (string, error) {
 }
 
 func (r *shareRepositoryWrapper) Update(id string, entity interface{}, _ ...string) error {
-	cols := []string{"description"}
+	cols := []string{"description", "downloadable"}
 
 	// TODO Better handling of Share expiration
 	if !entity.(*model.Share).ExpiresAt.IsZero() {

core/share_test.go

@@ -45,7 +45,7 @@ var _ = Describe("Share", func() {
 				entity := &model.Share{}
 				err := repo.Update("id", entity)
 				Expect(err).ToNot(HaveOccurred())
-				Expect(mockedRepo.(*tests.MockShareRepo).Cols).To(ConsistOf("description"))
+				Expect(mockedRepo.(*tests.MockShareRepo).Cols).To(ConsistOf("description", "downloadable"))
 			})
 		})
 	})

db/db.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"database/sql"
+	"embed"
 	"fmt"
 
 	_ "github.com/mattn/go-sqlite3"
@@ -9,7 +10,7 @@ import (
 	_ "github.com/navidrome/navidrome/db/migration"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/utils/singleton"
-	"github.com/pressly/goose"
+	"github.com/pressly/goose/v3"
 )
 
 var (
@@ -17,6 +18,11 @@ var (
 	Path   string
 )
 
+//go:embed migration/*.sql
+var embedMigrations embed.FS
+
+const migrationsFolder = "migration"
+
 func Db() *sql.DB {
 	return singleton.GetInstance(func() *sql.DB {
 		Path = conf.Server.DbPath
@@ -38,7 +44,7 @@ func Close() error {
 	return Db().Close()
 }
 
-func EnsureLatestVersion() {
+func Init() {
 	db := Db()
 
 	// Disable foreign_keys to allow re-creating tables in migrations
@@ -55,18 +61,19 @@ func EnsureLatestVersion() {
 
 	gooseLogger := &logAdapter{silent: isSchemaEmpty(db)}
 	goose.SetLogger(gooseLogger)
+	goose.SetBaseFS(embedMigrations)
 
 	err = goose.SetDialect(Driver)
 	if err != nil {
 		log.Fatal("Invalid DB driver", "driver", Driver, err)
 	}
-	err = goose.Run("up", db, "./")
+	err = goose.Up(db, migrationsFolder)
 	if err != nil {
 		log.Fatal("Failed to apply new migrations", err)
 	}
 }
 
-func isSchemaEmpty(db *sql.DB) bool { // nolint:interfacer
+func isSchemaEmpty(db *sql.DB) bool {
 	rows, err := db.Query("SELECT name FROM sqlite_master WHERE type='table' AND name='goose_db_version';") // nolint:rowserrcheck
 	if err != nil {
 		log.Fatal("Database could not be opened!", err)

db/migration/20200130083147_create_schema.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 
 	"github.com/navidrome/navidrome/log"
-	"github.com/pressly/goose"
+	"github.com/pressly/goose/v3"
 )
 
 func init() {

db/migration/20200131183653_standardize_item_type.go

@@ -3,7 +3,7 @@ package migrations
 import (
 	"database/sql"
 
-	"github.com/pressly/goose"
+	"github.com/pressly/goose/v3"
 )
 
 func init() {

db/migration/20200208222418_add_defaults_to_annotations.go

@@ -3,7 +3,7 @@ package migrations
 import (
 	"database/sql"
 
-	"github.com/pressly/goose"
+	"github.com/pressly/goose/v3"
 )
 
 func init() {

db/migration/20200220143731_change_duration_to_float.go

@@ -3,7 +3,7 @@ package migrations
 import (
 	"database/sql"
 
-	"github.com/pressly/goose"
+	"github.com/pressly/goose/v3"
 )
 
 func init() {

db/migration/20200310171621_enable_search_by_albumartist.go

@@ -3,7 +3,7 @@ package migrations
 import (
 	"database/sql"
 
-	"github.com/pressly/goose"
+	"github.com/pressly/goose/v3"
 )
 
 func init() {

db/migration/20200310181627_add_transcoding_and_player_tables.go

@@ -3,7 +3,7 @@ package migrations
 import (
 	"database/sql"
 
-	"github.com/pressly/goose"
+	"github.com/pressly/goose/v3"
 )
 
 func init() {

db/migration/20200319211049_merge_search_into_main_tables.go

@@ -3,7 +3,7 @@ package migrations
 import (
 	"database/sql"
 
-	"github.com/pressly/goose"
+	"github.com/pressly/goose/v3"
 )
 
 func init() {

db/migration/20200325185135_add_album_artist_id.go

@@ -3,7 +3,7 @@ package migrations
 import (
 	"database/sql"
 
-	"github.com/pressly/goose"
+	"github.com/pressly/goose/v3"
 )
 
 func init() {