go mod tidy

.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.24",
+			"VARIANT": "1.19",
 			// Options
 			"INSTALL_NODE": "true",
-			"NODE_VERSION": "v20"
+			"NODE_VERSION": "v16"
 		}
 	},
 	"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:
@@ -8,118 +8,81 @@ on:
   pull_request:
     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@v7
+        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
+    name: Test with Go ${{ matrix.go_version }}
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go_version: [1.20.x,1.19.x]
     steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
+      - name: Install taglib
+        run: sudo apt-get install libtag1-dev
 
-      - name: Download TagLib
-        uses: ./.github/actions/download-taglib
+      - 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:
-          version: ${{ env.CROSS_TAGLIB_VERSION }}
+          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: 16
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: npm install dependencies
         run: |
@@ -141,289 +104,121 @@ jobs:
           cd ui
           npm run build
 
-  i18n-lint:
-    name: Lint i18n files
-    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
+      - uses: actions/upload-artifact@v3
         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
+          name: js-bundle
+          path: ui/build
           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
+  binaries:
+    name: Build binaries
+    needs: [js, go, go-lint]
     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
+          retention-days: 7
+
+  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,93 +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"
-}
-
-# Function to check differences between local and remote translations
-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
-}
-
-# Function to get the list of languages
-get_language_list() {
-  response=$(curl -s -X POST https://api.poeditor.com/v2/languages/list \
-    -d api_token="${POEDITOR_APIKEY}" \
-    -d id="${POEDITOR_PROJECTID}")
-
-  echo $response
-}
-
-# Function to get the language name from the language code
-get_language_name() {
-  lang_code="$1"
-  lang_list="$2"
-
-  lang_name=$(echo "$lang_list" | jq -r ".result.languages[] | select(.code == \"$lang_code\") | .name")
-
-  if [ -z "$lang_name" ]; then
-    echo "Error: Language code '$lang_code' not found" >&2
-    return 1
-  fi
-
-  echo "$lang_name"
-}
-
-# Function to get the language code from the file path
-get_lang_code() {
-  filepath="$1"
-  # Extract just the filename
-  filename=$(basename "$filepath")
-
-  # Remove the extension
-  lang_code="${filename%.*}"
-
-  echo "$lang_code"
-}
-
-lang_list=$(get_language_list)
-
-# Check differences for each language
-for file in ${I18N_DIR}/*.json; do
-  code=$(get_lang_code "$file")
-  lang=$(jq -r .languageName < "$file")
-  lang_name=$(get_language_name "$code" "$lang_list")
-  echo "Downloading $lang_name - $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_code=$(get_lang_code "$file")
-  lang_name=$(get_language_name "$lang_code" "$lang_list")
-  languages="${languages}$(echo "$lang_name" | tr -d '\n'), "
-done
-echo "${languages%??}" 1>&2

.github/workflows/update-translations.yml

@@ -6,28 +6,22 @@ on:
 jobs:
   update-translations:
     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,17 @@ 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
-navidrome-master
-*.exe
+!contrib/docker-compose.yml

.golangci.yml

@@ -1,58 +1,36 @@
-version: "2"
 run:
-  build-tags:
-    - netgo
+  go: "1.19"
+
 linters:
   enable:
     - asasalint
     - asciicheck
     - bidichk
     - bodyclose
-    - copyloopvar
+    - depguard
     - dogsled
     - durationcheck
+    - errcheck
     - errorlint
-    - gocritic
+    - exportloopref
     - gocyclo
     - goprintffuncname
     - gosec
+    - gosimple
+    - govet
+    - ineffassign
     - misspell
     - nakedret
     - nilerr
     - rowserrcheck
-    - unconvert
-    - whitespace
-  disable:
     - staticcheck
-  settings:
-    gocritic:
-      disable-all: true
-      enabled-checks:
-        - deprecatedComment
-    gosec:
-      excludes:
-        - G501
-        - G401
-        - G505
-        - G115
-    govet:
-      enable:
-        - nilness
-  exclusions:
-    generated: lax
-    presets:
-      - comments
-      - common-false-positives
-      - legacy
-      - std-error-handling
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
-formatters:
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+    - typecheck
+    - unconvert
+    - unused
+    - whitespace
+
+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
+v16

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,145 +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.24-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
-
-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
-
-ARG GIT_SHA
-ARG GIT_TAG
-
-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 sqlite
-
-# Copy navidrome binary
-COPY --from=build /out/navidrome /app/
-
-VOLUME ["/data", "/music"]
-ENV ND_MUSICFOLDER=/music
-ENV ND_DATAFOLDER=/data
-ENV ND_CONFIGFILE=/data/navidrome.toml
-ENV ND_PORT=4533
-ENV GODEBUG="asyncpreemptoff=1"
-RUN touch /.nddockerenv
-
-EXPOSE ${ND_PORT}
-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,31 +17,27 @@ 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 tool reflex -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 tool ginkgo 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 ./...
+	go test -race -shuffle=on ./...
 .PHONY: test
 
-testrace: ##@Development Run Go tests with race detector
-	go test -tags netgo -race -shuffle=on ./...
-.PHONY: test
-
-testall: testrace ##@Development Run Go and JS tests
-	@(cd ./ui && npm run test:ci)
+testall: test ##@Development Run Go and JS tests
+	@(cd ./ui && npm test -- --watchAll=false)
 .PHONY: testall
 
 lint: ##@Development Lint Go code
-	go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest run -v --timeout 5m
+	go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run -v --timeout 5m
 .PHONY: lint
 
 lintall: lint ##@Development Lint Go and JS code
@@ -57,28 +45,22 @@ lintall: lint ##@Development Lint Go and JS code
 	@(cd ./ui && npm run lint)
 .PHONY: lintall
 
-format: ##@Development Format code
-	@(cd ./ui && npm run prettier)
-	@go tool goimports -w `find . -name '*.go' | grep -v _gen.go$$`
-	@go mod tidy
-.PHONY: format
-
 wire: check_go_env ##@Development Update Dependency Injection
-	go tool wire gen -tags=netgo ./...
+	go run github.com/google/wire/cmd/wire@latest ./...
 .PHONY: wire
 
 snapshots: ##@Development Update (GoLang) Snapshot tests
-	UPDATE_SNAPSHOTS=true go tool ginkgo ./server/subsonic/responses/...
+	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
@@ -90,76 +72,45 @@ 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
 	( cd music; \
 	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=dev_download&id=ec2093ec4801402f1e17cc462195cdbb" > brock.zip; \
-	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=dev_download&id=b376eeb4652d2498aa2b25ba0696725e" > back_on_earth.zip; \
-	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=dev_download&id=e49c609b542fc51899ee8b53aa858cb4" > ugress.zip; \
-	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=dev_download&id=350bcab3a4c1d93869e39ce496464f03" > voodoocuts.zip; \
+	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=NavidromeUI&id=b376eeb4652d2498aa2b25ba0696725e" > back_on_earth.zip; \
+	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=NavidromeUI&id=e49c609b542fc51899ee8b53aa858cb4" > ugress.zip; \
+	curl "https://demo.navidrome.org/rest/download?u=demo&p=demo&f=json&v=1.8.0&c=NavidromeUI&id=350bcab3a4c1d93869e39ce496464f03" > voodoocuts.zip; \
 	for file in *.zip; do unzip -n $${file}; done )
 	@echo "Done. Remember to set your MusicFolder to ./music"
 .PHONY: get-music
@@ -168,11 +119,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
@@ -212,10 +158,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 = \

Procfile.dev

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

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:

adapters/taglib/end_to_end_test.go

@@ -1,154 +0,0 @@
-package taglib
-
-import (
-	"io/fs"
-	"os"
-	"time"
-
-	"github.com/djherbis/times"
-	"github.com/navidrome/navidrome/model"
-	"github.com/navidrome/navidrome/model/metadata"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-type testFileInfo struct {
-	fs.FileInfo
-}
-
-func (t testFileInfo) BirthTime() time.Time {
-	if ts := times.Get(t.FileInfo); ts.HasBirthTime() {
-		return ts.BirthTime()
-	}
-	return t.FileInfo.ModTime()
-}
-
-var _ = Describe("Extractor", func() {
-	toP := func(name, sortName, mbid string) model.Participant {
-		return model.Participant{
-			Artist: model.Artist{Name: name, SortArtistName: sortName, MbzArtistID: mbid},
-		}
-	}
-
-	roles := []struct {
-		model.Role
-		model.ParticipantList
-	}{
-		{model.RoleComposer, model.ParticipantList{
-			toP("coma a", "a, coma", "bf13b584-f27c-43db-8f42-32898d33d4e2"),
-			toP("comb", "comb", "924039a2-09c6-4d29-9b4f-50cc54447d36"),
-		}},
-		{model.RoleLyricist, model.ParticipantList{
-			toP("la a", "a, la", "c84f648f-68a6-40a2-a0cb-d135b25da3c2"),
-			toP("lb", "lb", "0a7c582d-143a-4540-b4e9-77200835af65"),
-		}},
-		{model.RoleArranger, model.ParticipantList{
-			toP("aa", "", "4605a1d4-8d15-42a3-bd00-9c20e42f71e6"),
-			toP("ab", "", "002f0ff8-77bf-42cc-8216-61a9c43dc145"),
-		}},
-		{model.RoleConductor, model.ParticipantList{
-			toP("cona", "", "af86879b-2141-42af-bad2-389a4dc91489"),
-			toP("conb", "", "3dfa3c70-d7d3-4b97-b953-c298dd305e12"),
-		}},
-		{model.RoleDirector, model.ParticipantList{
-			toP("dia", "", "f943187f-73de-4794-be47-88c66f0fd0f4"),
-			toP("dib", "", "bceb75da-1853-4b3d-b399-b27f0cafc389"),
-		}},
-		{model.RoleEngineer, model.ParticipantList{
-			toP("ea", "", "f634bf6d-d66a-425d-888a-28ad39392759"),
-			toP("eb", "", "243d64ae-d514-44e1-901a-b918d692baee"),
-		}},
-		{model.RoleProducer, model.ParticipantList{
-			toP("pra", "", "d971c8d7-999c-4a5f-ac31-719721ab35d6"),
-			toP("prb", "", "f0a09070-9324-434f-a599-6d25ded87b69"),
-		}},
-		{model.RoleRemixer, model.ParticipantList{
-			toP("ra", "", "c7dc6095-9534-4c72-87cc-aea0103462cf"),
-			toP("rb", "", "8ebeef51-c08c-4736-992f-c37870becedd"),
-		}},
-		{model.RoleDJMixer, model.ParticipantList{
-			toP("dja", "", "d063f13b-7589-4efc-ab7f-c60e6db17247"),
-			toP("djb", "", "3636670c-385f-4212-89c8-0ff51d6bc456"),
-		}},
-		{model.RoleMixer, model.ParticipantList{
-			toP("ma", "", "53fb5a2d-7016-427e-a563-d91819a5f35a"),
-			toP("mb", "", "64c13e65-f0da-4ab9-a300-71ee53b0376a"),
-		}},
-	}
-
-	var e *extractor
-
-	BeforeEach(func() {
-		e = &extractor{}
-	})
-
-	Describe("Participants", func() {
-		DescribeTable("test tags consistent across formats", func(format string) {
-			path := "tests/fixtures/test." + format
-			mds, err := e.Parse(path)
-			Expect(err).ToNot(HaveOccurred())
-
-			info := mds[path]
-			fileInfo, _ := os.Stat(path)
-			info.FileInfo = testFileInfo{FileInfo: fileInfo}
-
-			metadata := metadata.New(path, info)
-			mf := metadata.ToMediaFile(1, "folderID")
-
-			for _, data := range roles {
-				role := data.Role
-				artists := data.ParticipantList
-
-				actual := mf.Participants[role]
-				Expect(actual).To(HaveLen(len(artists)))
-
-				for i := range artists {
-					actualArtist := actual[i]
-					expectedArtist := artists[i]
-
-					Expect(actualArtist.Name).To(Equal(expectedArtist.Name))
-					Expect(actualArtist.SortArtistName).To(Equal(expectedArtist.SortArtistName))
-					Expect(actualArtist.MbzArtistID).To(Equal(expectedArtist.MbzArtistID))
-				}
-			}
-
-			if format != "m4a" {
-				performers := mf.Participants[model.RolePerformer]
-				Expect(performers).To(HaveLen(8))
-
-				rules := map[string][]string{
-					"pgaa": {"2fd0b311-9fa8-4ff9-be5d-f6f3d16b835e", "Guitar"},
-					"pgbb": {"223d030b-bf97-4c2a-ad26-b7f7bbe25c93", "Guitar", ""},
-					"pvaa": {"cb195f72-448f-41c8-b962-3f3c13d09d38", "Vocals"},
-					"pvbb": {"60a1f832-8ca2-49f6-8660-84d57f07b520", "Vocals", "Flute"},
-					"pfaa": {"51fb40c-0305-4bf9-a11b-2ee615277725", "", "Flute"},
-				}
-
-				for name, rule := range rules {
-					mbid := rule[0]
-					for i := 1; i < len(rule); i++ {
-						found := false
-
-						for _, mapped := range performers {
-							if mapped.Name == name && mapped.MbzArtistID == mbid && mapped.SubRole == rule[i] {
-								found = true
-								break
-							}
-						}
-
-						Expect(found).To(BeTrue(), "Could not find matching artist")
-					}
-				}
-			}
-		},
-			Entry("FLAC format", "flac"),
-			Entry("M4a format", "m4a"),
-			Entry("OGG format", "ogg"),
-			Entry("WMA format", "wv"),
-
-			Entry("MP3 format", "mp3"),
-			Entry("WAV format", "wav"),
-			Entry("AIFF format", "aiff"),
-		)
-	})
-})

adapters/taglib/taglib.go

@@ -1,151 +0,0 @@
-package taglib
-
-import (
-	"io/fs"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/navidrome/navidrome/core/storage/local"
-	"github.com/navidrome/navidrome/log"
-	"github.com/navidrome/navidrome/model/metadata"
-)
-
-type extractor struct {
-	baseDir string
-}
-
-func (e extractor) Parse(files ...string) (map[string]metadata.Info, error) {
-	results := make(map[string]metadata.Info)
-	for _, path := range files {
-		props, err := e.extractMetadata(path)
-		if err != nil {
-			continue
-		}
-		results[path] = *props
-	}
-	return results, nil
-}
-
-func (e extractor) Version() string {
-	return Version()
-}
-
-func (e extractor) extractMetadata(filePath string) (*metadata.Info, error) {
-	fullPath := filepath.Join(e.baseDir, filePath)
-	tags, err := Read(fullPath)
-	if err != nil {
-		log.Warn("extractor: Error reading metadata from file. Skipping", "filePath", fullPath, err)
-		return nil, err
-	}
-
-	// Parse audio properties
-	ap := metadata.AudioProperties{}
-	if length, ok := tags["_lengthinmilliseconds"]; ok && len(length) > 0 {
-		millis, _ := strconv.Atoi(length[0])
-		if millis > 0 {
-			ap.Duration = (time.Millisecond * time.Duration(millis)).Round(time.Millisecond * 10)
-		}
-		delete(tags, "_lengthinmilliseconds")
-	}
-	parseProp := func(prop string, target *int) {
-		if value, ok := tags[prop]; ok && len(value) > 0 {
-			*target, _ = strconv.Atoi(value[0])
-			delete(tags, prop)
-		}
-	}
-	parseProp("_bitrate", &ap.BitRate)
-	parseProp("_channels", &ap.Channels)
-	parseProp("_samplerate", &ap.SampleRate)
-	parseProp("_bitspersample", &ap.BitDepth)
-
-	// Parse track/disc totals
-	parseTuple := func(prop string) {
-		tagName := prop + "number"
-		tagTotal := prop + "total"
-		if value, ok := tags[tagName]; ok && len(value) > 0 {
-			parts := strings.Split(value[0], "/")
-			tags[tagName] = []string{parts[0]}
-			if len(parts) == 2 {
-				tags[tagTotal] = []string{parts[1]}
-			}
-		}
-	}
-	parseTuple("track")
-	parseTuple("disc")
-
-	// Adjust some ID3 tags
-	parseLyrics(tags)
-	parseTIPL(tags)
-	delete(tags, "tmcl") // TMCL is already parsed by TagLib
-
-	return &metadata.Info{
-		Tags:            tags,
-		AudioProperties: ap,
-		HasPicture:      tags["has_picture"] != nil && len(tags["has_picture"]) > 0 && tags["has_picture"][0] == "true",
-	}, nil
-}
-
-// parseLyrics make sure lyrics tags have language
-func parseLyrics(tags map[string][]string) {
-	lyrics := tags["lyrics"]
-	if len(lyrics) > 0 {
-		tags["lyrics:xxx"] = lyrics
-		delete(tags, "lyrics")
-	}
-}
-
-// These are the only roles we support, based on Picard's tag map:
-// https://picard-docs.musicbrainz.org/downloads/MusicBrainz_Picard_Tag_Map.html
-var tiplMapping = map[string]string{
-	"arranger": "arranger",
-	"engineer": "engineer",
-	"producer": "producer",
-	"mix":      "mixer",
-	"DJ-mix":   "djmixer",
-}
-
-// parseTIPL parses the ID3v2.4 TIPL frame string, which is received from TagLib in the format:
-//
-//	"arranger Andrew Powell engineer Chris Blair engineer Pat Stapley producer Eric Woolfson".
-//
-// and breaks it down into a map of roles and names, e.g.:
-//
-//	{"arranger": ["Andrew Powell"], "engineer": ["Chris Blair", "Pat Stapley"], "producer": ["Eric Woolfson"]}.
-func parseTIPL(tags map[string][]string) {
-	tipl := tags["tipl"]
-	if len(tipl) == 0 {
-		return
-	}
-
-	addRole := func(currentRole string, currentValue []string) {
-		if currentRole != "" && len(currentValue) > 0 {
-			role := tiplMapping[currentRole]
-			tags[role] = append(tags[role], strings.Join(currentValue, " "))
-		}
-	}
-
-	var currentRole string
-	var currentValue []string
-	for _, part := range strings.Split(tipl[0], " ") {
-		if _, ok := tiplMapping[part]; ok {
-			addRole(currentRole, currentValue)
-			currentRole = part
-			currentValue = nil
-			continue
-		}
-		currentValue = append(currentValue, part)
-	}
-	addRole(currentRole, currentValue)
-	delete(tags, "tipl")
-}
-
-var _ local.Extractor = (*extractor)(nil)
-
-func init() {
-	local.RegisterExtractor("taglib", func(_ fs.FS, baseDir string) local.Extractor {
-		// ignores fs, as taglib extractor only works with local files
-		return &extractor{baseDir}
-	})
-}

adapters/taglib/taglib_test.go

@@ -1,296 +0,0 @@
-package taglib
-
-import (
-	"io/fs"
-	"os"
-	"strings"
-
-	"github.com/navidrome/navidrome/utils"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Extractor", func() {
-	var e *extractor
-
-	BeforeEach(func() {
-		e = &extractor{}
-	})
-
-	Describe("Parse", func() {
-		It("correctly parses metadata from all files in folder", func() {
-			mds, err := e.Parse(
-				"tests/fixtures/test.mp3",
-				"tests/fixtures/test.ogg",
-			)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(mds).To(HaveLen(2))
-
-			// Test MP3
-			m := mds["tests/fixtures/test.mp3"]
-			Expect(m.Tags).To(HaveKeyWithValue("title", []string{"Song"}))
-			Expect(m.Tags).To(HaveKeyWithValue("album", []string{"Album"}))
-			Expect(m.Tags).To(HaveKeyWithValue("artist", []string{"Artist"}))
-			Expect(m.Tags).To(HaveKeyWithValue("albumartist", []string{"Album Artist"}))
-
-			Expect(m.HasPicture).To(BeTrue())
-			Expect(m.AudioProperties.Duration.String()).To(Equal("1.02s"))
-			Expect(m.AudioProperties.BitRate).To(Equal(192))
-			Expect(m.AudioProperties.Channels).To(Equal(2))
-			Expect(m.AudioProperties.SampleRate).To(Equal(44100))
-
-			Expect(m.Tags).To(Or(
-				HaveKeyWithValue("compilation", []string{"1"}),
-				HaveKeyWithValue("tcmp", []string{"1"})),
-			)
-			Expect(m.Tags).To(HaveKeyWithValue("genre", []string{"Rock"}))
-			Expect(m.Tags).To(HaveKeyWithValue("date", []string{"2014-05-21"}))
-			Expect(m.Tags).To(HaveKeyWithValue("originaldate", []string{"1996-11-21"}))
-			Expect(m.Tags).To(HaveKeyWithValue("releasedate", []string{"2020-12-31"}))
-			Expect(m.Tags).To(HaveKeyWithValue("discnumber", []string{"1"}))
-			Expect(m.Tags).To(HaveKeyWithValue("disctotal", []string{"2"}))
-			Expect(m.Tags).To(HaveKeyWithValue("comment", []string{"Comment1\nComment2"}))
-			Expect(m.Tags).To(HaveKeyWithValue("bpm", []string{"123"}))
-			Expect(m.Tags).To(HaveKeyWithValue("replaygain_album_gain", []string{"+3.21518 dB"}))
-			Expect(m.Tags).To(HaveKeyWithValue("replaygain_album_peak", []string{"0.9125"}))
-			Expect(m.Tags).To(HaveKeyWithValue("replaygain_track_gain", []string{"-1.48 dB"}))
-			Expect(m.Tags).To(HaveKeyWithValue("replaygain_track_peak", []string{"0.4512"}))
-
-			Expect(m.Tags).To(HaveKeyWithValue("tracknumber", []string{"2"}))
-			Expect(m.Tags).To(HaveKeyWithValue("tracktotal", []string{"10"}))
-
-			Expect(m.Tags).ToNot(HaveKey("lyrics"))
-			Expect(m.Tags).To(Or(HaveKeyWithValue("lyrics:eng", []string{
-				"[00:00.00]This is\n[00:02.50]English SYLT\n",
-				"[00:00.00]This is\n[00:02.50]English",
-			}), HaveKeyWithValue("lyrics:eng", []string{
-				"[00:00.00]This is\n[00:02.50]English",
-				"[00:00.00]This is\n[00:02.50]English SYLT\n",
-			})))
-			Expect(m.Tags).To(Or(HaveKeyWithValue("lyrics:xxx", []string{
-				"[00:00.00]This is\n[00:02.50]unspecified SYLT\n",
-				"[00:00.00]This is\n[00:02.50]unspecified",
-			}), HaveKeyWithValue("lyrics:xxx", []string{
-				"[00:00.00]This is\n[00:02.50]unspecified",
-				"[00:00.00]This is\n[00:02.50]unspecified SYLT\n",
-			})))
-
-			// Test OGG
-			m = mds["tests/fixtures/test.ogg"]
-			Expect(err).To(BeNil())
-			Expect(m.Tags).To(HaveKeyWithValue("fbpm", []string{"141.7"}))
-
-			// TabLib 1.12 returns 18, previous versions return 39.
-			// See https://github.com/taglib/taglib/commit/2f238921824741b2cfe6fbfbfc9701d9827ab06b
-			Expect(m.AudioProperties.BitRate).To(BeElementOf(18, 39, 40, 43, 49))
-			Expect(m.AudioProperties.Channels).To(BeElementOf(2))
-			Expect(m.AudioProperties.SampleRate).To(BeElementOf(8000))
-			Expect(m.AudioProperties.SampleRate).To(BeElementOf(8000))
-			Expect(m.HasPicture).To(BeFalse())
-		})
-
-		DescribeTable("Format-Specific tests",
-			func(file, duration string, channels, samplerate, bitdepth int, albumGain, albumPeak, trackGain, trackPeak string, id3Lyrics bool) {
-				file = "tests/fixtures/" + file
-				mds, err := e.Parse(file)
-				Expect(err).NotTo(HaveOccurred())
-				Expect(mds).To(HaveLen(1))
-
-				m := mds[file]
-
-				Expect(m.HasPicture).To(BeFalse())
-				Expect(m.AudioProperties.Duration.String()).To(Equal(duration))
-				Expect(m.AudioProperties.Channels).To(Equal(channels))
-				Expect(m.AudioProperties.SampleRate).To(Equal(samplerate))
-				Expect(m.AudioProperties.BitDepth).To(Equal(bitdepth))
-
-				Expect(m.Tags).To(Or(
-					HaveKeyWithValue("replaygain_album_gain", []string{albumGain}),
-					HaveKeyWithValue("----:com.apple.itunes:replaygain_track_gain", []string{albumGain}),
-				))
-
-				Expect(m.Tags).To(Or(
-					HaveKeyWithValue("replaygain_album_peak", []string{albumPeak}),
-					HaveKeyWithValue("----:com.apple.itunes:replaygain_album_peak", []string{albumPeak}),
-				))
-				Expect(m.Tags).To(Or(
-					HaveKeyWithValue("replaygain_track_gain", []string{trackGain}),
-					HaveKeyWithValue("----:com.apple.itunes:replaygain_track_gain", []string{trackGain}),
-				))
-				Expect(m.Tags).To(Or(
-					HaveKeyWithValue("replaygain_track_peak", []string{trackPeak}),
-					HaveKeyWithValue("----:com.apple.itunes:replaygain_track_peak", []string{trackPeak}),
-				))
-
-				Expect(m.Tags).To(HaveKeyWithValue("title", []string{"Title"}))
-				Expect(m.Tags).To(HaveKeyWithValue("album", []string{"Album"}))
-				Expect(m.Tags).To(HaveKeyWithValue("artist", []string{"Artist"}))
-				Expect(m.Tags).To(HaveKeyWithValue("albumartist", []string{"Album Artist"}))
-				Expect(m.Tags).To(HaveKeyWithValue("genre", []string{"Rock"}))
-				Expect(m.Tags).To(HaveKeyWithValue("date", []string{"2014"}))
-
-				Expect(m.Tags).To(HaveKeyWithValue("bpm", []string{"123"}))
-				Expect(m.Tags).To(Or(
-					HaveKeyWithValue("tracknumber", []string{"3"}),
-					HaveKeyWithValue("tracknumber", []string{"3/10"}),
-				))
-				if !strings.HasSuffix(file, "test.wma") {
-					// TODO Not sure why this is not working for WMA
-					Expect(m.Tags).To(HaveKeyWithValue("tracktotal", []string{"10"}))
-				}
-				Expect(m.Tags).To(Or(
-					HaveKeyWithValue("discnumber", []string{"1"}),
-					HaveKeyWithValue("discnumber", []string{"1/2"}),
-				))
-				Expect(m.Tags).To(HaveKeyWithValue("disctotal", []string{"2"}))
-
-				// WMA does not have a "compilation" tag, but "wm/iscompilation"
-				Expect(m.Tags).To(Or(
-					HaveKeyWithValue("compilation", []string{"1"}),
-					HaveKeyWithValue("wm/iscompilation", []string{"1"})),
-				)
-
-				if id3Lyrics {
-					Expect(m.Tags).To(HaveKeyWithValue("lyrics:eng", []string{
-						"[00:00.00]This is\n[00:02.50]English",
-					}))
-					Expect(m.Tags).To(HaveKeyWithValue("lyrics:xxx", []string{
-						"[00:00.00]This is\n[00:02.50]unspecified",
-					}))
-				} else {
-					Expect(m.Tags).To(HaveKeyWithValue("lyrics:xxx", []string{
-						"[00:00.00]This is\n[00:02.50]unspecified",
-						"[00:00.00]This is\n[00:02.50]English",
-					}))
-				}
-
-				Expect(m.Tags).To(HaveKeyWithValue("comment", []string{"Comment1\nComment2"}))
-			},
-
-			// ffmpeg -f lavfi -i "sine=frequency=1200:duration=1" test.flac
-			Entry("correctly parses flac tags", "test.flac", "1s", 1, 44100, 16, "+4.06 dB", "0.12496948", "+4.06 dB", "0.12496948", false),
-
-			Entry("correctly parses m4a (aac) gain tags", "01 Invisible (RED) Edit Version.m4a", "1.04s", 2, 44100, 16, "0.37", "0.48", "0.37", "0.48", false),
-			Entry("correctly parses m4a (aac) gain tags (uppercase)", "test.m4a", "1.04s", 2, 44100, 16, "0.37", "0.48", "0.37", "0.48", false),
-			Entry("correctly parses ogg (vorbis) tags", "test.ogg", "1.04s", 2, 8000, 0, "+7.64 dB", "0.11772506", "+7.64 dB", "0.11772506", false),
-
-			// ffmpeg -f lavfi -i "sine=frequency=900:duration=1" test.wma
-			// Weird note: for the tag parsing to work, the lyrics are actually stored in the reverse order
-			Entry("correctly parses wma/asf tags", "test.wma", "1.02s", 1, 44100, 16, "3.27 dB", "0.132914", "3.27 dB", "0.132914", false),
-
-			// ffmpeg -f lavfi -i "sine=frequency=800:duration=1" test.wv
-			Entry("correctly parses wv (wavpak) tags", "test.wv", "1s", 1, 44100, 16, "3.43 dB", "0.125061", "3.43 dB", "0.125061", false),
-
-			// ffmpeg -f lavfi -i "sine=frequency=1000:duration=1" test.wav
-			Entry("correctly parses wav tags", "test.wav", "1s", 1, 44100, 16, "3.06 dB", "0.125056", "3.06 dB", "0.125056", true),
-
-			// ffmpeg -f lavfi -i "sine=frequency=1400:duration=1" test.aiff
-			Entry("correctly parses aiff tags", "test.aiff", "1s", 1, 44100, 16, "2.00 dB", "0.124972", "2.00 dB", "0.124972", true),
-		)
-
-		// Skip these tests when running as root
-		Context("Access Forbidden", func() {
-			var accessForbiddenFile string
-			var RegularUserContext = XContext
-			var isRegularUser = os.Getuid() != 0
-			if isRegularUser {
-				RegularUserContext = Context
-			}
-
-			// Only run permission tests if we are not root
-			RegularUserContext("when run without root privileges", func() {
-				BeforeEach(func() {
-					accessForbiddenFile = utils.TempFileName("access_forbidden-", ".mp3")
-
-					f, err := os.OpenFile(accessForbiddenFile, os.O_WRONLY|os.O_CREATE, 0222)
-					Expect(err).ToNot(HaveOccurred())
-
-					DeferCleanup(func() {
-						Expect(f.Close()).To(Succeed())
-						Expect(os.Remove(accessForbiddenFile)).To(Succeed())
-					})
-				})
-
-				It("correctly handle unreadable file due to insufficient read permission", func() {
-					_, err := e.extractMetadata(accessForbiddenFile)
-					Expect(err).To(MatchError(os.ErrPermission))
-				})
-
-				It("skips the file if it cannot be read", func() {
-					files := []string{
-						"tests/fixtures/test.mp3",
-						"tests/fixtures/test.ogg",
-						accessForbiddenFile,
-					}
-					mds, err := e.Parse(files...)
-					Expect(err).NotTo(HaveOccurred())
-					Expect(mds).To(HaveLen(2))
-					Expect(mds).ToNot(HaveKey(accessForbiddenFile))
-				})
-			})
-		})
-
-	})
-
-	Describe("Error Checking", func() {
-		It("returns a generic ErrPath if file does not exist", func() {
-			testFilePath := "tests/fixtures/NON_EXISTENT.ogg"
-			_, err := e.extractMetadata(testFilePath)
-			Expect(err).To(MatchError(fs.ErrNotExist))
-		})
-		It("does not throw a SIGSEGV error when reading a file with an invalid frame", func() {
-			// File has an empty TDAT frame
-			md, err := e.extractMetadata("tests/fixtures/invalid-files/test-invalid-frame.mp3")
-			Expect(err).ToNot(HaveOccurred())
-			Expect(md.Tags).To(HaveKeyWithValue("albumartist", []string{"Elvis Presley"}))
-		})
-	})
-
-	Describe("parseTIPL", func() {
-		var tags map[string][]string
-
-		BeforeEach(func() {
-			tags = make(map[string][]string)
-		})
-
-		Context("when the TIPL string is populated", func() {
-			It("correctly parses roles and names", func() {
-				tags["tipl"] = []string{"arranger Andrew Powell DJ-mix François Kevorkian DJ-mix Jane Doe engineer Chris Blair"}
-				parseTIPL(tags)
-				Expect(tags["arranger"]).To(ConsistOf("Andrew Powell"))
-				Expect(tags["engineer"]).To(ConsistOf("Chris Blair"))
-				Expect(tags["djmixer"]).To(ConsistOf("François Kevorkian", "Jane Doe"))
-			})
-
-			It("handles multiple names for a single role", func() {
-				tags["tipl"] = []string{"engineer Pat Stapley producer Eric Woolfson engineer Chris Blair"}
-				parseTIPL(tags)
-				Expect(tags["producer"]).To(ConsistOf("Eric Woolfson"))
-				Expect(tags["engineer"]).To(ConsistOf("Pat Stapley", "Chris Blair"))
-			})
-
-			It("discards roles without names", func() {
-				tags["tipl"] = []string{"engineer Pat Stapley producer engineer Chris Blair"}
-				parseTIPL(tags)
-				Expect(tags).ToNot(HaveKey("producer"))
-				Expect(tags["engineer"]).To(ConsistOf("Pat Stapley", "Chris Blair"))
-			})
-		})
-
-		Context("when the TIPL string is empty", func() {
-			It("does nothing", func() {
-				tags["tipl"] = []string{""}
-				parseTIPL(tags)
-				Expect(tags).To(BeEmpty())
-			})
-		})
-
-		Context("when the TIPL is not present", func() {
-			It("does nothing", func() {
-				parseTIPL(tags)
-				Expect(tags).To(BeEmpty())
-			})
-		})
-	})
-
-})

adapters/taglib/taglib_wrapper.cpp

@@ -1,242 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <typeinfo>
-
-#define TAGLIB_STATIC
-#include <apeproperties.h>
-#include <apetag.h>
-#include <aifffile.h>
-#include <asffile.h>
-#include <dsffile.h>
-#include <fileref.h>
-#include <flacfile.h>
-#include <id3v2tag.h>
-#include <unsynchronizedlyricsframe.h>
-#include <synchronizedlyricsframe.h>
-#include <mp4file.h>
-#include <mpegfile.h>
-#include <opusfile.h>
-#include <tpropertymap.h>
-#include <vorbisfile.h>
-#include <wavfile.h>
-#include <wavfile.h>
-#include <wavpackfile.h>
-
-#include "taglib_wrapper.h"
-
-char has_cover(const TagLib::FileRef f);
-
-static char TAGLIB_VERSION[16];
-
-char* taglib_version() {
-    snprintf((char *)TAGLIB_VERSION, 16, "%d.%d.%d", TAGLIB_MAJOR_VERSION, TAGLIB_MINOR_VERSION, TAGLIB_PATCH_VERSION);
-    return (char *)TAGLIB_VERSION;
-}
-
-int taglib_read(const FILENAME_CHAR_T *filename, unsigned long id) {
-  TagLib::FileRef f(filename, true, TagLib::AudioProperties::Fast);
-
-  if (f.isNull()) {
-    return TAGLIB_ERR_PARSE;
-  }
-
-  if (!f.audioProperties()) {
-    return TAGLIB_ERR_AUDIO_PROPS;
-  }
-
-  // Add audio properties to the tags
-  const TagLib::AudioProperties *props(f.audioProperties());
-  goPutInt(id, (char *)"_lengthinmilliseconds", props->lengthInMilliseconds());
-  goPutInt(id, (char *)"_bitrate", props->bitrate());
-  goPutInt(id, (char *)"_channels", props->channels());
-  goPutInt(id, (char *)"_samplerate", props->sampleRate());
-
-  if (const auto* apeProperties{ dynamic_cast<const TagLib::APE::Properties*>(props) })
-      goPutInt(id, (char *)"_bitspersample",  apeProperties->bitsPerSample());
-  if (const auto* asfProperties{ dynamic_cast<const TagLib::ASF::Properties*>(props) })
-      goPutInt(id, (char *)"_bitspersample",  asfProperties->bitsPerSample());
-  else if (const auto* flacProperties{ dynamic_cast<const TagLib::FLAC::Properties*>(props) })
-      goPutInt(id, (char *)"_bitspersample",  flacProperties->bitsPerSample());
-  else if (const auto* mp4Properties{ dynamic_cast<const TagLib::MP4::Properties*>(props) })
-      goPutInt(id, (char *)"_bitspersample",  mp4Properties->bitsPerSample());
-  else if (const auto* wavePackProperties{ dynamic_cast<const TagLib::WavPack::Properties*>(props) })
-      goPutInt(id, (char *)"_bitspersample",  wavePackProperties->bitsPerSample());
-  else if (const auto* aiffProperties{ dynamic_cast<const TagLib::RIFF::AIFF::Properties*>(props) })
-      goPutInt(id, (char *)"_bitspersample",  aiffProperties->bitsPerSample());
-  else if (const auto* wavProperties{ dynamic_cast<const TagLib::RIFF::WAV::Properties*>(props) })
-      goPutInt(id, (char *)"_bitspersample",  wavProperties->bitsPerSample());
-  else if (const auto* dsfProperties{ dynamic_cast<const TagLib::DSF::Properties*>(props) })
-      goPutInt(id, (char *)"_bitspersample",  dsfProperties->bitsPerSample());
-
-  // Send all properties to the Go map
-  TagLib::PropertyMap tags = f.file()->properties();
-
-  TagLib::ID3v2::Tag *id3Tags = NULL;
-
-  // Get some extended/non-standard ID3-only tags (ex: iTunes extended frames)
-  TagLib::MPEG::File *mp3File(dynamic_cast<TagLib::MPEG::File *>(f.file()));
-  if (mp3File != NULL) {
-    id3Tags = mp3File->ID3v2Tag();
-  }
-
-  if (id3Tags == NULL) {
-    TagLib::RIFF::WAV::File *wavFile(dynamic_cast<TagLib::RIFF::WAV::File *>(f.file()));
-    if (wavFile != NULL && wavFile->hasID3v2Tag()) {
-      id3Tags = wavFile->ID3v2Tag();
-    }
-  }
-
-  if (id3Tags == NULL) {
-    TagLib::RIFF::AIFF::File *aiffFile(dynamic_cast<TagLib::RIFF::AIFF::File *>(f.file()));
-    if (aiffFile && aiffFile->hasID3v2Tag()) {
-      id3Tags = aiffFile->tag();
-    }
-  }
-
-  // Yes, it is possible to have ID3v2 tags in FLAC. However, that can cause problems
-  // with many players, so they will not be parsed
-
-  if (id3Tags != NULL) {
-    const auto &frames = id3Tags->frameListMap();
-
-    for (const auto &kv: frames) {
-      if (kv.first == "USLT") {
-        for (const auto &tag: kv.second) {
-          TagLib::ID3v2::UnsynchronizedLyricsFrame *frame = dynamic_cast<TagLib::ID3v2::UnsynchronizedLyricsFrame *>(tag);
-          if (frame == NULL) continue;
-
-          tags.erase("LYRICS");
-
-          const auto bv = frame->language();
-          char language[4] = {'x', 'x', 'x', '\0'};
-          if (bv.size() == 3) {
-            strncpy(language, bv.data(), 3);
-          }
-
-          char *val = (char *)frame->text().toCString(true);
-
-          goPutLyrics(id, language, val);
-        }
-      } else if (kv.first == "SYLT") {
-        for (const auto &tag: kv.second) {
-          TagLib::ID3v2::SynchronizedLyricsFrame *frame = dynamic_cast<TagLib::ID3v2::SynchronizedLyricsFrame *>(tag);
-          if (frame == NULL) continue;
-
-          const auto bv = frame->language();
-          char language[4] = {'x', 'x', 'x', '\0'};
-          if (bv.size() == 3) {
-            strncpy(language, bv.data(), 3);
-          }
-
-          const auto format = frame->timestampFormat();
-          if (format == TagLib::ID3v2::SynchronizedLyricsFrame::AbsoluteMilliseconds) {
-
-            for (const auto &line: frame->synchedText()) {
-              char *text = (char *)line.text.toCString(true);
-              goPutLyricLine(id, language, text, line.time);
-            }
-          } else if (format == TagLib::ID3v2::SynchronizedLyricsFrame::AbsoluteMpegFrames) {
-            const int sampleRate = props->sampleRate();
-
-            if (sampleRate != 0) {
-              for (const auto &line: frame->synchedText()) {
-                const int timeInMs = (line.time * 1000) / sampleRate;
-                char *text = (char *)line.text.toCString(true);
-                goPutLyricLine(id, language, text, timeInMs);
-              }
-            }
-          }
-        }
-      } else if (kv.first == "TIPL"){
-        if (!kv.second.isEmpty()) {
-          tags.insert(kv.first, kv.second.front()->toString());
-        }
-      }
-    }
-  }
-
-  // M4A may have some iTunes specific tags not captured by the PropertyMap interface
-  TagLib::MP4::File *m4afile(dynamic_cast<TagLib::MP4::File *>(f.file()));
-  if (m4afile != NULL) {
-    const auto itemListMap = m4afile->tag()->itemMap();
-    for (const auto item: itemListMap) {
-      char *key = (char *)item.first.toCString(true);
-      for (const auto value: item.second.toStringList()) {
-        char *val = (char *)value.toCString(true);
-        goPutM4AStr(id, key, val);
-      }
-    }
-  }
-
-  // WMA/ASF files may have additional tags not captured by the PropertyMap interface
-  TagLib::ASF::File *asfFile(dynamic_cast<TagLib::ASF::File *>(f.file()));
-  if (asfFile != NULL) {
-    const TagLib::ASF::Tag *asfTags{asfFile->tag()};
-    const auto itemListMap = asfTags->attributeListMap();
-    for (const auto item : itemListMap) {
-      tags.insert(item.first, item.second.front().toString());
-    }
-  }
-
-  // Send all collected tags to the Go map
-  for (TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end();
-       ++i) {
-    char *key = (char *)i->first.toCString(true);
-    for (TagLib::StringList::ConstIterator j = i->second.begin();
-         j != i->second.end(); ++j) {
-      char *val = (char *)(*j).toCString(true);
-      goPutStr(id, key, val);
-    }
-  }
-
-  // Cover art has to be handled separately
-  if (has_cover(f)) {
-    goPutStr(id, (char *)"has_picture", (char *)"true");
-  }
-
-  return 0;
-}
-
-// Detect if the file has cover art. Returns 1 if the file has cover art, 0 otherwise.
-char has_cover(const TagLib::FileRef f) {
-  char hasCover = 0;
-  // ----- MP3
-  if (TagLib::MPEG::File * mp3File{dynamic_cast<TagLib::MPEG::File *>(f.file())}) {
-    if (mp3File->ID3v2Tag()) {
-      const auto &frameListMap{mp3File->ID3v2Tag()->frameListMap()};
-      hasCover = !frameListMap["APIC"].isEmpty();
-    }
-  }
-  // ----- FLAC
-  else if (TagLib::FLAC::File * flacFile{dynamic_cast<TagLib::FLAC::File *>(f.file())}) {
-    hasCover = !flacFile->pictureList().isEmpty();
-  }
-  // ----- MP4
-  else if (TagLib::MP4::File * mp4File{dynamic_cast<TagLib::MP4::File *>(f.file())}) {
-    auto &coverItem{mp4File->tag()->itemMap()["covr"]};
-    TagLib::MP4::CoverArtList coverArtList{coverItem.toCoverArtList()};
-    hasCover = !coverArtList.isEmpty();
-  }
-  // ----- Ogg
-  else if (TagLib::Ogg::Vorbis::File * vorbisFile{dynamic_cast<TagLib::Ogg::Vorbis::File *>(f.file())}) {
-    hasCover = !vorbisFile->tag()->pictureList().isEmpty();
-  }
-  // ----- Opus
-  else if (TagLib::Ogg::Opus::File * opusFile{dynamic_cast<TagLib::Ogg::Opus::File *>(f.file())}) {
-    hasCover = !opusFile->tag()->pictureList().isEmpty();
-  }
-  // ----- WMA
-  else if (TagLib::ASF::File * asfFile{dynamic_cast<TagLib::ASF::File *>(f.file())}) {
-    const TagLib::ASF::Tag *tag{asfFile->tag()};
-    hasCover = tag && tag->attributeListMap().contains("WM/Picture");
-  }
-  // ----- WAV
-  else if (TagLib::RIFF::WAV::File * wavFile{ dynamic_cast<TagLib::RIFF::WAV::File*>(f.file()) }) {
-    if (wavFile->hasID3v2Tag()) {
-        const auto& frameListMap{ wavFile->ID3v2Tag()->frameListMap() };
-        hasCover = !frameListMap["APIC"].isEmpty();
-    }
-  }
-
-  return hasCover;
-}

adapters/taglib/taglib_wrapper.go

@@ -1,157 +0,0 @@
-package taglib
-
-/*
-#cgo !windows pkg-config: --define-prefix taglib
-#cgo windows pkg-config: taglib
-#cgo illumos LDFLAGS: -lstdc++ -lsendfile
-#cgo linux darwin CXXFLAGS: -std=c++11
-#cgo darwin LDFLAGS: -L/opt/homebrew/opt/taglib/lib
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "taglib_wrapper.h"
-*/
-import "C"
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"runtime/debug"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"unsafe"
-
-	"github.com/navidrome/navidrome/log"
-)
-
-const iTunesKeyPrefix = "----:com.apple.itunes:"
-
-func Version() string {
-	return C.GoString(C.taglib_version())
-}
-
-func Read(filename string) (tags map[string][]string, err error) {
-	// Do not crash on failures in the C code/library
-	debug.SetPanicOnFault(true)
-	defer func() {
-		if r := recover(); r != nil {
-			log.Error("extractor: recovered from panic when reading tags", "file", filename, "error", r)
-			err = fmt.Errorf("extractor: recovered from panic: %s", r)
-		}
-	}()
-
-	fp := getFilename(filename)
-	defer C.free(unsafe.Pointer(fp))
-	id, m, release := newMap()
-	defer release()
-
-	log.Trace("extractor: reading tags", "filename", filename, "map_id", id)
-	res := C.taglib_read(fp, C.ulong(id))
-	switch res {
-	case C.TAGLIB_ERR_PARSE:
-		// Check additional case whether the file is unreadable due to permission
-		file, fileErr := os.OpenFile(filename, os.O_RDONLY, 0600)
-		defer file.Close()
-
-		if os.IsPermission(fileErr) {
-			return nil, fmt.Errorf("navidrome does not have permission: %w", fileErr)
-		} else if fileErr != nil {
-			return nil, fmt.Errorf("cannot parse file media file: %w", fileErr)
-		} else {
-			return nil, fmt.Errorf("cannot parse file media file")
-		}
-	case C.TAGLIB_ERR_AUDIO_PROPS:
-		return nil, fmt.Errorf("can't get audio properties from file")
-	}
-	if log.IsGreaterOrEqualTo(log.LevelDebug) {
-		j, _ := json.Marshal(m)
-		log.Trace("extractor: read tags", "tags", string(j), "filename", filename, "id", id)
-	} else {
-		log.Trace("extractor: read tags", "tags", m, "filename", filename, "id", id)
-	}
-
-	return m, nil
-}
-
-type tagMap map[string][]string
-
-var allMaps sync.Map
-var mapsNextID atomic.Uint32
-
-func newMap() (uint32, tagMap, func()) {
-	id := mapsNextID.Add(1)
-
-	m := tagMap{}
-	allMaps.Store(id, m)
-
-	return id, m, func() {
-		allMaps.Delete(id)
-	}
-}
-
-func doPutTag(id C.ulong, key string, val *C.char) {
-	if key == "" {
-		return
-	}
-
-	r, _ := allMaps.Load(uint32(id))
-	m := r.(tagMap)
-	k := strings.ToLower(key)
-	v := strings.TrimSpace(C.GoString(val))
-	m[k] = append(m[k], v)
-}
-
-//export goPutM4AStr
-func goPutM4AStr(id C.ulong, key *C.char, val *C.char) {
-	k := C.GoString(key)
-
-	// Special for M4A, do not catch keys that have no actual name
-	k = strings.TrimPrefix(k, iTunesKeyPrefix)
-	doPutTag(id, k, val)
-}
-
-//export goPutStr
-func goPutStr(id C.ulong, key *C.char, val *C.char) {
-	doPutTag(id, C.GoString(key), val)
-}
-
-//export goPutInt
-func goPutInt(id C.ulong, key *C.char, val C.int) {
-	valStr := strconv.Itoa(int(val))
-	vp := C.CString(valStr)
-	defer C.free(unsafe.Pointer(vp))
-	goPutStr(id, key, vp)
-}
-
-//export goPutLyrics
-func goPutLyrics(id C.ulong, lang *C.char, val *C.char) {
-	doPutTag(id, "lyrics:"+C.GoString(lang), val)
-}
-
-//export goPutLyricLine
-func goPutLyricLine(id C.ulong, lang *C.char, text *C.char, time C.int) {
-	language := C.GoString(lang)
-	line := C.GoString(text)
-	timeGo := int64(time)
-
-	ms := timeGo % 1000
-	timeGo /= 1000
-	sec := timeGo % 60
-	timeGo /= 60
-	minimum := timeGo % 60
-	formattedLine := fmt.Sprintf("[%02d:%02d.%02d]%s\n", minimum, sec, ms/10, line)
-
-	key := "lyrics:" + language
-
-	r, _ := allMaps.Load(uint32(id))
-	m := r.(tagMap)
-	k := strings.ToLower(key)
-	existing, ok := m[k]
-	if ok {
-		existing[0] += formattedLine
-	} else {
-		m[k] = []string{formattedLine}
-	}
-}

