Refactor included handling

Based on Aura and JSONAPI

.devcontainer/Dockerfile

@@ -2,7 +2,7 @@
 
 # [Choice] Go version: 1, 1.15, 1.14
 ARG VARIANT="1"
-FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}
+FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT}
 
 # [Option] Install Node.js
 ARG INSTALL_NODE="true"
@@ -17,4 +17,4 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # RUN go get -x <your-dependency-or-tool>
 
 # [Optional] Uncomment this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

.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.23",
+			"VARIANT": "1.20",
 			// Options
 			"INSTALL_NODE": "true",
-			"NODE_VERSION": "v20"
+			"NODE_VERSION": "v18"
 		}
 	},
 	"workspaceMount": "",
@@ -18,37 +18,33 @@
 		"--volume=${localWorkspaceFolder}:/workspaces/${localWorkspaceFolderBasename}:Z"
 	],
 	// Set *default* container specific settings.json values on container create.
-	"customizations": {
-		"vscode": {
-			"settings": {
-				"terminal.integrated.shell.linux": "/bin/bash",
-				"go.useGoProxyToCheckForToolUpdates": false,
-				"go.useLanguageServer": true,
-				"go.gopath": "/go",
-				"go.goroot": "/usr/local/go",
-				"go.toolsGopath": "/go/bin",
-				"go.formatTool": "goimports",
-				"go.lintOnSave": "package",
-				"go.lintTool": "golangci-lint",
-				"editor.formatOnSave": true,
-				"[javascript]": {
-					"editor.defaultFormatter": "esbenp.prettier-vscode"
-				},
-				"[json]": {
-					"editor.defaultFormatter": "esbenp.prettier-vscode"
-				},
-				"[jsonc]": {
-					"editor.defaultFormatter": "vscode.json-language-features"
-				}
-			},
-			// Add the IDs of extensions you want installed when the container is created.
-			"extensions": [
-				"golang.Go",
-				"esbenp.prettier-vscode",
-				"tamasfe.even-better-toml"
-			]
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash",
+		"go.useGoProxyToCheckForToolUpdates": false,
+		"go.useLanguageServer": true,
+		"go.gopath": "/go",
+		"go.goroot": "/usr/local/go",
+		"go.toolsGopath": "/go/bin",
+		"go.formatTool": "goimports",
+		"go.lintOnSave": "package",
+		"go.lintTool": "golangci-lint",
+		"editor.formatOnSave": true,
+		"[javascript]": {
+			"editor.defaultFormatter": "esbenp.prettier-vscode"
+		},
+		"[json]": {
+			"editor.defaultFormatter": "esbenp.prettier-vscode"
+		},
+		"[jsonc]": {
+			"editor.defaultFormatter": "vscode.json-language-features"
 		}
 	},
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"golang.Go",
+		"esbenp.prettier-vscode",
+		"tamasfe.even-better-toml"
+	],
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [
 		4533,

.dockerignore

@@ -1,18 +1,10 @@
 .DS_Store
 ui/node_modules
-ui/build
-!ui/build/.gitkeep
 Dockerfile
 docker-compose*.yml
 data
 *.db
 testDB
 navidrome
+navidrome.db
 navidrome.toml
-tmp
-!tmp/taglib
-dist
-binaries
-cache
-music
-!Dockerfile

.github/actions/download-taglib/action.yml

@@ -1,23 +0,0 @@
-name: 'Download TagLib'
-description: 'Downloads and extracts the TagLib library, adding it to PKG_CONFIG_PATH'
-inputs:
-  version:
-    description: 'Version of TagLib to download'
-    required: true
-  platform:
-    description: 'Platform to download TagLib for'
-    default: 'linux-amd64'
-runs:
-  using: 'composite'
-  steps:
-    - name: Download TagLib
-      shell: bash
-      run: |
-        mkdir -p /tmp/taglib
-        cd /tmp
-        FILE=taglib-${{ inputs.platform }}.tar.gz
-        wget https://github.com/navidrome/cross-taglib/releases/download/v${{ inputs.version }}/${FILE}
-        tar -xzf ${FILE} -C taglib
-        PKG_CONFIG_PREFIX=/tmp/taglib
-        echo "PKG_CONFIG_PREFIX=${PKG_CONFIG_PREFIX}" >> $GITHUB_ENV
-        echo "PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${PKG_CONFIG_PREFIX}/lib/pkgconfig" >> $GITHUB_ENV

.github/actions/prepare-docker/action.yml

@@ -1,84 +0,0 @@
-name: 'Prepare Docker Buildx environment'
-description: 'Downloads and extracts the TagLib library, adding it to PKG_CONFIG_PATH'
-inputs:
-  github_token:
-    description: 'GitHub token'
-    required: true
-    default: ''
-  hub_repository:
-    description: 'Docker Hub repository to push images to'
-    required: false
-    default: ''
-  hub_username:
-    description: 'Docker Hub username'
-    required: false
-    default: ''
-  hub_password:
-    description: 'Docker Hub password'
-    required: false
-    default: ''
-outputs:
-  tags:
-    description: 'Docker image tags'
-    value: ${{ steps.meta.outputs.tags }}
-  labels:
-    description: 'Docker image labels'
-    value: ${{ steps.meta.outputs.labels }}
-  annotations:
-    description: 'Docker image annotations'
-    value: ${{ steps.meta.outputs.annotations }}
-  version:
-    description: 'Docker image version'
-    value: ${{ steps.meta.outputs.version }}
-  hub_repository:
-    description: 'Docker Hub repository'
-    value: ${{ env.DOCKER_HUB_REPO }}
-  hub_enabled:
-    description: 'Is Docker Hub enabled'
-    value: ${{ env.DOCKER_HUB_ENABLED }}
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Check Docker Hub configuration
-      shell: bash
-      run: |
-        if [ -z "${{inputs.hub_repository}}" ]; then
-          echo "DOCKER_HUB_REPO=none" >> $GITHUB_ENV
-          echo "DOCKER_HUB_ENABLED=false" >> $GITHUB_ENV
-        else
-          echo "DOCKER_HUB_REPO=${{inputs.hub_repository}}" >> $GITHUB_ENV
-          echo "DOCKER_HUB_ENABLED=true" >> $GITHUB_ENV
-        fi
-
-    - name: Login to Docker Hub
-      if: inputs.hub_username != '' && inputs.hub_password != ''
-      uses: docker/login-action@v3
-      with:
-        username: ${{ inputs.hub_username }}
-        password: ${{ inputs.hub_password }}
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ inputs.github_token }}
-
-    - name: Set up Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Extract metadata for Docker image
-      id: meta
-      uses: docker/metadata-action@v5
-      with:
-        labels: |
-          maintainer=deluan@navidrome.org
-        images: |
-          name=${{env.DOCKER_HUB_REPO}},enable=${{env.DOCKER_HUB_ENABLED}}
-          name=ghcr.io/${{ github.repository }}
-        tags: |
-          type=ref,event=pr
-          type=semver,pattern={{version}}
-          type=raw,value=develop,enable={{is_default_branch}}

.github/dependabot.yml

@@ -10,13 +10,3 @@ updates:
   schedule:
     interval: weekly
   open-pull-requests-limit: 10
-- package-ecosystem: docker
-  directory: "/"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 10
-- package-ecosystem: github-actions
-  directory: "/.github/workflows"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 10

.github/workflows/pipeline.dockerfile

@@ -0,0 +1,38 @@
+#####################################################
+### Copy platform specific binary
+FROM bash as copy-binary
+ARG TARGETPLATFORM
+
+RUN echo "Target Platform = ${TARGETPLATFORM}"
+
+COPY dist .
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ];  then cp navidrome_linux_amd64_linux_amd64_v1/navidrome /navidrome; fi
+RUN if [ "$TARGETPLATFORM" = "linux/386" ];  then cp navidrome_linux_386_linux_386/navidrome /navidrome; fi
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ];  then cp navidrome_linux_arm64_linux_arm64/navidrome /navidrome; fi
+RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ]; then cp navidrome_linux_arm_linux_arm_6/navidrome /navidrome; fi
+RUN if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then cp navidrome_linux_arm_linux_arm_7/navidrome /navidrome; fi
+RUN chmod +x /navidrome
+
+
+#####################################################
+### Build Final Image
+FROM alpine as release
+LABEL maintainer="deluan@navidrome.org"
+
+# Install ffmpeg and output build config
+RUN apk add --no-cache ffmpeg
+RUN ffmpeg -buildconf
+
+COPY --from=copy-binary /navidrome /app/
+
+VOLUME ["/data", "/music"]
+ENV ND_MUSICFOLDER /music
+ENV ND_DATAFOLDER /data
+ENV ND_PORT 4533
+ENV GODEBUG "asyncpreemptoff=1"
+
+EXPOSE ${ND_PORT}
+HEALTHCHECK CMD wget -O- http://localhost:${ND_PORT}/ping || exit 1
+WORKDIR /app
+
+ENTRYPOINT ["/app/navidrome"]

.github/workflows/pipeline.yml

@@ -1,4 +1,4 @@
-name: "Pipeline: Test, Lint, Build"
+name: 'Pipeline: Test, Lint, Build'
 on:
   push:
     branches:
@@ -9,117 +9,103 @@ on:
     branches:
       - master
 