adapters/taglib/taglib_wrapper.h

@@ -1,24 +0,0 @@
-#define TAGLIB_ERR_PARSE -1
-#define TAGLIB_ERR_AUDIO_PROPS -2
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef WIN32
-#define FILENAME_CHAR_T wchar_t
-#else
-#define FILENAME_CHAR_T char
-#endif
-
-extern void goPutM4AStr(unsigned long id, char *key, char *val);
-extern void goPutStr(unsigned long id, char *key, char *val);
-extern void goPutInt(unsigned long id, char *key, int val);
-extern void goPutLyrics(unsigned long id, char *lang, char *val);
-extern void goPutLyricLine(unsigned long id, char *lang, char *text, int time);
-int taglib_read(const FILENAME_CHAR_T *filename, unsigned long id);
-char* taglib_version();
-
-#ifdef __cplusplus
-}
-#endif

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,79 +0,0 @@
-package cmd
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/navidrome/navidrome/core"
-	"github.com/navidrome/navidrome/log"
-	"github.com/navidrome/navidrome/model"
-	"github.com/pelletier/go-toml/v2"
-	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v3"
-)
-
-var (
-	format string
-)
-
-func init() {
-	inspectCmd.Flags().StringVarP(&format, "format", "f", "jsonindent", "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.([]core.InspectOutput)
-	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
-}
-
-func runInspector(args []string) {
-	marshal := marshalers[format]
-	if marshal == nil {
-		log.Fatal("Invalid format", "format", format)
-	}
-	var out []core.InspectOutput
-	for _, filePath := range args {
-		if !model.IsAudioFile(filePath) {
-			log.Warn("Not an audio file", "file", filePath)
-			continue
-		}
-		output, err := core.Inspect(filePath, 1, "")
-		if err != nil {
-			log.Warn("Unable to process file", "file", filePath, "error", err)
-			continue
-		}
-
-		out = append(out, *output)
-	}
-	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,57 +15,32 @@ 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:     "playlists",
+	Aliases: []string{"pls", "playlist"},
+	Short:   "Export playlists",
+	Long:    "Export Navidrome playlists to M3U files",
+	Run: func(cmd *cobra.Command, args []string) {
+		runExporter()
+	},
+}
 
 func runExporter() {
 	sqlDB := db.Db()
 	ds := persistence.New(sqlDB)
 	ctx := auth.WithAdminUser(context.Background(), ds)
-	playlist, err := ds.Playlist(ctx).GetWithTracks(playlistID, true, false)
+	playlist, err := ds.Playlist(ctx).GetWithTracks(playlistID, true)
 	if err != nil && !errors.Is(err, model.ErrNotFound) {
 		log.Fatal("Error retrieving playlist", "name", playlistID, err)
 	}
@@ -79,7 +50,7 @@ func runExporter() {
 			log.Fatal("Error retrieving playlist", "name", playlistID, err)
 		}
 		if len(playlists) > 0 {
-			playlist, err = ds.Playlist(ctx).GetWithTracks(playlists[0].ID, true, false)
+			playlist, err = ds.Playlist(ctx).GetWithTracks(playlists[0].ID, true)
 			if err != nil {
 				log.Fatal("Error retrieving playlist", "name", playlistID, err)
 			}
@@ -99,58 +70,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,28 +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/adapters/taglib"
 	"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/model"
 	"github.com/navidrome/navidrome/resources"
-	"github.com/navidrome/navidrome/scanner"
 	"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
@@ -37,23 +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(context.Background())
 		},
 		Version: consts.Version,
 	}
 )
 
-// Execute runs the root cobra command, which will start the Navidrome server by calling the runNavidrome function.
 func Execute() {
-	ctx, cancel := mainContext(context.Background())
-	defer cancel()
-
 	rootCmd.SetVersionTemplate(`{{println .Version}}`)
-	if err := rootCmd.ExecuteContext(ctx); err != nil {
-		log.Fatal(err)
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
 	}
 }
 
@@ -61,56 +57,34 @@ func preRun() {
 	if !noBanner {
 		println(resources.Banner())
 	}
-	conf.Load(noBanner)
+	conf.Load()
 }
 
-func postRun() {
-	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)()
+	db.Init()
+	defer func() {
+		if err := db.Close(); err != nil {
+			log.Error("Error closing DB", err)
+		}
+		log.Info("Navidrome stopped, bye.")
+	}()
 
 	g, ctx := errgroup.WithContext(ctx)
 	g.Go(startServer(ctx))
-	g.Go(startSignaller(ctx))
+	g.Go(startSignaler(ctx))
 	g.Go(startScheduler(ctx))
-	g.Go(startPlaybackServer(ctx))
-	g.Go(schedulePeriodicBackup(ctx))
-	g.Go(startInsightsCollector(ctx))
-	g.Go(scheduleDBOptimizer(ctx))
-	if conf.Server.Scanner.Enabled {
-		g.Go(runInitialScan(ctx))
-		g.Go(startScanWatcher(ctx))
-		g.Go(schedulePeriodicScan(ctx))
-	} else {
-		log.Warn(ctx, "Automatic Scanning is DISABLED")
-	}
+	g.Go(schedulePeriodicScan(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()
+		a := CreateServer(conf.Server.MusicFolder)
 		a.MountRouter("Native API", consts.URLPathNativeAPI, CreateNativeAPIRouter())
-		a.MountRouter("Subsonic API", consts.URLPathSubsonicAPI, CreateSubsonicAPIRouter(ctx))
+		a.MountRouter("Subsonic API", consts.URLPathSubsonicAPI, CreateSubsonicAPIRouter())
 		a.MountRouter("Public Endpoints", consts.URLPathPublic, CreatePublicRouter())
 		if conf.Server.LastFM.Enabled {
 			a.MountRouter("LastFM Auth", consts.URLPathNativeAPI+"/lastfm", CreateLastFMRouter())
@@ -119,212 +93,59 @@ 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())
 		}
 		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.Scanner.Schedule
+		schedule := conf.Server.ScanSchedule
 		if schedule == "" {
-			log.Info(ctx, "Periodic scan is DISABLED")
+			log.Warn("Periodic scan is DISABLED")
 			return nil
 		}
 
-		s := CreateScanner(ctx)
+		scanner := GetScanner()
 		schedulerInstance := scheduler.GetInstance()
 
 		log.Info("Scheduling periodic scan", "schedule", schedule)
 		err := schedulerInstance.Add(schedule, func() {
-			_, err := s.ScanAll(ctx, false)
-			if err != nil {
-				log.Error(ctx, "Error executing periodic scan", err)
-			}
+			_ = scanner.RescanAll(ctx, false)
 		})
 		if err != nil {
-			log.Error(ctx, "Error scheduling periodic scan", err)
+			log.Error("Error scheduling periodic scan", err)
 		}
-		return nil
-	}
-}
 
-func pidHashChanged(ds model.DataStore) (bool, error) {
-	pidAlbum, err := ds.Property(context.Background()).DefaultGet(consts.PIDAlbumKey, "")
-	if err != nil {
-		return false, err
-	}
-	pidTrack, err := ds.Property(context.Background()).DefaultGet(consts.PIDTrackKey, "")
-	if err != nil {
-		return false, err
-	}
-	return !strings.EqualFold(pidAlbum, conf.Server.PID.Album) || !strings.EqualFold(pidTrack, conf.Server.PID.Track), nil
-}
-
-func runInitialScan(ctx context.Context) func() error {
-	return func() error {
-		ds := CreateDataStore()
-		fullScanRequired, err := ds.Property(ctx).DefaultGet(consts.FullScanAfterMigrationFlagKey, "0")
-		if err != nil {
-			return err
-		}
-		inProgress, err := ds.Library(ctx).ScanInProgress()
-		if err != nil {
-			return err
-		}
-		pidHasChanged, err := pidHashChanged(ds)
-		if err != nil {
-			return err
-		}
-		scanNeeded := conf.Server.Scanner.ScanOnStartup || inProgress || fullScanRequired == "1" || pidHasChanged
 		time.Sleep(2 * time.Second) // Wait 2 seconds before the initial scan
-		if scanNeeded {
-			scanner := CreateScanner(ctx)
-			switch {
-			case fullScanRequired == "1":
-				log.Warn(ctx, "Full scan required after migration")
-				_ = ds.Property(ctx).Delete(consts.FullScanAfterMigrationFlagKey)
-			case pidHasChanged:
-				log.Warn(ctx, "PID config changed, performing full scan")
-				fullScanRequired = "1"
-			case inProgress:
-				log.Warn(ctx, "Resuming interrupted scan")
-			default:
-				log.Info("Executing initial scan")
-			}
-
-			_, err = scanner.ScanAll(ctx, fullScanRequired == "1")
-			if err != nil {
-				log.Error(ctx, "Scan failed", err)
-			} else {
-				log.Info(ctx, "Scan completed")
-			}
-		} else {
-			log.Debug(ctx, "Initial scan not needed")
+		log.Debug("Executing initial scan")
+		if err := scanner.RescanAll(ctx, false); err != nil {
+			log.Error("Error executing initial scan", err)
 		}
+		log.Debug("Finished initial scan")
 		return nil
 	}
 }
 
-func startScanWatcher(ctx context.Context) func() error {
-	return func() error {
-		if conf.Server.Scanner.WatcherWait == 0 {
-			log.Debug("Folder watcher is DISABLED")
-			return nil
-		}
-		w := CreateScanWatcher(ctx)
-		err := w.Run(ctx)
-		if err != nil {
-			log.Error("Error starting watcher", err)
-		}
-		return nil
-	}
-}
-
-func schedulePeriodicBackup(ctx context.Context) func() error {
-	return func() error {
-		schedule := conf.Server.Backup.Schedule
-		if schedule == "" {
-			log.Info(ctx, "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
-	}
-}
-
-func scheduleDBOptimizer(ctx context.Context) func() error {
-	return func() error {
-		log.Info(ctx, "Scheduling DB optimizer", "schedule", consts.OptimizeDBSchedule)
-		schedulerInstance := scheduler.GetInstance()
-		err := schedulerInstance.Add(consts.OptimizeDBSchedule, func() {
-			if scanner.IsScanning() {
-				log.Debug(ctx, "Skipping DB optimization because a scan is in progress")
-				return
-			}
-			db.Optimize(ctx)
-		})
-		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() {
@@ -334,22 +155,17 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "configfile", "c", "", `config file (default "./navidrome.toml")`)
 	rootCmd.PersistentFlags().BoolVarP(&noBanner, "nobanner", "n", false, `don't show banner`)
 	rootCmd.PersistentFlags().String("musicfolder", viper.GetString("musicfolder"), "folder where your music is stored")
-	rootCmd.PersistentFlags().String("datafolder", viper.GetString("datafolder"), "folder to store application data (DB), needs write access")
-	rootCmd.PersistentFlags().String("cachefolder", viper.GetString("cachefolder"), "folder to store cache data (transcoding, images...), needs write access")
+	rootCmd.PersistentFlags().String("datafolder", viper.GetString("datafolder"), "folder to store application data (DB, cache...), 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")
@@ -358,7 +174,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`")
@@ -367,7 +182,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/scan.go

@@ -2,28 +2,15 @@ package cmd
 
 import (
 	"context"
-	"encoding/gob"
-	"os"
 
-	"github.com/navidrome/navidrome/core"
-	"github.com/navidrome/navidrome/core/artwork"
-	"github.com/navidrome/navidrome/core/metrics"
-	"github.com/navidrome/navidrome/db"
 	"github.com/navidrome/navidrome/log"
-	"github.com/navidrome/navidrome/persistence"
-	"github.com/navidrome/navidrome/scanner"
-	"github.com/navidrome/navidrome/utils/pl"
 	"github.com/spf13/cobra"
 )
 
-var (
-	fullScan   bool
-	subprocess bool
-)
+var fullRescan bool
 
 func init() {
-	scanCmd.Flags().BoolVarP(&fullScan, "full", "f", false, "check all subfolders, ignoring timestamps")
-	scanCmd.Flags().BoolVarP(&subprocess, "subprocess", "", false, "run as subprocess (internal use)")
+	scanCmd.Flags().BoolVarP(&fullRescan, "full", "f", false, "check all subfolders, ignoring timestamps")
 	rootCmd.AddCommand(scanCmd)
 }
 
@@ -32,53 +19,16 @@ var scanCmd = &cobra.Command{
 	Short: "Scan music folder",
 	Long:  "Scan music folder for updates",
 	Run: func(cmd *cobra.Command, args []string) {
-		runScanner(cmd.Context())
+		runScanner()
 	},
 }
 
-func trackScanInteractively(ctx context.Context, progress <-chan *scanner.ProgressInfo) {
-	for status := range pl.ReadOrDone(ctx, progress) {
-		if status.Warning != "" {
-			log.Warn(ctx, "Scan warning", "error", status.Warning)
-		}
-		if status.Error != "" {
-			log.Error(ctx, "Scan error", "error", status.Error)
-		}
-		// Discard the progress status, we only care about errors
-	}
-
-	if fullScan {
+func runScanner() {
+	scanner := GetScanner()
+	_ = scanner.RescanAll(context.Background(), fullRescan)
+	if fullRescan {
 		log.Info("Finished full rescan")
 	} else {
 		log.Info("Finished rescan")
 	}
 }
-
-func trackScanAsSubprocess(ctx context.Context, progress <-chan *scanner.ProgressInfo) {
-	encoder := gob.NewEncoder(os.Stdout)
-	for status := range pl.ReadOrDone(ctx, progress) {
-		err := encoder.Encode(status)
-		if err != nil {
-			log.Error(ctx, "Failed to encode status", err)
-		}
-	}
-}
-
-func runScanner(ctx context.Context) {
-	sqlDB := db.Db()
-	defer db.Db().Close()
-	ds := persistence.New(sqlDB)
-	pls := core.NewPlaylists(ds)
-
-	progress, err := scanner.CallScan(ctx, ds, artwork.NoopCacheWarmer(), pls, metrics.NewNoopInstance(), fullScan)
-	if err != nil {
-		log.Fatal(ctx, "Failed to scan", err)
-	}
-
-	// Wait for the scanner to finish
-	if subprocess {
-		trackScanAsSubprocess(ctx, progress)
-	} else {
-		trackScanInteractively(ctx, progress)
-	}
-}

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,24 +14,35 @@ 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 := CreateScanner(ctx)
+	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.ScanAll(ctx, false)
+				err := scanner.RescanAll(ctx, false)
 				if err != nil {
 					log.Error(ctx, "Error scanning", err)
 				}
-				log.Info(ctx, "Triggered scan complete", "elapsed", time.Since(start))
+				log.Info(ctx, "Triggered scan complete", "elapsed", time.Since(start).Round(100*time.Millisecond))
 			case <-ctx.Done():
 				return nil
 			}

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

@@ -6,7 +6,6 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
-	"time"
 
 	"github.com/kardianos/service"
 	"github.com/navidrome/navidrome/conf"
@@ -20,9 +19,6 @@ var (
 		service.StatusStopped: "Stopped",
 		service.StatusRunning: "Running",
 	}
-
-	installUser      string
-	workingDirectory string
 )
 
 func init() {
@@ -31,7 +27,6 @@ func init() {
 	svcCmd.AddCommand(buildStartCmd())
 	svcCmd.AddCommand(buildStopCmd())
 	svcCmd.AddCommand(buildStatusCmd())
-	svcCmd.AddCommand(buildExecuteCmd())
 	rootCmd.AddCommand(svcCmd)
 }
 
@@ -46,78 +41,64 @@ var svcCmd = &cobra.Command{
 type svcControl struct {
 	ctx    context.Context
 	cancel context.CancelFunc
-	done   chan struct{}
 }
 
-func (p *svcControl) Start(service.Service) error {
-	p.done = make(chan struct{})
+func (p *svcControl) Start(_ service.Service) error {
 	p.ctx, p.cancel = context.WithCancel(context.Background())
-	go func() {
-		runNavidrome(p.ctx)
-		close(p.done)
-	}()
+	go p.run()
 	return nil
 }
 
-func (p *svcControl) Stop(service.Service) error {
+func (p *svcControl) run() {
+	runNavidrome(p.ctx)
+}
+
+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
+var (
+	svc     service.Service
+	svcOnce = sync.Once{}
+)
 
-	prg := &svcControl{}
-	svc, err := service.New(prg, svcConfig)
-	if err != nil {
-		log.Fatal(err)
-	}
+func svcInstance() service.Service {
+	svcOnce.Do(func() {
+		options := make(service.KeyValue)
+		options["Restart"] = "on-success"
+		options["SuccessExitStatus"] = "1 2 8 SIGKILL"
+		options["UserService"] = true
+		options["LogDirectory"] = conf.Server.DataFolder
+		svcConfig := &service.Config{
+			Name:        "Navidrome",
+			DisplayName: "Navidrome",
+			Description: "Navidrome is a self-hosted music server and streamer",
+			Dependencies: []string{
+				"Requires=network.target",
+				"After=network-online.target syslog.target"},
+			WorkingDirectory: executablePath(),
+			Option:           options,
+		}
+		if conf.Server.ConfigFile != "" {
+			svcConfig.Arguments = []string{"-c", conf.Server.ConfigFile}
+		}
+		prg := &svcControl{}
+		var err error
+		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)
@@ -132,11 +113,6 @@ func buildInstallCmd() *cobra.Command {
 		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 {
@@ -151,15 +127,11 @@ func buildInstallCmd() *cobra.Command {
 		println("Service installed. Use 'navidrome svc start' to start it.")
 	}
 
-	cmd := &cobra.Command{
+	return &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 {
@@ -217,51 +189,3 @@ func buildStatusCmd() *cobra.Command {
 		},
 	}
 }
-
-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,26 +1,21 @@
 // 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
 
 package cmd
 
 import (
-	"context"
 	"github.com/google/wire"
 	"github.com/navidrome/navidrome/core"
 	"github.com/navidrome/navidrome/core/agents"
 	"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/external"
 	"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/model"
 	"github.com/navidrome/navidrome/persistence"
 	"github.com/navidrome/navidrome/scanner"
 	"github.com/navidrome/navidrome/server"
@@ -28,26 +23,16 @@ import (
 	"github.com/navidrome/navidrome/server/nativeapi"
 	"github.com/navidrome/navidrome/server/public"
 	"github.com/navidrome/navidrome/server/subsonic"
-)
-
-import (
-	_ "github.com/navidrome/navidrome/adapters/taglib"
+	"sync"
 )
 
 // Injectors from wire_injectors.go:
 
-func CreateDataStore() model.DataStore {
-	sqlDB := db.Db()
-	dataStore := persistence.New(sqlDB)
-	return dataStore
-}
-
-func CreateServer() *server.Server {
+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
 }
 
@@ -55,33 +40,28 @@ 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 CreateSubsonicAPIRouter(ctx context.Context) *subsonic.Router {
+func CreateSubsonicAPIRouter() *subsonic.Router {
 	sqlDB := db.Db()
 	dataStore := persistence.New(sqlDB)
 	fileCache := artwork.GetImageCache()
 	fFmpeg := ffmpeg.New()
-	agentsAgents := agents.GetAgents(dataStore)
-	provider := external.NewProvider(dataStore, agentsAgents)
-	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, provider)
+	agentsAgents := agents.New(dataStore)
+	externalMetadata := core.NewExternalMetadata(dataStore, agentsAgents)
+	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, externalMetadata)
 	transcodingCache := core.GetTranscodingCache()
 	mediaStreamer := core.NewMediaStreamer(dataStore, fFmpeg, transcodingCache)
 	share := core.NewShare(dataStore)
 	archiver := core.NewArchiver(mediaStreamer, dataStore, share)
 	players := core.NewPlayers(dataStore)
-	cacheWarmer := artwork.NewCacheWarmer(artworkArtwork, fileCache)
+	scanner := GetScanner()
 	broker := events.GetBroker()
 	playlists := core.NewPlaylists(dataStore)
-	metricsMetrics := metrics.NewPrometheusInstance(dataStore)
-	scannerScanner := scanner.New(ctx, dataStore, cacheWarmer, broker, playlists, metricsMetrics)
 	playTracker := scrobbler.GetPlayTracker(dataStore, broker)
-	playbackServer := playback.GetInstance(dataStore)
-	router := subsonic.New(dataStore, artworkArtwork, mediaStreamer, archiver, players, provider, scannerScanner, broker, playlists, playTracker, share, playbackServer)
+	router := subsonic.New(dataStore, artworkArtwork, mediaStreamer, archiver, players, externalMetadata, scanner, broker, playlists, playTracker, share)
 	return router
 }
 
@@ -90,9 +70,9 @@ func CreatePublicRouter() *public.Router {
 	dataStore := persistence.New(sqlDB)
 	fileCache := artwork.GetImageCache()
 	fFmpeg := ffmpeg.New()
-	agentsAgents := agents.GetAgents(dataStore)
-	provider := external.NewProvider(dataStore, agentsAgents)
-	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, provider)
+	agentsAgents := agents.New(dataStore)
+	externalMetadata := core.NewExternalMetadata(dataStore, agentsAgents)
+	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, externalMetadata)
 	transcodingCache := core.GetTranscodingCache()
 	mediaStreamer := core.NewMediaStreamer(dataStore, fFmpeg, transcodingCache)
 	share := core.NewShare(dataStore)
@@ -115,60 +95,34 @@ 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 CreateScanner(ctx context.Context) scanner.Scanner {
+func createScanner() scanner.Scanner {
 	sqlDB := db.Db()
 	dataStore := persistence.New(sqlDB)
+	playlists := core.NewPlaylists(dataStore)
 	fileCache := artwork.GetImageCache()
 	fFmpeg := ffmpeg.New()
-	agentsAgents := agents.GetAgents(dataStore)
-	provider := external.NewProvider(dataStore, agentsAgents)
-	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, provider)
+	agentsAgents := agents.New(dataStore)
+	externalMetadata := core.NewExternalMetadata(dataStore, agentsAgents)
+	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, externalMetadata)
 	cacheWarmer := artwork.NewCacheWarmer(artworkArtwork, fileCache)
 	broker := events.GetBroker()
-	playlists := core.NewPlaylists(dataStore)
-	metricsMetrics := metrics.NewPrometheusInstance(dataStore)
-	scannerScanner := scanner.New(ctx, dataStore, cacheWarmer, broker, playlists, metricsMetrics)
+	scannerScanner := scanner.New(dataStore, playlists, cacheWarmer, broker)
 	return scannerScanner
 }
 
-func CreateScanWatcher(ctx context.Context) scanner.Watcher {
-	sqlDB := db.Db()
-	dataStore := persistence.New(sqlDB)
-	fileCache := artwork.GetImageCache()
-	fFmpeg := ffmpeg.New()
-	agentsAgents := agents.GetAgents(dataStore)
-	provider := external.NewProvider(dataStore, agentsAgents)
-	artworkArtwork := artwork.NewArtwork(dataStore, fileCache, fFmpeg, provider)
-	cacheWarmer := artwork.NewCacheWarmer(artworkArtwork, fileCache)
-	broker := events.GetBroker()
-	playlists := core.NewPlaylists(dataStore)
-	metricsMetrics := metrics.NewPrometheusInstance(dataStore)
-	scannerScanner := scanner.New(ctx, dataStore, cacheWarmer, broker, playlists, metricsMetrics)
-	watcher := scanner.NewWatcher(dataStore, scannerScanner)
-	return watcher
-}
-
-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.New, scanner.NewWatcher, metrics.NewPrometheusInstance, db.Db)
+var allProviders = wire.NewSet(core.Set, artwork.Set, subsonic.New, nativeapi.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,14 @@
 package cmd
 
 import (
-	"context"
+	"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/model"
 	"github.com/navidrome/navidrome/persistence"
 	"github.com/navidrome/navidrome/scanner"
 	"github.com/navidrome/navidrome/server"
@@ -26,7 +23,6 @@ import (
 var allProviders = wire.NewSet(
 	core.Set,
 	artwork.Set,
-	server.New,
 	subsonic.New,
 	nativeapi.New,
 	public.New,
@@ -34,20 +30,12 @@ var allProviders = wire.NewSet(
 	lastfm.NewRouter,
 	listenbrainz.NewRouter,
 	events.GetBroker,
-	scanner.New,
-	scanner.NewWatcher,
-	metrics.NewPrometheusInstance,
 	db.Db,
 )
 
-func CreateDataStore() model.DataStore {
-	panic(wire.Build(
-		allProviders,
-	))
-}
-
-func CreateServer() *server.Server {
+func CreateServer(musicFolder string) *server.Server {
 	panic(wire.Build(
+		server.New,
 		allProviders,
 	))
 }
@@ -58,9 +46,10 @@ func CreateNativeAPIRouter() *nativeapi.Router {
 	))
 }
 
-func CreateSubsonicAPIRouter(ctx context.Context) *subsonic.Router {
+func CreateSubsonicAPIRouter() *subsonic.Router {
 	panic(wire.Build(
 		allProviders,
+		GetScanner,
 	))
 }
 
@@ -82,32 +71,22 @@ func CreateListenBrainzRouter() *listenbrainz.Router {
 	))
 }
 
-func CreateInsights() metrics.Insights {
-	panic(wire.Build(
-		allProviders,
-	))
+// Scanner must be a Singleton
+var (
+	onceScanner     sync.Once
+	scannerInstance scanner.Scanner
+)
+
+func GetScanner() scanner.Scanner {
+	onceScanner.Do(func() {
+		scannerInstance = createScanner()
+	})
+	return scannerInstance
 }
 
-func CreatePrometheus() metrics.Metrics {
-	panic(wire.Build(
-		allProviders,
-	))
-}
-
-func CreateScanner(ctx context.Context) scanner.Scanner {
-	panic(wire.Build(
-		allProviders,
-	))
-}
-
-func CreateScanWatcher(ctx context.Context) scanner.Watcher {
-	panic(wire.Build(
-		allProviders,
-	))
-}
-
-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

@@ -9,96 +9,79 @@ import (
 	"strings"
 	"time"
 
-	"github.com/bmatcuk/doublestar/v4"
-	"github.com/go-viper/encoding/ini"
 	"github.com/kr/pretty"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/log"
-	"github.com/navidrome/navidrome/utils/chain"
+	"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
-	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
-	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
-	PID                             pidOptions
-	Inspect                         inspectOptions
-	Subsonic                        subsonicOptions
+	ConfigFile                   string
+	Address                      string
+	Port                         int
+	MusicFolder                  string
+	DataFolder                   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
 	Spotify      spotifyOptions
 	ListenBrainz listenBrainzOptions
-	Tags         map[string]TagConf
 
 	// DevFlags. These are used to enable/disable debugging and incomplete features
 	DevLogSourceLine                 bool
@@ -107,47 +90,19 @@ 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
-	DevExternalScanner               bool
-	DevScannerThreads                uint
-	DevInsightsInitialDelay          time.Duration
-	DevEnablePlayerInsights          bool
 }
 
 type scannerOptions struct {
-	Enabled            bool
-	Schedule           string
-	WatcherWait        time.Duration
-	ScanOnStartup      bool
-	Extractor          string
-	ArtistJoiner       string
-	GenreSeparators    string // Deprecated: Use Tags.genre.Split instead
-	GroupAlbumReleases bool   // Deprecated: Use PID.Album instead
-}
-
-type subsonicOptions struct {
-	AppendSubtitle        bool
-	ArtistParticipations  bool
-	DefaultReportRealPath bool
-	LegacyClients         string
-}
-
-type TagConf struct {
-	Ignore    bool     `yaml:"ignore"`
-	Aliases   []string `yaml:"aliases"`
-	Type      string   `yaml:"type"`
-	MaxLength int      `yaml:"maxLength"`
-	Split     []string `yaml:"split"`
-	Album     bool     `yaml:"album"`
+	Extractor       string
+	GenreSeparators string
 }
 
 type lastfmOptions struct {
@@ -167,41 +122,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
-}
-
-type pidOptions struct {
-	Track string
-	Album string
-}
-
-type inspectOptions struct {
-	Enabled        bool
-	MaxRequests    int
-	BacklogLimit   int
-	BacklogTimeout int
 }
 
 var (
@@ -211,79 +134,38 @@ var (
 
 func LoadFromFile(confFile string) {
 	viper.SetConfigFile(confFile)
-	err := viper.ReadInConfig()
-	if err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error reading config file:", err)
-		os.Exit(1)
-	}
-	Load(true)
+	Load()
 }
 
-func Load(noConfigDump bool) {
-	parseIniFileConfiguration()
-
+func Load() {
 	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)
 	}
-
-	if Server.CacheFolder == "" {
-		Server.CacheFolder = filepath.Join(Server.DataFolder, "cache")
-	}
-	err = os.MkdirAll(Server.CacheFolder, os.ModePerm)
-	if err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, "FATAL: Error creating cache path:", err)
-		os.Exit(1)
-	}
-
 	Server.ConfigFile = viper.GetViper().ConfigFileUsed()
 	if Server.DbPath == "" {
 		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)
 	log.SetRedacting(Server.EnableLogRedacting)
 
-	err = chain.RunSequentially(
-		validateScanSchedule,
-		validateBackupSchedule,
-		validatePlaylistsPath,
-	)
-	if err != nil {
+	if err := validateScanSchedule(); 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
@@ -294,71 +176,26 @@ func Load(noConfigDump bool) {
 	}
 
 	// Print current configuration if log level is Debug
-	if log.IsGreaterOrEqualTo(log.LevelDebug) && !noConfigDump {
+	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 {
 		disableExternalServices()
 	}
 
-	if Server.Scanner.Extractor != consts.DefaultScannerExtractor {
-		log.Warn(fmt.Sprintf("Extractor '%s' is not implemented, using 'taglib'", Server.Scanner.Extractor))
-		Server.Scanner.Extractor = consts.DefaultScannerExtractor
-	}
-	logDeprecatedOptions("Scanner.GenreSeparators")
-	logDeprecatedOptions("Scanner.GroupAlbumReleases")
-
 	// Call init hooks
 	for _, hook := range hooks {
 		hook()
 	}
 }
 
-func logDeprecatedOptions(options ...string) {
-	for _, option := range options {
-		envVar := "ND_" + strings.ToUpper(strings.ReplaceAll(option, ".", "_"))
-		if os.Getenv(envVar) != "" {
-			log.Warn(fmt.Sprintf("Option '%s' is deprecated and will be ignored in a future release", envVar))
-		}
-		if viper.InConfig(option) {
-			log.Warn(fmt.Sprintf("Option '%s' is deprecated and will be ignored in a future release", option))
-		}
-	}
-}
-
-// 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
@@ -368,49 +205,33 @@ func disableExternalServices() {
 	}
 }
 
-func validatePlaylistsPath() error {
-	for _, path := range strings.Split(Server.PlaylistsPath, string(filepath.ListSeparator)) {
-		_, err := doublestar.Match(path, "")
-		if err != nil {
-			log.Error("Invalid PlaylistsPath", "path", path, err)
-			return err
+func validateScanSchedule() error {
+	if Server.ScanInterval != -1 {
+		log.Warn("ScanInterval is DEPRECATED. Please use ScanSchedule. See docs at https://navidrome.org/docs/usage/configuration-options/")
+		if Server.ScanSchedule != "@every 1m" {
+			log.Error("You cannot specify both ScanInterval and ScanSchedule, ignoring ScanInterval")
+		} else {
+			if Server.ScanInterval == 0 {
+				Server.ScanSchedule = ""
+			} else {
+				Server.ScanSchedule = fmt.Sprintf("@every %s", Server.ScanInterval)
+			}
+			log.Warn("Setting ScanSchedule", "schedule", Server.ScanSchedule)
 		}
 	}
-	return nil
-}
-
-func validateScanSchedule() error {
-	if Server.Scanner.Schedule == "0" || Server.Scanner.Schedule == "" {
-		Server.Scanner.Schedule = ""
+	if Server.ScanSchedule == "0" || Server.ScanSchedule == "" {
+		Server.ScanSchedule = ""
 		return nil
 	}
-	var err error
-	Server.Scanner.Schedule, err = validateSchedule(Server.Scanner.Schedule, "Scanner.Schedule")
-	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, "Backup.Schedule")
-	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", schedule, 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
@@ -420,14 +241,13 @@ func AddHook(hook func()) {
 
 func init() {
 	viper.SetDefault("musicfolder", filepath.Join(".", "music"))
-	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")
 	viper.SetDefault("baseurl", "")
 	viper.SetDefault("tlscert", "")
 	viper.SetDefault("tlskey", "")
@@ -437,25 +257,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", "")
-	viper.SetDefault("smartPlaylistRefreshDelay", 5*time.Second)
+	viper.SetDefault("playlistspath", consts.DefaultPlaylistsPath)
 	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")
@@ -468,11 +283,7 @@ func init() {
 	viper.SetDefault("defaultuivolume", consts.DefaultUIVolume)
 	viper.SetDefault("enablereplaygain", true)
 	viper.SetDefault("enablecoveranimation", true)
-	viper.SetDefault("enablesharing", false)
-	viper.SetDefault("shareurl", "")
-	viper.SetDefault("defaultdownloadableshare", false)
 	viper.SetDefault("gatrackingid", "")
-	viper.SetDefault("enableinsightscollector", true)
 	viper.SetDefault("enablelogredacting", true)
 	viper.SetDefault("authrequestlimit", 5)
 	viper.SetDefault("authwindowlength", 20*time.Second)
@@ -482,79 +293,40 @@ func init() {
 	viper.SetDefault("reverseproxywhitelist", "")
 
 	viper.SetDefault("prometheus.enabled", false)
-	viper.SetDefault("prometheus.metricspath", consts.PrometheusDefaultPath)
-	viper.SetDefault("prometheus.password", "")
+	viper.SetDefault("prometheus.metricspath", "/metrics")
 
-	viper.SetDefault("jukebox.enabled", false)
-	viper.SetDefault("jukebox.devices", []AudioDeviceDefinition{})
-	viper.SetDefault("jukebox.default", "")
-	viper.SetDefault("jukebox.adminonly", true)
-
-	viper.SetDefault("scanner.enabled", true)
-	viper.SetDefault("scanner.schedule", "0")
 	viper.SetDefault("scanner.extractor", consts.DefaultScannerExtractor)
-	viper.SetDefault("scanner.watcherwait", consts.DefaultWatcherWait)
-	viper.SetDefault("scanner.scanonstartup", true)
-	viper.SetDefault("scanner.artistjoiner", consts.ArtistJoiner)
-	viper.SetDefault("scanner.genreseparators", "")
-	viper.SetDefault("scanner.groupalbumreleases", false)
-
-	viper.SetDefault("subsonic.appendsubtitle", true)
-	viper.SetDefault("subsonic.artistparticipations", false)
-	viper.SetDefault("subsonic.defaultreportrealpath", false)
-	viper.SetDefault("subsonic.legacyclients", "DSub")
+	viper.SetDefault("scanner.genreseparators", ";/,")
 
 	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)
-
-	viper.SetDefault("pid.track", consts.DefaultTrackPID)
-	viper.SetDefault("pid.album", consts.DefaultAlbumPID)
-
-	viper.SetDefault("inspect.enabled", true)
-	viper.SetDefault("inspect.maxrequests", 1)
-	viper.SetDefault("inspect.backloglimit", consts.RequestThrottleBacklogLimit)
-	viper.SetDefault("inspect.backlogtimeout", consts.RequestThrottleBacklogTimeout)
-
 	// 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("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("devexternalscanner", true)
-	viper.SetDefault("devscannerthreads", 5)
-	viper.SetDefault("devinsightsinitialdelay", consts.InsightsInitialDelay)
-	viper.SetDefault("devenableplayerinsights", true)
 }
 
 func InitConfig(cfgFile string) {
-	codecRegistry := viper.NewCodecRegistry()
-	_ = codecRegistry.RegisterCodec("ini", ini.Codec{})
-	viper.SetOptions(viper.WithCodecRegistry(codecRegistry))
-
 	cfgFile = getConfigFile(cfgFile)
 	if cfgFile != "" {
 		// Use config file from the flag.
@@ -578,17 +350,9 @@ func InitConfig(cfgFile string) {
 	}
 }
 
-// getConfigFile returns the path to the config file, either from the flag or from the environment variable.
-// If it is defined in the environment variable, it will check if the file exists.
 func getConfigFile(cfgFile string) string {
 	if cfgFile != "" {
 		return cfgFile
 	}
-	cfgFile = os.Getenv("ND_CONFIGFILE")
-	if cfgFile != "" {
-		if _, err := os.Stat(cfgFile); err == nil {
-			return cfgFile
-		}
-	}
-	return ""
+	return os.Getenv("ND_CONFIGFILE")
 }

conf/configuration_test.go

@@ -1,50 +0,0 @@
-package conf_test
-
-import (
-	"fmt"
-	"path/filepath"
-	"testing"
-
-	. "github.com/navidrome/navidrome/conf"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	"github.com/spf13/viper"
-)
-
-func TestConfiguration(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Configuration Suite")
-}
-
-var _ = Describe("Configuration", func() {
-	BeforeEach(func() {
-		// Reset viper configuration
-		viper.Reset()
-		viper.SetDefault("datafolder", GinkgoT().TempDir())
-		viper.SetDefault("loglevel", "error")
-		ResetConf()
-	})
-
-	DescribeTable("should load configuration from",
-		func(format string) {
-			filename := filepath.Join("testdata", "cfg."+format)
-
-			// Initialize config with the test file
-			InitConfig(filename)
-			// Load the configuration (with noConfigDump=true)
-			Load(true)
-
-			// Execute the format-specific assertions
-			Expect(Server.MusicFolder).To(Equal(fmt.Sprintf("/%s/music", format)))
-			Expect(Server.UIWelcomeMessage).To(Equal("Welcome " + format))
-			Expect(Server.Tags["custom"].Aliases).To(Equal([]string{format, "test"}))
-
-			// The config file used should be the one we created
-			Expect(Server.ConfigFile).To(Equal(filename))
-		},
-		Entry("TOML format", "toml"),
-		Entry("YAML format", "yaml"),
-		Entry("INI format", "ini"),
-		Entry("JSON format", "json"),
-	)
-})

conf/export_test.go

@@ -1,5 +0,0 @@
-package conf
-
-func ResetConf() {
-	Server = &configOptions{}
-}

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)
-}

conf/testdata/cfg.ini

@@ -1,6 +0,0 @@
-[default]
-MusicFolder = /ini/music
-UIWelcomeMessage = Welcome ini
-
-[Tags]
-Custom.Aliases = ini,test

conf/testdata/cfg.json

@@ -1,12 +0,0 @@
-{
-  "musicFolder": "/json/music",
-  "uiWelcomeMessage": "Welcome json",
-  "Tags": {
-    "custom": {
-      "aliases": [
-        "json",
-        "test"
-      ]
-    }
-  }
-}

conf/testdata/cfg.toml

@@ -1,5 +0,0 @@
-musicFolder = "/toml/music"
-uiWelcomeMessage = "Welcome toml"
-
-[Tags.custom]
-aliases = ["toml", "test"]

conf/testdata/cfg.yaml

@@ -1,7 +0,0 @@
-musicFolder: "/yaml/music"
-uiWelcomeMessage: "Welcome yaml"
-Tags:
-  custom:
-    aliases:
-      - yaml
-      - test

consts/consts.go

@@ -1,29 +1,26 @@
 package consts
 
 import (
-	"os"
+	"crypto/md5"
+	"fmt"
+	"path/filepath"
 	"strings"
 	"time"
-
-	"github.com/navidrome/navidrome/model/id"
 )
 
 const (
 	AppName = "navidrome"
 
-	DefaultDbPath                 = "navidrome.db?cache=shared&_busy_timeout=15000&_journal_mode=WAL&_foreign_keys=on&synchronous=normal"
-	InitialSetupFlagKey           = "InitialSetup"
-	FullScanAfterMigrationFlagKey = "FullScanAfterMigration"
+	DefaultDbPath       = "navidrome.db?cache=shared&_busy_timeout=15000&_journal_mode=WAL&_foreign_keys=on"
+	InitialSetupFlagKey = "InitialSetup"
 
 	UIAuthorizationHeader  = "X-ND-Authorization"
 	UIClientUniqueIDHeader = "X-ND-Client-Unique-Id"
 	JWTSecretKey           = "JWTSecret"
 	JWTIssuer              = "ND"
-	DefaultSessionTimeout  = 48 * time.Hour
+	DefaultSessionTimeout  = 24 * time.Hour
 	CookieExpiry           = 365 * 24 * 3600 // One year
 
-	OptimizeDBSchedule = "@every 24h"
-
 	// DefaultEncryptionKey This is the encryption key used if none is specified in the `PasswordEncryptionKey` option
 	// Never ever change this! Or it will break all Navidrome installations that don't set the config option
 	DefaultEncryptionKey  = "just for obfuscation"
@@ -53,16 +50,14 @@ const (
 
 	ServerReadHeaderTimeout = 3 * time.Second
 
-	ArtistInfoTimeToLive      = 24 * time.Hour
-	AlbumInfoTimeToLive       = 7 * 24 * time.Hour
-	UpdateLastAccessFrequency = time.Minute
-	UpdatePlayerFrequency     = time.Minute
+	ArtistInfoTimeToLive = 24 * time.Hour
+	AlbumInfoTimeToLive  = 7 * 24 * time.Hour
 
-	I18nFolder     = "i18n"
-	ScanIgnoreFile = ".ndignore"
+	I18nFolder   = "i18n"
+	SkipScanFile = ".ndignore"
 
 	PlaceholderArtistArt = "artist-placeholder.webp"
-	PlaceholderAlbumArt  = "album-placeholder.webp"
+	PlaceholderAlbumArt  = "placeholder.png"
 	PlaceholderAvatar    = "logo-192x192.png"
 	UICoverArtSize       = 300
 	DefaultUIVolume      = 100
@@ -70,98 +65,61 @@ const (
 	DefaultHttpClientTimeOut = 10 * time.Second
 
 	DefaultScannerExtractor = "taglib"
-	DefaultWatcherWait      = 5 * time.Second
-	Zwsp                    = string('\u200b')
-)
 
-// Prometheus options
-const (
-	PrometheusDefaultPath = "/metrics"
-	PrometheusAuthUser    = "navidrome"
+	Zwsp = string('\u200b')
 )
 
 // Cache options
 const (
-	TranscodingCacheDir             = "transcoding"
+	TranscodingCacheDir             = "cache/transcoding"
 	DefaultTranscodingCacheMaxItems = 0 // Unlimited
 
-	ImageCacheDir             = "images"
+	ImageCacheDir             = "cache/images"
 	DefaultImageCacheMaxItems = 0 // Unlimited
 
 	DefaultCacheSize            = 100 * 1024 * 1024 // 100MB
 	DefaultCacheCleanUpInterval = 10 * time.Minute
 )
 
+// Shared secrets (only add here "secrets" that can be public)
 const (
-	AlbumPlayCountModeAbsolute   = "absolute"
-	AlbumPlayCountModeNormalized = "normalized"
-)
-
-const (
-	//DefaultAlbumPID = "album_legacy"
-	DefaultAlbumPID = "musicbrainz_albumid|albumartistid,album,albumversion,releasedate"
-	DefaultTrackPID = "musicbrainz_trackid|albumid,discnumber,tracknumber,title"
-	PIDAlbumKey     = "PIDAlbum"
-	PIDTrackKey     = "PIDTrack"
-)
-
-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: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: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:0 -b:a %bk -v 0 -c:a aac -f adts -",
 		},
 	}
+
+	DefaultPlaylistsPath = strings.Join([]string{".", "**/**"}, string(filepath.ListSeparator))
 )
 
 var (
-	VariousArtists = "Various Artists"
-	// TODO This will be dynamic when using disambiguation
-	VariousArtistsID = "63sqASlAfjbGMuLP4JhnZU"
-	UnknownAlbum     = "[Unknown Album]"
-	UnknownArtist    = "[Unknown Artist]"
-	// TODO This will be dynamic when using disambiguation
-	UnknownArtistID     = id.NewHash(strings.ToLower(UnknownArtist))
+	VariousArtists      = "Various Artists"
+	VariousArtistsID    = fmt.Sprintf("%x", md5.Sum([]byte(strings.ToLower(VariousArtists))))
+	UnknownAlbum        = "[Unknown Album]"
+	UnknownArtist       = "[Unknown Artist]"
+	UnknownArtistID     = fmt.Sprintf("%x", md5.Sum([]byte(strings.ToLower(UnknownArtist))))
 	VariousArtistsMbzId = "89ad4ac3-39f7-470e-963a-56509c546377"
 
-	ArtistJoiner = " • "
-)
-
-var (
 	ServerStart = time.Now()
-
-	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

@@ -10,7 +10,6 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/utils"
-	"github.com/navidrome/navidrome/utils/singleton"
 )
 
 type Agents struct {
@@ -18,36 +17,22 @@ type Agents struct {
 	agents []Interface
 }
 
-func GetAgents(ds model.DataStore) *Agents {
-	return singleton.GetInstance(func() *Agents {
-		return createAgents(ds)
-	})
-}
-
-func createAgents(ds model.DataStore) *Agents {
+func New(ds model.DataStore) *Agents {
 	var order []string
 	if conf.Server.Agents != "" {
 		order = strings.Split(conf.Server.Agents, ",")
 	}
 	order = append(order, LocalAgentName)
 	var res []Interface
-	var enabled []string
 	for _, name := range order {
 		init, ok := Map[name]
 		if !ok {
-			log.Error("Invalid agent. Check `Agents` configuration", "name", name, "conf", conf.Server.Agents)
+			log.Error("Agent not available. Check configuration", "name", name)
 			continue
 		}
 
-		agent := init(ds)
-		if agent == nil {
-			log.Debug("Agent not available. Missing configuration?", "name", name)
-			continue
-		}
-		enabled = append(enabled, name)
-		res = append(res, agent)
+		res = append(res, init(ds))
 	}
-	log.Debug("List of agents enabled", "names", enabled)
 
 	return &Agents{ds: ds, agents: res}
 }
@@ -149,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

@@ -7,7 +7,6 @@ import (
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	"github.com/navidrome/navidrome/utils/slice"
 
 	"github.com/navidrome/navidrome/conf"
 	. "github.com/onsi/ginkgo/v2"
@@ -29,7 +28,7 @@ var _ = Describe("Agents", func() {
 		var ag *Agents
 		BeforeEach(func() {
 			conf.Server.Agents = ""
-			ag = createAgents(ds)
+			ag = New(ds)
 		})
 
 		It("calls the placeholder GetArtistImages", func() {
@@ -45,25 +44,23 @@ var _ = Describe("Agents", func() {
 		var mock *mockAgent
 		BeforeEach(func() {
 			mock = &mockAgent{}
-			Register("fake", func(model.DataStore) Interface { return mock })
-			Register("disabled", func(model.DataStore) Interface { return nil })
-			Register("empty", func(model.DataStore) Interface { return &emptyAgent{} })
-			conf.Server.Agents = "empty,fake,disabled"
-			ag = createAgents(ds)
+			Register("fake", func(ds model.DataStore) Interface {
+				return mock
+			})
+			Register("empty", func(ds model.DataStore) Interface {
+				return struct {
+					Interface
+				}{}
+			})
+			conf.Server.Agents = "empty,fake"
+			ag = New(ds)
 			Expect(ag.AgentName()).To(Equal("agents"))
 		})
 
-		It("does not register disabled agents", func() {
-			ags := slice.Map(ag.agents, func(a Interface) string { return a.AgentName() })
-			// local agent is always appended to the end of the agents list
-			Expect(ags).To(HaveExactElements("empty", "fake", "local"))
-			Expect(ags).ToNot(ContainElement("disabled"))
-		})
-
 		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)
@@ -81,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()
@@ -94,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, "")
@@ -112,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()
@@ -125,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, "")
@@ -143,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()
@@ -159,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()
@@ -181,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()
@@ -203,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()
@@ -239,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()
@@ -347,11 +344,3 @@ func (a *mockAgent) GetAlbumInfo(ctx context.Context, name, artist, mbid string)
 		},
 	}, nil
 }
-
-type emptyAgent struct {
-	Interface
-}
-
-func (e *emptyAgent) AgentName() string {
-	return "empty"
-}

core/agents/lastfm/agent.go

@@ -3,22 +3,18 @@ package lastfm
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"regexp"
 	"strconv"
 	"strings"
-	"sync"
 
-	"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 (
@@ -32,19 +28,15 @@ var ignoredBiographies = []string{
 }
 
 type lastfmAgent struct {
-	ds           model.DataStore
-	sessionKeys  *agents.SessionKeys
-	apiKey       string
-	secret       string
-	lang         string
-	client       *client
-	getInfoMutex sync.Mutex
+	ds          model.DataStore
+	sessionKeys *agents.SessionKeys
+	apiKey      string
+	secret      string
+	lang        string
+	client      *client
 }
 
 func lastFMConstructor(ds model.DataStore) *lastfmAgent {
-	if !conf.Server.LastFM.Enabled || conf.Server.LastFM.ApiKey == "" || conf.Server.LastFM.Secret == "" {
-		return nil
-	}
 	l := &lastfmAgent{
 		ds:          ds,
 		lang:        conf.Server.LastFM.Language,
@@ -55,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
 }
@@ -112,7 +104,7 @@ func (l *lastfmAgent) GetAlbumInfo(ctx context.Context, name, artist, mbid strin
 }
 
 func (l *lastfmAgent) GetArtistMBID(ctx context.Context, id string, name string) (string, error) {
-	a, err := l.callArtistGetInfo(ctx, name)
+	a, err := l.callArtistGetInfo(ctx, name, "")
 	if err != nil {
 		return "", err
 	}
@@ -123,7 +115,7 @@ func (l *lastfmAgent) GetArtistMBID(ctx context.Context, id string, name string)
 }
 
 func (l *lastfmAgent) GetArtistURL(ctx context.Context, id, name, mbid string) (string, error) {
-	a, err := l.callArtistGetInfo(ctx, name)
+	a, err := l.callArtistGetInfo(ctx, name, mbid)
 	if err != nil {
 		return "", err
 	}
@@ -134,7 +126,7 @@ func (l *lastfmAgent) GetArtistURL(ctx context.Context, id, name, mbid string) (
 }
 
 func (l *lastfmAgent) GetArtistBiography(ctx context.Context, id, name, mbid string) (string, error) {
-	a, err := l.callArtistGetInfo(ctx, name)
+	a, err := l.callArtistGetInfo(ctx, name, mbid)
 	if err != nil {
 		return "", err
 	}
@@ -151,7 +143,7 @@ func (l *lastfmAgent) GetArtistBiography(ctx context.Context, id, name, mbid str
 }
 
 func (l *lastfmAgent) GetSimilarArtists(ctx context.Context, id, name, mbid string, limit int) ([]agents.Artist, error) {
-	resp, err := l.callArtistGetSimilar(ctx, name, limit)
+	resp, err := l.callArtistGetSimilar(ctx, name, mbid, limit)
 	if err != nil {
 		return nil, err
 	}
@@ -169,7 +161,7 @@ func (l *lastfmAgent) GetSimilarArtists(ctx context.Context, id, name, mbid stri
 }
 
 func (l *lastfmAgent) GetArtistTopSongs(ctx context.Context, id, artistName, mbid string, count int) ([]agents.Song, error) {
-	resp, err := l.callArtistGetTopTracks(ctx, artistName, count)
+	resp, err := l.callArtistGetTopTracks(ctx, artistName, mbid, count)
 	if err != nil {
 		return nil, err
 	}
@@ -186,55 +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) {
-	log.Debug(ctx, "Getting artist images from Last.fm", "name", name)
-	hc := http.Client{
-		Timeout: consts.DefaultHttpClientTimeOut,
-	}
-	a, err := l.callArtistGetInfo(ctx, name)
-	if err != nil {
-		return nil, fmt.Errorf("get artist info: %w", err)
-	}
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, a.URL, nil)
-	if err != nil {
-		return nil, fmt.Errorf("create artist image request: %w", err)
-	}
-	resp, err := 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, "")
 	}
 
@@ -249,31 +199,48 @@ func (l *lastfmAgent) callAlbumGetInfo(ctx context.Context, name, artist, mbid s
 	return a, nil
 }
 
-func (l *lastfmAgent) callArtistGetInfo(ctx context.Context, name string) (*Artist, error) {
-	l.getInfoMutex.Lock()
-	defer l.getInfoMutex.Unlock()
+func (l *lastfmAgent) callArtistGetInfo(ctx context.Context, name string, mbid string) (*Artist, error) {
+	a, err := l.client.artistGetInfo(ctx, name, mbid)
+	var lfErr *lastFMError
+	isLastFMError := errors.As(err, &lfErr)
+
+	if mbid != "" && ((err == nil && a.Name == "[unknown]") || (isLastFMError && lfErr.Code == 6)) {
+		log.Warn(ctx, "LastFM/artist.getInfo could not find artist by mbid, trying again", "artist", name, "mbid", mbid)
+		return l.callArtistGetInfo(ctx, name, "")
+	}
 
-	a, err := l.client.artistGetInfo(ctx, name)
 	if err != nil {
-		log.Error(ctx, "Error calling LastFM/artist.getInfo", "artist", name, err)
+		log.Error(ctx, "Error calling LastFM/artist.getInfo", "artist", name, "mbid", mbid, err)
 		return nil, err
 	}
 	return a, nil
 }
 
-func (l *lastfmAgent) callArtistGetSimilar(ctx context.Context, name string, limit int) ([]Artist, error) {
-	s, err := l.client.artistGetSimilar(ctx, name, limit)
+func (l *lastfmAgent) callArtistGetSimilar(ctx context.Context, name string, mbid string, limit int) ([]Artist, error) {
+	s, err := l.client.artistGetSimilar(ctx, name, mbid, limit)
+	var lfErr *lastFMError
+	isLastFMError := errors.As(err, &lfErr)
+	if mbid != "" && ((err == nil && s.Attr.Artist == "[unknown]") || (isLastFMError && lfErr.Code == 6)) {
+		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 {
-		log.Error(ctx, "Error calling LastFM/artist.getSimilar", "artist", name, err)
+		log.Error(ctx, "Error calling LastFM/artist.getSimilar", "artist", name, "mbid", mbid, err)
 		return nil, err
 	}
 	return s.Artists, nil
 }
 
-func (l *lastfmAgent) callArtistGetTopTracks(ctx context.Context, artistName string, count int) ([]Track, error) {
-	t, err := l.client.artistGetTopTracks(ctx, artistName, count)
+func (l *lastfmAgent) callArtistGetTopTracks(ctx context.Context, artistName, mbid string, count int) ([]Track, error) {
+	t, err := l.client.artistGetTopTracks(ctx, artistName, mbid, count)
+	var lfErr *lastFMError
+	isLastFMError := errors.As(err, &lfErr)
+	if mbid != "" && ((err == nil && t.Attr.Artist == "[unknown]") || (isLastFMError && lfErr.Code == 6)) {
+		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 {
-		log.Error(ctx, "Error calling LastFM/artist.getTopTracks", "artist", artistName, err)
+		log.Error(ctx, "Error calling LastFM/artist.getTopTracks", "artist", artistName, "mbid", mbid, err)
 		return nil, err
 	}
 	return t.Track, nil
@@ -290,13 +257,13 @@ 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,
 	})
 	if err != nil {
 		log.Warn(ctx, "Last.fm client.updateNowPlaying returned error", "track", track.Title, err)
-		return errors.Join(err, scrobbler.ErrUnrecoverable)
+		return scrobbler.ErrUnrecoverable
 	}
 	return nil
 }
@@ -304,7 +271,7 @@ func (l *lastfmAgent) NowPlaying(ctx context.Context, userId string, track *mode
 func (l *lastfmAgent) Scrobble(ctx context.Context, userId string, s scrobbler.Scrobble) error {
 	sk, err := l.sessionKeys.Get(ctx, userId)
 	if err != nil || sk == "" {
-		return errors.Join(err, scrobbler.ErrNotAuthorized)
+		return scrobbler.ErrNotAuthorized
 	}
 
 	if s.Duration <= 30 {
@@ -316,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,
@@ -328,12 +295,12 @@ func (l *lastfmAgent) Scrobble(ctx context.Context, userId string, s scrobbler.S
 	isLastFMError := errors.As(err, &lfErr)
 	if !isLastFMError {
 		log.Warn(ctx, "Last.fm client.scrobble returned error", "track", s.Title, err)
-		return errors.Join(err, scrobbler.ErrRetryLater)
+		return scrobbler.ErrRetryLater
 	}
 	if lfErr.Code == 11 || lfErr.Code == 16 {
-		return errors.Join(err, scrobbler.ErrRetryLater)
+		return scrobbler.ErrRetryLater
 	}
-	return errors.Join(err, scrobbler.ErrUnrecoverable)
+	return scrobbler.ErrUnrecoverable
 }
 
 func (l *lastfmAgent) IsAuthorized(ctx context.Context, userId string) bool {
@@ -343,19 +310,13 @@ func (l *lastfmAgent) IsAuthorized(ctx context.Context, userId string) bool {
 
 func init() {
 	conf.AddHook(func() {
-		agents.Register(lastFMAgentName, func(ds model.DataStore) agents.Interface {
-			a := lastFMConstructor(ds)
-			if a != nil {
-				return a
-			}
-			return nil
-		})
-		scrobbler.Register(lastFMAgentName, func(ds model.DataStore) scrobbler.Scrobbler {
-			a := lastFMConstructor(ds)
-			if a != nil {
-				return a
-			}
-			return nil
-		})
+		if conf.Server.LastFM.Enabled {
+			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

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/conf/configtest"
 	"github.com/navidrome/navidrome/core/agents"
 	"github.com/navidrome/navidrome/core/scrobbler"
 	"github.com/navidrome/navidrome/model"
@@ -31,38 +30,16 @@ var _ = Describe("lastfmAgent", func() {
 	BeforeEach(func() {
 		ds = &tests.MockDataStore{}
 		ctx = context.Background()
-		DeferCleanup(configtest.SetupConfig())
-		conf.Server.LastFM.Enabled = true
-		conf.Server.LastFM.ApiKey = "123"
-		conf.Server.LastFM.Secret = "secret"
 	})
 	Describe("lastFMConstructor", func() {
-		When("Agent is properly configured", func() {
-			It("uses configured api key and language", func() {
-				conf.Server.LastFM.Language = "pt"
-				agent := lastFMConstructor(ds)
-				Expect(agent.apiKey).To(Equal("123"))
-				Expect(agent.secret).To(Equal("secret"))
-				Expect(agent.lang).To(Equal("pt"))
-			})
-		})
-		When("Agent is disabled", func() {
-			It("returns nil", func() {
-				conf.Server.LastFM.Enabled = false
-				Expect(lastFMConstructor(ds)).To(BeNil())
-			})
-		})
-		When("ApiKey is empty", func() {
-			It("returns nil", func() {
-				conf.Server.LastFM.ApiKey = ""
-				Expect(lastFMConstructor(ds)).To(BeNil())
-			})
-		})
-		When("Secret is empty", func() {
-			It("returns nil", func() {
-				conf.Server.LastFM.Secret = ""
-				Expect(lastFMConstructor(ds)).To(BeNil())
-			})
+		It("uses configured api key and language", func() {
+			conf.Server.LastFM.ApiKey = "123"
+			conf.Server.LastFM.Secret = "secret"
+			conf.Server.LastFM.Language = "pt"
+			agent := lastFMConstructor(ds)
+			Expect(agent.apiKey).To(Equal("123"))
+			Expect(agent.secret).To(Equal("secret"))
+			Expect(agent.lang).To(Equal("pt"))
 		})
 	})
 
@@ -79,25 +56,48 @@ var _ = Describe("lastfmAgent", func() {
 		It("returns the biography", func() {
 			f, _ := os.Open("tests/fixtures/lastfm.artist.getinfo.json")
 			httpClient.Res = http.Response{Body: f, StatusCode: 200}
-			Expect(agent.GetArtistBiography(ctx, "123", "U2", "")).To(Equal("U2 é uma das mais importantes bandas de rock de todos os tempos. Formada em 1976 em Dublin, composta por Bono (vocalista  e guitarrista), The Edge (guitarrista, pianista e backing vocal), Adam Clayton (baixista), Larry Mullen, Jr. (baterista e percussionista).\n\nDesde a década de 80, U2 é uma das bandas mais populares no mundo. Seus shows são únicos e um verdadeiro festival de efeitos especiais, além de serem um dos que mais arrecadam anualmente. <a href=\"https://www.last.fm/music/U2\">Read more on Last.fm</a>"))
+			Expect(agent.GetArtistBiography(ctx, "123", "U2", "mbid-1234")).To(Equal("U2 é uma das mais importantes bandas de rock de todos os tempos. Formada em 1976 em Dublin, composta por Bono (vocalista  e guitarrista), The Edge (guitarrista, pianista e backing vocal), Adam Clayton (baixista), Larry Mullen, Jr. (baterista e percussionista).\n\nDesde a década de 80, U2 é uma das bandas mais populares no mundo. Seus shows são únicos e um verdadeiro festival de efeitos especiais, além de serem um dos que mais arrecadam anualmente. <a href=\"https://www.last.fm/music/U2\">Read more on Last.fm</a>"))
 			Expect(httpClient.RequestCount).To(Equal(1))
-			Expect(httpClient.SavedRequest.URL.Query().Get("artist")).To(Equal("U2"))
+			Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(Equal("mbid-1234"))
 		})
 
 		It("returns an error if Last.fm call fails", func() {
 			httpClient.Err = errors.New("error")
-			_, err := agent.GetArtistBiography(ctx, "123", "U2", "")
+			_, err := agent.GetArtistBiography(ctx, "123", "U2", "mbid-1234")
 			Expect(err).To(HaveOccurred())
 			Expect(httpClient.RequestCount).To(Equal(1))
-			Expect(httpClient.SavedRequest.URL.Query().Get("artist")).To(Equal("U2"))
+			Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(Equal("mbid-1234"))
 		})
 
 		It("returns an error if Last.fm call returns an error", func() {
 			httpClient.Res = http.Response{Body: io.NopCloser(bytes.NewBufferString(lastfmError3)), StatusCode: 200}
+			_, err := agent.GetArtistBiography(ctx, "123", "U2", "mbid-1234")
+			Expect(err).To(HaveOccurred())
+			Expect(httpClient.RequestCount).To(Equal(1))
+			Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(Equal("mbid-1234"))
+		})
+
+		It("returns an error if Last.fm call returns an error 6 and mbid is empty", func() {
+			httpClient.Res = http.Response{Body: io.NopCloser(bytes.NewBufferString(lastfmError6)), StatusCode: 200}
 			_, err := agent.GetArtistBiography(ctx, "123", "U2", "")
 			Expect(err).To(HaveOccurred())
 			Expect(httpClient.RequestCount).To(Equal(1))
-			Expect(httpClient.SavedRequest.URL.Query().Get("artist")).To(Equal("U2"))
+		})
+
+		Context("MBID non existent in Last.fm", func() {
+			It("calls again when the response is artist == [unknown]", func() {
+				f, _ := os.Open("tests/fixtures/lastfm.artist.getinfo.unknown.json")
+				httpClient.Res = http.Response{Body: f, StatusCode: 200}
+				_, _ = agent.GetArtistBiography(ctx, "123", "U2", "mbid-1234")
+				Expect(httpClient.RequestCount).To(Equal(2))
+				Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(BeEmpty())
+			})
+			It("calls again when last.fm returns an error 6", func() {
+				httpClient.Res = http.Response{Body: io.NopCloser(bytes.NewBufferString(lastfmError6)), StatusCode: 200}
+				_, _ = agent.GetArtistBiography(ctx, "123", "U2", "mbid-1234")
+				Expect(httpClient.RequestCount).To(Equal(2))
+				Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(BeEmpty())
+			})
 		})
 	})
 
@@ -114,28 +114,51 @@ var _ = Describe("lastfmAgent", func() {
 		It("returns similar artists", func() {
 			f, _ := os.Open("tests/fixtures/lastfm.artist.getsimilar.json")
 			httpClient.Res = http.Response{Body: f, StatusCode: 200}
-			Expect(agent.GetSimilarArtists(ctx, "123", "U2", "", 2)).To(Equal([]agents.Artist{
+			Expect(agent.GetSimilarArtists(ctx, "123", "U2", "mbid-1234", 2)).To(Equal([]agents.Artist{
 				{Name: "Passengers", MBID: "e110c11f-1c94-4471-a350-c38f46b29389"},
 				{Name: "INXS", MBID: "481bf5f9-2e7c-4c44-b08a-05b32bc7c00d"},
 			}))
 			Expect(httpClient.RequestCount).To(Equal(1))
-			Expect(httpClient.SavedRequest.URL.Query().Get("artist")).To(Equal("U2"))
+			Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(Equal("mbid-1234"))
 		})
 
 		It("returns an error if Last.fm call fails", func() {
 			httpClient.Err = errors.New("error")
-			_, err := agent.GetSimilarArtists(ctx, "123", "U2", "", 2)
+			_, err := agent.GetSimilarArtists(ctx, "123", "U2", "mbid-1234", 2)
 			Expect(err).To(HaveOccurred())
 			Expect(httpClient.RequestCount).To(Equal(1))
-			Expect(httpClient.SavedRequest.URL.Query().Get("artist")).To(Equal("U2"))
+			Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(Equal("mbid-1234"))
 		})
 
 		It("returns an error if Last.fm call returns an error", func() {
 			httpClient.Res = http.Response{Body: io.NopCloser(bytes.NewBufferString(lastfmError3)), StatusCode: 200}
+			_, err := agent.GetSimilarArtists(ctx, "123", "U2", "mbid-1234", 2)
+			Expect(err).To(HaveOccurred())
+			Expect(httpClient.RequestCount).To(Equal(1))
+			Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(Equal("mbid-1234"))
+		})
+
+		It("returns an error if Last.fm call returns an error 6 and mbid is empty", func() {
+			httpClient.Res = http.Response{Body: io.NopCloser(bytes.NewBufferString(lastfmError6)), StatusCode: 200}
 			_, err := agent.GetSimilarArtists(ctx, "123", "U2", "", 2)
 			Expect(err).To(HaveOccurred())
 			Expect(httpClient.RequestCount).To(Equal(1))
-			Expect(httpClient.SavedRequest.URL.Query().Get("artist")).To(Equal("U2"))
+		})
+
+		Context("MBID non existent in Last.fm", func() {
+			It("calls again when the response is artist == [unknown]", func() {
+				f, _ := os.Open("tests/fixtures/lastfm.artist.getsimilar.unknown.json")
+				httpClient.Res = http.Response{Body: f, StatusCode: 200}
+				_, _ = agent.GetSimilarArtists(ctx, "123", "U2", "mbid-1234", 2)
+				Expect(httpClient.RequestCount).To(Equal(2))
+				Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(BeEmpty())
+			})
+			It("calls again when last.fm returns an error 6", func() {
+				httpClient.Res = http.Response{Body: io.NopCloser(bytes.NewBufferString(lastfmError6)), StatusCode: 200}
+				_, _ = agent.GetSimilarArtists(ctx, "123", "U2", "mbid-1234", 2)
+				Expect(httpClient.RequestCount).To(Equal(2))
+				Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(BeEmpty())
+			})
 		})
 	})
 
@@ -152,28 +175,51 @@ var _ = Describe("lastfmAgent", func() {
 		It("returns top songs", func() {
 			f, _ := os.Open("tests/fixtures/lastfm.artist.gettoptracks.json")
 			httpClient.Res = http.Response{Body: f, StatusCode: 200}
-			Expect(agent.GetArtistTopSongs(ctx, "123", "U2", "", 2)).To(Equal([]agents.Song{
+			Expect(agent.GetArtistTopSongs(ctx, "123", "U2", "mbid-1234", 2)).To(Equal([]agents.Song{
 				{Name: "Beautiful Day", MBID: "f7f264d0-a89b-4682-9cd7-a4e7c37637af"},
 				{Name: "With or Without You", MBID: "6b9a509f-6907-4a6e-9345-2f12da09ba4b"},
 			}))
 			Expect(httpClient.RequestCount).To(Equal(1))
-			Expect(httpClient.SavedRequest.URL.Query().Get("artist")).To(Equal("U2"))
+			Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(Equal("mbid-1234"))
 		})
 
 		It("returns an error if Last.fm call fails", func() {
 			httpClient.Err = errors.New("error")
-			_, err := agent.GetArtistTopSongs(ctx, "123", "U2", "", 2)
+			_, err := agent.GetArtistTopSongs(ctx, "123", "U2", "mbid-1234", 2)
 			Expect(err).To(HaveOccurred())
 			Expect(httpClient.RequestCount).To(Equal(1))
-			Expect(httpClient.SavedRequest.URL.Query().Get("artist")).To(Equal("U2"))
+			Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(Equal("mbid-1234"))
 		})
 
 		It("returns an error if Last.fm call returns an error", func() {
 			httpClient.Res = http.Response{Body: io.NopCloser(bytes.NewBufferString(lastfmError3)), StatusCode: 200}
+			_, err := agent.GetArtistTopSongs(ctx, "123", "U2", "mbid-1234", 2)
+			Expect(err).To(HaveOccurred())
+			Expect(httpClient.RequestCount).To(Equal(1))
+			Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(Equal("mbid-1234"))
+		})
+
+		It("returns an error if Last.fm call returns an error 6 and mbid is empty", func() {
+			httpClient.Res = http.Response{Body: io.NopCloser(bytes.NewBufferString(lastfmError6)), StatusCode: 200}
 			_, err := agent.GetArtistTopSongs(ctx, "123", "U2", "", 2)
 			Expect(err).To(HaveOccurred())
 			Expect(httpClient.RequestCount).To(Equal(1))
-			Expect(httpClient.SavedRequest.URL.Query().Get("artist")).To(Equal("U2"))
+		})
+
+		Context("MBID non existent in Last.fm", func() {
+			It("calls again when the response is artist == [unknown]", func() {
+				f, _ := os.Open("tests/fixtures/lastfm.artist.gettoptracks.unknown.json")
+				httpClient.Res = http.Response{Body: f, StatusCode: 200}
+				_, _ = agent.GetArtistTopSongs(ctx, "123", "U2", "mbid-1234", 2)
+				Expect(httpClient.RequestCount).To(Equal(2))
+				Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(BeEmpty())
+			})
+			It("calls again when last.fm returns an error 6", func() {
+				httpClient.Res = http.Response{Body: io.NopCloser(bytes.NewBufferString(lastfmError6)), StatusCode: 200}
+				_, _ = agent.GetArtistTopSongs(ctx, "123", "U2", "mbid-1234", 2)
+				Expect(httpClient.RequestCount).To(Equal(2))
+				Expect(httpClient.SavedRequest.URL.Query().Get("mbid")).To(BeEmpty())
+			})
 		})
 	})
 
@@ -188,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",
 			}
 		})
 
@@ -216,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() {
@@ -243,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 (
@@ -59,10 +59,11 @@ func (c *client) albumGetInfo(ctx context.Context, name string, artist string, m
 	return &response.Album, nil
 }
 
-func (c *client) artistGetInfo(ctx context.Context, name string) (*Artist, error) {
+func (c *client) artistGetInfo(ctx context.Context, name string, mbid string) (*Artist, error) {
 	params := url.Values{}
 	params.Add("method", "artist.getInfo")
 	params.Add("artist", name)
+	params.Add("mbid", mbid)
 	params.Add("lang", c.lang)
 	response, err := c.makeRequest(ctx, http.MethodGet, params, false)
 	if err != nil {
@@ -71,10 +72,11 @@ func (c *client) artistGetInfo(ctx context.Context, name string) (*Artist, error
 	return &response.Artist, nil
 }
 
-func (c *client) artistGetSimilar(ctx context.Context, name string, limit int) (*SimilarArtists, error) {
+func (c *client) artistGetSimilar(ctx context.Context, name string, mbid string, limit int) (*SimilarArtists, error) {
 	params := url.Values{}
 	params.Add("method", "artist.getSimilar")
 	params.Add("artist", name)
+	params.Add("mbid", mbid)
 	params.Add("limit", strconv.Itoa(limit))
 	response, err := c.makeRequest(ctx, http.MethodGet, params, false)
 	if err != nil {
@@ -83,10 +85,11 @@ func (c *client) artistGetSimilar(ctx context.Context, name string, limit int) (
 	return &response.SimilarArtists, nil
 }
 
-func (c *client) artistGetTopTracks(ctx context.Context, name string, limit int) (*TopTracks, error) {
+func (c *client) artistGetTopTracks(ctx context.Context, name string, mbid string, limit int) (*TopTracks, error) {
 	params := url.Values{}
 	params.Add("method", "artist.getTopTracks")
 	params.Add("artist", name)
+	params.Add("mbid", mbid)
 	params.Add("limit", strconv.Itoa(limit))
 	response, err := c.makeRequest(ctx, http.MethodGet, params, false)
 	if err != nil {

core/agents/lastfm/client_test.go

@@ -42,10 +42,10 @@ var _ = Describe("client", func() {
 			f, _ := os.Open("tests/fixtures/lastfm.artist.getinfo.json")
 			httpClient.Res = http.Response{Body: f, StatusCode: 200}
 
-			artist, err := client.artistGetInfo(context.Background(), "U2")
+			artist, err := client.artistGetInfo(context.Background(), "U2", "123")
 			Expect(err).To(BeNil())
 			Expect(artist.Name).To(Equal("U2"))
-			Expect(httpClient.SavedRequest.URL.String()).To(Equal(apiBaseUrl + "?api_key=API_KEY&artist=U2&format=json&lang=pt&method=artist.getInfo"))
+			Expect(httpClient.SavedRequest.URL.String()).To(Equal(apiBaseUrl + "?api_key=API_KEY&artist=U2&format=json&lang=pt&mbid=123&method=artist.getInfo"))
 		})
 
 		It("fails if Last.fm returns an http status != 200", func() {
@@ -54,7 +54,7 @@ var _ = Describe("client", func() {
 				StatusCode: 500,
 			}
 
-			_, err := client.artistGetInfo(context.Background(), "U2")
+			_, err := client.artistGetInfo(context.Background(), "U2", "123")
 			Expect(err).To(MatchError("last.fm http status: (500)"))
 		})
 
@@ -64,7 +64,7 @@ var _ = Describe("client", func() {
 				StatusCode: 400,
 			}
 
-			_, err := client.artistGetInfo(context.Background(), "U2")
+			_, err := client.artistGetInfo(context.Background(), "U2", "123")
 			Expect(err).To(MatchError(&lastFMError{Code: 3, Message: "Invalid Method - No method with that name in this package"}))
 		})
 
@@ -74,14 +74,14 @@ var _ = Describe("client", func() {
 				StatusCode: 200,
 			}
 
-			_, err := client.artistGetInfo(context.Background(), "U2")
+			_, err := client.artistGetInfo(context.Background(), "U2", "123")
 			Expect(err).To(MatchError(&lastFMError{Code: 6, Message: "The artist you supplied could not be found"}))
 		})
 
 		It("fails if HttpClient.Do() returns error", func() {
 			httpClient.Err = errors.New("generic error")
 
-			_, err := client.artistGetInfo(context.Background(), "U2")
+			_, err := client.artistGetInfo(context.Background(), "U2", "123")
 			Expect(err).To(MatchError("generic error"))
 		})
 
@@ -91,7 +91,7 @@ var _ = Describe("client", func() {
 				StatusCode: 200,
 			}
 
-			_, err := client.artistGetInfo(context.Background(), "U2")
+			_, err := client.artistGetInfo(context.Background(), "U2", "123")
 			Expect(err).To(MatchError("invalid character '<' looking for beginning of value"))
 		})
 
@@ -102,10 +102,10 @@ var _ = Describe("client", func() {
 			f, _ := os.Open("tests/fixtures/lastfm.artist.getsimilar.json")
 			httpClient.Res = http.Response{Body: f, StatusCode: 200}
 
-			similar, err := client.artistGetSimilar(context.Background(), "U2", 2)
+			similar, err := client.artistGetSimilar(context.Background(), "U2", "123", 2)
 			Expect(err).To(BeNil())
 			Expect(len(similar.Artists)).To(Equal(2))
-			Expect(httpClient.SavedRequest.URL.String()).To(Equal(apiBaseUrl + "?api_key=API_KEY&artist=U2&format=json&limit=2&method=artist.getSimilar"))
+			Expect(httpClient.SavedRequest.URL.String()).To(Equal(apiBaseUrl + "?api_key=API_KEY&artist=U2&format=json&limit=2&mbid=123&method=artist.getSimilar"))
 		})
 	})
 
@@ -114,10 +114,10 @@ var _ = Describe("client", func() {
 			f, _ := os.Open("tests/fixtures/lastfm.artist.gettoptracks.json")
 			httpClient.Res = http.Response{Body: f, StatusCode: 200}
 
-			top, err := client.artistGetTopTracks(context.Background(), "U2", 2)
+			top, err := client.artistGetTopTracks(context.Background(), "U2", "123", 2)
 			Expect(err).To(BeNil())
 			Expect(len(top.Track)).To(Equal(2))
-			Expect(httpClient.SavedRequest.URL.String()).To(Equal(apiBaseUrl + "?api_key=API_KEY&artist=U2&format=json&limit=2&method=artist.getTopTracks"))
+			Expect(httpClient.SavedRequest.URL.String()).To(Equal(apiBaseUrl + "?api_key=API_KEY&artist=U2&format=json&limit=2&mbid=123&method=artist.getTopTracks"))
 		})
 	})
 

core/agents/listenbrainz/agent.go

@@ -11,8 +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/slice"
+	"github.com/navidrome/navidrome/utils"
 )
 
 const (
@@ -36,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
 }
@@ -46,12 +45,6 @@ func (l *listenBrainzAgent) AgentName() string {
 }
 
 func (l *listenBrainzAgent) formatListen(track *model.MediaFile) listenInfo {
-	artistMBIDs := slice.Map(track.Participants[model.RoleArtist], func(p model.Participant) string {
-		return p.MbzArtistID
-	})
-	artistNames := slice.Map(track.Participants[model.RoleArtist], func(p model.Participant) string {
-		return p.Name
-	})
 	li := listenInfo{
 		TrackMetadata: trackMetadata{
 			ArtistName:  track.Artist,
@@ -61,12 +54,9 @@ func (l *listenBrainzAgent) formatListen(track *model.MediaFile) listenInfo {
 				SubmissionClient:        consts.AppName,
 				SubmissionClientVersion: consts.Version,
 				TrackNumber:             track.TrackNumber,
-				ArtistNames:             artistNames,
-				ArtistMBIDs:             artistMBIDs,
-				RecordingMBID:           track.MbzRecordingID,
-				ReleaseMBID:             track.MbzAlbumID,
-				ReleaseGroupMBID:        track.MbzReleaseGroupID,
-				DurationMs:              int(track.Duration * 1000),
+				ArtistMbzIDs:            []string{track.MbzArtistID},
+				TrackMbzID:              track.MbzTrackID,
+				ReleaseMbID:             track.MbzAlbumID,
 			},
 		},
 	}
@@ -76,14 +66,14 @@ func (l *listenBrainzAgent) formatListen(track *model.MediaFile) listenInfo {
 func (l *listenBrainzAgent) NowPlaying(ctx context.Context, userId string, track *model.MediaFile) error {
 	sk, err := l.sessionKeys.Get(ctx, userId)
 	if err != nil || sk == "" {
-		return errors.Join(err, scrobbler.ErrNotAuthorized)
+		return scrobbler.ErrNotAuthorized
 	}
 
 	li := l.formatListen(track)
 	err = l.client.updateNowPlaying(ctx, sk, li)
 	if err != nil {
 		log.Warn(ctx, "ListenBrainz updateNowPlaying returned error", "track", track.Title, err)
-		return errors.Join(err, scrobbler.ErrUnrecoverable)
+		return scrobbler.ErrUnrecoverable
 	}
 	return nil
 }
@@ -91,7 +81,7 @@ func (l *listenBrainzAgent) NowPlaying(ctx context.Context, userId string, track
 func (l *listenBrainzAgent) Scrobble(ctx context.Context, userId string, s scrobbler.Scrobble) error {
 	sk, err := l.sessionKeys.Get(ctx, userId)
 	if err != nil || sk == "" {
-		return errors.Join(err, scrobbler.ErrNotAuthorized)
+		return scrobbler.ErrNotAuthorized
 	}
 
 	li := l.formatListen(&s.MediaFile)
@@ -105,12 +95,12 @@ func (l *listenBrainzAgent) Scrobble(ctx context.Context, userId string, s scrob
 	isListenBrainzError := errors.As(err, &lbErr)
 	if !isListenBrainzError {
 		log.Warn(ctx, "ListenBrainz Scrobble returned HTTP error", "track", s.Title, err)
-		return errors.Join(err, scrobbler.ErrRetryLater)
+		return scrobbler.ErrRetryLater
 	}
 	if lbErr.Code == 500 || lbErr.Code == 503 {
-		return errors.Join(err, scrobbler.ErrRetryLater)
+		return scrobbler.ErrRetryLater
 	}
-	return errors.Join(err, scrobbler.ErrUnrecoverable)
+	return scrobbler.ErrUnrecoverable
 }
 
 func (l *listenBrainzAgent) IsAuthorized(ctx context.Context, userId string) bool {

core/agents/listenbrainz/agent_test.go

@@ -32,26 +32,23 @@ 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",
-			MbzReleaseGroupID: "mbz-789",
-			Duration:          142.2,
-			Participants: map[model.Role]model.ParticipantList{
-				model.RoleArtist: []model.Participant{
-					{Artist: model.Artist{ID: "ar-1", Name: "Artist 1", MbzArtistID: "mbz-111"}},
-					{Artist: model.Artist{ID: "ar-2", Name: "Artist 2", MbzArtistID: "mbz-222"}},
-				},
-			},
+			ID:          "123",
+			Title:       "Track Title",
+			Album:       "Track Album",
+			Artist:      "Track Artist",
+			TrackNumber: 1,
+			MbzTrackID:  "mbz-123",
+			MbzAlbumID:  "mbz-456",
+			MbzArtistID: "mbz-789",
 		}
 	})
 
 	Describe("formatListen", func() {
 		It("constructs the listenInfo properly", func() {
+			var idArtistId = func(element interface{}) string {
+				return element.(string)
+			}
+
 			lr := agent.formatListen(track)
 			Expect(lr).To(MatchAllFields(Fields{
 				"ListenedAt": Equal(0),
@@ -63,12 +60,11 @@ var _ = Describe("listenBrainzAgent", func() {
 						"SubmissionClient":        Equal(consts.AppName),
 						"SubmissionClientVersion": Equal(consts.Version),
 						"TrackNumber":             Equal(track.TrackNumber),
-						"RecordingMBID":           Equal(track.MbzRecordingID),
-						"ReleaseMBID":             Equal(track.MbzAlbumID),
-						"ReleaseGroupMBID":        Equal(track.MbzReleaseGroupID),
-						"ArtistNames":             ConsistOf("Artist 1", "Artist 2"),
-						"ArtistMBIDs":             ConsistOf("mbz-111", "mbz-222"),
-						"DurationMs":              Equal(142200),
+						"TrackMbzID":              Equal(track.MbzTrackID),
+						"ReleaseMbID":             Equal(track.MbzAlbumID),
+						"ArtistMbzIDs": MatchAllElements(idArtistId, Elements{
+							"mbz-789": Equal(track.MbzArtistID),
+						}),
 					}),
 				}),
 			}))

core/agents/listenbrainz/client.go

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

core/agents/listenbrainz/client_test.go

@@ -74,12 +74,10 @@ var _ = Describe("client", func() {
 					TrackName:   "Track Title",
 					ReleaseName: "Track Album",
 					AdditionalInfo: additionalInfo{
-						TrackNumber:   1,
-						ArtistNames:   []string{"Artist 1", "Artist 2"},
-						ArtistMBIDs:   []string{"mbz-789", "mbz-012"},
-						RecordingMBID: "mbz-123",
-						ReleaseMBID:   "mbz-456",
-						DurationMs:    142200,
+						TrackNumber:  1,
+						TrackMbzID:   "mbz-123",
+						ArtistMbzIDs: []string{"mbz-789"},
+						ReleaseMbID:  "mbz-456",
 					},
 				},
 			}

core/agents/mcp/mcp-server/.gitignore

@@ -1,2 +0,0 @@
-mcp-server
-*.wasm

core/agents/mcp/mcp-server/README.md

@@ -1,17 +0,0 @@
-# MCP Server (Proof of Concept)
-
-This directory contains the source code for the `mcp-server`, a simple server implementation used as a proof-of-concept (PoC) for the Navidrome Plugin/MCP agent system.
-
-This server is designed to be compiled into a WebAssembly (WASM) module (`.wasm`) using the `wasip1` target.
-
-## Compilation
-
-To compile the server into a WASM module (`mcp-server.wasm`), navigate to this directory in your terminal and run the following command:
-
-```bash
-CGO_ENABLED=0 GOOS=wasip1 GOARCH=wasm go build -o mcp-server.wasm .
-```
-
-**Note:** This command compiles the WASM module _without_ the `netgo` tag. Networking operations (like HTTP requests) are expected to be handled by host functions provided by the embedding application (Navidrome's `MCPAgent`) rather than directly within the WASM module itself.
-
-Place the resulting `mcp-server.wasm` file where the Navidrome `MCPAgent` expects it (currently configured via the `McpServerPath` constant in `core/agents/mcp/mcp_agent.go`).

core/agents/mcp/mcp-server/dbpedia.go

@@ -1,172 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/json" // Reusing ErrNotFound from wikidata.go (implicitly via main)
-	"fmt"
-	"log"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-)
-
-const dbpediaEndpoint = "https://dbpedia.org/sparql"
-
-// Default timeout for DBpedia requests
-const defaultDbpediaTimeout = 20 * time.Second
-
-// Can potentially reuse SparqlResult, SparqlBindings, SparqlValue from wikidata.go
-// if the structure is identical. Assuming it is for now.
-
-// GetArtistBioFromDBpedia queries DBpedia for an artist's abstract using their name.
-func GetArtistBioFromDBpedia(fetcher Fetcher, ctx context.Context, name string) (string, error) {
-	log.Printf("[MCP] Debug: GetArtistBioFromDBpedia called for name: %s", name)
-	if name == "" {
-		log.Printf("[MCP] Error: GetArtistBioFromDBpedia requires a name.")
-		return "", fmt.Errorf("name is required to query DBpedia by name")
-	}
-
-	// Escape name for SPARQL query literal
-	escapedName := strings.ReplaceAll(name, "\"", "\\\"")
-
-	// SPARQL query using DBpedia ontology (dbo)
-	// Prefixes are recommended but can be omitted if endpoint resolves them.
-	// Searching case-insensitively on the label.
-	// Filtering for dbo:MusicalArtist or dbo:Band.
-	// Selecting the English abstract.
-	sparqlQuery := fmt.Sprintf(`
-PREFIX dbo: <http://dbpedia.org/ontology/>
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT DISTINCT ?abstract WHERE {
-  ?artist rdfs:label ?nameLabel .
-  FILTER(LCASE(STR(?nameLabel)) = LCASE("%s") && LANG(?nameLabel) = "en")
-  
-  # Ensure it's a musical artist or band
-  { ?artist rdf:type dbo:MusicalArtist } UNION { ?artist rdf:type dbo:Band }
-  
-  ?artist dbo:abstract ?abstract .
-  FILTER(LANG(?abstract) = "en")
-} LIMIT 1`, escapedName)
-
-	// Prepare and execute HTTP request
-	queryValues := url.Values{}
-	queryValues.Set("query", sparqlQuery)
-	queryValues.Set("format", "application/sparql-results+json") // DBpedia standard format
-
-	reqURL := fmt.Sprintf("%s?%s", dbpediaEndpoint, queryValues.Encode())
-	log.Printf("[MCP] Debug: DBpedia Bio Request URL: %s", reqURL)
-
-	timeout := defaultDbpediaTimeout
-	if deadline, ok := ctx.Deadline(); ok {
-		timeout = time.Until(deadline)
-	}
-	log.Printf("[MCP] Debug: Fetching from DBpedia with timeout: %v", timeout)
-
-	statusCode, bodyBytes, err := fetcher.Fetch(ctx, "GET", reqURL, nil, timeout)
-	if err != nil {
-		log.Printf("[MCP] Error: Fetcher failed for DBpedia bio request (name: '%s'): %v", name, err)
-		return "", fmt.Errorf("failed to execute DBpedia request: %w", err)
-	}
-
-	if statusCode != http.StatusOK {
-		log.Printf("[MCP] Error: DBpedia bio query failed for name '%s' with status %d: %s", name, statusCode, string(bodyBytes))
-		return "", fmt.Errorf("DBpedia query failed with status %d: %s", statusCode, string(bodyBytes))
-	}
-	log.Printf("[MCP] Debug: DBpedia bio query successful (status %d), %d bytes received.", statusCode, len(bodyBytes))
-
-	var result SparqlResult
-	if err := json.Unmarshal(bodyBytes, &result); err != nil {
-		// Try reading the raw body for debugging if JSON parsing fails
-		// (Seek back to the beginning might be needed if already read for error)
-		// For simplicity, just return the parsing error now.
-		log.Printf("[MCP] Error: Failed to decode DBpedia bio response for name '%s': %v", name, err)
-		return "", fmt.Errorf("failed to decode DBpedia response: %w", err)
-	}
-
-	// Extract the abstract
-	if len(result.Results.Bindings) > 0 {
-		if abstractVal, ok := result.Results.Bindings[0]["abstract"]; ok {
-			log.Printf("[MCP] Debug: Found DBpedia abstract for '%s'.", name)
-			return abstractVal.Value, nil
-		}
-	}
-
-	// Use the shared ErrNotFound
-	log.Printf("[MCP] Warn: No abstract found on DBpedia for name '%s'.", name)
-	return "", ErrNotFound
-}
-
-// GetArtistWikipediaURLFromDBpedia queries DBpedia for an artist's Wikipedia URL using their name.
-func GetArtistWikipediaURLFromDBpedia(fetcher Fetcher, ctx context.Context, name string) (string, error) {
-	log.Printf("[MCP] Debug: GetArtistWikipediaURLFromDBpedia called for name: %s", name)
-	if name == "" {
-		log.Printf("[MCP] Error: GetArtistWikipediaURLFromDBpedia requires a name.")
-		return "", fmt.Errorf("name is required to query DBpedia by name for URL")
-	}
-
-	escapedName := strings.ReplaceAll(name, "\"", "\\\"")
-
-	// SPARQL query using foaf:isPrimaryTopicOf
-	sparqlQuery := fmt.Sprintf(`
-PREFIX dbo: <http://dbpedia.org/ontology/>
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-SELECT DISTINCT ?wikiPage WHERE {
-  ?artist rdfs:label ?nameLabel .
-  FILTER(LCASE(STR(?nameLabel)) = LCASE("%s") && LANG(?nameLabel) = "en")
-
-  { ?artist rdf:type dbo:MusicalArtist } UNION { ?artist rdf:type dbo:Band }
-
-  ?artist foaf:isPrimaryTopicOf ?wikiPage .
-  # Ensure it links to the English Wikipedia
-  FILTER(STRSTARTS(STR(?wikiPage), "https://en.wikipedia.org/"))
-} LIMIT 1`, escapedName)
-
-	// Prepare and execute HTTP request (similar structure to bio query)
-	queryValues := url.Values{}
-	queryValues.Set("query", sparqlQuery)
-	queryValues.Set("format", "application/sparql-results+json")
-
-	reqURL := fmt.Sprintf("%s?%s", dbpediaEndpoint, queryValues.Encode())
-	log.Printf("[MCP] Debug: DBpedia URL Request URL: %s", reqURL)
-
-	timeout := defaultDbpediaTimeout
-	if deadline, ok := ctx.Deadline(); ok {
-		timeout = time.Until(deadline)
-	}
-	log.Printf("[MCP] Debug: Fetching DBpedia URL with timeout: %v", timeout)
-
-	statusCode, bodyBytes, err := fetcher.Fetch(ctx, "GET", reqURL, nil, timeout)
-	if err != nil {
-		log.Printf("[MCP] Error: Fetcher failed for DBpedia URL request (name: '%s'): %v", name, err)
-		return "", fmt.Errorf("failed to execute DBpedia URL request: %w", err)
-	}
-
-	if statusCode != http.StatusOK {
-		log.Printf("[MCP] Error: DBpedia URL query failed for name '%s' with status %d: %s", name, statusCode, string(bodyBytes))
-		return "", fmt.Errorf("DBpedia URL query failed with status %d: %s", statusCode, string(bodyBytes))
-	}
-	log.Printf("[MCP] Debug: DBpedia URL query successful (status %d), %d bytes received.", statusCode, len(bodyBytes))
-
-	var result SparqlResult
-	if err := json.Unmarshal(bodyBytes, &result); err != nil {
-		log.Printf("[MCP] Error: Failed to decode DBpedia URL response for name '%s': %v", name, err)
-		return "", fmt.Errorf("failed to decode DBpedia URL response: %w", err)
-	}
-
-	// Extract the URL
-	if len(result.Results.Bindings) > 0 {
-		if pageVal, ok := result.Results.Bindings[0]["wikiPage"]; ok {
-			log.Printf("[MCP] Debug: Found DBpedia Wikipedia URL for '%s': %s", name, pageVal.Value)
-			return pageVal.Value, nil
-		}
-	}
-
-	log.Printf("[MCP] Warn: No Wikipedia URL found on DBpedia for name '%s'.", name)
-	return "", ErrNotFound
-}

core/agents/mcp/mcp-server/fetch.go

@@ -1,16 +0,0 @@
-package main
-
-import (
-	"context"
-	"time"
-)
-
-// Fetcher defines an interface for making HTTP requests, abstracting
-// over native net/http and WASM host functions.
-type Fetcher interface {
-	// Fetch performs an HTTP request.
-	// Returns the status code, response body, and any error encountered.
-	// Note: Implementations should aim to return the body even on non-2xx status codes
-	// if the body was successfully read, allowing callers to potentially inspect it.
-	Fetch(ctx context.Context, method, url string, requestBody []byte, timeout time.Duration) (statusCode int, responseBody []byte, err error)
-}

core/agents/mcp/mcp-server/fetch_native.go

@@ -1,83 +0,0 @@
-//go:build !wasm
-
-package main
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"time"
-)
-
-type nativeFetcher struct {
-	// We could hold a shared client, but creating one per request
-	// with the specific timeout is simpler for this adapter.
-}
-
-// Ensure nativeFetcher implements Fetcher
-var _ Fetcher = (*nativeFetcher)(nil)
-
-// NewFetcher creates the default native HTTP fetcher.
-func NewFetcher() Fetcher {
-	log.Println("[MCP] Debug: Using Native HTTP fetcher")
-	return &nativeFetcher{}
-}
-
-func (nf *nativeFetcher) Fetch(ctx context.Context, method, urlStr string, requestBody []byte, timeout time.Duration) (statusCode int, responseBody []byte, err error) {
-	log.Printf("[MCP] Debug: Native Fetch: Method=%s, URL=%s, Timeout=%v", method, urlStr, timeout)
-	// Create a client with the specific timeout for this request
-	client := &http.Client{Timeout: timeout}
-
-	var bodyReader io.Reader
-	if requestBody != nil {
-		bodyReader = bytes.NewReader(requestBody)
-	}
-
-	req, err := http.NewRequestWithContext(ctx, method, urlStr, bodyReader)
-	if err != nil {
-		log.Printf("[MCP] Error: Native Fetch failed to create request: %v", err)
-		return 0, nil, fmt.Errorf("failed to create native request: %w", err)
-	}
-
-	// Set headers consistent with previous direct client usage
-	req.Header.Set("Accept", "application/sparql-results+json, application/json")
-	// Note: Specific User-Agent was set per call site previously, might need adjustment
-	// if different user agents are desired per service.
-	req.Header.Set("User-Agent", "MCPGoServerExample/0.1 (Native Client)")
-
-	log.Printf("[MCP] Debug: Native Fetch executing request...")
-	resp, err := client.Do(req)
-	if err != nil {
-		// Let context cancellation errors pass through
-		if ctx.Err() != nil {
-			log.Printf("[MCP] Debug: Native Fetch context cancelled: %v", ctx.Err())
-			return 0, nil, ctx.Err()
-		}
-		log.Printf("[MCP] Error: Native Fetch HTTP request failed: %v", err)
-		return 0, nil, fmt.Errorf("native HTTP request failed: %w", err)
-	}
-	defer resp.Body.Close()
-
-	statusCode = resp.StatusCode
-	log.Printf("[MCP] Debug: Native Fetch received status code: %d", statusCode)
-	responseBodyBytes, readErr := io.ReadAll(resp.Body)
-	if readErr != nil {
-		// Still return status code if body read fails
-		log.Printf("[MCP] Error: Native Fetch failed to read response body: %v", readErr)
-		return statusCode, nil, fmt.Errorf("failed to read native response body: %w", readErr)
-	}
-	responseBody = responseBodyBytes
-	log.Printf("[MCP] Debug: Native Fetch read %d bytes from response body", len(responseBodyBytes))
-
-	// Mimic behavior of returning body even on error status
-	if statusCode < 200 || statusCode >= 300 {
-		log.Printf("[MCP] Warn: Native Fetch request failed with status %d. Body: %s", statusCode, string(responseBody))
-		return statusCode, responseBody, fmt.Errorf("native request failed with status %d", statusCode)
-	}
-
-	log.Printf("[MCP] Debug: Native Fetch completed successfully.")
-	return statusCode, responseBody, nil
-}

core/agents/mcp/mcp-server/fetch_wasm.go

@@ -1,171 +0,0 @@
-//go:build wasm
-
-package main
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"log"
-	"time"
-	"unsafe"
-)
-
-// --- WASM Host Function Import --- (Copied from user prompt)
-
-//go:wasmimport env http_fetch
-//go:noescape
-func http_fetch(
-	// Request details
-	urlPtr, urlLen uint32,
-	methodPtr, methodLen uint32,
-	bodyPtr, bodyLen uint32,
-	timeoutMillis uint32,
-	// Result pointers
-	resultStatusPtr uint32,
-	resultBodyPtr uint32, resultBodyCapacity uint32, resultBodyLenPtr uint32,
-	resultErrorPtr uint32, resultErrorCapacity uint32, resultErrorLenPtr uint32,
-) uint32 // 0 on success, 1 on host error
-
-// --- Go Wrapper for Host Function --- (Copied from user prompt)
-
-const (
-	defaultResponseBodyCapacity  = 1024 * 10 // 10 KB for response body
-	defaultResponseErrorCapacity = 1024      // 1 KB for error messages
-)
-
-// callHostHTTPFetch provides a Go-friendly interface to the http_fetch host function.
-func callHostHTTPFetch(ctx context.Context, method, url string, requestBody []byte, timeout time.Duration) (statusCode int, responseBody []byte, err error) {
-	log.Printf("[MCP] Debug: WASM Fetch (Host Call): Method=%s, URL=%s, Timeout=%v", method, url, timeout)
-
-	// --- Prepare Input Pointers ---
-	urlPtr, urlLen := stringToPtr(url)
-	methodPtr, methodLen := stringToPtr(method)
-	bodyPtr, bodyLen := bytesToPtr(requestBody)
-
-	timeoutMillis := uint32(timeout.Milliseconds())
-	if timeoutMillis <= 0 {
-		timeoutMillis = 30000 // Default 30 seconds if 0 or negative
-	}
-	if timeout == 0 {
-		// Handle case where context might already be cancelled
-		select {
-		case <-ctx.Done():
-			log.Printf("[MCP] Debug: WASM Fetch context cancelled before host call: %v", ctx.Err())
-			return 0, nil, ctx.Err()
-		default:
-		}
-	}
-
-	// --- Prepare Output Buffers and Pointers ---
-	resultBodyBuffer := make([]byte, defaultResponseBodyCapacity)
-	resultErrorBuffer := make([]byte, defaultResponseErrorCapacity)
-
-	resultStatus := uint32(0)
-	resultBodyLen := uint32(0)
-	resultErrorLen := uint32(0)
-
-	resultStatusPtr := &resultStatus
-	resultBodyPtr, resultBodyCapacity := bytesToPtr(resultBodyBuffer)
-	resultBodyLenPtr := &resultBodyLen
-	resultErrorPtr, resultErrorCapacity := bytesToPtr(resultErrorBuffer)
-	resultErrorLenPtr := &resultErrorLen
-
-	// --- Call the Host Function ---
-	log.Printf("[MCP] Debug: WASM Fetch calling host function http_fetch...")
-	hostReturnCode := http_fetch(
-		urlPtr, urlLen,
-		methodPtr, methodLen,
-		bodyPtr, bodyLen,
-		timeoutMillis,
-		uint32(uintptr(unsafe.Pointer(resultStatusPtr))),
-		resultBodyPtr, resultBodyCapacity, uint32(uintptr(unsafe.Pointer(resultBodyLenPtr))),
-		resultErrorPtr, resultErrorCapacity, uint32(uintptr(unsafe.Pointer(resultErrorLenPtr))),
-	)
-	log.Printf("[MCP] Debug: WASM Fetch host function returned code: %d", hostReturnCode)
-
-	// --- Process Results ---
-	if hostReturnCode != 0 {
-		err = errors.New("host function http_fetch failed internally")
-		log.Printf("[MCP] Error: WASM Fetch host function failed: %v", err)
-		return 0, nil, err
-	}
-
-	statusCode = int(resultStatus)
-	log.Printf("[MCP] Debug: WASM Fetch received status code from host: %d", statusCode)
-
-	if resultErrorLen > 0 {
-		actualErrorLen := min(resultErrorLen, resultErrorCapacity)
-		errMsg := string(resultErrorBuffer[:actualErrorLen])
-		err = errors.New(errMsg)
-		log.Printf("[MCP] Error: WASM Fetch received error from host: %s", errMsg)
-		return statusCode, nil, err
-	}
-
-	if resultBodyLen > 0 {
-		actualBodyLen := min(resultBodyLen, resultBodyCapacity)
-		responseBody = make([]byte, actualBodyLen)
-		copy(responseBody, resultBodyBuffer[:actualBodyLen])
-		log.Printf("[MCP] Debug: WASM Fetch received %d bytes from host body (reported size: %d)", actualBodyLen, resultBodyLen)
-
-		if resultBodyLen > resultBodyCapacity {
-			err = fmt.Errorf("response body truncated: received %d bytes, but actual size was %d", actualBodyLen, resultBodyLen)
-			log.Printf("[MCP] Warn: WASM Fetch %v", err)
-			return statusCode, responseBody, err // Return truncated body with error
-		}
-		log.Printf("[MCP] Debug: WASM Fetch completed successfully.")
-		return statusCode, responseBody, nil
-	}
-
-	log.Printf("[MCP] Debug: WASM Fetch completed successfully (no body, no error).")
-	return statusCode, nil, nil
-}
-
-// --- Pointer Helper Functions --- (Copied from user prompt)
-
-func stringToPtr(s string) (ptr uint32, length uint32) {
-	if len(s) == 0 {
-		return 0, 0
-	}
-	// Use unsafe.StringData for potentially safer pointer access in modern Go
-	// Needs Go 1.20+
-	// return uint32(uintptr(unsafe.Pointer(unsafe.StringData(s)))), uint32(len(s))
-	// Fallback to slice conversion for broader compatibility / if StringData isn't available
-	buf := []byte(s)
-	return bytesToPtr(buf)
-}
-
-func bytesToPtr(b []byte) (ptr uint32, length uint32) {
-	if len(b) == 0 {
-		return 0, 0
-	}
-	// Use unsafe.SliceData for potentially safer pointer access in modern Go
-	// Needs Go 1.20+
-	// return uint32(uintptr(unsafe.Pointer(unsafe.SliceData(b)))), uint32(len(b))
-	// Fallback for broader compatibility
-	return uint32(uintptr(unsafe.Pointer(&b[0]))), uint32(len(b))
-}
-
-func min(a, b uint32) uint32 {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-// --- WASM Fetcher Implementation ---
-type wasmFetcher struct{}
-
-// Ensure wasmFetcher implements Fetcher
-var _ Fetcher = (*wasmFetcher)(nil)
-
-// NewFetcher creates the WASM host function fetcher.
-func NewFetcher() Fetcher {
-	log.Println("[MCP] Debug: Using WASM host fetcher")
-	return &wasmFetcher{}
-}
-
-func (wf *wasmFetcher) Fetch(ctx context.Context, method, url string, requestBody []byte, timeout time.Duration) (statusCode int, responseBody []byte, err error) {
-	// Directly call the wrapper which now contains logging
-	return callHostHTTPFetch(ctx, method, url, requestBody, timeout)
-}

core/agents/mcp/mcp-server/go.mod

@@ -1,19 +0,0 @@
-module mcp-server
-
-go 1.24.2
-
-require github.com/metoro-io/mcp-golang v0.11.0
-
-require (
-	github.com/bahlo/generic-list-go v0.2.0 // indirect
-	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/invopop/jsonschema v0.12.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/tidwall/gjson v1.18.0 // indirect
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.1 // indirect
-	github.com/tidwall/sjson v1.2.5 // indirect
-	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)

core/agents/mcp/mcp-server/go.sum

@@ -1,34 +0,0 @@
-github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
-github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
-github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
-github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/invopop/jsonschema v0.12.0 h1:6ovsNSuvn9wEQVOyc72aycBMVQFKz7cPdMJn10CvzRI=
-github.com/invopop/jsonschema v0.12.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/metoro-io/mcp-golang v0.11.0 h1:1k+VSE9QaeMTLn0gJ3FgE/DcjsCBsLFnz5eSFbgXUiI=
-github.com/metoro-io/mcp-golang v0.11.0/go.mod h1:ifLP9ZzKpN1UqFWNTpAHOqSvNkMK6b7d1FSZ5Lu0lN0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
-github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
-github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
-github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
-github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
-github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
-github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

core/agents/mcp/mcp-server/main.go

@@ -1,289 +0,0 @@
-package main
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"log"
-	"net/url"
-	"os"
-
-	mcp_golang "github.com/metoro-io/mcp-golang"
-	"github.com/metoro-io/mcp-golang/transport/stdio"
-)
-
-type Content struct {
-	Title       string  `json:"title" jsonschema:"required,description=The title to submit"`
-	Description *string `json:"description" jsonschema:"description=The description to submit"`
-}
-type MyFunctionsArguments struct {
-	Submitter string  `json:"submitter" jsonschema:"required,description=The name of the thing calling this tool (openai, google, claude, etc)"`
-	Content   Content `json:"content" jsonschema:"required,description=The content of the message"`
-}
-
-type ArtistBiography struct {
-	ID   string `json:"id" jsonschema:"required,description=The id of the artist"`
-	Name string `json:"name" jsonschema:"required,description=The name of the artist"`
-	MBID string `json:"mbid" jsonschema:"description=The mbid of the artist"`
-}
-
-type ArtistURLArgs struct {
-	ID   string `json:"id" jsonschema:"required,description=The id of the artist"`
-	Name string `json:"name" jsonschema:"required,description=The name of the artist"`
-	MBID string `json:"mbid" jsonschema:"description=The mbid of the artist"`
-}
-
-func main() {
-	log.Println("[MCP] Starting mcp-server...")
-	done := make(chan struct{})
-
-	// Create the appropriate fetcher (native or WASM based on build tags)
-	log.Printf("[MCP] Debug: Creating fetcher...")
-	fetcher := NewFetcher()
-	log.Printf("[MCP] Debug: Fetcher created successfully.")
-
-	// --- Command Line Flag Handling ---
-	nameFlag := flag.String("name", "", "Artist name to query directly")
-	mbidFlag := flag.String("mbid", "", "Artist MBID to query directly")
-	flag.Parse()
-
-	if *nameFlag != "" || *mbidFlag != "" {
-		log.Printf("[MCP] Debug: Running tools directly via CLI flags (Name: '%s', MBID: '%s')", *nameFlag, *mbidFlag)
-		fmt.Println("--- Running Tools Directly ---")
-
-		// Call getArtistBiography
-		fmt.Printf("Calling get_artist_biography (Name: '%s', MBID: '%s')...\n", *nameFlag, *mbidFlag)
-		if *mbidFlag == "" && *nameFlag == "" {
-			fmt.Println("  Error: --mbid or --name is required for get_artist_biography")
-		} else {
-			// Use context.Background for CLI calls
-			log.Printf("[MCP] Debug: CLI calling getArtistBiography...")
-			bio, bioErr := getArtistBiography(fetcher, context.Background(), "cli", *nameFlag, *mbidFlag)
-			if bioErr != nil {
-				fmt.Printf("  Error: %v\n", bioErr)
-				log.Printf("[MCP] Error: CLI getArtistBiography failed: %v", bioErr)
-			} else {
-				fmt.Printf("  Result: %s\n", bio)
-				log.Printf("[MCP] Debug: CLI getArtistBiography succeeded.")
-			}
-		}
-
-		// Call getArtistURL
-		fmt.Printf("Calling get_artist_url (Name: '%s', MBID: '%s')...\n", *nameFlag, *mbidFlag)
-		if *mbidFlag == "" && *nameFlag == "" {
-			fmt.Println("  Error: --mbid or --name is required for get_artist_url")
-		} else {
-			log.Printf("[MCP] Debug: CLI calling getArtistURL...")
-			urlResult, urlErr := getArtistURL(fetcher, context.Background(), "cli", *nameFlag, *mbidFlag)
-			if urlErr != nil {
-				fmt.Printf("  Error: %v\n", urlErr)
-				log.Printf("[MCP] Error: CLI getArtistURL failed: %v", urlErr)
-			} else {
-				fmt.Printf("  Result: %s\n", urlResult)
-				log.Printf("[MCP] Debug: CLI getArtistURL succeeded.")
-			}
-		}
-
-		fmt.Println("-----------------------------")
-		log.Printf("[MCP] Debug: CLI execution finished.")
-		return // Exit after direct execution
-	}
-	// --- End Command Line Flag Handling ---
-
-	log.Printf("[MCP] Debug: Initializing MCP server...")
-	server := mcp_golang.NewServer(stdio.NewStdioServerTransport())
-
-	log.Printf("[MCP] Debug: Registering tool 'hello'...")
-	err := server.RegisterTool("hello", "Say hello to a person", func(arguments MyFunctionsArguments) (*mcp_golang.ToolResponse, error) {
-		log.Printf("[MCP] Debug: Tool 'hello' called with args: %+v", arguments)
-		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("Hello, %server!", arguments.Submitter))), nil
-	})
-	if err != nil {
-		log.Fatalf("[MCP] Fatal: Failed to register tool 'hello': %v", err)
-	}
-
-	log.Printf("[MCP] Debug: Registering tool 'get_artist_biography'...")
-	err = server.RegisterTool("get_artist_biography", "Get the biography of an artist", func(arguments ArtistBiography) (*mcp_golang.ToolResponse, error) {
-		log.Printf("[MCP] Debug: Tool 'get_artist_biography' called with args: %+v", arguments)
-		// Using background context in handlers as request context isn't passed through MCP library currently
-		bio, err := getArtistBiography(fetcher, context.Background(), arguments.ID, arguments.Name, arguments.MBID)
-		if err != nil {
-			log.Printf("[MCP] Error: getArtistBiography handler failed: %v", err)
-			return nil, fmt.Errorf("handler returned an error: %w", err) // Return structured error
-		}
-		log.Printf("[MCP] Debug: Tool 'get_artist_biography' succeeded.")
-		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(bio)), nil
-	})
-	if err != nil {
-		log.Fatalf("[MCP] Fatal: Failed to register tool 'get_artist_biography': %v", err)
-	}
-
-	log.Printf("[MCP] Debug: Registering tool 'get_artist_url'...")
-	err = server.RegisterTool("get_artist_url", "Get the artist's specific Wikipedia URL via MBID, or a search URL using name as fallback", func(arguments ArtistURLArgs) (*mcp_golang.ToolResponse, error) {
-		log.Printf("[MCP] Debug: Tool 'get_artist_url' called with args: %+v", arguments)
-		urlResult, err := getArtistURL(fetcher, context.Background(), arguments.ID, arguments.Name, arguments.MBID)
-		if err != nil {
-			log.Printf("[MCP] Error: getArtistURL handler failed: %v", err)
-			return nil, fmt.Errorf("handler returned an error: %w", err)
-		}
-		log.Printf("[MCP] Debug: Tool 'get_artist_url' succeeded.")
-		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(urlResult)), nil
-	})
-	if err != nil {
-		log.Fatalf("[MCP] Fatal: Failed to register tool 'get_artist_url': %v", err)
-	}
-
-	log.Printf("[MCP] Debug: Registering prompt 'prompt_test'...")
-	err = server.RegisterPrompt("prompt_test", "This is a test prompt", func(arguments Content) (*mcp_golang.PromptResponse, error) {
-		log.Printf("[MCP] Debug: Prompt 'prompt_test' called with args: %+v", arguments)
-		return mcp_golang.NewPromptResponse("description", mcp_golang.NewPromptMessage(mcp_golang.NewTextContent(fmt.Sprintf("Hello, %server!", arguments.Title)), mcp_golang.RoleUser)), nil
-	})
-	if err != nil {
-		log.Fatalf("[MCP] Fatal: Failed to register prompt 'prompt_test': %v", err)
-	}
-
-	log.Printf("[MCP] Debug: Registering resource 'test://resource'...")
-	err = server.RegisterResource("test://resource", "resource_test", "This is a test resource", "application/json", func() (*mcp_golang.ResourceResponse, error) {
-		log.Printf("[MCP] Debug: Resource 'test://resource' called")
-		return mcp_golang.NewResourceResponse(mcp_golang.NewTextEmbeddedResource("test://resource", "This is a test resource", "application/json")), nil
-	})
-	if err != nil {
-		log.Fatalf("[MCP] Fatal: Failed to register resource 'test://resource': %v", err)
-	}
-
-	log.Printf("[MCP] Debug: Registering resource 'file://app_logs'...")
-	err = server.RegisterResource("file://app_logs", "app_logs", "The app logs", "text/plain", func() (*mcp_golang.ResourceResponse, error) {
-		log.Printf("[MCP] Debug: Resource 'file://app_logs' called")
-		return mcp_golang.NewResourceResponse(mcp_golang.NewTextEmbeddedResource("file://app_logs", "This is a test resource", "text/plain")), nil
-	})
-	if err != nil {
-		log.Fatalf("[MCP] Fatal: Failed to register resource 'file://app_logs': %v", err)
-	}
-
-	log.Println("[MCP] MCP server initialized and starting to serve...")
-	err = server.Serve()
-	if err != nil {
-		log.Fatalf("[MCP] Fatal: Server exited with error: %v", err)
-	}
-
-	log.Println("[MCP] Server exited cleanly.")
-	<-done // Keep running until interrupted (though server.Serve() is blocking)
-}
-
-func getArtistBiography(fetcher Fetcher, ctx context.Context, id, name, mbid string) (string, error) {
-	log.Printf("[MCP] Debug: getArtistBiography called (id: %s, name: %s, mbid: %s)", id, name, mbid)
-	if mbid == "" {
-		fmt.Fprintf(os.Stderr, "MBID not provided, attempting DBpedia lookup by name: %s\n", name)
-		log.Printf("[MCP] Debug: MBID not provided, attempting DBpedia lookup by name: %s", name)
-	} else {
-		// 1. Attempt Wikidata MBID lookup first
-		log.Printf("[MCP] Debug: Attempting Wikidata URL lookup for MBID: %s", mbid)
-		wikiURL, err := GetArtistWikipediaURL(fetcher, ctx, mbid)
-		if err == nil {
-			// 1a. Found Wikidata URL, now fetch from Wikipedia API
-			log.Printf("[MCP] Debug: Found Wikidata URL '%s', fetching bio from Wikipedia API...", wikiURL)
-			bio, errBio := GetBioFromWikipediaAPI(fetcher, ctx, wikiURL)
-			if errBio == nil {
-				log.Printf("[MCP] Debug: Successfully fetched bio from Wikipedia API for '%s'.", name)
-				return bio, nil // Success via Wikidata/Wikipedia!
-			} else {
-				// Failed to get bio even though URL was found
-				log.Printf("[MCP] Error: Found Wikipedia URL (%s) via MBID %s, but failed to fetch bio: %v", wikiURL, mbid, errBio)
-				fmt.Fprintf(os.Stderr, "Found Wikipedia URL (%s) via MBID %s, but failed to fetch bio: %v\n", wikiURL, mbid, errBio)
-				// Fall through to try DBpedia by name as a last resort?
-				// Let's fall through for now.
-			}
-		} else if !errors.Is(err, ErrNotFound) {
-			// Wikidata lookup failed for a reason other than not found (e.g., network)
-			log.Printf("[MCP] Error: Wikidata URL lookup failed for MBID %s (non-NotFound error): %v", mbid, err)
-			fmt.Fprintf(os.Stderr, "Wikidata URL lookup failed for MBID %s (non-NotFound error): %v\n", mbid, err)
-			// Don't proceed to DBpedia name lookup if Wikidata had a technical failure
-			return "", fmt.Errorf("Wikidata lookup failed: %w", err)
-		} else {
-			// Wikidata lookup returned ErrNotFound for MBID
-			log.Printf("[MCP] Debug: MBID %s not found on Wikidata, attempting DBpedia lookup by name: %s", mbid, name)
-			fmt.Fprintf(os.Stderr, "MBID %s not found on Wikidata, attempting DBpedia lookup by name: %s\n", mbid, name)
-		}
-	}
-
-	// 2. Attempt DBpedia lookup by name (if MBID was missing or failed with ErrNotFound)
-	if name == "" {
-		log.Printf("[MCP] Error: Cannot find artist bio: MBID lookup failed/missing, and no name provided.")
-		return "", fmt.Errorf("cannot find artist: MBID lookup failed or MBID not provided, and no name provided for DBpedia fallback")
-	}
-	log.Printf("[MCP] Debug: Attempting DBpedia bio lookup by name: %s", name)
-	dbpediaBio, errDb := GetArtistBioFromDBpedia(fetcher, ctx, name)
-	if errDb == nil {
-		log.Printf("[MCP] Debug: Successfully fetched bio from DBpedia for '%s'.", name)
-		return dbpediaBio, nil // Success via DBpedia!
-	}
-
-	// 3. If both Wikidata (MBID) and DBpedia (Name) failed
-	if errors.Is(errDb, ErrNotFound) {
-		log.Printf("[MCP] Error: Artist '%s' (MBID: %s) not found via Wikidata or DBpedia name lookup.", name, mbid)
-		return "", fmt.Errorf("artist '%s' (MBID: %s) not found via Wikidata MBID or DBpedia Name lookup", name, mbid)
-	}
-
-	// Return DBpedia's error if it wasn't ErrNotFound
-	log.Printf("[MCP] Error: DBpedia lookup failed for name '%s': %v", name, errDb)
-	return "", fmt.Errorf("DBpedia lookup failed for name '%s': %w", name, errDb)
-}
-
-// getArtistURL attempts to find the specific Wikipedia URL using MBID (via Wikidata),
-// then by Name (via DBpedia), falling back to a search URL using name.
-func getArtistURL(fetcher Fetcher, ctx context.Context, id, name, mbid string) (string, error) {
-	log.Printf("[MCP] Debug: getArtistURL called (id: %s, name: %s, mbid: %s)", id, name, mbid)
-	if mbid == "" {
-		fmt.Fprintf(os.Stderr, "getArtistURL: MBID not provided, attempting DBpedia lookup by name: %s\n", name)
-		log.Printf("[MCP] Debug: getArtistURL: MBID not provided, attempting DBpedia lookup by name: %s", name)
-	} else {
-		// Try to get the specific URL from Wikidata using MBID
-		log.Printf("[MCP] Debug: getArtistURL: Attempting Wikidata URL lookup for MBID: %s", mbid)
-		wikiURL, err := GetArtistWikipediaURL(fetcher, ctx, mbid)
-		if err == nil && wikiURL != "" {
-			log.Printf("[MCP] Debug: getArtistURL: Found specific URL '%s' via Wikidata MBID.", wikiURL)
-			return wikiURL, nil // Found specific URL via MBID
-		}
-		// Log error if Wikidata lookup failed for reasons other than not found
-		if err != nil && !errors.Is(err, ErrNotFound) {
-			log.Printf("[MCP] Error: getArtistURL: Wikidata URL lookup failed for MBID %s (non-NotFound error): %v", mbid, err)
-			fmt.Fprintf(os.Stderr, "getArtistURL: Wikidata URL lookup failed for MBID %s (non-NotFound error): %v\n", mbid, err)
-			// Fall through to try DBpedia if name is available
-		} else if errors.Is(err, ErrNotFound) {
-			log.Printf("[MCP] Debug: getArtistURL: MBID %s not found on Wikidata, attempting DBpedia lookup by name: %s", mbid, name)
-			fmt.Fprintf(os.Stderr, "getArtistURL: MBID %s not found on Wikidata, attempting DBpedia lookup by name: %s\n", mbid, name)
-		}
-	}
-
-	// Fallback 1: Try DBpedia lookup by name
-	if name != "" {
-		log.Printf("[MCP] Debug: getArtistURL: Attempting DBpedia URL lookup by name: %s", name)
-		dbpediaWikiURL, errDb := GetArtistWikipediaURLFromDBpedia(fetcher, ctx, name)
-		if errDb == nil && dbpediaWikiURL != "" {
-			log.Printf("[MCP] Debug: getArtistURL: Found specific URL '%s' via DBpedia Name lookup.", dbpediaWikiURL)
-			return dbpediaWikiURL, nil // Found specific URL via DBpedia Name lookup
-		}
-		// Log error if DBpedia lookup failed for reasons other than not found
-		if errDb != nil && !errors.Is(errDb, ErrNotFound) {
-			log.Printf("[MCP] Error: getArtistURL: DBpedia URL lookup failed for name '%s' (non-NotFound error): %v", name, errDb)
-			fmt.Fprintf(os.Stderr, "getArtistURL: DBpedia URL lookup failed for name '%s' (non-NotFound error): %v\n", name, errDb)
-			// Fall through to search URL fallback
-		} else if errors.Is(errDb, ErrNotFound) {
-			log.Printf("[MCP] Debug: getArtistURL: Name '%s' not found on DBpedia, attempting search fallback", name)
-			fmt.Fprintf(os.Stderr, "getArtistURL: Name '%s' not found on DBpedia, attempting search fallback\n", name)
-		}
-	}
-
-	// Fallback 2: Generate a search URL if name is provided
-	if name != "" {
-		searchURL := fmt.Sprintf("https://en.wikipedia.org/w/index.php?search=%s", url.QueryEscape(name))
-		log.Printf("[MCP] Debug: getArtistURL: Falling back to search URL: %s", searchURL)
-		fmt.Fprintf(os.Stderr, "getArtistURL: Falling back to search URL: %s\n", searchURL)
-		return searchURL, nil
-	}
-
-	// Final error: MBID lookup failed (or no MBID given) AND no name provided for fallback
-	log.Printf("[MCP] Error: getArtistURL: Cannot generate Wikipedia URL: Lookups failed and no name provided.")
-	return "", fmt.Errorf("cannot generate Wikipedia URL: Wikidata/DBpedia lookups failed and no artist name provided for search fallback")
-}

core/agents/mcp/mcp-server/wikidata.go

@@ -1,205 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"net/url"
-	"os"
-	"time"
-)
-
-const wikidataEndpoint = "https://query.wikidata.org/sparql"
-
-// ErrNotFound indicates a specific item (like an artist or URL) was not found on Wikidata.
-var ErrNotFound = errors.New("item not found on Wikidata")
-
-// Wikidata SPARQL query result structures
-type SparqlResult struct {
-	Results SparqlBindings `json:"results"`
-}
-
-type SparqlBindings struct {
-	Bindings []map[string]SparqlValue `json:"bindings"`
-}
-
-type SparqlValue struct {
-	Type  string `json:"type"`
-	Value string `json:"value"`
-	Lang  string `json:"xml:lang,omitempty"` // Handle language tags like "en"
-}
-
-// GetArtistBioFromWikidata queries Wikidata for an artist's description using their MBID.
-// NOTE: This function is currently UNUSED as the main logic prefers Wikipedia/DBpedia.
-func GetArtistBioFromWikidata(client *http.Client, mbid string) (string, error) {
-	log.Printf("[MCP] Debug: GetArtistBioFromWikidata called for MBID: %s", mbid)
-	if mbid == "" {
-		log.Printf("[MCP] Error: GetArtistBioFromWikidata requires an MBID.")
-		return "", fmt.Errorf("MBID is required to query Wikidata")
-	}
-
-	// SPARQL query to find the English description for an entity with a specific MusicBrainz ID
-	sparqlQuery := fmt.Sprintf(`
-SELECT ?artistDescription WHERE {
-  ?artist wdt:P434 "%s" . # P434 is the property for MusicBrainz artist ID
-  OPTIONAL { 
-    ?artist schema:description ?artistDescription .
-    FILTER(LANG(?artistDescription) = "en")
-  }
-  SERVICE wikibase:label { bd:serviceParam wikibase:language "en". }
-}
-LIMIT 1`, mbid)
-
-	// Prepare the HTTP request
-	queryValues := url.Values{}
-	queryValues.Set("query", sparqlQuery)
-	queryValues.Set("format", "json")
-
-	reqURL := fmt.Sprintf("%s?%s", wikidataEndpoint, queryValues.Encode())
-	log.Printf("[MCP] Debug: Wikidata Bio Request URL: %s", reqURL)
-
-	req, err := http.NewRequest("GET", reqURL, nil)
-	if err != nil {
-		log.Printf("[MCP] Error: Failed to create Wikidata bio request: %v", err)
-		return "", fmt.Errorf("failed to create Wikidata request: %w", err)
-	}
-	req.Header.Set("Accept", "application/sparql-results+json")
-	req.Header.Set("User-Agent", "MCPGoServerExample/0.1 (https://example.com/contact)") // Good practice to identify your client
-
-	// Execute the request
-	log.Printf("[MCP] Debug: Executing Wikidata bio request...")
-	resp, err := client.Do(req)
-	if err != nil {
-		log.Printf("[MCP] Error: Failed to execute Wikidata bio request: %v", err)
-		return "", fmt.Errorf("failed to execute Wikidata request: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		// Attempt to read body for more error info, but don't fail if it doesn't work
-		bodyBytes, readErr := io.ReadAll(resp.Body)
-		errorMsg := "Could not read error body"
-		if readErr == nil {
-			errorMsg = string(bodyBytes)
-		}
-		log.Printf("[MCP] Error: Wikidata bio query failed with status %d: %s", resp.StatusCode, errorMsg)
-		return "", fmt.Errorf("Wikidata query failed with status %d: %s", resp.StatusCode, errorMsg)
-	}
-	log.Printf("[MCP] Debug: Wikidata bio query successful (status %d).", resp.StatusCode)
-
-	// Parse the response
-	var result SparqlResult
-	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
-		log.Printf("[MCP] Error: Failed to decode Wikidata bio response: %v", err)
-		return "", fmt.Errorf("failed to decode Wikidata response: %w", err)
-	}
-
-	// Extract the description
-	if len(result.Results.Bindings) > 0 {
-		if descriptionVal, ok := result.Results.Bindings[0]["artistDescription"]; ok {
-			log.Printf("[MCP] Debug: Found description for MBID %s", mbid)
-			return descriptionVal.Value, nil
-		}
-	}
-
-	log.Printf("[MCP] Warn: No English description found on Wikidata for MBID %s", mbid)
-	return "", fmt.Errorf("no English description found on Wikidata for MBID %s", mbid)
-}
-
-// GetArtistWikipediaURL queries Wikidata for an artist's English Wikipedia page URL using MBID.
-// It tries searching by MBID first, then falls back to searching by name.
-func GetArtistWikipediaURL(fetcher Fetcher, ctx context.Context, mbid string) (string, error) {
-	log.Printf("[MCP] Debug: GetArtistWikipediaURL called for MBID: %s", mbid)
-	// 1. Try finding by MBID
-	if mbid == "" {
-		log.Printf("[MCP] Error: GetArtistWikipediaURL requires an MBID.")
-		return "", fmt.Errorf("MBID is required to find Wikipedia URL on Wikidata")
-	} else {
-		// SPARQL query to find the enwiki URL for an entity with a specific MusicBrainz ID
-		sparqlQuery := fmt.Sprintf(`
-SELECT ?article WHERE {
-  ?artist wdt:P434 "%s" . # P434 is MusicBrainz artist ID
-  ?article schema:about ?artist ;
-           schema:isPartOf <https://en.wikipedia.org/> .
-}
-LIMIT 1`, mbid)
-
-		log.Printf("[MCP] Debug: Executing Wikidata URL query for MBID: %s", mbid)
-		foundURL, err := executeWikidataURLQuery(fetcher, ctx, sparqlQuery)
-		if err == nil && foundURL != "" {
-			log.Printf("[MCP] Debug: Found Wikipedia URL '%s' via MBID %s", foundURL, mbid)
-			return foundURL, nil // Found via MBID
-		}
-		// Use the specific ErrNotFound
-		if errors.Is(err, ErrNotFound) {
-			log.Printf("[MCP] Debug: MBID %s not found on Wikidata for URL lookup.", mbid)
-			return "", ErrNotFound // Explicitly return ErrNotFound
-		}
-		// Log other errors
-		if err != nil {
-			log.Printf("[MCP] Error: Wikidata URL lookup via MBID %s failed: %v", mbid, err)
-			fmt.Fprintf(os.Stderr, "Wikidata URL lookup via MBID %s failed: %v\n", mbid, err)
-			return "", fmt.Errorf("Wikidata URL lookup via MBID failed: %w", err)
-		}
-	}
-
-	// Should ideally not be reached if MBID is required and lookup failed or was not found
-	log.Printf("[MCP] Warn: Reached end of GetArtistWikipediaURL unexpectedly for MBID %s", mbid)
-	return "", ErrNotFound // Return ErrNotFound if somehow reached
-}
-
-// executeWikidataURLQuery is a helper to run SPARQL and extract the first bound URL for '?article'.
-func executeWikidataURLQuery(fetcher Fetcher, ctx context.Context, sparqlQuery string) (string, error) {
-	log.Printf("[MCP] Debug: executeWikidataURLQuery called.")
-	queryValues := url.Values{}
-	queryValues.Set("query", sparqlQuery)
-	queryValues.Set("format", "json")
-
-	reqURL := fmt.Sprintf("%s?%s", wikidataEndpoint, queryValues.Encode())
-	log.Printf("[MCP] Debug: Wikidata Sparql Request URL: %s", reqURL)
-
-	// Directly use the fetcher
-	// Note: Headers (Accept, User-Agent) are now handled by the Fetcher implementation
-	// The WASM fetcher currently doesn't support setting them via the host func interface.
-	// Timeout is handled via context for native, and passed to host func for WASM.
-	// Let's use a default timeout here if not provided via context (e.g., 15s)
-	// TODO: Consider making timeout configurable or passed down
-	timeout := 15 * time.Second
-	if deadline, ok := ctx.Deadline(); ok {
-		timeout = time.Until(deadline)
-	}
-	log.Printf("[MCP] Debug: Fetching from Wikidata with timeout: %v", timeout)
-
-	statusCode, bodyBytes, err := fetcher.Fetch(ctx, "GET", reqURL, nil, timeout)
-	if err != nil {
-		log.Printf("[MCP] Error: Fetcher failed for Wikidata SPARQL request: %v", err)
-		return "", fmt.Errorf("failed to execute Wikidata request: %w", err)
-	}
-
-	// Check status code. Fetcher interface implies body might be returned even on error.
-	if statusCode != http.StatusOK {
-		log.Printf("[MCP] Error: Wikidata SPARQL query failed with status %d: %s", statusCode, string(bodyBytes))
-		return "", fmt.Errorf("Wikidata query failed with status %d: %s", statusCode, string(bodyBytes))
-	}
-	log.Printf("[MCP] Debug: Wikidata SPARQL query successful (status %d), %d bytes received.", statusCode, len(bodyBytes))
-
-	var result SparqlResult
-	if err := json.Unmarshal(bodyBytes, &result); err != nil { // Use Unmarshal for byte slice
-		log.Printf("[MCP] Error: Failed to decode Wikidata SPARQL response: %v", err)
-		return "", fmt.Errorf("failed to decode Wikidata response: %w", err)
-	}
-
-	if len(result.Results.Bindings) > 0 {
-		if articleVal, ok := result.Results.Bindings[0]["article"]; ok {
-			log.Printf("[MCP] Debug: Found Wikidata article URL: %s", articleVal.Value)
-			return articleVal.Value, nil
-		}
-	}
-
-	log.Printf("[MCP] Debug: No Wikidata article URL found in SPARQL response.")
-	return "", ErrNotFound
-}

core/agents/mcp/mcp-server/wikipedia.go

@@ -1,121 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-)
-
-const mediaWikiAPIEndpoint = "https://en.wikipedia.org/w/api.php"
-
-// Structures for parsing MediaWiki API response (query extracts)
-type MediaWikiQueryResult struct {
-	Query MediaWikiQuery `json:"query"`
-}
-
-type MediaWikiQuery struct {
-	Pages map[string]MediaWikiPage `json:"pages"`
-}
-
-type MediaWikiPage struct {
-	PageID  int    `json:"pageid"`
-	Ns      int    `json:"ns"`
-	Title   string `json:"title"`
-	Extract string `json:"extract"`
-}
-
-// Default timeout for Wikipedia API requests
-const defaultWikipediaTimeout = 15 * time.Second
-
-// GetBioFromWikipediaAPI fetches the introductory text of a Wikipedia page.
-func GetBioFromWikipediaAPI(fetcher Fetcher, ctx context.Context, wikipediaURL string) (string, error) {
-	log.Printf("[MCP] Debug: GetBioFromWikipediaAPI called for URL: %s", wikipediaURL)
-	pageTitle, err := extractPageTitleFromURL(wikipediaURL)
-	if err != nil {
-		log.Printf("[MCP] Error: Could not extract title from Wikipedia URL '%s': %v", wikipediaURL, err)
-		return "", fmt.Errorf("could not extract title from Wikipedia URL %s: %w", wikipediaURL, err)
-	}
-	log.Printf("[MCP] Debug: Extracted Wikipedia page title: %s", pageTitle)
-
-	// Prepare API request parameters
-	apiParams := url.Values{}
-	apiParams.Set("action", "query")
-	apiParams.Set("format", "json")
-	apiParams.Set("prop", "extracts")    // Request page extracts
-	apiParams.Set("exintro", "true")     // Get only the intro section
-	apiParams.Set("explaintext", "true") // Get plain text instead of HTML
-	apiParams.Set("titles", pageTitle)   // Specify the page title
-	apiParams.Set("redirects", "1")      // Follow redirects
-
-	reqURL := fmt.Sprintf("%s?%s", mediaWikiAPIEndpoint, apiParams.Encode())
-	log.Printf("[MCP] Debug: MediaWiki API Request URL: %s", reqURL)
-
-	timeout := defaultWikipediaTimeout
-	if deadline, ok := ctx.Deadline(); ok {
-		timeout = time.Until(deadline)
-	}
-	log.Printf("[MCP] Debug: Fetching from MediaWiki with timeout: %v", timeout)
-
-	statusCode, bodyBytes, err := fetcher.Fetch(ctx, "GET", reqURL, nil, timeout)
-	if err != nil {
-		log.Printf("[MCP] Error: Fetcher failed for MediaWiki request (title: '%s'): %v", pageTitle, err)
-		return "", fmt.Errorf("failed to execute MediaWiki request for title '%s': %w", pageTitle, err)
-	}
-
-	if statusCode != http.StatusOK {
-		log.Printf("[MCP] Error: MediaWiki query for '%s' failed with status %d: %s", pageTitle, statusCode, string(bodyBytes))
-		return "", fmt.Errorf("MediaWiki query for '%s' failed with status %d: %s", pageTitle, statusCode, string(bodyBytes))
-	}
-	log.Printf("[MCP] Debug: MediaWiki query successful (status %d), %d bytes received.", statusCode, len(bodyBytes))
-
-	// Parse the response
-	var result MediaWikiQueryResult
-	if err := json.Unmarshal(bodyBytes, &result); err != nil {
-		log.Printf("[MCP] Error: Failed to decode MediaWiki response for '%s': %v", pageTitle, err)
-		return "", fmt.Errorf("failed to decode MediaWiki response for '%s': %w", pageTitle, err)
-	}
-
-	// Extract the text - MediaWiki API returns pages keyed by page ID
-	for pageID, page := range result.Query.Pages {
-		log.Printf("[MCP] Debug: Processing MediaWiki page ID: %s, Title: %s", pageID, page.Title)
-		if page.Extract != "" {
-			// Often includes a newline at the end, trim it
-			log.Printf("[MCP] Debug: Found extract for '%s'. Length: %d", pageTitle, len(page.Extract))
-			return strings.TrimSpace(page.Extract), nil
-		}
-	}
-
-	log.Printf("[MCP] Warn: No extract found in MediaWiki response for title '%s'", pageTitle)
-	return "", fmt.Errorf("no extract found in MediaWiki response for title '%s' (page might not exist or be empty)", pageTitle)
-}
-
-// extractPageTitleFromURL attempts to get the page title from a standard Wikipedia URL.
-// Example: https://en.wikipedia.org/wiki/The_Beatles -> The_Beatles
-func extractPageTitleFromURL(wikiURL string) (string, error) {
-	parsedURL, err := url.Parse(wikiURL)
-	if err != nil {
-		return "", err
-	}
-	if parsedURL.Host != "en.wikipedia.org" {
-		return "", fmt.Errorf("URL host is not en.wikipedia.org: %s", parsedURL.Host)
-	}
-	pathParts := strings.Split(strings.TrimPrefix(parsedURL.Path, "/"), "/")
-	if len(pathParts) < 2 || pathParts[0] != "wiki" {
-		return "", fmt.Errorf("URL path does not match /wiki/<title> format: %s", parsedURL.Path)
-	}
-	title := pathParts[1]
-	if title == "" {
-		return "", fmt.Errorf("extracted title is empty")
-	}
-	// URL Decode the title (e.g., %27 -> ')
-	decodedTitle, err := url.PathUnescape(title)
-	if err != nil {
-		return "", fmt.Errorf("failed to decode title '%s': %w", title, err)
-	}
-	return decodedTitle, nil
-}

core/agents/mcp/mcp_agent.go

@@ -1,207 +0,0 @@
-package mcp
-
-import (
-	"context"
-	"errors"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	mcp "github.com/metoro-io/mcp-golang"
-	"github.com/tetratelabs/wazero"
-
-	"github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1"
-
-	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/core/agents"
-	"github.com/navidrome/navidrome/log"
-	"github.com/navidrome/navidrome/model"
-)
-
-// Constants used by the MCP agent
-const (
-	McpAgentName          = "mcp"
-	initializationTimeout = 5 * time.Second
-	// McpServerPath defines the location of the MCP server executable or WASM module.
-	// McpServerPath     = "./core/agents/mcp/mcp-server/mcp-server"
-	McpServerPath     = "./core/agents/mcp/mcp-server/mcp-server.wasm"
-	McpToolNameGetBio = "get_artist_biography"
-	McpToolNameGetURL = "get_artist_url"
-)
-
-// mcpClient interface matching the methods used from mcp.Client.
-type mcpClient interface {
-	Initialize(ctx context.Context) (*mcp.InitializeResponse, error)
-	CallTool(ctx context.Context, toolName string, args any) (*mcp.ToolResponse, error)
-}
-
-// mcpImplementation defines the common interface for both native and WASM MCP agents.
-// This allows the main MCPAgent to delegate calls without knowing the underlying type.
-type mcpImplementation interface {
-	Close() error // For cleaning up resources associated with this specific implementation.
-
-	// callMCPTool is the core method implemented differently by native/wasm
-	callMCPTool(ctx context.Context, toolName string, args any) (string, error)
-}
-
-// MCPAgent is the public-facing agent registered with Navidrome.
-// It acts as a wrapper around the actual implementation (native or WASM).
-type MCPAgent struct {
-	// No mutex needed here if impl is set once at construction
-	// and the implementation handles its own internal state synchronization.
-	impl mcpImplementation
-
-	// Shared Wazero resources (runtime, cache) are managed externally
-	// and closed separately, likely during application shutdown.
-}
-
-// mcpConstructor creates the appropriate MCP implementation (native or WASM)
-// and wraps it in the MCPAgent.
-func mcpConstructor(ds model.DataStore) agents.Interface {
-	if _, err := os.Stat(McpServerPath); os.IsNotExist(err) {
-		log.Warn("MCP server executable/WASM not found, disabling agent", "path", McpServerPath, "error", err)
-		return nil
-	}
-
-	var agentImpl mcpImplementation
-	var err error
-
-	if strings.HasSuffix(McpServerPath, ".wasm") {
-		log.Info("Configuring MCP agent for WASM execution", "path", McpServerPath)
-		ctx := context.Background()
-
-		// Setup Shared Wazero Resources
-		var cache wazero.CompilationCache
-		cacheDir := filepath.Join(conf.Server.DataFolder, "cache", "wazero")
-		if errMkdir := os.MkdirAll(cacheDir, 0755); errMkdir != nil {
-			log.Error(ctx, "Failed to create Wazero cache directory, WASM caching disabled", "path", cacheDir, "error", errMkdir)
-		} else {
-			cache, err = wazero.NewCompilationCacheWithDir(cacheDir)
-			if err != nil {
-				log.Error(ctx, "Failed to create Wazero compilation cache, WASM caching disabled", "path", cacheDir, "error", err)
-				cache = nil
-			}
-		}
-
-		runtimeConfig := wazero.NewRuntimeConfig()
-		if cache != nil {
-			runtimeConfig = runtimeConfig.WithCompilationCache(cache)
-		}
-
-		runtime := wazero.NewRuntimeWithConfig(ctx, runtimeConfig)
-
-		if err = registerHostFunctions(ctx, runtime); err != nil {
-			_ = runtime.Close(ctx)
-			if cache != nil {
-				_ = cache.Close(ctx)
-			}
-			return nil // Fatal error: Host functions required
-		}
-
-		if _, err = wasi_snapshot_preview1.Instantiate(ctx, runtime); err != nil {
-			log.Error(ctx, "Failed to instantiate WASI on shared Wazero runtime, MCP WASM agent disabled", "error", err)
-			_ = runtime.Close(ctx)
-			if cache != nil {
-				_ = cache.Close(ctx)
-			}
-			return nil // Fatal error: WASI required
-		}
-
-		// Compile the module
-		log.Debug(ctx, "Pre-compiling WASM module...", "path", McpServerPath)
-		wasmBytes, err := os.ReadFile(McpServerPath)
-		if err != nil {
-			log.Error(ctx, "Failed to read WASM module file, disabling agent", "path", McpServerPath, "error", err)
-			_ = runtime.Close(ctx)
-			if cache != nil {
-				_ = cache.Close(ctx)
-			}
-			return nil
-		}
-		compiledModule, err := runtime.CompileModule(ctx, wasmBytes)
-		if err != nil {
-			log.Error(ctx, "Failed to pre-compile WASM module, disabling agent", "path", McpServerPath, "error", err)
-			_ = runtime.Close(ctx)
-			if cache != nil {
-				_ = cache.Close(ctx)
-			}
-			return nil
-		}
-
-		agentImpl = newMCPWasm(runtime, cache, compiledModule)
-		log.Info(ctx, "Shared Wazero runtime, WASI, cache, host functions initialized, and module pre-compiled for MCP agent")
-
-	} else {
-		log.Info("Configuring MCP agent for native execution", "path", McpServerPath)
-		agentImpl = newMCPNative()
-	}
-
-	log.Info("MCP Agent implementation created successfully")
-	return &MCPAgent{impl: agentImpl}
-}
-
-// NewAgentForTesting is a constructor specifically for tests.
-// It creates the appropriate implementation based on McpServerPath
-// and injects a mock mcpClient into its ClientOverride field.
-func NewAgentForTesting(mockClient mcpClient) agents.Interface {
-	// We need to replicate the logic from mcpConstructor to determine
-	// the implementation type, but without actually starting processes.
-
-	var agentImpl mcpImplementation
-
-	if strings.HasSuffix(McpServerPath, ".wasm") {
-		// For WASM testing, we might not need the full runtime setup,
-		// just the struct. Pass nil for shared resources for now.
-		// We rely on the mockClient being used before any real WASM interaction.
-		wasmImpl := newMCPWasm(nil, nil, nil)
-		wasmImpl.ClientOverride = mockClient
-		agentImpl = wasmImpl
-	} else {
-		nativeImpl := newMCPNative()
-		nativeImpl.ClientOverride = mockClient
-		agentImpl = nativeImpl
-	}
-
-	return &MCPAgent{impl: agentImpl}
-}
-
-func (a *MCPAgent) AgentName() string {
-	return McpAgentName
-}
-
-func (a *MCPAgent) GetArtistBiography(ctx context.Context, id, name, mbid string) (string, error) {
-	if a.impl == nil {
-		return "", errors.New("MCP agent implementation is nil")
-	}
-	// Construct args and call the implementation's specific tool caller
-	args := ArtistArgs{ID: id, Name: name, Mbid: mbid}
-	return a.impl.callMCPTool(ctx, McpToolNameGetBio, args)
-}
-
-func (a *MCPAgent) GetArtistURL(ctx context.Context, id, name, mbid string) (string, error) {
-	if a.impl == nil {
-		return "", errors.New("MCP agent implementation is nil")
-	}
-	// Construct args and call the implementation's specific tool caller
-	args := ArtistArgs{ID: id, Name: name, Mbid: mbid}
-	return a.impl.callMCPTool(ctx, McpToolNameGetURL, args)
-}
-
-// Note: A Close method on MCPAgent itself isn't part of agents.Interface.
-// Cleanup of the specific implementation happens via impl.Close().
-// Cleanup of shared Wazero resources needs separate handling (e.g., on app shutdown).
-
-// ArtistArgs defines the structure for MCP tool arguments requiring artist info.
-type ArtistArgs struct {
-	ID   string `json:"id"`
-	Name string `json:"name"`
-	Mbid string `json:"mbid,omitempty"`
-}
-
-var _ agents.ArtistBiographyRetriever = (*MCPAgent)(nil)
-var _ agents.ArtistURLRetriever = (*MCPAgent)(nil)
-
-func init() {
-	agents.Register(McpAgentName, mcpConstructor)
-}

core/agents/mcp/mcp_agent_test.go

@@ -1,237 +0,0 @@
-package mcp_test
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-
-	mcp_client "github.com/metoro-io/mcp-golang" // Renamed alias for clarity
-	"github.com/navidrome/navidrome/core/agents"
-	"github.com/navidrome/navidrome/core/agents/mcp"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-// Define the mcpClient interface locally for mocking, matching the one
-// used internally by MCPNative/MCPWasm.
-type mcpClient interface {
-	Initialize(ctx context.Context) (*mcp_client.InitializeResponse, error)
-	CallTool(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error)
-}
-
-// mockMCPClient is a mock implementation of mcpClient for testing.
-type mockMCPClient struct {
-	InitializeFunc func(ctx context.Context) (*mcp_client.InitializeResponse, error)
-	CallToolFunc   func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error)
-	callToolArgs   []any  // Store args for verification
-	callToolName   string // Store tool name for verification
-}
-
-func (m *mockMCPClient) Initialize(ctx context.Context) (*mcp_client.InitializeResponse, error) {
-	if m.InitializeFunc != nil {
-		return m.InitializeFunc(ctx)
-	}
-	return &mcp_client.InitializeResponse{}, nil // Default success
-}
-
-func (m *mockMCPClient) CallTool(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-	m.callToolName = toolName
-	m.callToolArgs = append(m.callToolArgs, args)
-	if m.CallToolFunc != nil {
-		return m.CallToolFunc(ctx, toolName, args)
-	}
-	return &mcp_client.ToolResponse{}, nil
-}
-
-// Ensure mock implements the local interface (compile-time check)
-var _ mcpClient = (*mockMCPClient)(nil)
-
-var _ = Describe("MCPAgent", func() {
-	var (
-		ctx context.Context
-		// We test the public MCPAgent wrapper, which uses the implementations internally.
-		// The actual agent instance might be native or wasm depending on McpServerPath
-		agent      agents.Interface // Use the public agents.Interface
-		mockClient *mockMCPClient
-	)
-
-	BeforeEach(func() {
-		ctx = context.Background()
-		mockClient = &mockMCPClient{
-			callToolArgs: make([]any, 0), // Reset args on each test
-		}
-
-		// Instantiate the real agent using a testing constructor
-		// This constructor needs to be added to the mcp package.
-		agent = mcp.NewAgentForTesting(mockClient)
-		Expect(agent).NotTo(BeNil(), "Agent should be created")
-	})
-
-	// Helper to get the concrete agent type for calling specific methods
-	getConcreteAgent := func() *mcp.MCPAgent {
-		concreteAgent, ok := agent.(*mcp.MCPAgent)
-		Expect(ok).To(BeTrue(), "Agent should be of type *mcp.MCPAgent")
-		return concreteAgent
-	}
-
-	Describe("GetArtistBiography", func() {
-		It("should call the correct tool and return the biography", func() {
-			expectedBio := "This is the artist bio."
-			mockClient.CallToolFunc = func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-				Expect(toolName).To(Equal(mcp.McpToolNameGetBio))
-				Expect(args).To(BeAssignableToTypeOf(mcp.ArtistArgs{}))
-				typedArgs := args.(mcp.ArtistArgs)
-				Expect(typedArgs.ID).To(Equal("id1"))
-				Expect(typedArgs.Name).To(Equal("Artist Name"))
-				Expect(typedArgs.Mbid).To(Equal("mbid1"))
-				return mcp_client.NewToolResponse(mcp_client.NewTextContent(expectedBio)), nil
-			}
-
-			bio, err := getConcreteAgent().GetArtistBiography(ctx, "id1", "Artist Name", "mbid1")
-			Expect(err).NotTo(HaveOccurred())
-			Expect(bio).To(Equal(expectedBio))
-		})
-
-		It("should return error if CallTool fails", func() {
-			expectedErr := errors.New("mcp tool error")
-			mockClient.CallToolFunc = func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-				return nil, expectedErr
-			}
-
-			bio, err := getConcreteAgent().GetArtistBiography(ctx, "id1", "Artist Name", "mbid1")
-			Expect(err).To(HaveOccurred())
-			// The error originates from the implementation now, check for specific part
-			Expect(err.Error()).To(SatisfyAny(
-				ContainSubstring("native MCP agent not ready"), // Error from native
-				ContainSubstring("WASM MCP agent not ready"),   // Error from WASM
-				ContainSubstring("failed to call native MCP tool"),
-				ContainSubstring("failed to call WASM MCP tool"),
-			))
-			Expect(errors.Is(err, expectedErr)).To(BeTrue())
-			Expect(bio).To(BeEmpty())
-		})
-
-		It("should return ErrNotFound if CallTool response is empty", func() {
-			mockClient.CallToolFunc = func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-				// Return a response created with no content parts
-				return mcp_client.NewToolResponse(), nil
-			}
-
-			bio, err := getConcreteAgent().GetArtistBiography(ctx, "id1", "Artist Name", "mbid1")
-			Expect(err).To(MatchError(agents.ErrNotFound))
-			Expect(bio).To(BeEmpty())
-		})
-
-		It("should return ErrNotFound if CallTool response has nil TextContent (simulated by empty string)", func() {
-			mockClient.CallToolFunc = func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-				// Simulate nil/empty text content by creating response with empty string text
-				return mcp_client.NewToolResponse(mcp_client.NewTextContent("")), nil
-			}
-
-			bio, err := getConcreteAgent().GetArtistBiography(ctx, "id1", "Artist Name", "mbid1")
-			Expect(err).To(MatchError(agents.ErrNotFound))
-			Expect(bio).To(BeEmpty())
-		})
-
-		It("should return comm error if CallTool returns pipe error", func() {
-			mockClient.CallToolFunc = func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-				return nil, io.ErrClosedPipe
-			}
-
-			bio, err := getConcreteAgent().GetArtistBiography(ctx, "id1", "Artist Name", "mbid1")
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(SatisfyAny(
-				ContainSubstring("native MCP agent process communication error"),
-				ContainSubstring("WASM MCP agent module communication error"),
-			))
-			Expect(errors.Is(err, io.ErrClosedPipe)).To(BeTrue())
-			Expect(bio).To(BeEmpty())
-		})
-
-		It("should return ErrNotFound if MCP tool returns an error string", func() {
-			mcpErrorString := "handler returned an error: something went wrong on the server"
-			mockClient.CallToolFunc = func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-				return mcp_client.NewToolResponse(mcp_client.NewTextContent(mcpErrorString)), nil
-			}
-
-			bio, err := getConcreteAgent().GetArtistBiography(ctx, "id1", "Artist Name", "mbid1")
-			Expect(err).To(MatchError(agents.ErrNotFound))
-			Expect(bio).To(BeEmpty())
-		})
-	})
-
-	Describe("GetArtistURL", func() {
-		It("should call the correct tool and return the URL", func() {
-			expectedURL := "http://example.com/artist"
-			mockClient.CallToolFunc = func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-				Expect(toolName).To(Equal(mcp.McpToolNameGetURL))
-				Expect(args).To(BeAssignableToTypeOf(mcp.ArtistArgs{}))
-				typedArgs := args.(mcp.ArtistArgs)
-				Expect(typedArgs.ID).To(Equal("id2"))
-				Expect(typedArgs.Name).To(Equal("Another Artist"))
-				Expect(typedArgs.Mbid).To(Equal("mbid2"))
-				return mcp_client.NewToolResponse(mcp_client.NewTextContent(expectedURL)), nil
-			}
-
-			url, err := getConcreteAgent().GetArtistURL(ctx, "id2", "Another Artist", "mbid2")
-			Expect(err).NotTo(HaveOccurred())
-			Expect(url).To(Equal(expectedURL))
-		})
-
-		It("should return error if CallTool fails", func() {
-			expectedErr := errors.New("mcp tool error url")
-			mockClient.CallToolFunc = func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-				return nil, expectedErr
-			}
-
-			url, err := getConcreteAgent().GetArtistURL(ctx, "id2", "Another Artist", "mbid2")
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(SatisfyAny(
-				ContainSubstring("native MCP agent not ready"), // Error from native
-				ContainSubstring("WASM MCP agent not ready"),   // Error from WASM
-				ContainSubstring("failed to call native MCP tool"),
-				ContainSubstring("failed to call WASM MCP tool"),
-			))
-			Expect(errors.Is(err, expectedErr)).To(BeTrue())
-			Expect(url).To(BeEmpty())
-		})
-
-		It("should return ErrNotFound if CallTool response is empty", func() {
-			mockClient.CallToolFunc = func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-				// Return a response created with no content parts
-				return mcp_client.NewToolResponse(), nil
-			}
-
-			url, err := getConcreteAgent().GetArtistURL(ctx, "id2", "Another Artist", "mbid2")
-			Expect(err).To(MatchError(agents.ErrNotFound))
-			Expect(url).To(BeEmpty())
-		})
-
-		It("should return comm error if CallTool returns pipe error", func() {
-			mockClient.CallToolFunc = func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-				return nil, fmt.Errorf("write: %w", io.ErrClosedPipe)
-			}
-
-			url, err := getConcreteAgent().GetArtistURL(ctx, "id2", "Another Artist", "mbid2")
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(SatisfyAny(
-				ContainSubstring("native MCP agent process communication error"),
-				ContainSubstring("WASM MCP agent module communication error"),
-			))
-			Expect(errors.Is(err, io.ErrClosedPipe)).To(BeTrue())
-			Expect(url).To(BeEmpty())
-		})
-
-		It("should return ErrNotFound if MCP tool returns an error string", func() {
-			mcpErrorString := "handler returned an error: could not find url"
-			mockClient.CallToolFunc = func(ctx context.Context, toolName string, args any) (*mcp_client.ToolResponse, error) {
-				return mcp_client.NewToolResponse(mcp_client.NewTextContent(mcpErrorString)), nil
-			}
-
-			url, err := getConcreteAgent().GetArtistURL(ctx, "id2", "Another Artist", "mbid2")
-			Expect(err).To(MatchError(agents.ErrNotFound))
-			Expect(url).To(BeEmpty())
-		})
-	})
-})

core/agents/mcp/mcp_host_functions.go

@@ -1,189 +0,0 @@
-package mcp
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"time"
-
-	"github.com/navidrome/navidrome/log"
-	"github.com/tetratelabs/wazero"
-	"github.com/tetratelabs/wazero/api"
-)
-
-// httpClient is a shared HTTP client for host function reuse.
-var httpClient = &http.Client{
-	// Consider adding a default timeout
-	Timeout: 30 * time.Second,
-}
-
-// registerHostFunctions defines and registers the host functions (e.g., http_fetch)
-// into the provided Wazero runtime.
-func registerHostFunctions(ctx context.Context, runtime wazero.Runtime) error {
-	// Define and Instantiate Host Module "env"
-	_, err := runtime.NewHostModuleBuilder("env"). // "env" is the conventional module name
-							NewFunctionBuilder().
-							WithFunc(httpFetch).  // Register our Go function
-							Export("http_fetch"). // Export it with the name WASM will use
-							Instantiate(ctx)
-	if err != nil {
-		log.Error(ctx, "Failed to instantiate 'env' host module with httpFetch", "error", err)
-		return fmt.Errorf("instantiate host module 'env': %w", err)
-	}
-	log.Info(ctx, "Instantiated 'env' host module with http_fetch function")
-	return nil
-}
-
-// httpFetch is the host function exposed to WASM.
-// ... (full implementation as provided previously) ...
-// Returns:
-// - 0 on success (request completed, results written).
-// - 1 on host-side failure (e.g., memory access error, invalid input).
-func httpFetch(
-	ctx context.Context, mod api.Module, // Standard Wazero host function params
-	// Request details
-	urlPtr, urlLen uint32,
-	methodPtr, methodLen uint32,
-	bodyPtr, bodyLen uint32,
-	timeoutMillis uint32,
-	// Result pointers
-	resultStatusPtr uint32,
-	resultBodyPtr uint32, resultBodyCapacity uint32, resultBodyLenPtr uint32,
-	resultErrorPtr uint32, resultErrorCapacity uint32, resultErrorLenPtr uint32,
-) uint32 { // Using uint32 for status code convention (0=success, 1=failure)
-	mem := mod.Memory()
-
-	// --- Read Inputs ---
-	urlBytes, ok := mem.Read(urlPtr, urlLen)
-	if !ok {
-		log.Error(ctx, "httpFetch host error: failed to read URL from WASM memory")
-		// Cannot write error back as we don't have the pointers validated yet
-		return 1
-	}
-	url := string(urlBytes)
-
-	methodBytes, ok := mem.Read(methodPtr, methodLen)
-	if !ok {
-		log.Error(ctx, "httpFetch host error: failed to read method from WASM memory", "url", url)
-		return 1 // Bail out
-	}
-	method := string(methodBytes)
-	if method == "" {
-		method = "GET" // Default to GET
-	}
-
-	var reqBody io.Reader
-	if bodyLen > 0 {
-		bodyBytes, ok := mem.Read(bodyPtr, bodyLen)
-		if !ok {
-			log.Error(ctx, "httpFetch host error: failed to read body from WASM memory", "url", url, "method", method)
-			return 1 // Bail out
-		}
-		reqBody = bytes.NewReader(bodyBytes)
-	}
-
-	timeout := time.Duration(timeoutMillis) * time.Millisecond
-	if timeout <= 0 {
-		timeout = 30 * time.Second // Default timeout matching httpClient
-	}
-
-	// --- Prepare and Execute Request ---
-	log.Debug(ctx, "httpFetch executing request", "method", method, "url", url, "timeout", timeout)
-
-	// Use a specific context for the request, derived from the host function's context
-	// but with the specific timeout for this call.
-	reqCtx, cancel := context.WithTimeout(ctx, timeout)
-	defer cancel()
-
-	req, err := http.NewRequestWithContext(reqCtx, method, url, reqBody)
-	if err != nil {
-		errMsg := fmt.Sprintf("failed to create request: %v", err)
-		log.Error(ctx, "httpFetch host error", "url", url, "method", method, "error", errMsg)
-		writeStringResult(mem, resultErrorPtr, resultErrorCapacity, resultErrorLenPtr, errMsg)
-		mem.WriteUint32Le(resultStatusPtr, 0)  // Write 0 status on creation error
-		mem.WriteUint32Le(resultBodyLenPtr, 0) // No body
-		return 0                               // Indicate results (including error) were written
-	}
-
-	// TODO: Consider adding a User-Agent?
-	// req.Header.Set("User-Agent", "Navidrome/MCP-Agent-Host")
-
-	resp, err := httpClient.Do(req)
-	if err != nil {
-		// Handle client-side errors (network, DNS, timeout)
-		errMsg := fmt.Sprintf("failed to execute request: %v", err)
-		log.Error(ctx, "httpFetch host error", "url", url, "method", method, "error", errMsg)
-		writeStringResult(mem, resultErrorPtr, resultErrorCapacity, resultErrorLenPtr, errMsg)
-		mem.WriteUint32Le(resultStatusPtr, 0) // Write 0 status on transport error
-		mem.WriteUint32Le(resultBodyLenPtr, 0)
-		return 0 // Indicate results written
-	}
-	defer resp.Body.Close()
-
-	// --- Process Response ---
-	statusCode := uint32(resp.StatusCode)
-	responseBodyBytes, readErr := io.ReadAll(resp.Body)
-	if readErr != nil {
-		errMsg := fmt.Sprintf("failed to read response body: %v", readErr)
-		log.Error(ctx, "httpFetch host error", "url", url, "method", method, "status", statusCode, "error", errMsg)
-		writeStringResult(mem, resultErrorPtr, resultErrorCapacity, resultErrorLenPtr, errMsg)
-		mem.WriteUint32Le(resultStatusPtr, statusCode) // Write actual status code
-		mem.WriteUint32Le(resultBodyLenPtr, 0)
-		return 0 // Indicate results written
-	}
-
-	// --- Write Results Back to WASM Memory ---
-	log.Debug(ctx, "httpFetch writing results", "url", url, "method", method, "status", statusCode, "bodyLen", len(responseBodyBytes))
-
-	// Write status code
-	if !mem.WriteUint32Le(resultStatusPtr, statusCode) {
-		log.Error(ctx, "httpFetch host error: failed to write status code to WASM memory")
-		return 1 // Host error
-	}
-
-	// Write response body (checking capacity)
-	if !writeBytesResult(mem, resultBodyPtr, resultBodyCapacity, resultBodyLenPtr, responseBodyBytes) {
-		// If body write fails (likely due to capacity), write an error message instead.
-		errMsg := fmt.Sprintf("response body size (%d) exceeds buffer capacity (%d)", len(responseBodyBytes), resultBodyCapacity)
-		log.Error(ctx, "httpFetch host error", "url", url, "method", method, "status", statusCode, "error", errMsg)
-		writeStringResult(mem, resultErrorPtr, resultErrorCapacity, resultErrorLenPtr, errMsg)
-		mem.WriteUint32Le(resultBodyLenPtr, 0) // Ensure body length is 0 if we wrote an error
-	} else {
-		// Write empty error string if body write was successful
-		mem.WriteUint32Le(resultErrorLenPtr, 0)
-	}
-
-	return 0 // Success
-}
-
-// Helper to write string results, respecting capacity. Returns true on success.
-func writeStringResult(mem api.Memory, ptr, capacity, lenPtr uint32, result string) bool {
-	bytes := []byte(result)
-	return writeBytesResult(mem, ptr, capacity, lenPtr, bytes)
-}
-
-// Helper to write byte results, respecting capacity. Returns true on success.
-func writeBytesResult(mem api.Memory, ptr, capacity, lenPtr uint32, result []byte) bool {
-	resultLen := uint32(len(result))
-	writeLen := resultLen
-	if writeLen > capacity {
-		log.Warn(context.Background(), "WASM host write truncated", "requested", resultLen, "capacity", capacity)
-		writeLen = capacity // Truncate if too large for buffer
-	}
-
-	if writeLen > 0 {
-		if !mem.Write(ptr, result[:writeLen]) {
-			log.Error(context.Background(), "WASM host memory write failed", "ptr", ptr, "len", writeLen)
-			return false // Memory write failed
-		}
-	}
-
-	// Write the *original* length of the data (even if truncated) so the WASM side knows.
-	if !mem.WriteUint32Le(lenPtr, resultLen) {
-		log.Error(context.Background(), "WASM host memory length write failed", "lenPtr", lenPtr, "len", resultLen)
-		return false // Memory write failed
-	}
-	return true
-}

core/agents/mcp/mcp_process_native.go

@@ -1,252 +0,0 @@
-package mcp
-
-import (
-	"bufio"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"strings"
-	"sync"
-
-	mcp "github.com/metoro-io/mcp-golang"
-	"github.com/metoro-io/mcp-golang/transport/stdio"
-	"github.com/navidrome/navidrome/core/agents"
-	"github.com/navidrome/navidrome/log"
-)
-
-// MCPNative implements the mcpImplementation interface for running the MCP server as a native process.
-type MCPNative struct {
-	mu     sync.Mutex
-	cmd    *exec.Cmd // Stores the running command
-	stdin  io.WriteCloser
-	client mcpClient
-
-	// ClientOverride allows injecting a mock client for testing this specific implementation.
-	ClientOverride mcpClient // TODO: Consider if this is the best way to test
-}
-
-// newMCPNative creates a new instance of the native MCP agent implementation.
-func newMCPNative() *MCPNative {
-	return &MCPNative{}
-}
-
-// --- mcpImplementation interface methods ---
-
-func (n *MCPNative) Close() error {
-	n.mu.Lock()
-	defer n.mu.Unlock()
-	n.cleanupResources_locked()
-	return nil // Currently, cleanup doesn't return errors
-}
-
-// --- Internal Helper Methods ---
-
-// ensureClientInitialized starts the MCP server process and initializes the client if needed.
-// MUST be called with the mutex HELD.
-func (n *MCPNative) ensureClientInitialized_locked(ctx context.Context) error {
-	// Use override if provided (for testing)
-	if n.ClientOverride != nil {
-		if n.client == nil {
-			n.client = n.ClientOverride
-			log.Debug(ctx, "Using provided MCP client override for native testing")
-		}
-		return nil
-	}
-
-	// Check if already initialized
-	if n.client != nil {
-		return nil
-	}
-
-	log.Info(ctx, "Initializing Native MCP client and starting/restarting server process...", "serverPath", McpServerPath)
-
-	// Clean up any old resources *before* starting new ones
-	n.cleanupResources_locked()
-
-	hostStdinWriter, hostStdoutReader, nativeCmd, startErr := n.startProcess_locked(ctx)
-	if startErr != nil {
-		log.Error(ctx, "Failed to start Native MCP server process", "error", startErr)
-		// Ensure pipes are closed if start failed (startProcess might handle this, but be sure)
-		if hostStdinWriter != nil {
-			_ = hostStdinWriter.Close()
-		}
-		if hostStdoutReader != nil {
-			_ = hostStdoutReader.Close()
-		}
-		return fmt.Errorf("failed to start native MCP server: %w", startErr)
-	}
-
-	// --- Initialize MCP client ---
-	transport := stdio.NewStdioServerTransportWithIO(hostStdoutReader, hostStdinWriter)
-	clientImpl := mcp.NewClient(transport)
-
-	initCtx, cancel := context.WithTimeout(context.Background(), initializationTimeout)
-	defer cancel()
-	if _, initErr := clientImpl.Initialize(initCtx); initErr != nil {
-		err := fmt.Errorf("failed to initialize native MCP client: %w", initErr)
-		log.Error(ctx, "Native MCP client initialization failed", "error", err)
-		// Cleanup the newly started process and close pipes
-		n.cmd = nativeCmd // Temporarily set cmd so cleanup can kill it
-		n.cleanupResources_locked()
-		if hostStdinWriter != nil {
-			_ = hostStdinWriter.Close()
-		}
-		if hostStdoutReader != nil {
-			_ = hostStdoutReader.Close()
-		}
-		return err
-	}
-
-	// --- Initialization successful, update agent state ---
-	n.cmd = nativeCmd
-	n.stdin = hostStdinWriter // This is the pipe the agent writes to
-	n.client = clientImpl
-
-	log.Info(ctx, "Native MCP client initialized successfully", "pid", n.cmd.Process.Pid)
-	return nil // Success
-}
-
-// callMCPTool handles ensuring initialization and calling the MCP tool.
-func (n *MCPNative) callMCPTool(ctx context.Context, toolName string, args any) (string, error) {
-	// Ensure the client is initialized and the server is running (attempts restart if needed)
-	n.mu.Lock()
-	err := n.ensureClientInitialized_locked(ctx)
-	if err != nil {
-		n.mu.Unlock()
-		log.Error(ctx, "Native MCP agent initialization/restart failed", "tool", toolName, "error", err)
-		return "", fmt.Errorf("native MCP agent not ready: %w", err)
-	}
-
-	// Keep a reference to the client while locked
-	currentClient := n.client
-	// Unlock mutex *before* making the potentially blocking MCP call
-	n.mu.Unlock()
-
-	// Call the tool using the client reference
-	log.Debug(ctx, "Calling Native MCP tool", "tool", toolName, "args", args)
-	response, callErr := currentClient.CallTool(ctx, toolName, args)
-	if callErr != nil {
-		// Handle potential pipe closures or other communication errors
-		log.Error(ctx, "Failed to call Native MCP tool", "tool", toolName, "error", callErr)
-		// Check if the error indicates a broken pipe, suggesting the server died
-		// The monitoring goroutine will handle cleanup, just return error here.
-		if errors.Is(callErr, io.ErrClosedPipe) || strings.Contains(callErr.Error(), "broken pipe") || strings.Contains(callErr.Error(), "EOF") {
-			log.Warn(ctx, "Native MCP tool call failed, possibly due to server process exit.", "tool", toolName)
-			// No need to explicitly call cleanup, monitoring goroutine handles it.
-			return "", fmt.Errorf("native MCP agent process communication error: %w", callErr)
-		}
-		return "", fmt.Errorf("failed to call native MCP tool '%s': %w", toolName, callErr)
-	}
-
-	// Process the response (same logic as before)
-	if response == nil || len(response.Content) == 0 || response.Content[0].TextContent == nil || response.Content[0].TextContent.Text == "" {
-		log.Warn(ctx, "Native MCP tool returned empty/invalid response", "tool", toolName)
-		// Treat as not found for agent interface consistency
-		return "", agents.ErrNotFound // Import agents package if needed, or define locally
-	}
-	resultText := response.Content[0].TextContent.Text
-	if strings.HasPrefix(resultText, "handler returned an error:") {
-		log.Warn(ctx, "Native MCP tool returned an error message", "tool", toolName, "mcpError", resultText)
-		return "", agents.ErrNotFound // Treat MCP tool errors as "not found"
-	}
-
-	log.Debug(ctx, "Received response from Native MCP agent", "tool", toolName, "length", len(resultText))
-	return resultText, nil
-}
-
-// cleanupResources closes existing resources (stdin, server process).
-// MUST be called with the mutex HELD.
-func (n *MCPNative) cleanupResources_locked() {
-	log.Debug(context.Background(), "Cleaning up Native MCP instance resources...")
-	if n.stdin != nil {
-		_ = n.stdin.Close()
-		n.stdin = nil
-	}
-	if n.cmd != nil && n.cmd.Process != nil {
-		pid := n.cmd.Process.Pid
-		log.Debug(context.Background(), "Killing native MCP process", "pid", pid)
-		// Kill the process. Ignore error if it's already done.
-		if err := n.cmd.Process.Kill(); err != nil && !errors.Is(err, os.ErrProcessDone) {
-			log.Error(context.Background(), "Failed to kill native process", "pid", pid, "error", err)
-		}
-		// Wait for the process to release resources. Ignore error.
-		_ = n.cmd.Wait()
-		n.cmd = nil
-	}
-	// Mark client as invalid
-	n.client = nil
-}
-
-// startProcess starts the MCP server as a native executable and sets up monitoring.
-// MUST be called with the mutex HELD.
-func (n *MCPNative) startProcess_locked(ctx context.Context) (stdin io.WriteCloser, stdout io.ReadCloser, cmd *exec.Cmd, err error) {
-	log.Debug(ctx, "Starting native MCP server process", "path", McpServerPath)
-	// Use Background context for the command itself, as it should outlive the request context (ctx)
-	cmd = exec.CommandContext(context.Background(), McpServerPath)
-
-	stdinPipe, err := cmd.StdinPipe()
-	if err != nil {
-		return nil, nil, nil, fmt.Errorf("native stdin pipe: %w", err)
-	}
-
-	stdoutPipe, err := cmd.StdoutPipe()
-	if err != nil {
-		_ = stdinPipe.Close()
-		return nil, nil, nil, fmt.Errorf("native stdout pipe: %w", err)
-	}
-
-	// Get stderr pipe to stream logs
-	stderrPipe, err := cmd.StderrPipe()
-	if err != nil {
-		_ = stdinPipe.Close()
-		_ = stdoutPipe.Close()
-		return nil, nil, nil, fmt.Errorf("native stderr pipe: %w", err)
-	}
-
-	if err = cmd.Start(); err != nil {
-		_ = stdinPipe.Close()
-		_ = stdoutPipe.Close()
-		// stderrPipe gets closed implicitly if cmd.Start() fails
-		return nil, nil, nil, fmt.Errorf("native start: %w", err)
-	}
-
-	currentPid := cmd.Process.Pid
-	currentCmd := cmd // Capture the current cmd pointer for the goroutine
-	log.Info(ctx, "Native MCP server process started", "pid", currentPid)
-
-	// Start monitoring goroutine for process exit
-	go func() {
-		// Start separate goroutine to stream stderr
-		go func() {
-			scanner := bufio.NewScanner(stderrPipe)
-			for scanner.Scan() {
-				log.Info("[MCP-SERVER] " + scanner.Text())
-			}
-			if err := scanner.Err(); err != nil {
-				log.Error("Error reading MCP server stderr", "pid", currentPid, "error", err)
-			}
-			log.Debug("MCP server stderr pipe closed", "pid", currentPid)
-		}()
-
-		waitErr := currentCmd.Wait() // Wait for the specific process this goroutine monitors
-		n.mu.Lock()
-		// Stderr is now streamed, so we don't capture it here anymore.
-		log.Warn("Native MCP server process exited", "pid", currentPid, "error", waitErr)
-
-		// Critical: Check if the agent's current command is STILL the one we were monitoring.
-		// If it's different, it means cleanup/restart already happened, so we shouldn't cleanup again.
-		if n.cmd == currentCmd {
-			n.cleanupResources_locked() // Use the locked version as we hold the lock
-			log.Info("MCP Native agent state cleaned up after process exit", "pid", currentPid)
-		} else {
-			log.Debug("Native MCP process exited, but state already updated/cmd mismatch", "exitedPid", currentPid)
-		}
-		n.mu.Unlock()
-	}()
-
-	// Return the pipes connected to the process and the Cmd object
-	return stdinPipe, stdoutPipe, cmd, nil
-}

core/agents/mcp/mcp_process_wazero.go

@@ -1,305 +0,0 @@
-package mcp
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"sync"
-	"time"
-
-	mcp "github.com/metoro-io/mcp-golang"
-	"github.com/metoro-io/mcp-golang/transport/stdio"
-	"github.com/navidrome/navidrome/core/agents" // Needed for ErrNotFound
-	"github.com/navidrome/navidrome/log"
-	"github.com/tetratelabs/wazero"     // Needed for types
-	"github.com/tetratelabs/wazero/api" // Needed for types
-)
-
-// MCPWasm implements the mcpImplementation interface for running the MCP server as a WASM module.
-type MCPWasm struct {
-	mu           sync.Mutex
-	wasmModule   api.Module // Stores the instantiated module
-	wasmCompiled api.Closer // Stores the compiled module reference for this instance
-	stdin        io.WriteCloser
-	client       mcpClient
-
-	// Shared resources (passed in, not owned by this struct)
-	wasmRuntime       api.Closer              // Shared Wazero Runtime
-	wasmCache         wazero.CompilationCache // Shared Compilation Cache (can be nil)
-	preCompiledModule wazero.CompiledModule   // Pre-compiled module from constructor
-
-	// ClientOverride allows injecting a mock client for testing this specific implementation.
-	ClientOverride mcpClient // TODO: Consider if this is the best way to test
-}
-
-// newMCPWasm creates a new instance of the WASM MCP agent implementation.
-// It stores the shared runtime, cache, and the pre-compiled module.
-func newMCPWasm(runtime api.Closer, cache wazero.CompilationCache, compiledModule wazero.CompiledModule) *MCPWasm {
-	return &MCPWasm{
-		wasmRuntime:       runtime,
-		wasmCache:         cache,
-		preCompiledModule: compiledModule,
-	}
-}
-
-// --- mcpImplementation interface methods ---
-
-// Close cleans up instance-specific WASM resources.
-// It does NOT close the shared runtime or cache.
-func (w *MCPWasm) Close() error {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	w.cleanupResources_locked()
-	return nil
-}
-
-// --- Internal Helper Methods ---
-
-// ensureClientInitialized starts the MCP WASM module and initializes the client if needed.
-// MUST be called with the mutex HELD.
-func (w *MCPWasm) ensureClientInitialized_locked(ctx context.Context) error {
-	// Use override if provided (for testing)
-	if w.ClientOverride != nil {
-		if w.client == nil {
-			w.client = w.ClientOverride
-			log.Debug(ctx, "Using provided MCP client override for WASM testing")
-		}
-		return nil
-	}
-
-	// Check if already initialized
-	if w.client != nil {
-		return nil
-	}
-
-	log.Info(ctx, "Initializing WASM MCP client and starting/restarting server module...", "serverPath", McpServerPath)
-
-	w.cleanupResources_locked()
-
-	// Check if shared runtime exists
-	if w.wasmRuntime == nil {
-		return errors.New("shared Wazero runtime not initialized for MCPWasm")
-	}
-
-	hostStdinWriter, hostStdoutReader, mod, err := w.startModule_locked(ctx)
-	if err != nil {
-		log.Error(ctx, "Failed to start WASM MCP server module", "error", err)
-		// Ensure pipes are closed if start failed
-		if hostStdinWriter != nil {
-			_ = hostStdinWriter.Close()
-		}
-		if hostStdoutReader != nil {
-			_ = hostStdoutReader.Close()
-		}
-		// startModule_locked handles cleanup of mod/compiled on error
-		return fmt.Errorf("failed to start WASM MCP server: %w", err)
-	}
-
-	transport := stdio.NewStdioServerTransportWithIO(hostStdoutReader, hostStdinWriter)
-	clientImpl := mcp.NewClient(transport)
-
-	initCtx, cancel := context.WithTimeout(context.Background(), initializationTimeout)
-	defer cancel()
-	if _, initErr := clientImpl.Initialize(initCtx); initErr != nil {
-		err := fmt.Errorf("failed to initialize WASM MCP client: %w", initErr)
-		log.Error(ctx, "WASM MCP client initialization failed", "error", err)
-		// Cleanup the newly started module and close pipes
-		w.wasmModule = mod   // Temporarily set so cleanup can close it
-		w.wasmCompiled = nil // We don't store the compiled instance ref anymore, just the module instance
-		w.cleanupResources_locked()
-		if hostStdinWriter != nil {
-			_ = hostStdinWriter.Close()
-		}
-		if hostStdoutReader != nil {
-			_ = hostStdoutReader.Close()
-		}
-		return err
-	}
-
-	w.wasmModule = mod
-	w.wasmCompiled = nil // We don't store the compiled instance ref anymore, just the module instance
-	w.stdin = hostStdinWriter
-	w.client = clientImpl
-
-	log.Info(ctx, "WASM MCP client initialized successfully")
-	return nil
-}
-
-// callMCPTool handles ensuring initialization and calling the MCP tool.
-func (w *MCPWasm) callMCPTool(ctx context.Context, toolName string, args any) (string, error) {
-	w.mu.Lock()
-	err := w.ensureClientInitialized_locked(ctx)
-	if err != nil {
-		w.mu.Unlock()
-		log.Error(ctx, "WASM MCP agent initialization/restart failed", "tool", toolName, "error", err)
-		return "", fmt.Errorf("WASM MCP agent not ready: %w", err)
-	}
-
-	// Keep a reference to the client while locked
-	currentClient := w.client
-	// Unlock mutex *before* making the potentially blocking MCP call
-	w.mu.Unlock()
-
-	// Call the tool using the client reference
-	log.Debug(ctx, "Calling WASM MCP tool", "tool", toolName, "args", args)
-	response, callErr := currentClient.CallTool(ctx, toolName, args)
-	if callErr != nil {
-		// Handle potential pipe closures or other communication errors
-		log.Error(ctx, "Failed to call WASM MCP tool", "tool", toolName, "error", callErr)
-		// Check if the error indicates a broken pipe, suggesting the server died
-		// The monitoring goroutine will handle cleanup, just return error here.
-		if errors.Is(callErr, io.ErrClosedPipe) || strings.Contains(callErr.Error(), "broken pipe") || strings.Contains(callErr.Error(), "EOF") {
-			log.Warn(ctx, "WASM MCP tool call failed, possibly due to server module exit.", "tool", toolName)
-			// No need to explicitly call cleanup, monitoring goroutine handles it.
-			return "", fmt.Errorf("WASM MCP agent module communication error: %w", callErr)
-		}
-		return "", fmt.Errorf("failed to call WASM MCP tool '%s': %w", toolName, callErr)
-	}
-
-	// Process the response (same logic as native)
-	if response == nil || len(response.Content) == 0 || response.Content[0].TextContent == nil || response.Content[0].TextContent.Text == "" {
-		log.Warn(ctx, "WASM MCP tool returned empty/invalid response", "tool", toolName)
-		return "", agents.ErrNotFound
-	}
-	resultText := response.Content[0].TextContent.Text
-	if strings.HasPrefix(resultText, "handler returned an error:") {
-		log.Warn(ctx, "WASM MCP tool returned an error message", "tool", toolName, "mcpError", resultText)
-		return "", agents.ErrNotFound // Treat MCP tool errors as "not found"
-	}
-
-	log.Debug(ctx, "Received response from WASM MCP agent", "tool", toolName, "length", len(resultText))
-	return resultText, nil
-}
-
-// cleanupResources closes instance-specific WASM resources (stdin, module, compiled ref).
-// It specifically avoids closing the shared runtime or cache.
-// MUST be called with the mutex HELD.
-func (w *MCPWasm) cleanupResources_locked() {
-	log.Debug(context.Background(), "Cleaning up WASM MCP instance resources...")
-	if w.stdin != nil {
-		_ = w.stdin.Close()
-		w.stdin = nil
-	}
-	// Close the module instance
-	if w.wasmModule != nil {
-		log.Debug(context.Background(), "Closing WASM module instance")
-		ctxClose, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-		if err := w.wasmModule.Close(ctxClose); err != nil && !errors.Is(err, context.DeadlineExceeded) {
-			log.Error(context.Background(), "Failed to close WASM module instance", "error", err)
-		}
-		cancel()
-		w.wasmModule = nil
-	}
-	// DO NOT close w.wasmCompiled (instance ref)
-	// DO NOT close w.preCompiledModule (shared pre-compiled code)
-	// DO NOT CLOSE w.wasmRuntime or w.wasmCache here!
-	w.client = nil
-}
-
-// startModule loads and starts the MCP server as a WASM module.
-// It now uses the pre-compiled module.
-// MUST be called with the mutex HELD.
-func (w *MCPWasm) startModule_locked(ctx context.Context) (hostStdinWriter io.WriteCloser, hostStdoutReader io.ReadCloser, mod api.Module, err error) {
-	// Check for pre-compiled module
-	if w.preCompiledModule == nil {
-		return nil, nil, nil, errors.New("pre-compiled WASM module is nil")
-	}
-
-	// Create pipes for stdio redirection
-	wasmStdinReader, hostStdinWriter, err := os.Pipe()
-	if err != nil {
-		return nil, nil, nil, fmt.Errorf("wasm stdin pipe: %w", err)
-	}
-	// Defer close pipes on error exit
-	shouldClosePipesOnError := true
-	defer func() {
-		if shouldClosePipesOnError {
-			if wasmStdinReader != nil {
-				_ = wasmStdinReader.Close()
-			}
-			if hostStdinWriter != nil {
-				_ = hostStdinWriter.Close()
-			}
-			// hostStdoutReader and wasmStdoutWriter handled below
-		}
-	}()
-
-	hostStdoutReader, wasmStdoutWriter, err := os.Pipe()
-	if err != nil {
-		return nil, nil, nil, fmt.Errorf("wasm stdout pipe: %w", err)
-	}
-	// Defer close pipes on error exit
-	defer func() {
-		if shouldClosePipesOnError {
-			if hostStdoutReader != nil {
-				_ = hostStdoutReader.Close()
-			}
-			if wasmStdoutWriter != nil {
-				_ = wasmStdoutWriter.Close()
-			}
-		}
-	}()
-
-	// Use the SHARDED runtime from the agent struct
-	runtime, ok := w.wasmRuntime.(wazero.Runtime)
-	if !ok || runtime == nil {
-		return nil, nil, nil, errors.New("wasmRuntime is not initialized or not a wazero.Runtime")
-	}
-
-	// Prepare module configuration (host funcs/WASI already instantiated on runtime)
-	config := wazero.NewModuleConfig().
-		WithStdin(wasmStdinReader).
-		WithStdout(wasmStdoutWriter).
-		WithStderr(os.Stderr).
-		WithArgs(McpServerPath).
-		WithFS(os.DirFS("/")) // Keep FS access for now
-
-	log.Info(ctx, "Instantiating pre-compiled WASM module (will run _start)...")
-	var moduleInstance api.Module
-	instanceErrChan := make(chan error, 1)
-	go func() {
-		var instantiateErr error
-		// Use context.Background() for the module's main execution context
-		moduleInstance, instantiateErr = runtime.InstantiateModule(context.Background(), w.preCompiledModule, config)
-		instanceErrChan <- instantiateErr
-	}()
-
-	// Wait briefly for immediate instantiation errors
-	select {
-	case instantiateErr := <-instanceErrChan:
-		if instantiateErr != nil {
-			log.Error(ctx, "Failed to instantiate pre-compiled WASM module", "error", instantiateErr)
-			// Pipes closed by defer
-			return nil, nil, nil, fmt.Errorf("instantiate wasm module: %w", instantiateErr)
-		}
-		log.Warn(ctx, "WASM module instantiation returned (exited?) immediately without error.")
-	case <-time.After(1 * time.Second): // Shorter wait now, instantiation should be faster
-		log.Debug(ctx, "WASM module instantiation likely blocking (server running), proceeding...")
-	}
-
-	// Start a monitoring goroutine for WASM module exit/error
-	go func(instanceToMonitor api.Module, errChan chan error) {
-		// This blocks until the instance created by InstantiateModule exits or errors.
-		instantiateErr := <-errChan
-
-		w.mu.Lock() // Lock the specific MCPWasm instance
-		log.Warn("WASM module exited/errored", "error", instantiateErr)
-
-		// Critical: Check if the agent's current module is STILL the one we were monitoring.
-		if w.wasmModule == instanceToMonitor {
-			w.cleanupResources_locked() // Use the locked version
-			log.Info("MCP WASM agent state cleaned up after module exit/error")
-		} else {
-			log.Debug("WASM module exited, but state already updated/module mismatch. No cleanup needed by this goroutine.")
-			// No need to close anything here, the pre-compiled module is shared
-		}
-		w.mu.Unlock()
-	}(moduleInstance, instanceErrChan)
-
-	// Success: prevent deferred cleanup of pipes
-	shouldClosePipesOnError = false
-	return hostStdinWriter, hostStdoutReader, moduleInstance, nil
-}

core/agents/mcp/mcp_suite_test.go

@@ -1,17 +0,0 @@
-package mcp_test
-
-import (
-	"testing"
-
-	"github.com/navidrome/navidrome/log"
-	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-func TestMCPAgent(t *testing.T) {
-	tests.Init(t, false)
-	log.SetLevel(log.LevelFatal)
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "MCP Agent Test Suite")
-}

core/agents/spotify/spotify.go

@@ -13,7 +13,7 @@ import (
 	"github.com/navidrome/navidrome/core/agents"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
-	"github.com/navidrome/navidrome/utils/cache"
+	"github.com/navidrome/navidrome/utils"
 	"github.com/xrash/smetrics"
 )
 
@@ -27,9 +27,6 @@ type spotifyAgent struct {
 }
 
 func spotifyConstructor(ds model.DataStore) agents.Interface {
-	if conf.Server.Spotify.ID == "" || conf.Server.Spotify.Secret == "" {
-		return nil
-	}
 	l := &spotifyAgent{
 		ds:     ds,
 		id:     conf.Server.Spotify.ID,
@@ -38,7 +35,7 @@ func spotifyConstructor(ds model.DataStore) agents.Interface {
 	hc := &http.Client{
 		Timeout: consts.DefaultHttpClientTimeOut,
 	}
-	chc := cache.NewHTTPClient(hc, consts.DefaultHttpClientTimeOut)
+	chc := utils.NewCachedHTTPClient(hc, consts.DefaultHttpClientTimeOut)
 	l.client = newClient(l.id, l.secret, chc)
 	return l
 }
@@ -91,6 +88,8 @@ func (s *spotifyAgent) searchArtist(ctx context.Context, name string) (*Artist,
 
 func init() {
 	conf.AddHook(func() {
-		agents.Register(spotifyAgentName, spotifyConstructor)
+		if conf.Server.Spotify.ID != "" && conf.Server.Spotify.Secret != "" {
+			agents.Register(spotifyAgentName, spotifyConstructor)
+		}
 	})
 }

core/archiver.go

@@ -53,11 +53,11 @@ func (a *archiver) zipAlbums(ctx context.Context, id string, format string, bitr
 	})
 	for _, album := range albums {
 		discs := slice.Group(album, func(mf model.MediaFile) int { return mf.DiscNumber })
-		isMultiDisc := len(discs) > 1
+		isMultDisc := len(discs) > 1
 		log.Debug(ctx, "Zipping album", "name", album[0].Album, "artist", album[0].AlbumArtist,
-			"format", format, "bitrate", bitrate, "isMultiDisc", isMultiDisc, "numTracks", len(album))
+			"format", format, "bitrate", bitrate, "isMultDisc", isMultDisc, "numTracks", len(album))
 		for _, mf := range album {
-			file := a.albumFilename(mf, format, isMultiDisc)
+			file := a.albumFilename(mf, format, isMultDisc)
 			_ = a.addFileToZip(ctx, z, mf, format, bitrate, file)
 		}
 	}
@@ -78,31 +78,31 @@ func createZipWriter(out io.Writer, format string, bitrate int) *zip.Writer {
 	return z
 }
 
-func (a *archiver) albumFilename(mf model.MediaFile, format string, isMultiDisc bool) string {
+func (a *archiver) albumFilename(mf model.MediaFile, format string, isMultDisc bool) string {
 	_, file := filepath.Split(mf.Path)
 	if format != "raw" {
 		file = strings.TrimSuffix(file, mf.Suffix) + format
 	}
-	if isMultiDisc {
+	if isMultDisc {
 		file = fmt.Sprintf("Disc %02d/%s", mf.DiscNumber, file)
 	}
-	return fmt.Sprintf("%s/%s", sanitizeName(mf.Album), file)
+	return fmt.Sprintf("%s/%s", mf.Album, file)
 }
 
 func (a *archiver) ZipShare(ctx context.Context, id string, out io.Writer) error {
 	s, err := a.shares.Load(ctx, id)
-	if err != nil {
-		return err
-	}
 	if !s.Downloadable {
 		return model.ErrNotAuthorized
 	}
+	if err != nil {
+		return err
+	}
 	log.Debug(ctx, "Zipping share", "name", s.ID, "format", s.Format, "bitrate", s.MaxBitRate, "numTracks", len(s.Tracks))
 	return a.zipMediaFiles(ctx, id, s.Format, s.MaxBitRate, out, s.Tracks)
 }
 
 func (a *archiver) ZipPlaylist(ctx context.Context, id string, format string, bitrate int, out io.Writer) error {
-	pls, err := a.ds.Playlist(ctx).GetWithTracks(id, true, false)
+	pls, err := a.ds.Playlist(ctx).GetWithTracks(id, true)
 	if err != nil {
 		log.Error(ctx, "Error loading mediafiles from playlist", "id", id, err)
 		return err
@@ -130,45 +130,41 @@ func (a *archiver) playlistFilename(mf model.MediaFile, format string, idx int)
 	if format != "" && format != "raw" {
 		ext = format
 	}
-	return fmt.Sprintf("%02d - %s - %s.%s", idx+1, sanitizeName(mf.Artist), sanitizeName(mf.Title), ext)
-}
-
-func sanitizeName(target string) string {
-	return strings.ReplaceAll(target, "/", "_")
+	file := fmt.Sprintf("%02d - %s - %s.%s", idx+1, mf.Artist, mf.Title, ext)
+	return file
 }
 
 func (a *archiver) addFileToZip(ctx context.Context, z *zip.Writer, mf model.MediaFile, format string, bitrate int, filename string) error {
-	path := mf.AbsolutePath()
 	w, err := z.CreateHeader(&zip.FileHeader{
 		Name:     filename,
 		Modified: mf.UpdatedAt,
 		Method:   zip.Store,
 	})
 	if err != nil {
-		log.Error(ctx, "Error creating zip entry", "file", path, err)
+		log.Error(ctx, "Error creating zip entry", "file", mf.Path, err)
 		return err
 	}
 
 	var r io.ReadCloser
 	if format != "raw" && format != "" {
-		r, err = a.ms.DoStream(ctx, &mf, format, bitrate, 0)
+		r, err = a.ms.DoStream(ctx, &mf, format, bitrate)
 	} else {
-		r, err = os.Open(path)
+		r, err = os.Open(mf.Path)
 	}
 	if err != nil {
-		log.Error(ctx, "Error opening file for zipping", "file", path, "format", format, err)
+		log.Error(ctx, "Error opening file for zipping", "file", mf.Path, "format", format, err)
 		return err
 	}
 
 	defer func() {
-		if err := r.Close(); err != nil && log.IsGreaterOrEqualTo(log.LevelDebug) {
-			log.Error(ctx, "Error closing stream", "id", mf.ID, "file", path, err)
+		if err := r.Close(); err != nil && log.CurrentLevel() >= log.LevelDebug {
+			log.Error(ctx, "Error closing stream", "id", mf.ID, "file", mf.Path, err)
 		}
 	}()
 
 	_, err = io.Copy(w, r)
 	if err != nil {
-		log.Error(ctx, "Error zipping file", "file", path, err)
+		log.Error(ctx, "Error zipping file", "file", mf.Path, err)
 		return err
 	}
 

core/archiver_test.go

@@ -25,16 +25,16 @@ var _ = Describe("Archiver", func() {
 
 	BeforeEach(func() {
 		ms = &mockMediaStreamer{}
-		sh = &mockShare{}
 		ds = &mockDataStore{}
+		sh = &mockShare{}
 		arch = core.NewArchiver(ms, ds, sh)
 	})
 
 	Context("ZipAlbum", func() {
 		It("zips an album correctly", func() {
 			mfs := model.MediaFiles{
-				{Path: "test_data/01 - track1.mp3", Suffix: "mp3", AlbumID: "1", Album: "Album/Promo", DiscNumber: 1},
-				{Path: "test_data/02 - track2.mp3", Suffix: "mp3", AlbumID: "1", Album: "Album/Promo", DiscNumber: 1},
+				{Path: "test_data/01 - track1.mp3", Suffix: "mp3", AlbumID: "1", Album: "Album 1", DiscNumber: 1},
+				{Path: "test_data/02 - track2.mp3", Suffix: "mp3", AlbumID: "1", Album: "Album 1", DiscNumber: 1},
 			}
 
 			mfRepo := &mockMediaFileRepository{}
@@ -44,7 +44,7 @@ var _ = Describe("Archiver", func() {
 			}}).Return(mfs, nil)
 
 			ds.On("MediaFile", mock.Anything).Return(mfRepo)
-			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128, 0).Return(io.NopCloser(strings.NewReader("test")), nil).Times(3)
+			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128).Return(io.NopCloser(strings.NewReader("test")), nil).Times(2)
 
 			out := new(bytes.Buffer)
 			err := arch.ZipAlbum(context.Background(), "1", "mp3", 128, out)
@@ -54,8 +54,8 @@ var _ = Describe("Archiver", func() {
 			Expect(err).To(BeNil())
 
 			Expect(len(zr.File)).To(Equal(2))
-			Expect(zr.File[0].Name).To(Equal("Album_Promo/01 - track1.mp3"))
-			Expect(zr.File[1].Name).To(Equal("Album_Promo/02 - track2.mp3"))
+			Expect(zr.File[0].Name).To(Equal("Album 1/01 - track1.mp3"))
+			Expect(zr.File[1].Name).To(Equal("Album 1/02 - track2.mp3"))
 		})
 	})
 
@@ -73,7 +73,7 @@ var _ = Describe("Archiver", func() {
 			}}).Return(mfs, nil)
 
 			ds.On("MediaFile", mock.Anything).Return(mfRepo)
-			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128, 0).Return(io.NopCloser(strings.NewReader("test")), nil).Times(2)
+			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128).Return(io.NopCloser(strings.NewReader("test")), nil).Times(2)
 
 			out := new(bytes.Buffer)
 			err := arch.ZipArtist(context.Background(), "1", "mp3", 128, out)
@@ -104,7 +104,7 @@ var _ = Describe("Archiver", func() {
 			}
 
 			sh.On("Load", mock.Anything, "1").Return(share, nil)
-			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128, 0).Return(io.NopCloser(strings.NewReader("test")), nil).Times(2)
+			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128).Return(io.NopCloser(strings.NewReader("test")), nil).Times(2)
 
 			out := new(bytes.Buffer)
 			err := arch.ZipShare(context.Background(), "1", out)
@@ -123,7 +123,7 @@ var _ = Describe("Archiver", func() {
 	Context("ZipPlaylist", func() {
 		It("zips a playlist correctly", func() {
 			tracks := []model.PlaylistTrack{
-				{MediaFile: model.MediaFile{Path: "test_data/01 - track1.mp3", Suffix: "mp3", AlbumID: "1", Album: "Album 1", DiscNumber: 1, Artist: "AC/DC", Title: "track1"}},
+				{MediaFile: model.MediaFile{Path: "test_data/01 - track1.mp3", Suffix: "mp3", AlbumID: "1", Album: "Album 1", DiscNumber: 1, Artist: "Artist 1", Title: "track1"}},
 				{MediaFile: model.MediaFile{Path: "test_data/02 - track2.mp3", Suffix: "mp3", AlbumID: "1", Album: "Album 1", DiscNumber: 1, Artist: "Artist 2", Title: "track2"}},
 			}
 
@@ -134,9 +134,9 @@ var _ = Describe("Archiver", func() {
 			}
 
 			plRepo := &mockPlaylistRepository{}
-			plRepo.On("GetWithTracks", "1", true, false).Return(pls, nil)
+			plRepo.On("GetWithTracks", "1", true).Return(pls, nil)
 			ds.On("Playlist", mock.Anything).Return(plRepo)
-			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128, 0).Return(io.NopCloser(strings.NewReader("test")), nil).Times(2)
+			ms.On("DoStream", mock.Anything, mock.Anything, "mp3", 128).Return(io.NopCloser(strings.NewReader("test")), nil).Times(2)
 
 			out := new(bytes.Buffer)
 			err := arch.ZipPlaylist(context.Background(), "1", "mp3", 128, out)
@@ -146,7 +146,7 @@ var _ = Describe("Archiver", func() {
 			Expect(err).To(BeNil())
 
 			Expect(len(zr.File)).To(Equal(2))
-			Expect(zr.File[0].Name).To(Equal("01 - AC_DC - track1.mp3"))
+			Expect(zr.File[0].Name).To(Equal("01 - Artist 1 - track1.mp3"))
 			Expect(zr.File[1].Name).To(Equal("02 - Artist 2 - track2.mp3"))
 		})
 	})
@@ -167,19 +167,6 @@ func (m *mockDataStore) Playlist(ctx context.Context) model.PlaylistRepository {
 	return args.Get(0).(model.PlaylistRepository)
 }
 
-func (m *mockDataStore) Library(context.Context) model.LibraryRepository {
-	return &mockLibraryRepository{}
-}
-
-type mockLibraryRepository struct {
-	mock.Mock
-	model.LibraryRepository
-}
-
-func (m *mockLibraryRepository) GetPath(id int) (string, error) {
-	return "/music", nil
-}
-
 type mockMediaFileRepository struct {
 	mock.Mock
 	model.MediaFileRepository
@@ -195,8 +182,8 @@ type mockPlaylistRepository struct {
 	model.PlaylistRepository
 }
 
-func (m *mockPlaylistRepository) GetWithTracks(id string, refreshSmartPlaylists, includeMissing bool) (*model.Playlist, error) {
-	args := m.Called(id, refreshSmartPlaylists, includeMissing)
+func (m *mockPlaylistRepository) GetWithTracks(id string, includeTracks bool) (*model.Playlist, error) {
+	args := m.Called(id, includeTracks)
 	return args.Get(0).(*model.Playlist), args.Error(1)
 }
 
@@ -205,8 +192,8 @@ type mockMediaStreamer struct {
 	core.MediaStreamer
 }
 
-func (m *mockMediaStreamer) DoStream(ctx context.Context, mf *model.MediaFile, reqFormat string, reqBitRate int, reqOffset int) (*core.Stream, error) {
-	args := m.Called(ctx, mf, reqFormat, reqBitRate, reqOffset)
+func (m *mockMediaStreamer) DoStream(ctx context.Context, mf *model.MediaFile, format string, bitrate int) (*core.Stream, error) {
+	args := m.Called(ctx, mf, format, bitrate)
 	if args.Error(1) != nil {
 		return nil, args.Error(1)
 	}

core/artwork/artwork.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/external"
+	"github.com/navidrome/navidrome/core"
 	"github.com/navidrome/navidrome/core/ffmpeg"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
@@ -20,19 +20,19 @@ import (
 var ErrUnavailable = errors.New("artwork unavailable")
 
 type Artwork interface {
-	Get(ctx context.Context, artID model.ArtworkID, size int, square bool) (io.ReadCloser, time.Time, error)
-	GetOrPlaceholder(ctx context.Context, id string, size int, square bool) (io.ReadCloser, time.Time, error)
+	Get(ctx context.Context, artID model.ArtworkID, size int) (io.ReadCloser, time.Time, error)
+	GetOrPlaceholder(ctx context.Context, id string, size int) (io.ReadCloser, time.Time, error)
 }
 
-func NewArtwork(ds model.DataStore, cache cache.FileCache, ffmpeg ffmpeg.FFmpeg, provider external.Provider) Artwork {
-	return &artwork{ds: ds, cache: cache, ffmpeg: ffmpeg, provider: provider}
+func NewArtwork(ds model.DataStore, cache cache.FileCache, ffmpeg ffmpeg.FFmpeg, em core.ExternalMetadata) Artwork {
+	return &artwork{ds: ds, cache: cache, ffmpeg: ffmpeg, em: em}
 }
 
 type artwork struct {
-	ds       model.DataStore
-	cache    cache.FileCache
-	ffmpeg   ffmpeg.FFmpeg
-	provider external.Provider
+	ds     model.DataStore
+	cache  cache.FileCache
+	ffmpeg ffmpeg.FFmpeg
+	em     core.ExternalMetadata
 }
 
 type artworkReader interface {
@@ -41,10 +41,10 @@ type artworkReader interface {
 	Reader(ctx context.Context) (io.ReadCloser, string, error)
 }
 
-func (a *artwork) GetOrPlaceholder(ctx context.Context, id string, size int, square bool) (reader io.ReadCloser, lastUpdate time.Time, err error) {
+func (a *artwork) GetOrPlaceholder(ctx context.Context, id string, size int) (reader io.ReadCloser, lastUpdate time.Time, err error) {
 	artID, err := a.getArtworkId(ctx, id)
 	if err == nil {
-		reader, lastUpdate, err = a.Get(ctx, artID, size, square)
+		reader, lastUpdate, err = a.Get(ctx, artID, size)
 	}
 	if errors.Is(err, ErrUnavailable) {
 		if artID.Kind == model.KindArtistArtwork {
@@ -57,8 +57,8 @@ func (a *artwork) GetOrPlaceholder(ctx context.Context, id string, size int, squ
 	return reader, lastUpdate, err
 }
 
-func (a *artwork) Get(ctx context.Context, artID model.ArtworkID, size int, square bool) (reader io.ReadCloser, lastUpdate time.Time, err error) {
-	artReader, err := a.getArtworkReader(ctx, artID, size, square)
+func (a *artwork) Get(ctx context.Context, artID model.ArtworkID, size int) (reader io.ReadCloser, lastUpdate time.Time, err error) {
+	artReader, err := a.getArtworkReader(ctx, artID, size)
 	if err != nil {
 		return nil, time.Time{}, err
 	}
@@ -107,17 +107,17 @@ func (a *artwork) getArtworkId(ctx context.Context, id string) (model.ArtworkID,
 	return artID, nil
 }
 
-func (a *artwork) getArtworkReader(ctx context.Context, artID model.ArtworkID, size int, square bool) (artworkReader, error) {
+func (a *artwork) getArtworkReader(ctx context.Context, artID model.ArtworkID, size int) (artworkReader, error) {
 	var artReader artworkReader
 	var err error
-	if size > 0 || square {
-		artReader, err = resizedFromOriginal(ctx, a, artID, size, square)
+	if size > 0 {
+		artReader, err = resizedFromOriginal(ctx, a, artID, size)
 	} else {
 		switch artID.Kind {
 		case model.KindArtistArtwork:
-			artReader, err = newArtistReader(ctx, a, artID, a.provider)
+			artReader, err = newArtistReader(ctx, a, artID, a.em)
 		case model.KindAlbumArtwork:
-			artReader, err = newAlbumArtworkReader(ctx, a, artID, a.provider)
+			artReader, err = newAlbumArtworkReader(ctx, a, artID, a.em)
 		case model.KindMediaFileArtwork:
 			artReader, err = newMediafileArtworkReader(ctx, a, artID)
 		case model.KindPlaylistArtwork:

core/artwork/artwork_internal_test.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/conf/configtest"
+	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
@@ -15,8 +16,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-// TODO Fix tests
-var _ = XDescribe("Artwork", func() {
+var _ = Describe("Artwork", func() {
 	var aw *artwork
 	var ds model.DataStore
 	var ffmpeg *tests.MockFFmpeg
@@ -33,17 +33,17 @@ var _ = XDescribe("Artwork", func() {
 		ds = &tests.MockDataStore{MockedTranscoding: &tests.MockTranscodingRepo{}}
 		alOnlyEmbed = model.Album{ID: "222", Name: "Only embed", EmbedArtPath: "tests/fixtures/artist/an-album/test.mp3"}
 		alEmbedNotFound = model.Album{ID: "333", Name: "Embed not found", EmbedArtPath: "tests/fixtures/NON_EXISTENT.mp3"}
-		//alOnlyExternal = model.Album{ID: "444", Name: "Only external", ImageFiles: "tests/fixtures/artist/an-album/front.png"}
-		//alExternalNotFound = model.Album{ID: "555", Name: "External not found", ImageFiles: "tests/fixtures/NON_EXISTENT.png"}
+		alOnlyExternal = model.Album{ID: "444", Name: "Only external", ImageFiles: "tests/fixtures/artist/an-album/front.png"}
+		alExternalNotFound = model.Album{ID: "555", Name: "External not found", ImageFiles: "tests/fixtures/NON_EXISTENT.png"}
 		arMultipleCovers = model.Artist{ID: "777", Name: "All options"}
 		alMultipleCovers = model.Album{
 			ID:           "666",
 			Name:         "All options",
 			EmbedArtPath: "tests/fixtures/artist/an-album/test.mp3",
-			//Paths:        []string{"tests/fixtures/artist/an-album"},
-			//ImageFiles: "tests/fixtures/artist/an-album/cover.jpg" + consts.Zwsp +
-			//	"tests/fixtures/artist/an-album/front.png" + consts.Zwsp +
-			//	"tests/fixtures/artist/an-album/artist.png",
+			Paths:        "tests/fixtures/artist/an-album",
+			ImageFiles: "tests/fixtures/artist/an-album/cover.jpg" + consts.Zwsp +
+				"tests/fixtures/artist/an-album/front.png" + consts.Zwsp +
+				"tests/fixtures/artist/an-album/artist.png",
 			AlbumArtistID: "777",
 		}
 		mfWithEmbed = model.MediaFile{ID: "22", Path: "tests/fixtures/test.mp3", HasCoverArt: true, AlbumID: "222"}
@@ -211,83 +211,33 @@ var _ = XDescribe("Artwork", func() {
 				alMultipleCovers,
 			})
 		})
-		When("Square is false", func() {
-			It("returns a PNG if original image is a PNG", func() {
-				conf.Server.CoverArtPriority = "front.png"
-				r, _, err := aw.Get(context.Background(), alMultipleCovers.CoverArtID(), 15, false)
-				Expect(err).ToNot(HaveOccurred())
+		It("returns a PNG if original image is a PNG", func() {
+			conf.Server.CoverArtPriority = "front.png"
+			r, _, err := aw.Get(context.Background(), alMultipleCovers.CoverArtID(), 15)
+			Expect(err).ToNot(HaveOccurred())
 
-				img, format, err := image.Decode(r)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(format).To(Equal("png"))
-				Expect(img.Bounds().Size().X).To(Equal(15))
-				Expect(img.Bounds().Size().Y).To(Equal(15))
-			})
-			It("returns a JPEG if original image is not a PNG", func() {
-				conf.Server.CoverArtPriority = "cover.jpg"
-				r, _, err := aw.Get(context.Background(), alMultipleCovers.CoverArtID(), 200, false)
-				Expect(err).ToNot(HaveOccurred())
+			br, format, err := asImageReader(r)
+			Expect(format).To(Equal("image/png"))
+			Expect(err).ToNot(HaveOccurred())
 
-				img, format, err := image.Decode(r)
-				Expect(format).To(Equal("jpeg"))
-				Expect(err).ToNot(HaveOccurred())
-				Expect(img.Bounds().Size().X).To(Equal(200))
-				Expect(img.Bounds().Size().Y).To(Equal(200))
-			})
+			img, _, err := image.Decode(br)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(img.Bounds().Size().X).To(Equal(15))
+			Expect(img.Bounds().Size().Y).To(Equal(15))
 		})
-		When("When square is true", func() {
-			var alCover model.Album
+		It("returns a JPEG if original image is not a PNG", func() {
+			conf.Server.CoverArtPriority = "cover.jpg"
+			r, _, err := aw.Get(context.Background(), alMultipleCovers.CoverArtID(), 200)
+			Expect(err).ToNot(HaveOccurred())
 
-			DescribeTable("resize",
-				func(format string, landscape bool, size int) {
-					coverFileName := "cover." + format
-					//dirName := createImage(format, landscape, size)
-					alCover = model.Album{
-						ID:   "444",
-						Name: "Only external",
-						//ImageFiles: filepath.Join(dirName, coverFileName),
-					}
-					ds.Album(ctx).(*tests.MockAlbumRepo).SetData(model.Albums{
-						alCover,
-					})
+			br, format, err := asImageReader(r)
+			Expect(format).To(Equal("image/jpeg"))
+			Expect(err).ToNot(HaveOccurred())
 
-					conf.Server.CoverArtPriority = coverFileName
-					r, _, err := aw.Get(context.Background(), alCover.CoverArtID(), size, true)
-					Expect(err).ToNot(HaveOccurred())
-
-					img, format, err := image.Decode(r)
-					Expect(err).ToNot(HaveOccurred())
-					Expect(format).To(Equal("png"))
-					Expect(img.Bounds().Size().X).To(Equal(size))
-					Expect(img.Bounds().Size().Y).To(Equal(size))
-				},
-				Entry("portrait png image", "png", false, 200),
-				Entry("landscape png image", "png", true, 200),
-				Entry("portrait jpg image", "jpg", false, 200),
-				Entry("landscape jpg image", "jpg", true, 200),
-			)
+			img, _, err := image.Decode(br)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(img.Bounds().Size().X).To(Equal(200))
+			Expect(img.Bounds().Size().Y).To(Equal(200))
 		})
 	})
 })
-
-//func createImage(format string, landscape bool, size int) string {
-//	var img image.Image
-//
-//	if landscape {
-//		img = image.NewRGBA(image.Rect(0, 0, size, size/2))
-//	} else {
-//		img = image.NewRGBA(image.Rect(0, 0, size/2, size))
-//	}
-//
-//	tmpDir := GinkgoT().TempDir()
-//	f, _ := os.Create(filepath.Join(tmpDir, "cover."+format))
-//	defer f.Close()
-//	switch format {
-//	case "png":
-//		_ = png.Encode(f, img)
-//	case "jpg":
-//		_ = jpeg.Encode(f, img, &jpeg.Options{Quality: 75})
-//	}
-//
-//	return tmpDir
-//}

core/artwork/artwork_test.go

@@ -31,7 +31,7 @@ var _ = Describe("Artwork", func() {
 	Context("GetOrPlaceholder", func() {
 		Context("Empty ID", func() {
 			It("returns placeholder if album is not in the DB", func() {
-				r, _, err := aw.GetOrPlaceholder(context.Background(), "", 0, false)
+				r, _, err := aw.GetOrPlaceholder(context.Background(), "", 0)
 				Expect(err).ToNot(HaveOccurred())
 
 				ph, err := resources.FS().Open(consts.PlaceholderAlbumArt)
@@ -49,7 +49,7 @@ var _ = Describe("Artwork", func() {
 	Context("Get", func() {
 		Context("Empty ID", func() {
 			It("returns an ErrUnavailable error", func() {
-				_, _, err := aw.Get(context.Background(), model.ArtworkID{}, 0, false)
+				_, _, err := aw.Get(context.Background(), model.ArtworkID{}, 0)
 				Expect(err).To(MatchError(artwork.ErrUnavailable))
 			})
 		})

core/artwork/cache_warmer.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"maps"
-	"slices"
 	"sync"
 	"time"
 
@@ -16,15 +14,13 @@ import (
 	"github.com/navidrome/navidrome/model/request"
 	"github.com/navidrome/navidrome/utils/cache"
 	"github.com/navidrome/navidrome/utils/pl"
+	"golang.org/x/exp/maps"
 )
 
 type CacheWarmer interface {
 	PreCache(artID model.ArtworkID)
 }
 
-// NewCacheWarmer creates a new CacheWarmer instance. The CacheWarmer will pre-cache Artwork images in the background
-// to speed up the response time when the image is requested by the UI. The cache is pre-populated with the original
-// image size, as well as the size defined in the UICoverArtSize constant.
 func NewCacheWarmer(artwork Artwork, cache cache.FileCache) CacheWarmer {
 	// If image cache is disabled, return a NOOP implementation
 	if conf.Server.ImageCacheSize == "0" || !conf.Server.EnableArtworkPrecache {
@@ -52,7 +48,15 @@ type cacheWarmer struct {
 	wakeSignal chan struct{}
 }
 
+var ignoredIds = map[string]struct{}{
+	consts.VariousArtistsID: {},
+	consts.UnknownArtistID:  {},
+}
+
 func (a *cacheWarmer) PreCache(artID model.ArtworkID) {
+	if _, shouldIgnore := ignoredIds[artID.ID]; shouldIgnore {
+		return
+	}
 	a.mutex.Lock()
 	defer a.mutex.Unlock()
 	a.buffer[artID] = struct{}{}
@@ -90,7 +94,7 @@ func (a *cacheWarmer) run(ctx context.Context) {
 			continue
 		}
 
-		batch := slices.Collect(maps.Keys(a.buffer))
+		batch := maps.Keys(a.buffer)
 		a.buffer = make(map[model.ArtworkID]struct{})
 		a.mutex.Unlock()
 
@@ -99,8 +103,14 @@ func (a *cacheWarmer) run(ctx context.Context) {
 }
 
 func (a *cacheWarmer) waitSignal(ctx context.Context, timeout time.Duration) {
+	var to <-chan time.Time
+	if !a.cache.Available(ctx) {
+		tmr := time.NewTimer(timeout)
+		defer tmr.Stop()
+		to = tmr.C
+	}
 	select {
-	case <-time.After(timeout):
+	case <-to:
 	case <-a.wakeSignal:
 	case <-ctx.Done():
 	}
@@ -111,7 +121,7 @@ func (a *cacheWarmer) processBatch(ctx context.Context, batch []model.ArtworkID)
 	input := pl.FromSlice(ctx, batch)
 	errs := pl.Sink(ctx, 2, input, a.doCacheImage)
 	for err := range errs {
-		log.Debug(ctx, "Error warming cache", err)
+		log.Warn(ctx, "Error warming cache", err)
 	}
 }
 
@@ -119,9 +129,9 @@ func (a *cacheWarmer) doCacheImage(ctx context.Context, id model.ArtworkID) erro
 	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
 	defer cancel()
 
-	r, _, err := a.artwork.Get(ctx, id, consts.UICoverArtSize, true)
+	r, _, err := a.artwork.Get(ctx, id, consts.UICoverArtSize)
 	if err != nil {
-		return fmt.Errorf("caching id='%s': %w", id, err)
+		return fmt.Errorf("error cacheing id='%s': %w", id, err)
 	}
 	defer r.Close()
 	_, err = io.Copy(io.Discard, r)
@@ -131,10 +141,6 @@ func (a *cacheWarmer) doCacheImage(ctx context.Context, id model.ArtworkID) erro
 	return nil
 }
 
-func NoopCacheWarmer() CacheWarmer {
-	return &noopCacheWarmer{}
-}
-
 type noopCacheWarmer struct{}
 
 func (a *noopCacheWarmer) PreCache(model.ArtworkID) {}

core/artwork/reader_album.go

@@ -5,52 +5,34 @@ import (
 	"crypto/md5"
 	"fmt"
 	"io"
-	"path/filepath"
-	"slices"
 	"strings"
 	"time"
 
-	"github.com/Masterminds/squirrel"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/core"
-	"github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/core/ffmpeg"
 	"github.com/navidrome/navidrome/model"
 )
 
 type albumArtworkReader struct {
 	cacheKey
-	a          *artwork
-	provider   external.Provider
-	album      model.Album
-	updatedAt  *time.Time
-	imgFiles   []string
-	rootFolder string
+	a     *artwork
+	em    core.ExternalMetadata
+	album model.Album
 }
 
-func newAlbumArtworkReader(ctx context.Context, artwork *artwork, artID model.ArtworkID, provider external.Provider) (*albumArtworkReader, error) {
+func newAlbumArtworkReader(ctx context.Context, artwork *artwork, artID model.ArtworkID, em core.ExternalMetadata) (*albumArtworkReader, error) {
 	al, err := artwork.ds.Album(ctx).Get(artID.ID)
 	if err != nil {
 		return nil, err
 	}
-	_, imgFiles, imagesUpdateAt, err := loadAlbumFoldersPaths(ctx, artwork.ds, *al)
-	if err != nil {
-		return nil, err
-	}
 	a := &albumArtworkReader{
-		a:          artwork,
-		provider:   provider,
-		album:      *al,
-		updatedAt:  imagesUpdateAt,
-		imgFiles:   imgFiles,
-		rootFolder: core.AbsolutePath(ctx, artwork.ds, al.LibraryID, ""),
+		a:     artwork,
+		em:    em,
+		album: *al,
 	}
 	a.cacheKey.artID = artID
-	if a.updatedAt != nil && a.updatedAt.After(al.UpdatedAt) {
-		a.cacheKey.lastUpdate = *a.updatedAt
-	} else {
-		a.cacheKey.lastUpdate = al.UpdatedAt
-	}
+	a.cacheKey.lastUpdate = al.UpdatedAt
 	return a, nil
 }
 
@@ -81,43 +63,12 @@ func (a *albumArtworkReader) fromCoverArtPriority(ctx context.Context, ffmpeg ff
 		pattern = strings.TrimSpace(pattern)
 		switch {
 		case pattern == "embedded":
-			embedArtPath := filepath.Join(a.rootFolder, a.album.EmbedArtPath)
-			ff = append(ff, fromTag(ctx, embedArtPath), fromFFmpegTag(ctx, ffmpeg, embedArtPath))
+			ff = append(ff, fromTag(a.album.EmbedArtPath), fromFFmpegTag(ctx, ffmpeg, a.album.EmbedArtPath))
 		case pattern == "external":
-			ff = append(ff, fromAlbumExternalSource(ctx, a.album, a.provider))
-		case len(a.imgFiles) > 0:
-			ff = append(ff, fromExternalFile(ctx, a.imgFiles, pattern))
+			ff = append(ff, fromAlbumExternalSource(ctx, a.album, a.em))
+		case a.album.ImageFiles != "":
+			ff = append(ff, fromExternalFile(ctx, a.album.ImageFiles, pattern))
 		}
 	}
 	return ff
 }
-
-func loadAlbumFoldersPaths(ctx context.Context, ds model.DataStore, albums ...model.Album) ([]string, []string, *time.Time, error) {
-	var folderIDs []string
-	for _, album := range albums {
-		folderIDs = append(folderIDs, album.FolderIDs...)
-	}
-	folders, err := ds.Folder(ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"folder.id": folderIDs, "missing": false}})
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	var paths []string
-	var imgFiles []string
-	var updatedAt time.Time
-	for _, f := range folders {
-		path := f.AbsolutePath()
-		paths = append(paths, path)
-		if f.ImagesUpdatedAt.After(updatedAt) {
-			updatedAt = f.ImagesUpdatedAt
-		}
-		for _, img := range f.ImageFiles {
-			imgFiles = append(imgFiles, filepath.Join(path, img))
-		}
-	}
-
-	// Sort image files to ensure consistent selection of cover art
-	// This prioritizes files from lower-numbered disc folders by sorting the paths
-	slices.Sort(imgFiles)
-
-	return paths, imgFiles, &updatedAt, nil
-}

core/artwork/reader_album_test.go

@@ -1,76 +0,0 @@
-package artwork
-
-import (
-	"context"
-	"path/filepath"
-	"time"
-
-	"github.com/navidrome/navidrome/model"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Album Artwork Reader", func() {
-	Describe("loadAlbumFoldersPaths", func() {
-		var (
-			ctx        context.Context
-			ds         *fakeDataStore
-			repo       *fakeFolderRepo
-			album      model.Album
-			now        time.Time
-			expectedAt time.Time
-		)
-
-		BeforeEach(func() {
-			ctx = context.Background()
-			now = time.Now().Truncate(time.Second)
-			expectedAt = now.Add(5 * time.Minute)
-
-			// Set up the test folders with image files
-			repo = &fakeFolderRepo{
-				result: []model.Folder{
-					{
-						Path:            "Artist/Album/Disc1",
-						ImagesUpdatedAt: expectedAt,
-						ImageFiles:      []string{"cover.jpg", "back.jpg"},
-					},
-					{
-						Path:            "Artist/Album/Disc2",
-						ImagesUpdatedAt: now,
-						ImageFiles:      []string{"cover.jpg"},
-					},
-					{
-						Path:            "Artist/Album/Disc10",
-						ImagesUpdatedAt: now,
-						ImageFiles:      []string{"cover.jpg"},
-					},
-				},
-				err: nil,
-			}
-			ds = &fakeDataStore{
-				folderRepo: repo,
-			}
-			album = model.Album{
-				ID:        "album1",
-				Name:      "Album",
-				FolderIDs: []string{"folder1", "folder2", "folder3"},
-			}
-		})
-
-		It("returns sorted image files", func() {
-			_, imgFiles, imagesUpdatedAt, err := loadAlbumFoldersPaths(ctx, ds, album)
-
-			Expect(err).ToNot(HaveOccurred())
-			Expect(*imagesUpdatedAt).To(Equal(expectedAt))
-
-			// Check that image files are sorted alphabetically
-			Expect(imgFiles).To(HaveLen(4))
-
-			// The files should be sorted by full path
-			Expect(imgFiles[0]).To(Equal(filepath.FromSlash("Artist/Album/Disc1/back.jpg")))
-			Expect(imgFiles[1]).To(Equal(filepath.FromSlash("Artist/Album/Disc1/cover.jpg")))
-			Expect(imgFiles[2]).To(Equal(filepath.FromSlash("Artist/Album/Disc10/cover.jpg")))
-			Expect(imgFiles[3]).To(Equal(filepath.FromSlash("Artist/Album/Disc2/cover.jpg")))
-		})
-	})
-})

core/artwork/reader_artist.go

@@ -13,59 +13,52 @@ import (
 
 	"github.com/Masterminds/squirrel"
 	"github.com/navidrome/navidrome/conf"
+	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/core"
-	"github.com/navidrome/navidrome/core/external"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
-	"github.com/navidrome/navidrome/utils/str"
+	"github.com/navidrome/navidrome/utils"
 )
 
 type artistReader struct {
 	cacheKey
 	a            *artwork
-	provider     external.Provider
+	em           core.ExternalMetadata
 	artist       model.Artist
 	artistFolder string
-	imgFiles     []string
+	files        string
 }
 
-func newArtistReader(ctx context.Context, artwork *artwork, artID model.ArtworkID, provider external.Provider) (*artistReader, error) {
+func newArtistReader(ctx context.Context, artwork *artwork, artID model.ArtworkID, em core.ExternalMetadata) (*artistReader, error) {
 	ar, err := artwork.ds.Artist(ctx).Get(artID.ID)
 	if err != nil {
 		return nil, err
 	}
-	// Only consider albums where the artist is the sole album artist.
-	als, err := artwork.ds.Album(ctx).GetAll(model.QueryOptions{
-		Filters: squirrel.And{
-			squirrel.Eq{"album_artist_id": artID.ID},
-			squirrel.Eq{"json_array_length(participants, '$.albumartist')": 1},
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-	albumPaths, imgFiles, imagesUpdatedAt, err := loadAlbumFoldersPaths(ctx, artwork.ds, als...)
-	if err != nil {
-		return nil, err
-	}
-	artistFolder, artistFolderLastUpdate, err := loadArtistFolder(ctx, artwork.ds, als, albumPaths)
+	als, err := artwork.ds.Album(ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_artist_id": artID.ID}})
 	if err != nil {
 		return nil, err
 	}
 	a := &artistReader{
-		a:            artwork,
-		provider:     provider,
-		artist:       *ar,
-		artistFolder: artistFolder,
-		imgFiles:     imgFiles,
+		a:      artwork,
+		em:     em,
+		artist: *ar,
 	}
 	// TODO Find a way to factor in the ExternalUpdateInfoAt in the cache key. Problem is that it can
 	// change _after_ retrieving from external sources, making the key invalid
 	//a.cacheKey.lastUpdate = ar.ExternalInfoUpdatedAt
-
-	a.cacheKey.lastUpdate = *imagesUpdatedAt
-	if artistFolderLastUpdate.After(a.cacheKey.lastUpdate) {
-		a.cacheKey.lastUpdate = artistFolderLastUpdate
+	var files []string
+	var paths []string
+	for _, al := range als {
+		files = append(files, al.ImageFiles)
+		paths = append(paths, splitList(al.Paths)...)
+		if a.cacheKey.lastUpdate.Before(al.UpdatedAt) {
+			a.cacheKey.lastUpdate = al.UpdatedAt
+		}
+	}
+	a.files = strings.Join(files, consts.Zwsp)
+	a.artistFolder = utils.LongestCommonPrefix(paths)
+	if !strings.HasSuffix(a.artistFolder, string(filepath.Separator)) {
+		a.artistFolder, _ = filepath.Split(a.artistFolder)
 	}
 	a.cacheKey.artID = artID
 	return a, nil
@@ -96,9 +89,9 @@ func (a *artistReader) fromArtistArtPriority(ctx context.Context, priority strin
 		pattern = strings.TrimSpace(pattern)
 		switch {
 		case pattern == "external":
-			ff = append(ff, fromArtistExternalSource(ctx, a.artist, a.provider))
+			ff = append(ff, fromArtistExternalSource(ctx, a.artist, a.em))
 		case strings.HasPrefix(pattern, "album/"):
-			ff = append(ff, fromExternalFile(ctx, a.imgFiles, strings.TrimPrefix(pattern, "album/")))
+			ff = append(ff, fromExternalFile(ctx, a.files, strings.TrimPrefix(pattern, "album/")))
 		default:
 			ff = append(ff, fromArtistFolder(ctx, a.artistFolder, pattern))
 		}
@@ -132,33 +125,3 @@ func fromArtistFolder(ctx context.Context, artistFolder string, pattern string)
 		return nil, "", nil
 	}
 }
-
-func loadArtistFolder(ctx context.Context, ds model.DataStore, albums model.Albums, paths []string) (string, time.Time, error) {
-	if len(albums) == 0 {
-		return "", time.Time{}, nil
-	}
-	libID := albums[0].LibraryID // Just need one of the albums, as they should all be in the same Library
-
-	folderPath := str.LongestCommonPrefix(paths)
-	if !strings.HasSuffix(folderPath, string(filepath.Separator)) {
-		folderPath, _ = filepath.Split(folderPath)
-	}
-	folderPath = filepath.Dir(folderPath)
-
-	// Manipulate the path to get the folder ID
-	// TODO: This is a bit hacky, but it's the easiest way to get the folder ID, ATM
-	libPath := core.AbsolutePath(ctx, ds, libID, "")
-	folderID := model.FolderID(model.Library{ID: libID, Path: libPath}, folderPath)
-
-	log.Trace(ctx, "Calculating artist folder details", "folderPath", folderPath, "folderID", folderID,
-		"libPath", libPath, "libID", libID, "albumPaths", paths)
-
-	// Get the last update time for the folder
-	folders, err := ds.Folder(ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"folder.id": folderID, "missing": false}})
-	if err != nil || len(folders) == 0 {
-		log.Warn(ctx, "Could not find folder for artist", "folderPath", folderPath, "id", folderID,
-			"libPath", libPath, "libID", libID, err)
-		return "", time.Time{}, err
-	}
-	return folderPath, folders[0].ImagesUpdatedAt, nil
-}

core/artwork/reader_artist_test.go

@@ -1,141 +0,0 @@
-package artwork
-
-import (
-	"context"
-	"errors"
-	"path/filepath"
-	"time"
-
-	"github.com/navidrome/navidrome/core"
-	"github.com/navidrome/navidrome/model"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("artistReader", func() {
-	var _ = Describe("loadArtistFolder", func() {
-		var (
-			ctx             context.Context
-			fds             *fakeDataStore
-			repo            *fakeFolderRepo
-			albums          model.Albums
-			paths           []string
-			now             time.Time
-			expectedUpdTime time.Time
-		)
-
-		BeforeEach(func() {
-			ctx = context.Background()
-			DeferCleanup(stubCoreAbsolutePath())
-
-			now = time.Now().Truncate(time.Second)
-			expectedUpdTime = now.Add(5 * time.Minute)
-			repo = &fakeFolderRepo{
-				result: []model.Folder{
-					{
-						ImagesUpdatedAt: expectedUpdTime,
-					},
-				},
-				err: nil,
-			}
-			fds = &fakeDataStore{
-				folderRepo: repo,
-			}
-			albums = model.Albums{
-				{LibraryID: 1, ID: "album1", Name: "Album 1"},
-			}
-		})
-
-		When("no albums provided", func() {
-			It("returns empty and zero time", func() {
-				folder, upd, err := loadArtistFolder(ctx, fds, model.Albums{}, []string{"/dummy/path"})
-				Expect(err).ToNot(HaveOccurred())
-				Expect(folder).To(BeEmpty())
-				Expect(upd).To(BeZero())
-			})
-		})
-
-		When("artist has only one album", func() {
-			It("returns the parent folder", func() {
-				paths = []string{
-					filepath.FromSlash("/music/artist/album1"),
-				}
-				folder, upd, err := loadArtistFolder(ctx, fds, albums, paths)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(folder).To(Equal("/music/artist"))
-				Expect(upd).To(Equal(expectedUpdTime))
-			})
-		})
-
-		When("the artist have multiple albums", func() {
-			It("returns the common prefix for the albums paths", func() {
-				paths = []string{
-					filepath.FromSlash("/music/library/artist/one"),
-					filepath.FromSlash("/music/library/artist/two"),
-				}
-				folder, upd, err := loadArtistFolder(ctx, fds, albums, paths)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(folder).To(Equal(filepath.FromSlash("/music/library/artist")))
-				Expect(upd).To(Equal(expectedUpdTime))
-			})
-		})
-
-		When("the album paths contain same prefix", func() {
-			It("returns the common prefix", func() {
-				paths = []string{
-					filepath.FromSlash("/music/artist/album1"),
-					filepath.FromSlash("/music/artist/album2"),
-				}
-				folder, upd, err := loadArtistFolder(ctx, fds, albums, paths)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(folder).To(Equal("/music/artist"))
-				Expect(upd).To(Equal(expectedUpdTime))
-			})
-		})
-
-		When("ds.Folder().GetAll returns an error", func() {
-			It("returns an error", func() {
-				paths = []string{
-					filepath.FromSlash("/music/artist/album1"),
-					filepath.FromSlash("/music/artist/album2"),
-				}
-				repo.err = errors.New("fake error")
-				folder, upd, err := loadArtistFolder(ctx, fds, albums, paths)
-				Expect(err).To(MatchError(ContainSubstring("fake error")))
-				// Folder and time are empty on error.
-				Expect(folder).To(BeEmpty())
-				Expect(upd).To(BeZero())
-			})
-		})
-	})
-})
-
-type fakeFolderRepo struct {
-	model.FolderRepository
-	result []model.Folder
-	err    error
-}
-
-func (f *fakeFolderRepo) GetAll(...model.QueryOptions) ([]model.Folder, error) {
-	return f.result, f.err
-}
-
-type fakeDataStore struct {
-	model.DataStore
-	folderRepo *fakeFolderRepo
-}
-
-func (fds *fakeDataStore) Folder(_ context.Context) model.FolderRepository {
-	return fds.folderRepo
-}
-
-func stubCoreAbsolutePath() func() {
-	// Override core.AbsolutePath to return a fixed string during tests.
-	original := core.AbsolutePath
-	core.AbsolutePath = func(_ context.Context, ds model.DataStore, libID int, p string) string {
-		return filepath.FromSlash("/music")
-	}
-	return func() {
-		core.AbsolutePath = original
-	}
-}

core/artwork/reader_mediafile.go

@@ -54,10 +54,9 @@ func (a *mediafileArtworkReader) LastUpdated() time.Time {
 func (a *mediafileArtworkReader) Reader(ctx context.Context) (io.ReadCloser, string, error) {
 	var ff []sourceFunc
 	if a.mediafile.CoverArtID().Kind == model.KindMediaFileArtwork {
-		path := a.mediafile.AbsolutePath()
 		ff = []sourceFunc{
-			fromTag(ctx, path),
-			fromFFmpegTag(ctx, a.a.ffmpeg, path),
+			fromTag(a.mediafile.Path),
+			fromFFmpegTag(ctx, a.a.ffmpeg, a.mediafile.Path),
 		}
 	}
 	ff = append(ff, fromAlbum(ctx, a.a, a.mediafile.AlbumCoverArtID()))

core/artwork/reader_playlist.go

@@ -61,7 +61,7 @@ func (a *playlistArtworkReader) fromGeneratedTiledCover(ctx context.Context) sou
 	}
 }
 
-func toAlbumArtworkIDs(albumIDs []string) []model.ArtworkID {
+func toArtworkIDs(albumIDs []string) []model.ArtworkID {
 	return slice.Map(albumIDs, func(id string) model.ArtworkID {
 		al := model.Album{ID: id}
 		return al.CoverArtID()
@@ -75,21 +75,24 @@ func (a *playlistArtworkReader) loadTiles(ctx context.Context) ([]image.Image, e
 		log.Error(ctx, "Error getting album IDs for playlist", "id", a.pl.ID, "name", a.pl.Name, err)
 		return nil, err
 	}
-	ids := toAlbumArtworkIDs(albumIds)
+	ids := toArtworkIDs(albumIds)
 
 	var tiles []image.Image
-	for _, id := range ids {
-		r, _, err := fromAlbum(ctx, a.a, id)()
-		if err == nil {
-			tile, err := a.createTile(ctx, r)
-			if err == nil {
-				tiles = append(tiles, tile)
-			}
-			_ = r.Close()
-		}
-		if len(tiles) == 4 {
+	for len(tiles) < 4 {
+		if len(ids) == 0 {
 			break
 		}
+		id := ids[len(ids)-1]
+		ids = ids[0 : len(ids)-1]
+		r, _, err := fromAlbum(ctx, a.a, id)()
+		if err != nil {
+			continue
+		}
+		tile, err := a.createTile(ctx, r)
+		if err == nil {
+			tiles = append(tiles, tile)
+		}
+		_ = r.Close()
 	}
 	switch len(tiles) {
 	case 0:

core/artwork/reader_resized.go

@@ -1,6 +1,7 @@
 package artwork
 
 import (
+	"bufio"
 	"bytes"
 	"context"
 	"fmt"
@@ -8,12 +9,14 @@ import (
 	"image/jpeg"
 	"image/png"
 	"io"
+	"net/http"
 	"time"
 
 	"github.com/disintegration/imaging"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
+	"github.com/navidrome/navidrome/utils/number"
 )
 
 type resizedArtworkReader struct {
@@ -21,18 +24,16 @@ type resizedArtworkReader struct {
 	cacheKey   string
 	lastUpdate time.Time
 	size       int
-	square     bool
 	a          *artwork
 }
 
-func resizedFromOriginal(ctx context.Context, a *artwork, artID model.ArtworkID, size int, square bool) (*resizedArtworkReader, error) {
+func resizedFromOriginal(ctx context.Context, a *artwork, artID model.ArtworkID, size int) (*resizedArtworkReader, error) {
 	r := &resizedArtworkReader{a: a}
 	r.artID = artID
 	r.size = size
-	r.square = square
 
 	// Get lastUpdated and cacheKey from original artwork
-	original, err := a.getArtworkReader(ctx, artID, 0, false)
+	original, err := a.getArtworkReader(ctx, artID, 0)
 	if err != nil {
 		return nil, err
 	}
@@ -42,11 +43,12 @@ func resizedFromOriginal(ctx context.Context, a *artwork, artID model.ArtworkID,
 }
 
 func (a *resizedArtworkReader) Key() string {
-	baseKey := fmt.Sprintf("%s.%d", a.cacheKey, a.size)
-	if a.square {
-		return baseKey + ".square"
-	}
-	return fmt.Sprintf("%s.%d", baseKey, conf.Server.CoverJpegQuality)
+	return fmt.Sprintf(
+		"%s.%d.%d",
+		a.cacheKey,
+		a.size,
+		conf.Server.CoverJpegQuality,
+	)
 }
 
 func (a *resizedArtworkReader) LastUpdated() time.Time {
@@ -55,62 +57,81 @@ func (a *resizedArtworkReader) LastUpdated() time.Time {
 
 func (a *resizedArtworkReader) Reader(ctx context.Context) (io.ReadCloser, string, error) {
 	// Get artwork in original size, possibly from cache
-	orig, _, err := a.a.Get(ctx, a.artID, 0, false)
+	orig, _, err := a.a.Get(ctx, a.artID, 0)
 	if err != nil {
 		return nil, "", err
 	}
+
+	// Keep a copy of the original data. In case we can't resize it, send it as is
+	buf := new(bytes.Buffer)
+	r := io.TeeReader(orig, buf)
 	defer orig.Close()
 
-	resized, origSize, err := resizeImage(orig, a.size, a.square)
+	resized, origSize, err := resizeImage(r, a.size)
 	if resized == nil {
-		log.Trace(ctx, "Image smaller than requested size", "artID", a.artID, "original", origSize, "resized", a.size, "square", a.square)
+		log.Trace(ctx, "Image smaller than requested size", "artID", a.artID, "original", origSize, "resized", a.size)
 	} else {
-		log.Trace(ctx, "Resizing artwork", "artID", a.artID, "original", origSize, "resized", a.size, "square", a.square)
+		log.Trace(ctx, "Resizing artwork", "artID", a.artID, "original", origSize, "resized", a.size)
 	}
 	if err != nil {
-		log.Warn(ctx, "Could not resize image. Will return image as is", "artID", a.artID, "size", a.size, "square", a.square, err)
+		log.Warn(ctx, "Could not resize image. Will return image as is", "artID", a.artID, "size", a.size, err)
 	}
 	if err != nil || resized == nil {
-		// if we couldn't resize the image, return the original
-		orig, _, err = a.a.Get(ctx, a.artID, 0, false)
-		return orig, "", err
+		// Force finish reading any remaining data
+		_, _ = io.Copy(io.Discard, r)
+		return io.NopCloser(buf), "", nil //nolint:nilerr
 	}
 	return io.NopCloser(resized), fmt.Sprintf("%s@%d", a.artID, a.size), nil
 }
 
-func resizeImage(reader io.Reader, size int, square bool) (io.Reader, int, error) {
-	original, format, err := image.Decode(reader)
+func asImageReader(r io.Reader) (io.Reader, string, error) {
+	br := bufio.NewReader(r)
+	buf, err := br.Peek(512)
+	if err == io.EOF && len(buf) > 0 {
+		// Check if there are enough bytes to detect type
+		typ := http.DetectContentType(buf)
+		if typ != "" {
+			return br, typ, nil
+		}
+	}
+	if err != nil {
+		return nil, "", err
+	}
+	return br, http.DetectContentType(buf), nil
+}
+
+func resizeImage(reader io.Reader, size int) (io.Reader, int, error) {
+	r, format, err := asImageReader(reader)
 	if err != nil {
 		return nil, 0, err
 	}
 
-	bounds := original.Bounds()
-	originalSize := max(bounds.Max.X, bounds.Max.Y)
+	img, _, err := image.Decode(r)
+	if err != nil {
+		return nil, 0, err
+	}
 
-	if originalSize <= size && !square {
+	// Don't upscale the image
+	bounds := img.Bounds()
+	originalSize := number.Max(bounds.Max.X, bounds.Max.Y)
+	if originalSize <= size {
 		return nil, originalSize, nil
 	}
 
-	var resized image.Image
-	if originalSize >= size {
-		resized = imaging.Fit(original, size, size, imaging.Lanczos)
+	var m *image.NRGBA
+	// Preserve the aspect ratio of the image.
+	if bounds.Max.X > bounds.Max.Y {
+		m = imaging.Resize(img, size, 0, imaging.Lanczos)
 	} else {
-		if bounds.Max.Y < bounds.Max.X {
-			resized = imaging.Resize(original, size, 0, imaging.Lanczos)
-		} else {
-			resized = imaging.Resize(original, 0, size, imaging.Lanczos)
-		}
-	}
-	if square {
-		bg := image.NewRGBA(image.Rect(0, 0, size, size))
-		resized = imaging.OverlayCenter(bg, resized, 1)
+		m = imaging.Resize(img, 0, size, imaging.Lanczos)
 	}
 
 	buf := new(bytes.Buffer)
-	if format == "png" || square {
-		err = png.Encode(buf, resized)
+	buf.Reset()
+	if format == "image/png" {
+		err = png.Encode(buf, m)
 	} else {
-		err = jpeg.Encode(buf, resized, &jpeg.Options{Quality: conf.Server.CoverJpegQuality})
+		err = jpeg.Encode(buf, m, &jpeg.Options{Quality: conf.Server.CoverJpegQuality})
 	}
 	return buf, originalSize, err
 }

core/artwork/sources.go

@@ -10,14 +10,13 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
-	"regexp"
 	"runtime"
 	"strings"
 	"time"
 
 	"github.com/dhowden/tag"
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/external"
+	"github.com/navidrome/navidrome/core"
 	"github.com/navidrome/navidrome/core/ffmpeg"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
@@ -38,7 +37,7 @@ func selectImageReader(ctx context.Context, artID model.ArtworkID, extractFuncs
 		}
 		log.Trace(ctx, "Failed trying to extract artwork", "artID", artID, "source", f, "elapsed", time.Since(start), err)
 	}
-	return nil, "", fmt.Errorf("could not get `%s` cover art for %s: %w", artID.Kind, artID, ErrUnavailable)
+	return nil, "", fmt.Errorf("could not get a cover art for %s: %w", artID, ErrUnavailable)
 }
 
 type sourceFunc func() (r io.ReadCloser, path string, err error)
@@ -53,9 +52,13 @@ func (f sourceFunc) String() string {
 	return name
 }
 
-func fromExternalFile(ctx context.Context, files []string, pattern string) sourceFunc {
+func splitList(s string) []string {
+	return strings.Split(s, consts.Zwsp)
+}
+
+func fromExternalFile(ctx context.Context, files string, pattern string) sourceFunc {
 	return func() (io.ReadCloser, string, error) {
-		for _, file := range files {
+		for _, file := range splitList(files) {
 			_, name := filepath.Split(file)
 			match, err := filepath.Match(pattern, strings.ToLower(name))
 			if err != nil {
@@ -76,14 +79,7 @@ func fromExternalFile(ctx context.Context, files []string, pattern string) sourc
 	}
 }
 
-// These regexes are used to match the picture type in the file, in the order they are listed.
-var picTypeRegexes = []*regexp.Regexp{
-	regexp.MustCompile(`(?i).*cover.*front.*|.*front.*cover.*`),
-	regexp.MustCompile(`(?i).*front.*`),
-	regexp.MustCompile(`(?i).*cover.*`),
-}
-
-func fromTag(ctx context.Context, path string) sourceFunc {
+func fromTag(path string) sourceFunc {
 	return func() (io.ReadCloser, string, error) {
 		if path == "" {
 			return nil, "", nil
@@ -99,31 +95,10 @@ func fromTag(ctx context.Context, path string) sourceFunc {
 			return nil, "", err
 		}
 
-		types := m.PictureTypes()
-		if len(types) == 0 {
+		picture := m.Picture()
+		if picture == nil {
 			return nil, "", fmt.Errorf("no embedded image found in %s", path)
 		}
-
-		var picture *tag.Picture
-		for _, regex := range picTypeRegexes {
-			for _, t := range types {
-				if regex.MatchString(t) {
-					log.Trace(ctx, "Found embedded image", "type", t, "path", path)
-					picture = m.Pictures(t)
-					break
-				}
-			}
-			if picture != nil {
-				break
-			}
-		}
-		if picture == nil {
-			log.Trace(ctx, "Could not find a front image. Getting the first one", "type", types[0], "path", path)
-			picture = m.Picture()
-		}
-		if picture == nil {
-			return nil, "", fmt.Errorf("could not load embedded image from %s", path)
-		}
 		return io.NopCloser(bytes.NewReader(picture.Data)), path, nil
 	}
 }
@@ -137,13 +112,19 @@ func fromFFmpegTag(ctx context.Context, ffmpeg ffmpeg.FFmpeg, path string) sourc
 		if err != nil {
 			return nil, "", err
 		}
-		return r, path, nil
+		defer r.Close()
+		buf := new(bytes.Buffer)
+		_, err = io.Copy(buf, r)
+		if err != nil {
+			return nil, "", err
+		}
+		return io.NopCloser(buf), path, nil
 	}
 }
 
 func fromAlbum(ctx context.Context, a *artwork, id model.ArtworkID) sourceFunc {
 	return func() (io.ReadCloser, string, error) {
-		r, _, err := a.Get(ctx, id, 0, false)
+		r, _, err := a.Get(ctx, id, 0)
 		if err != nil {
 			return nil, "", err
 		}
@@ -157,9 +138,9 @@ func fromAlbumPlaceholder() sourceFunc {
 		return r, consts.PlaceholderAlbumArt, nil
 	}
 }
-func fromArtistExternalSource(ctx context.Context, ar model.Artist, provider external.Provider) sourceFunc {
+func fromArtistExternalSource(ctx context.Context, ar model.Artist, em core.ExternalMetadata) sourceFunc {
 	return func() (io.ReadCloser, string, error) {
-		imageUrl, err := provider.ArtistImage(ctx, ar.ID)
+		imageUrl, err := em.ArtistImage(ctx, ar.ID)
 		if err != nil {
 			return nil, "", err
 		}
@@ -168,9 +149,9 @@ func fromArtistExternalSource(ctx context.Context, ar model.Artist, provider ext
 	}
 }
 
-func fromAlbumExternalSource(ctx context.Context, al model.Album, provider external.Provider) sourceFunc {
+func fromAlbumExternalSource(ctx context.Context, al model.Album, em core.ExternalMetadata) sourceFunc {
 	return func() (io.ReadCloser, string, error) {
-		imageUrl, err := provider.AlbumImage(ctx, al.ID)
+		imageUrl, err := em.AlbumImage(ctx, al.ID)
 		if err != nil {
 			return nil, "", err
 		}

core/auth/auth.go

@@ -1,9 +1,7 @@
 package auth
 
 import (
-	"cmp"
 	"context"
-	"crypto/sha256"
 	"sync"
 	"time"
 
@@ -13,35 +11,24 @@ import (
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
-	"github.com/navidrome/navidrome/model/id"
 	"github.com/navidrome/navidrome/model/request"
-	"github.com/navidrome/navidrome/utils"
 )
 
 var (
 	once      sync.Once
+	Secret    []byte
 	TokenAuth *jwtauth.JWTAuth
 )
 
-// Init creates a JWTAuth object from the secret stored in the DB.
-// If the secret is not found, it will create a new one and store it in the DB.
 func Init(ds model.DataStore) {
 	once.Do(func() {
-		ctx := context.TODO()
 		log.Info("Setting Session Timeout", "value", conf.Server.SessionTimeout)
-
-		secret, err := ds.Property(ctx).Get(consts.JWTSecretKey)
-		if err != nil || secret == "" {
-			log.Info(ctx, "Creating new JWT secret, used for encrypting UI sessions")
-			secret = createNewSecret(ctx, ds)
-		} else {
-			if secret, err = utils.Decrypt(ctx, getEncKey(), secret); err != nil {
-				log.Error(ctx, "Could not decrypt JWT secret, creating a new one", err)
-				secret = createNewSecret(ctx, ds)
-			}
+		secret, err := ds.Property(context.TODO()).DefaultGet(consts.JWTSecretKey, "not so secret")
+		if err != nil {
+			log.Error("No JWT secret found in DB. Setting a temp one, but please report this error", err)
 		}
-
-		TokenAuth = jwtauth.New("HS256", []byte(secret), nil)
+		Secret = []byte(secret)
+		TokenAuth = jwtauth.New("HS256", Secret, nil)
 	})
 }
 
@@ -123,25 +110,3 @@ func WithAdminUser(ctx context.Context, ds model.DataStore) context.Context {
 	ctx = request.WithUsername(ctx, u.UserName)
 	return request.WithUser(ctx, *u)
 }
-
-func createNewSecret(ctx context.Context, ds model.DataStore) string {
-	secret := id.NewRandom()
-	encSecret, err := utils.Encrypt(ctx, getEncKey(), secret)
-	if err != nil {
-		log.Error(ctx, "Could not encrypt JWT secret", err)
-		return secret
-	}
-	if err := ds.Property(ctx).Put(consts.JWTSecretKey, encSecret); err != nil {
-		log.Error(ctx, "Could not save JWT secret in DB", err)
-	}
-	return secret
-}
-
-func getEncKey() []byte {
-	key := cmp.Or(
-		conf.Server.PasswordEncryptionKey,
-		consts.DefaultEncryptionKey,
-	)
-	sum := sha256.Sum256([]byte(key))
-	return sum[:]
-}

core/auth/auth_test.go

@@ -4,12 +4,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-chi/jwtauth/v5"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/core/auth"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
-	"github.com/navidrome/navidrome/tests"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -32,10 +32,8 @@ var _ = BeforeSuite(func() {
 var _ = Describe("Auth", func() {
 
 	BeforeEach(func() {
-		ds := &tests.MockDataStore{
-			MockedProperty: &tests.MockedPropertyRepo{},
-		}
-		auth.Init(ds)
+		auth.Secret = []byte(testJWTSecret)
+		auth.TokenAuth = jwtauth.New("HS256", auth.Secret, nil)
 	})
 
 	Describe("Validate", func() {

core/common.go

@@ -2,9 +2,7 @@ package core
 
 import (
 	"context"
-	"path/filepath"
 
-	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
 )
 
@@ -15,13 +13,3 @@ func userName(ctx context.Context) string {
 		return user.UserName
 	}
 }
-
-// BFR We should only access files through the `storage.Storage` interface. This will require changing how
-// TagLib and ffmpeg access files
-var AbsolutePath = func(ctx context.Context, ds model.DataStore, libId int, path string) string {
-	libPath, err := ds.Library(ctx).GetPath(libId)
-	if err != nil {
-		return path
-	}
-	return filepath.Join(libPath, path)
-}

core/common_test.go

@@ -1,55 +0,0 @@
-package core
-
-import (
-	"context"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-
-	"github.com/navidrome/navidrome/model"
-	"github.com/navidrome/navidrome/model/request"
-	"github.com/navidrome/navidrome/tests"
-)
-
-var _ = Describe("common.go", func() {
-	Describe("userName", func() {
-		It("returns the username from context", func() {
-			ctx := request.WithUser(context.Background(), model.User{UserName: "testuser"})
-			Expect(userName(ctx)).To(Equal("testuser"))
-		})
-
-		It("returns 'UNKNOWN' if no user in context", func() {
-			ctx := context.Background()
-			Expect(userName(ctx)).To(Equal("UNKNOWN"))
-		})
-	})
-
-	Describe("AbsolutePath", func() {
-		var (
-			ds    *tests.MockDataStore
-			libId int
-			path  string
-		)
-
-		BeforeEach(func() {
-			ds = &tests.MockDataStore{}
-			libId = 1
-			path = "music/file.mp3"
-			mockLib := &tests.MockLibraryRepo{}
-			mockLib.SetData(model.Libraries{{ID: libId, Path: "/library/root"}})
-			ds.MockedLibrary = mockLib
-		})
-
-		It("returns the absolute path when library exists", func() {
-			ctx := context.Background()
-			abs := AbsolutePath(ctx, ds, libId, path)
-			Expect(abs).To(Equal("/library/root/music/file.mp3"))
-		})
-
-		It("returns the original path if library not found", func() {
-			ctx := context.Background()
-			abs := AbsolutePath(ctx, ds, 999, path)
-			Expect(abs).To(Equal(path))
-		})
-	})
-})

core/external/extdata_helper_test.go

@@ -1,270 +0,0 @@
-package external_test
-
-import (
-	"context"
-	"errors"
-
-	"github.com/navidrome/navidrome/core/agents"
-	"github.com/navidrome/navidrome/model"
-	"github.com/stretchr/testify/mock"
-)
-
-// --- Shared Mock Implementations ---
-
-// mockArtistRepo mocks model.ArtistRepository
-type mockArtistRepo struct {
-	mock.Mock
-	model.ArtistRepository
-}
-
-func newMockArtistRepo() *mockArtistRepo {
-	return &mockArtistRepo{}
-}
-
-// SetData sets up basic Get expectations.
-func (m *mockArtistRepo) SetData(artists model.Artists) {
-	for _, a := range artists {
-		artistCopy := a
-		m.On("Get", artistCopy.ID).Return(&artistCopy, nil)
-	}
-}
-
-// Get implements model.ArtistRepository.
-func (m *mockArtistRepo) Get(id string) (*model.Artist, error) {
-	args := m.Called(id)
-	if args.Get(0) == nil {
-		return nil, args.Error(1)
-	}
-	return args.Get(0).(*model.Artist), args.Error(1)
-}
-
-// GetAll implements model.ArtistRepository.
-func (m *mockArtistRepo) GetAll(options ...model.QueryOptions) (model.Artists, error) {
-	argsSlice := make([]interface{}, len(options))
-	for i, v := range options {
-		argsSlice[i] = v
-	}
-	args := m.Called(argsSlice...)
-	if args.Get(0) == nil {
-		return nil, args.Error(1)
-	}
-	return args.Get(0).(model.Artists), args.Error(1)
-}
-
-// SetError is a helper to set up a generic error for GetAll.
-func (m *mockArtistRepo) SetError(hasError bool) {
-	if hasError {
-		m.On("GetAll", mock.Anything).Return(nil, errors.New("mock repo error"))
-	}
-}
-
-// FindByName is a helper to set up a GetAll expectation for finding by name.
-func (m *mockArtistRepo) FindByName(name string, artist model.Artist) {
-	m.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool {
-		return opt.Filters != nil
-	})).Return(model.Artists{artist}, nil).Once()
-}
-
-// mockMediaFileRepo mocks model.MediaFileRepository
-type mockMediaFileRepo struct {
-	mock.Mock
-	model.MediaFileRepository
-}
-
-func newMockMediaFileRepo() *mockMediaFileRepo {
-	return &mockMediaFileRepo{}
-}
-
-// SetData sets up basic Get expectations.
-func (m *mockMediaFileRepo) SetData(mediaFiles model.MediaFiles) {
-	for _, mf := range mediaFiles {
-		mfCopy := mf
-		m.On("Get", mfCopy.ID).Return(&mfCopy, nil)
-	}
-}
-
-// Get implements model.MediaFileRepository.
-func (m *mockMediaFileRepo) Get(id string) (*model.MediaFile, error) {
-	args := m.Called(id)
-	if args.Get(0) == nil {
-		return nil, args.Error(1)
-	}
-	return args.Get(0).(*model.MediaFile), args.Error(1)
-}
-
-// GetAll implements model.MediaFileRepository.
-func (m *mockMediaFileRepo) GetAll(options ...model.QueryOptions) (model.MediaFiles, error) {
-	argsSlice := make([]interface{}, len(options))
-	for i, v := range options {
-		argsSlice[i] = v
-	}
-	args := m.Called(argsSlice...)
-	if args.Get(0) == nil {
-		return nil, args.Error(1)
-	}
-	return args.Get(0).(model.MediaFiles), args.Error(1)
-}
-
-// SetError is a helper to set up a generic error for GetAll.
-func (m *mockMediaFileRepo) SetError(hasError bool) {
-	if hasError {
-		m.On("GetAll", mock.Anything).Return(nil, errors.New("mock repo error"))
-	}
-}
-
-// FindByMBID is a helper to set up a GetAll expectation for finding by MBID.
-func (m *mockMediaFileRepo) FindByMBID(mbid string, mediaFile model.MediaFile) {
-	m.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool {
-		return opt.Filters != nil
-	})).Return(model.MediaFiles{mediaFile}, nil).Once()
-}
-
-// FindByArtistAndTitle is a helper to set up a GetAll expectation for finding by artist/title.
-func (m *mockMediaFileRepo) FindByArtistAndTitle(artistID string, title string, mediaFile model.MediaFile) {
-	m.On("GetAll", mock.MatchedBy(func(opt model.QueryOptions) bool {
-		return opt.Filters != nil
-	})).Return(model.MediaFiles{mediaFile}, nil).Once()
-}
-
-// mockAlbumRepo mocks model.AlbumRepository
-type mockAlbumRepo struct {
-	mock.Mock
-	model.AlbumRepository
-}
-
-func newMockAlbumRepo() *mockAlbumRepo {
-	return &mockAlbumRepo{}
-}
-
-// Get implements model.AlbumRepository.
-func (m *mockAlbumRepo) Get(id string) (*model.Album, error) {
-	args := m.Called(id)
-	if args.Get(0) == nil {
-		return nil, args.Error(1)
-	}
-	return args.Get(0).(*model.Album), args.Error(1)
-}
-
-// GetAll implements model.AlbumRepository.
-func (m *mockAlbumRepo) GetAll(options ...model.QueryOptions) (model.Albums, error) {
-	argsSlice := make([]interface{}, len(options))
-	for i, v := range options {
-		argsSlice[i] = v
-	}
-	args := m.Called(argsSlice...)
-	if args.Get(0) == nil {
-		return nil, args.Error(1)
-	}
-	return args.Get(0).(model.Albums), args.Error(1)
-}
-
-// mockSimilarArtistAgent mocks agents implementing ArtistTopSongsRetriever and ArtistSimilarRetriever
-type mockSimilarArtistAgent struct {
-	mock.Mock
-	agents.Interface // Embed to satisfy methods not explicitly mocked
-}
-
-func (m *mockSimilarArtistAgent) AgentName() string {
-	return "mockSimilar"
-}
-
-func (m *mockSimilarArtistAgent) GetArtistTopSongs(ctx context.Context, id, artistName, mbid string, count int) ([]agents.Song, error) {
-	args := m.Called(ctx, id, artistName, mbid, count)
-	if args.Get(0) != nil {
-		return args.Get(0).([]agents.Song), args.Error(1)
-	}
-	return nil, args.Error(1)
-}
-
-func (m *mockSimilarArtistAgent) GetSimilarArtists(ctx context.Context, id, name, mbid string, limit int) ([]agents.Artist, error) {
-	args := m.Called(ctx, id, name, mbid, limit)
-	if args.Get(0) != nil {
-		return args.Get(0).([]agents.Artist), args.Error(1)
-	}
-	return nil, args.Error(1)
-}
-
-// mockAgents mocks the main Agents interface used by Provider
-type mockAgents struct {
-	mock.Mock      // Embed testify mock
-	topSongsAgent  agents.ArtistTopSongsRetriever
-	similarAgent   agents.ArtistSimilarRetriever
-	imageAgent     agents.ArtistImageRetriever
-	albumInfoAgent agents.AlbumInfoRetriever
-	bioAgent       agents.ArtistBiographyRetriever
-	mbidAgent      agents.ArtistMBIDRetriever
-	urlAgent       agents.ArtistURLRetriever
-	agents.Interface
-}
-
-func (m *mockAgents) AgentName() string {
-	return "mockCombined"
-}
-
-func (m *mockAgents) GetSimilarArtists(ctx context.Context, id, name, mbid string, limit int) ([]agents.Artist, error) {
-	if m.similarAgent != nil {
-		return m.similarAgent.GetSimilarArtists(ctx, id, name, mbid, limit)
-	}
-	args := m.Called(ctx, id, name, mbid, limit)
-	if args.Get(0) != nil {
-		return args.Get(0).([]agents.Artist), args.Error(1)
-	}
-	return nil, args.Error(1)
-}
-
-func (m *mockAgents) GetArtistTopSongs(ctx context.Context, id, artistName, mbid string, count int) ([]agents.Song, error) {
-	if m.topSongsAgent != nil {
-		return m.topSongsAgent.GetArtistTopSongs(ctx, id, artistName, mbid, count)
-	}
-	args := m.Called(ctx, id, artistName, mbid, count)
-	if args.Get(0) != nil {
-		return args.Get(0).([]agents.Song), args.Error(1)
-	}
-	return nil, args.Error(1)
-}
-
-func (m *mockAgents) GetAlbumInfo(ctx context.Context, name, artist, mbid string) (*agents.AlbumInfo, error) {
-	if m.albumInfoAgent != nil {
-		return m.albumInfoAgent.GetAlbumInfo(ctx, name, artist, mbid)
-	}
-	args := m.Called(ctx, name, artist, mbid)
-	if args.Get(0) != nil {
-		return args.Get(0).(*agents.AlbumInfo), args.Error(1)
-	}
-	return nil, args.Error(1)
-}
-
-func (m *mockAgents) GetArtistMBID(ctx context.Context, id string, name string) (string, error) {
-	if m.mbidAgent != nil {
-		return m.mbidAgent.GetArtistMBID(ctx, id, name)
-	}
-	args := m.Called(ctx, id, name)
-	return args.String(0), args.Error(1)
-}
-
-func (m *mockAgents) GetArtistURL(ctx context.Context, id, name, mbid string) (string, error) {
-	if m.urlAgent != nil {
-		return m.urlAgent.GetArtistURL(ctx, id, name, mbid)
-	}
-	args := m.Called(ctx, id, name, mbid)
-	return args.String(0), args.Error(1)
-}
-
-func (m *mockAgents) GetArtistBiography(ctx context.Context, id, name, mbid string) (string, error) {
-	if m.bioAgent != nil {
-		return m.bioAgent.GetArtistBiography(ctx, id, name, mbid)
-	}
-	args := m.Called(ctx, id, name, mbid)
-	return args.String(0), args.Error(1)
-}
-
-func (m *mockAgents) GetArtistImages(ctx context.Context, id, name, mbid string) ([]agents.ExternalImage, error) {
-	if m.imageAgent != nil {
-		return m.imageAgent.GetArtistImages(ctx, id, name, mbid)
-	}
-	args := m.Called(ctx, id, name, mbid)
-	if args.Get(0) != nil {
-		return args.Get(0).([]agents.ExternalImage), args.Error(1)
-	}
-	return nil, args.Error(1)
-}

core/external/extdata_suite_test.go

@@ -1,17 +0,0 @@
-package external
-
-import (
-	"testing"
-
-	"github.com/navidrome/navidrome/log"
-	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-func TestExternal(t *testing.T) {
-	tests.Init(t, false)
-	log.SetLevel(log.LevelFatal)
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "External Suite")
-}