-concurrency:
-  group: ${{ startsWith(github.ref, 'refs/tags/v') && 'tag' || 'branch' }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  CROSS_TAGLIB_VERSION: "2.0.2-1"
-  IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') && 'true' || 'false' }}
-
 jobs:
-  git-version:
-    name: Get version info
-    runs-on: ubuntu-latest
-    outputs:
-      git_tag: ${{ steps.git-version.outputs.GIT_TAG }}
-      git_sha: ${{ steps.git-version.outputs.GIT_SHA }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Show git version info
-        run: |
-          echo "git describe (dirty): $(git describe --dirty --always --tags)"
-          echo "git describe --tags: $(git describe --tags `git rev-list --tags --max-count=1`)"
-          echo "git tag: $(git tag --sort=-committerdate | head -n 1)"
-          echo "github_ref: $GITHUB_REF"
-          echo "github_head_sha: ${{ github.event.pull_request.head.sha }}"
-          git tag -l
-      - name: Determine git current SHA and latest tag
-        id: git-version
-        run: |
-          GIT_TAG=$(git tag --sort=-committerdate | head -n 1)
-          if [ -n "$GIT_TAG" ]; then
-            if [[ "$GITHUB_REF" != refs/tags/* ]]; then
-              GIT_TAG=${GIT_TAG}-SNAPSHOT
-            fi
-            echo "GIT_TAG=$GIT_TAG" >> $GITHUB_OUTPUT
-          fi
-          GIT_SHA=$(git rev-parse --short HEAD)
-          PR_NUM=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")
-          if [[ $PR_NUM != "null" ]]; then
-            GIT_SHA=$(echo "${{ github.event.pull_request.head.sha }}" | cut -c1-8)
-            GIT_SHA="pr-${PR_NUM}/${GIT_SHA}"
-          fi
-          echo "GIT_SHA=$GIT_SHA" >> $GITHUB_OUTPUT
-          
-          echo "GIT_TAG=$GIT_TAG"
-          echo "GIT_SHA=$GIT_SHA"
-
   go-lint:
     name: Lint Go code
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Install taglib
+        run: sudo apt-get install libtag1-dev
 
-      - name: Download TagLib
-        uses: ./.github/actions/download-taglib
+      - name: Set up Go 1.20
+        uses: actions/setup-go@v3
         with:
-          version: ${{ env.CROSS_TAGLIB_VERSION }}
+          go-version: 1.20.x
+
+      - uses: actions/checkout@v3
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v3
         with:
           version: latest
-          problem-matchers: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           args: --timeout 2m
 
-      - name: Run go goimports
-        run: go run golang.org/x/tools/cmd/goimports@latest -w `find . -name '*.go' | grep -v '_gen.go$'`
+      - name: Install goimports
+        run: go install golang.org/x/tools/cmd/goimports
+
+      - run: goimports -w `find . -name '*.go' | grep -v '_gen.go$'`
       - run: go mod tidy
       - name: Verify no changes from goimports and go mod tidy
         run: |
           git status --porcelain
           if [ -n "$(git status --porcelain)" ]; then
-            echo 'To fix this check, run "make format" and commit the changes'
+            echo 'To fix this check, run "goimports -w $(find . -name '*.go' | grep -v '_gen.go$') && go mod tidy"'
             exit 1
           fi
 
-  go:
-    name: Test Go code
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
-      - name: Download TagLib
-        uses: ./.github/actions/download-taglib
+      - uses: actions/setup-node@v3
         with:
-          version: ${{ env.CROSS_TAGLIB_VERSION }}
+          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
+    strategy:
+      matrix:
+        go_version: [1.20.x,1.19.x]
+    steps:
+      - name: Install taglib
+        run: sudo apt-get install libtag1-dev
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Set up Go ${{ matrix.go_version }}
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go_version }}
+          cache: true
 
       - name: Download dependencies
+        if: steps.cache-go.outputs.cache-hit != 'true'
+        continue-on-error: ${{contains(matrix.go_version, 'beta') || contains(matrix.go_version, 'rc')}}
         run: go mod download
 
       - name: Test
-        run: |
-          pkg-config --define-prefix --cflags --libs taglib # for debugging
-          go test -shuffle=on -tags netgo -race -cover ./... -v
+        continue-on-error: ${{contains(matrix.go_version, 'beta') || contains(matrix.go_version, 'rc')}}
+        run: go test -shuffle=on -race -cover ./... -v
 
   js:
-    name: Test JS code
+    name: Build JS bundle
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 20
-          cache: "npm"
-          cache-dependency-path: "**/package-lock.json"
+          node-version: 18
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: npm install dependencies
         run: |
@@ -141,289 +127,119 @@ jobs:
           cd ui
           npm run build
 
-  i18n-lint:
-    name: Lint i18n files
+      - uses: actions/upload-artifact@v3
+        with:
+          name: js-bundle
+          path: ui/build
+
+  binaries:
+    name: Build binaries
+    needs: [js, go, go-lint]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - run: |
-          set -e
-          for file in resources/i18n/*.json; do
-            echo "Validating $file"
-            if ! jq empty "$file" 2>error.log; then
-              error_message=$(cat error.log)
-              line_number=$(echo "$error_message" | grep -oP 'line \K[0-9]+')
-              echo "::error file=$file,line=$line_number::$error_message"
-              exit 1
-            fi
-          done
-
-  check-push-enabled:
-    name: Check Docker configuration
-    runs-on: ubuntu-latest
-    outputs:
-      is_enabled: ${{ steps.check.outputs.is_enabled }}
-    steps:
-      - name: Check if Docker push is configured
-        id: check
-        run: echo "is_enabled=${{ secrets.DOCKER_HUB_USERNAME != '' }}" >> $GITHUB_OUTPUT
-
-  build:
-    name: Build
-    needs: [js, go, go-lint, i18n-lint, git-version, check-push-enabled]
-    strategy:
-      matrix:
-        platform: [ linux/amd64, linux/arm64, linux/arm/v5, linux/arm/v6, linux/arm/v7, linux/386, darwin/amd64, darwin/arm64, windows/amd64, windows/386 ]
-    runs-on: ubuntu-latest
-    env:
-      IS_LINUX: ${{ startsWith(matrix.platform, 'linux/') && 'true' || 'false' }}
-      IS_ARMV5: ${{ matrix.platform == 'linux/arm/v5' && 'true' || 'false' }}
-      IS_DOCKER_PUSH_CONFIGURED: ${{ needs.check-push-enabled.outputs.is_enabled == 'true' }}
-      DOCKER_BUILD_SUMMARY: false
-      GIT_SHA: ${{ needs.git-version.outputs.git_sha }}
-      GIT_TAG: ${{ needs.git-version.outputs.git_tag }}
-    steps:
-      - name: Sanitize platform name
-        id: set-platform
-        run: |
-          PLATFORM=$(echo ${{ matrix.platform }} | tr '/' '_')
-          echo "PLATFORM=$PLATFORM" >> $GITHUB_ENV
-
-      - uses: actions/checkout@v4
-
-      - name: Prepare Docker Buildx
-        uses: ./.github/actions/prepare-docker
-        id: docker
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          hub_repository: ${{ vars.DOCKER_HUB_REPO }}
-          hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          hub_password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-
-      - name: Build Binaries
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile
-          platforms: ${{ matrix.platform }}
-          outputs: |
-            type=local,dest=./output/${{ env.PLATFORM }}
-          target: binary
-          build-args: |
-            GIT_SHA=${{ env.GIT_SHA }}
-            GIT_TAG=${{ env.GIT_TAG }}
-            CROSS_TAGLIB_VERSION=${{ env.CROSS_TAGLIB_VERSION }}
-
-      - name: Upload Binaries
-        uses: actions/upload-artifact@v4
-        with:
-          name: navidrome-${{ env.PLATFORM }}
-          path: ./output
-          retention-days: 7
-
-      - name: Build and push image by digest
-        id: push-image
-        if: env.IS_LINUX == 'true' && env.IS_DOCKER_PUSH_CONFIGURED == 'true' && env.IS_ARMV5 == 'false'
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile
-          platforms: ${{ matrix.platform }}
-          labels: ${{ steps.docker.outputs.labels }}
-          build-args: |
-            GIT_SHA=${{ env.GIT_SHA }}
-            GIT_TAG=${{ env.GIT_TAG }}
-            CROSS_TAGLIB_VERSION=${{ env.CROSS_TAGLIB_VERSION }}
-          outputs: |
-            type=image,name=${{ steps.docker.outputs.hub_repository }},push-by-digest=true,name-canonical=true,push=${{ steps.docker.outputs.hub_enabled }}
-            type=image,name=ghcr.io/${{ github.repository }},push-by-digest=true,name-canonical=true,push=true
-
-      - name: Export digest
-        if: env.IS_LINUX == 'true' && env.IS_DOCKER_PUSH_CONFIGURED == 'true' && env.IS_ARMV5 == 'false'
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.push-image.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"          
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        if: env.IS_LINUX == 'true' && env.IS_DOCKER_PUSH_CONFIGURED == 'true' && env.IS_ARMV5 == 'false'
-        with:
-          name: digests-${{ env.PLATFORM }}
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  push-manifest:
-    name: Push Docker manifest
-    runs-on: ubuntu-latest
-    needs: [build, check-push-enabled]
-    if: needs.check-push-enabled.outputs.is_enabled == 'true'
-    env:
-      REGISTRY_IMAGE: ghcr.io/${{ github.repository }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: Prepare Docker Buildx
-        uses: ./.github/actions/prepare-docker
-        id: docker
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          hub_repository: ${{ vars.DOCKER_HUB_REPO }}
-          hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          hub_password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-
-      - name: Create manifest list and push to ghcr.io
-        working-directory: /tmp/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)          
-
-      - name: Create manifest list and push to Docker Hub
-        working-directory: /tmp/digests
-        if: vars.DOCKER_HUB_REPO != ''
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ vars.DOCKER_HUB_REPO }}@sha256:%s ' *)          
-
-      - name: Inspect image in ghcr.io
-        run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.docker.outputs.version }}
-
-      - name: Inspect image in Docker Hub
-        if: vars.DOCKER_HUB_REPO != ''
-        run: |
-          docker buildx imagetools inspect ${{ vars.DOCKER_HUB_REPO }}:${{ steps.docker.outputs.version }}
-
-      - name: Delete unnecessary digest artifacts
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          for artifact in $(gh api repos/${{ github.repository }}/actions/artifacts | jq -r '.artifacts[] | select(.name | startswith("digests-")) | .id'); do
-            gh api --method DELETE repos/${{ github.repository }}/actions/artifacts/$artifact
-          done
-
-  msi:
-    name: Build Windows installers
-    needs: [build, git-version]
-    runs-on: ubuntu-24.04
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/download-artifact@v4
-        with:
-          path: ./binaries
-          pattern: navidrome-windows*
-          merge-multiple: true
-
-      - name: Install Wix
-        run: sudo apt-get install -y wixl jq
-
-      - name: Build MSI
-        env:
-          GIT_TAG: ${{ needs.git-version.outputs.git_tag }}
-        run: |
-          rm -rf binaries/msi
-          sudo GIT_TAG=$GIT_TAG release/wix/build_msi.sh ${GITHUB_WORKSPACE} 386
-          sudo GIT_TAG=$GIT_TAG release/wix/build_msi.sh ${GITHUB_WORKSPACE} amd64
-          du -h binaries/msi/*.msi
-
-      - name: Upload MSI files
-        uses: actions/upload-artifact@v4
-        with:
-          name: navidrome-windows-installers
-          path: binaries/msi/*.msi
-          retention-days: 7
-
-  release:
-    name: Package/Release
-    needs: [build, msi]
-    runs-on: ubuntu-latest
-    outputs:
-      package_list: ${{ steps.set-package-list.outputs.package_list }}
-    steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Code
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          fetch-tags: true
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
-          path: ./binaries
-          pattern: navidrome-*
-          merge-multiple: true
+          name: js-bundle
+          path: ui/build
 
-      - run: ls -lR ./binaries
-
-      - name: Set RELEASE_FLAGS for snapshot releases
-        if: env.IS_RELEASE == 'false'
-        run: echo 'RELEASE_FLAGS=--skip=publish --snapshot' >> $GITHUB_ENV
-
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v6
-        with:
-          version: '~> v2'
-          args: "release --clean -f release/goreleaser.yml ${{ env.RELEASE_FLAGS }}"
+      - name: Config /github/workspace folder as trusted
+        uses: docker://deluan/ci-goreleaser:1.20.3-1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Remove build artifacts
-        run: |
-          ls -l ./dist
-          rm ./dist/*.tar.gz ./dist/*.zip
-
-      - name: Upload all-packages artifact
-        uses: actions/upload-artifact@v4
         with:
-          name: packages
-          path: dist/navidrome_0*
+          args: /bin/bash -c "git config --global --add safe.directory /github/workspace;  git describe --dirty --always --tags"
 
-      - id: set-package-list
-        name: Export list of generated packages
-        run: |
-          cd dist
-          set +x
-          ITEMS=$(ls navidrome_0* | sed 's/^navidrome_0[^_]*_linux_//' | jq -R -s -c 'split("\n")[:-1]')
-          echo $ITEMS
-          echo "package_list=${ITEMS}" >> $GITHUB_OUTPUT
+      - name: Run GoReleaser - SNAPSHOT
+        if: startsWith(github.ref, 'refs/tags/') != true
+        uses: docker://deluan/ci-goreleaser:1.20.3-1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: goreleaser release --rm-dist --skip-publish --snapshot
 
-  upload-packages:
-    name: Upload Linux PKG
+      - name: Run GoReleaser - RELEASE
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: docker://deluan/ci-goreleaser:1.20.3-1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: goreleaser release --rm-dist
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: binaries
+          path: |
+            dist
+            !dist/*.tar.gz
+            !dist/*.zip
+
+  docker:
+    name: Build and publish Docker images
+    needs: [binaries]
     runs-on: ubuntu-latest
-    needs: [release]
-    strategy:
-      matrix:
-        item: ${{ fromJson(needs.release.outputs.package_list) }}
+    env:
+      DOCKER_IMAGE: ${{secrets.DOCKER_IMAGE}}
     steps:
-      - name: Download all-packages artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: packages
-          path: ./dist
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v2
+        if: env.DOCKER_IMAGE != ''
 
-      - name: Upload all-packages artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: navidrome_linux_${{ matrix.item }}
-          path: dist/navidrome_0*_linux_${{ matrix.item }}
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+        if: env.DOCKER_IMAGE != ''
 
-#  delete-artifacts:
-#    name: Delete unused artifacts
-#    runs-on: ubuntu-latest
-#    needs: [upload-packages]
-#    steps:
-#      - name: Delete all-packages artifact
-#        env:
-#          GH_TOKEN: ${{ github.token }}
-#        run: |
-#          for artifact in $(gh api repos/${{ github.repository }}/actions/artifacts | jq -r '.artifacts[] | select(.name | startswith("packages")) | .id'); do
-#            gh api --method DELETE repos/${{ github.repository }}/actions/artifacts/$artifact
-#          done
+      - uses: actions/checkout@v3
+        if: env.DOCKER_IMAGE != ''
+
+      - uses: actions/download-artifact@v3
+        if: env.DOCKER_IMAGE != ''
+        with:
+          name: binaries
+          path: dist
+
+      - name: Login to Docker Hub
+        if: env.DOCKER_IMAGE != ''
+        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

@@ -12,9 +12,8 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: dessant/lock-threads@v4.0.0
         with:
-          process-only: 'issues, prs'
           issue-inactive-days: 120
           pr-inactive-days: 120
           log-output: true
@@ -28,7 +27,7 @@ jobs:
             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@v9
+      - uses: actions/stale@v7
         with:
           operations-per-run: 999
           days-before-issue-stale: 180

.github/workflows/update-translations.sh

@@ -1,53 +0,0 @@
-#!/bin/sh
-
-set -e
-
-I18N_DIR=resources/i18n
-
-# Function to process JSON: remove empty attributes and sort
-process_json() {
-  jq 'walk(if type == "object" then with_entries(select(.value != null and .value != "" and .value != [] and .value != {})) | to_entries | sort_by(.key) | from_entries else . end)' "$1"
-}
-
-check_lang_diff() {
-  filename=${I18N_DIR}/"$1".json
-  url=$(curl -s -X POST https://poeditor.com/api/ \
-    -d api_token="${POEDITOR_APIKEY}" \
-    -d action="export" \
-    -d id="${POEDITOR_PROJECTID}" \
-    -d language="$1" \
-    -d type="key_value_json" | jq -r .item)
-  if [ -z "$url" ]; then
-    echo "Failed to export $1"
-    return 1
-  fi
-  curl -sSL "$url" > poeditor.json
-
-  process_json "$filename" > "$filename".tmp
-  process_json poeditor.json > poeditor.tmp
-  
-  diff=$(diff -u "$filename".tmp poeditor.tmp) || true
-  if [ -n "$diff" ]; then
-    echo "$diff"
-    mv poeditor.json "$filename"
-  fi
-  
-  rm -f poeditor.json poeditor.tmp "$filename".tmp
-}
-
-for file in ${I18N_DIR}/*.json; do
-  name=$(basename "$file")
-  code=$(echo "$name" | cut -f1 -d.)
-  lang=$(jq -r .languageName < "$file")
-  echo "Downloading $lang ($code)"
-  check_lang_diff "$code"
-done
-
-
-# List changed languages to stderr
-languages=""
-for file in $(git diff --name-only --exit-code | grep json); do
-  lang=$(jq -r .languageName < "$file")
-  languages="${languages}$(echo $lang | tr -d '\n'), "
-done
-echo "${languages%??}" 1>&2

.github/workflows/update-translations.yml

@@ -8,26 +8,21 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'navidrome' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Get updated translations
-        id: poeditor
         env:
           POEDITOR_PROJECTID: ${{ secrets.POEDITOR_PROJECTID }}
           POEDITOR_APIKEY: ${{ secrets.POEDITOR_APIKEY }}
         run: |
-          .github/workflows/update-translations.sh 2> title.tmp
-          title=$(cat title.tmp)
-          echo "::set-output name=title::$title"
-          rm title.tmp
+          ./update-translations.sh
       - name: Show changes, if any
         run: |
           git status --porcelain
           git diff
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.PAT }}
-          author: "navidrome-bot <navidrome-bot@navidrome.org>"
-          commit-message: "fix(ui): update ${{ steps.poeditor.outputs.title }} translations from POEditor"
-          title: "fix(ui): update ${{ steps.poeditor.outputs.title }} translations from POEditor"
+          commit-message: Update translations
+          title: Update translations from POEditor
           branch: update-translations

.gitignore

@@ -11,17 +11,18 @@ wiki
 TODO.md
 var
 navidrome.toml
-!release/linux/navidrome.toml
 master.zip
 testDB
+navidrome.db
 cache/*
 *.swp
+embedded_gen.go
 dist
 music
-*.db*
+navidrome.db-shm
+navidrome.db-wal
+tags
 .gitinfo
 docker-compose.yml
 !contrib/docker-compose.yml
-binaries
-taglib
-navidrome-master
+/api/openapi.yaml

.golangci.yml

@@ -1,6 +1,5 @@
 run:
-  build-tags:
-    - netgo
+  go: "1.19"
 
 linters:
   enable:
@@ -8,11 +7,11 @@ linters:
     - asciicheck
     - bidichk
     - bodyclose
-    - copyloopvar
     - dogsled
     - durationcheck
     - errcheck
     - errorlint
+    - exportloopref
     - gocyclo
     - goprintffuncname
     - gosec
@@ -29,13 +28,8 @@ linters:
     - unused
     - whitespace
 
-linters-settings:
-  govet:
-    enable:
-      - nilness
-  gosec:
-    excludes:
-      - G501
-      - G401
-      - G505
-      - G115 # Can't check context, where the warning is clearly a false positive. See discussion in https://github.com/securego/gosec/pull/1149
+issues:
+  exclude-rules:
+    - linters:
+        - gosec
+      text: "(G501|G401|G505):"

.goreleaser.yml

@@ -0,0 +1,139 @@
+# GoReleaser config
+project_name: navidrome
+
+builds:
+  - id: navidrome_linux_amd64
+    env:
+      - CGO_ENABLED=1
+    goos:
+      - linux
+    goarch:
+      - amd64
+    flags:
+      - -tags=netgo
+    ldflags:
+      - "-extldflags '-static -lz'"
+      - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}}
+
+  - id: navidrome_linux_386
+    env:
+      - CGO_ENABLED=1
+      - PKG_CONFIG_PATH=/i386/lib/pkgconfig
+    goos:
+      - linux
+    goarch:
+      - "386"
+    flags:
+      - -tags=netgo
+    ldflags:
+      - "-extldflags '-static'"
+      - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}}
+
+  - id: navidrome_linux_arm
+    env:
+      - CGO_ENABLED=1
+      - CC=arm-linux-gnueabi-gcc
+      - CXX=arm-linux-gnueabi-g++
+      - PKG_CONFIG_PATH=/arm/lib/pkgconfig
+    goos:
+      - linux
+    goarch:
+      - arm
+    goarm:
+      - "5"
+      - "6"
+      - "7"
+    flags:
+      - -tags=netgo
+    ldflags:
+      - "-extldflags '-static'"
+      - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}}
+
+  - id: navidrome_linux_arm64
+    env:
+      - CGO_ENABLED=1
+      - CC=aarch64-linux-gnu-gcc
+      - CXX=aarch64-linux-gnu-g++
+      - PKG_CONFIG_PATH=/arm64/lib/pkgconfig
+    goos:
+      - linux
+    goarch:
+      - arm64
+    flags:
+      - -tags=netgo
+    ldflags:
+      - "-extldflags '-static'"
+      - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}}
+
+  - id: navidrome_windows_386
+    env:
+      - CGO_ENABLED=1
+      - CC=i686-w64-mingw32-gcc
+      - CXX=i686-w64-mingw32-g++
+      - PKG_CONFIG_PATH=/mingw32/lib/pkgconfig
+    goos:
+      - windows
+    goarch:
+      - "386"
+    flags:
+      - -tags=netgo
+    ldflags:
+      - "-extldflags '-static'"
+      - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}}
+
+  - id: navidrome_windows_amd64
+    env:
+      - CGO_ENABLED=1
+      - CC=x86_64-w64-mingw32-gcc
+      - CXX=x86_64-w64-mingw32-g++
+      - PKG_CONFIG_PATH=/mingw64/lib/pkgconfig
+    goos:
+      - windows
+    goarch:
+      - amd64
+    flags:
+      - -tags=netgo
+    ldflags:
+      - "-extldflags '-static'"
+      - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}}
+
+  - id: navidrome_darwin_amd64
+    env:
+      - CGO_ENABLED=1
+      - CC=o64-clang
+      - CXX=o64-clang++
+      - PKG_CONFIG_PATH=/darwin/lib/pkgconfig
+    goos:
+      - darwin
+    goarch:
+      - amd64
+    flags:
+      - -tags=netgo
+    ldflags:
+      - -s -w -X github.com/navidrome/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/navidrome/navidrome/consts.gitTag={{.Version}}
+
+archives:
+  - format_overrides:
+      - goos: windows
+        format: zip
+    replacements:
+      darwin: macOS
+      linux: Linux
+      windows: Windows
+      386: i386
+      amd64: x86_64
+
+checksum:
+  name_template: "{{ .ProjectName }}_checksums.txt"
+
+snapshot:
+  name_template: "{{ .Tag }}-SNAPSHOT"
+
+release:
+  draft: true
+
+changelog:
+  # sort: asc
+  filters:
+    exclude:
+      - "^docs:"

.nvmrc

@@ -1 +1 @@
-v20
+v18

CONTRIBUTING.md

@@ -48,15 +48,14 @@ This improves the readability of the messages
 It can be one of the following:
 1. **feat**: Addition of a new feature
 2. **fix**: Bug fix
-3. **sec**: Fixing security issues
-4. **docs**: Documentation Changes
-5. **style**: Changes to styling
-6. **refactor**: Refactoring of code
-7. **perf**: Code that affects performance
-8. **test**: Updating or improving the current tests
-9. **build**: Changes to Build process
-10. **revert**: Reverting to a previous commit
-11. **chore** : updating grunt tasks etc
+3. **docs**: Documentation Changes
+4. **style**: Changes to styling
+5. **refactor**: Refactoring of code
+6. **perf**: Code that affects performance
+7. **test**: Updating or improving the current tests
+8. **build**: Changes to Build process
+9. **revert**: Reverting to a previous commit 
+10. **chore** : updating grunt tasks etc
 
 If there is a breaking change in your Pull Request, please add `BREAKING CHANGE` in the optional body section
 

Dockerfile

@@ -1,144 +0,0 @@
-FROM --platform=$BUILDPLATFORM ghcr.io/crazy-max/osxcross:14.5-debian AS osxcross
-
-########################################################################################################################
-### Build xx (orignal image: tonistiigi/xx)
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/alpine:3.21 AS xx-build
-
-# v1.5.0
-ENV XX_VERSION=b4e4c451c778822e6742bfc9d9a91d7c7d885c8a
-
-RUN apk add -U --no-cache git
-RUN git clone https://github.com/tonistiigi/xx && \
-    cd xx && \
-    git checkout ${XX_VERSION} && \
-    mkdir -p /out && \
-    cp src/xx-* /out/
-
-RUN cd /out && \
-    ln -s xx-cc /out/xx-clang && \
-    ln -s xx-cc /out/xx-clang++ && \
-    ln -s xx-cc /out/xx-c++ && \
-    ln -s xx-apt /out/xx-apt-get
-
-# xx mimics the original tonistiigi/xx image
-FROM scratch AS xx
-COPY --from=xx-build /out/ /usr/bin/
-
-########################################################################################################################
-### Get TagLib
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/alpine:3.21 AS taglib-build
-ARG TARGETPLATFORM
-ARG CROSS_TAGLIB_VERSION=2.0.2-1
-ENV CROSS_TAGLIB_RELEASES_URL=https://github.com/navidrome/cross-taglib/releases/download/v${CROSS_TAGLIB_VERSION}/
-
-RUN <<EOT
-    PLATFORM=$(echo ${TARGETPLATFORM} | tr '/' '-')
-    FILE=taglib-${PLATFORM}.tar.gz
-
-    DOWNLOAD_URL=${CROSS_TAGLIB_RELEASES_URL}${FILE}
-    wget ${DOWNLOAD_URL}
-
-    mkdir /taglib
-    tar -xzf ${FILE} -C /taglib
-EOT
-
-########################################################################################################################
-### Build Navidrome UI
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/node:lts-alpine AS ui
-WORKDIR /app
-
-# Install node dependencies
-COPY ui/package.json ui/package-lock.json ./
-COPY ui/bin/ ./bin/
-RUN npm ci
-
-# Build bundle
-COPY ui/ ./
-RUN npm run build -- --outDir=/build
-
-FROM scratch AS ui-bundle
-COPY --from=ui /build /build
-
-########################################################################################################################
-### Build Navidrome binary
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.23-bookworm AS base
-RUN apt-get update && apt-get install -y clang lld
-COPY --from=xx / /
-WORKDIR /workspace
-
-FROM --platform=$BUILDPLATFORM base AS build
-
-# Install build dependencies for the target platform
-ARG TARGETPLATFORM
-ARG GIT_SHA
-ARG GIT_TAG
-
-RUN xx-apt install -y binutils gcc g++ libc6-dev zlib1g-dev
-RUN xx-verify --setup
-
-RUN --mount=type=bind,source=. \
-    --mount=type=cache,target=/root/.cache \
-    --mount=type=cache,target=/go/pkg/mod \
-    go mod download
-
-RUN --mount=type=bind,source=. \
-    --mount=from=ui,source=/build,target=./ui/build,ro \
-    --mount=from=osxcross,src=/osxcross/SDK,target=/xx-sdk,ro \
-    --mount=type=cache,target=/root/.cache \
-    --mount=type=cache,target=/go/pkg/mod \
-    --mount=from=taglib-build,target=/taglib,src=/taglib,ro <<EOT
-
-    # Setup CGO cross-compilation environment
-    xx-go --wrap
-    export CGO_ENABLED=1
-    export PKG_CONFIG_PATH=/taglib/lib/pkgconfig
-    cat $(go env GOENV)
-
-    # Only Darwin (macOS) requires clang (default), Windows requires gcc, everything else can use any compiler.
-    # So let's use gcc for everything except Darwin.
-    if [ "$(xx-info os)" != "darwin" ]; then
-        export CC=$(xx-info)-gcc
-        export CXX=$(xx-info)-g++
-        export LD_EXTRA="-extldflags '-static -latomic'"
-    fi
-    if [ "$(xx-info os)" = "windows" ]; then
-        export EXT=".exe"
-    fi
-
-    go build -tags=netgo -ldflags="${LD_EXTRA} -w -s \
-        -X github.com/navidrome/navidrome/consts.gitSha=${GIT_SHA} \
-        -X github.com/navidrome/navidrome/consts.gitTag=${GIT_TAG}" \
-        -o /out/navidrome${EXT} .
-EOT
-
-# Verify if the binary was built for the correct platform and it is statically linked
-RUN xx-verify --static /out/navidrome*
-
-FROM scratch AS binary
-COPY --from=build /out /
-
-########################################################################################################################
-### Build Final Image
-FROM public.ecr.aws/docker/library/alpine:3.21 AS final
-LABEL maintainer="deluan@navidrome.org"
-LABEL org.opencontainers.image.source="https://github.com/navidrome/navidrome"
-
-# Install ffmpeg and mpv
-RUN apk add -U --no-cache ffmpeg mpv
-
-# Copy navidrome binary
-COPY --from=build /out/navidrome /app/
-
-VOLUME ["/data", "/music"]
-ENV ND_MUSICFOLDER=/music
-ENV ND_DATAFOLDER=/data
-ENV ND_PORT=4533
-ENV GODEBUG="asyncpreemptoff=1"
-RUN touch /.nddockerenv
-
-EXPOSE ${ND_PORT}
-HEALTHCHECK CMD wget -O- http://localhost:${ND_PORT}/ping || exit 1
-WORKDIR /app
-
-ENTRYPOINT ["/app/navidrome"]
-

Makefile

@@ -3,21 +3,13 @@ NODE_VERSION=$(shell cat .nvmrc)
 
 ifneq ("$(wildcard .git/HEAD)","")
 GIT_SHA=$(shell git rev-parse --short HEAD)
-GIT_TAG=$(shell git describe --tags `git rev-list --tags --max-count=1`)-SNAPSHOT
+GIT_TAG=$(shell git describe --tags `git rev-list --tags --max-count=1`)
 else
 GIT_SHA=source_archive
-GIT_TAG=$(patsubst navidrome-%,v%,$(notdir $(PWD)))-SNAPSHOT
+GIT_TAG=$(patsubst navidrome-%,v%,$(notdir $(PWD)))
 endif
 
-SUPPORTED_PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v5,linux/arm/v6,linux/arm/v7,linux/386,darwin/amd64,darwin/arm64,windows/amd64,windows/386
-IMAGE_PLATFORMS ?= $(shell echo $(SUPPORTED_PLATFORMS) | tr ',' '\n' | grep "linux" | grep -v "arm/v5" | tr '\n' ',' | sed 's/,$$//')
-PLATFORMS ?= $(SUPPORTED_PLATFORMS)
-DOCKER_TAG ?= deluan/navidrome:develop
-
-# Taglib version to use in cross-compilation, from https://github.com/navidrome/cross-taglib
-CROSS_TAGLIB_VERSION ?= 2.0.2-1
-
-UI_SRC_FILES := $(shell find ui -type f -not -path "ui/build/*" -not -path "ui/node_modules/*")
+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...
@@ -25,56 +17,63 @@ setup: check_env download-deps setup-git ##@1_Run_First Install dependencies and
 .PHONY: setup
 
 dev: check_env   ##@Development Start Navidrome in development mode, with hot-reload for both frontend and backend
-	ND_ENABLEINSIGHTSCOLLECTOR="false" npx foreman -j Procfile.dev -p 4533 start
+	npx foreman -j Procfile.dev -p 4533 start
 .PHONY: dev
 
-server: check_go_env buildjs ##@Development Start the backend in development mode
-	@ND_ENABLEINSIGHTSCOLLECTOR="false" go run github.com/cespare/reflex@latest -d none -c reflex.conf
+server: check_go_env  ##@Development Start the backend in development mode
+	@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@latest watch -tags netgo -notify ./...
+	go run github.com/onsi/ginkgo/v2/ginkgo@latest watch -notify ./...
 .PHONY: watch
 
 test: ##@Development Run Go tests
-	go test -tags netgo -race -shuffle=on ./...
+	go test -race -shuffle=on ./...
 .PHONY: test
 
-testall: test ##@Development Run Go and JS tests
-	@(cd ./ui && npm run test:ci)
+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@latest run -v --timeout 5m
 .PHONY: lint
 
-lintall: lint ##@Development Lint Go and JS code
+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
 
-format: ##@Development Format code
-	@(cd ./ui && npm run prettier)
-	@go run golang.org/x/tools/cmd/goimports@latest -w `find . -name '*.go' | grep -v _gen.go$$`
-	@go mod tidy
-.PHONY: format
-
-wire: check_go_env ##@Development Update Dependency Injection
-	go run github.com/google/wire/cmd/wire@latest gen -tags=netgo ./...
+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@latest ./server/subsonic/...
 .PHONY: snapshots
 
 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/migrations create ${name} sql
+	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/migrations create ${name}
+	go run github.com/pressly/goose/v3/cmd/goose@latest -dir db/migration create ${name}
 .PHONY: migration
 
 setup-dev: setup
@@ -86,68 +85,37 @@ setup-git: ##@Development Setup Git hooks (pre-commit and pre-push)
 	@(cd .git/hooks && ln -sf ../../git/* .)
 .PHONY: setup-git
 
-build: check_go_env buildjs ##@Build Build the project
-	go build -ldflags="-X github.com/navidrome/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/navidrome/navidrome/consts.gitTag=$(GIT_TAG)" -tags=netgo
-.PHONY: build
-
-buildall: deprecated build
+buildall: buildjs build ##@Build Build the project, both frontend and backend
 .PHONY: buildall
 
-debug-build: check_go_env buildjs ##@Build Build the project (with remote debug on)
-	go build -gcflags="all=-N -l" -ldflags="-X github.com/navidrome/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/navidrome/navidrome/consts.gitTag=$(GIT_TAG)" -tags=netgo
-.PHONY: debug-build
+build: warning-noui-build check_go_env  ##@Build Build only backend
+	go build -ldflags="-X github.com/navidrome/navidrome/consts.gitSha=$(GIT_SHA) -X github.com/navidrome/navidrome/consts.gitTag=$(GIT_TAG)-SNAPSHOT" -tags=netgo
+.PHONY: build
 
-buildjs: check_node_env ui/build/index.html ##@Build Build only frontend
+buildjs: check_node_env ##@Build Build only frontend
+	@(cd ./ui && npm run build)
 .PHONY: buildjs
 
-docker-buildjs: ##@Build Build only frontend using Docker
-	docker build --output "./ui" --target ui-bundle .
-.PHONY: docker-buildjs
+all: warning-noui-build ##@Cross_Compilation Build binaries for all supported platforms. It does not build the frontend
+	docker run -t -v $(PWD):/workspace -w /workspace deluan/ci-goreleaser:$(CI_RELEASER_VERSION) \
+ 		goreleaser release --rm-dist --skip-publish --snapshot
+.PHONY: all
 
-ui/build/index.html: $(UI_SRC_FILES)
-	@(cd ./ui && npm run build)
+single: warning-noui-build ##@Cross_Compilation Build binaries for a single supported platforms. It does not build the frontend
+	@if [ -z "${GOOS}" -o -z "${GOARCH}" ]; then \
+		echo "Usage: GOOS=<os> GOARCH=<arch> make single"; \
+		echo "Options:"; \
+		grep -- "- id: navidrome_" .goreleaser.yml | sed 's/- id: navidrome_//g'; \
+		exit 1; \
+	fi
+	@echo "Building binaries for ${GOOS}/${GOARCH}"
+	docker run -t -v $(PWD):/workspace -e GOOS -e GOARCH -w /workspace deluan/ci-goreleaser:$(CI_RELEASER_VERSION) \
+ 		goreleaser build --rm-dist --snapshot --single-target --id navidrome_${GOOS}_${GOARCH}
+.PHONY: single
 
-docker-platforms: ##@Cross_Compilation List supported platforms
-	@echo "Supported platforms:"
-	@echo "$(SUPPORTED_PLATFORMS)" | tr ',' '\n' | sort | sed 's/^/    /'
-	@echo "\nUsage: make PLATFORMS=\"linux/amd64\" docker-build"
-	@echo "       make IMAGE_PLATFORMS=\"linux/amd64\" docker-image"
-.PHONY: docker-platforms
-
-docker-build: ##@Cross_Compilation Cross-compile for any supported platform (check `make docker-platforms`)
-	docker buildx build \
-		--platform $(PLATFORMS) \
-		--build-arg GIT_TAG=${GIT_TAG} \
-		--build-arg GIT_SHA=${GIT_SHA} \
-		--build-arg CROSS_TAGLIB_VERSION=${CROSS_TAGLIB_VERSION} \
-		--output "./binaries" --target binary .
-.PHONY: docker-build
-
-docker-image: ##@Cross_Compilation Build Docker image, tagged as `deluan/navidrome:develop`, override with DOCKER_TAG var. Use IMAGE_PLATFORMS to specify target platforms
-	@echo $(IMAGE_PLATFORMS) | grep -q "windows" && echo "ERROR: Windows is not supported for Docker builds" && exit 1 || true
-	@echo $(IMAGE_PLATFORMS) | grep -q "darwin" && echo "ERROR: macOS is not supported for Docker builds" && exit 1 || true
-	@echo $(IMAGE_PLATFORMS) | grep -q "arm/v5" && echo "ERROR: Linux ARMv5 is not supported for Docker builds" && exit 1 || true
-	docker buildx build \
-		--platform $(IMAGE_PLATFORMS) \
-		--build-arg GIT_TAG=${GIT_TAG} \
-		--build-arg GIT_SHA=${GIT_SHA} \
-		--build-arg CROSS_TAGLIB_VERSION=${CROSS_TAGLIB_VERSION} \
-		--tag $(DOCKER_TAG) .
-.PHONY: docker-image
-
-docker-msi: ##@Cross_Compilation Build MSI installer for Windows
-	make docker-build PLATFORMS=windows/386,windows/amd64
-	DOCKER_CLI_HINTS=false docker build -q -t navidrome-msi-builder -f release/wix/msitools.dockerfile .
-	@rm -rf binaries/msi
-	docker run -it --rm -v $(PWD):/workspace -v $(PWD)/binaries:/workspace/binaries -e GIT_TAG=${GIT_TAG} \
-		navidrome-msi-builder sh -c "release/wix/build_msi.sh /workspace 386 && release/wix/build_msi.sh /workspace amd64"
-	@du -h binaries/msi/*.msi
-.PHONY: docker-msi
-
-package: docker-build ##@Cross_Compilation Create binaries and packages for ALL supported platforms
-	@if [ -z `which goreleaser` ]; then echo "Please install goreleaser first: https://goreleaser.com/install/"; exit 1; fi
-	goreleaser release -f release/goreleaser.yml --clean --skip=publish --snapshot
-.PHONY: package
+warning-noui-build:
+	@echo "WARNING: This command does not build the frontend, it uses the latest built with 'make buildjs'"
+.PHONY: warning-noui-build
 
 get-music: ##@Development Download some free music from Navidrome's demo instance
 	mkdir -p music
@@ -164,11 +132,6 @@ get-music: ##@Development Download some free music from Navidrome's demo instanc
 ##########################################
 #### Miscellaneous
 
-clean:
-	@rm -rf ./binaries ./dist ./ui/build/*
-	@touch ./ui/build/.gitkeep
-.PHONY: clean
-
 release:
 	@if [[ ! "${V}" =~ ^[0-9]+\.[0-9]+\.[0-9]+.*$$ ]]; then echo "Usage: make release V=X.X.X"; exit 1; fi
 	go mod tidy
@@ -208,10 +171,6 @@ check_node_env:
 pre-push: lintall testall
 .PHONY: pre-push
 
-deprecated:
-	@echo "WARNING: This target is deprecated and will be removed in future releases. Use 'make build' instead."
-.PHONY: deprecated
-
 .DEFAULT_GOAL := help
 
 HELP_FUN = \

README.md

@@ -9,7 +9,6 @@
 [![Dev Chat](https://img.shields.io/discord/671335427726114836?logo=discord&label=discord&style=flat-square)](https://discord.gg/xh7j7yF)
 [![Subreddit](https://img.shields.io/reddit/subreddit-subscribers/navidrome?logo=reddit&label=/r/navidrome&style=flat-square)](https://www.reddit.com/r/navidrome/)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0-ff69b4.svg?style=flat-square)](CODE_OF_CONDUCT.md)
-[![Gurubase](https://img.shields.io/badge/Gurubase-Ask%20Navidrome%20Guru-006BFF?style=flat-square)](https://gurubase.io/g/navidrome)
 
 Navidrome is an open source web-based music collection server and streamer. It gives you freedom to listen to your
 music collection from any browser or mobile device. It's like your personal Spotify!
@@ -57,15 +56,6 @@ A share of the revenue helps fund the development of Navidrome at no additional
  - **Transcoding** on the fly. Can be set per user/player. **Opus encoding is supported**
  - Translated to **various languages**
 
-## Translations
-
-Navidrome uses [POEditor](https://poeditor.com/) for translations, and we are always looking 
-for [more contributors](https://www.navidrome.org/docs/developers/translations/)
-
-<a href="https://poeditor.com/"> 
-<img height="32" src="https://github.com/user-attachments/assets/c19b1d2b-01e1-4682-a007-12356c42147c">
-</a>
-
 ## Documentation
 All documentation can be found in the project's website: https://www.navidrome.org/docs. 
 Here are some useful direct links:

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/backup.go

@@ -1,186 +0,0 @@
-package cmd
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/db"
-	"github.com/navidrome/navidrome/log"
-	"github.com/spf13/cobra"
-)
-
-var (
-	backupCount int
-	backupDir   string
-	force       bool
-	restorePath string
-)
-
-func init() {
-	rootCmd.AddCommand(backupRoot)
-
-	backupCmd.Flags().StringVarP(&backupDir, "backup-dir", "d", "", "directory to manually make backup")
-	backupRoot.AddCommand(backupCmd)
-
-	pruneCmd.Flags().StringVarP(&backupDir, "backup-dir", "d", "", "directory holding Navidrome backups")
-	pruneCmd.Flags().IntVarP(&backupCount, "keep-count", "k", -1, "specify the number of backups to keep. 0 remove ALL backups, and negative values mean to use the default from configuration")
-	pruneCmd.Flags().BoolVarP(&force, "force", "f", false, "bypass warning when backup count is zero")
-	backupRoot.AddCommand(pruneCmd)
-
-	restoreCommand.Flags().StringVarP(&restorePath, "backup-file", "b", "", "path of backup database to restore")
-	restoreCommand.Flags().BoolVarP(&force, "force", "f", false, "bypass restore warning")
-	_ = restoreCommand.MarkFlagRequired("backup-file")
-	backupRoot.AddCommand(restoreCommand)
-}
-
-var (
-	backupRoot = &cobra.Command{
-		Use:     "backup",
-		Aliases: []string{"bkp"},
-		Short:   "Create, restore and prune database backups",
-		Long:    "Create, restore and prune database backups",
-	}
-
-	backupCmd = &cobra.Command{
-		Use:   "create",
-		Short: "Create a backup database",
-		Long:  "Manually backup Navidrome database. This will ignore BackupCount",
-		Run: func(cmd *cobra.Command, _ []string) {
-			runBackup(cmd.Context())
-		},
-	}
-
-	pruneCmd = &cobra.Command{
-		Use:   "prune",
-		Short: "Prune database backups",
-		Long:  "Manually prune database backups according to backup rules",
-		Run: func(cmd *cobra.Command, _ []string) {
-			runPrune(cmd.Context())
-		},
-	}
-
-	restoreCommand = &cobra.Command{
-		Use:   "restore",
-		Short: "Restore Navidrome database",
-		Long:  "Restore Navidrome database from a backup. This must be done offline",
-		Run: func(cmd *cobra.Command, _ []string) {
-			runRestore(cmd.Context())
-		},
-	}
-)
-
-func runBackup(ctx context.Context) {
-	if backupDir != "" {
-		conf.Server.Backup.Path = backupDir
-	}
-
-	idx := strings.LastIndex(conf.Server.DbPath, "?")
-	var path string
-
-	if idx == -1 {
-		path = conf.Server.DbPath
-	} else {
-		path = conf.Server.DbPath[:idx]
-	}
-
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		log.Fatal("No existing database", "path", path)
-		return
-	}
-
-	start := time.Now()
-	path, err := db.Backup(ctx)
-	if err != nil {
-		log.Fatal("Error backing up database", "backup path", conf.Server.BasePath, err)
-	}
-
-	elapsed := time.Since(start)
-	log.Info("Backup complete", "elapsed", elapsed, "path", path)
-}
-
-func runPrune(ctx context.Context) {
-	if backupDir != "" {
-		conf.Server.Backup.Path = backupDir
-	}
-
-	if backupCount != -1 {
-		conf.Server.Backup.Count = backupCount
-	}
-
-	if conf.Server.Backup.Count == 0 && !force {
-		fmt.Println("Warning: pruning ALL backups")
-		fmt.Printf("Please enter YES (all caps) to continue: ")
-		var input string
-		_, err := fmt.Scanln(&input)
-
-		if input != "YES" || err != nil {
-			log.Warn("Prune cancelled")
-			return
-		}
-	}
-
-	idx := strings.LastIndex(conf.Server.DbPath, "?")
-	var path string
-
-	if idx == -1 {
-		path = conf.Server.DbPath
-	} else {
-		path = conf.Server.DbPath[:idx]
-	}
-
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		log.Fatal("No existing database", "path", path)
-		return
-	}
-
-	start := time.Now()
-	count, err := db.Prune(ctx)
-	if err != nil {
-		log.Fatal("Error pruning up database", "backup path", conf.Server.BasePath, err)
-	}
-
-	elapsed := time.Since(start)
-
-	log.Info("Prune complete", "elapsed", elapsed, "successfully pruned", count)
-}
-
-func runRestore(ctx context.Context) {
-	idx := strings.LastIndex(conf.Server.DbPath, "?")
-	var path string
-
-	if idx == -1 {
-		path = conf.Server.DbPath
-	} else {
-		path = conf.Server.DbPath[:idx]
-	}
-
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		log.Fatal("No existing database", "path", path)
-		return
-	}
-
-	if !force {
-		fmt.Println("Warning: restoring the Navidrome database should only be done offline, especially if your backup is very old.")
-		fmt.Printf("Please enter YES (all caps) to continue: ")
-		var input string
-		_, err := fmt.Scanln(&input)
-
-		if input != "YES" || err != nil {
-			log.Warn("Restore cancelled")
-			return
-		}
-	}
-
-	start := time.Now()
-	err := db.Restore(ctx, restorePath)
-	if err != nil {
-		log.Fatal("Error restoring database", "backup path", conf.Server.BasePath, err)
-	}
-
-	elapsed := time.Since(start)
-	log.Info("Restore complete", "elapsed", elapsed)
-}

cmd/inspect.go

@@ -1,99 +0,0 @@
-package cmd
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/log"
-	"github.com/navidrome/navidrome/model"
-	"github.com/navidrome/navidrome/scanner"
-	"github.com/navidrome/navidrome/scanner/metadata"
-	"github.com/navidrome/navidrome/tests"
-	"github.com/pelletier/go-toml/v2"
-	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v3"
-)
-
-var (
-	extractor string
-	format    string
-)
-
-func init() {
-	inspectCmd.Flags().StringVarP(&extractor, "extractor", "x", "", "extractor to use (ffmpeg or taglib, default: auto)")
-	inspectCmd.Flags().StringVarP(&format, "format", "f", "pretty", "output format (pretty, toml, yaml, json, jsonindent)")
-	rootCmd.AddCommand(inspectCmd)
-}
-
-var inspectCmd = &cobra.Command{
-	Use:   "inspect [files to inspect]",
-	Short: "Inspect tags",
-	Long:  "Show file tags as seen by Navidrome",
-	Args:  cobra.MinimumNArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		runInspector(args)
-	},
-}
-
-var marshalers = map[string]func(interface{}) ([]byte, error){
-	"pretty": prettyMarshal,
-	"toml":   toml.Marshal,
-	"yaml":   yaml.Marshal,
-	"json":   json.Marshal,
-	"jsonindent": func(v interface{}) ([]byte, error) {
-		return json.MarshalIndent(v, "", "  ")
-	},
-}
-
-func prettyMarshal(v interface{}) ([]byte, error) {
-	out := v.([]inspectorOutput)
-	var res strings.Builder
-	for i := range out {
-		res.WriteString(fmt.Sprintf("====================\nFile: %s\n\n", out[i].File))
-		t, _ := toml.Marshal(out[i].RawTags)
-		res.WriteString(fmt.Sprintf("Raw tags:\n%s\n\n", t))
-		t, _ = toml.Marshal(out[i].MappedTags)
-		res.WriteString(fmt.Sprintf("Mapped tags:\n%s\n\n", t))
-	}
-	return []byte(res.String()), nil
-}
-
-type inspectorOutput struct {
-	File       string
-	RawTags    metadata.ParsedTags
-	MappedTags model.MediaFile
-}
-
-func runInspector(args []string) {
-	if extractor != "" {
-		conf.Server.Scanner.Extractor = extractor
-	}
-	log.Info("Using extractor", "extractor", conf.Server.Scanner.Extractor)
-	md, err := metadata.Extract(args...)
-	if err != nil {
-		log.Fatal("Error extracting tags", err)
-	}
-	mapper := scanner.NewMediaFileMapper(conf.Server.MusicFolder, &tests.MockedGenreRepo{})
-	marshal := marshalers[format]
-	if marshal == nil {
-		log.Fatal("Invalid format", "format", format)
-	}
-	var out []inspectorOutput
-	for k, v := range md {
-		if !model.IsAudioFile(k) {
-			continue
-		}
-		if len(v.Tags) == 0 {
-			continue
-		}
-		out = append(out, inspectorOutput{
-			File:       k,
-			RawTags:    v.Tags,
-			MappedTags: mapper.ToMediaFile(v),
-		})
-	}
-	data, _ := marshal(out)
-	fmt.Println(string(data))
-}

cmd/pls.go

@@ -2,12 +2,8 @@ package cmd
 
 import (
 	"context"
-	"encoding/csv"
-	"encoding/json"
 	"errors"
-	"fmt"
 	"os"
-	"strconv"
 
 	"github.com/Masterminds/squirrel"
 	"github.com/navidrome/navidrome/core/auth"
@@ -19,51 +15,25 @@ import (
 )
 
 var (
-	playlistID   string
-	outputFile   string
-	userID       string
-	outputFormat string
+	playlistID string
+	outputFile string
 )
 
-type displayPlaylist struct {
-	Id        string `json:"id"`
-	Name      string `json:"name"`
-	OwnerName string `json:"ownerName"`
-	OwnerId   string `json:"ownerId"`
-	Public    bool   `json:"public"`
-}
-
-type displayPlaylists []displayPlaylist
-
 func init() {
 	plsCmd.Flags().StringVarP(&playlistID, "playlist", "p", "", "playlist name or ID")
 	plsCmd.Flags().StringVarP(&outputFile, "output", "o", "", "output file (default stdout)")
 	_ = plsCmd.MarkFlagRequired("playlist")
 	rootCmd.AddCommand(plsCmd)
-
-	listCommand.Flags().StringVarP(&userID, "user", "u", "", "username or ID")
-	listCommand.Flags().StringVarP(&outputFormat, "format", "f", "csv", "output format [supported values: csv, json]")
-	plsCmd.AddCommand(listCommand)
 }
 
-var (
-	plsCmd = &cobra.Command{
-		Use:   "pls",
-		Short: "Export playlists",
-		Long:  "Export Navidrome playlists to M3U files",
-		Run: func(cmd *cobra.Command, args []string) {
-			runExporter()
-		},
-	}
-
-	listCommand = &cobra.Command{
-		Use:   "list",
-		Short: "List playlists",
-		Run: func(cmd *cobra.Command, args []string) {
-			runList()
-		},
-	}
-)
+var plsCmd = &cobra.Command{
+	Use:   "pls",
+	Short: "Export playlists",
+	Long:  "Export Navidrome playlists to M3U files",
+	Run: func(cmd *cobra.Command, args []string) {
+		runExporter()
+	},
+}
 
 func runExporter() {
 	sqlDB := db.Db()
@@ -99,58 +69,3 @@ func runExporter() {
 		log.Fatal("Error writing to the output file", "file", outputFile, err)
 	}
 }
-
-func runList() {
-	if outputFormat != "csv" && outputFormat != "json" {
-		log.Fatal("Invalid output format. Must be one of csv, json", "format", outputFormat)
-	}
-
-	sqlDB := db.Db()
-	ds := persistence.New(sqlDB)
-	ctx := auth.WithAdminUser(context.Background(), ds)
-
-	options := model.QueryOptions{Sort: "owner_name"}
-
-	if userID != "" {
-		user, err := ds.User(ctx).FindByUsername(userID)
-
-		if err != nil && !errors.Is(err, model.ErrNotFound) {
-			log.Fatal("Error retrieving user by name", "name", userID, err)
-		}
-
-		if errors.Is(err, model.ErrNotFound) {
-			user, err = ds.User(ctx).Get(userID)
-			if err != nil {
-				log.Fatal("Error retrieving user by id", "id", userID, err)
-			}
-		}
-
-		options.Filters = squirrel.Eq{"owner_id": user.ID}
-	}
-
-	playlists, err := ds.Playlist(ctx).GetAll(options)
-	if err != nil {
-		log.Fatal(ctx, "Failed to retrieve playlists", err)
-	}
-
-	if outputFormat == "csv" {
-		w := csv.NewWriter(os.Stdout)
-		_ = w.Write([]string{"playlist id", "playlist name", "owner id", "owner name", "public"})
-		for _, playlist := range playlists {
-			_ = w.Write([]string{playlist.ID, playlist.Name, playlist.OwnerID, playlist.OwnerName, strconv.FormatBool(playlist.Public)})
-		}
-		w.Flush()
-	} else {
-		display := make(displayPlaylists, len(playlists))
-		for idx, playlist := range playlists {
-			display[idx].Id = playlist.ID
-			display[idx].Name = playlist.Name
-			display[idx].OwnerId = playlist.OwnerID
-			display[idx].OwnerName = playlist.OwnerName
-			display[idx].Public = playlist.Public
-		}
-
-		j, _ := json.Marshal(display)
-		fmt.Printf("%s\n", j)
-	}
-}

cmd/root.go

@@ -2,25 +2,30 @@ package cmd
 
 import (
 	"context"
+	"errors"
+	"fmt"
 	"os"
-	"os/signal"
 	"strings"
-	"syscall"
 	"time"
 
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
+	"github.com/navidrome/navidrome/core"
 	"github.com/navidrome/navidrome/db"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/resources"
 	"github.com/navidrome/navidrome/scheduler"
 	"github.com/navidrome/navidrome/server/backgrounds"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"golang.org/x/sync/errgroup"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"golang.org/x/sync/errgroup"
 )
 
+var interrupted = errors.New("service was interrupted")
+
 var (
 	cfgFile  string
 	noBanner bool
@@ -34,20 +39,17 @@ Complete documentation is available at https://www.navidrome.org/docs`,
 			preRun()
 		},
 		Run: func(cmd *cobra.Command, args []string) {
-			runNavidrome(cmd.Context())
-		},
-		PostRun: func(cmd *cobra.Command, args []string) {
-			postRun()
+			runNavidrome()
 		},
 		Version: consts.Version,
 	}
 )
 
-// Execute runs the root cobra command, which will start the Navidrome server by calling the runNavidrome function.
 func Execute() {
 	rootCmd.SetVersionTemplate(`{{println .Version}}`)
 	if err := rootCmd.Execute(); err != nil {
-		log.Fatal(err)
+		fmt.Println(err)
+		os.Exit(1)
 	}
 }
 
@@ -58,44 +60,26 @@ func preRun() {
 	conf.Load()
 }
 
-func postRun() {
-	log.Info("Navidrome stopped, bye.")
-}
+func runNavidrome() {
+	db.Init()
+	defer func() {
+		if err := db.Close(); err != nil {
+			log.Error("Error closing DB", err)
+		}
+		log.Info("Navidrome stopped, bye.")
+	}()
 
-// runNavidrome is the main entry point for the Navidrome server. It starts all the services and blocks.
-// If any of the services returns an error, it will log it and exit. If the process receives a signal to exit,
-// it will cancel the context and exit gracefully.
-func runNavidrome(ctx context.Context) {
-	defer db.Init()()
-
-	ctx, cancel := mainContext(ctx)
-	defer cancel()
-
-	g, ctx := errgroup.WithContext(ctx)
+	g, ctx := errgroup.WithContext(context.Background())
 	g.Go(startServer(ctx))
-	g.Go(startSignaller(ctx))
+	g.Go(startSignaler(ctx))
 	g.Go(startScheduler(ctx))
-	g.Go(startPlaybackServer(ctx))
 	g.Go(schedulePeriodicScan(ctx))
-	g.Go(schedulePeriodicBackup(ctx))
-	g.Go(startInsightsCollector(ctx))
 
-	if err := g.Wait(); err != nil {
+	if err := g.Wait(); err != nil && !errors.Is(err, interrupted) {
 		log.Error("Fatal error in Navidrome. Aborting", err)
 	}
 }
 
-// mainContext returns a context that is cancelled when the process receives a signal to exit.
-func mainContext(ctx context.Context) (context.Context, context.CancelFunc) {
-	return signal.NotifyContext(ctx,
-		os.Interrupt,
-		syscall.SIGHUP,
-		syscall.SIGTERM,
-		syscall.SIGABRT,
-	)
-}
-
-// startServer starts the Navidrome web server, adding all the necessary routers.
 func startServer(ctx context.Context) func() error {
 	return func() error {
 		a := CreateServer(conf.Server.MusicFolder)
@@ -109,22 +93,21 @@ func startServer(ctx context.Context) func() error {
 			a.MountRouter("ListenBrainz Auth", consts.URLPathNativeAPI+"/listenbrainz", CreateListenBrainzRouter())
 		}
 		if conf.Server.Prometheus.Enabled {
-			p := CreatePrometheus()
-			// blocking call because takes <100ms but useful if fails
-			p.WriteInitialMetrics(ctx)
-			a.MountRouter("Prometheus metrics", conf.Server.Prometheus.MetricsPath, p.GetHandler())
+			// blocking call because takes <1ms but useful if fails
+			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", conf.Server.UILoginBackgroundURL, backgrounds.NewHandler())
+			a.MountRouter("Background images", consts.DefaultUILoginBackgroundURL, backgrounds.NewHandler())
 		}
+		a.MountRouter("New Native API", consts.URLPathAPI, CreateNewNativeAPIRouter())
 		return a.Run(ctx, conf.Server.Address, conf.Server.Port, conf.Server.TLSCert, conf.Server.TLSKey)
 	}
 }
 
-// schedulePeriodicScan schedules a periodic scan of the music library, if configured.
 func schedulePeriodicScan(ctx context.Context) func() error {
 	return func() error {
 		schedule := conf.Server.ScanSchedule
@@ -154,84 +137,16 @@ func schedulePeriodicScan(ctx context.Context) func() error {
 	}
 }
 
-func schedulePeriodicBackup(ctx context.Context) func() error {
-	return func() error {
-		schedule := conf.Server.Backup.Schedule
-		if schedule == "" {
-			log.Warn("Periodic backup is DISABLED")
-			return nil
-		}
-
-		schedulerInstance := scheduler.GetInstance()
-
-		log.Info("Scheduling periodic backup", "schedule", schedule)
-		err := schedulerInstance.Add(schedule, func() {
-			start := time.Now()
-			path, err := db.Backup(ctx)
-			elapsed := time.Since(start)
-			if err != nil {
-				log.Error(ctx, "Error backing up database", "elapsed", elapsed, err)
-				return
-			}
-			log.Info(ctx, "Backup complete", "elapsed", elapsed, "path", path)
-
-			count, err := db.Prune(ctx)
-			if err != nil {
-				log.Error(ctx, "Error pruning database", "error", err)
-			} else if count > 0 {
-				log.Info(ctx, "Successfully pruned old files", "count", count)
-			} else {
-				log.Info(ctx, "No backups pruned")
-			}
-		})
-
-		return err
-	}
-}
-
-// startScheduler starts the Navidrome scheduler, which is used to run periodic tasks.
 func startScheduler(ctx context.Context) func() error {
+	log.Info(ctx, "Starting scheduler")
+	schedulerInstance := scheduler.GetInstance()
+
 	return func() error {
-		log.Info(ctx, "Starting scheduler")
-		schedulerInstance := scheduler.GetInstance()
 		schedulerInstance.Run(ctx)
 		return nil
 	}
 }
 
-// startInsightsCollector starts the Navidrome Insight Collector, if configured.
-func startInsightsCollector(ctx context.Context) func() error {
-	return func() error {
-		if !conf.Server.EnableInsightsCollector {
-			log.Info(ctx, "Insight Collector is DISABLED")
-			return nil
-		}
-		log.Info(ctx, "Starting Insight Collector")
-		select {
-		case <-time.After(conf.Server.DevInsightsInitialDelay):
-		case <-ctx.Done():
-			return nil
-		}
-		ic := CreateInsights()
-		ic.Run(ctx)
-		return nil
-	}
-}
-
-// startPlaybackServer starts the Navidrome playback server, if configured.
-// It is responsible for the Jukebox functionality
-func startPlaybackServer(ctx context.Context) func() error {
-	return func() error {
-		if !conf.Server.Jukebox.Enabled {
-			log.Debug("Jukebox is DISABLED")
-			return nil
-		}
-		log.Info(ctx, "Starting Jukebox service")
-		playbackInstance := GetPlaybackServer()
-		return playbackInstance.Run(ctx)
-	}
-}
-
 // TODO: Implement some struct tags to map flags to viper
 func init() {
 	cobra.OnInitialize(func() {
@@ -244,19 +159,16 @@ func init() {
 	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")
-	rootCmd.PersistentFlags().String("logfile", viper.GetString("logfile"), "log file path, if not set logs will be printed to stderr")
 
 	_ = 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"))
-	_ = viper.BindPFlag("logfile", rootCmd.PersistentFlags().Lookup("logfile"))
 
 	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("unixsocketperm", viper.GetString("unixsocketperm"), "optional file permission for the unix socket")
 	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")
@@ -265,7 +177,6 @@ func init() {
 	rootCmd.Flags().Bool("enabletranscodingconfig", viper.GetBool("enabletranscodingconfig"), "enables transcoding configuration in the UI")
 	rootCmd.Flags().String("transcodingcachesize", viper.GetString("transcodingcachesize"), "size of transcoding cache")
 	rootCmd.Flags().String("imagecachesize", viper.GetString("imagecachesize"), "size of image (art work) cache. set to 0 to disable cache")
-	rootCmd.Flags().String("albumplaycountmode", viper.GetString("albumplaycountmode"), "how to compute playcount for albums. absolute (default) or normalized")
 	rootCmd.Flags().Bool("autoimportplaylists", viper.GetBool("autoimportplaylists"), "enable/disable .m3u playlist auto-import`")
 
 	rootCmd.Flags().Bool("prometheus.enabled", viper.GetBool("prometheus.enabled"), "enable/disable prometheus metrics endpoint`")
@@ -274,7 +185,6 @@ 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("unixsocketperm", rootCmd.Flags().Lookup("unixsocketperm"))
 	_ = viper.BindPFlag("tlskey", rootCmd.Flags().Lookup("tlskey"))
 	_ = viper.BindPFlag("baseurl", rootCmd.Flags().Lookup("baseurl"))
 

cmd/signaler_nonunix.go

@@ -0,0 +1,27 @@
+//go:build windows || plan9
+
+package cmd
+
+import (
+	"context"
+	"os"
+	"os/signal"
+
+	"github.com/navidrome/navidrome/log"
+)
+
+func startSignaler(ctx context.Context) func() error {
+	log.Info(ctx, "Starting signaler")
+
+	return func() error {
+		var sigChan = make(chan os.Signal, 1)
+		signal.Notify(sigChan, os.Interrupt)
+		select {
+		case sig := <-sigChan:
+			log.Info(ctx, "Received termination signal", "signal", sig)
+			return interrupted
+		case <-ctx.Done():
+			return nil
+		}
+	}
+}

cmd/signaler_unix.go

@@ -14,17 +14,28 @@ import (
 
 const triggerScanSignal = syscall.SIGUSR1
 
-func startSignaller(ctx context.Context) func() error {
+func startSignaler(ctx context.Context) func() error {
 	log.Info(ctx, "Starting signaler")
 	scanner := GetScanner()
 
 	return func() error {
 		var sigChan = make(chan os.Signal, 1)
-		signal.Notify(sigChan, triggerScanSignal)
+		signal.Notify(
+			sigChan,
+			os.Interrupt,
+			triggerScanSignal,
+			syscall.SIGHUP,
+			syscall.SIGTERM,
+			syscall.SIGABRT,
+		)
 
 		for {
 			select {
 			case sig := <-sigChan:
+				if sig != triggerScanSignal {
+					log.Info(ctx, "Received termination signal", "signal", sig)
+					return interrupted
+				}
 				log.Info(ctx, "Received signal, triggering a new scan", "signal", sig)
 				start := time.Now()
 				err := scanner.RescanAll(ctx, false)

cmd/signaller_nounix.go

@@ -1,14 +0,0 @@
-//go:build windows || plan9
-
-package cmd
-
-import (
-	"context"
-)
-
-// Windows and Plan9 don't support SIGUSR1, so we don't need to start a signaler
-func startSignaller(ctx context.Context) func() error {
-	return func() error {
-		return nil
-	}
-}

cmd/svc.go

@@ -1,267 +0,0 @@
-package cmd
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-
-	"github.com/kardianos/service"
-	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/log"
-	"github.com/spf13/cobra"
-)
-
-var (
-	svcStatusLabels = map[service.Status]string{
-		service.StatusUnknown: "Unknown",
-		service.StatusStopped: "Stopped",
-		service.StatusRunning: "Running",
-	}
-
-	installUser      string
-	workingDirectory string
-)
-
-func init() {
-	svcCmd.AddCommand(buildInstallCmd())
-	svcCmd.AddCommand(buildUninstallCmd())
-	svcCmd.AddCommand(buildStartCmd())
-	svcCmd.AddCommand(buildStopCmd())
-	svcCmd.AddCommand(buildStatusCmd())
-	svcCmd.AddCommand(buildExecuteCmd())
-	rootCmd.AddCommand(svcCmd)
-}
-
-var svcCmd = &cobra.Command{
-	Use:     "service",
-	Aliases: []string{"svc"},
-	Short:   "Manage Navidrome as a service",
-	Long:    fmt.Sprintf("Manage Navidrome as a service, using the OS service manager (%s)", service.Platform()),
-	Run:     runServiceCmd,
-}
-
-type svcControl struct {
-	ctx    context.Context
-	cancel context.CancelFunc
-	done   chan struct{}
-}
-
-func (p *svcControl) Start(service.Service) error {
-	p.done = make(chan struct{})
-	p.ctx, p.cancel = context.WithCancel(context.Background())
-	go func() {
-		runNavidrome(p.ctx)
-		close(p.done)
-	}()
-	return nil
-}
-
-func (p *svcControl) Stop(service.Service) error {
-	log.Info("Stopping service")
-	p.cancel()
-	select {
-	case <-p.done:
-		log.Info("Service stopped gracefully")
-	case <-time.After(10 * time.Second):
-		log.Error("Service did not stop in time. Killing it.")
-	}
-	return nil
-}
-
-var svcInstance = sync.OnceValue(func() service.Service {
-	options := make(service.KeyValue)
-	options["Restart"] = "on-failure"
-	options["SuccessExitStatus"] = "1 2 8 SIGKILL"
-	options["UserService"] = false
-	options["LogDirectory"] = conf.Server.DataFolder
-	options["SystemdScript"] = systemdScript
-	if conf.Server.LogFile != "" {
-		options["LogOutput"] = false
-	} else {
-		options["LogOutput"] = true
-		options["LogDirectory"] = conf.Server.DataFolder
-	}
-	svcConfig := &service.Config{
-		UserName:    installUser,
-		Name:        "navidrome",
-		DisplayName: "Navidrome",
-		Description: "Your Personal Streaming Service",
-		Dependencies: []string{
-			"After=remote-fs.target network.target",
-		},
-		WorkingDirectory: executablePath(),
-		Option:           options,
-	}
-	arguments := []string{"service", "execute"}
-	if conf.Server.ConfigFile != "" {
-		arguments = append(arguments, "-c", conf.Server.ConfigFile)
-	}
-	svcConfig.Arguments = arguments
-
-	prg := &svcControl{}
-	svc, err := service.New(prg, svcConfig)
-	if err != nil {
-		log.Fatal(err)
-	}
-	return svc
-})
-
-func runServiceCmd(cmd *cobra.Command, _ []string) {
-	_ = cmd.Help()
-}
-
-func executablePath() string {
-	if workingDirectory != "" {
-		return workingDirectory
-	}
-
-	ex, err := os.Executable()
-	if err != nil {
-		log.Fatal(err)
-	}
-	return filepath.Dir(ex)
-}
-
-func buildInstallCmd() *cobra.Command {
-	runInstallCmd := func(_ *cobra.Command, _ []string) {
-		var err error
-		println("Installing service with:")
-		println("  working directory: " + executablePath())
-		println("  music folder:      " + conf.Server.MusicFolder)
-		println("  data folder:       " + conf.Server.DataFolder)
-		if conf.Server.LogFile != "" {
-			println("  log file:          " + conf.Server.LogFile)
-		} else {
-			println("  logs folder:       " + conf.Server.DataFolder)
-		}
-		if cfgFile != "" {
-			conf.Server.ConfigFile, err = filepath.Abs(cfgFile)
-			if err != nil {
-				log.Fatal(err)
-			}
-			println("  config file:       " + conf.Server.ConfigFile)
-		}
-		err = svcInstance().Install()
-		if err != nil {
-			log.Fatal(err)
-		}
-		println("Service installed. Use 'navidrome svc start' to start it.")
-	}
-
-	cmd := &cobra.Command{
-		Use:   "install",
-		Short: "Install Navidrome service.",
-		Run:   runInstallCmd,
-	}
-	cmd.Flags().StringVarP(&installUser, "user", "u", "", "user to run service")
-	cmd.Flags().StringVarP(&workingDirectory, "working-directory", "w", "", "working directory of service")
-
-	return cmd
-}
-
-func buildUninstallCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:   "uninstall",
-		Short: "Uninstall Navidrome service. Does not delete the music or data folders",
-		Run: func(cmd *cobra.Command, args []string) {
-			err := svcInstance().Uninstall()
-			if err != nil {
-				log.Fatal(err)
-			}
-			println("Service uninstalled. Music and data folders are still intact.")
-		},
-	}
-}
-
-func buildStartCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:   "start",
-		Short: "Start Navidrome service",
-		Run: func(cmd *cobra.Command, args []string) {
-			err := svcInstance().Start()
-			if err != nil {
-				log.Fatal(err)
-			}
-			println("Service started. Use 'navidrome svc status' to check its status.")
-		},
-	}
-}
-
-func buildStopCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:   "stop",
-		Short: "Stop Navidrome service",
-		Run: func(cmd *cobra.Command, args []string) {
-			err := svcInstance().Stop()
-			if err != nil {
-				log.Fatal(err)
-			}
-			println("Service stopped. Use 'navidrome svc status' to check its status.")
-		},
-	}
-}
-
-func buildStatusCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:   "status",
-		Short: "Show Navidrome service status",
-		Run: func(cmd *cobra.Command, args []string) {
-			status, err := svcInstance().Status()
-			if err != nil {
-				log.Fatal(err)
-			}
-			fmt.Printf("Navidrome is %s.\n", svcStatusLabels[status])
-		},
-	}
-}
-
-func buildExecuteCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:   "execute",
-		Short: "Run navidrome as a service in the foreground (it is very unlikely you want to run this, you are better off running just navidrome)",
-		Run: func(cmd *cobra.Command, args []string) {
-			err := svcInstance().Run()
-			if err != nil {
-				log.Fatal(err)
-			}
-		},
-	}
-}
-
-const systemdScript = `[Unit]
-Description={{.Description}}
-ConditionFileIsExecutable={{.Path|cmdEscape}}
-{{range $i, $dep := .Dependencies}} 
-{{$dep}} {{end}}
-
-[Service]
-StartLimitInterval=5
-StartLimitBurst=10
-ExecStart={{.Path|cmdEscape}}{{range .Arguments}} {{.|cmd}}{{end}}
-{{if .WorkingDirectory}}WorkingDirectory={{.WorkingDirectory|cmdEscape}}{{end}}
-{{if .UserName}}User={{.UserName}}{{end}}
-{{if .Restart}}Restart={{.Restart}}{{end}}
-{{if .SuccessExitStatus}}SuccessExitStatus={{.SuccessExitStatus}}{{end}}
-TimeoutStopSec=20
-RestartSec=120
-EnvironmentFile=-/etc/sysconfig/{{.Name}}
-
-DevicePolicy=closed
-NoNewPrivileges=yes
-PrivateTmp=yes
-ProtectControlGroups=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
-RestrictNamespaces=yes
-RestrictRealtime=yes
-SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap
-{{if .WorkingDirectory}}ReadWritePaths={{.WorkingDirectory|cmdEscape}}{{end}}
-ProtectSystem=full
-
-[Install]
-WantedBy=multi-user.target
-`

cmd/wire_gen.go

@@ -1,6 +1,6 @@
 // Code generated by Wire. DO NOT EDIT.
 
-//go:generate go run -mod=mod github.com/google/wire/cmd/wire gen -tags "netgo"
+//go:generate go run github.com/google/wire/cmd/wire
 //go:build !wireinject
 // +build !wireinject
 
@@ -14,17 +14,17 @@ import (
 	"github.com/navidrome/navidrome/core/agents/listenbrainz"
 	"github.com/navidrome/navidrome/core/artwork"
 	"github.com/navidrome/navidrome/core/ffmpeg"
-	"github.com/navidrome/navidrome/core/metrics"
-	"github.com/navidrome/navidrome/core/playback"
 	"github.com/navidrome/navidrome/core/scrobbler"
 	"github.com/navidrome/navidrome/db"
 	"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"
 	"github.com/navidrome/navidrome/server/subsonic"
+	"sync"
 )
 
 // Injectors from wire_injectors.go:
@@ -33,8 +33,7 @@ func CreateServer(musicFolder string) *server.Server {
 	sqlDB := db.Db()
 	dataStore := persistence.New(sqlDB)
 	broker := events.GetBroker()
-	insights := metrics.GetInstance(dataStore)
-	serverServer := server.New(dataStore, broker, insights)
+	serverServer := server.New(dataStore, broker)
 	return serverServer
 }
 
@@ -42,9 +41,14 @@ func CreateNativeAPIRouter() *nativeapi.Router {
 	sqlDB := db.Db()
 	dataStore := persistence.New(sqlDB)
 	share := core.NewShare(dataStore)
-	playlists := core.NewPlaylists(dataStore)
-	insights := metrics.GetInstance(dataStore)
-	router := nativeapi.New(dataStore, share, playlists, insights)
+	router := nativeapi.New(dataStore, share)
+	return router
+}
+
+func CreateNewNativeAPIRouter() *api.Router {
+	sqlDB := db.Db()
+	dataStore := persistence.New(sqlDB)
+	router := api.New(dataStore)
 	return router
 }
 
@@ -61,14 +65,11 @@ func CreateSubsonicAPIRouter() *subsonic.Router {
 	share := core.NewShare(dataStore)
 	archiver := core.NewArchiver(mediaStreamer, dataStore, share)
 	players := core.NewPlayers(dataStore)
-	playlists := core.NewPlaylists(dataStore)
-	cacheWarmer := artwork.NewCacheWarmer(artworkArtwork, fileCache)
+	scanner := GetScanner()
 	broker := events.GetBroker()
-	metricsMetrics := metrics.NewPrometheusInstance(dataStore)
-	scannerScanner := scanner.GetInstance(dataStore, playlists, cacheWarmer, broker, metricsMetrics)
+	playlists := core.NewPlaylists(dataStore)
 	playTracker := scrobbler.GetPlayTracker(dataStore, broker)
-	playbackServer := playback.GetInstance(dataStore)
-	router := subsonic.New(dataStore, artworkArtwork, mediaStreamer, archiver, players, externalMetadata, scannerScanner, broker, playlists, playTracker, share, playbackServer)
+	router := subsonic.New(dataStore, artworkArtwork, mediaStreamer, archiver, players, externalMetadata, scanner, broker, playlists, playTracker, share)
 	return router
 }
 
@@ -102,21 +103,7 @@ func CreateListenBrainzRouter() *listenbrainz.Router {
 	return router
 }
 
-func CreateInsights() metrics.Insights {
-	sqlDB := db.Db()
-	dataStore := persistence.New(sqlDB)
-	insights := metrics.GetInstance(dataStore)
-	return insights
-}
-
-func CreatePrometheus() metrics.Metrics {
-	sqlDB := db.Db()
-	dataStore := persistence.New(sqlDB)
-	metricsMetrics := metrics.NewPrometheusInstance(dataStore)
-	return metricsMetrics
-}
-
-func GetScanner() scanner.Scanner {
+func createScanner() scanner.Scanner {
 	sqlDB := db.Db()
 	dataStore := persistence.New(sqlDB)
 	playlists := core.NewPlaylists(dataStore)
@@ -127,18 +114,23 @@ func GetScanner() scanner.Scanner {
 	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, externalMetadata)
 	cacheWarmer := artwork.NewCacheWarmer(artworkArtwork, fileCache)
 	broker := events.GetBroker()
-	metricsMetrics := metrics.NewPrometheusInstance(dataStore)
-	scannerScanner := scanner.GetInstance(dataStore, playlists, cacheWarmer, broker, metricsMetrics)
+	scannerScanner := scanner.New(dataStore, playlists, cacheWarmer, broker)
 	return scannerScanner
 }
 
-func GetPlaybackServer() playback.PlaybackServer {
-	sqlDB := db.Db()
-	dataStore := persistence.New(sqlDB)
-	playbackServer := playback.GetInstance(dataStore)
-	return playbackServer
-}
-
 // wire_injectors.go:
 
-var allProviders = wire.NewSet(core.Set, artwork.Set, server.New, subsonic.New, nativeapi.New, public.New, persistence.New, lastfm.NewRouter, listenbrainz.NewRouter, events.GetBroker, scanner.GetInstance, db.Db, metrics.NewPrometheusInstance)
+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 (
+	onceScanner     sync.Once
+	scannerInstance scanner.Scanner
+)
+
+func GetScanner() scanner.Scanner {
+	onceScanner.Do(func() {
+		scannerInstance = createScanner()
+	})
+	return scannerInstance
+}

cmd/wire_injectors.go

@@ -3,17 +3,18 @@
 package cmd
 
 import (
+	"sync"
+
 	"github.com/google/wire"
 	"github.com/navidrome/navidrome/core"
 	"github.com/navidrome/navidrome/core/agents/lastfm"
 	"github.com/navidrome/navidrome/core/agents/listenbrainz"
 	"github.com/navidrome/navidrome/core/artwork"
-	"github.com/navidrome/navidrome/core/metrics"
-	"github.com/navidrome/navidrome/core/playback"
 	"github.com/navidrome/navidrome/db"
 	"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"
@@ -23,21 +24,20 @@ import (
 var allProviders = wire.NewSet(
 	core.Set,
 	artwork.Set,
-	server.New,
 	subsonic.New,
 	nativeapi.New,
+	api.New,
 	public.New,
 	persistence.New,
 	lastfm.NewRouter,
 	listenbrainz.NewRouter,
 	events.GetBroker,
-	scanner.GetInstance,
 	db.Db,
-	metrics.NewPrometheusInstance,
 )
 
 func CreateServer(musicFolder string) *server.Server {
 	panic(wire.Build(
+		server.New,
 		allProviders,
 	))
 }
@@ -48,9 +48,16 @@ func CreateNativeAPIRouter() *nativeapi.Router {
 	))
 }
 
+func CreateNewNativeAPIRouter() *api.Router {
+	panic(wire.Build(
+		allProviders,
+	))
+}
+
 func CreateSubsonicAPIRouter() *subsonic.Router {
 	panic(wire.Build(
 		allProviders,
+		GetScanner,
 	))
 }
 
@@ -72,26 +79,22 @@ func CreateListenBrainzRouter() *listenbrainz.Router {
 	))
 }
 
-func CreateInsights() metrics.Insights {
-	panic(wire.Build(
-		allProviders,
-	))
-}
-
-func CreatePrometheus() metrics.Metrics {
-	panic(wire.Build(
-		allProviders,
-	))
-}
+// Scanner must be a Singleton
+var (
+	onceScanner     sync.Once
+	scannerInstance scanner.Scanner
+)
 
 func GetScanner() scanner.Scanner {
-	panic(wire.Build(
-		allProviders,
-	))
+	onceScanner.Do(func() {
+		scannerInstance = createScanner()
+	})
+	return scannerInstance
 }
 
-func GetPlaybackServer() playback.PlaybackServer {
+func createScanner() scanner.Scanner {
 	panic(wire.Build(
 		allProviders,
+		scanner.New,
 	))
 }

conf/buildtags/buildtags.go

@@ -1,4 +0,0 @@
-package buildtags
-
-// This file is left intentionally empty. It is used to make sure the package is not empty, in the case all
-// required build tags are disabled.

conf/buildtags/netgo.go

@@ -1,11 +0,0 @@
-//go:build netgo
-
-package buildtags
-
-// NOTICE: This file was created to force the inclusion of the `netgo` tag when compiling the project.
-// If the tag is not included, the compilation will fail because this variable won't be defined, and the `main.go`
-// file requires it.
-
-// Why this tag is required? See https://github.com/navidrome/navidrome/issues/700
-
-var NETGO = true

conf/configuration.go

@@ -12,84 +12,72 @@ import (
 	"github.com/kr/pretty"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/log"
+	"github.com/navidrome/navidrome/utils/number"
 	"github.com/robfig/cron/v3"
 	"github.com/spf13/viper"
 )
 
 type configOptions struct {
-	ConfigFile                      string
-	Address                         string
-	Port                            int
-	UnixSocketPerm                  string
-	MusicFolder                     string
-	DataFolder                      string
-	CacheFolder                     string
-	DbPath                          string
-	LogLevel                        string
-	LogFile                         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
-	EnableTranscodingConfig         bool
-	EnableDownloads                 bool
-	EnableExternalServices          bool
-	EnableInsightsCollector         bool
-	EnableMediaFileCoverArt         bool
-	TranscodingCacheSize            string
-	ImageCacheSize                  string
-	AlbumPlayCountMode              string
-	EnableArtworkPrecache           bool
-	AutoImportPlaylists             bool
-	DefaultPlaylistPublicVisibility bool
-	PlaylistsPath                   string
-	SmartPlaylistRefreshDelay       time.Duration
-	AutoTranscodeDownload           bool
-	DefaultDownsamplingFormat       string
-	SearchFullString                bool
-	RecentlyAddedByModTime          bool
-	PreferSortTags                  bool
-	IgnoredArticles                 string
-	IndexGroups                     string
-	SubsonicArtistParticipations    bool
-	FFmpegPath                      string
-	MPVPath                         string
-	MPVCmdTemplate                  string
-	CoverArtPriority                string
-	CoverJpegQuality                int
-	ArtistArtPriority               string
-	EnableGravatar                  bool
-	EnableFavourites                bool
-	EnableStarRating                bool
-	EnableUserEditing               bool
-	EnableSharing                   bool
-	ShareURL                        string
-	DefaultDownloadableShare        bool
-	DefaultTheme                    string
-	DefaultLanguage                 string
-	DefaultUIVolume                 int
-	EnableReplayGain                bool
-	EnableCoverAnimation            bool
-	GATrackingID                    string
-	EnableLogRedacting              bool
-	AuthRequestLimit                int
-	AuthWindowLength                time.Duration
-	PasswordEncryptionKey           string
-	ReverseProxyUserHeader          string
-	ReverseProxyWhitelist           string
-	HTTPSecurityHeaders             secureOptions
-	Prometheus                      prometheusOptions
-	Scanner                         scannerOptions
-	Jukebox                         jukeboxOptions
-	Backup                          backupOptions
+	ConfigFile                   string
+	Address                      string
+	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
+	EnableTranscodingConfig      bool
+	EnableDownloads              bool
+	EnableExternalServices       bool
+	EnableMediaFileCoverArt      bool
+	TranscodingCacheSize         string
+	ImageCacheSize               string
+	EnableArtworkPrecache        bool
+	AutoImportPlaylists          bool
+	PlaylistsPath                string
+	AutoTranscodeDownload        bool
+	DefaultDownsamplingFormat    string
+	SearchFullString             bool
+	RecentlyAddedByModTime       bool
+	IgnoredArticles              string
+	IndexGroups                  string
+	SubsonicArtistParticipations bool
+	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
+	EnableReplayGain             bool
+	EnableCoverAnimation         bool
+	GATrackingID                 string
+	EnableLogRedacting           bool
+	AuthRequestLimit             int
+	AuthWindowLength             time.Duration
+	PasswordEncryptionKey        string
+	ReverseProxyUserHeader       string
+	ReverseProxyWhitelist        string
+	Prometheus                   prometheusOptions
+	Scanner                      scannerOptions
 
 	Agents       string
 	LastFM       lastfmOptions
@@ -103,18 +91,14 @@ type configOptions struct {
 	DevAutoCreateAdminPassword       string
 	DevAutoLoginUsername             string
 	DevActivityPanel                 bool
-	DevActivityPanelUpdateRate       time.Duration
 	DevSidebarPlaylists              bool
 	DevEnableBufferedScrobble        bool
 	DevShowArtistPage                bool
-	DevOffsetOptimize                int
 	DevArtworkMaxRequests            int
 	DevArtworkThrottleBacklogLimit   int
 	DevArtworkThrottleBacklogTimeout time.Duration
 	DevArtistInfoTimeToLive          time.Duration
 	DevAlbumInfoTimeToLive           time.Duration
-	DevInsightsInitialDelay          time.Duration
-	DevEnablePlayerInsights          bool
 }
 
 type scannerOptions struct {
@@ -140,29 +124,9 @@ type listenBrainzOptions struct {
 	BaseURL string
 }
 
-type secureOptions struct {
-	CustomFrameOptionsValue string
-}
-
 type prometheusOptions struct {
 	Enabled     bool
 	MetricsPath string
-	Password    string
-}
-
-type AudioDeviceDefinition []string
-
-type jukeboxOptions struct {
-	Enabled   bool
-	Devices   []AudioDeviceDefinition
-	Default   string
-	AdminOnly bool
-}
-
-type backupOptions struct {
-	Count    int
-	Path     string
-	Schedule string
 }
 
 var (
@@ -181,17 +145,14 @@ func LoadFromFile(confFile string) {
 }
 
 func Load() {
-	parseIniFileConfiguration()
-
 	err := viper.Unmarshal(&Server)
 	if err != nil {
 		_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error parsing config:", err)
 		os.Exit(1)
 	}
-
 	err = os.MkdirAll(Server.DataFolder, os.ModePerm)
 	if err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error creating data path:", err)
+		_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error creating data path:", "path", Server.DataFolder, err)
 		os.Exit(1)
 	}
 
@@ -200,7 +161,7 @@ func Load() {
 	}
 	err = os.MkdirAll(Server.CacheFolder, os.ModePerm)
 	if err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error creating cache path:", err)
+		_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error creating cache path:", "path", Server.CacheFolder, err)
 		os.Exit(1)
 	}
 
@@ -209,24 +170,6 @@ func Load() {
 		Server.DbPath = filepath.Join(Server.DataFolder, consts.DefaultDbPath)
 	}
 
-	if Server.Backup.Path != "" {
-		err = os.MkdirAll(Server.Backup.Path, os.ModePerm)
-		if err != nil {
-			_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error creating backup path:", err)
-			os.Exit(1)
-		}
-	}
-
-	out := os.Stderr
-	if Server.LogFile != "" {
-		out, err = os.OpenFile(Server.LogFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-		if err != nil {
-			_, _ = fmt.Fprintf(os.Stderr, "FATAL: Error opening log file %s: %s\n", Server.LogFile, err.Error())
-			os.Exit(1)
-		}
-		log.SetOutput(out)
-	}
-
 	log.SetLevelString(Server.LogLevel)
 	log.SetLogLevels(Server.DevLogLevels)
 	log.SetLogSourceLine(Server.DevLogSourceLine)
@@ -236,14 +179,10 @@ func Load() {
 		os.Exit(1)
 	}
 
-	if err := validateBackupSchedule(); err != nil {
-		os.Exit(1)
-	}
-
 	if Server.BaseURL != "" {
 		u, err := url.Parse(Server.BaseURL)
 		if err != nil {
-			_, _ = fmt.Fprintln(os.Stderr, "FATAL: Invalid BaseURL:", err)
+			_, _ = fmt.Fprintf(os.Stderr, "FATAL: Invalid BaseURL %s: %s\n", Server.BaseURL, err.Error())
 			os.Exit(1)
 		}
 		Server.BasePath = u.Path
@@ -254,12 +193,12 @@ func Load() {
 	}
 
 	// Print current configuration if log level is Debug
-	if log.IsGreaterOrEqualTo(log.LevelDebug) {
+	if log.CurrentLevel() >= log.LevelDebug {
 		prettyConf := pretty.Sprintf("Loaded configuration from '%s': %# v", Server.ConfigFile, Server)
 		if Server.EnableLogRedacting {
 			prettyConf = log.Redact(prettyConf)
 		}
-		_, _ = fmt.Fprintln(out, prettyConf)
+		_, _ = fmt.Fprintln(os.Stderr, prettyConf)
 	}
 
 	if !Server.EnableExternalServices {
@@ -272,34 +211,8 @@ func Load() {
 	}
 }
 
-// parseIniFileConfiguration is used to parse the config file when it is in INI format. For INI files, it
-// would require a nested structure, so instead we unmarshal it to a map and then merge the nested [default]
-// section into the root level.
-func parseIniFileConfiguration() {
-	cfgFile := viper.ConfigFileUsed()
-	if strings.ToLower(filepath.Ext(cfgFile)) == ".ini" {
-		var iniConfig map[string]interface{}
-		err := viper.Unmarshal(&iniConfig)
-		if err != nil {
-			_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error parsing config:", err)
-			os.Exit(1)
-		}
-		cfg, ok := iniConfig["default"].(map[string]any)
-		if !ok {
-			_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error parsing config: missing [default] section:", iniConfig)
-			os.Exit(1)
-		}
-		err = viper.MergeConfigMap(cfg)
-		if err != nil {
-			_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error parsing config:", err)
-			os.Exit(1)
-		}
-	}
-}
-
 func disableExternalServices() {
 	log.Info("All external integrations are DISABLED!")
-	Server.EnableInsightsCollector = false
 	Server.LastFM.Enabled = false
 	Server.Spotify.ID = ""
 	Server.ListenBrainz.Enabled = false
@@ -327,35 +240,15 @@ func validateScanSchedule() error {
 		Server.ScanSchedule = ""
 		return nil
 	}
-	var err error
-	Server.ScanSchedule, err = validateSchedule(Server.ScanSchedule, "ScanSchedule")
-	return err
-}
-
-func validateBackupSchedule() error {
-	if Server.Backup.Path == "" || Server.Backup.Schedule == "" || Server.Backup.Count == 0 {
-		Server.Backup.Schedule = ""
-		return nil
-	}
-
-	var err error
-	Server.Backup.Schedule, err = validateSchedule(Server.Backup.Schedule, "BackupSchedule")
-
-	return err
-}
-
-func validateSchedule(schedule, field string) (string, error) {
-	if _, err := time.ParseDuration(schedule); err == nil {
-		schedule = "@every " + schedule
+	if _, err := time.ParseDuration(Server.ScanSchedule); err == nil {
+		Server.ScanSchedule = "@every " + Server.ScanSchedule
 	}
 	c := cron.New()
-	id, err := c.AddFunc(schedule, func() {})
+	_, err := c.AddFunc(Server.ScanSchedule, func() {})
 	if err != nil {
-		log.Error(fmt.Sprintf("Invalid %s. Please read format spec at https://pkg.go.dev/github.com/robfig/cron#hdr-CRON_Expression_Format", field), "schedule", field, err)
-	} else {
-		c.Remove(id)
+		log.Error("Invalid ScanSchedule. Please read format spec at https://pkg.go.dev/github.com/robfig/cron#hdr-CRON_Expression_Format", "schedule", Server.ScanSchedule, err)
 	}
-	return schedule, err
+	return err
 }
 
 // AddHook is used to register initialization code that should run as soon as the config is loaded
@@ -368,10 +261,8 @@ func init() {
 	viper.SetDefault("cachefolder", "")
 	viper.SetDefault("datafolder", ".")
 	viper.SetDefault("loglevel", "info")
-	viper.SetDefault("logfile", "")
 	viper.SetDefault("address", "0.0.0.0")
 	viper.SetDefault("port", 4533)
-	viper.SetDefault("unixsocketperm", "0660")
 	viper.SetDefault("sessiontimeout", consts.DefaultSessionTimeout)
 	viper.SetDefault("scaninterval", -1)
 	viper.SetDefault("scanschedule", "@every 1m")
@@ -384,26 +275,20 @@ func init() {
 	viper.SetDefault("enabletranscodingconfig", false)
 	viper.SetDefault("transcodingcachesize", "100MB")
 	viper.SetDefault("imagecachesize", "100MB")
-	viper.SetDefault("albumplaycountmode", consts.AlbumPlayCountModeAbsolute)
 	viper.SetDefault("enableartworkprecache", true)
 	viper.SetDefault("autoimportplaylists", true)
-	viper.SetDefault("defaultplaylistpublicvisibility", false)
 	viper.SetDefault("playlistspath", consts.DefaultPlaylistsPath)
-	viper.SetDefault("smartPlaylistRefreshDelay", 5*time.Second)
 	viper.SetDefault("enabledownloads", true)
 	viper.SetDefault("enableexternalservices", true)
-	viper.SetDefault("enablemediafilecoverart", true)
+	viper.SetDefault("enableMediaFileCoverArt", true)
 	viper.SetDefault("autotranscodedownload", false)
 	viper.SetDefault("defaultdownsamplingformat", consts.DefaultDownsamplingFormat)
 	viper.SetDefault("searchfullstring", false)
 	viper.SetDefault("recentlyaddedbymodtime", false)
-	viper.SetDefault("prefersorttags", false)
 	viper.SetDefault("ignoredarticles", "The El La Los Las Le Les Os As O A")
 	viper.SetDefault("indexgroups", "A B C D E F G H I J K L M N O P Q R S T U V W X-Z(XYZ) [Unknown]([)")
 	viper.SetDefault("subsonicartistparticipations", false)
 	viper.SetDefault("ffmpegpath", "")
-	viper.SetDefault("mpvcmdtemplate", "mpv --audio-device=%d --no-audio-display --pause %f --input-ipc-server=%s")
-
 	viper.SetDefault("coverartpriority", "cover.*, folder.*, front.*, embedded, external")
 	viper.SetDefault("coverjpegquality", 75)
 	viper.SetDefault("artistartpriority", "artist.*, album/artist.*, external")
@@ -417,7 +302,6 @@ func init() {
 	viper.SetDefault("enablereplaygain", true)
 	viper.SetDefault("enablecoveranimation", true)
 	viper.SetDefault("gatrackingid", "")
-	viper.SetDefault("enableinsightscollector", true)
 	viper.SetDefault("enablelogredacting", true)
 	viper.SetDefault("authrequestlimit", 5)
 	viper.SetDefault("authwindowlength", 20*time.Second)
@@ -427,13 +311,7 @@ func init() {
 	viper.SetDefault("reverseproxywhitelist", "")
 
 	viper.SetDefault("prometheus.enabled", false)
-	viper.SetDefault("prometheus.metricspath", consts.PrometheusDefaultPath)
-	viper.SetDefault("prometheus.password", "")
-
-	viper.SetDefault("jukebox.enabled", false)
-	viper.SetDefault("jukebox.devices", []AudioDeviceDefinition{})
-	viper.SetDefault("jukebox.default", "")
-	viper.SetDefault("jukebox.adminonly", true)
+	viper.SetDefault("prometheus.metricspath", "/metrics")
 
 	viper.SetDefault("scanner.extractor", consts.DefaultScannerExtractor)
 	viper.SetDefault("scanner.genreseparators", ";/,")
@@ -442,40 +320,29 @@ func init() {
 	viper.SetDefault("agents", "lastfm,spotify")
 	viper.SetDefault("lastfm.enabled", true)
 	viper.SetDefault("lastfm.language", "en")
-	viper.SetDefault("lastfm.apikey", "")
-	viper.SetDefault("lastfm.secret", "")
+	viper.SetDefault("lastfm.apikey", consts.LastFMAPIKey)
+	viper.SetDefault("lastfm.secret", consts.LastFMAPISecret)
 	viper.SetDefault("spotify.id", "")
 	viper.SetDefault("spotify.secret", "")
 	viper.SetDefault("listenbrainz.enabled", true)
 	viper.SetDefault("listenbrainz.baseurl", "https://api.listenbrainz.org/1/")
 
-	viper.SetDefault("httpsecurityheaders.customframeoptionsvalue", "DENY")
-
-	viper.SetDefault("backup.path", "")
-	viper.SetDefault("backup.schedule", "")
-	viper.SetDefault("backup.count", 0)
-
 	// 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("devactivitypanelupdaterate", 300*time.Millisecond)
 	viper.SetDefault("enablesharing", false)
-	viper.SetDefault("shareurl", "")
 	viper.SetDefault("defaultdownloadableshare", false)
 	viper.SetDefault("devenablebufferedscrobble", true)
 	viper.SetDefault("devsidebarplaylists", true)
 	viper.SetDefault("devshowartistpage", true)
-	viper.SetDefault("devoffsetoptimize", 50000)
-	viper.SetDefault("devartworkmaxrequests", max(2, runtime.NumCPU()/3))
+	viper.SetDefault("devartworkmaxrequests", number.Max(2, runtime.NumCPU()/3))
 	viper.SetDefault("devartworkthrottlebackloglimit", consts.RequestThrottleBacklogLimit)
 	viper.SetDefault("devartworkthrottlebacklogtimeout", consts.RequestThrottleBacklogTimeout)
 	viper.SetDefault("devartistinfotimetolive", consts.ArtistInfoTimeToLive)
 	viper.SetDefault("devalbuminfotimetolive", consts.AlbumInfoTimeToLive)
-	viper.SetDefault("devinsightsinitialdelay", consts.InsightsInitialDelay)
-	viper.SetDefault("devenableplayerinsights", true)
 }
 
 func InitConfig(cfgFile string) {

conf/mime/mime_types.go

@@ -1,48 +0,0 @@
-package mime
-
-import (
-	"mime"
-	"strings"
-
-	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/log"
-	"github.com/navidrome/navidrome/resources"
-	"gopkg.in/yaml.v3"
-)
-
-type mimeConf struct {
-	Types    map[string]string `yaml:"types"`
-	Lossless []string          `yaml:"lossless"`
-}
-
-var LosslessFormats []string
-
-func initMimeTypes() {
-	// In some circumstances, Windows sets JS mime-type to `text/plain`!
-	_ = mime.AddExtensionType(".js", "text/javascript")
-	_ = mime.AddExtensionType(".css", "text/css")
-	_ = mime.AddExtensionType(".webmanifest", "application/manifest+json")
-
-	f, err := resources.FS().Open("mime_types.yaml")
-	if err != nil {
-		log.Fatal("Fatal error opening mime_types.yaml", err)
-	}
-	defer f.Close()
-
-	var mimeConf mimeConf
-	err = yaml.NewDecoder(f).Decode(&mimeConf)
-	if err != nil {
-		log.Fatal("Fatal error parsing mime_types.yaml", err)
-	}
-	for ext, typ := range mimeConf.Types {
-		_ = mime.AddExtensionType(ext, typ)
-	}
-
-	for _, ext := range mimeConf.Lossless {
-		LosslessFormats = append(LosslessFormats, strings.TrimPrefix(ext, "."))
-	}
-}
-
-func init() {
-	conf.AddHook(initMimeTypes)
-}

consts/consts.go

@@ -3,7 +3,6 @@ package consts
 import (
 	"crypto/md5"
 	"fmt"
-	"os"
 	"path/filepath"
 	"strings"
 	"time"
@@ -33,6 +32,7 @@ const (
 
 	URLPathUI           = "/app"
 	URLPathNativeAPI    = "/api"
+	URLPathAPI          = "/api/v2"
 	URLPathSubsonicAPI  = "/rest"
 	URLPathPublic       = "/share"
 	URLPathPublicImages = URLPathPublic + "/img"
@@ -58,7 +58,7 @@ const (
 	SkipScanFile = ".ndignore"
 
 	PlaceholderArtistArt = "artist-placeholder.webp"
-	PlaceholderAlbumArt  = "album-placeholder.webp"
+	PlaceholderAlbumArt  = "placeholder.png"
 	PlaceholderAvatar    = "logo-192x192.png"
 	UICoverArtSize       = 300
 	DefaultUIVolume      = 100
@@ -70,12 +70,6 @@ const (
 	Zwsp = string('\u200b')
 )
 
-// Prometheus options
-const (
-	PrometheusDefaultPath = "/metrics"
-	PrometheusAuthUser    = "navidrome"
-)
-
 // Cache options
 const (
 	TranscodingCacheDir             = "transcoding"
@@ -88,43 +82,32 @@ const (
 	DefaultCacheCleanUpInterval = 10 * time.Minute
 )
 
+// Shared secrets (only add here "secrets" that can be public)
 const (
-	AlbumPlayCountModeAbsolute   = "absolute"
-	AlbumPlayCountModeNormalized = "normalized"
-)
-
-const (
-	InsightsIDKey          = "InsightsID"
-	InsightsEndpoint       = "https://insights.navidrome.org/collect"
-	InsightsUpdateInterval = 24 * time.Hour
-	InsightsInitialDelay   = 30 * time.Minute
+	LastFMAPIKey    = "9b94a5515ea66b2da3ec03c12300327e" // nolint:gosec
+	LastFMAPISecret = "74cb6557cec7171d921af5d7d887c587" // nolint:gosec
 )
 
 var (
 	DefaultDownsamplingFormat = "opus"
-	DefaultTranscodings       = []struct {
-		Name           string
-		TargetFormat   string
-		DefaultBitRate int
-		Command        string
-	}{
+	DefaultTranscodings       = []map[string]interface{}{
 		{
-			Name:           "mp3 audio",
-			TargetFormat:   "mp3",
-			DefaultBitRate: 192,
-			Command:        "ffmpeg -i %s -ss %t -map 0:a:0 -b:a %bk -v 0 -f mp3 -",
+			"name":           "mp3 audio",
+			"targetFormat":   "mp3",
+			"defaultBitRate": 192,
+			"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 -ss %t -map 0:a:0 -b:a %bk -v 0 -c:a libopus -f opus -",
+			"name":           "opus audio",
+			"targetFormat":   "opus",
+			"defaultBitRate": 128,
+			"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 -ss %t -map 0:a:0 -b:a %bk -v 0 -c:a aac -f adts -",
+			"name":           "aac audio",
+			"targetFormat":   "aac",
+			"defaultBitRate": 256,
+			"command":        "ffmpeg -i %s -map 0:a:0 -b:a %bk -v 0 -c:a aac -f adts -",
 		},
 	}
 
@@ -141,11 +124,3 @@ var (
 
 	ServerStart = time.Now()
 )
-
-var InContainer = func() bool {
-	// Check if the /.nddockerenv file exists
-	if _, err := os.Stat("/.nddockerenv"); err == nil {
-		return true
-	}
-	return false
-}()

consts/mime_types.go

@@ -0,0 +1,64 @@
+package consts
+
+import (
+	"mime"
+	"sort"
+	"strings"
+)
+
+type format struct {
+	typ      string
+	lossless bool
+}
+
+var audioFormats = map[string]format{
+	".mp3":  {typ: "audio/mpeg"},
+	".ogg":  {typ: "audio/ogg"},
+	".oga":  {typ: "audio/ogg"},
+	".opus": {typ: "audio/ogg"},
+	".aac":  {typ: "audio/mp4"},
+	".alac": {typ: "audio/mp4", lossless: true},
+	".m4a":  {typ: "audio/mp4"},
+	".m4b":  {typ: "audio/mp4"},
+	".flac": {typ: "audio/flac", lossless: true},
+	".wav":  {typ: "audio/x-wav", lossless: true},
+	".wma":  {typ: "audio/x-ms-wma"},
+	".ape":  {typ: "audio/x-monkeys-audio", lossless: true},
+	".mpc":  {typ: "audio/x-musepack"},
+	".shn":  {typ: "audio/x-shn", lossless: true},
+	".aif":  {typ: "audio/x-aiff"},
+	".aiff": {typ: "audio/x-aiff"},
+	".m3u":  {typ: "audio/x-mpegurl"},
+	".pls":  {typ: "audio/x-scpls"},
+	".dsf":  {typ: "audio/dsd", lossless: true},
+	".wv":   {typ: "audio/x-wavpack", lossless: true},
+	".wvp":  {typ: "audio/x-wavpack", lossless: true},
+	".mka":  {typ: "audio/x-matroska"},
+}
+var imageFormats = map[string]string{
+	".gif":  "image/gif",
+	".jpg":  "image/jpeg",
+	".jpeg": "image/jpeg",
+	".webp": "image/webp",
+	".png":  "image/png",
+	".bmp":  "image/bmp",
+}
+
+var LosslessFormats []string
+
+func init() {
+	for ext, fmt := range audioFormats {
+		_ = mime.AddExtensionType(ext, fmt.typ)
+		if fmt.lossless {
+			LosslessFormats = append(LosslessFormats, strings.TrimPrefix(ext, "."))
+		}
+	}
+	sort.Strings(LosslessFormats)
+	for ext, typ := range imageFormats {
+		_ = mime.AddExtensionType(ext, typ)
+	}
+
+	// In some circumstances, Windows sets JS mime-type to `text/plain`!
+	_ = mime.AddExtensionType(".js", "text/javascript")
+	_ = mime.AddExtensionType(".css", "text/css")
+}

contrib/freebsd_rc

@@ -11,7 +11,7 @@
 #
 # navidrome_enable (bool):              Set to YES to enable navidrome
 #                                       Default: NO
-# navidrome_config (str):               navidrome configuration file
+# navidrome_config (str):               navidrome configration file
 #                                       Default: /usr/local/etc/navidrome/config.toml
 # navidrome_datafolder (str):   navidrome Folder to store application data 
 #                                       Default: www

contrib/navidrome.service

@@ -11,13 +11,15 @@ WantedBy=multi-user.target
 User=navidrome
 Group=navidrome
 Type=simple
-ExecStart=/usr/bin/navidrome --configfile "/etc/navidrome/navidrome.toml"
+ExecStart=/usr/bin/navidrome
 StateDirectory=navidrome
 WorkingDirectory=/var/lib/navidrome
 TimeoutStopSec=20
 KillMode=process
 Restart=on-failure
 
+EnvironmentFile=-/etc/sysconfig/navidrome
+
 # See https://www.freedesktop.org/software/systemd/man/systemd.exec.html
 CapabilityBoundingSet=
 DevicePolicy=closed

core/agents/agents.go

@@ -134,7 +134,7 @@ func (a *Agents) GetSimilarArtists(ctx context.Context, id, name, mbid string, l
 		}
 		similar, err := agent.GetSimilarArtists(ctx, id, name, mbid, limit)
 		if len(similar) > 0 && err == nil {
-			if log.IsGreaterOrEqualTo(log.LevelTrace) {
+			if log.CurrentLevel() >= log.LevelTrace {
 				log.Debug(ctx, "Got Similar Artists", "agent", ag.AgentName(), "artist", name, "similar", similar, "elapsed", time.Since(start))
 			} else {
 				log.Debug(ctx, "Got Similar Artists", "agent", ag.AgentName(), "artist", name, "similarReceived", len(similar), "elapsed", time.Since(start))

core/agents/agents_test.go

@@ -60,7 +60,7 @@ var _ = Describe("Agents", func() {
 		Describe("GetArtistMBID", func() {
 			It("returns on first match", func() {
 				Expect(ag.GetArtistMBID(ctx, "123", "test")).To(Equal("mbid"))
-				Expect(mock.Args).To(HaveExactElements("123", "test"))
+				Expect(mock.Args).To(ConsistOf("123", "test"))
 			})
 			It("returns empty if artist is Various Artists", func() {
 				mbid, err := ag.GetArtistMBID(ctx, consts.VariousArtistsID, consts.VariousArtists)
@@ -78,7 +78,7 @@ var _ = Describe("Agents", func() {
 				mock.Err = errors.New("error")
 				_, err := ag.GetArtistMBID(ctx, "123", "test")
 				Expect(err).To(MatchError(ErrNotFound))
-				Expect(mock.Args).To(HaveExactElements("123", "test"))
+				Expect(mock.Args).To(ConsistOf("123", "test"))
 			})
 			It("interrupts if the context is canceled", func() {
 				cancel()
@@ -91,7 +91,7 @@ var _ = Describe("Agents", func() {
 		Describe("GetArtistURL", func() {
 			It("returns on first match", func() {
 				Expect(ag.GetArtistURL(ctx, "123", "test", "mb123")).To(Equal("url"))
-				Expect(mock.Args).To(HaveExactElements("123", "test", "mb123"))
+				Expect(mock.Args).To(ConsistOf("123", "test", "mb123"))
 			})
 			It("returns empty if artist is Various Artists", func() {
 				url, err := ag.GetArtistURL(ctx, consts.VariousArtistsID, consts.VariousArtists, "")
@@ -109,7 +109,7 @@ var _ = Describe("Agents", func() {
 				mock.Err = errors.New("error")
 				_, err := ag.GetArtistURL(ctx, "123", "test", "mb123")
 				Expect(err).To(MatchError(ErrNotFound))
-				Expect(mock.Args).To(HaveExactElements("123", "test", "mb123"))
+				Expect(mock.Args).To(ConsistOf("123", "test", "mb123"))
 			})
 			It("interrupts if the context is canceled", func() {
 				cancel()
@@ -122,7 +122,7 @@ var _ = Describe("Agents", func() {
 		Describe("GetArtistBiography", func() {
 			It("returns on first match", func() {
 				Expect(ag.GetArtistBiography(ctx, "123", "test", "mb123")).To(Equal("bio"))
-				Expect(mock.Args).To(HaveExactElements("123", "test", "mb123"))
+				Expect(mock.Args).To(ConsistOf("123", "test", "mb123"))
 			})
 			It("returns empty if artist is Various Artists", func() {
 				bio, err := ag.GetArtistBiography(ctx, consts.VariousArtistsID, consts.VariousArtists, "")
@@ -140,7 +140,7 @@ var _ = Describe("Agents", func() {
 				mock.Err = errors.New("error")
 				_, err := ag.GetArtistBiography(ctx, "123", "test", "mb123")
 				Expect(err).To(MatchError(ErrNotFound))
-				Expect(mock.Args).To(HaveExactElements("123", "test", "mb123"))
+				Expect(mock.Args).To(ConsistOf("123", "test", "mb123"))
 			})
 			It("interrupts if the context is canceled", func() {
 				cancel()
@@ -156,13 +156,13 @@ var _ = Describe("Agents", func() {
 					URL:  "imageUrl",
 					Size: 100,
 				}}))
-				Expect(mock.Args).To(HaveExactElements("123", "test", "mb123"))
+				Expect(mock.Args).To(ConsistOf("123", "test", "mb123"))
 			})
 			It("skips the agent if it returns an error", func() {
 				mock.Err = errors.New("error")
 				_, err := ag.GetArtistImages(ctx, "123", "test", "mb123")
 				Expect(err).To(MatchError("not found"))
-				Expect(mock.Args).To(HaveExactElements("123", "test", "mb123"))
+				Expect(mock.Args).To(ConsistOf("123", "test", "mb123"))
 			})
 			It("interrupts if the context is canceled", func() {
 				cancel()
@@ -178,13 +178,13 @@ var _ = Describe("Agents", func() {
 					Name: "Joe Dohn",
 					MBID: "mbid321",
 				}}))
-				Expect(mock.Args).To(HaveExactElements("123", "test", "mb123", 1))
+				Expect(mock.Args).To(ConsistOf("123", "test", "mb123", 1))
 			})
 			It("skips the agent if it returns an error", func() {
 				mock.Err = errors.New("error")
 				_, err := ag.GetSimilarArtists(ctx, "123", "test", "mb123", 1)
 				Expect(err).To(MatchError(ErrNotFound))
-				Expect(mock.Args).To(HaveExactElements("123", "test", "mb123", 1))
+				Expect(mock.Args).To(ConsistOf("123", "test", "mb123", 1))
 			})
 			It("interrupts if the context is canceled", func() {
 				cancel()
@@ -200,13 +200,13 @@ var _ = Describe("Agents", func() {
 					Name: "A Song",
 					MBID: "mbid444",
 				}}))
-				Expect(mock.Args).To(HaveExactElements("123", "test", "mb123", 2))
+				Expect(mock.Args).To(ConsistOf("123", "test", "mb123", 2))
 			})
 			It("skips the agent if it returns an error", func() {
 				mock.Err = errors.New("error")
 				_, err := ag.GetArtistTopSongs(ctx, "123", "test", "mb123", 2)
 				Expect(err).To(MatchError(ErrNotFound))
-				Expect(mock.Args).To(HaveExactElements("123", "test", "mb123", 2))
+				Expect(mock.Args).To(ConsistOf("123", "test", "mb123", 2))
 			})
 			It("interrupts if the context is canceled", func() {
 				cancel()
@@ -236,13 +236,13 @@ var _ = Describe("Agents", func() {
 						},
 					},
 				}))
-				Expect(mock.Args).To(HaveExactElements("album", "artist", "mbid"))
+				Expect(mock.Args).To(ConsistOf("album", "artist", "mbid"))
 			})
 			It("skips the agent if it returns an error", func() {
 				mock.Err = errors.New("error")
 				_, err := ag.GetAlbumInfo(ctx, "album", "artist", "mbid")
 				Expect(err).To(MatchError(ErrNotFound))
-				Expect(mock.Args).To(HaveExactElements("album", "artist", "mbid"))
+				Expect(mock.Args).To(ConsistOf("album", "artist", "mbid"))
 			})
 			It("interrupts if the context is canceled", func() {
 				cancel()

core/agents/lastfm/agent.go

@@ -3,21 +3,18 @@ package lastfm
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"regexp"
 	"strconv"
 	"strings"
 
-	"github.com/andybalholm/cascadia"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/core/agents"
 	"github.com/navidrome/navidrome/core/scrobbler"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
-	"github.com/navidrome/navidrome/utils/cache"
-	"golang.org/x/net/html"
+	"github.com/navidrome/navidrome/utils"
 )
 
 const (
@@ -50,7 +47,7 @@ func lastFMConstructor(ds model.DataStore) *lastfmAgent {
 	hc := &http.Client{
 		Timeout: consts.DefaultHttpClientTimeOut,
 	}
-	chc := cache.NewHTTPClient(hc, consts.DefaultHttpClientTimeOut)
+	chc := utils.NewCachedHTTPClient(hc, consts.DefaultHttpClientTimeOut)
 	l.client = newClient(l.apiKey, l.secret, l.lang, chc)
 	return l
 }
@@ -181,51 +178,13 @@ func (l *lastfmAgent) GetArtistTopSongs(ctx context.Context, id, artistName, mbi
 	return res, nil
 }
 
-var artistOpenGraphQuery = cascadia.MustCompile(`html > head > meta[property="og:image"]`)
-
-func (l *lastfmAgent) GetArtistImages(ctx context.Context, _, name, mbid string) ([]agents.ExternalImage, error) {
-	a, err := l.callArtistGetInfo(ctx, name, mbid)
-	if err != nil {
-		return nil, fmt.Errorf("get artist info: %w", err)
-	}
-	req, err := http.NewRequest(http.MethodGet, a.URL, nil)
-	if err != nil {
-		return nil, fmt.Errorf("create artist image request: %w", err)
-	}
-	resp, err := l.client.hc.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("get artist url: %w", err)
-	}
-	defer resp.Body.Close()
-
-	node, err := html.Parse(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("parse html: %w", err)
-	}
-
-	var res []agents.ExternalImage
-	n := cascadia.Query(node, artistOpenGraphQuery)
-	if n == nil {
-		return res, nil
-	}
-	for _, attr := range n.Attr {
-		if attr.Key == "content" {
-			res = []agents.ExternalImage{
-				{URL: attr.Val},
-			}
-			break
-		}
-	}
-	return res, nil
-}
-
 func (l *lastfmAgent) callAlbumGetInfo(ctx context.Context, name, artist, mbid string) (*Album, error) {
 	a, err := l.client.albumGetInfo(ctx, name, artist, mbid)
 	var lfErr *lastFMError
 	isLastFMError := errors.As(err, &lfErr)
 
 	if mbid != "" && (isLastFMError && lfErr.Code == 6) {
-		log.Debug(ctx, "LastFM/album.getInfo could not find album by mbid, trying again", "album", name, "mbid", mbid)
+		log.Warn(ctx, "LastFM/album.getInfo could not find album by mbid, trying again", "album", name, "mbid", mbid)
 		return l.callAlbumGetInfo(ctx, name, artist, "")
 	}
 
@@ -246,7 +205,7 @@ func (l *lastfmAgent) callArtistGetInfo(ctx context.Context, name string, mbid s
 	isLastFMError := errors.As(err, &lfErr)
 
 	if mbid != "" && ((err == nil && a.Name == "[unknown]") || (isLastFMError && lfErr.Code == 6)) {
-		log.Debug(ctx, "LastFM/artist.getInfo could not find artist by mbid, trying again", "artist", name, "mbid", mbid)
+		log.Warn(ctx, "LastFM/artist.getInfo could not find artist by mbid, trying again", "artist", name, "mbid", mbid)
 		return l.callArtistGetInfo(ctx, name, "")
 	}
 
@@ -262,7 +221,7 @@ func (l *lastfmAgent) callArtistGetSimilar(ctx context.Context, name string, mbi
 	var lfErr *lastFMError
 	isLastFMError := errors.As(err, &lfErr)
 	if mbid != "" && ((err == nil && s.Attr.Artist == "[unknown]") || (isLastFMError && lfErr.Code == 6)) {
-		log.Debug(ctx, "LastFM/artist.getSimilar could not find artist by mbid, trying again", "artist", name, "mbid", mbid)
+		log.Warn(ctx, "LastFM/artist.getSimilar could not find artist by mbid, trying again", "artist", name, "mbid", mbid)
 		return l.callArtistGetSimilar(ctx, name, "", limit)
 	}
 	if err != nil {
@@ -277,7 +236,7 @@ func (l *lastfmAgent) callArtistGetTopTracks(ctx context.Context, artistName, mb
 	var lfErr *lastFMError
 	isLastFMError := errors.As(err, &lfErr)
 	if mbid != "" && ((err == nil && t.Attr.Artist == "[unknown]") || (isLastFMError && lfErr.Code == 6)) {
-		log.Debug(ctx, "LastFM/artist.getTopTracks could not find artist by mbid, trying again", "artist", artistName, "mbid", mbid)
+		log.Warn(ctx, "LastFM/artist.getTopTracks could not find artist by mbid, trying again", "artist", artistName, "mbid", mbid)
 		return l.callArtistGetTopTracks(ctx, artistName, "", count)
 	}
 	if err != nil {
@@ -298,7 +257,7 @@ func (l *lastfmAgent) NowPlaying(ctx context.Context, userId string, track *mode
 		track:       track.Title,
 		album:       track.Album,
 		trackNumber: track.TrackNumber,
-		mbid:        track.MbzRecordingID,
+		mbid:        track.MbzTrackID,
 		duration:    int(track.Duration),
 		albumArtist: track.AlbumArtist,
 	})
@@ -324,7 +283,7 @@ func (l *lastfmAgent) Scrobble(ctx context.Context, userId string, s scrobbler.S
 		track:       s.Title,
 		album:       s.Album,
 		trackNumber: s.TrackNumber,
-		mbid:        s.MbzRecordingID,
+		mbid:        s.MbzTrackID,
 		duration:    int(s.Duration),
 		albumArtist: s.AlbumArtist,
 		timestamp:   s.TimeStamp,
@@ -352,14 +311,12 @@ func (l *lastfmAgent) IsAuthorized(ctx context.Context, userId string) bool {
 func init() {
 	conf.AddHook(func() {
 		if conf.Server.LastFM.Enabled {
-			if conf.Server.LastFM.ApiKey != "" && conf.Server.LastFM.Secret != "" {
-				agents.Register(lastFMAgentName, func(ds model.DataStore) agents.Interface {
-					return lastFMConstructor(ds)
-				})
-				scrobbler.Register(lastFMAgentName, func(ds model.DataStore) scrobbler.Scrobbler {
-					return lastFMConstructor(ds)
-				})
-			}
+			agents.Register(lastFMAgentName, func(ds model.DataStore) agents.Interface {
+				return lastFMConstructor(ds)
+			})
+			scrobbler.Register(lastFMAgentName, func(ds model.DataStore) scrobbler.Scrobbler {
+				return lastFMConstructor(ds)
+			})
 		}
 	})
 }

core/agents/lastfm/agent_test.go

@@ -234,14 +234,14 @@ var _ = Describe("lastfmAgent", func() {
 			agent = lastFMConstructor(ds)
 			agent.client = client
 			track = &model.MediaFile{
-				ID:             "123",
-				Title:          "Track Title",
-				Album:          "Track Album",
-				Artist:         "Track Artist",
-				AlbumArtist:    "Track AlbumArtist",
-				TrackNumber:    1,
-				Duration:       180,
-				MbzRecordingID: "mbz-123",
+				ID:          "123",
+				Title:       "Track Title",
+				Album:       "Track Album",
+				Artist:      "Track Artist",
+				AlbumArtist: "Track AlbumArtist",
+				TrackNumber: 1,
+				Duration:    180,
+				MbzTrackID:  "mbz-123",
 			}
 		})
 
@@ -262,7 +262,7 @@ var _ = Describe("lastfmAgent", func() {
 				Expect(sentParams.Get("albumArtist")).To(Equal(track.AlbumArtist))
 				Expect(sentParams.Get("trackNumber")).To(Equal(strconv.Itoa(track.TrackNumber)))
 				Expect(sentParams.Get("duration")).To(Equal(strconv.FormatFloat(float64(track.Duration), 'G', -1, 32)))
-				Expect(sentParams.Get("mbid")).To(Equal(track.MbzRecordingID))
+				Expect(sentParams.Get("mbid")).To(Equal(track.MbzTrackID))
 			})
 
 			It("returns ErrNotAuthorized if user is not linked", func() {
@@ -289,7 +289,7 @@ var _ = Describe("lastfmAgent", func() {
 				Expect(sentParams.Get("albumArtist")).To(Equal(track.AlbumArtist))
 				Expect(sentParams.Get("trackNumber")).To(Equal(strconv.Itoa(track.TrackNumber)))
 				Expect(sentParams.Get("duration")).To(Equal(strconv.FormatFloat(float64(track.Duration), 'G', -1, 32)))
-				Expect(sentParams.Get("mbid")).To(Equal(track.MbzRecordingID))
+				Expect(sentParams.Get("mbid")).To(Equal(track.MbzTrackID))
 				Expect(sentParams.Get("timestamp")).To(Equal(strconv.FormatInt(ts.Unix(), 10)))
 			})
 

core/agents/lastfm/auth_router.go

@@ -18,7 +18,7 @@ import (
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
 	"github.com/navidrome/navidrome/server"
-	"github.com/navidrome/navidrome/utils/req"
+	"github.com/navidrome/navidrome/utils"
 )
 
 //go:embed token_received.html
@@ -65,9 +65,7 @@ func (s *Router) routes() http.Handler {
 }
 
 func (s *Router) getLinkStatus(w http.ResponseWriter, r *http.Request) {
-	resp := map[string]interface{}{
-		"apiKey": s.apiKey,
-	}
+	resp := map[string]interface{}{}
 	u, _ := request.UserFrom(r.Context())
 	key, err := s.sessionKeys.Get(r.Context(), u.ID)
 	if err != nil && !errors.Is(err, model.ErrNotFound) {
@@ -91,14 +89,13 @@ func (s *Router) unlink(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s *Router) callback(w http.ResponseWriter, r *http.Request) {
-	p := req.Params(r)
-	token, err := p.String("token")
-	if err != nil {
+	token := utils.ParamString(r, "token")
+	if token == "" {
 		_ = rest.RespondWithError(w, http.StatusBadRequest, "token not received")
 		return
 	}
-	uid, err := p.String("uid")
-	if err != nil {
+	uid := utils.ParamString(r, "uid")
+	if uid == "" {
 		_ = rest.RespondWithError(w, http.StatusBadRequest, "uid not received")
 		return
 	}
@@ -106,7 +103,7 @@ func (s *Router) callback(w http.ResponseWriter, r *http.Request) {
 	// Need to add user to context, as this is a non-authenticated endpoint, so it does not
 	// automatically contain any user info
 	ctx := request.WithUser(r.Context(), model.User{ID: uid})
-	err = s.fetchSessionKey(ctx, uid, token)
+	err := s.fetchSessionKey(ctx, uid, token)
 	if err != nil {
 		w.Header().Set("Content-Type", "text/plain; charset=utf-8")
 		w.WriteHeader(http.StatusBadRequest)

core/agents/lastfm/client.go

@@ -8,13 +8,13 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"slices"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/navidrome/navidrome/log"
+	"golang.org/x/exp/slices"
 )
 
 const (

core/agents/listenbrainz/agent.go

@@ -11,7 +11,7 @@ import (
 	"github.com/navidrome/navidrome/core/scrobbler"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
-	"github.com/navidrome/navidrome/utils/cache"
+	"github.com/navidrome/navidrome/utils"
 )
 
 const (
@@ -35,7 +35,7 @@ func listenBrainzConstructor(ds model.DataStore) *listenBrainzAgent {
 	hc := &http.Client{
 		Timeout: consts.DefaultHttpClientTimeOut,
 	}
-	chc := cache.NewHTTPClient(hc, consts.DefaultHttpClientTimeOut)
+	chc := utils.NewCachedHTTPClient(hc, consts.DefaultHttpClientTimeOut)
 	l.client = newClient(l.baseURL, chc)
 	return l
 }
@@ -55,9 +55,8 @@ func (l *listenBrainzAgent) formatListen(track *model.MediaFile) listenInfo {
 				SubmissionClientVersion: consts.Version,
 				TrackNumber:             track.TrackNumber,
 				ArtistMbzIDs:            []string{track.MbzArtistID},
-				RecordingMbzID:          track.MbzRecordingID,
+				TrackMbzID:              track.MbzTrackID,
 				ReleaseMbID:             track.MbzAlbumID,
-				DurationMs:              int(track.Duration * 1000),
 			},
 		},
 	}

core/agents/listenbrainz/agent_test.go

@@ -32,15 +32,14 @@ var _ = Describe("listenBrainzAgent", func() {
 		agent = listenBrainzConstructor(ds)
 		agent.client = newClient("http://localhost:8080", httpClient)
 		track = &model.MediaFile{
-			ID:             "123",
-			Title:          "Track Title",
-			Album:          "Track Album",
-			Artist:         "Track Artist",
-			TrackNumber:    1,
-			MbzRecordingID: "mbz-123",
-			MbzAlbumID:     "mbz-456",
-			MbzArtistID:    "mbz-789",
-			Duration:       142.2,
+			ID:          "123",
+			Title:       "Track Title",
+			Album:       "Track Album",
+			Artist:      "Track Artist",
+			TrackNumber: 1,
+			MbzTrackID:  "mbz-123",
+			MbzAlbumID:  "mbz-456",
+			MbzArtistID: "mbz-789",
 		}
 	})
 
@@ -61,12 +60,11 @@ var _ = Describe("listenBrainzAgent", func() {
 						"SubmissionClient":        Equal(consts.AppName),
 						"SubmissionClientVersion": Equal(consts.Version),
 						"TrackNumber":             Equal(track.TrackNumber),
-						"RecordingMbzID":          Equal(track.MbzRecordingID),
+						"TrackMbzID":              Equal(track.MbzTrackID),
 						"ReleaseMbID":             Equal(track.MbzAlbumID),
 						"ArtistMbzIDs": MatchAllElements(idArtistId, Elements{
 							"mbz-789": Equal(track.MbzArtistID),
 						}),
-						"DurationMs": Equal(142200),
 					}),
 				}),
 			}))

core/agents/listenbrainz/client.go

@@ -76,10 +76,9 @@ type additionalInfo struct {
 	SubmissionClient        string   `json:"submission_client,omitempty"`
 	SubmissionClientVersion string   `json:"submission_client_version,omitempty"`
 	TrackNumber             int      `json:"tracknumber,omitempty"`
-	RecordingMbzID          string   `json:"recording_mbid,omitempty"`
+	TrackMbzID              string   `json:"track_mbid,omitempty"`
 	ArtistMbzIDs            []string `json:"artist_mbids,omitempty"`
 	ReleaseMbID             string   `json:"release_mbid,omitempty"`
-	DurationMs              int      `json:"duration_ms,omitempty"`
 }
 
 func (c *client) validateToken(ctx context.Context, apiKey string) (*listenBrainzResponse, error) {

core/agents/listenbrainz/client_test.go

@@ -74,11 +74,10 @@ var _ = Describe("client", func() {
 					TrackName:   "Track Title",
 					ReleaseName: "Track Album",
 					AdditionalInfo: additionalInfo{
-						TrackNumber:    1,
-						RecordingMbzID: "mbz-123",
-						ArtistMbzIDs:   []string{"mbz-789"},
-						ReleaseMbID:    "mbz-456",
-						DurationMs:     142200,
+						TrackNumber:  1,
+						TrackMbzID:   "mbz-123",
+						ArtistMbzIDs: []string{"mbz-789"},
+						ReleaseMbID:  "mbz-456",
 					},
 				},
 			}