fix(ios): remove stale built-in Spotify bridge handlers

.fvmrc

@@ -1,3 +0,0 @@
-{
-  "flutter": "3.41.4"
-}

.github/workflows/release.yml

@@ -344,18 +344,9 @@ jobs:
           VERSION=${{ needs.get-version.outputs.version }}
           REPO_OWNER="${{ github.repository_owner }}"
           REPO_NAME="${{ github.event.repository.name }}"
-          CURRENT_REF=$(git rev-list -n 1 "$VERSION" 2>/dev/null || git rev-parse HEAD)
-          PREVIOUS_TAG=$(git describe --tags --abbrev=0 "${CURRENT_REF}^" 2>/dev/null || true)
 
-          # Start with git-cliff changelog, but replace its compare footer with a
-          # deterministic previous-tag lookup from git.
-          sed '/^## [0-9][0-9.[:alpha:]-]*$/d; /^\*\*Full Changelog\*\*/d' /tmp/changelog.txt > /tmp/release_body.txt
-
-          if [ -n "$PREVIOUS_TAG" ]; then
-            printf '\n**Full Changelog**: [%s...%s](https://github.com/%s/%s/compare/%s...%s)\n' \
-              "$PREVIOUS_TAG" "$VERSION" "$REPO_OWNER" "$REPO_NAME" "$PREVIOUS_TAG" "$VERSION" \
-              >> /tmp/release_body.txt
-          fi
+          # Start with git-cliff changelog
+          cp /tmp/changelog.txt /tmp/release_body.txt
 
           # Append download section
           cat >> /tmp/release_body.txt << FOOTER
@@ -393,63 +384,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  update-altstore:
-    runs-on: ubuntu-latest
-    needs: [get-version, build-ios, create-release]
-    if: ${{ needs.get-version.outputs.is_prerelease != 'true' }}
-    permissions:
-      contents: write
-
-    steps:
-      - name: Checkout main branch
-        uses: actions/checkout@v6
-        with:
-          ref: main
-
-      - name: Download iOS IPA
-        uses: actions/download-artifact@v7
-        with:
-          name: ios-ipa
-          path: ./release
-
-      - name: Update apps.json
-        run: |
-          VERSION="${{ needs.get-version.outputs.version }}"
-          VERSION_NUM="${VERSION#v}"
-          DATE=$(date -u +%Y-%m-%d)
-          IPA_FILE=$(find ./release -name "*ios*.ipa" | head -1)
-
-          if [ -z "$IPA_FILE" ]; then
-            echo "WARNING: IPA file not found, skipping apps.json update"
-            exit 0
-          fi
-
-          IPA_SIZE=$(stat -c%s "$IPA_FILE" 2>/dev/null || stat -f%z "$IPA_FILE")
-
-          if [ ! -f apps.json ]; then
-            echo "WARNING: apps.json not found on main, skipping"
-            exit 0
-          fi
-
-          jq --arg ver "$VERSION_NUM" \
-             --arg date "$DATE" \
-             --arg url "https://github.com/zarzet/SpotiFLAC-Mobile/releases/download/${VERSION}/SpotiFLAC-${VERSION}-ios-unsigned.ipa" \
-             --argjson size "$IPA_SIZE" \
-             '.apps[0].version = $ver | .apps[0].versionDate = $date | .apps[0].downloadURL = $url | .apps[0].size = $size' \
-             apps.json > apps.json.tmp && mv apps.json.tmp apps.json
-
-          echo "Updated apps.json:"
-          cat apps.json
-
-      - name: Commit and push
-        run: |
-          VERSION="${{ needs.get-version.outputs.version }}"
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add apps.json
-          git diff --cached --quiet && echo "No changes to commit" || \
-            (git commit -m "chore: update AltStore source to ${VERSION}" && git push)
-
   notify-telegram:
     runs-on: ubuntu-latest
     needs: [get-version, create-release]
@@ -490,10 +424,7 @@ jobs:
           else
             # Convert Markdown to Telegram HTML
             CHANGELOG=$(cat /tmp/cliff_tg.txt | \
-              sed '/^## [0-9][0-9.[:alpha:]-]*$/d' | \
               sed '/^\*\*Full Changelog\*\*/d' | \
-              sed 's/ by \[@[^]]*\](https:\/\/github\.com\/[^)]*)//g' | \
-              sed 's/ by @[A-Za-z0-9_-]\+//g' | \
               sed 's/\[#\([0-9]*\)\]([^)]*)/#\1/g' | \
               sed 's/\[@\([^]]*\)\]([^)]*)/@\1/g' | \
               sed 's/&/\&amp;/g' | \

.gitignore

@@ -67,7 +67,6 @@ AGENTS.md
 
 # Temp/misc
 nul
-network_requests.txt
 
 # Log files
 *.log
@@ -77,6 +76,3 @@ flutter_*.log
 # Development tools
 tool/
 .claude/settings.local.json
-
-# FVM Version Cache
-.fvm/

CHANGELOG.md

@@ -334,7 +334,7 @@ Thank you for your understanding and continued support. This decision was made t
   - Routing priority: YouTube service -> extension fallback -> built-in fallback -> direct service
 - New Android method channel handler: `"downloadByStrategy"` -> `Gobackend.downloadByStrategy(...)`
 - SpotFetch metadata fallback integration for Spotify-blocked regions
-  - New backend client for `sp.afkarxyz.qzz.io/api`
+  - New backend client for `spotify.afkarxyz.fun/api`
   - Automatic fallback in Spotify metadata fetch path when primary source fails
 - Lyrics extraction now supports MP3 (ID3v2) and Opus/OGG (Vorbis comments) in addition to FLAC
   - Includes heuristic detection of lyrics stored in Comment fields
@@ -349,7 +349,7 @@ Thank you for your understanding and continued support. This decision was made t
 - Legacy Dart bridge methods (`downloadTrack`, `downloadWithFallback`, `downloadWithExtensions`, `downloadFromYouTube`) are now thin wrappers and marked `@Deprecated`
 - Qobuz downloader updated to latest Jumo API contract (`/get` endpoint, required headers)
 - Amazon download flow now returns `decryption_key` from Go and performs decryption in Flutter (local file + SAF paths)
-- Amazon now uses the new `amzn.afkarxyz.qzz.io` API flow (ASIN-based track endpoint + legacy fallback) with encrypted stream support
+- Amazon now uses the new `amazon.afkarxyz.fun` API flow (ASIN-based track endpoint + legacy fallback) with encrypted stream support
 - Amazon ASIN extraction rewritten with robust URL/query-param parsing and regex fallback
 - Amazon provider re-enabled in download service picker and download settings (alongside Tidal, Qobuz, and YouTube picker flow)
 - Track Metadata cover UI now refreshes from the embedded file after Edit Metadata/Re-enrich, so the displayed art matches actual file tags

CONTRIBUTING.md

@@ -86,31 +86,17 @@ Translation files are located in `lib/l10n/arb/`.
    git remote add upstream https://github.com/zarzet/SpotiFLAC-Mobile.git
    ```
 
-3. **Use FVM (Flutter Version: 3.38.1)**
-   ```bash
-   fvm use
-   ```
-
-4. **Install dependencies**
+3. **Install dependencies**
    ```bash
    flutter pub get
    ```
 
-5. **Generate code** (for Riverpod, JSON serialization, etc.)
+4. **Generate code** (for Riverpod, JSON serialization, etc.)
    ```bash
    dart run build_runner build --delete-conflicting-outputs
    ```
 
-6. **Set up Go environment (Go Version: 1.25.7)**
-   ```bash
-   cd go_backend 
-   mkdir -p ../android/app/libs
-   gomobile init
-   gomobile bind -target=android -androidapi 24 -o ../android/app/libs/gobackend.aar .
-   cd ..
-   ```
-
-7. **Run the app**
+5. **Run the app**
    ```bash
    flutter run
    ```

README.md

@@ -14,17 +14,6 @@
 
 </div>
 
-<div align="center">
-
-[![GitHub Release](https://img.shields.io/github/v/release/zarzet/SpotiFLAC-Mobile?style=for-the-badge&logo=github)](https://github.com/zarzet/SpotiFLAC-Mobile/releases)
-[![VirusTotal](https://img.shields.io/badge/VirusTotal-Safe-brightgreen?style=for-the-badge&logo=virustotal)](https://www.virustotal.com/gui/file/cc11355330c76f97548b8d26452b91746db9d9c1edbcfc4c18250133484d1487)
-[![Crowdin](https://img.shields.io/badge/HELP%20TRANSLATE%20ON-CROWDIN-%2321252b?style=for-the-badge&logo=crowdin)](https://crowdin.com/project/spotiflac-mobile)
-
-[![Telegram Channel](https://img.shields.io/badge/CHANNEL-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/spotiflac)
-[![Telegram Community](https://img.shields.io/badge/COMMUNITY-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/spotiflac_chat)
-
-</div>
-
 ## Screenshots
 
 <p align="center">
@@ -34,141 +23,68 @@
   <img src="assets/images/4.jpg?v=2" width="200" />
 </p>
 
----
+<div align="center">
+
+[![GitHub All Releases](https://img.shields.io/github/downloads/zarzet/SpotiFLAC-Mobile/total?style=for-the-badge&refresh=1)](https://github.com/zarzet/SpotiFLAC-Mobile/releases)
+[![VirusTotal](https://img.shields.io/badge/VirusTotal-Safe-brightgreen?style=for-the-badge&logo=virustotal)](https://www.virustotal.com/gui/file/0a2bd2a033551983fc9fcd83f82fd912c83914fd1094cd8d1c7c6a68eb23233f)
+[![Crowdin](https://img.shields.io/badge/HELP%20TRANSLATE%20ON-CROWDIN-%2321252b?style=for-the-badge&logo=crowdin)](https://crowdin.com/project/spotiflac-mobile)
+
+[![Telegram Channel](https://img.shields.io/badge/CHANNEL-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/spotiflac)
+[![Telegram Community](https://img.shields.io/badge/COMMUNITY-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/spotiflac_chat)
+
+</div>
 
 ## Extensions
 
-Extensions let the community add new music sources and features without waiting for app updates. When a streaming service API changes or a new source becomes available, extensions can be updated independently.
+Extensions allow the community to add new music sources and features without waiting for app updates. When a streaming service API changes or a new source becomes available, extensions can be updated independently.
 
 ### Installing Extensions
-
-1. Open the **Store** tab in the app
-2. On first launch, enter an **Extension Repository URL** when prompted
-3. Browse and install extensions with one tap
-4. Or download a `.spotiflac-ext` file and install manually via **Settings > Extensions**
-5. Configure extension settings if needed
-6. Set provider priority under **Settings > Extensions > Provider Priority**
+1. Go to **Store** tab in the app
+2. Browse and install extensions with one tap
+3. Or download a `.spotiflac-ext` file and install manually via **Settings > Extensions**
+4. Configure extension settings if needed
+5. Set provider priority in **Settings > Extensions > Provider Priority**
 
 ### Developing Extensions
+Want to create your own extension? Check out the [Extension Development Guide](https://zarz.moe/docs) for complete documentation.
 
-> [!NOTE]
-> Want to build your own extension? The [Extension Development Guide](https://zarzet.github.io/SpotiFLAC-Mobile/docs) has everything you need.
-
----
-
-## Related Projects
+## Other project
 
 ### [SpotiFLAC (Desktop)](https://github.com/afkarxyz/SpotiFLAC)
-Download music in true lossless FLAC from Tidal, Qobuz & Amazon Music available for Windows, macOS & Linux.
-
-### [SpotiFLAC (Python Module)](https://github.com/ShuShuzinhuu/SpotiFLAC-Module-Version)
-Python library for SpotiFLAC integration, maintained by [@ShuShuzinhuu](https://github.com/ShuShuzinhuu).
-
----
+Download music in true lossless FLAC from Tidal, Qobuz & Amazon Music for Windows, macOS & Linux
 
 ## FAQ
 
-<details>
-<summary><b>Why does the Store tab ask me to enter a URL?</b></summary>
-<br>
+**Q: Why is my download failing with "Song not found"?**  
+A: The track may not be available on the streaming services. Try enabling more download services in Settings > Download > Provider Priority, or install additional extensions like Amazon Music from the Store.
 
-Starting from version 3.8.0, SpotiFLAC uses a decentralized extension repository system extensions are hosted on GitHub repositories rather than a built-in server, so anyone can create and host their own. Enter a repository URL in the Store tab to browse and install extensions.
+**Q: Why are some tracks downloading in lower quality?**  
+A: Quality depends on what's available from the streaming service and extensions. Built-in providers: Tidal offers up to 24-bit/192kHz, Qobuz up to 24-bit/192kHz, and Deezer up to 16-bit/44.1kHz.
 
-</details>
+**Q: Can I download playlists?**  
+A: Yes! Just paste the playlist URL in the search bar. The app will fetch all tracks and queue them for download.
 
-<details>
-<summary><b>Why is my download failing with "Song not found"?</b></summary>
-<br>
+**Q: Why do I need to grant storage permission?**  
+A: The app needs permission to save downloaded files to your device. On Android 13+, you may need to grant "All files access" in Settings > Apps > SpotiFLAC > Permissions.
 
-The track may not be available on the streaming services. Try enabling more providers under **Settings > Download > Provider Priority**, or install additional extensions like Amazon Music from the Store.
+**Q: Is this app safe?**  
+A: Yes, the app is open source and you can verify the code yourself. Each release is scanned with VirusTotal (see badge at top of README).
 
-</details>
+**Q: Why is download not working in my country?**  
+A: Some countries have restricted access to certain streaming service APIs. If downloads are failing, try using a VPN to connect through a different region.
 
-<details>
-<summary><b>Why are some tracks downloading in lower quality?</b></summary>
-<br>
 
-Quality depends on what's available from the streaming service and its extensions. Built-in providers:
-- **Tidal** up to 24-bit/192kHz
-- **Qobuz** up to 24-bit/192kHz
-- **Deezer** up to 16-bit/44.1kHz
+### Want to support SpotiFLAC-Mobile?
 
-</details>
+_If this software is useful and brings you value, consider supporting the project. Your support helps keep development going._
 
-<details>
-<summary><b>Can I download playlists?</b></summary>
-<br>
-
-Yes! Just paste the playlist URL in the search bar. The app will fetch all tracks and queue them for download.
-
-</details>
-
-<details>
-<summary><b>Why do I need to grant storage permission?</b></summary>
-<br>
-
-The app needs permission to save downloaded files to your device. On Android 13+, you may need to grant **All files access** under **Settings > Apps > SpotiFLAC > Permissions**.
-
-</details>
-
-<details>
-<summary><b>Is this app safe?</b></summary>
-<br>
-
-Yes SpotiFLAC is open source and you can verify the code yourself. Each release is also scanned with VirusTotal (see badge above).
-
-</details>
-
-<details>
-<summary><b>Why is downloading not working in my country?</b></summary>
-<br>
-
-Some countries have restricted access to certain streaming service APIs. If downloads are failing, try using a VPN to connect through a different region.
-
-</details>
-
-<details>
-<summary><b>Can I add SpotiFLAC to AltStore or SideStore?</b></summary>
-<br>
-
-Yes! Add the official source to receive updates directly within the app. Copy this link:
-
-```
-https://raw.githubusercontent.com/zarzet/SpotiFLAC-Mobile/refs/heads/main/apps.json
-```
-
-In AltStore/SideStore, go to **Browse > Sources**, tap **+**, and paste the link.
-
-</details>
-
-> [!NOTE]
-> If SpotiFLAC is useful to you, consider supporting development:
->
-> [![Ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/zarzet)
-
----
-
-## Contributors
-
-Thanks to everyone who has contributed to SpotiFLAC Mobile!
-
-<a href="https://github.com/zarzet/SpotiFLAC-Mobile/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=zarzet/SpotiFLAC-Mobile" />
-</a>
-
-We also appreciate everyone who helped with [translations on Crowdin](https://crowdin.com/project/spotiflac-mobile), reported bugs, suggested features, and spread the word.
-
-Interested in contributing? Check out the [Contributing Guide](CONTRIBUTING.md) to get started!
-
----
+[![Ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/zarzet)
 
 ## API Credits
 
-| | | | | |
-|---|---|---|---|---|
-| [hifi-api](https://github.com/binimum/hifi-api) | [music.binimum.org](https://music.binimum.org) | [qqdl.site](https://qqdl.site) | [squid.wtf](https://squid.wtf) | [spotisaver.net](https://spotisaver.net) |
-| [dabmusic.xyz](https://dabmusic.xyz) | [AfkarXYZ](https://github.com/afkarxyz) | [LRCLib](https://lrclib.net) | [Paxsenix](https://lyrics.paxsenix.org) | [Cobalt](https://cobalt.tools) |
-| [qwkuns.me](https://qwkuns.me) | [SpotubeDL](https://spotubedl.com) | [Song.link](https://song.link) | [IDHS](https://github.com/sjdonado/idonthavespotify) | |
+[hifi-api](https://github.com/binimum/hifi-api) · [music.binimum.org](https://music.binimum.org) · [qqdl.site](https://qqdl.site) · [squid.wtf](https://squid.wtf) · [spotisaver.net](https://spotisaver.net) · [dabmusic.xyz](https://dabmusic.xyz) · [AfkarXYZ](https://github.com/afkarxyz) · [LRCLib](https://lrclib.net) · [Paxsenix](https://lyrics.paxsenix.org) · [Cobalt](https://cobalt.tools) · [qwkuns.me](https://qwkuns.me) · [SpotubeDL](https://spotubedl.com) · [Song.link](https://song.link) · [IDHS](https://github.com/sjdonado/idonthavespotify)
+
 
 > [!TIP]
-> **Star the repo** to get notified about all new releases directly from GitHub.
+>
+> **Star Us**, You will receive all release notifications from GitHub without any delay ~

android/app/src/main/kotlin/com/zarz/spotiflac/DownloadService.kt

@@ -115,8 +115,10 @@ class DownloadService : Service() {
      * We must call stopSelf() within a few seconds to avoid a crash.
      */
     override fun onTimeout(startId: Int, fgsType: Int) {
+        // Log the timeout for debugging
         android.util.Log.w("DownloadService", "Foreground service timeout reached (6 hours limit). Stopping service.")
         
+        // Gracefully stop the service
         stopForegroundService()
     }
     
@@ -137,13 +139,14 @@ class DownloadService : Service() {
     
     private fun startForegroundService() {
         isRunning = true
-
+        
+        // Acquire wake lock to prevent CPU sleep
         val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
         wakeLock = powerManager.newWakeLock(
             PowerManager.PARTIAL_WAKE_LOCK,
             WAKELOCK_TAG
         ).apply {
-            acquire(60 * 60 * 1000L)
+            acquire(60 * 60 * 1000L) // 1 hour max
         }
         
         val notification = buildNotification(0, 0)

apps.json

@@ -1,18 +0,0 @@
-{
-  "name": "SpotiFLAC Source",
-  "identifier": "com.zarzet.spotiflac.source",
-  "subtitle": "FLAC Downloader for iOS",
-  "apps": [
-    {
-      "name": "SpotiFLAC",
-      "bundleIdentifier": "com.zarzet.spotiflac",
-      "developerName": "zarzet",
-      "version": "3.9.0",
-      "versionDate": "2026-03-25",
-      "downloadURL": "https://github.com/zarzet/SpotiFLAC-Mobile/releases/download/v3.9.0/SpotiFLAC-v3.9.0-ios-unsigned.ipa",
-      "localizedDescription": "Mobile version of SpotiFLAC written in Flutter. Download Tracks in true FLAC from Tidal, Qobuz, & Amazon Music.",
-      "iconURL": "https://raw.githubusercontent.com/zarzet/SpotiFLAC-Mobile/main/assets/images/logo.png",
-      "size": 34477323
-    }
-  ]
-}

cliff.toml

@@ -22,7 +22,7 @@ body = """
             {% if commit.github.pr_number %} \
                 ([#{{ commit.github.pr_number }}]({{ self::remote_url() }}/pull/{{ commit.github.pr_number }}))\
             {% endif %}\
-            {%- if commit.github.username and commit.github.username != "zarzet" %} by [@{{ commit.github.username }}](https://github.com/{{ commit.github.username }}){%- endif %}
+            {%- if commit.github.username %} by [@{{ commit.github.username }}](https://github.com/{{ commit.github.username }}){%- endif %}
     {%- endfor %}
 {% endfor %}
 
@@ -58,6 +58,8 @@ split_commits = false
 
 # Regex for preprocessing the commit messages
 commit_preprocessors = [
+  # Remove PR number from message (we add it back via GitHub integration)
+  { pattern = '\(#(\d+)\)', replace = '' },
   # Strip conventional commit prefix for cleaner messages
   # (group header already shows the type)
 ]

go_backend/audio_metadata.go

@@ -498,13 +498,7 @@ func extractUserTextFrame(data []byte) (string, string) {
 
 func isLyricsDescription(description string) bool {
 	switch strings.ToLower(strings.TrimSpace(description)) {
-	case
-		"lyrics",
-		"lyric",
-		"unsyncedlyrics",
-		"unsynced lyrics",
-		"uslt",
-		"lrc":
+	case "lyrics", "lyric", "unsyncedlyrics", "unsynced lyrics", "lrc":
 		return true
 	default:
 		return false
@@ -1572,14 +1566,7 @@ func base64StdDecode(dst, src []byte) (int, error) {
 }
 
 func extractAnyCoverArt(filePath string) ([]byte, string, error) {
-	return extractAnyCoverArtWithHint(filePath, "")
-}
-
-func extractAnyCoverArtWithHint(filePath, displayNameHint string) ([]byte, string, error) {
 	ext := strings.ToLower(filepath.Ext(filePath))
-	if ext == "" {
-		ext = strings.ToLower(filepath.Ext(displayNameHint))
-	}
 
 	switch ext {
 	case ".flac":
@@ -1600,19 +1587,7 @@ func extractAnyCoverArtWithHint(filePath, displayNameHint string) ([]byte, strin
 		return extractOggCoverArt(filePath)
 
 	case ".m4a":
-		data, err := extractCoverFromM4A(filePath)
-		if err != nil {
-			return nil, "", err
-		}
-		mimeType := "image/jpeg"
-		if len(data) >= 8 &&
-			data[0] == 0x89 &&
-			data[1] == 0x50 &&
-			data[2] == 0x4E &&
-			data[3] == 0x47 {
-			mimeType = "image/png"
-		}
-		return data, mimeType, nil
+		return nil, "", fmt.Errorf("M4A cover extraction not yet supported")
 
 	default:
 		return nil, "", fmt.Errorf("unsupported format: %s", ext)
@@ -1620,10 +1595,6 @@ func extractAnyCoverArtWithHint(filePath, displayNameHint string) ([]byte, strin
 }
 
 func SaveCoverToCache(filePath, cacheDir string) (string, error) {
-	return SaveCoverToCacheWithHint(filePath, "", cacheDir)
-}
-
-func SaveCoverToCacheWithHint(filePath, displayNameHint, cacheDir string) (string, error) {
 	cacheKey := filePath
 	if stat, err := os.Stat(filePath); err == nil {
 		cacheKey = fmt.Sprintf("%s|%d|%d", filePath, stat.Size(), stat.ModTime().UnixNano())
@@ -1640,7 +1611,7 @@ func SaveCoverToCacheWithHint(filePath, displayNameHint, cacheDir string) (strin
 		return pngPath, nil
 	}
 
-	imageData, mimeType, err := extractAnyCoverArtWithHint(filePath, displayNameHint)
+	imageData, mimeType, err := extractAnyCoverArt(filePath)
 	if err != nil {
 		return "", err
 	}

go_backend/audio_metadata_mp3_test.go

@@ -1,133 +0,0 @@
-package gobackend
-
-import (
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-func ffmpegCommand(args ...string) *exec.Cmd {
-	if ffmpegPath, err := exec.LookPath("ffmpeg"); err == nil {
-		return exec.Command(ffmpegPath, args...)
-	}
-	return exec.Command("ffmpeg", args...)
-}
-
-func runFFmpegTestCommand(t *testing.T, args ...string) {
-	t.Helper()
-	cmd := ffmpegCommand(args...)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("ffmpeg failed: %v\n%s", err, string(output))
-	}
-}
-
-func TestExtractLyricsReadsMp3AfterCoverEmbed(t *testing.T) {
-	if _, err := exec.LookPath("ffmpeg"); err != nil {
-		t.Skip("ffmpeg not available")
-	}
-
-	tempDir := t.TempDir()
-	sourceFlac := filepath.Join(tempDir, "source.flac")
-	baseMp3 := filepath.Join(tempDir, "base.mp3")
-	finalMp3 := filepath.Join(tempDir, "final.mp3")
-	coverPath := filepath.Join(tempDir, "cover.jpg")
-	lyrics := "[ti:Test Song]\n[ar:Test Artist]\n[00:00.00]Hello from embedded lyrics"
-
-	runFFmpegTestCommand(
-		t,
-		"-y",
-		"-f",
-		"lavfi",
-		"-i",
-		"sine=frequency=440:duration=1",
-		"-c:a",
-		"flac",
-		sourceFlac,
-	)
-
-	runFFmpegTestCommand(
-		t,
-		"-y",
-		"-f",
-		"lavfi",
-		"-i",
-		"color=c=red:s=32x32:d=1",
-		"-frames:v",
-		"1",
-		coverPath,
-	)
-
-	runFFmpegTestCommand(
-		t,
-		"-y",
-		"-i",
-		sourceFlac,
-		"-b:a",
-		"320k",
-		"-metadata",
-		"title=Test Song",
-		"-metadata",
-		"artist=Test Artist",
-		"-metadata",
-		"lyrics="+lyrics,
-		baseMp3,
-	)
-
-	runFFmpegTestCommand(
-		t,
-		"-y",
-		"-i",
-		baseMp3,
-		"-i",
-		coverPath,
-		"-map",
-		"0:a",
-		"-map_metadata",
-		"-1",
-		"-map",
-		"1:0",
-		"-c:v:0",
-		"copy",
-		"-id3v2_version",
-		"3",
-		"-metadata",
-		"title=Test Song",
-		"-metadata",
-		"artist=Test Artist",
-		"-metadata",
-		"lyrics="+lyrics,
-		"-metadata:s:v",
-		"title=Album cover",
-		"-metadata:s:v",
-		"comment=Cover (front)",
-		"-c:a",
-		"copy",
-		finalMp3,
-	)
-
-	meta, err := ReadID3Tags(finalMp3)
-	if err != nil {
-		t.Fatalf("ReadID3Tags failed: %v", err)
-	}
-	if meta == nil {
-		t.Fatalf("ReadID3Tags returned nil metadata")
-	}
-
-	embeddedLyrics, err := ExtractLyrics(finalMp3)
-	if err != nil {
-		t.Fatalf("ExtractLyrics failed: %v (metadata=%+v)", err, meta)
-	}
-	if !strings.Contains(embeddedLyrics, "Hello from embedded lyrics") {
-		t.Fatalf("embedded lyrics missing, got %q (metadata=%+v)", embeddedLyrics, meta)
-	}
-	if !strings.Contains(meta.Lyrics, "Hello from embedded lyrics") {
-		t.Fatalf("ReadID3Tags lyrics missing, got %+v", meta)
-	}
-
-	if _, err := os.Stat(finalMp3); err != nil {
-		t.Fatalf("expected final mp3 to exist: %v", err)
-	}
-}

go_backend/cover.go

@@ -17,8 +17,6 @@ const (
 // Deezer CDN supports these sizes: 56, 250, 500, 1000, 1400, 1800
 var deezerSizeRegex = regexp.MustCompile(`/(\d+)x(\d+)-\d+-\d+-\d+-\d+\.jpg$`)
 
-var tidalSizeRegex = regexp.MustCompile(`/\d+x\d+\.jpg$`)
-
 func convertSmallToMedium(imageURL string) string {
 	if strings.Contains(imageURL, spotifySize300) {
 		return strings.Replace(imageURL, spotifySize300, spotifySize640, 1)
@@ -42,6 +40,7 @@ func downloadCoverToMemory(coverURL string, maxQuality bool) ([]byte, error) {
 		maxURL := upgradeToMaxQuality(downloadURL)
 		if maxURL != downloadURL {
 			downloadURL = maxURL
+			// Log already printed by upgradeToMaxQuality for Deezer
 			if strings.Contains(coverURL, "scdn.co") || strings.Contains(coverURL, "spotifycdn") {
 				GoLog("[Cover] Spotify: upgraded to max resolution (~2000x2000)")
 			}
@@ -87,22 +86,16 @@ func downloadCoverToMemory(coverURL string, maxQuality bool) ([]byte, error) {
 }
 
 func upgradeToMaxQuality(coverURL string) string {
+	// Spotify CDN upgrade
 	if strings.Contains(coverURL, spotifySize640) {
 		return strings.Replace(coverURL, spotifySize640, spotifySizeMax, 1)
 	}
 
+	// Deezer CDN upgrade
 	if strings.Contains(coverURL, "cdn-images.dzcdn.net") {
 		return upgradeDeezerCover(coverURL)
 	}
 
-	if strings.Contains(coverURL, "resources.tidal.com") {
-		return upgradeTidalCover(coverURL)
-	}
-
-	if strings.Contains(coverURL, "static.qobuz.com") {
-		return upgradeQobuzCover(coverURL)
-	}
-
 	return coverURL
 }
 
@@ -111,6 +104,7 @@ func upgradeDeezerCover(coverURL string) string {
 		return coverURL
 	}
 
+	// Replace any size pattern with 1800x1800
 	upgraded := deezerSizeRegex.ReplaceAllString(coverURL, "/1800x1800-000000-80-0-0.jpg")
 	if upgraded != coverURL {
 		GoLog("[Cover] Deezer: upgraded to 1800x1800")
@@ -118,35 +112,12 @@ func upgradeDeezerCover(coverURL string) string {
 	return upgraded
 }
 
-func upgradeTidalCover(coverURL string) string {
-	if !strings.Contains(coverURL, "resources.tidal.com") {
-		return coverURL
-	}
-
-	upgraded := tidalSizeRegex.ReplaceAllString(coverURL, "/origin.jpg")
-	if upgraded != coverURL {
-		GoLog("[Cover] Tidal: upgraded to origin resolution")
-	}
-	return upgraded
-}
-
-func upgradeQobuzCover(coverURL string) string {
-	if !strings.Contains(coverURL, "static.qobuz.com") {
-		return coverURL
-	}
-
-	upgraded := qobuzImageSizeRe.ReplaceAllString(coverURL, "_max.jpg")
-	if upgraded != coverURL {
-		GoLog("[Cover] Qobuz: upgraded to max resolution")
-	}
-	return upgraded
-}
-
 func GetCoverFromSpotify(imageURL string, maxQuality bool) string {
 	if imageURL == "" {
 		return ""
 	}
 
+	// Always upgrade small to medium first
 	result := convertSmallToMedium(imageURL)
 
 	if maxQuality {

go_backend/cue_parser.go

@@ -13,6 +13,7 @@ import (
 
 // CueSheet represents a parsed .cue file
 type CueSheet struct {
+	// Album-level metadata
 	Performer string     `json:"performer"`
 	Title     string     `json:"title"`
 	FileName  string     `json:"file_name"`
@@ -31,6 +32,7 @@ type CueTrack struct {
 	Performer string `json:"performer"`
 	ISRC      string `json:"isrc,omitempty"`
 	Composer  string `json:"composer,omitempty"`
+	// Index positions in seconds (fractional)
 	StartTime float64 `json:"start_time"` // INDEX 01 in seconds
 	PreGap    float64 `json:"pre_gap"`    // INDEX 00 in seconds (or -1 if not present)
 }
@@ -80,6 +82,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 			continue
 		}
 
+		// Handle BOM at start of file
 		if strings.HasPrefix(line, "\xef\xbb\xbf") {
 			line = strings.TrimPrefix(line, "\xef\xbb\xbf")
 			line = strings.TrimSpace(line)
@@ -87,6 +90,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 
 		upper := strings.ToUpper(line)
 
+		// REM commands (album-level metadata)
 		if strings.HasPrefix(upper, "REM ") {
 			matches := reRemCommand.FindStringSubmatch(line)
 			if len(matches) == 3 {
@@ -110,6 +114,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 			continue
 		}
 
+		// PERFORMER
 		if strings.HasPrefix(upper, "PERFORMER ") {
 			value := unquoteCue(line[len("PERFORMER "):])
 			if currentTrack != nil {
@@ -120,6 +125,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 			continue
 		}
 
+		// TITLE
 		if strings.HasPrefix(upper, "TITLE ") {
 			value := unquoteCue(line[len("TITLE "):])
 			if currentTrack != nil {
@@ -130,15 +136,21 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 			continue
 		}
 
+		// FILE
 		if strings.HasPrefix(upper, "FILE ") {
 			rest := line[len("FILE "):]
+			// Extract filename and type
+			// Format: FILE "filename.flac" WAVE
+			// or: FILE filename.flac WAVE
 			fname, ftype := parseCueFileLine(rest)
 			sheet.FileName = fname
 			sheet.FileType = ftype
 			continue
 		}
 
+		// TRACK
 		if strings.HasPrefix(upper, "TRACK ") {
+			// Save previous track
 			if currentTrack != nil {
 				sheet.Tracks = append(sheet.Tracks, *currentTrack)
 			}
@@ -156,6 +168,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 			continue
 		}
 
+		// INDEX
 		if strings.HasPrefix(upper, "INDEX ") && currentTrack != nil {
 			parts := strings.Fields(line)
 			if len(parts) >= 3 {
@@ -171,11 +184,13 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 			continue
 		}
 
+		// ISRC
 		if strings.HasPrefix(upper, "ISRC ") && currentTrack != nil {
 			currentTrack.ISRC = strings.TrimSpace(line[len("ISRC "):])
 			continue
 		}
 
+		// SONGWRITER (used as composer sometimes)
 		if strings.HasPrefix(upper, "SONGWRITER ") {
 			value := unquoteCue(line[len("SONGWRITER "):])
 			if currentTrack != nil {
@@ -187,6 +202,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 		}
 	}
 
+	// Don't forget the last track
 	if currentTrack != nil {
 		sheet.Tracks = append(sheet.Tracks, *currentTrack)
 	}
@@ -414,15 +430,7 @@ func ParseCueFileJSON(cuePath string, audioDir string) (string, error) {
 // entries, one per track. This is used by the library scanner to populate the
 // library with individual track entries from a single CUE+FLAC album.
 func ScanCueFileForLibrary(cuePath string, scanTime string) ([]LibraryScanResult, error) {
-	sheet, err := ParseCueFile(cuePath)
-	if err != nil {
-		return nil, err
-	}
-	audioPath, err := resolveCueAudioPathForLibrary(cuePath, sheet, "")
-	if err != nil {
-		return nil, err
-	}
-	return scanCueSheetForLibrary(cuePath, sheet, audioPath, "", 0, scanTime)
+	return scanCueFileForLibraryInternal(cuePath, "", "", 0, scanTime)
 }
 
 // ScanCueFileForLibraryExt is like ScanCueFileForLibrary but with extra parameters
@@ -433,35 +441,23 @@ func ScanCueFileForLibrary(cuePath string, scanTime string) ([]LibraryScanResult
 //   - fileModTime: if > 0, used as the FileModTime for all results instead of
 //     stat-ing the cuePath on disk (useful when the real file lives behind SAF)
 func ScanCueFileForLibraryExt(cuePath, audioDir, virtualPathPrefix string, fileModTime int64, scanTime string) ([]LibraryScanResult, error) {
+	return scanCueFileForLibraryInternal(cuePath, audioDir, virtualPathPrefix, fileModTime, scanTime)
+}
+
+func scanCueFileForLibraryInternal(cuePath, audioDir, virtualPathPrefix string, fileModTime int64, scanTime string) ([]LibraryScanResult, error) {
 	sheet, err := ParseCueFile(cuePath)
 	if err != nil {
 		return nil, err
 	}
-	audioPath, err := resolveCueAudioPathForLibrary(cuePath, sheet, audioDir)
-	if err != nil {
-		return nil, err
-	}
-	return scanCueSheetForLibrary(cuePath, sheet, audioPath, virtualPathPrefix, fileModTime, scanTime)
-}
 
-func resolveCueAudioPathForLibrary(cuePath string, sheet *CueSheet, audioDir string) (string, error) {
-	if sheet == nil {
-		return "", fmt.Errorf("cue sheet is nil for %s", cuePath)
-	}
+	// Resolve audio file — optionally in an overridden directory
 	resolveBase := cuePath
 	if audioDir != "" {
 		resolveBase = filepath.Join(audioDir, filepath.Base(cuePath))
 	}
 	audioPath := ResolveCueAudioPath(resolveBase, sheet.FileName)
 	if audioPath == "" {
-		return "", fmt.Errorf("audio file not found for cue: %s (referenced: %s)", cuePath, sheet.FileName)
-	}
-	return audioPath, nil
-}
-
-func scanCueSheetForLibrary(cuePath string, sheet *CueSheet, audioPath, virtualPathPrefix string, fileModTime int64, scanTime string) ([]LibraryScanResult, error) {
-	if sheet == nil {
-		return nil, fmt.Errorf("cue sheet is nil for %s", cuePath)
+		return nil, fmt.Errorf("audio file not found for cue: %s (referenced: %s)", cuePath, sheet.FileName)
 	}
 
 	// Try to get quality info from the audio file
@@ -544,6 +540,7 @@ func scanCueSheetForLibrary(cuePath string, sheet *CueSheet, audioPath, virtualP
 			duration = int(totalDurationSec - track.StartTime)
 		}
 
+		// Use a unique ID based on pathBase + track number
 		id := generateLibraryID(fmt.Sprintf("%s#track%d", pathBase, track.Number))
 
 		// Use a virtual file path that includes the track number to ensure

go_backend/deezer.go

@@ -256,7 +256,6 @@ type deezerAlbumFull struct {
 	NbTracks    int    `json:"nb_tracks"`
 	RecordType  string `json:"record_type"`
 	Label       string `json:"label"`
-	Copyright   string `json:"copyright"`
 	Genres      struct {
 		Data []deezerGenre `json:"data"`
 	} `json:"genres"`
@@ -1085,9 +1084,8 @@ func (c *DeezerClient) getBestAlbumImage(album deezerAlbumFull) string {
 }
 
 type AlbumExtendedMetadata struct {
-	Genre     string
-	Label     string
-	Copyright string
+	Genre string
+	Label string
 }
 
 func (c *DeezerClient) GetAlbumExtendedMetadata(ctx context.Context, albumID string) (*AlbumExtendedMetadata, error) {
@@ -1118,9 +1116,8 @@ func (c *DeezerClient) GetAlbumExtendedMetadata(ctx context.Context, albumID str
 	}
 
 	result := &AlbumExtendedMetadata{
-		Genre:     strings.Join(genres, ", "),
-		Label:     album.Label,
-		Copyright: album.Copyright,
+		Genre: strings.Join(genres, ", "),
+		Label: album.Label,
 	}
 
 	c.cacheMu.Lock()
@@ -1132,7 +1129,7 @@ func (c *DeezerClient) GetAlbumExtendedMetadata(ctx context.Context, albumID str
 	c.maybeCleanupCachesLocked(now)
 	c.cacheMu.Unlock()
 
-	GoLog("[Deezer] Album metadata fetched - Genre: %s, Label: %s, Copyright: %s\n", result.Genre, result.Label, result.Copyright)
+	GoLog("[Deezer] Album metadata fetched - Genre: %s, Label: %s\n", result.Genre, result.Label)
 
 	return result, nil
 }
@@ -1181,7 +1178,7 @@ func (c *DeezerClient) getJSON(ctx context.Context, endpoint string, dst interfa
 
 	for attempt := 0; attempt <= deezerMaxRetries; attempt++ {
 		if attempt > 0 {
-			delay := deezerRetryDelay * time.Duration(1<<(attempt-1))
+			delay := deezerRetryDelay * time.Duration(1<<(attempt-1)) // Exponential backoff
 			GoLog("[Deezer] Retry %d/%d after %v...\n", attempt, deezerMaxRetries, delay)
 			time.Sleep(delay)
 		}
@@ -1194,6 +1191,7 @@ func (c *DeezerClient) getJSON(ctx context.Context, endpoint string, dst interfa
 		lastErr = err
 		errStr := err.Error()
 
+		// Check if error is retryable
 		isRetryable := strings.Contains(errStr, "timeout") ||
 			strings.Contains(errStr, "connection reset") ||
 			strings.Contains(errStr, "connection refused") ||

go_backend/deezer_download.go

@@ -203,48 +203,29 @@ func resolveDeezerTrackURL(req DownloadRequest) (string, error) {
 		}
 	}
 	if deezerID != "" {
-		trackURL := fmt.Sprintf("https://www.deezer.com/track/%s", deezerID)
-		if err := verifyDeezerTrack(req, deezerID); err != nil {
-			GoLog("[Deezer] Direct ID %s verification failed: %v\n", deezerID, err)
-			// Don't reject direct IDs from request payload — they're presumably correct.
-		}
-		return trackURL, nil
+		return fmt.Sprintf("https://www.deezer.com/track/%s", deezerID), nil
 	}
 
-	// Try SongLink
+	// Try resolving Deezer ID from Spotify ID via SongLink
 	spotifyID := strings.TrimSpace(req.SpotifyID)
 	if spotifyID != "" && isLikelySpotifyTrackID(spotifyID) {
 		songlink := NewSongLinkClient()
 		availability, err := songlink.CheckTrackAvailability(spotifyID, "")
 		if err == nil && availability.Deezer && availability.DeezerURL != "" {
-			resolvedID := extractDeezerIDFromURL(availability.DeezerURL)
-			if resolvedID != "" {
-				if verifyErr := verifyDeezerTrack(req, resolvedID); verifyErr != nil {
-					GoLog("[Deezer] SongLink ID %s rejected: %v\n", resolvedID, verifyErr)
-					// Fall through to ISRC search instead of using wrong track.
-				} else {
-					return availability.DeezerURL, nil
-				}
-			} else {
-				return availability.DeezerURL, nil
-			}
+			return availability.DeezerURL, nil
 		}
 	}
 
-	// Try ISRC
+	// Try resolving from ISRC
 	isrc := strings.TrimSpace(req.ISRC)
 	if isrc != "" {
 		ctx, cancel := context.WithTimeout(context.Background(), SongLinkTimeout)
 		defer cancel()
 		track, err := GetDeezerClient().SearchByISRC(ctx, isrc)
 		if err == nil && track != nil {
-			resolvedID := songLinkExtractDeezerTrackID(track)
-			if resolvedID != "" {
-				if verifyErr := verifyDeezerTrack(req, resolvedID); verifyErr != nil {
-					GoLog("[Deezer] ISRC-resolved ID %s rejected: %v\n", resolvedID, verifyErr)
-					return "", fmt.Errorf("deezer track resolved via ISRC does not match: %w", verifyErr)
-				}
-				return fmt.Sprintf("https://www.deezer.com/track/%s", resolvedID), nil
+			deezerID = songLinkExtractDeezerTrackID(track)
+			if deezerID != "" {
+				return fmt.Sprintf("https://www.deezer.com/track/%s", deezerID), nil
 			}
 		}
 	}
@@ -252,26 +233,6 @@ func resolveDeezerTrackURL(req DownloadRequest) (string, error) {
 	return "", fmt.Errorf("could not resolve Deezer track URL")
 }
 
-func verifyDeezerTrack(req DownloadRequest, deezerID string) error {
-	ctx, cancel := context.WithTimeout(context.Background(), SongLinkTimeout)
-	defer cancel()
-	trackResp, err := GetDeezerClient().GetTrack(ctx, deezerID)
-	if err != nil {
-		return nil // Can't verify — don't block the download.
-	}
-	resolved := resolvedTrackInfo{
-		Title:      trackResp.Track.Name,
-		ArtistName: trackResp.Track.Artists,
-		Duration:   trackResp.Track.DurationMS / 1000,
-	}
-	if !trackMatchesRequest(req, resolved, "Deezer") {
-		return fmt.Errorf("expected '%s - %s', got '%s - %s'",
-			req.ArtistName, req.TrackName, resolved.ArtistName, resolved.Title)
-	}
-	GoLog("[Deezer] Track %s verified: '%s - %s' ✓\n", deezerID, resolved.ArtistName, resolved.Title)
-	return nil
-}
-
 type deezerMusicDLRequest struct {
 	Platform string `json:"platform"`
 	URL      string `json:"url"`
@@ -319,6 +280,7 @@ func (c *DeezerClient) GetMusicDLDownloadURL(deezerTrackURL string) (string, err
 		return "", fmt.Errorf("MusicDL error: %s", errMsg)
 	}
 
+	// Try various response fields for download URL
 	for _, key := range []string{"download_url", "url", "link"} {
 		if urlVal, ok := raw[key].(string); ok && strings.TrimSpace(urlVal) != "" {
 			return strings.TrimSpace(urlVal), nil
@@ -432,6 +394,11 @@ func downloadFromDeezer(req DownloadRequest) (DeezerDownloadResult, error) {
 		}
 	}
 
+	spotifyURL, err := resolveSpotifyURLForYoinkify(req)
+	if err != nil {
+		return DeezerDownloadResult{}, err
+	}
+
 	filename := buildFilenameFromTemplate(req.FilenameFormat, map[string]interface{}{
 		"title":  req.TrackName,
 		"artist": req.ArtistName,
@@ -494,17 +461,6 @@ func downloadFromDeezer(req DownloadRequest) (DeezerDownloadResult, error) {
 	}
 
 	if downloadErr != nil || deezerURLErr != nil {
-		spotifyURL, err := resolveSpotifyURLForYoinkify(req)
-		if err != nil {
-			if deezerURLErr != nil {
-				return DeezerDownloadResult{}, fmt.Errorf(
-					"deezer download failed: direct Deezer resolution error: %v; Yoinkify fallback error: %w",
-					deezerURLErr,
-					err,
-				)
-			}
-			return DeezerDownloadResult{}, err
-		}
 		downloadErr = deezerClient.DownloadFromYoinkify(spotifyURL, outputPath, req.OutputFD, req.ItemID)
 		if downloadErr != nil {
 			if errors.Is(downloadErr, ErrDownloadCancelled) {

go_backend/duplicate.go

@@ -34,6 +34,7 @@ func GetISRCIndex(outputDir string) *ISRCIndex {
 		return idx
 	}
 
+	// Slow path: need to build index
 	// Use per-directory mutex to prevent multiple goroutines from building simultaneously
 	buildLock, _ := isrcBuildingMu.LoadOrStore(outputDir, &sync.Mutex{})
 	mu := buildLock.(*sync.Mutex)

go_backend/exports.go

@@ -48,6 +48,7 @@ func CheckAvailability(spotifyID, isrc string) (string, error) {
 }
 
 // SetSongLinkNetworkOptions is kept for backward compatibility.
+// It now applies global network compatibility options for all backend API requests.
 func SetSongLinkNetworkOptions(allowHTTP, insecureTLS bool) {
 	SetNetworkCompatibilityOptions(allowHTTP, insecureTLS)
 }
@@ -127,7 +128,6 @@ type DownloadResult struct {
 	TrackNumber   int
 	DiscNumber    int
 	ISRC          string
-	CoverURL      string
 	Genre         string
 	Label         string
 	Copyright     string
@@ -135,36 +135,6 @@ type DownloadResult struct {
 	DecryptionKey string
 }
 
-func preferredReleaseMetadata(
-	req DownloadRequest,
-	album string,
-	releaseDate string,
-	trackNumber int,
-	discNumber int,
-) (string, string, int, int) {
-	preferredAlbum := strings.TrimSpace(req.AlbumName)
-	if preferredAlbum == "" {
-		preferredAlbum = album
-	}
-
-	preferredReleaseDate := strings.TrimSpace(req.ReleaseDate)
-	if preferredReleaseDate == "" {
-		preferredReleaseDate = releaseDate
-	}
-
-	preferredTrackNumber := req.TrackNumber
-	if preferredTrackNumber == 0 {
-		preferredTrackNumber = trackNumber
-	}
-
-	preferredDiscNumber := req.DiscNumber
-	if preferredDiscNumber == 0 {
-		preferredDiscNumber = discNumber
-	}
-
-	return preferredAlbum, preferredReleaseDate, preferredTrackNumber, preferredDiscNumber
-}
-
 func buildDownloadSuccessResponse(
 	req DownloadRequest,
 	result DownloadResult,
@@ -183,16 +153,25 @@ func buildDownloadSuccessResponse(
 		artist = req.ArtistName
 	}
 
-	// Preserve requested release metadata when available so mixed-provider
-	// fallback downloads from the same source album do not get split into
-	// different albums just because Tidal/Qobuz report variant titles/dates.
-	album, releaseDate, trackNumber, discNumber := preferredReleaseMetadata(
-		req,
-		result.Album,
-		result.ReleaseDate,
-		result.TrackNumber,
-		result.DiscNumber,
-	)
+	album := result.Album
+	if album == "" {
+		album = req.AlbumName
+	}
+
+	releaseDate := result.ReleaseDate
+	if releaseDate == "" {
+		releaseDate = req.ReleaseDate
+	}
+
+	trackNumber := result.TrackNumber
+	if trackNumber == 0 {
+		trackNumber = req.TrackNumber
+	}
+
+	discNumber := result.DiscNumber
+	if discNumber == 0 {
+		discNumber = req.DiscNumber
+	}
 
 	isrc := result.ISRC
 	if isrc == "" {
@@ -214,11 +193,6 @@ func buildDownloadSuccessResponse(
 		copyright = req.Copyright
 	}
 
-	coverURL := strings.TrimSpace(result.CoverURL)
-	if coverURL == "" {
-		coverURL = strings.TrimSpace(req.CoverURL)
-	}
-
 	return DownloadResponse{
 		Success:          true,
 		Message:          message,
@@ -235,7 +209,7 @@ func buildDownloadSuccessResponse(
 		TrackNumber:      trackNumber,
 		DiscNumber:       discNumber,
 		ISRC:             isrc,
-		CoverURL:         coverURL,
+		CoverURL:         req.CoverURL,
 		Genre:            genre,
 		Label:            label,
 		Copyright:        copyright,
@@ -288,7 +262,7 @@ func enrichRequestExtendedMetadata(req *DownloadRequest) {
 		return
 	}
 
-	if req.ISRC == "" || (req.Genre != "" && req.Label != "" && req.Copyright != "") {
+	if req.ISRC == "" || (req.Genre != "" && req.Label != "") {
 		return
 	}
 
@@ -310,11 +284,8 @@ func enrichRequestExtendedMetadata(req *DownloadRequest) {
 	if req.Label == "" && extMeta.Label != "" {
 		req.Label = extMeta.Label
 	}
-	if req.Copyright == "" && extMeta.Copyright != "" {
-		req.Copyright = extMeta.Copyright
-	}
-	if req.Genre != "" || req.Label != "" || req.Copyright != "" {
-		GoLog("[DownloadWithFallback] Extended metadata ready: genre=%s, label=%s, copyright=%s\n", req.Genre, req.Label, req.Copyright)
+	if req.Genre != "" || req.Label != "" {
+		GoLog("[DownloadWithFallback] Extended metadata ready: genre=%s, label=%s\n", req.Genre, req.Label)
 	}
 }
 
@@ -383,7 +354,6 @@ func DownloadTrack(requestJSON string) (string, error) {
 				TrackNumber: qobuzResult.TrackNumber,
 				DiscNumber:  qobuzResult.DiscNumber,
 				ISRC:        qobuzResult.ISRC,
-				CoverURL:    qobuzResult.CoverURL,
 				LyricsLRC:   qobuzResult.LyricsLRC,
 			}
 		}
@@ -406,6 +376,24 @@ func DownloadTrack(requestJSON string) (string, error) {
 			}
 		}
 		err = deezerErr
+	case "youtube":
+		youtubeResult, youtubeErr := downloadFromYouTube(req)
+		if youtubeErr == nil {
+			result = DownloadResult{
+				FilePath:    youtubeResult.FilePath,
+				BitDepth:    0,
+				SampleRate:  0,
+				Title:       youtubeResult.Title,
+				Artist:      youtubeResult.Artist,
+				Album:       youtubeResult.Album,
+				ReleaseDate: youtubeResult.ReleaseDate,
+				TrackNumber: youtubeResult.TrackNumber,
+				DiscNumber:  youtubeResult.DiscNumber,
+				ISRC:        youtubeResult.ISRC,
+				LyricsLRC:   youtubeResult.LyricsLRC,
+			}
+		}
+		err = youtubeErr
 	default:
 		return errorResponse("Unknown service: " + req.Service)
 	}
@@ -457,7 +445,7 @@ func DownloadByStrategy(requestJSON string) (string, error) {
 	serviceNormalized := strings.ToLower(serviceRaw)
 
 	normalizedReq := req
-	if isBuiltInProvider(serviceNormalized) {
+	if serviceNormalized == "youtube" || isBuiltInProvider(serviceNormalized) {
 		normalizedReq.Service = serviceNormalized
 	}
 
@@ -467,6 +455,10 @@ func DownloadByStrategy(requestJSON string) (string, error) {
 	}
 	normalizedJSON := string(normalizedBytes)
 
+	if serviceNormalized == "youtube" {
+		return DownloadFromYouTube(normalizedJSON)
+	}
+
 	if req.UseExtensions {
 		// Respect strict mode when auto fallback is disabled:
 		// for built-in providers, route directly to selected service only.
@@ -570,7 +562,6 @@ func DownloadWithFallback(requestJSON string) (string, error) {
 					TrackNumber: qobuzResult.TrackNumber,
 					DiscNumber:  qobuzResult.DiscNumber,
 					ISRC:        qobuzResult.ISRC,
-					CoverURL:    qobuzResult.CoverURL,
 					LyricsLRC:   qobuzResult.LyricsLRC,
 				}
 			} else if !errors.Is(qobuzErr, ErrDownloadCancelled) {
@@ -698,80 +689,32 @@ func ReadFileMetadata(filePath string) (string, error) {
 	if isFlac {
 		metadata, err := ReadMetadata(filePath)
 		if err != nil {
-			// File may have wrong extension (e.g. opus saved as .flac).
-			// Try Ogg/Opus parser as fallback before giving up.
-			GoLog("[ReadFileMetadata] FLAC parse failed for %s, trying Ogg fallback: %v\n", filePath, err)
-			oggMeta, oggErr := ReadOggVorbisComments(filePath)
-			if oggErr == nil && oggMeta != nil {
-				result["title"] = oggMeta.Title
-				result["artist"] = oggMeta.Artist
-				result["album"] = oggMeta.Album
-				result["album_artist"] = oggMeta.AlbumArtist
-				result["date"] = oggMeta.Date
-				if oggMeta.Date == "" {
-					result["date"] = oggMeta.Year
-				}
-				result["track_number"] = oggMeta.TrackNumber
-				result["disc_number"] = oggMeta.DiscNumber
-				result["isrc"] = oggMeta.ISRC
-				result["lyrics"] = oggMeta.Lyrics
-				result["genre"] = oggMeta.Genre
-				result["composer"] = oggMeta.Composer
-				result["comment"] = oggMeta.Comment
-				quality, qualityErr := GetOggQuality(filePath)
-				if qualityErr == nil {
-					result["sample_rate"] = quality.SampleRate
-					result["duration"] = quality.Duration
-				}
-			} else {
-				return "", fmt.Errorf("failed to read metadata: %w", err)
-			}
-		} else {
-			result["title"] = metadata.Title
-			result["artist"] = metadata.Artist
-			result["album"] = metadata.Album
-			result["album_artist"] = metadata.AlbumArtist
-			result["date"] = metadata.Date
-			result["track_number"] = metadata.TrackNumber
-			result["disc_number"] = metadata.DiscNumber
-			result["isrc"] = metadata.ISRC
-			result["lyrics"] = metadata.Lyrics
-			result["genre"] = metadata.Genre
-			result["label"] = metadata.Label
-			result["copyright"] = metadata.Copyright
-			result["composer"] = metadata.Composer
-			result["comment"] = metadata.Comment
+			return "", fmt.Errorf("failed to read metadata: %w", err)
+		}
+		result["title"] = metadata.Title
+		result["artist"] = metadata.Artist
+		result["album"] = metadata.Album
+		result["album_artist"] = metadata.AlbumArtist
+		result["date"] = metadata.Date
+		result["track_number"] = metadata.TrackNumber
+		result["disc_number"] = metadata.DiscNumber
+		result["isrc"] = metadata.ISRC
+		result["lyrics"] = metadata.Lyrics
+		result["genre"] = metadata.Genre
+		result["label"] = metadata.Label
+		result["copyright"] = metadata.Copyright
+		result["composer"] = metadata.Composer
+		result["comment"] = metadata.Comment
 
-			quality, qualityErr := GetAudioQuality(filePath)
-			if qualityErr == nil {
-				result["bit_depth"] = quality.BitDepth
-				result["sample_rate"] = quality.SampleRate
-				if quality.SampleRate > 0 && quality.TotalSamples > 0 {
-					result["duration"] = int(quality.TotalSamples / int64(quality.SampleRate))
-				}
+		quality, qualityErr := GetAudioQuality(filePath)
+		if qualityErr == nil {
+			result["bit_depth"] = quality.BitDepth
+			result["sample_rate"] = quality.SampleRate
+			if quality.SampleRate > 0 && quality.TotalSamples > 0 {
+				result["duration"] = int(quality.TotalSamples / int64(quality.SampleRate))
 			}
 		}
 	} else if isM4A {
-		meta, err := ReadM4ATags(filePath)
-		if err == nil && meta != nil {
-			result["title"] = meta.Title
-			result["artist"] = meta.Artist
-			result["album"] = meta.Album
-			result["album_artist"] = meta.AlbumArtist
-			result["date"] = meta.Date
-			if meta.Date == "" {
-				result["date"] = meta.Year
-			}
-			result["track_number"] = meta.TrackNumber
-			result["disc_number"] = meta.DiscNumber
-			result["isrc"] = meta.ISRC
-			result["lyrics"] = meta.Lyrics
-			result["genre"] = meta.Genre
-			result["label"] = meta.Label
-			result["copyright"] = meta.Copyright
-			result["composer"] = meta.Composer
-			result["comment"] = meta.Comment
-		}
 		quality, qualityErr := GetM4AQuality(filePath)
 		if qualityErr == nil {
 			result["bit_depth"] = quality.BitDepth
@@ -915,6 +858,7 @@ func EditFileMetadata(filePath, metadataJSON string) (string, error) {
 		return string(jsonBytes), nil
 	}
 
+	// MP3/Opus: return metadata for Dart-side FFmpeg embedding
 	resp := map[string]any{
 		"success": true,
 		"method":  "ffmpeg",
@@ -1159,36 +1103,6 @@ func SearchDeezerAll(query string, trackLimit, artistLimit int, filter string) (
 	return string(jsonBytes), nil
 }
 
-func SearchTidalAll(query string, trackLimit, artistLimit int, filter string) (string, error) {
-	downloader := NewTidalDownloader()
-	results, err := downloader.SearchAll(query, trackLimit, artistLimit, filter)
-	if err != nil {
-		return "", err
-	}
-
-	jsonBytes, err := json.Marshal(results)
-	if err != nil {
-		return "", err
-	}
-
-	return string(jsonBytes), nil
-}
-
-func SearchQobuzAll(query string, trackLimit, artistLimit int, filter string) (string, error) {
-	downloader := NewQobuzDownloader()
-	results, err := downloader.SearchAll(query, trackLimit, artistLimit, filter)
-	if err != nil {
-		return "", err
-	}
-
-	jsonBytes, err := json.Marshal(results)
-	if err != nil {
-		return "", err
-	}
-
-	return string(jsonBytes), nil
-}
-
 func GetDeezerRelatedArtists(artistID string, limit int) (string, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
 	defer cancel()
@@ -1242,66 +1156,6 @@ func GetDeezerMetadata(resourceType, resourceID string) (string, error) {
 	return string(jsonBytes), nil
 }
 
-func GetQobuzMetadata(resourceType, resourceID string) (string, error) {
-	downloader := NewQobuzDownloader()
-
-	var data interface{}
-	var err error
-
-	switch resourceType {
-	case "track":
-		data, err = downloader.GetTrackMetadata(resourceID)
-	case "album":
-		data, err = downloader.GetAlbumMetadata(resourceID)
-	case "artist":
-		data, err = downloader.GetArtistMetadata(resourceID)
-	case "playlist":
-		data, err = downloader.GetPlaylistMetadata(resourceID)
-	default:
-		return "", fmt.Errorf("unsupported Qobuz resource type: %s", resourceType)
-	}
-	if err != nil {
-		return "", err
-	}
-
-	jsonBytes, err := json.Marshal(data)
-	if err != nil {
-		return "", err
-	}
-
-	return string(jsonBytes), nil
-}
-
-func GetTidalMetadata(resourceType, resourceID string) (string, error) {
-	downloader := NewTidalDownloader()
-
-	var data interface{}
-	var err error
-
-	switch resourceType {
-	case "track":
-		data, err = downloader.GetTrackMetadata(resourceID)
-	case "album":
-		data, err = downloader.GetAlbumMetadata(resourceID)
-	case "artist":
-		data, err = downloader.GetArtistMetadata(resourceID)
-	case "playlist":
-		data, err = downloader.GetPlaylistMetadata(resourceID)
-	default:
-		return "", fmt.Errorf("unsupported Tidal resource type: %s", resourceType)
-	}
-	if err != nil {
-		return "", err
-	}
-
-	jsonBytes, err := json.Marshal(data)
-	if err != nil {
-		return "", err
-	}
-
-	return string(jsonBytes), nil
-}
-
 func ParseDeezerURLExport(url string) (string, error) {
 	resourceType, resourceID, err := parseDeezerURL(url)
 	if err != nil {
@@ -1321,25 +1175,6 @@ func ParseDeezerURLExport(url string) (string, error) {
 	return string(jsonBytes), nil
 }
 
-func ParseQobuzURLExport(url string) (string, error) {
-	resourceType, resourceID, err := parseQobuzURL(url)
-	if err != nil {
-		return "", err
-	}
-
-	result := map[string]string{
-		"type": resourceType,
-		"id":   resourceID,
-	}
-
-	jsonBytes, err := json.Marshal(result)
-	if err != nil {
-		return "", err
-	}
-
-	return string(jsonBytes), nil
-}
-
 func ParseTidalURLExport(url string) (string, error) {
 	resourceType, resourceID, err := parseTidalURL(url)
 	if err != nil {
@@ -1400,7 +1235,10 @@ func GetDeezerExtendedMetadata(trackID string) (string, error) {
 		return "", err
 	}
 
-	result := buildDeezerExtendedMetadataResult(metadata)
+	result := map[string]string{
+		"genre": metadata.Genre,
+		"label": metadata.Label,
+	}
 
 	jsonBytes, err := json.Marshal(result)
 	if err != nil {
@@ -1420,8 +1258,7 @@ func SearchDeezerByISRC(isrc string) (string, error) {
 		return "", err
 	}
 
-	result := buildDeezerISRCSearchResult(track)
-	jsonBytes, err := json.Marshal(result)
+	jsonBytes, err := json.Marshal(track)
 	if err != nil {
 		return "", err
 	}
@@ -1429,55 +1266,6 @@ func SearchDeezerByISRC(isrc string) (string, error) {
 	return string(jsonBytes), nil
 }
 
-func buildDeezerExtendedMetadataResult(metadata *AlbumExtendedMetadata) map[string]string {
-	if metadata == nil {
-		return map[string]string{
-			"genre":     "",
-			"label":     "",
-			"copyright": "",
-		}
-	}
-
-	return map[string]string{
-		"genre":     metadata.Genre,
-		"label":     metadata.Label,
-		"copyright": metadata.Copyright,
-	}
-}
-
-func buildDeezerISRCSearchResult(track *TrackMetadata) map[string]interface{} {
-	if track == nil {
-		return map[string]interface{}{}
-	}
-
-	result := map[string]interface{}{
-		"spotify_id":    track.SpotifyID,
-		"artists":       track.Artists,
-		"name":          track.Name,
-		"album_name":    track.AlbumName,
-		"album_artist":  track.AlbumArtist,
-		"duration_ms":   track.DurationMS,
-		"images":        track.Images,
-		"release_date":  track.ReleaseDate,
-		"track_number":  track.TrackNumber,
-		"total_tracks":  track.TotalTracks,
-		"disc_number":   track.DiscNumber,
-		"external_urls": track.ExternalURL,
-		"isrc":          track.ISRC,
-		"album_id":      track.AlbumID,
-		"artist_id":     track.ArtistID,
-		"album_type":    track.AlbumType,
-	}
-
-	if deezerID := strings.TrimSpace(strings.TrimPrefix(track.SpotifyID, "deezer:")); deezerID != "" {
-		result["id"] = deezerID
-		result["track_id"] = deezerID
-		result["success"] = true
-	}
-
-	return result
-}
-
 func ConvertSpotifyToDeezer(resourceType, spotifyID string) (string, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
@@ -1523,6 +1311,7 @@ func ConvertSpotifyToDeezer(resourceType, spotifyID string) (string, error) {
 		return string(jsonBytes), nil
 	}
 
+	// For artists/playlists, SongLink doesn't provide direct mapping
 	return "", fmt.Errorf("Spotify to Deezer conversion only supported for tracks and albums. Please search by name for %s", resourceType)
 }
 
@@ -1674,6 +1463,62 @@ func errorResponse(msg string) (string, error) {
 	return string(jsonBytes), nil
 }
 
+func DownloadFromYouTube(requestJSON string) (string, error) {
+	var req DownloadRequest
+	if err := json.Unmarshal([]byte(requestJSON), &req); err != nil {
+		return errorResponse("Invalid request: " + err.Error())
+	}
+	applySongLinkRegionFromRequest(&req)
+	defer closeOwnedOutputFD(req.OutputFD)
+
+	req.TrackName = strings.TrimSpace(req.TrackName)
+	req.ArtistName = strings.TrimSpace(req.ArtistName)
+	req.AlbumName = strings.TrimSpace(req.AlbumName)
+	req.AlbumArtist = strings.TrimSpace(req.AlbumArtist)
+	req.OutputDir = strings.TrimSpace(req.OutputDir)
+	req.OutputPath = strings.TrimSpace(req.OutputPath)
+	req.OutputExt = strings.TrimSpace(req.OutputExt)
+
+	if req.OutputPath == "" && req.OutputFD <= 0 && req.OutputDir != "" {
+		AddAllowedDownloadDir(req.OutputDir)
+	}
+
+	youtubeResult, err := downloadFromYouTube(req)
+	if err != nil {
+		return errorResponse(err.Error())
+	}
+
+	resp := DownloadResponse{
+		Success:     true,
+		Message:     "Downloaded from YouTube",
+		FilePath:    youtubeResult.FilePath,
+		Service:     "youtube",
+		Title:       youtubeResult.Title,
+		Artist:      youtubeResult.Artist,
+		Album:       youtubeResult.Album,
+		ReleaseDate: youtubeResult.ReleaseDate,
+		TrackNumber: youtubeResult.TrackNumber,
+		DiscNumber:  youtubeResult.DiscNumber,
+		ISRC:        youtubeResult.ISRC,
+		LyricsLRC:   youtubeResult.LyricsLRC,
+		CoverURL:    req.CoverURL,
+		Genre:       req.Genre,
+		Label:       req.Label,
+		Copyright:   req.Copyright,
+	}
+
+	jsonBytes, _ := json.Marshal(resp)
+	return string(jsonBytes), nil
+}
+
+func IsYouTubeURLExport(urlStr string) bool {
+	return IsYouTubeURL(urlStr)
+}
+
+func ExtractYouTubeVideoIDExport(urlStr string) (string, error) {
+	return ExtractYouTubeVideoID(urlStr)
+}
+
 func DownloadCoverToFile(coverURL string, outputPath string, maxQuality bool) error {
 	if coverURL == "" {
 		return fmt.Errorf("no cover URL provided")
@@ -1700,8 +1545,6 @@ func ExtractCoverToFile(audioPath string, outputPath string) error {
 
 	if strings.HasSuffix(lower, ".flac") {
 		coverData, err = ExtractCoverArt(audioPath)
-	} else if strings.HasSuffix(lower, ".m4a") || strings.HasSuffix(lower, ".aac") {
-		coverData, err = extractCoverFromM4A(audioPath)
 	} else if strings.HasSuffix(lower, ".mp3") {
 		coverData, _, err = extractMP3CoverArt(audioPath)
 	} else if strings.HasSuffix(lower, ".opus") || strings.HasSuffix(lower, ".ogg") {
@@ -1832,58 +1675,83 @@ func ReEnrichFile(requestJSON string) (string, error) {
 
 	GoLog("[ReEnrich] Starting re-enrichment for: %s\n", req.FilePath)
 
-	// When search_online is true, search for metadata from internet using the
-	// configured metadata-provider priority.
+	// When search_online is true, search for metadata from internet.
+	// Priority: 1) Deezer (reliable, no credentials) 2) Extension providers (spotify-web etc)
 	if req.SearchOnline && req.TrackName != "" && req.ArtistName != "" {
 		GoLog("[ReEnrich] Searching online metadata for: %s - %s\n", req.TrackName, req.ArtistName)
 		searchQuery := req.TrackName + " " + req.ArtistName
 		found := false
 
+		// 1) Try Deezer first (reliable, no credentials needed)
+		GoLog("[ReEnrich] Trying Deezer search...\n")
 		deezerClient := GetDeezerClient()
-		GoLog("[ReEnrich] Trying metadata providers in configured priority...\n")
-		manager := GetExtensionManager()
-		tracks, searchErr := manager.SearchTracksWithMetadataProviders(searchQuery, 5, true)
-		if searchErr == nil && len(tracks) > 0 {
-			track := tracks[0]
-			GoLog("[ReEnrich] Metadata match (%s): %s - %s (album: %s)\n", track.ProviderID, track.Name, track.Artists, track.AlbumName)
-			if track.SpotifyID != "" {
-				req.SpotifyID = track.SpotifyID
-			} else if track.DeezerID != "" {
-				req.SpotifyID = "deezer:" + track.DeezerID
-			} else if track.QobuzID != "" {
-				req.SpotifyID = "qobuz:" + track.QobuzID
-			} else if track.TidalID != "" {
-				req.SpotifyID = "tidal:" + track.TidalID
-			} else {
-				req.SpotifyID = track.ID
+		{
+			ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+			deezerResults, err := deezerClient.SearchAll(ctx, searchQuery, 5, 0, "track")
+			cancel()
+			if err == nil && len(deezerResults.Tracks) > 0 {
+				track := deezerResults.Tracks[0]
+				GoLog("[ReEnrich] Deezer match: %s - %s (album: %s)\n", track.Name, track.Artists, track.AlbumName)
+				req.SpotifyID = "deezer:" + track.SpotifyID
+				req.AlbumName = track.AlbumName
+				req.AlbumArtist = track.AlbumArtist
+				req.TrackNumber = track.TrackNumber
+				req.DiscNumber = track.DiscNumber
+				req.ReleaseDate = track.ReleaseDate
+				req.ISRC = track.ISRC
+				if track.Images != "" {
+					req.CoverURL = track.Images
+				}
+				req.DurationMs = int64(track.DurationMS)
+				found = true
+			} else if err != nil {
+				GoLog("[ReEnrich] Deezer search failed: %v\n", err)
 			}
-			req.AlbumName = track.AlbumName
-			req.AlbumArtist = track.AlbumArtist
-			req.TrackNumber = track.TrackNumber
-			req.DiscNumber = track.DiscNumber
-			req.ReleaseDate = track.ReleaseDate
-			req.ISRC = track.ISRC
-			coverURL := track.ResolvedCoverURL()
-			if coverURL != "" {
-				req.CoverURL = coverURL
-			}
-			req.DurationMs = int64(track.DurationMS)
-			if track.Genre != "" {
-				req.Genre = track.Genre
-			}
-			if track.Label != "" {
-				req.Label = track.Label
-			}
-			if track.Copyright != "" {
-				req.Copyright = track.Copyright
-			}
-			found = true
-		} else if searchErr != nil {
-			GoLog("[ReEnrich] Metadata provider search failed: %v\n", searchErr)
 		}
 
-		// Try to get extended metadata from Deezer if not already set
-		if found && req.ISRC != "" && (req.Genre == "" || req.Label == "" || req.Copyright == "") {
+		// 2) Try extension metadata providers (spotify-web etc) if Deezer failed
+		if !found {
+			GoLog("[ReEnrich] Trying extension metadata providers...\n")
+			manager := GetExtensionManager()
+			extTracks, extErr := manager.SearchTracksWithExtensions(searchQuery, 5)
+			if extErr == nil && len(extTracks) > 0 {
+				track := extTracks[0]
+				GoLog("[ReEnrich] Extension match (%s): %s - %s (album: %s)\n", track.ProviderID, track.Name, track.Artists, track.AlbumName)
+				if track.SpotifyID != "" {
+					req.SpotifyID = track.SpotifyID
+				} else if track.DeezerID != "" {
+					req.SpotifyID = "deezer:" + track.DeezerID
+				} else {
+					req.SpotifyID = track.ID
+				}
+				req.AlbumName = track.AlbumName
+				req.AlbumArtist = track.AlbumArtist
+				req.TrackNumber = track.TrackNumber
+				req.DiscNumber = track.DiscNumber
+				req.ReleaseDate = track.ReleaseDate
+				req.ISRC = track.ISRC
+				coverURL := track.ResolvedCoverURL()
+				if coverURL != "" {
+					req.CoverURL = coverURL
+				}
+				req.DurationMs = int64(track.DurationMS)
+				if track.Genre != "" {
+					req.Genre = track.Genre
+				}
+				if track.Label != "" {
+					req.Label = track.Label
+				}
+				if track.Copyright != "" {
+					req.Copyright = track.Copyright
+				}
+				found = true
+			} else if extErr != nil {
+				GoLog("[ReEnrich] Extension search failed: %v\n", extErr)
+			}
+		}
+
+		// Try to get extended metadata (genre, label) from Deezer if not already set
+		if found && req.ISRC != "" && (req.Genre == "" || req.Label == "") {
 			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 			extMeta, err := deezerClient.GetExtendedMetadataByISRC(ctx, req.ISRC)
 			cancel()
@@ -1894,10 +1762,7 @@ func ReEnrichFile(requestJSON string) (string, error) {
 				if req.Label == "" && extMeta.Label != "" {
 					req.Label = extMeta.Label
 				}
-				if req.Copyright == "" && extMeta.Copyright != "" {
-					req.Copyright = extMeta.Copyright
-				}
-				GoLog("[ReEnrich] Extended metadata: genre=%s, label=%s, copyright=%s\n", req.Genre, req.Label, req.Copyright)
+				GoLog("[ReEnrich] Extended metadata: genre=%s, label=%s\n", req.Genre, req.Label)
 			}
 		}
 
@@ -1906,6 +1771,7 @@ func ReEnrichFile(requestJSON string) (string, error) {
 		}
 	}
 
+	// Log metadata summary before embedding
 	GoLog("[ReEnrich] Metadata to embed: title=%s, artist=%s, album=%s, albumArtist=%s\n",
 		req.TrackName, req.ArtistName, req.AlbumName, req.AlbumArtist)
 	GoLog("[ReEnrich] track=%d, disc=%d, date=%s, isrc=%s, genre=%s, label=%s\n",
@@ -1965,15 +1831,8 @@ func ReEnrichFile(requestJSON string) (string, error) {
 		}
 	}()
 
-	// Preserve existing lyrics when online enrichment does not return a replacement.
-	var lyricsLRC string
-	existingLyrics, existingLyricsErr := ExtractLyrics(req.FilePath)
-	if existingLyricsErr == nil && strings.TrimSpace(existingLyrics) != "" {
-		lyricsLRC = existingLyrics
-		GoLog("[ReEnrich] Preserving existing embedded/sidecar lyrics\n")
-	}
-
 	// Fetch lyrics
+	var lyricsLRC string
 	if req.EmbedLyrics {
 		client := NewLyricsClient()
 		durationSec := float64(req.DurationMs) / 1000.0
@@ -1988,6 +1847,7 @@ func ReEnrichFile(requestJSON string) (string, error) {
 		}
 	}
 
+	// Build enriched metadata response for Dart (includes online search results)
 	enrichedMeta := map[string]interface{}{
 		"track_name":   req.TrackName,
 		"artist_name":  req.ArtistName,
@@ -2053,6 +1913,7 @@ func ReEnrichFile(requestJSON string) (string, error) {
 		return string(jsonBytes), nil
 	}
 
+	// MP3/Opus: return metadata map for Dart to use FFmpeg
 	// Don't cleanup cover temp — Dart needs it for FFmpeg embed
 	cleanupCover = false
 	result := map[string]interface{}{
@@ -2133,6 +1994,12 @@ func LoadExtensionFromPath(filePath string) (string, error) {
 		return "", err
 	}
 
+	settingsStore := GetExtensionSettingsStore()
+	settings := settingsStore.GetAll(ext.ID)
+	if len(settings) > 0 {
+		manager.InitializeExtension(ext.ID, settings)
+	}
+
 	result := map[string]interface{}{
 		"id":           ext.ID,
 		"name":         ext.Manifest.Name,
@@ -2166,6 +2033,12 @@ func UpgradeExtensionFromPath(filePath string) (string, error) {
 		return "", err
 	}
 
+	settingsStore := GetExtensionSettingsStore()
+	settings := settingsStore.GetAll(ext.ID)
+	if len(settings) > 0 {
+		manager.InitializeExtension(ext.ID, settings)
+	}
+
 	result := map[string]interface{}{
 		"id":           ext.ID,
 		"display_name": ext.Manifest.DisplayName,
@@ -2276,21 +2149,6 @@ func SearchTracksWithExtensionsJSON(query string, limit int) (string, error) {
 	return string(jsonBytes), nil
 }
 
-func SearchTracksWithMetadataProvidersJSON(query string, limit int, includeExtensions bool) (string, error) {
-	manager := GetExtensionManager()
-	tracks, err := manager.SearchTracksWithMetadataProviders(query, limit, includeExtensions)
-	if err != nil {
-		return "", err
-	}
-
-	jsonBytes, err := json.Marshal(tracks)
-	if err != nil {
-		return "", err
-	}
-
-	return string(jsonBytes), nil
-}
-
 func DownloadWithExtensionsJSON(requestJSON string) (string, error) {
 	var req DownloadRequest
 	if err := json.Unmarshal([]byte(requestJSON), &req); err != nil {
@@ -2676,28 +2534,6 @@ func HandleURLWithExtensionJSON(url string) (string, error) {
 			artistResponse["albums"] = albums
 		}
 
-		if len(result.Artist.Releases) > 0 {
-			releases := make([]map[string]interface{}, len(result.Artist.Releases))
-			for i, release := range result.Artist.Releases {
-				releaseType := release.AlbumType
-				if releaseType == "" {
-					releaseType = "album"
-				}
-				releases[i] = map[string]interface{}{
-					"id":           release.ID,
-					"name":         release.Name,
-					"artists":      release.Artists,
-					"images":       release.CoverURL,
-					"cover_url":    release.CoverURL,
-					"release_date": release.ReleaseDate,
-					"total_tracks": release.TotalTracks,
-					"album_type":   releaseType,
-					"provider_id":  release.ProviderID,
-				}
-			}
-			artistResponse["releases"] = releases
-		}
-
 		if len(result.Artist.TopTracks) > 0 {
 			topTracks := make([]map[string]interface{}, len(result.Artist.TopTracks))
 			for i, track := range result.Artist.TopTracks {
@@ -2947,27 +2783,6 @@ func GetArtistWithExtensionJSON(extensionID, artistID string) (string, error) {
 		"provider_id": artist.ProviderID,
 	}
 
-	if len(artist.Releases) > 0 {
-		releases := make([]map[string]interface{}, len(artist.Releases))
-		for i, release := range artist.Releases {
-			releaseType := release.AlbumType
-			if releaseType == "" {
-				releaseType = "album"
-			}
-			releases[i] = map[string]interface{}{
-				"id":           release.ID,
-				"name":         release.Name,
-				"artists":      release.Artists,
-				"cover_url":    release.CoverURL,
-				"release_date": release.ReleaseDate,
-				"total_tracks": release.TotalTracks,
-				"album_type":   releaseType,
-				"provider_id":  release.ProviderID,
-			}
-		}
-		response["releases"] = releases
-	}
-
 	if artist.HeaderImage != "" {
 		response["header_image"] = artist.HeaderImage
 	}
@@ -3115,52 +2930,17 @@ func InitExtensionStoreJSON(cacheDir string) error {
 	return nil
 }
 
-func SetStoreRegistryURLJSON(registryURL string) error {
-	store := GetExtensionStore()
-	if store == nil {
-		return fmt.Errorf("extension store not initialized")
-	}
-
-	resolved, err := ResolveRegistryURL(registryURL)
-	if err != nil {
-		return err
-	}
-
-	if err := requireHTTPSURL(resolved, "registry"); err != nil {
-		return err
-	}
-
-	store.SetRegistryURL(resolved)
-	return nil
-}
-
-func ClearStoreRegistryURLJSON() error {
-	store := GetExtensionStore()
-	if store == nil {
-		return fmt.Errorf("extension store not initialized")
-	}
-
-	store.SetRegistryURL("")
-	store.ClearCache()
-	return nil
-}
-
-func GetStoreRegistryURLJSON() (string, error) {
-	store := GetExtensionStore()
-	if store == nil {
-		return "", fmt.Errorf("extension store not initialized")
-	}
-
-	return store.GetRegistryURL(), nil
-}
-
 func GetStoreExtensionsJSON(forceRefresh bool) (string, error) {
 	store := GetExtensionStore()
 	if store == nil {
 		return "", fmt.Errorf("extension store not initialized")
 	}
 
-	extensions, err := store.getExtensionsWithStatus(forceRefresh)
+	if forceRefresh {
+		store.FetchRegistry(true)
+	}
+
+	extensions, err := store.GetExtensionsWithStatus()
 	if err != nil {
 		return "", err
 	}
@@ -3254,14 +3034,12 @@ func callExtensionFunctionJSON(extensionID, functionName string, timeout time.Du
 	if !ext.Enabled {
 		return "", fmt.Errorf("extension '%s' is disabled", extensionID)
 	}
-	vm, err := ext.lockReadyVM()
-	if err != nil {
-		return "", err
-	}
-	defer ext.VMMu.Unlock()
 
 	// Goja runtime is not thread-safe; guard direct extension.*() calls with VMMu
 	// to avoid races with other provider calls (e.g. getAlbum/getPlaylist).
+	ext.VMMu.Lock()
+	defer ext.VMMu.Unlock()
+
 	script := fmt.Sprintf(`
 		(function() {
 			if (typeof extension !== 'undefined' && typeof extension.%s === 'function') {
@@ -3271,7 +3049,7 @@ func callExtensionFunctionJSON(extensionID, functionName string, timeout time.Du
 		})()
 	`, functionName, functionName)
 
-	result, err := RunWithTimeoutAndRecover(vm, script, timeout)
+	result, err := RunWithTimeoutAndRecover(ext.VM, script, timeout)
 	if err != nil {
 		return "", fmt.Errorf("%s failed: %w", functionName, err)
 	}
@@ -3309,10 +3087,6 @@ func ScanLibraryFolderIncrementalJSON(folderPath, existingFilesJSON string) (str
 	return ScanLibraryFolderIncremental(folderPath, existingFilesJSON)
 }
 
-func ScanLibraryFolderIncrementalFromSnapshotJSON(folderPath, snapshotPath string) (string, error) {
-	return ScanLibraryFolderIncrementalFromSnapshot(folderPath, snapshotPath)
-}
-
 func GetLibraryScanProgressJSON() string {
 	return GetLibraryScanProgress()
 }
@@ -3324,7 +3098,3 @@ func CancelLibraryScanJSON() {
 func ReadAudioMetadataJSON(filePath string) (string, error) {
 	return ReadAudioMetadata(filePath)
 }
-
-func ReadAudioMetadataWithHintJSON(filePath, displayName string) (string, error) {
-	return ReadAudioMetadataWithDisplayName(filePath, displayName)
-}

go_backend/exports_deezer_metadata_test.go

@@ -1,59 +0,0 @@
-package gobackend
-
-import "testing"
-
-func TestBuildDeezerExtendedMetadataResultHandlesNil(t *testing.T) {
-	result := buildDeezerExtendedMetadataResult(nil)
-
-	if result["genre"] != "" {
-		t.Fatalf("expected empty genre, got %q", result["genre"])
-	}
-	if result["label"] != "" {
-		t.Fatalf("expected empty label, got %q", result["label"])
-	}
-	if result["copyright"] != "" {
-		t.Fatalf("expected empty copyright, got %q", result["copyright"])
-	}
-}
-
-func TestBuildDeezerExtendedMetadataResultIncludesCopyright(t *testing.T) {
-	result := buildDeezerExtendedMetadataResult(&AlbumExtendedMetadata{
-		Genre:     "Rock",
-		Label:     "EMI",
-		Copyright: "(C) Queen",
-	})
-
-	if result["genre"] != "Rock" {
-		t.Fatalf("unexpected genre: %q", result["genre"])
-	}
-	if result["label"] != "EMI" {
-		t.Fatalf("unexpected label: %q", result["label"])
-	}
-	if result["copyright"] != "(C) Queen" {
-		t.Fatalf("unexpected copyright: %q", result["copyright"])
-	}
-}
-
-func TestBuildDeezerISRCSearchResultAddsCompatibilityIDs(t *testing.T) {
-	result := buildDeezerISRCSearchResult(&TrackMetadata{
-		SpotifyID:   "deezer:3135556",
-		Name:        "Love Of My Life",
-		Artists:     "Queen",
-		AlbumName:   "A Night at the Opera",
-		ISRC:        "GBUM71029604",
-		ReleaseDate: "1975-11-21",
-	})
-
-	if result["spotify_id"] != "deezer:3135556" {
-		t.Fatalf("unexpected spotify_id: %v", result["spotify_id"])
-	}
-	if result["id"] != "3135556" {
-		t.Fatalf("unexpected id: %v", result["id"])
-	}
-	if result["track_id"] != "3135556" {
-		t.Fatalf("unexpected track_id: %v", result["track_id"])
-	}
-	if result["success"] != true {
-		t.Fatalf("expected success=true, got %v", result["success"])
-	}
-}

go_backend/exports_test.go

@@ -1,115 +0,0 @@
-package gobackend
-
-import "testing"
-
-func TestBuildDownloadSuccessResponsePrefersRequestedAlbumMetadata(t *testing.T) {
-	req := DownloadRequest{
-		TrackName:   "Bonus Track",
-		ArtistName:  "Artist",
-		AlbumName:   "Album (Deluxe)",
-		AlbumArtist: "Artist",
-		ReleaseDate: "2024-01-01",
-		TrackNumber: 14,
-		DiscNumber:  1,
-		ISRC:        "REQ123",
-		CoverURL:    "https://example.com/cover.jpg",
-		Genre:       "Pop",
-		Label:       "Label",
-		Copyright:   "Copyright",
-	}
-
-	result := DownloadResult{
-		Title:       "Bonus Track",
-		Artist:      "Artist",
-		Album:       "Album",
-		ReleaseDate: "2023-12-01",
-		TrackNumber: 2,
-		DiscNumber:  9,
-		ISRC:        "RES456",
-	}
-
-	resp := buildDownloadSuccessResponse(
-		req,
-		result,
-		"tidal",
-		"ok",
-		"/tmp/test.flac",
-		false,
-	)
-
-	if resp.Album != req.AlbumName {
-		t.Fatalf("album = %q, want %q", resp.Album, req.AlbumName)
-	}
-	if resp.ReleaseDate != req.ReleaseDate {
-		t.Fatalf("release date = %q, want %q", resp.ReleaseDate, req.ReleaseDate)
-	}
-	if resp.TrackNumber != req.TrackNumber {
-		t.Fatalf("track number = %d, want %d", resp.TrackNumber, req.TrackNumber)
-	}
-	if resp.DiscNumber != req.DiscNumber {
-		t.Fatalf("disc number = %d, want %d", resp.DiscNumber, req.DiscNumber)
-	}
-	if resp.Artist != result.Artist {
-		t.Fatalf("artist = %q, want provider artist %q", resp.Artist, result.Artist)
-	}
-	if resp.ISRC != result.ISRC {
-		t.Fatalf("isrc = %q, want provider isrc %q", resp.ISRC, result.ISRC)
-	}
-}
-
-func TestPreferredReleaseMetadataPrefersRequestValues(t *testing.T) {
-	album, releaseDate, trackNumber, discNumber := preferredReleaseMetadata(
-		DownloadRequest{
-			AlbumName:   "Album (Deluxe Edition)",
-			ReleaseDate: "2024-01-01",
-			TrackNumber: 13,
-			DiscNumber:  2,
-		},
-		"Album",
-		"2023-01-01",
-		3,
-		1,
-	)
-
-	if album != "Album (Deluxe Edition)" {
-		t.Fatalf("album = %q", album)
-	}
-	if releaseDate != "2024-01-01" {
-		t.Fatalf("release date = %q", releaseDate)
-	}
-	if trackNumber != 13 {
-		t.Fatalf("track number = %d", trackNumber)
-	}
-	if discNumber != 2 {
-		t.Fatalf("disc number = %d", discNumber)
-	}
-}
-
-func TestBuildDownloadSuccessResponsePrefersProviderCoverURL(t *testing.T) {
-	req := DownloadRequest{
-		TrackName:   "Track",
-		ArtistName:  "Artist",
-		AlbumName:   "Album",
-		AlbumArtist: "Artist",
-	}
-
-	result := DownloadResult{
-		Title:    "Track",
-		Artist:   "Artist",
-		Album:    "Album",
-		CoverURL: "https://cdn.qobuz.test/cover.jpg",
-	}
-
-	resp := buildDownloadSuccessResponse(
-		req,
-		result,
-		"qobuz",
-		"ok",
-		"/tmp/test.flac",
-		false,
-	)
-
-	if resp.CoverURL != result.CoverURL {
-		t.Fatalf("cover url = %q, want %q", resp.CoverURL, result.CoverURL)
-	}
-}

go_backend/extension_manager.go

@@ -44,76 +44,16 @@ func compareVersions(v1, v2 string) int {
 }
 
 type LoadedExtension struct {
-	ID          string             `json:"id"`
-	Manifest    *ExtensionManifest `json:"manifest"`
-	VM          *goja.Runtime      `json:"-"`
-	VMMu        sync.Mutex         `json:"-"`
-	runtime     *ExtensionRuntime
-	initialized bool
-	Enabled     bool   `json:"enabled"`
-	Error       string `json:"error,omitempty"`
-	DataDir     string `json:"data_dir"`
-	SourceDir   string `json:"source_dir"`
-	IconPath    string `json:"icon_path"`
-}
-
-func getExtensionInitSettings(extensionID string) map[string]interface{} {
-	settings := GetExtensionSettingsStore().GetAll(extensionID)
-	if len(settings) == 0 {
-		return settings
-	}
-
-	filtered := make(map[string]interface{}, len(settings))
-	for key, value := range settings {
-		if strings.HasPrefix(key, "_") {
-			continue
-		}
-		filtered[key] = value
-	}
-	return filtered
-}
-
-func ensureRuntimeReadyLocked(ext *LoadedExtension, applyStoredSettings bool) error {
-	if ext.VM == nil || ext.runtime == nil {
-		if err := initializeVMLocked(ext); err != nil {
-			ext.Error = err.Error()
-			ext.Enabled = false
-			return err
-		}
-	}
-
-	if applyStoredSettings && !ext.initialized {
-		settings := getExtensionInitSettings(ext.ID)
-		if len(settings) > 0 {
-			if err := initializeExtensionWithSettingsLocked(ext, settings); err != nil {
-				teardownVMLocked(ext)
-				ext.Error = err.Error()
-				ext.Enabled = false
-				return err
-			}
-		} else {
-			ext.initialized = true
-		}
-	}
-
-	ext.Error = ""
-	return nil
-}
-
-func (ext *LoadedExtension) ensureRuntimeReady() error {
-	ext.VMMu.Lock()
-	defer ext.VMMu.Unlock()
-
-	return ensureRuntimeReadyLocked(ext, true)
-}
-
-func (ext *LoadedExtension) lockReadyVM() (*goja.Runtime, error) {
-	ext.VMMu.Lock()
-	if err := ensureRuntimeReadyLocked(ext, true); err != nil {
-		ext.VMMu.Unlock()
-		return nil, err
-	}
-	return ext.VM, nil
+	ID        string             `json:"id"`
+	Manifest  *ExtensionManifest `json:"manifest"`
+	VM        *goja.Runtime      `json:"-"`
+	VMMu      sync.Mutex         `json:"-"`
+	runtime   *ExtensionRuntime
+	Enabled   bool   `json:"enabled"`
+	Error     string `json:"error,omitempty"`
+	DataDir   string `json:"data_dir"`
+	SourceDir string `json:"source_dir"`
+	IconPath  string `json:"icon_path"`
 }
 
 type ExtensionManager struct {
@@ -211,6 +151,7 @@ func (m *ExtensionManager) LoadExtensionFromFile(filePath string) (*LoadedExtens
 	if exists {
 		versionCompare := compareVersions(manifest.Version, existingVersion)
 		if versionCompare > 0 {
+			// This is an upgrade - call UpgradeExtension
 			return m.UpgradeExtension(filePath)
 		} else if versionCompare == 0 {
 			return nil, fmt.Errorf("Extension '%s' v%s is already installed", existingDisplayName, existingVersion)
@@ -280,10 +221,10 @@ func (m *ExtensionManager) LoadExtensionFromFile(filePath string) (*LoadedExtens
 		SourceDir: extDir,
 	}
 
-	if err := validateExtensionLoad(ext); err != nil {
+	if err := m.initializeVM(ext); err != nil {
 		ext.Error = err.Error()
 		ext.Enabled = false
-		GoLog("[Extension] Failed to validate extension %s: %v\n", manifest.Name, err)
+		GoLog("[Extension] Failed to initialize VM for %s: %v\n", manifest.Name, err)
 	}
 
 	m.extensions[manifest.Name] = ext
@@ -292,10 +233,7 @@ func (m *ExtensionManager) LoadExtensionFromFile(filePath string) (*LoadedExtens
 	return ext, nil
 }
 
-func initializeVMLocked(ext *LoadedExtension) error {
-	ext.VM = nil
-	ext.runtime = nil
-	ext.initialized = false
+func (m *ExtensionManager) initializeVM(ext *LoadedExtension) error {
 	vm := goja.New()
 	ext.VM = vm
 
@@ -342,136 +280,6 @@ func initializeVMLocked(ext *LoadedExtension) error {
 	return nil
 }
 
-func (m *ExtensionManager) initializeVM(ext *LoadedExtension) error {
-	ext.VMMu.Lock()
-	defer ext.VMMu.Unlock()
-	return initializeVMLocked(ext)
-}
-
-func initializeExtensionWithSettingsLocked(
-	ext *LoadedExtension,
-	settings map[string]interface{},
-) error {
-	if ext.VM == nil {
-		return fmt.Errorf("Extension failed to load. Please reinstall the extension")
-	}
-
-	settingsJSON, err := json.Marshal(settings)
-	if err != nil {
-		return fmt.Errorf("Failed to save settings")
-	}
-
-	script := fmt.Sprintf(`
-		(function() {
-			var settings = %s;
-			if (typeof extension !== 'undefined' && typeof extension.initialize === 'function') {
-				try {
-					extension.initialize(settings);
-					return { success: true };
-				} catch (e) {
-					return { success: false, error: e.toString() };
-				}
-			}
-			return { success: true, message: 'no initialize function' };
-		})()
-	`, string(settingsJSON))
-
-	result, err := ext.VM.RunString(script)
-	if err != nil {
-		ext.Error = fmt.Sprintf("initialize failed: %v", err)
-		ext.Enabled = false
-		GoLog("[Extension] Initialize error for %s: %v\n", ext.ID, err)
-		return err
-	}
-
-	if result != nil && !goja.IsUndefined(result) {
-		exported := result.Export()
-		if resultMap, ok := exported.(map[string]interface{}); ok {
-			if success, ok := resultMap["success"].(bool); ok && !success {
-				errMsg := "unknown error"
-				if e, ok := resultMap["error"].(string); ok {
-					errMsg = e
-				}
-				ext.Error = errMsg
-				ext.Enabled = false
-				GoLog("[Extension] Initialize failed for %s: %s\n", ext.ID, errMsg)
-				return fmt.Errorf("initialize failed: %s", errMsg)
-			}
-		}
-	}
-
-	ext.initialized = true
-	GoLog("[Extension] Initialized %s\n", ext.ID)
-	return nil
-}
-
-func runCleanupLocked(ext *LoadedExtension) error {
-	if ext.VM != nil {
-		script := `
-			(function() {
-				if (typeof extension !== 'undefined' && typeof extension.cleanup === 'function') {
-					try {
-						extension.cleanup();
-						return { success: true };
-					} catch (e) {
-						return { success: false, error: e.toString() };
-					}
-				}
-				return { success: true, message: 'no cleanup function' };
-			})()
-		`
-
-		result, err := ext.VM.RunString(script)
-		if err != nil {
-			return err
-		}
-
-		if result != nil && !goja.IsUndefined(result) {
-			exported := result.Export()
-			if resultMap, ok := exported.(map[string]interface{}); ok {
-				if success, ok := resultMap["success"].(bool); ok && !success {
-					errMsg := "unknown error"
-					if e, ok := resultMap["error"].(string); ok {
-						errMsg = e
-					}
-					return fmt.Errorf("cleanup failed: %s", errMsg)
-				}
-			}
-		}
-
-		if result != nil && !goja.IsUndefined(result) && !goja.IsNull(result) {
-			GoLog("[Extension] Cleanup called for %s\n", ext.ID)
-		}
-	}
-	return nil
-}
-
-func teardownVMLocked(ext *LoadedExtension) {
-	if err := runCleanupLocked(ext); err != nil {
-		GoLog("[Extension] Error calling cleanup for %s: %v\n", ext.ID, err)
-	}
-	if ext.runtime != nil {
-		if err := ext.runtime.flushStorageNow(); err != nil {
-			GoLog("[Extension] Failed to flush storage for %s: %v\n", ext.ID, err)
-		}
-		ext.runtime.closeStorageFlusher()
-	}
-	ext.runtime = nil
-	ext.VM = nil
-	ext.initialized = false
-}
-
-func validateExtensionLoad(ext *LoadedExtension) error {
-	ext.VMMu.Lock()
-	defer ext.VMMu.Unlock()
-
-	if err := initializeVMLocked(ext); err != nil {
-		return err
-	}
-	teardownVMLocked(ext)
-	return nil
-}
-
 func (m *ExtensionManager) UnloadExtension(extensionID string) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
@@ -481,9 +289,21 @@ func (m *ExtensionManager) UnloadExtension(extensionID string) error {
 		return fmt.Errorf("Extension not found")
 	}
 
-	ext.VMMu.Lock()
-	teardownVMLocked(ext)
-	ext.VMMu.Unlock()
+	if ext.VM != nil {
+		cleanup, err := ext.VM.RunString("typeof extension !== 'undefined' && typeof extension.cleanup === 'function' ? extension.cleanup() : null")
+		if err != nil {
+			GoLog("[Extension] Error calling cleanup for %s: %v\n", extensionID, err)
+		} else if cleanup != nil && !goja.IsUndefined(cleanup) && !goja.IsNull(cleanup) {
+			GoLog("[Extension] Cleanup called for %s\n", extensionID)
+		}
+	}
+	if ext.runtime != nil {
+		if err := ext.runtime.flushStorageNow(); err != nil {
+			GoLog("[Extension] Failed to flush storage for %s: %v\n", extensionID, err)
+		}
+		ext.runtime.closeStorageFlusher()
+		ext.runtime = nil
+	}
 
 	delete(m.extensions, extensionID)
 	GoLog("[Extension] Unloaded extension: %s\n", extensionID)
@@ -522,21 +342,7 @@ func (m *ExtensionManager) SetExtensionEnabled(extensionID string, enabled bool)
 		return fmt.Errorf("Extension not found")
 	}
 
-	if enabled {
-		ext.Enabled = true
-		if err := ext.ensureRuntimeReady(); err != nil {
-			store := GetExtensionSettingsStore()
-			ext.Enabled = false
-			_ = store.Set(extensionID, "_enabled", false)
-			return err
-		}
-	} else {
-		ext.Enabled = false
-		ext.Error = ""
-		ext.VMMu.Lock()
-		teardownVMLocked(ext)
-		ext.VMMu.Unlock()
-	}
+	ext.Enabled = enabled
 	GoLog("[Extension] %s %s\n", extensionID, map[bool]string{true: "enabled", false: "disabled"}[enabled])
 
 	store := GetExtensionSettingsStore()
@@ -623,6 +429,7 @@ func (m *ExtensionManager) loadExtensionFromDirectory(dirPath string) (*LoadedEx
 		SourceDir: dirPath,
 	}
 
+	// Restore enabled state from settings store
 	store := GetExtensionSettingsStore()
 	if enabledVal, err := store.Get(manifest.Name, "_enabled"); err == nil {
 		if enabled, ok := enabledVal.(bool); ok {
@@ -631,10 +438,10 @@ func (m *ExtensionManager) loadExtensionFromDirectory(dirPath string) (*LoadedEx
 		}
 	}
 
-	if err := validateExtensionLoad(ext); err != nil {
+	if err := m.initializeVM(ext); err != nil {
 		ext.Error = err.Error()
 		ext.Enabled = false
-		GoLog("[Extension] Failed to validate extension %s: %v\n", manifest.Name, err)
+		GoLog("[Extension] Failed to initialize VM for %s: %v\n", manifest.Name, err)
 	}
 
 	m.extensions[manifest.Name] = ext
@@ -785,14 +592,10 @@ func (m *ExtensionManager) UpgradeExtension(filePath string) (*LoadedExtension,
 		SourceDir: extDir,
 	}
 
-	if wasEnabled {
-		if err := ext.ensureRuntimeReady(); err != nil {
-			GoLog("[Extension] Failed to initialize upgraded extension %s: %v\n", newManifest.Name, err)
-		}
-	} else if err := validateExtensionLoad(ext); err != nil {
+	if err := m.initializeVM(ext); err != nil {
 		ext.Error = err.Error()
 		ext.Enabled = false
-		GoLog("[Extension] Failed to validate upgraded extension %s: %v\n", newManifest.Name, err)
+		GoLog("[Extension] Failed to initialize VM for %s: %v\n", newManifest.Name, err)
 	}
 
 	m.mu.Lock()
@@ -989,13 +792,56 @@ func (m *ExtensionManager) InitializeExtension(extensionID string, settings map[
 		return fmt.Errorf("Extension not found")
 	}
 
-	ext.VMMu.Lock()
-	defer ext.VMMu.Unlock()
+	if ext.VM == nil {
+		return fmt.Errorf("Extension failed to load. Please reinstall the extension")
+	}
 
-	if err := ensureRuntimeReadyLocked(ext, false); err != nil {
+	settingsJSON, err := json.Marshal(settings)
+	if err != nil {
+		return fmt.Errorf("Failed to save settings")
+	}
+
+	script := fmt.Sprintf(`
+		(function() {
+			var settings = %s;
+			if (typeof extension !== 'undefined' && typeof extension.initialize === 'function') {
+				try {
+					extension.initialize(settings);
+					return { success: true };
+				} catch (e) {
+					return { success: false, error: e.toString() };
+				}
+			}
+			return { success: true, message: 'no initialize function' };
+		})()
+	`, string(settingsJSON))
+
+	result, err := ext.VM.RunString(script)
+	if err != nil {
+		ext.Error = fmt.Sprintf("initialize failed: %v", err)
+		ext.Enabled = false
+		GoLog("[Extension] Initialize error for %s: %v\n", extensionID, err)
 		return err
 	}
-	return initializeExtensionWithSettingsLocked(ext, settings)
+
+	if result != nil && !goja.IsUndefined(result) {
+		exported := result.Export()
+		if resultMap, ok := exported.(map[string]interface{}); ok {
+			if success, ok := resultMap["success"].(bool); ok && !success {
+				errMsg := "unknown error"
+				if e, ok := resultMap["error"].(string); ok {
+					errMsg = e
+				}
+				ext.Error = errMsg
+				ext.Enabled = false
+				GoLog("[Extension] Initialize failed for %s: %s\n", extensionID, errMsg)
+				return fmt.Errorf("initialize failed: %s", errMsg)
+			}
+		}
+	}
+
+	GoLog("[Extension] Initialized %s\n", extensionID)
+	return nil
 }
 
 func (m *ExtensionManager) CleanupExtension(extensionID string) error {
@@ -1010,12 +856,41 @@ func (m *ExtensionManager) CleanupExtension(extensionID string) error {
 	if ext.VM == nil {
 		return nil
 	}
-	ext.VMMu.Lock()
-	defer ext.VMMu.Unlock()
-	if err := runCleanupLocked(ext); err != nil {
+
+	script := `
+		(function() {
+			if (typeof extension !== 'undefined' && typeof extension.cleanup === 'function') {
+				try {
+					extension.cleanup();
+					return { success: true };
+				} catch (e) {
+					return { success: false, error: e.toString() };
+				}
+			}
+			return { success: true, message: 'no cleanup function' };
+		})()
+	`
+
+	result, err := ext.VM.RunString(script)
+	if err != nil {
 		GoLog("[Extension] Cleanup error for %s: %v\n", extensionID, err)
 		return err
 	}
+
+	if result != nil && !goja.IsUndefined(result) {
+		exported := result.Export()
+		if resultMap, ok := exported.(map[string]interface{}); ok {
+			if success, ok := resultMap["success"].(bool); ok && !success {
+				errMsg := "unknown error"
+				if e, ok := resultMap["error"].(string); ok {
+					errMsg = e
+				}
+				GoLog("[Extension] Cleanup failed for %s: %s\n", extensionID, errMsg)
+				return fmt.Errorf("cleanup failed: %s", errMsg)
+			}
+		}
+	}
+
 	GoLog("[Extension] Cleaned up %s\n", extensionID)
 	return nil
 }
@@ -1044,8 +919,8 @@ func (m *ExtensionManager) InvokeAction(extensionID string, actionName string) (
 		return nil, fmt.Errorf("extension not found: %s", extensionID)
 	}
 
-	if err := ext.ensureRuntimeReady(); err != nil {
-		return nil, err
+	if ext.VM == nil {
+		return nil, fmt.Errorf("extension VM not initialized")
 	}
 
 	if !ext.Enabled {

go_backend/extension_providers.go

@@ -70,7 +70,6 @@ type ExtArtistMetadata struct {
 	HeaderImage string             `json:"header_image,omitempty"`
 	Listeners   int                `json:"listeners,omitempty"`
 	Albums      []ExtAlbumMetadata `json:"albums,omitempty"`
-	Releases    []ExtAlbumMetadata `json:"releases,omitempty"`
 	TopTracks   []ExtTrackMetadata `json:"top_tracks,omitempty"`
 	ProviderID  string             `json:"provider_id"`
 }
@@ -125,15 +124,6 @@ func NewExtensionProviderWrapper(ext *LoadedExtension) *ExtensionProviderWrapper
 	}
 }
 
-func (p *ExtensionProviderWrapper) lockReadyVM() error {
-	vm, err := p.extension.lockReadyVM()
-	if err != nil {
-		return err
-	}
-	p.vm = vm
-	return nil
-}
-
 func (p *ExtensionProviderWrapper) SearchTracks(query string, limit int) (*ExtSearchResult, error) {
 	if !p.extension.Manifest.IsMetadataProvider() {
 		return nil, fmt.Errorf("extension '%s' is not a metadata provider", p.extension.ID)
@@ -142,9 +132,8 @@ func (p *ExtensionProviderWrapper) SearchTracks(query string, limit int) (*ExtSe
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -202,9 +191,8 @@ func (p *ExtensionProviderWrapper) GetTrack(trackID string) (*ExtTrackMetadata,
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -251,9 +239,8 @@ func (p *ExtensionProviderWrapper) GetAlbum(albumID string) (*ExtAlbumMetadata,
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -303,9 +290,8 @@ func (p *ExtensionProviderWrapper) GetArtist(artistID string) (*ExtArtistMetadat
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -341,12 +327,6 @@ func (p *ExtensionProviderWrapper) GetArtist(artistID string) (*ExtArtistMetadat
 	}
 
 	artist.ProviderID = p.extension.ID
-	for i := range artist.Releases {
-		artist.Releases[i].ProviderID = p.extension.ID
-		for j := range artist.Releases[i].Tracks {
-			artist.Releases[i].Tracks[j].ProviderID = p.extension.ID
-		}
-	}
 	return &artist, nil
 }
 
@@ -358,10 +338,8 @@ func (p *ExtensionProviderWrapper) EnrichTrack(track *ExtTrackMetadata) (*ExtTra
 	if !p.extension.Enabled {
 		return track, nil
 	}
-	if err := p.lockReadyVM(); err != nil {
-		GoLog("[Extension] EnrichTrack init error for %s: %v\n", p.extension.ID, err)
-		return track, nil
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	trackJSON, err := json.Marshal(track)
@@ -420,9 +398,8 @@ func (p *ExtensionProviderWrapper) CheckAvailability(isrc, trackName, artistName
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -468,9 +445,8 @@ func (p *ExtensionProviderWrapper) GetDownloadURL(trackID, quality string) (*Ext
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -508,7 +484,7 @@ func (p *ExtensionProviderWrapper) GetDownloadURL(trackID, quality string) (*Ext
 	return &urlResult, nil
 }
 
-const ExtDownloadTimeout = DownloadTimeout
+const ExtDownloadTimeout = 5 * time.Minute
 
 func (p *ExtensionProviderWrapper) Download(trackID, quality, outputPath string, onProgress func(percent int)) (*ExtDownloadResult, error) {
 	if !p.extension.Manifest.IsDownloadProvider() {
@@ -518,13 +494,8 @@ func (p *ExtensionProviderWrapper) Download(trackID, quality, outputPath string,
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return &ExtDownloadResult{
-			Success:      false,
-			ErrorMessage: err.Error(),
-			ErrorType:    "init_error",
-		}, nil
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	p.vm.Set("__onProgress", func(call goja.FunctionCall) goja.Value {
@@ -629,30 +600,8 @@ func (m *ExtensionManager) SearchTracksWithExtensions(query string, limit int) (
 		return nil, nil
 	}
 
-	providerByID := make(map[string]*ExtensionProviderWrapper, len(providers))
-	orderedProviders := make([]*ExtensionProviderWrapper, 0, len(providers))
-	for _, provider := range providers {
-		providerByID[provider.extension.ID] = provider
-	}
-	for _, providerID := range GetMetadataProviderPriority() {
-		if provider := providerByID[providerID]; provider != nil {
-			orderedProviders = append(orderedProviders, provider)
-			delete(providerByID, providerID)
-		}
-	}
-	if len(providerByID) > 0 {
-		remainingIDs := make([]string, 0, len(providerByID))
-		for providerID := range providerByID {
-			remainingIDs = append(remainingIDs, providerID)
-		}
-		sort.Strings(remainingIDs)
-		for _, providerID := range remainingIDs {
-			orderedProviders = append(orderedProviders, providerByID[providerID])
-		}
-	}
-
 	var allTracks []ExtTrackMetadata
-	for _, provider := range orderedProviders {
+	for _, provider := range providers {
 		result, err := provider.SearchTracks(query, limit)
 		if err != nil {
 			GoLog("[Extension] Search error from %s: %v\n", provider.extension.ID, err)
@@ -672,8 +621,6 @@ var providerPriorityMu sync.RWMutex
 var metadataProviderPriority []string
 var metadataProviderPriorityMu sync.RWMutex
 
-var searchBuiltInMetadataTracksFunc = searchBuiltInMetadataTracks
-
 func SetProviderPriority(providerIDs []string) {
 	providerPriorityMu.Lock()
 	defer providerPriorityMu.Unlock()
@@ -698,7 +645,7 @@ func SetMetadataProviderPriority(providerIDs []string) {
 	metadataProviderPriorityMu.Lock()
 	defer metadataProviderPriorityMu.Unlock()
 
-	sanitized := make([]string, 0, len(providerIDs)+3)
+	sanitized := make([]string, 0, len(providerIDs)+1)
 	seen := map[string]struct{}{}
 	for _, providerID := range providerIDs {
 		providerID = strings.TrimSpace(providerID)
@@ -711,12 +658,8 @@ func SetMetadataProviderPriority(providerIDs []string) {
 		seen[providerID] = struct{}{}
 		sanitized = append(sanitized, providerID)
 	}
-	for _, providerID := range []string{"deezer", "qobuz", "tidal"} {
-		if _, exists := seen[providerID]; exists {
-			continue
-		}
-		seen[providerID] = struct{}{}
-		sanitized = append(sanitized, providerID)
+	if _, exists := seen["deezer"]; !exists {
+		sanitized = append([]string{"deezer"}, sanitized...)
 	}
 
 	metadataProviderPriority = sanitized
@@ -728,7 +671,7 @@ func GetMetadataProviderPriority() []string {
 	defer metadataProviderPriorityMu.RUnlock()
 
 	if len(metadataProviderPriority) == 0 {
-		return []string{"deezer", "qobuz", "tidal"}
+		return []string{"deezer"}
 	}
 
 	result := make([]string, len(metadataProviderPriority))
@@ -745,165 +688,6 @@ func isBuiltInProvider(providerID string) bool {
 	}
 }
 
-func normalizeBuiltInMetadataTrack(track TrackMetadata, providerID string) ExtTrackMetadata {
-	deezerID := ""
-	tidalID := ""
-	qobuzID := ""
-	prefixedID := strings.TrimSpace(track.SpotifyID)
-
-	switch providerID {
-	case "deezer":
-		deezerID = strings.TrimPrefix(prefixedID, "deezer:")
-	case "tidal":
-		tidalID = strings.TrimPrefix(prefixedID, "tidal:")
-	case "qobuz":
-		qobuzID = strings.TrimPrefix(prefixedID, "qobuz:")
-	}
-
-	return ExtTrackMetadata{
-		ID:          prefixedID,
-		Name:        track.Name,
-		Artists:     track.Artists,
-		AlbumName:   track.AlbumName,
-		AlbumArtist: track.AlbumArtist,
-		DurationMS:  track.DurationMS,
-		CoverURL:    track.Images,
-		Images:      track.Images,
-		ReleaseDate: track.ReleaseDate,
-		TrackNumber: track.TrackNumber,
-		DiscNumber:  track.DiscNumber,
-		ISRC:        track.ISRC,
-		ProviderID:  providerID,
-		SpotifyID:   prefixedID,
-		DeezerID:    deezerID,
-		TidalID:     tidalID,
-		QobuzID:     qobuzID,
-		AlbumType:   track.AlbumType,
-	}
-}
-
-func metadataTrackDedupKey(track ExtTrackMetadata) string {
-	if isrc := strings.TrimSpace(track.ISRC); isrc != "" {
-		return "isrc:" + strings.ToUpper(isrc)
-	}
-	if spotifyID := strings.TrimSpace(track.SpotifyID); spotifyID != "" {
-		return "spotify:" + spotifyID
-	}
-	if providerID := strings.TrimSpace(track.ProviderID); providerID != "" && strings.TrimSpace(track.ID) != "" {
-		return providerID + ":" + strings.TrimSpace(track.ID)
-	}
-	return strings.TrimSpace(track.Name) + "|" + strings.TrimSpace(track.Artists)
-}
-
-func searchBuiltInMetadataTracks(providerID, query string, limit int) ([]ExtTrackMetadata, error) {
-	switch providerID {
-	case "deezer":
-		ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-		defer cancel()
-
-		results, err := GetDeezerClient().SearchAll(ctx, query, limit, 0, "track")
-		if err != nil {
-			return nil, err
-		}
-
-		tracks := make([]ExtTrackMetadata, 0, len(results.Tracks))
-		for _, track := range results.Tracks {
-			tracks = append(tracks, normalizeBuiltInMetadataTrack(track, "deezer"))
-		}
-		return tracks, nil
-	case "qobuz":
-		return NewQobuzDownloader().SearchTracks(query, limit)
-	case "tidal":
-		return NewTidalDownloader().SearchTracks(query, limit)
-	default:
-		return nil, fmt.Errorf("unsupported built-in metadata provider: %s", providerID)
-	}
-}
-
-func (m *ExtensionManager) SearchTracksWithMetadataProviders(query string, limit int, includeExtensions bool) ([]ExtTrackMetadata, error) {
-	priority := GetMetadataProviderPriority()
-	if limit <= 0 {
-		limit = 20
-	}
-
-	extensionProviders := make(map[string]*ExtensionProviderWrapper)
-	if includeExtensions {
-		for _, provider := range m.GetMetadataProviders() {
-			extensionProviders[provider.extension.ID] = provider
-		}
-	}
-
-	orderedProviderIDs := make([]string, 0, len(priority)+len(extensionProviders))
-	seenProviderIDs := make(map[string]struct{}, len(priority)+len(extensionProviders))
-	for _, providerID := range priority {
-		providerID = strings.TrimSpace(providerID)
-		if providerID == "" {
-			continue
-		}
-		orderedProviderIDs = append(orderedProviderIDs, providerID)
-		seenProviderIDs[providerID] = struct{}{}
-	}
-	if includeExtensions {
-		remainingIDs := make([]string, 0, len(extensionProviders))
-		for providerID := range extensionProviders {
-			if _, exists := seenProviderIDs[providerID]; exists {
-				continue
-			}
-			remainingIDs = append(remainingIDs, providerID)
-		}
-		sort.Strings(remainingIDs)
-		orderedProviderIDs = append(orderedProviderIDs, remainingIDs...)
-	}
-
-	tracks := make([]ExtTrackMetadata, 0, limit)
-	seenTracks := make(map[string]struct{})
-	for _, providerID := range orderedProviderIDs {
-		var (
-			providerTracks []ExtTrackMetadata
-			err            error
-		)
-
-		if isBuiltInProvider(providerID) {
-			providerTracks, err = searchBuiltInMetadataTracksFunc(providerID, query, limit)
-		} else {
-			if !includeExtensions {
-				continue
-			}
-			provider := extensionProviders[providerID]
-			if provider == nil {
-				continue
-			}
-			var result *ExtSearchResult
-			result, err = provider.SearchTracks(query, limit)
-			if result != nil {
-				providerTracks = result.Tracks
-			}
-		}
-
-		if err != nil {
-			GoLog("[MetadataSearch] Search error from %s: %v\n", providerID, err)
-			continue
-		}
-
-		for _, track := range providerTracks {
-			key := metadataTrackDedupKey(track)
-			if key == "" {
-				continue
-			}
-			if _, exists := seenTracks[key]; exists {
-				continue
-			}
-			seenTracks[key] = struct{}{}
-			tracks = append(tracks, track)
-			if len(tracks) >= limit {
-				return tracks, nil
-			}
-		}
-	}
-
-	return tracks, nil
-}
-
 func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, error) {
 	priority := GetProviderPriority()
 	extManager := GetExtensionManager()
@@ -999,24 +783,6 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 				if enrichedTrack.Artists != "" {
 					req.ArtistName = enrichedTrack.Artists
 				}
-				if enrichedTrack.AlbumName != "" && req.AlbumName == "" {
-					GoLog("[DownloadWithExtensionFallback] AlbumName from enrichment: %s\n", enrichedTrack.AlbumName)
-					req.AlbumName = enrichedTrack.AlbumName
-				}
-				if enrichedTrack.AlbumArtist != "" && req.AlbumArtist == "" {
-					req.AlbumArtist = enrichedTrack.AlbumArtist
-				}
-				if enrichedTrack.DurationMS > 0 && req.DurationMS == 0 {
-					GoLog("[DownloadWithExtensionFallback] DurationMS from enrichment: %d\n", enrichedTrack.DurationMS)
-					req.DurationMS = enrichedTrack.DurationMS
-				}
-				if enrichedTrack.CoverURL != "" && req.CoverURL == "" {
-					req.CoverURL = enrichedTrack.CoverURL
-				}
-				if enrichedTrack.ID != "" && req.SpotifyID == "" {
-					GoLog("[DownloadWithExtensionFallback] Track ID from enrichment: %s\n", enrichedTrack.ID)
-					req.SpotifyID = enrichedTrack.ID
-				}
 				if enrichedTrack.Label != "" && req.Label == "" {
 					GoLog("[DownloadWithExtensionFallback] Label from enrichment: %s\n", enrichedTrack.Label)
 					req.Label = enrichedTrack.Label
@@ -1037,77 +803,6 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 		}
 	}
 
-	// If key metadata is still missing after extension enrichment, search
-	// configured metadata providers (Spotify/Deezer/Tidal/Qobuz) — same
-	// logic that ReEnrichFile uses.
-	if req.Source != "" && !isBuiltInProvider(strings.ToLower(req.Source)) &&
-		req.TrackName != "" && req.ArtistName != "" &&
-		(req.AlbumName == "" || req.ReleaseDate == "" || req.ISRC == "") {
-
-		searchQuery := req.TrackName + " " + req.ArtistName
-		GoLog("[DownloadWithExtensionFallback] Metadata incomplete, searching providers for: %s\n", searchQuery)
-
-		tracks, searchErr := extManager.SearchTracksWithMetadataProviders(searchQuery, 5, true)
-		if searchErr == nil && len(tracks) > 0 {
-			track := tracks[0]
-			GoLog("[DownloadWithExtensionFallback] Metadata match (%s): %s - %s (album: %s, date: %s, isrc: %s)\n",
-				track.ProviderID, track.Name, track.Artists, track.AlbumName, track.ReleaseDate, track.ISRC)
-
-			if track.AlbumName != "" && req.AlbumName == "" {
-				req.AlbumName = track.AlbumName
-			}
-			if track.AlbumArtist != "" && req.AlbumArtist == "" {
-				req.AlbumArtist = track.AlbumArtist
-			}
-			if track.ReleaseDate != "" && req.ReleaseDate == "" {
-				req.ReleaseDate = track.ReleaseDate
-			}
-			if track.ISRC != "" && req.ISRC == "" {
-				req.ISRC = track.ISRC
-			}
-			if track.TrackNumber > 0 && req.TrackNumber == 0 {
-				req.TrackNumber = track.TrackNumber
-			}
-			if track.DiscNumber > 0 && req.DiscNumber == 0 {
-				req.DiscNumber = track.DiscNumber
-			}
-			if track.CoverURL != "" && req.CoverURL == "" {
-				req.CoverURL = track.CoverURL
-			}
-			if track.Genre != "" && req.Genre == "" {
-				req.Genre = track.Genre
-			}
-			if track.Label != "" && req.Label == "" {
-				req.Label = track.Label
-			}
-			if track.Copyright != "" && req.Copyright == "" {
-				req.Copyright = track.Copyright
-			}
-		} else if searchErr != nil {
-			GoLog("[DownloadWithExtensionFallback] Metadata provider search failed (non-fatal): %v\n", searchErr)
-		}
-
-		// Try Deezer extended metadata if we have ISRC
-		if req.ISRC != "" &&
-			(req.Genre == "" || req.Label == "" || req.Copyright == "") {
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			extMeta, err := GetDeezerClient().GetExtendedMetadataByISRC(ctx, req.ISRC)
-			cancel()
-			if err == nil && extMeta != nil {
-				if req.Genre == "" && extMeta.Genre != "" {
-					req.Genre = extMeta.Genre
-				}
-				if req.Label == "" && extMeta.Label != "" {
-					req.Label = extMeta.Label
-				}
-				if req.Copyright == "" && extMeta.Copyright != "" {
-					req.Copyright = extMeta.Copyright
-				}
-				GoLog("[DownloadWithExtensionFallback] Extended metadata from Deezer: genre=%s, label=%s, copyright=%s\n", req.Genre, req.Label, req.Copyright)
-			}
-		}
-	}
-
 	if req.Source != "" &&
 		!isBuiltInProvider(strings.ToLower(req.Source)) &&
 		(!strictMode || selectedProvider == "" || strings.EqualFold(selectedProvider, req.Source)) {
@@ -1201,30 +896,6 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 					}
 				}
 
-				// Always pass enriched metadata from req so Flutter can
-				// embed it — fills gaps from metadata provider search.
-				if req.AlbumName != "" && resp.Album == "" {
-					resp.Album = req.AlbumName
-				}
-				if req.AlbumArtist != "" && resp.AlbumArtist == "" {
-					resp.AlbumArtist = req.AlbumArtist
-				}
-				if req.ReleaseDate != "" && resp.ReleaseDate == "" {
-					resp.ReleaseDate = req.ReleaseDate
-				}
-				if req.ISRC != "" && resp.ISRC == "" {
-					resp.ISRC = req.ISRC
-				}
-				if req.TrackNumber > 0 && resp.TrackNumber == 0 {
-					resp.TrackNumber = req.TrackNumber
-				}
-				if req.DiscNumber > 0 && resp.DiscNumber == 0 {
-					resp.DiscNumber = req.DiscNumber
-				}
-				if req.CoverURL != "" && resp.CoverURL == "" {
-					resp.CoverURL = req.CoverURL
-				}
-
 				return resp, nil
 			}
 
@@ -1275,8 +946,7 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 		GoLog("[DownloadWithExtensionFallback] Trying provider: %s\n", providerID)
 
 		if isBuiltInProvider(providerIDNormalized) {
-			if (req.Genre == "" || req.Label == "" || req.Copyright == "") &&
-				req.ISRC != "" {
+			if (req.Genre == "" || req.Label == "") && req.ISRC != "" {
 				GoLog("[DownloadWithExtensionFallback] Enriching extended metadata from Deezer for ISRC: %s\n", req.ISRC)
 				ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 				deezerClient := GetDeezerClient()
@@ -1291,10 +961,6 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 						req.Label = extMeta.Label
 						GoLog("[DownloadWithExtensionFallback] Label from Deezer: %s\n", req.Label)
 					}
-					if req.Copyright == "" && extMeta.Copyright != "" {
-						req.Copyright = extMeta.Copyright
-						GoLog("[DownloadWithExtensionFallback] Copyright from Deezer: %s\n", req.Copyright)
-					}
 				} else if err != nil {
 					GoLog("[DownloadWithExtensionFallback] Failed to get extended metadata from Deezer: %v\n", err)
 				}
@@ -1502,7 +1168,6 @@ func tryBuiltInProvider(providerID string, req DownloadRequest) (*DownloadRespon
 				TrackNumber: qobuzResult.TrackNumber,
 				DiscNumber:  qobuzResult.DiscNumber,
 				ISRC:        qobuzResult.ISRC,
-				CoverURL:    qobuzResult.CoverURL,
 			}
 		}
 		err = qobuzErr
@@ -1545,7 +1210,6 @@ func tryBuiltInProvider(providerID string, req DownloadRequest) (*DownloadRespon
 		TrackNumber:      result.TrackNumber,
 		DiscNumber:       result.DiscNumber,
 		ISRC:             result.ISRC,
-		CoverURL:         result.CoverURL,
 		Genre:            req.Genre,
 		Label:            req.Label,
 		Copyright:        req.Copyright,
@@ -1648,9 +1312,8 @@ func (p *ExtensionProviderWrapper) CustomSearch(query string, options map[string
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	if options == nil {
@@ -1730,9 +1393,8 @@ func (p *ExtensionProviderWrapper) HandleURL(url string) (*ExtURLHandleResult, e
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -1787,12 +1449,6 @@ func (p *ExtensionProviderWrapper) HandleURL(url string) (*ExtURLHandleResult, e
 				handleResult.Artist.Albums[i].Tracks[j].ProviderID = p.extension.ID
 			}
 		}
-		for i := range handleResult.Artist.Releases {
-			handleResult.Artist.Releases[i].ProviderID = p.extension.ID
-			for j := range handleResult.Artist.Releases[i].Tracks {
-				handleResult.Artist.Releases[i].Tracks[j].ProviderID = p.extension.ID
-			}
-		}
 		for i := range handleResult.Artist.TopTracks {
 			handleResult.Artist.TopTracks[i].ProviderID = p.extension.ID
 		}
@@ -1816,9 +1472,8 @@ func (p *ExtensionProviderWrapper) MatchTrack(sourceTrack map[string]interface{}
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	sourceJSON, _ := json.Marshal(sourceTrack)
@@ -1887,9 +1542,8 @@ func (p *ExtensionProviderWrapper) PostProcess(filePath string, metadata map[str
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return &PostProcessResult{Success: false, Error: err.Error()}, nil
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	metadataJSON, _ := json.Marshal(metadata)
@@ -1950,9 +1604,8 @@ func (p *ExtensionProviderWrapper) PostProcessV2(input PostProcessInput, metadat
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return &PostProcessResult{Success: false, Error: err.Error()}, nil
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	metadataJSON, _ := json.Marshal(metadata)
@@ -2209,9 +1862,8 @@ func (p *ExtensionProviderWrapper) FetchLyrics(trackName, artistName, albumName
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	// Use global variables to avoid JS injection issues with special characters in track/artist names

go_backend/extension_providers_test.go

@@ -1,68 +0,0 @@
-package gobackend
-
-import "testing"
-
-func TestSetMetadataProviderPriorityAddsBuiltIns(t *testing.T) {
-	original := GetMetadataProviderPriority()
-	defer SetMetadataProviderPriority(original)
-
-	SetMetadataProviderPriority([]string{"tidal"})
-	got := GetMetadataProviderPriority()
-	want := []string{"tidal", "deezer", "qobuz"}
-	if len(got) != len(want) {
-		t.Fatalf("unexpected priority length: got %v want %v", got, want)
-	}
-	for i := range want {
-		if got[i] != want[i] {
-			t.Fatalf("unexpected priority at %d: got %v want %v", i, got, want)
-		}
-	}
-}
-
-func TestSearchTracksWithMetadataProvidersUsesPriorityAndDedupes(t *testing.T) {
-	originalPriority := GetMetadataProviderPriority()
-	originalSearch := searchBuiltInMetadataTracksFunc
-	defer func() {
-		SetMetadataProviderPriority(originalPriority)
-		searchBuiltInMetadataTracksFunc = originalSearch
-	}()
-
-	SetMetadataProviderPriority([]string{"qobuz", "tidal", "deezer"})
-
-	var calls []string
-	searchBuiltInMetadataTracksFunc = func(providerID, query string, limit int) ([]ExtTrackMetadata, error) {
-		calls = append(calls, providerID)
-		switch providerID {
-		case "qobuz":
-			return []ExtTrackMetadata{
-				{ProviderID: "qobuz", SpotifyID: "qobuz:1", ISRC: "AAA111", Name: "First"},
-			}, nil
-		case "tidal":
-			return []ExtTrackMetadata{
-				{ProviderID: "tidal", SpotifyID: "tidal:2", ISRC: "AAA111", Name: "Duplicate"},
-				{ProviderID: "tidal", SpotifyID: "tidal:3", ISRC: "BBB222", Name: "Second"},
-			}, nil
-		case "deezer":
-			return []ExtTrackMetadata{
-				{ProviderID: "deezer", SpotifyID: "deezer:4", ISRC: "CCC333", Name: "Third"},
-			}, nil
-		default:
-			return nil, nil
-		}
-	}
-
-	manager := GetExtensionManager()
-	tracks, err := manager.SearchTracksWithMetadataProviders("query", 3, false)
-	if err != nil {
-		t.Fatalf("SearchTracksWithMetadataProviders returned error: %v", err)
-	}
-	if len(tracks) != 3 {
-		t.Fatalf("unexpected track count: got %d want 3", len(tracks))
-	}
-	if tracks[0].ProviderID != "qobuz" || tracks[1].ProviderID != "tidal" || tracks[2].ProviderID != "deezer" {
-		t.Fatalf("unexpected track provider order: %+v", tracks)
-	}
-	if len(calls) != 3 || calls[0] != "qobuz" || calls[1] != "tidal" || calls[2] != "deezer" {
-		t.Fatalf("unexpected provider call order: %v", calls)
-	}
-}

go_backend/extension_runtime.go

@@ -81,14 +81,13 @@ func SetExtensionTokens(extensionID string, accessToken, refreshToken string, ex
 }
 
 type ExtensionRuntime struct {
-	extensionID    string
-	manifest       *ExtensionManifest
-	settings       map[string]interface{}
-	httpClient     *http.Client
-	downloadClient *http.Client
-	cookieJar      http.CookieJar
-	dataDir        string
-	vm             *goja.Runtime
+	extensionID string
+	manifest    *ExtensionManifest
+	settings    map[string]interface{}
+	httpClient  *http.Client
+	cookieJar   http.CookieJar
+	dataDir     string
+	vm          *goja.Runtime
 
 	storageMu      sync.RWMutex
 	storageCache   map[string]interface{}
@@ -133,20 +132,13 @@ func NewExtensionRuntime(ext *LoadedExtension) *ExtensionRuntime {
 		storageFlushDelay: defaultStorageFlushDelay,
 	}
 
-	runtime.httpClient = newExtensionHTTPClient(ext, jar, 30*time.Second)
-	runtime.downloadClient = newExtensionHTTPClient(ext, jar, DownloadTimeout)
-
-	return runtime
-}
-
-func newExtensionHTTPClient(ext *LoadedExtension, jar http.CookieJar, timeout time.Duration) *http.Client {
 	// Extension sandbox enforces HTTPS-only domains. Do not apply global
 	// allow_http scheme downgrade here, because some extension APIs (e.g.
 	// spotify-web) will redirect http -> https and can end up in 301 loops.
 	// We still reuse sharedTransport so insecure TLS compatibility mode remains effective.
 	client := &http.Client{
 		Transport: sharedTransport,
-		Timeout:   timeout,
+		Timeout:   30 * time.Second,
 		Jar:       jar,
 	}
 	client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
@@ -173,7 +165,9 @@ func newExtensionHTTPClient(ext *LoadedExtension, jar http.CookieJar, timeout ti
 		}
 		return nil
 	}
-	return client
+	runtime.httpClient = client
+
+	return runtime
 }
 
 type RedirectBlockedError struct {

go_backend/extension_runtime_file.go

@@ -174,12 +174,7 @@ func (r *ExtensionRuntime) fileDownload(call goja.FunctionCall) goja.Value {
 		req.Header.Set("User-Agent", "SpotiFLAC-Extension/1.0")
 	}
 
-	client := r.downloadClient
-	if client == nil {
-		client = r.httpClient
-	}
-
-	resp, err := client.Do(req)
+	resp, err := r.httpClient.Do(req)
 	if err != nil {
 		return r.vm.ToValue(map[string]interface{}{
 			"success": false,

go_backend/extension_store.go

@@ -8,7 +8,6 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
-	"strings"
 	"sync"
 	"time"
 )
@@ -97,8 +96,8 @@ type StoreExtensionResponse struct {
 	HasUpdate        bool     `json:"has_update"`
 }
 
-func (e *StoreExtension) ToResponse() *StoreExtensionResponse {
-	return &StoreExtensionResponse{
+func (e *StoreExtension) ToResponse() StoreExtensionResponse {
+	return StoreExtensionResponse{
 		ID:            e.ID,
 		Name:          e.Name,
 		DisplayName:   e.getDisplayName(),
@@ -130,8 +129,9 @@ var (
 )
 
 const (
-	cacheTTL      = 30 * time.Minute
-	cacheFileName = "store_cache.json"
+	defaultRegistryURL = "https://raw.githubusercontent.com/zarzet/SpotiFLAC-Extension/main/registry.json"
+	cacheTTL           = 30 * time.Minute
+	cacheFileName      = "store_cache.json"
 )
 
 func InitExtensionStore(cacheDir string) *ExtensionStore {
@@ -140,7 +140,7 @@ func InitExtensionStore(cacheDir string) *ExtensionStore {
 
 	if extensionStore == nil {
 		extensionStore = &ExtensionStore{
-			registryURL: "", // No default - user must provide a registry URL
+			registryURL: defaultRegistryURL,
 			cacheDir:    cacheDir,
 			cacheTTL:    cacheTTL,
 		}
@@ -149,36 +149,6 @@ func InitExtensionStore(cacheDir string) *ExtensionStore {
 	return extensionStore
 }
 
-// SetRegistryURL updates the registry URL and clears the in-memory cache
-// so the next fetch will use the new URL. Disk cache is also cleared.
-func (s *ExtensionStore) SetRegistryURL(registryURL string) {
-	s.cacheMu.Lock()
-	defer s.cacheMu.Unlock()
-
-	if s.registryURL == registryURL {
-		return
-	}
-
-	s.registryURL = registryURL
-	s.cache = nil
-	s.cacheTime = time.Time{}
-
-	// Clear disk cache since it's from a different registry
-	if s.cacheDir != "" {
-		cachePath := filepath.Join(s.cacheDir, cacheFileName)
-		os.Remove(cachePath)
-	}
-
-	LogInfo("ExtensionStore", "Registry URL updated to: %s", registryURL)
-}
-
-// GetRegistryURL returns the currently configured registry URL.
-func (s *ExtensionStore) GetRegistryURL() string {
-	s.cacheMu.RLock()
-	defer s.cacheMu.RUnlock()
-	return s.registryURL
-}
-
 func GetExtensionStore() *ExtensionStore {
 	extensionStoreMu.Lock()
 	defer extensionStoreMu.Unlock()
@@ -236,10 +206,6 @@ func (s *ExtensionStore) FetchRegistry(forceRefresh bool) (*StoreRegistry, error
 	s.cacheMu.Lock()
 	defer s.cacheMu.Unlock()
 
-	if s.registryURL == "" {
-		return nil, fmt.Errorf("no registry URL configured. Please add a repository URL first")
-	}
-
 	if !forceRefresh && s.cache != nil && time.Since(s.cacheTime) < s.cacheTTL {
 		LogDebug("ExtensionStore", "Using cached registry (%d extensions)", len(s.cache.Extensions))
 		return s.cache, nil
@@ -288,8 +254,8 @@ func (s *ExtensionStore) FetchRegistry(forceRefresh bool) (*StoreRegistry, error
 	return &registry, nil
 }
 
-func (s *ExtensionStore) getExtensionsWithStatus(forceRefresh bool) ([]*StoreExtensionResponse, error) {
-	registry, err := s.FetchRegistry(forceRefresh)
+func (s *ExtensionStore) GetExtensionsWithStatus() ([]StoreExtensionResponse, error) {
+	registry, err := s.FetchRegistry(false)
 	if err != nil {
 		return nil, err
 	}
@@ -303,29 +269,22 @@ func (s *ExtensionStore) getExtensionsWithStatus(forceRefresh bool) ([]*StoreExt
 		}
 	}
 
-	LogDebug("ExtensionStore", "Building store response for %d registry extensions (%d installed)", len(registry.Extensions), len(installed))
-
-	result := make([]*StoreExtensionResponse, 0, len(registry.Extensions))
-	for i := range registry.Extensions {
-		ext := &registry.Extensions[i]
+	result := make([]StoreExtensionResponse, len(registry.Extensions))
+	for i, ext := range registry.Extensions {
 		resp := ext.ToResponse()
+
 		if installedVersion, ok := installed[ext.ID]; ok {
 			resp.IsInstalled = true
 			resp.InstalledVersion = installedVersion
 			resp.HasUpdate = compareVersions(ext.Version, installedVersion) > 0
 		}
 
-		result = append(result, resp)
+		result[i] = resp
 	}
 
-	LogDebug("ExtensionStore", "Built store response payload for %d extensions", len(result))
 	return result, nil
 }
 
-func (s *ExtensionStore) GetExtensionsWithStatus() ([]*StoreExtensionResponse, error) {
-	return s.getExtensionsWithStatus(false)
-}
-
 func (s *ExtensionStore) DownloadExtension(extensionID string, destPath string) error {
 	registry, err := s.FetchRegistry(false)
 	if err != nil {
@@ -377,80 +336,6 @@ func (s *ExtensionStore) DownloadExtension(extensionID string, destPath string)
 	return nil
 }
 
-// ResolveRegistryURL normalises a user-supplied URL into a direct registry.json URL.
-//
-// Accepted formats:
-//   - https://raw.githubusercontent.com/owner/repo/<branch>/registry.json  → returned as-is
-//   - https://github.com/owner/repo  (with optional trailing path / .git)  → resolved via
-//     the GitHub API to discover the default branch, then converted to the raw URL
-//   - Any other HTTPS URL  → returned as-is (assumed to be a direct link)
-func ResolveRegistryURL(input string) (string, error) {
-	input = strings.TrimSpace(input)
-	if input == "" {
-		return "", fmt.Errorf("registry URL is empty")
-	}
-
-	// Already a fully-qualified raw URL – keep it.
-	if strings.Contains(input, "raw.githubusercontent.com") {
-		return input, nil
-	}
-
-	const ghPrefix = "https://github.com/"
-	if !strings.HasPrefix(input, ghPrefix) {
-		// Also accept http:// and upgrade silently.
-		const ghPrefixHTTP = "http://github.com/"
-		if strings.HasPrefix(input, ghPrefixHTTP) {
-			input = "https://github.com/" + input[len(ghPrefixHTTP):]
-		} else {
-			// Not a GitHub URL – return as-is.
-			return input, nil
-		}
-	}
-
-	path := input[len(ghPrefix):]
-	parts := strings.SplitN(path, "/", 3) // owner, repo, [rest]
-	if len(parts) < 2 || parts[0] == "" || parts[1] == "" {
-		return "", fmt.Errorf("invalid GitHub URL: expected github.com/<owner>/<repo>")
-	}
-	owner := parts[0]
-	repo := strings.TrimSuffix(parts[1], ".git")
-
-	branch := resolveGitHubDefaultBranch(owner, repo)
-
-	resolved := fmt.Sprintf("https://raw.githubusercontent.com/%s/%s/%s/registry.json", owner, repo, branch)
-	LogInfo("ExtensionStore", "Resolved %s → %s (branch: %s)", input, resolved, branch)
-	return resolved, nil
-}
-
-// resolveGitHubDefaultBranch calls the GitHub API to discover the repository's
-// default branch.  Falls back to "main" on any error.
-func resolveGitHubDefaultBranch(owner, repo string) string {
-	apiURL := fmt.Sprintf("https://api.github.com/repos/%s/%s", owner, repo)
-	client := NewHTTPClientWithTimeout(10 * time.Second)
-
-	resp, err := client.Get(apiURL)
-	if err != nil {
-		LogWarn("ExtensionStore", "GitHub API request failed for %s/%s: %v – falling back to main", owner, repo, err)
-		return "main"
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		LogWarn("ExtensionStore", "GitHub API returned %d for %s/%s – falling back to main", resp.StatusCode, owner, repo)
-		return "main"
-	}
-
-	var info struct {
-		DefaultBranch string `json:"default_branch"`
-	}
-	if err := json.NewDecoder(resp.Body).Decode(&info); err != nil || info.DefaultBranch == "" {
-		LogWarn("ExtensionStore", "Could not parse default_branch for %s/%s – falling back to main", owner, repo)
-		return "main"
-	}
-
-	return info.DefaultBranch
-}
-
 func requireHTTPSURL(rawURL string, context string) error {
 	if rawURL == "" {
 		return fmt.Errorf("%s URL is empty", context)
@@ -475,7 +360,7 @@ func (s *ExtensionStore) GetCategories() []string {
 	}
 }
 
-func (s *ExtensionStore) SearchExtensions(query string, category string) ([]*StoreExtensionResponse, error) {
+func (s *ExtensionStore) SearchExtensions(query string, category string) ([]StoreExtensionResponse, error) {
 	extensions, err := s.GetExtensionsWithStatus()
 	if err != nil {
 		return nil, err
@@ -485,19 +370,22 @@ func (s *ExtensionStore) SearchExtensions(query string, category string) ([]*Sto
 		return extensions, nil
 	}
 
-	result := make([]*StoreExtensionResponse, 0, len(extensions))
+	var result []StoreExtensionResponse
 	queryLower := toLower(query)
 
 	for _, ext := range extensions {
+		// Filter by category
 		if category != "" && ext.Category != category {
 			continue
 		}
 
+		// Filter by query
 		if query != "" {
 			if !containsIgnoreCase(ext.Name, queryLower) &&
 				!containsIgnoreCase(ext.DisplayName, queryLower) &&
 				!containsIgnoreCase(ext.Description, queryLower) &&
 				!containsIgnoreCase(ext.Author, queryLower) {
+				// Check tags
 				found := false
 				for _, tag := range ext.Tags {
 					if containsIgnoreCase(tag, queryLower) {

go_backend/go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/refraction-networking/utls v1.8.2
 	golang.org/x/mobile v0.0.0-20260211191516-dcd2a3258864
 	golang.org/x/net v0.50.0
-	golang.org/x/text v0.34.0
 )
 
 require (
@@ -25,5 +24,6 @@ require (
 	golang.org/x/mod v0.33.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.41.0 // indirect
+	golang.org/x/text v0.34.0 // indirect
 	golang.org/x/tools v0.42.0 // indirect
 )

go_backend/go.sum

@@ -6,6 +6,8 @@ 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/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
 github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dop251/goja v0.0.0-20260106131823-651366fbe6e3 h1:bVp3yUzvSAJzu9GqID+Z96P+eu5TKnIMJSV4QaZMauM=
+github.com/dop251/goja v0.0.0-20260106131823-651366fbe6e3/go.mod h1:MxLav0peU43GgvwVgNbLAj1s/bSGboKkhuULvq/7hx4=
 github.com/dop251/goja v0.0.0-20260216154549-8b74ce4618c5 h1:QckvTXtu55YMopmVeDrPQ/r+T6xjw8KMCmE3UgUldkw=
 github.com/dop251/goja v0.0.0-20260216154549-8b74ce4618c5/go.mod h1:MxLav0peU43GgvwVgNbLAj1s/bSGboKkhuULvq/7hx4=
 github.com/go-flac/flacpicture/v2 v2.0.2 h1:HCaJIVZpxnpdWs6G3ECEVRelzqS5xOi1Ba1AGmtXbzE=
@@ -28,20 +30,36 @@ github.com/refraction-networking/utls v1.8.2 h1:j4Q1gJj0xngdeH+Ox/qND11aEfhpgoEv
 github.com/refraction-networking/utls v1.8.2/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
+golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
 golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
 golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
+golang.org/x/mobile v0.0.0-20260204172633-1dceadbbeea3 h1:NiJtT7g4ncNFVjVZMAYNBrPSNhIjFYPj8UKA8MEw2A4=
+golang.org/x/mobile v0.0.0-20260204172633-1dceadbbeea3/go.mod h1:wReH3Q1agKmmLapipWFnd4NSs8KPz3fK6mSEZjXLkrg=
+golang.org/x/mobile v0.0.0-20260209203831-923679eb55af h1:VqXrZNyqFISxo0rNDFZQlRDRIp7RXSJDeh/LbrK+W1k=
+golang.org/x/mobile v0.0.0-20260209203831-923679eb55af/go.mod h1:tbwefIr7RlQD1OpZ0KEZ9nux/uiihAOGdafgZfJkmII=
 golang.org/x/mobile v0.0.0-20260211191516-dcd2a3258864 h1:cTVynMSsMYgbUrtia2HB1jrhdUwQNtQti91vUCyjMp4=
 golang.org/x/mobile v0.0.0-20260211191516-dcd2a3258864/go.mod h1:4OGHIUSBiIqyFAQDaX1tpY0BVnO20DvNDeATBu8aeFQ=
+golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
+golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
 golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
 golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
+golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
 golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
 golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
 golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
 golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
+golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
 golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
+golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
 golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
 golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
+golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
+golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
 golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
 golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

go_backend/httputil.go

@@ -31,7 +31,7 @@ func getRandomUserAgent() string {
 
 const (
 	DefaultTimeout    = 60 * time.Second
-	DownloadTimeout   = 24 * time.Hour
+	DownloadTimeout   = 120 * time.Second
 	SongLinkTimeout   = 30 * time.Second
 	DefaultMaxRetries = 3
 	DefaultRetryDelay = 1 * time.Second
@@ -300,11 +300,14 @@ func DoRequestWithRetry(client *http.Client, req *http.Request, config RetryConf
 			continue
 		}
 
+		// Check for ISP blocking via HTTP status codes
+		// Some ISPs return 403 or 451 when blocking content
 		if resp.StatusCode == 403 || resp.StatusCode == 451 {
 			body, _ := io.ReadAll(resp.Body)
 			resp.Body.Close()
 			bodyStr := strings.ToLower(string(body))
 
+			// Check if response looks like ISP blocking page
 			ispBlockingIndicators := []string{
 				"blocked", "forbidden", "access denied", "not available in your",
 				"restricted", "censored", "unavailable for legal", "blocked by",
@@ -343,12 +346,11 @@ func calculateNextDelay(currentDelay time.Duration, config RetryConfig) time.Dur
 	return min(nextDelay, config.MaxDelay)
 }
 
-// Returns 0 if the header is missing or invalid so callers can keep their
-// normal exponential backoff instead of stalling for an arbitrary minute.
+// Returns 60 seconds as default if header is missing or invalid
 func getRetryAfterDuration(resp *http.Response) time.Duration {
 	retryAfter := resp.Header.Get("Retry-After")
 	if retryAfter == "" {
-		return 0
+		return 60 * time.Second // Default wait time
 	}
 
 	if seconds, err := strconv.Atoi(retryAfter); err == nil {
@@ -362,7 +364,7 @@ func getRetryAfterDuration(resp *http.Response) time.Duration {
 		}
 	}
 
-	return 0
+	return 60 * time.Second // Default
 }
 
 func ReadResponseBody(resp *http.Response) ([]byte, error) {
@@ -515,6 +517,7 @@ func IsISPBlocking(err error, requestURL string) *ISPBlockingError {
 	return nil
 }
 
+// Returns true if ISP blocking was detected
 func CheckAndLogISPBlocking(err error, requestURL string, tag string) bool {
 	ispErr := IsISPBlocking(err, requestURL)
 	if ispErr != nil {
@@ -549,6 +552,7 @@ func extractDomain(rawURL string) string {
 	return "unknown"
 }
 
+// If ISP blocking is detected, returns a more descriptive error
 func WrapErrorWithISPCheck(err error, requestURL string, tag string) error {
 	if err == nil {
 		return nil

go_backend/httputil_utls.go

@@ -112,6 +112,7 @@ func DoRequestWithCloudflareBypass(req *http.Request) (*http.Response, error) {
 
 	resp, err := sharedClient.Do(req)
 	if err == nil {
+		// Check for Cloudflare challenge page (403 with specific markers)
 		if resp.StatusCode == 403 || resp.StatusCode == 503 {
 			body, readErr := io.ReadAll(resp.Body)
 			resp.Body.Close()
@@ -153,6 +154,7 @@ func DoRequestWithCloudflareBypass(req *http.Request) (*http.Response, error) {
 		return resp, nil
 	}
 
+	// Check if error might be TLS-related (Cloudflare blocking)
 	errStr := strings.ToLower(err.Error())
 	tlsRelated := strings.Contains(errStr, "tls") ||
 		strings.Contains(errStr, "handshake") ||

go_backend/library_scan.go

@@ -1,12 +1,10 @@
 package gobackend
 
 import (
-	"bufio"
 	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -73,11 +71,6 @@ type libraryAudioFileInfo struct {
 	modTime int64
 }
 
-type scannedCueFileInfo struct {
-	sheet     *CueSheet
-	audioPath string
-}
-
 func collectLibraryAudioFiles(folderPath string, cancelCh <-chan struct{}) ([]libraryAudioFileInfo, error) {
 	var files []libraryAudioFileInfo
 
@@ -151,7 +144,12 @@ func ScanLibraryFolder(folderPath string) (string, error) {
 		return "[]", err
 	}
 
-	totalFiles := len(audioFileInfos)
+	audioFiles := make([]string, 0, len(audioFileInfos))
+	for _, fileInfo := range audioFileInfos {
+		audioFiles = append(audioFiles, fileInfo.path)
+	}
+
+	totalFiles := len(audioFiles)
 	libraryScanProgressMu.Lock()
 	libraryScanProgress.TotalFiles = totalFiles
 	libraryScanProgressMu.Unlock()
@@ -171,29 +169,22 @@ func ScanLibraryFolder(folderPath string) (string, error) {
 
 	// Track audio files referenced by .cue sheets to avoid duplicates
 	cueReferencedAudioFiles := make(map[string]bool)
-	parsedCueFiles := make(map[string]scannedCueFileInfo)
 
 	// First pass: scan .cue files to collect referenced audio paths
-	for _, fileInfo := range audioFileInfos {
-		filePath := fileInfo.path
+	for _, filePath := range audioFiles {
 		ext := strings.ToLower(filepath.Ext(filePath))
 		if ext == ".cue" {
 			sheet, err := ParseCueFile(filePath)
 			if err == nil && sheet.FileName != "" {
 				audioPath := ResolveCueAudioPath(filePath, sheet.FileName)
 				if audioPath != "" {
-					parsedCueFiles[filePath] = scannedCueFileInfo{
-						sheet:     sheet,
-						audioPath: audioPath,
-					}
 					cueReferencedAudioFiles[audioPath] = true
 				}
 			}
 		}
 	}
 
-	for i, fileInfo := range audioFileInfos {
-		filePath := fileInfo.path
+	for i, filePath := range audioFiles {
 		select {
 		case <-cancelCh:
 			return "[]", fmt.Errorf("scan cancelled")
@@ -210,20 +201,7 @@ func ScanLibraryFolder(folderPath string) (string, error) {
 
 		// Handle .cue files: produce multiple track results
 		if ext == ".cue" {
-			var cueResults []LibraryScanResult
-			cueInfo, ok := parsedCueFiles[filePath]
-			if ok {
-				cueResults, err = scanCueSheetForLibrary(
-					filePath,
-					cueInfo.sheet,
-					cueInfo.audioPath,
-					"",
-					fileInfo.modTime,
-					scanTime,
-				)
-			} else {
-				cueResults, err = ScanCueFileForLibrary(filePath, scanTime)
-			}
+			cueResults, err := ScanCueFileForLibrary(filePath, scanTime)
 			if err != nil {
 				errorCount++
 				GoLog("[LibraryScan] Error scanning cue %s: %v\n", filePath, err)
@@ -234,12 +212,14 @@ func ScanLibraryFolder(folderPath string) (string, error) {
 			continue
 		}
 
+		// Skip audio files that are referenced by a .cue sheet
+		// (they will be represented by the cue sheet's track entries instead)
 		if cueReferencedAudioFiles[filePath] {
 			GoLog("[LibraryScan] Skipping %s (referenced by .cue sheet)\n", filepath.Base(filePath))
 			continue
 		}
 
-		result, err := scanAudioFileWithKnownModTime(filePath, scanTime, fileInfo.modTime)
+		result, err := scanAudioFile(filePath, scanTime)
 		if err != nil {
 			errorCount++
 			GoLog("[LibraryScan] Error scanning %s: %v\n", filePath, err)
@@ -265,15 +245,7 @@ func ScanLibraryFolder(folderPath string) (string, error) {
 }
 
 func scanAudioFile(filePath, scanTime string) (*LibraryScanResult, error) {
-	return scanAudioFileWithKnownModTimeAndDisplayName(filePath, "", scanTime, 0)
-}
-
-func scanAudioFileWithKnownModTime(filePath, scanTime string, knownModTime int64) (*LibraryScanResult, error) {
-	return scanAudioFileWithKnownModTimeAndDisplayName(filePath, "", scanTime, knownModTime)
-}
-
-func scanAudioFileWithKnownModTimeAndDisplayName(filePath, displayNameHint, scanTime string, knownModTime int64) (*LibraryScanResult, error) {
-	ext := resolveLibraryAudioExt(filePath, displayNameHint)
+	ext := strings.ToLower(filepath.Ext(filePath))
 
 	result := &LibraryScanResult{
 		ID:        generateLibraryID(filePath),
@@ -282,17 +254,15 @@ func scanAudioFileWithKnownModTimeAndDisplayName(filePath, displayNameHint, scan
 		Format:    strings.TrimPrefix(ext, "."),
 	}
 
-	if knownModTime > 0 {
-		result.FileModTime = knownModTime
-	} else if info, err := os.Stat(filePath); err == nil {
+	if info, err := os.Stat(filePath); err == nil {
 		result.FileModTime = info.ModTime().UnixMilli()
 	}
 
 	libraryCoverCacheMu.RLock()
 	coverCacheDir := libraryCoverCacheDir
 	libraryCoverCacheMu.RUnlock()
-	if coverCacheDir != "" {
-		coverPath, err := SaveCoverToCacheWithHint(filePath, displayNameHint, coverCacheDir)
+	if coverCacheDir != "" && ext != ".m4a" {
+		coverPath, err := SaveCoverToCache(filePath, coverCacheDir)
 		if err == nil && coverPath != "" {
 			result.CoverPath = coverPath
 		}
@@ -306,31 +276,15 @@ func scanAudioFileWithKnownModTimeAndDisplayName(filePath, displayNameHint, scan
 	case ".mp3":
 		return scanMP3File(filePath, result)
 	case ".opus", ".ogg":
-		return scanOggFile(filePath, result, displayNameHint)
+		return scanOggFile(filePath, result)
 	default:
-		return scanFromFilename(filePath, displayNameHint, result)
+		return scanFromFilename(filePath, result)
 	}
 }
 
-func resolveLibraryAudioExt(filePath, displayNameHint string) string {
-	ext := strings.ToLower(filepath.Ext(filePath))
-	if ext != "" {
-		return ext
-	}
-	return strings.ToLower(filepath.Ext(displayNameHint))
-}
-
-func libraryDisplayNameOrPath(filePath, displayNameHint string) string {
-	if displayNameHint != "" {
-		return displayNameHint
-	}
-	return filePath
-}
-
-func applyDefaultLibraryMetadata(filePath, displayNameHint string, result *LibraryScanResult) {
-	nameSource := libraryDisplayNameOrPath(filePath, displayNameHint)
+func applyDefaultLibraryMetadata(filePath string, result *LibraryScanResult) {
 	if result.TrackName == "" {
-		result.TrackName = strings.TrimSuffix(filepath.Base(nameSource), filepath.Ext(nameSource))
+		result.TrackName = strings.TrimSuffix(filepath.Base(filePath), filepath.Ext(filePath))
 	}
 	if result.ArtistName == "" {
 		result.ArtistName = "Unknown Artist"
@@ -343,7 +297,7 @@ func applyDefaultLibraryMetadata(filePath, displayNameHint string, result *Libra
 func scanFLACFile(filePath string, result *LibraryScanResult) (*LibraryScanResult, error) {
 	metadata, err := ReadMetadata(filePath)
 	if err != nil {
-		return scanFromFilename(filePath, "", result)
+		return scanFromFilename(filePath, result)
 	}
 
 	result.TrackName = metadata.Title
@@ -365,43 +319,26 @@ func scanFLACFile(filePath string, result *LibraryScanResult) (*LibraryScanResul
 		}
 	}
 
-	applyDefaultLibraryMetadata(filePath, "", result)
+	applyDefaultLibraryMetadata(filePath, result)
 
 	return result, nil
 }
 
 func scanM4AFile(filePath string, result *LibraryScanResult) (*LibraryScanResult, error) {
-	metadata, err := ReadM4ATags(filePath)
-	if err == nil && metadata != nil {
-		result.TrackName = metadata.Title
-		result.ArtistName = metadata.Artist
-		result.AlbumName = metadata.Album
-		result.AlbumArtist = metadata.AlbumArtist
-		result.ISRC = metadata.ISRC
-		result.TrackNumber = metadata.TrackNumber
-		result.DiscNumber = metadata.DiscNumber
-		result.ReleaseDate = metadata.Date
-		if result.ReleaseDate == "" {
-			result.ReleaseDate = metadata.Year
-		}
-		result.Genre = metadata.Genre
-	}
-
 	quality, err := GetM4AQuality(filePath)
 	if err == nil {
 		result.BitDepth = quality.BitDepth
 		result.SampleRate = quality.SampleRate
 	}
 
-	applyDefaultLibraryMetadata(filePath, "", result)
-	return result, nil
+	return scanFromFilename(filePath, result)
 }
 
 func scanMP3File(filePath string, result *LibraryScanResult) (*LibraryScanResult, error) {
 	metadata, err := ReadID3Tags(filePath)
 	if err != nil {
 		GoLog("[LibraryScan] ID3 read error for %s: %v\n", filePath, err)
-		return scanFromFilename(filePath, "", result)
+		return scanFromFilename(filePath, result)
 	}
 
 	result.TrackName = metadata.Title
@@ -428,16 +365,16 @@ func scanMP3File(filePath string, result *LibraryScanResult) (*LibraryScanResult
 		}
 	}
 
-	applyDefaultLibraryMetadata(filePath, "", result)
+	applyDefaultLibraryMetadata(filePath, result)
 
 	return result, nil
 }
 
-func scanOggFile(filePath string, result *LibraryScanResult, displayNameHint string) (*LibraryScanResult, error) {
+func scanOggFile(filePath string, result *LibraryScanResult) (*LibraryScanResult, error) {
 	metadata, err := ReadOggVorbisComments(filePath)
 	if err != nil {
 		GoLog("[LibraryScan] Ogg/Opus read error for %s: %v\n", filePath, err)
-		return scanFromFilename(filePath, displayNameHint, result)
+		return scanFromFilename(filePath, result)
 	}
 
 	result.TrackName = metadata.Title
@@ -460,14 +397,13 @@ func scanOggFile(filePath string, result *LibraryScanResult, displayNameHint str
 		}
 	}
 
-	applyDefaultLibraryMetadata(filePath, displayNameHint, result)
+	applyDefaultLibraryMetadata(filePath, result)
 
 	return result, nil
 }
 
-func scanFromFilename(filePath, displayNameHint string, result *LibraryScanResult) (*LibraryScanResult, error) {
-	nameSource := libraryDisplayNameOrPath(filePath, displayNameHint)
-	filename := strings.TrimSuffix(filepath.Base(nameSource), filepath.Ext(nameSource))
+func scanFromFilename(filePath string, result *LibraryScanResult) (*LibraryScanResult, error) {
+	filename := strings.TrimSuffix(filepath.Base(filePath), filepath.Ext(filePath))
 
 	parts := strings.SplitN(filename, " - ", 2)
 	if len(parts) == 2 {
@@ -490,7 +426,7 @@ func scanFromFilename(filePath, displayNameHint string, result *LibraryScanResul
 
 	dir := filepath.Dir(filePath)
 	result.AlbumName = filepath.Base(dir)
-	if result.AlbumName == "." || result.AlbumName == "" || result.AlbumName == "fd" || result.AlbumName == "self" {
+	if result.AlbumName == "." || result.AlbumName == "" {
 		result.AlbumName = "Unknown Album"
 	}
 
@@ -537,12 +473,8 @@ func CancelLibraryScan() {
 }
 
 func ReadAudioMetadata(filePath string) (string, error) {
-	return ReadAudioMetadataWithDisplayName(filePath, "")
-}
-
-func ReadAudioMetadataWithDisplayName(filePath, displayNameHint string) (string, error) {
 	scanTime := time.Now().UTC().Format(time.RFC3339)
-	result, err := scanAudioFileWithKnownModTimeAndDisplayName(filePath, displayNameHint, scanTime, 0)
+	result, err := scanAudioFile(filePath, scanTime)
 	if err != nil {
 		return "", err
 	}
@@ -555,43 +487,10 @@ func ReadAudioMetadataWithDisplayName(filePath, displayNameHint string) (string,
 	return string(jsonBytes), nil
 }
 
-func loadExistingFilesSnapshot(snapshotPath string) (map[string]int64, error) {
-	existingFiles := make(map[string]int64)
-	if snapshotPath == "" {
-		return existingFiles, nil
-	}
-
-	file, err := os.Open(snapshotPath)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := scanner.Text()
-		if line == "" {
-			continue
-		}
-		parts := strings.SplitN(line, "\t", 2)
-		if len(parts) != 2 {
-			continue
-		}
-		modTime, err := strconv.ParseInt(parts[0], 10, 64)
-		if err != nil {
-			continue
-		}
-		existingFiles[parts[1]] = modTime
-	}
-
-	if err := scanner.Err(); err != nil {
-		return nil, err
-	}
-
-	return existingFiles, nil
-}
-
-func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFiles map[string]int64) (string, error) {
+// ScanLibraryFolderIncremental performs an incremental scan of the library folder
+// existingFilesJSON is a JSON object mapping filePath -> modTime (unix millis)
+// Only files that are new or have changed modification time will be scanned
+func ScanLibraryFolderIncremental(folderPath, existingFilesJSON string) (string, error) {
 	if folderPath == "" {
 		return "{}", fmt.Errorf("folder path is empty")
 	}
@@ -604,6 +503,13 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 		return "{}", fmt.Errorf("path is not a folder: %s", folderPath)
 	}
 
+	existingFiles := make(map[string]int64)
+	if existingFilesJSON != "" && existingFilesJSON != "{}" {
+		if err := json.Unmarshal([]byte(existingFilesJSON), &existingFiles); err != nil {
+			GoLog("[LibraryScan] Warning: failed to parse existing files JSON: %v\n", err)
+		}
+	}
+
 	GoLog("[LibraryScan] Incremental scan starting, %d existing files in database\n", len(existingFiles))
 
 	libraryScanProgressMu.Lock()
@@ -632,27 +538,44 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 	libraryScanProgress.TotalFiles = totalFiles
 	libraryScanProgressMu.Unlock()
 
+	// Find files to scan (new or modified)
 	var filesToScan []libraryAudioFileInfo
 	skippedCount := 0
-	existingCueTrackModTimes := make(map[string]int64)
-	for existingPath, modTime := range existingFiles {
-		if idx := strings.LastIndex(existingPath, "#track"); idx > 0 {
-			baseCuePath := existingPath[:idx]
-			if _, exists := existingCueTrackModTimes[baseCuePath]; !exists {
-				existingCueTrackModTimes[baseCuePath] = modTime
-			}
+
+	// Build a set of existing CUE virtual path base files for incremental matching.
+	// CUE tracks are stored with virtual paths like "/path/album.cue#track01".
+	// We need to match these against the actual .cue file's modTime.
+	cueBaseModTimes := make(map[string]int64) // base cue path -> modTime from disk
+	for _, f := range currentFiles {
+		if strings.ToLower(filepath.Ext(f.path)) == ".cue" {
+			cueBaseModTimes[f.path] = f.modTime
 		}
 	}
 
 	for _, f := range currentFiles {
 		existingModTime, exists := existingFiles[f.path]
 		if !exists {
+			// For .cue files, also check if any virtual path entries exist
 			if strings.ToLower(filepath.Ext(f.path)) == ".cue" {
-				if cueTrackModTime, hasCueTracks := existingCueTrackModTimes[f.path]; hasCueTracks {
-					if f.modTime == cueTrackModTime {
-						skippedCount++
-					} else {
-						filesToScan = append(filesToScan, f)
+				hasCueTracks := false
+				for existingPath := range existingFiles {
+					if strings.HasPrefix(existingPath, f.path+"#track") {
+						hasCueTracks = true
+						break
+					}
+				}
+				if hasCueTracks {
+					// CUE file exists in DB via virtual paths; check if modTime changed
+					// Use modTime from any virtual path (they all share the same .cue modTime)
+					for existingPath, modTime := range existingFiles {
+						if strings.HasPrefix(existingPath, f.path+"#track") {
+							if f.modTime == modTime {
+								skippedCount++
+							} else {
+								filesToScan = append(filesToScan, f)
+							}
+							break
+						}
 					}
 					continue
 				}
@@ -667,11 +590,14 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 
 	var deletedPaths []string
 	for existingPath := range existingFiles {
+		// For CUE virtual paths (e.g. "/path/album.cue#track01"),
+		// check if the base .cue file still exists on disk
 		if idx := strings.LastIndex(existingPath, "#track"); idx > 0 {
 			baseCuePath := existingPath[:idx]
 			if currentPathSet[baseCuePath] {
-				continue
+				continue // Base .cue file still exists, not deleted
 			}
+			// Base CUE file is gone, mark virtual path as deleted
 			deletedPaths = append(deletedPaths, existingPath)
 		} else if !currentPathSet[existingPath] {
 			deletedPaths = append(deletedPaths, existingPath)
@@ -702,8 +628,8 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 	scanTime := time.Now().UTC().Format(time.RFC3339)
 	errorCount := 0
 
+	// Track audio files referenced by .cue sheets to avoid duplicates (incremental)
 	cueReferencedAudioFilesInc := make(map[string]bool)
-	parsedCueFiles := make(map[string]scannedCueFileInfo)
 	for _, f := range filesToScan {
 		ext := strings.ToLower(filepath.Ext(f.path))
 		if ext == ".cue" {
@@ -711,10 +637,6 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 			if err == nil && sheet.FileName != "" {
 				audioPath := ResolveCueAudioPath(f.path, sheet.FileName)
 				if audioPath != "" {
-					parsedCueFiles[f.path] = scannedCueFileInfo{
-						sheet:     sheet,
-						audioPath: audioPath,
-					}
 					cueReferencedAudioFilesInc[audioPath] = true
 				}
 			}
@@ -736,21 +658,9 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 
 		ext := strings.ToLower(filepath.Ext(f.path))
 
+		// Handle .cue files: produce multiple track results
 		if ext == ".cue" {
-			var cueResults []LibraryScanResult
-			cueInfo, ok := parsedCueFiles[f.path]
-			if ok {
-				cueResults, err = scanCueSheetForLibrary(
-					f.path,
-					cueInfo.sheet,
-					cueInfo.audioPath,
-					"",
-					f.modTime,
-					scanTime,
-				)
-			} else {
-				cueResults, err = ScanCueFileForLibrary(f.path, scanTime)
-			}
+			cueResults, err := ScanCueFileForLibrary(f.path, scanTime)
 			if err != nil {
 				errorCount++
 				GoLog("[LibraryScan] Error scanning cue %s: %v\n", f.path, err)
@@ -760,11 +670,12 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 			continue
 		}
 
+		// Skip audio files referenced by .cue sheets
 		if cueReferencedAudioFilesInc[f.path] {
 			continue
 		}
 
-		result, err := scanAudioFileWithKnownModTime(f.path, scanTime, f.modTime)
+		result, err := scanAudioFile(f.path, scanTime)
 		if err != nil {
 			errorCount++
 			GoLog("[LibraryScan] Error scanning %s: %v\n", f.path, err)
@@ -798,24 +709,3 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 
 	return string(jsonBytes), nil
 }
-
-// ScanLibraryFolderIncremental performs an incremental scan of the library folder
-// existingFilesJSON is a JSON object mapping filePath -> modTime (unix millis)
-// Only files that are new or have changed modification time will be scanned
-func ScanLibraryFolderIncremental(folderPath, existingFilesJSON string) (string, error) {
-	existingFiles := make(map[string]int64)
-	if existingFilesJSON != "" && existingFilesJSON != "{}" {
-		if err := json.Unmarshal([]byte(existingFilesJSON), &existingFiles); err != nil {
-			GoLog("[LibraryScan] Warning: failed to parse existing files JSON: %v\n", err)
-		}
-	}
-	return scanLibraryFolderIncrementalWithExistingFiles(folderPath, existingFiles)
-}
-
-func ScanLibraryFolderIncrementalFromSnapshot(folderPath, snapshotPath string) (string, error) {
-	existingFiles, err := loadExistingFilesSnapshot(snapshotPath)
-	if err != nil {
-		return "{}", fmt.Errorf("failed to load incremental snapshot: %w", err)
-	}
-	return scanLibraryFolderIncrementalWithExistingFiles(folderPath, existingFiles)
-}

go_backend/lyrics.go

@@ -3,7 +3,6 @@ package gobackend
 import (
 	"encoding/json"
 	"fmt"
-	"io"
 	"math"
 	"net/http"
 	"net/url"
@@ -83,6 +82,7 @@ func SetLyricsProviderOrder(providers []string) {
 		return
 	}
 
+	// Validate provider names
 	validNames := map[string]bool{
 		LyricsProviderSpotifyAPI: true,
 		LyricsProviderLRCLIB:     true,
@@ -104,6 +104,7 @@ func SetLyricsProviderOrder(providers []string) {
 	GoLog("[Lyrics] Provider order set to: %v\n", valid)
 }
 
+// GetLyricsProviderOrder returns the current lyrics provider order.
 func GetLyricsProviderOrder() []string {
 	lyricsProvidersMu.RLock()
 	defer lyricsProvidersMu.RUnlock()
@@ -117,14 +118,15 @@ func GetLyricsProviderOrder() []string {
 	return result
 }
 
+// GetAvailableLyricsProviders returns metadata about all available providers.
 func GetAvailableLyricsProviders() []map[string]interface{} {
 	return []map[string]interface{}{
-		{"id": LyricsProviderSpotifyAPI, "name": "Spotify Lyrics API", "has_proxy_dependency": true, "description": "Spotify-sourced lyrics via Paxsenix"},
+		{"id": LyricsProviderSpotifyAPI, "name": "Spotify Lyrics API", "has_proxy_dependency": true, "description": "Spotify-sourced synced lyrics via community API"},
 		{"id": LyricsProviderLRCLIB, "name": "LRCLIB", "has_proxy_dependency": false, "description": "Open-source synced lyrics database"},
-		{"id": LyricsProviderNetease, "name": "Netease", "has_proxy_dependency": true, "description": "NetEase Cloud Music lyrics via Paxsenix"},
-		{"id": LyricsProviderMusixmatch, "name": "Musixmatch", "has_proxy_dependency": true, "description": "Musixmatch lyrics via Paxsenix"},
-		{"id": LyricsProviderAppleMusic, "name": "Apple Music", "has_proxy_dependency": true, "description": "Apple Music synced lyrics via Paxsenix"},
-		{"id": LyricsProviderQQMusic, "name": "QQ Music", "has_proxy_dependency": true, "description": "QQ Music lyrics via Paxsenix"},
+		{"id": LyricsProviderNetease, "name": "Netease", "has_proxy_dependency": false, "description": "NetEase Cloud Music (good for Asian songs)"},
+		{"id": LyricsProviderMusixmatch, "name": "Musixmatch", "has_proxy_dependency": true, "description": "Largest lyrics database (multi-language)"},
+		{"id": LyricsProviderAppleMusic, "name": "Apple Music", "has_proxy_dependency": true, "description": "Word-by-word synced lyrics"},
+		{"id": LyricsProviderQQMusic, "name": "QQ Music", "has_proxy_dependency": true, "description": "QQ Music lyrics (good for Chinese songs)"},
 	}
 }
 
@@ -137,6 +139,7 @@ func normalizeLyricsFetchOptions(opts LyricsFetchOptions) LyricsFetchOptions {
 	return opts
 }
 
+// SetLyricsFetchOptions sets provider-specific lyric fetch behavior.
 func SetLyricsFetchOptions(opts LyricsFetchOptions) {
 	normalized := normalizeLyricsFetchOptions(opts)
 
@@ -152,6 +155,7 @@ func SetLyricsFetchOptions(opts LyricsFetchOptions) {
 	)
 }
 
+// GetLyricsFetchOptions returns current provider-specific lyric fetch behavior.
 func GetLyricsFetchOptions() LyricsFetchOptions {
 	lyricsFetchOptionsMu.RLock()
 	defer lyricsFetchOptionsMu.RUnlock()
@@ -427,99 +431,6 @@ func parseSpotifyRetryAfter(retryAfter string, now time.Time) time.Time {
 	return now.Add(10 * time.Minute)
 }
 
-func buildSpotifyLyricsResponse(lines []LyricsLine, syncType, plainLyrics string) (*LyricsResponse, error) {
-	if len(lines) == 0 {
-		return nil, fmt.Errorf("Spotify Lyrics API returned empty lines")
-	}
-	if syncType == "" {
-		if len(lines) > 0 && lines[0].StartTimeMs > 0 {
-			syncType = "LINE_SYNCED"
-		} else {
-			syncType = "UNSYNCED"
-		}
-	}
-	return &LyricsResponse{
-		Lines:        lines,
-		SyncType:     syncType,
-		Instrumental: false,
-		PlainLyrics:  plainLyrics,
-		Provider:     "Spotify Lyrics API",
-		Source:       "Spotify Lyrics API",
-	}, nil
-}
-
-func plainLyricsFromTimedLines(lines []LyricsLine) string {
-	parts := make([]string, 0, len(lines))
-	for _, line := range lines {
-		words := strings.TrimSpace(line.Words)
-		if words == "" {
-			continue
-		}
-		parts = append(parts, words)
-	}
-	return strings.Join(parts, "\n")
-}
-
-func parseSpotifyLyricsResponseBody(body []byte) (*LyricsResponse, error) {
-	var lrcPayload string
-	if err := json.Unmarshal(body, &lrcPayload); err == nil {
-		trimmed := strings.TrimSpace(lrcPayload)
-		if trimmed == "" {
-			return nil, fmt.Errorf("Spotify Lyrics API returned empty payload")
-		}
-
-		lines := parseSyncedLyrics(trimmed)
-		if len(lines) > 0 {
-			return buildSpotifyLyricsResponse(lines, "LINE_SYNCED", plainLyricsFromTimedLines(lines))
-		}
-
-		plainLines := plainTextLyricsLines(trimmed)
-		return buildSpotifyLyricsResponse(plainLines, "UNSYNCED", trimmed)
-	}
-
-	var apiResp SpotifyLyricsAPIResponse
-	if err := json.Unmarshal(body, &apiResp); err != nil {
-		return nil, fmt.Errorf("failed to parse Spotify Lyrics API response: %w", err)
-	}
-
-	if apiResp.Error {
-		msg := strings.TrimSpace(apiResp.Message)
-		if msg == "" {
-			msg = "Spotify Lyrics API returned error"
-		}
-		return nil, fmt.Errorf("%s", msg)
-	}
-
-	lines := make([]LyricsLine, 0, len(apiResp.Lines))
-	for _, line := range apiResp.Lines {
-		words := strings.TrimSpace(line.Words)
-		if words == "" {
-			continue
-		}
-		startMs := parseSpotifyLyricsTimeTagToMs(line.TimeTag)
-		lines = append(lines, LyricsLine{
-			StartTimeMs: startMs,
-			Words:       words,
-			EndTimeMs:   0,
-		})
-	}
-
-	for i := 0; i < len(lines)-1; i++ {
-		nextStart := lines[i+1].StartTimeMs
-		if nextStart > lines[i].StartTimeMs {
-			lines[i].EndTimeMs = nextStart
-		}
-	}
-	if len(lines) > 0 {
-		last := len(lines) - 1
-		if lines[last].EndTimeMs == 0 {
-			lines[last].EndTimeMs = lines[last].StartTimeMs + 5000
-		}
-	}
-
-	return buildSpotifyLyricsResponse(lines, apiResp.SyncType, plainLyricsFromTimedLines(lines))
-}
-
 func (c *LyricsClient) FetchLyricsFromSpotifyAPI(spotifyID string) (*LyricsResponse, error) {
 	now := time.Now()
 	if limitedUntil := getSpotifyLyricsRateLimitUntil(); limitedUntil.After(now) {
@@ -538,7 +449,7 @@ func (c *LyricsClient) FetchLyricsFromSpotifyAPI(spotifyID string) (*LyricsRespo
 		spotifyID = parsed.ID
 	}
 
-	apiURL := fmt.Sprintf("https://lyrics.paxsenix.org/spotify/lyrics?id=%s", url.QueryEscape(spotifyID))
+	apiURL := fmt.Sprintf("https://spotify-lyrics-api-pi.vercel.app/?trackid=%s&format=lrc", url.QueryEscape(spotifyID))
 	req, err := http.NewRequest("GET", apiURL, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
@@ -551,18 +462,13 @@ func (c *LyricsClient) FetchLyricsFromSpotifyAPI(spotifyID string) (*LyricsRespo
 	}
 	defer resp.Body.Close()
 
-	bodyBytes, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read Spotify Lyrics API response: %w", err)
-	}
-
 	if resp.StatusCode != 200 {
 		if resp.StatusCode == http.StatusTooManyRequests {
 			retryUntil := parseSpotifyRetryAfter(resp.Header.Get("Retry-After"), now)
 			setSpotifyLyricsRateLimitUntil(retryUntil)
 		}
 		var payload map[string]interface{}
-		if err := json.Unmarshal(bodyBytes, &payload); err == nil {
+		if err := json.NewDecoder(resp.Body).Decode(&payload); err == nil {
 			if msg, ok := payload["message"].(string); ok && strings.TrimSpace(msg) != "" {
 				return nil, fmt.Errorf("Spotify Lyrics API returned status %d: %s", resp.StatusCode, strings.TrimSpace(msg))
 			}
@@ -573,7 +479,63 @@ func (c *LyricsClient) FetchLyricsFromSpotifyAPI(spotifyID string) (*LyricsRespo
 		return nil, fmt.Errorf("Spotify Lyrics API returned status %d", resp.StatusCode)
 	}
 
-	return parseSpotifyLyricsResponseBody(bodyBytes)
+	var apiResp SpotifyLyricsAPIResponse
+	if err := json.NewDecoder(resp.Body).Decode(&apiResp); err != nil {
+		return nil, fmt.Errorf("failed to parse Spotify Lyrics API response: %w", err)
+	}
+
+	if apiResp.Error {
+		msg := strings.TrimSpace(apiResp.Message)
+		if msg == "" {
+			msg = "Spotify Lyrics API returned error"
+		}
+		return nil, fmt.Errorf("%s", msg)
+	}
+
+	result := &LyricsResponse{
+		Lines:        make([]LyricsLine, 0, len(apiResp.Lines)),
+		SyncType:     apiResp.SyncType,
+		Instrumental: false,
+		PlainLyrics:  "",
+		Provider:     "Spotify Lyrics API",
+		Source:       "Spotify Lyrics API",
+	}
+
+	for _, line := range apiResp.Lines {
+		words := strings.TrimSpace(line.Words)
+		if words == "" {
+			continue
+		}
+		startMs := parseSpotifyLyricsTimeTagToMs(line.TimeTag)
+		result.Lines = append(result.Lines, LyricsLine{
+			StartTimeMs: startMs,
+			Words:       words,
+			EndTimeMs:   0,
+		})
+	}
+
+	if len(result.Lines) > 1 {
+		for i := 0; i < len(result.Lines)-1; i++ {
+			nextStart := result.Lines[i+1].StartTimeMs
+			if nextStart > result.Lines[i].StartTimeMs {
+				result.Lines[i].EndTimeMs = nextStart
+			}
+		}
+		last := len(result.Lines) - 1
+		if result.Lines[last].EndTimeMs == 0 {
+			result.Lines[last].EndTimeMs = result.Lines[last].StartTimeMs + 5000
+		}
+	}
+
+	if len(result.Lines) == 0 {
+		return nil, fmt.Errorf("Spotify Lyrics API returned empty lines")
+	}
+
+	if result.SyncType == "" {
+		result.SyncType = "LINE_SYNCED"
+	}
+
+	return result, nil
 }
 
 func (c *LyricsClient) findBestMatch(results []LRCLibResponse, targetDurationSec float64) *LRCLibResponse {
@@ -662,6 +624,7 @@ func (c *LyricsClient) FetchLyricsAllSources(spotifyID, trackName, artistName st
 
 	GoLog("[Lyrics] Searching for: %s - %s (providers: %v)\n", artistName, trackName, providerOrder)
 
+	// Cascade through all configured built-in providers
 	for _, providerName := range providerOrder {
 		GoLog("[Lyrics] Trying provider: %s\n", providerName)
 

go_backend/lyrics_apple.go

@@ -4,25 +4,121 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"math"
 	"net/http"
 	"net/url"
+	"regexp"
 	"strings"
+	"sync"
 	"time"
 )
 
 // AppleMusicClient fetches lyrics from Apple Music.
-// Uses Paxsenix endpoints for search and lyrics.
+// Uses a scraped JWT token for search and a proxy for lyrics.
 type AppleMusicClient struct {
 	httpClient *http.Client
 }
 
-type appleMusicSearchResult struct {
-	ID         string `json:"id"`
-	SongName   string `json:"songName"`
-	ArtistName string `json:"artistName"`
-	AlbumName  string `json:"albumName"`
-	Duration   int    `json:"duration"`
+// Apple Music token manager — singleton with mutex for thread safety
+type appleTokenManager struct {
+	mu    sync.Mutex
+	token string
+}
+
+var globalAppleTokenManager = &appleTokenManager{}
+
+func (m *appleTokenManager) getToken(client *http.Client) (string, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	if m.token != "" {
+		return m.token, nil
+	}
+
+	// Step 1: Fetch the Apple Music beta page
+	req, err := http.NewRequest("GET", "https://beta.music.apple.com", nil)
+	if err != nil {
+		return "", fmt.Errorf("failed to create request: %w", err)
+	}
+	req.Header.Set("User-Agent", getRandomUserAgent())
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", fmt.Errorf("failed to fetch Apple Music page: %w", err)
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", fmt.Errorf("failed to read Apple Music page: %w", err)
+	}
+
+	// Step 2: Find the index JS file URL
+	indexJsRegex := regexp.MustCompile(`/assets/index~[^/]+\.js`)
+	match := indexJsRegex.Find(body)
+	if match == nil {
+		return "", fmt.Errorf("could not find index JS script URL on Apple Music page")
+	}
+
+	indexJsURL := "https://beta.music.apple.com" + string(match)
+
+	// Step 3: Fetch the JS file
+	jsReq, err := http.NewRequest("GET", indexJsURL, nil)
+	if err != nil {
+		return "", fmt.Errorf("failed to create JS request: %w", err)
+	}
+	jsReq.Header.Set("User-Agent", getRandomUserAgent())
+
+	jsResp, err := client.Do(jsReq)
+	if err != nil {
+		return "", fmt.Errorf("failed to fetch Apple Music JS: %w", err)
+	}
+	defer jsResp.Body.Close()
+
+	jsBody, err := io.ReadAll(jsResp.Body)
+	if err != nil {
+		return "", fmt.Errorf("failed to read Apple Music JS: %w", err)
+	}
+
+	// Step 4: Extract JWT token (starts with eyJh)
+	tokenRegex := regexp.MustCompile(`eyJh[^"]*`)
+	tokenMatch := tokenRegex.Find(jsBody)
+	if tokenMatch == nil {
+		return "", fmt.Errorf("could not find JWT token in Apple Music JS")
+	}
+
+	m.token = string(tokenMatch)
+	GoLog("[AppleMusic] Token obtained successfully (length: %d)\n", len(m.token))
+	return m.token, nil
+}
+
+func (m *appleTokenManager) clearToken() {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	m.token = ""
+}
+
+type appleMusicSearchResponse struct {
+	Results struct {
+		Songs *struct {
+			Data []struct {
+				ID   string `json:"id"`
+				Type string `json:"type"`
+			} `json:"data"`
+		} `json:"songs"`
+	} `json:"results"`
+	Resources *struct {
+		Songs map[string]struct {
+			Attributes struct {
+				Name       string `json:"name"`
+				ArtistName string `json:"artistName"`
+				AlbumName  string `json:"albumName"`
+				URL        string `json:"url"`
+				Artwork    struct {
+					URL string `json:"url"`
+				} `json:"artwork"`
+			} `json:"attributes"`
+		} `json:"songs"`
+	} `json:"resources"`
 }
 
 // PaxResponse represents the lyrics proxy response for word-by-word / line lyrics
@@ -53,71 +149,32 @@ func NewAppleMusicClient() *AppleMusicClient {
 	}
 }
 
-func selectBestAppleMusicSearchResult(results []appleMusicSearchResult, trackName, artistName string, durationSec float64) *appleMusicSearchResult {
-	if len(results) == 0 {
-		return nil
-	}
-
-	normalizedTrack := strings.ToLower(strings.TrimSpace(simplifyTrackName(trackName)))
-	normalizedArtist := strings.ToLower(strings.TrimSpace(normalizeArtistName(artistName)))
-	if normalizedArtist == "" {
-		normalizedArtist = strings.ToLower(strings.TrimSpace(artistName))
-	}
-
-	bestIndex := 0
-	bestScore := -1
-	for i := range results {
-		result := &results[i]
-		score := 0
-
-		candidateTrack := strings.ToLower(strings.TrimSpace(simplifyTrackName(result.SongName)))
-		candidateArtist := strings.ToLower(strings.TrimSpace(normalizeArtistName(result.ArtistName)))
-
-		switch {
-		case candidateTrack == normalizedTrack:
-			score += 50
-		case strings.Contains(candidateTrack, normalizedTrack) || strings.Contains(normalizedTrack, candidateTrack):
-			score += 25
-		}
-
-		switch {
-		case candidateArtist == normalizedArtist:
-			score += 60
-		case strings.Contains(candidateArtist, normalizedArtist) || strings.Contains(normalizedArtist, candidateArtist):
-			score += 30
-		}
-
-		if durationSec > 0 && result.Duration > 0 {
-			diff := math.Abs(float64(result.Duration)/1000.0 - durationSec)
-			if diff <= durationToleranceSec {
-				score += 20
-			}
-		}
-
-		if score > bestScore {
-			bestScore = score
-			bestIndex = i
-		}
-	}
-
-	return &results[bestIndex]
-}
-
 // SearchSong searches for a song on Apple Music and returns its ID.
-func (c *AppleMusicClient) SearchSong(trackName, artistName string, durationSec float64) (string, error) {
+func (c *AppleMusicClient) SearchSong(trackName, artistName string) (string, error) {
 	query := trackName + " " + artistName
 	if strings.TrimSpace(query) == "" {
 		return "", fmt.Errorf("empty search query")
 	}
 
+	token, err := globalAppleTokenManager.getToken(c.httpClient)
+	if err != nil {
+		return "", fmt.Errorf("apple music token error: %w", err)
+	}
+
 	encodedQuery := url.QueryEscape(query)
-	searchURL := fmt.Sprintf("https://lyrics.paxsenix.org/apple-music/search?q=%s", encodedQuery)
+	searchURL := fmt.Sprintf(
+		"https://amp-api.music.apple.com/v1/catalog/us/search?term=%s&types=songs&limit=5&l=en-US&platform=web&format[resources]=map&include[songs]=artists&extend=artistUrl",
+		encodedQuery,
+	)
 
 	req, err := http.NewRequest("GET", searchURL, nil)
 	if err != nil {
 		return "", fmt.Errorf("failed to create request: %w", err)
 	}
 
+	req.Header.Set("Authorization", "Bearer "+token)
+	req.Header.Set("Origin", "https://music.apple.com")
+	req.Header.Set("Referer", "https://music.apple.com/")
 	req.Header.Set("User-Agent", getRandomUserAgent())
 	req.Header.Set("Accept", "application/json")
 
@@ -127,21 +184,25 @@ func (c *AppleMusicClient) SearchSong(trackName, artistName string, durationSec
 	}
 	defer resp.Body.Close()
 
+	if resp.StatusCode == 401 {
+		globalAppleTokenManager.clearToken()
+		return "", fmt.Errorf("apple music token expired")
+	}
+
 	if resp.StatusCode != 200 {
 		return "", fmt.Errorf("apple music search returned HTTP %d", resp.StatusCode)
 	}
 
-	var searchResp []appleMusicSearchResult
+	var searchResp appleMusicSearchResponse
 	if err := json.NewDecoder(resp.Body).Decode(&searchResp); err != nil {
 		return "", fmt.Errorf("failed to decode apple music response: %w", err)
 	}
 
-	best := selectBestAppleMusicSearchResult(searchResp, trackName, artistName, durationSec)
-	if best == nil || strings.TrimSpace(best.ID) == "" {
+	if searchResp.Results.Songs == nil || len(searchResp.Results.Songs.Data) == 0 {
 		return "", fmt.Errorf("no songs found on apple music")
 	}
 
-	return strings.TrimSpace(best.ID), nil
+	return searchResp.Results.Songs.Data[0].ID, nil
 }
 
 // FetchLyricsByID fetches lyrics from the paxsenix proxy using Apple Music song ID.
@@ -259,7 +320,7 @@ func (c *AppleMusicClient) FetchLyrics(
 	durationSec float64,
 	multiPersonWordByWord bool,
 ) (*LyricsResponse, error) {
-	songID, err := c.SearchSong(trackName, artistName, durationSec)
+	songID, err := c.SearchSong(trackName, artistName)
 	if err != nil {
 		return nil, err
 	}

go_backend/lyrics_musixmatch.go

@@ -3,8 +3,6 @@ package gobackend
 import (
 	"encoding/json"
 	"fmt"
-	"io"
-	"math"
 	"net/http"
 	"net/url"
 	"strings"
@@ -47,105 +45,100 @@ type musixmatchLyricsResponse struct {
 func NewMusixmatchClient() *MusixmatchClient {
 	return &MusixmatchClient{
 		httpClient: NewMetadataHTTPClient(15 * time.Second),
-		baseURL:    "https://lyrics.paxsenix.org/musixmatch/lyrics",
+		baseURL:    "http://158.180.60.95",
 	}
 }
 
-func (c *MusixmatchClient) fetchLyricsPayload(trackName, artistName string, durationSec float64, lyricsType, language string) (string, error) {
+// searchAndGetLyrics searches for a song and retrieves its lyrics in one call.
+// The Musixmatch proxy returns both search result and lyrics in a single response.
+func (c *MusixmatchClient) searchAndGetLyrics(trackName, artistName string) (*musixmatchSearchResponse, error) {
 	if strings.TrimSpace(trackName) == "" || strings.TrimSpace(artistName) == "" {
-		return "", fmt.Errorf("empty track or artist name")
+		return nil, fmt.Errorf("empty track or artist name")
 	}
 
-	params := url.Values{}
-	params.Set("t", trackName)
-	params.Set("a", artistName)
-	params.Set("type", lyricsType)
-	params.Set("format", "lrc")
-	if durationSec > 0 {
-		params.Set("d", fmt.Sprintf("%d", int(math.Round(durationSec))))
-	}
-	if strings.TrimSpace(language) != "" {
-		params.Set("l", strings.ToLower(strings.TrimSpace(language)))
-	}
-	fullURL := c.baseURL + "?" + params.Encode()
+	encodedArtist := url.QueryEscape(artistName)
+	encodedTrack := url.QueryEscape(trackName)
+
+	fullURL := fmt.Sprintf("%s/v2/full?artist=%s&track=%s", c.baseURL, encodedArtist, encodedTrack)
 
 	req, err := http.NewRequest("GET", fullURL, nil)
 	if err != nil {
-		return "", fmt.Errorf("failed to create request: %w", err)
+		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
-	req.Header.Set("Accept", "application/json")
 	req.Header.Set("User-Agent", getRandomUserAgent())
 
 	resp, err := c.httpClient.Do(req)
 	if err != nil {
-		return "", fmt.Errorf("musixmatch request failed: %w", err)
+		return nil, fmt.Errorf("musixmatch search failed: %w", err)
 	}
 	defer resp.Body.Close()
 
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", fmt.Errorf("failed to read musixmatch response: %w", err)
-	}
-
 	if resp.StatusCode != 200 {
-		trimmed := strings.TrimSpace(string(body))
-		if errMsg, isErrorPayload := detectLyricsErrorPayload(trimmed); isErrorPayload {
-			return "", fmt.Errorf("musixmatch proxy returned HTTP %d: %s", resp.StatusCode, errMsg)
-		}
-		return "", fmt.Errorf("musixmatch proxy returned HTTP %d", resp.StatusCode)
+		return nil, fmt.Errorf("musixmatch proxy returned HTTP %d", resp.StatusCode)
 	}
 
-	var lrcPayload string
-	if err := json.Unmarshal(body, &lrcPayload); err == nil {
-		lrcPayload = strings.TrimSpace(lrcPayload)
-		if lrcPayload == "" {
-			return "", fmt.Errorf("empty musixmatch lyrics payload")
-		}
-		return lrcPayload, nil
+	var result musixmatchSearchResponse
+	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+		return nil, fmt.Errorf("failed to decode musixmatch response: %w", err)
 	}
 
-	trimmed := strings.TrimSpace(string(body))
-	if errMsg, isErrorPayload := detectLyricsErrorPayload(trimmed); isErrorPayload {
-		return "", fmt.Errorf("%s", errMsg)
-	}
-	if trimmed != "" && !strings.HasPrefix(trimmed, "{") {
-		return trimmed, nil
-	}
-	return "", fmt.Errorf("failed to decode musixmatch response")
+	return &result, nil
 }
 
 // FetchLyricsInLanguage retrieves lyrics from Musixmatch for a specific language code.
-func (c *MusixmatchClient) FetchLyricsInLanguage(trackName, artistName string, durationSec float64, language string) (*LyricsResponse, error) {
+func (c *MusixmatchClient) FetchLyricsInLanguage(songID int64, language string) (*LyricsResponse, error) {
 	lang := strings.ToLower(strings.TrimSpace(language))
-	if lang == "" {
-		return nil, fmt.Errorf("invalid language")
+	if songID <= 0 || lang == "" {
+		return nil, fmt.Errorf("invalid song id or language")
 	}
 
-	lrcText, err := c.fetchLyricsPayload(trackName, artistName, durationSec, "translate", lang)
+	fullURL := fmt.Sprintf("%s/v2/full?id=%d&lang=%s", c.baseURL, songID, url.QueryEscape(lang))
+
+	req, err := http.NewRequest("GET", fullURL, nil)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+	req.Header.Set("User-Agent", getRandomUserAgent())
+
+	resp, err := c.httpClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("musixmatch language fetch failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("musixmatch language endpoint returned HTTP %d", resp.StatusCode)
 	}
 
-	lines := parseSyncedLyrics(lrcText)
-	if len(lines) > 0 {
-		return &LyricsResponse{
-			Lines:       lines,
-			SyncType:    "LINE_SYNCED",
-			PlainLyrics: plainLyricsFromTimedLines(lines),
-			Provider:    "Musixmatch",
-			Source:      fmt.Sprintf("Musixmatch (%s)", lang),
-		}, nil
+	var result musixmatchSearchResponse
+	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+		return nil, fmt.Errorf("failed to decode musixmatch language response: %w", err)
 	}
 
-	plainLines := plainTextLyricsLines(lrcText)
-	if len(plainLines) > 0 {
-		return &LyricsResponse{
-			Lines:       plainLines,
-			SyncType:    "UNSYNCED",
-			PlainLyrics: lrcText,
-			Provider:    "Musixmatch",
-			Source:      fmt.Sprintf("Musixmatch (%s)", lang),
-		}, nil
+	if result.SyncedLyrics != nil && strings.TrimSpace(result.SyncedLyrics.Lyrics) != "" {
+		lines := parseSyncedLyrics(result.SyncedLyrics.Lyrics)
+		if len(lines) > 0 {
+			return &LyricsResponse{
+				Lines:    lines,
+				SyncType: "LINE_SYNCED",
+				Provider: "Musixmatch",
+				Source:   fmt.Sprintf("Musixmatch (%s)", lang),
+			}, nil
+		}
+	}
+
+	if result.UnsyncedLyrics != nil && strings.TrimSpace(result.UnsyncedLyrics.Lyrics) != "" {
+		lines := plainTextLyricsLines(result.UnsyncedLyrics.Lyrics)
+
+		if len(lines) > 0 {
+			return &LyricsResponse{
+				Lines:       lines,
+				SyncType:    "UNSYNCED",
+				PlainLyrics: result.UnsyncedLyrics.Lyrics,
+				Provider:    "Musixmatch",
+				Source:      fmt.Sprintf("Musixmatch (%s)", lang),
+			}, nil
+		}
 	}
 
 	return nil, fmt.Errorf("no lyrics found on musixmatch for language %s", lang)
@@ -153,39 +146,43 @@ func (c *MusixmatchClient) FetchLyricsInLanguage(trackName, artistName string, d
 
 // FetchLyrics searches Musixmatch and returns parsed LyricsResponse.
 func (c *MusixmatchClient) FetchLyrics(trackName, artistName string, durationSec float64, preferredLanguage string) (*LyricsResponse, error) {
-	if preferred := strings.ToLower(strings.TrimSpace(preferredLanguage)); preferred != "" {
-		localized, localizedErr := c.FetchLyricsInLanguage(trackName, artistName, durationSec, preferred)
+	result, err := c.searchAndGetLyrics(trackName, artistName)
+	if err != nil {
+		return nil, err
+	}
+
+	if preferred := strings.ToLower(strings.TrimSpace(preferredLanguage)); preferred != "" && result.ID > 0 {
+		localized, localizedErr := c.FetchLyricsInLanguage(result.ID, preferred)
 		if localizedErr == nil {
 			return localized, nil
 		}
 		GoLog("[Musixmatch] Language override '%s' failed: %v\n", preferred, localizedErr)
 	}
 
-	lrcText, err := c.fetchLyricsPayload(trackName, artistName, durationSec, "word", "")
-	if err != nil {
-		return nil, err
+	if result.SyncedLyrics != nil && strings.TrimSpace(result.SyncedLyrics.Lyrics) != "" {
+		lines := parseSyncedLyrics(result.SyncedLyrics.Lyrics)
+		if len(lines) > 0 {
+			return &LyricsResponse{
+				Lines:    lines,
+				SyncType: "LINE_SYNCED",
+				Provider: "Musixmatch",
+				Source:   "Musixmatch",
+			}, nil
+		}
 	}
 
-	lines := parseSyncedLyrics(lrcText)
-	if len(lines) > 0 {
-		return &LyricsResponse{
-			Lines:       lines,
-			SyncType:    "LINE_SYNCED",
-			PlainLyrics: plainLyricsFromTimedLines(lines),
-			Provider:    "Musixmatch",
-			Source:      "Musixmatch",
-		}, nil
-	}
+	if result.UnsyncedLyrics != nil && strings.TrimSpace(result.UnsyncedLyrics.Lyrics) != "" {
+		lines := plainTextLyricsLines(result.UnsyncedLyrics.Lyrics)
 
-	plainLines := plainTextLyricsLines(lrcText)
-	if len(plainLines) > 0 {
-		return &LyricsResponse{
-			Lines:       plainLines,
-			SyncType:    "UNSYNCED",
-			PlainLyrics: lrcText,
-			Provider:    "Musixmatch",
-			Source:      "Musixmatch",
-		}, nil
+		if len(lines) > 0 {
+			return &LyricsResponse{
+				Lines:       lines,
+				SyncType:    "UNSYNCED",
+				PlainLyrics: result.UnsyncedLyrics.Lyrics,
+				Provider:    "Musixmatch",
+				Source:      "Musixmatch",
+			}, nil
+		}
 	}
 
 	return nil, fmt.Errorf("no lyrics found on musixmatch")

go_backend/lyrics_netease.go

@@ -9,7 +9,8 @@ import (
 	"time"
 )
 
-// NeteaseClient fetches lyrics through Paxsenix's NetEase endpoints.
+// NeteaseClient fetches lyrics from NetEase Cloud Music (music.163.com).
+// This is a direct public API — no proxy dependency.
 type NeteaseClient struct {
 	httpClient *http.Client
 }
@@ -58,9 +59,12 @@ func (c *NeteaseClient) SearchSong(trackName, artistName string) (int64, error)
 		return 0, fmt.Errorf("empty search query")
 	}
 
-	searchURL := "https://lyrics.paxsenix.org/netease/search"
+	searchURL := "http://music.163.com/api/search/pc"
 	params := url.Values{}
-	params.Set("q", query)
+	params.Set("s", query)
+	params.Set("type", "1")
+	params.Set("limit", "1")
+	params.Set("offset", "0")
 
 	fullURL := searchURL + "?" + params.Encode()
 
@@ -98,9 +102,12 @@ func (c *NeteaseClient) SearchSong(trackName, artistName string) (int64, error)
 
 // FetchLyricsByID fetches synced lyrics for a given Netease song ID.
 func (c *NeteaseClient) FetchLyricsByID(songID int64, includeTranslation, includeRomanization bool) (string, error) {
-	lyricsURL := "https://lyrics.paxsenix.org/netease/lyrics"
+	lyricsURL := "http://music.163.com/api/song/lyric"
 	params := url.Values{}
 	params.Set("id", fmt.Sprintf("%d", songID))
+	params.Set("lv", "1")
+	params.Set("tv", "1")
+	params.Set("rv", "1")
 
 	fullURL := lyricsURL + "?" + params.Encode()
 

go_backend/lyrics_qqmusic.go

@@ -1,31 +1,45 @@
 package gobackend
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
-	"math"
 	"net/http"
+	"net/url"
 	"strings"
 	"time"
 )
 
 // QQMusicClient fetches lyrics from QQ Music.
-// Uses Paxsenix metadata lookup for lyrics.
+// Search uses public QQ Music API, lyrics use the paxsenix proxy.
 type QQMusicClient struct {
 	httpClient *http.Client
 }
 
-type qqLyricsMetadataRequest struct {
-	Artist   []string `json:"artist"`
-	Album    string   `json:"album,omitempty"`
-	SongID   int64    `json:"songid,omitempty"`
-	Title    string   `json:"title"`
-	Duration int64    `json:"duration,omitempty"`
+type qqMusicSearchResponse struct {
+	Data struct {
+		Song struct {
+			List []struct {
+				Title  string `json:"title"`
+				Singer []struct {
+					Name string `json:"name"`
+				} `json:"singer"`
+				Album struct {
+					Name string `json:"name"`
+				} `json:"album"`
+				ID int64 `json:"id"`
+			} `json:"list"`
+		} `json:"song"`
+	} `json:"data"`
 }
 
-type qqLyricsMetadataResponse struct {
-	Lyrics []paxLyrics `json:"lyrics"`
+// QQ Music lyrics request payload for paxsenix proxy
+type qqLyricsPayload struct {
+	Artist []string `json:"artist"`
+	Album  string   `json:"album"`
+	ID     int64    `json:"id"`
+	Title  string   `json:"title"`
 }
 
 func NewQQMusicClient() *QQMusicClient {
@@ -34,29 +48,79 @@ func NewQQMusicClient() *QQMusicClient {
 	}
 }
 
-// fetchLyricsByMetadata asks Paxsenix to resolve and return QQ lyrics using track metadata.
-func (c *QQMusicClient) fetchLyricsByMetadata(trackName, artistName string, durationSec float64) (string, error) {
-	payload := qqLyricsMetadataRequest{
-		Artist: []string{artistName},
-		Title:  trackName,
-	}
-	if durationSec > 0 {
-		payload.Duration = int64(math.Round(durationSec))
+// searchSong searches QQ Music and returns the song info needed for lyrics fetch.
+func (c *QQMusicClient) searchSong(trackName, artistName string) (*qqLyricsPayload, error) {
+	query := trackName + " " + artistName
+	if strings.TrimSpace(query) == "" {
+		return nil, fmt.Errorf("empty search query")
 	}
 
-	lyricsURL := "https://lyrics.paxsenix.org/qq/lyrics-metadata"
+	searchURL := "https://c.y.qq.com/soso/fcgi-bin/client_search_cp"
+	params := url.Values{}
+	params.Set("format", "json")
+	params.Set("inCharset", "utf8")
+	params.Set("outCharset", "utf8")
+	params.Set("platform", "yqq.json")
+	params.Set("new_json", "1")
+	params.Set("w", query)
+
+	fullURL := searchURL + "?" + params.Encode()
+
+	req, err := http.NewRequest("GET", fullURL, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("User-Agent", getRandomUserAgent())
+
+	resp, err := c.httpClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("qqmusic search failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("qqmusic search returned HTTP %d", resp.StatusCode)
+	}
+
+	var searchResp qqMusicSearchResponse
+	if err := json.NewDecoder(resp.Body).Decode(&searchResp); err != nil {
+		return nil, fmt.Errorf("failed to decode qqmusic response: %w", err)
+	}
+
+	if len(searchResp.Data.Song.List) == 0 {
+		return nil, fmt.Errorf("no songs found on qqmusic")
+	}
+
+	song := searchResp.Data.Song.List[0]
+
+	var artists []string
+	for _, singer := range song.Singer {
+		artists = append(artists, singer.Name)
+	}
+
+	return &qqLyricsPayload{
+		Artist: artists,
+		Album:  song.Album.Name,
+		ID:     song.ID,
+		Title:  song.Title,
+	}, nil
+}
+
+// fetchLyricsByPayload fetches lyrics from the paxsenix proxy using QQ Music song info.
+func (c *QQMusicClient) fetchLyricsByPayload(payload *qqLyricsPayload) (string, error) {
+	lyricsURL := "https://paxsenix.alwaysdata.net/getQQLyrics.php"
 
 	payloadBytes, err := json.Marshal(payload)
 	if err != nil {
 		return "", fmt.Errorf("failed to marshal payload: %w", err)
 	}
 
-	req, err := http.NewRequest("POST", lyricsURL, strings.NewReader(string(payloadBytes)))
+	req, err := http.NewRequest("POST", lyricsURL, bytes.NewReader(payloadBytes))
 	if err != nil {
 		return "", fmt.Errorf("failed to create request: %w", err)
 	}
 	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Accept", "application/json")
 	req.Header.Set("User-Agent", getRandomUserAgent())
 
 	resp, err := c.httpClient.Do(req)
@@ -82,17 +146,6 @@ func (c *QQMusicClient) fetchLyricsByMetadata(trackName, artistName string, dura
 	return bodyStr, nil
 }
 
-func formatQQLyricsMetadataToLRC(rawJSON string, multiPersonWordByWord bool) (string, error) {
-	var response qqLyricsMetadataResponse
-	if err := json.Unmarshal([]byte(rawJSON), &response); err != nil {
-		return "", fmt.Errorf("failed to parse qq metadata lyrics response")
-	}
-	if len(response.Lyrics) == 0 {
-		return "", fmt.Errorf("qq metadata lyrics response was empty")
-	}
-	return formatPaxContent("Syllable", response.Lyrics, multiPersonWordByWord), nil
-}
-
 // FetchLyrics searches QQ Music and returns parsed LyricsResponse.
 func (c *QQMusicClient) FetchLyrics(
 	trackName,
@@ -100,7 +153,12 @@ func (c *QQMusicClient) FetchLyrics(
 	durationSec float64,
 	multiPersonWordByWord bool,
 ) (*LyricsResponse, error) {
-	rawLyrics, err := c.fetchLyricsByMetadata(trackName, artistName, durationSec)
+	payload, err := c.searchSong(trackName, artistName)
+	if err != nil {
+		return nil, err
+	}
+
+	rawLyrics, err := c.fetchLyricsByPayload(payload)
 	if err != nil {
 		return nil, err
 	}
@@ -108,13 +166,11 @@ func (c *QQMusicClient) FetchLyrics(
 		return nil, fmt.Errorf("qqmusic proxy returned non-lyric payload: %s", errMsg)
 	}
 
-	lrcText, err := formatQQLyricsMetadataToLRC(rawLyrics, multiPersonWordByWord)
+	// Try to parse as pax format (word-by-word or line)
+	lrcText, err := formatPaxLyricsToLRC(rawLyrics, multiPersonWordByWord)
 	if err != nil {
-		if fallback, fallbackErr := formatPaxLyricsToLRC(rawLyrics, multiPersonWordByWord); fallbackErr == nil {
-			lrcText = fallback
-		} else {
-			lrcText = rawLyrics
-		}
+		// If pax parsing fails, try to use as direct LRC text
+		lrcText = rawLyrics
 	}
 
 	lines := parseSyncedLyrics(lrcText)

go_backend/metadata.go

@@ -552,14 +552,6 @@ func ExtractLyrics(filePath string) (string, error) {
 		return extractLyricsFromSidecarLRC(filePath)
 	}
 
-	if strings.HasSuffix(lower, ".m4a") || strings.HasSuffix(lower, ".aac") {
-		lyrics, err := extractLyricsFromM4A(filePath)
-		if err == nil && strings.TrimSpace(lyrics) != "" {
-			return lyrics, nil
-		}
-		return extractLyricsFromSidecarLRC(filePath)
-	}
-
 	if strings.HasSuffix(lower, ".mp3") {
 		meta, err := ReadID3Tags(filePath)
 		if err == nil && meta != nil {
@@ -589,299 +581,6 @@ func ExtractLyrics(filePath string) (string, error) {
 	return extractLyricsFromSidecarLRC(filePath)
 }
 
-func ReadM4ATags(filePath string) (*AudioMetadata, error) {
-	f, err := os.Open(filePath)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	fi, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-
-	ilst, err := findM4AIlstAtom(f, fi.Size())
-	if err != nil {
-		return nil, err
-	}
-
-	metadata := &AudioMetadata{}
-	start := ilst.offset + ilst.headerSize
-	end := ilst.offset + ilst.size
-	for pos := start; pos+8 <= end; {
-		header, err := readAtomHeaderAt(f, pos, fi.Size())
-		if err != nil {
-			return nil, err
-		}
-		if header.size == 0 {
-			header.size = end - pos
-		}
-		if header.size < header.headerSize {
-			return nil, fmt.Errorf("invalid atom size for %s", header.typ)
-		}
-
-		switch header.typ {
-		case "\xa9nam":
-			metadata.Title, _ = readM4ATextValue(f, header, fi.Size())
-		case "\xa9ART":
-			metadata.Artist, _ = readM4ATextValue(f, header, fi.Size())
-		case "\xa9alb":
-			metadata.Album, _ = readM4ATextValue(f, header, fi.Size())
-		case "aART":
-			metadata.AlbumArtist, _ = readM4ATextValue(f, header, fi.Size())
-		case "\xa9day":
-			metadata.Date, _ = readM4ATextValue(f, header, fi.Size())
-			metadata.Year = metadata.Date
-		case "\xa9gen":
-			metadata.Genre, _ = readM4ATextValue(f, header, fi.Size())
-		case "\xa9wrt":
-			metadata.Composer, _ = readM4ATextValue(f, header, fi.Size())
-		case "\xa9cmt":
-			metadata.Comment, _ = readM4ATextValue(f, header, fi.Size())
-		case "cprt":
-			metadata.Copyright, _ = readM4ATextValue(f, header, fi.Size())
-		case "\xa9lyr":
-			metadata.Lyrics, _ = readM4ATextValue(f, header, fi.Size())
-		case "trkn":
-			metadata.TrackNumber, _ = readM4AIndexValue(f, header, fi.Size())
-		case "disk":
-			metadata.DiscNumber, _ = readM4AIndexValue(f, header, fi.Size())
-		case "----":
-			name, value, freeformErr := readM4AFreeformValue(f, header, fi.Size())
-			if freeformErr == nil {
-				switch strings.ToUpper(strings.TrimSpace(name)) {
-				case "ISRC":
-					metadata.ISRC = value
-				case "LABEL", "ORGANIZATION":
-					metadata.Label = value
-				case "COMMENT":
-					if metadata.Comment == "" {
-						metadata.Comment = value
-					}
-				case "COMPOSER":
-					if metadata.Composer == "" {
-						metadata.Composer = value
-					}
-				case "COPYRIGHT":
-					if metadata.Copyright == "" {
-						metadata.Copyright = value
-					}
-				case "LYRICS", "UNSYNCEDLYRICS":
-					if metadata.Lyrics == "" {
-						metadata.Lyrics = value
-					}
-				}
-			}
-		}
-
-		pos += header.size
-	}
-
-	if metadata.Title == "" &&
-		metadata.Artist == "" &&
-		metadata.Album == "" &&
-		metadata.AlbumArtist == "" &&
-		metadata.Lyrics == "" &&
-		metadata.TrackNumber == 0 &&
-		metadata.DiscNumber == 0 {
-		return nil, fmt.Errorf("no M4A tags found")
-	}
-
-	return metadata, nil
-}
-
-func extractLyricsFromM4A(filePath string) (string, error) {
-	metadata, err := ReadM4ATags(filePath)
-	if err != nil {
-		return "", err
-	}
-	if metadata == nil || strings.TrimSpace(metadata.Lyrics) == "" {
-		return "", fmt.Errorf("no lyrics found in file")
-	}
-	return metadata.Lyrics, nil
-}
-
-func extractCoverFromM4A(filePath string) ([]byte, error) {
-	f, err := os.Open(filePath)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	fi, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-	fileSize := fi.Size()
-
-	ilst, err := findM4AIlstAtom(f, fileSize)
-	if err != nil {
-		return nil, err
-	}
-
-	bodyStart := ilst.offset + ilst.headerSize
-	bodySize := ilst.size - ilst.headerSize
-
-	covr, found, err := findAtomInRange(f, bodyStart, bodySize, "covr", fileSize)
-	if err != nil || !found {
-		return nil, fmt.Errorf("cover atom not found")
-	}
-
-	dataStart := covr.offset + covr.headerSize
-	dataSize := covr.size - covr.headerSize
-
-	dataAtom, found, err := findAtomInRange(f, dataStart, dataSize, "data", fileSize)
-	if err != nil || !found {
-		return nil, fmt.Errorf("data atom not found in cover")
-	}
-
-	// data atom: header + 4 bytes type indicator + 4 bytes locale
-	imgStart := dataAtom.offset + dataAtom.headerSize + 8
-	imgLen := dataAtom.size - dataAtom.headerSize - 8
-	if imgLen <= 0 {
-		return nil, fmt.Errorf("empty cover data")
-	}
-
-	buf := make([]byte, imgLen)
-	if _, err := f.ReadAt(buf, imgStart); err != nil {
-		return nil, err
-	}
-
-	return buf, nil
-}
-
-// findM4AIlstAtom locates the ilst atom that holds all iTunes-style tags.
-// It tries two common layouts:
-//  1. moov > udta > meta > ilst  (iTunes, FFmpeg default)
-//  2. moov > meta > ilst         (some encoders omit the udta wrapper)
-func findM4AIlstAtom(f *os.File, fileSize int64) (atomHeader, error) {
-	moov, found, err := findAtomInRange(f, 0, fileSize, "moov", fileSize)
-	if err != nil || !found {
-		return atomHeader{}, fmt.Errorf("moov not found")
-	}
-
-	moovBodyStart := moov.offset + moov.headerSize
-	moovBodySize := moov.size - moov.headerSize
-
-	// Path 1: moov > udta > meta > ilst
-	if udta, ok, _ := findAtomInRange(f, moovBodyStart, moovBodySize, "udta", fileSize); ok {
-		udtaBodyStart := udta.offset + udta.headerSize
-		udtaBodySize := udta.size - udta.headerSize
-		if meta, ok2, _ := findAtomInRange(f, udtaBodyStart, udtaBodySize, "meta", fileSize); ok2 {
-			metaBodyStart := meta.offset + meta.headerSize + 4
-			metaBodySize := meta.size - meta.headerSize - 4
-			if ilst, ok3, _ := findAtomInRange(f, metaBodyStart, metaBodySize, "ilst", fileSize); ok3 {
-				return ilst, nil
-			}
-		}
-	}
-
-	// Path 2: moov > meta > ilst (no udta wrapper)
-	if meta, ok, _ := findAtomInRange(f, moovBodyStart, moovBodySize, "meta", fileSize); ok {
-		metaBodyStart := meta.offset + meta.headerSize + 4
-		metaBodySize := meta.size - meta.headerSize - 4
-		if ilst, ok2, _ := findAtomInRange(f, metaBodyStart, metaBodySize, "ilst", fileSize); ok2 {
-			return ilst, nil
-		}
-	}
-
-	return atomHeader{}, fmt.Errorf("ilst not found (tried moov>udta>meta>ilst and moov>meta>ilst)")
-}
-
-func readM4ADataAtomPayload(f *os.File, dataAtom atomHeader) ([]byte, error) {
-	payloadStart := dataAtom.offset + dataAtom.headerSize + 8
-	payloadLen := dataAtom.size - dataAtom.headerSize - 8
-	if payloadLen <= 0 {
-		return nil, fmt.Errorf("empty data atom in %s", dataAtom.typ)
-	}
-
-	buf := make([]byte, payloadLen)
-	if _, err := f.ReadAt(buf, payloadStart); err != nil {
-		return nil, err
-	}
-	return buf, nil
-}
-
-func readM4ADataPayload(f *os.File, parent atomHeader, fileSize int64) ([]byte, error) {
-	dataStart := parent.offset + parent.headerSize
-	dataSize := parent.size - parent.headerSize
-
-	dataAtom, found, err := findAtomInRange(f, dataStart, dataSize, "data", fileSize)
-	if err != nil || !found {
-		return nil, fmt.Errorf("data atom not found in %s", parent.typ)
-	}
-	return readM4ADataAtomPayload(f, dataAtom)
-}
-
-func readM4ATextValue(f *os.File, parent atomHeader, fileSize int64) (string, error) {
-	payload, err := readM4ADataPayload(f, parent, fileSize)
-	if err != nil {
-		return "", err
-	}
-	return strings.TrimSpace(strings.TrimRight(string(payload), "\x00")), nil
-}
-
-func readM4AIndexValue(f *os.File, parent atomHeader, fileSize int64) (int, error) {
-	payload, err := readM4ADataPayload(f, parent, fileSize)
-	if err != nil {
-		return 0, err
-	}
-	if len(payload) < 4 {
-		return 0, fmt.Errorf("index payload too short in %s", parent.typ)
-	}
-	return int(binary.BigEndian.Uint16(payload[2:4])), nil
-}
-
-func readM4AFreeformValue(f *os.File, parent atomHeader, fileSize int64) (string, string, error) {
-	start := parent.offset + parent.headerSize
-	end := parent.offset + parent.size
-
-	var nameValue string
-	var dataValue string
-	for pos := start; pos+8 <= end; {
-		header, err := readAtomHeaderAt(f, pos, fileSize)
-		if err != nil {
-			return "", "", err
-		}
-		if header.size == 0 {
-			header.size = end - pos
-		}
-		if header.size < header.headerSize {
-			return "", "", fmt.Errorf("invalid atom size for %s", header.typ)
-		}
-
-		switch header.typ {
-		case "mean":
-			// Domain qualifier (e.g. "com.apple.iTunes") — not needed, skip.
-		case "name":
-			// The "name" atom payload is: 4-byte version/flags, then raw UTF-8 text.
-			// It does NOT contain a nested "data" atom, so read the payload directly.
-			payloadStart := header.offset + header.headerSize + 4
-			payloadLen := header.size - header.headerSize - 4
-			if payloadLen > 0 {
-				buf := make([]byte, payloadLen)
-				if _, readErr := f.ReadAt(buf, payloadStart); readErr == nil {
-					nameValue = strings.TrimSpace(strings.TrimRight(string(buf), "\x00"))
-				}
-			}
-		case "data":
-			payload, payloadErr := readM4ADataAtomPayload(f, header)
-			if payloadErr == nil {
-				dataValue = strings.TrimSpace(strings.TrimRight(string(payload), "\x00"))
-			}
-		}
-
-		pos += header.size
-	}
-
-	if nameValue == "" || dataValue == "" {
-		return "", "", fmt.Errorf("freeform M4A tag incomplete")
-	}
-
-	return nameValue, dataValue, nil
-}
-
 func extractLyricsFromSidecarLRC(filePath string) (string, error) {
 	ext := filepath.Ext(filePath)
 	base := strings.TrimSuffix(filePath, ext)
@@ -1044,28 +743,15 @@ func GetM4AQuality(filePath string) (AudioQuality, error) {
 		return AudioQuality{}, err
 	}
 
-	buf := make([]byte, 32)
+	buf := make([]byte, 24)
 	if _, err := f.ReadAt(buf, sampleOffset); err != nil {
 		return AudioQuality{}, fmt.Errorf("failed to read audio sample entry: %w", err)
 	}
 
-	// AudioSampleEntry layout from the box type field:
-	//   [0:4]   type ("mp4a"/"alac")
-	//   [4:10]  SampleEntry.reserved
-	//   [10:12] data_reference_index
-	//   [12:20] reserved[8]
-	//   [20:22] channelcount
-	//   [22:24] samplesize (bit depth)
-	//   [24:26] pre_defined
-	//   [26:28] reserved
-	//   [28:32] samplerate (16.16 fixed-point)
-	sampleRate := int(buf[28])<<8 | int(buf[29])
-	bitDepth := int(buf[22])<<8 | int(buf[23])
-	if bitDepth <= 0 {
-		bitDepth = 16
-		if atomType == "alac" {
-			bitDepth = 24
-		}
+	sampleRate := int(buf[22])<<8 | int(buf[23])
+	bitDepth := 16
+	if atomType == "alac" {
+		bitDepth = 24
 	}
 
 	return AudioQuality{BitDepth: bitDepth, SampleRate: sampleRate}, nil
@@ -1188,7 +874,7 @@ func findAudioSampleEntry(f *os.File, start, end, fileSize int64) (int64, string
 
 		if bestIdx >= 0 {
 			absolute := readPos - int64(len(tail)) + int64(bestIdx)
-			if absolute+32 > fileSize {
+			if absolute+24 > fileSize {
 				return 0, "", fmt.Errorf("audio info not found in M4A file")
 			}
 			return absolute, bestType, nil

go_backend/progress.go

@@ -34,16 +34,10 @@ var (
 	downloadDir   string
 	downloadDirMu sync.RWMutex
 
-	multiProgress       = MultiProgress{Items: make(map[string]*ItemProgress)}
-	multiMu             sync.RWMutex
-	multiProgressDirty  = true
-	cachedMultiProgress = "{\"items\":{}}"
+	multiProgress = MultiProgress{Items: make(map[string]*ItemProgress)}
+	multiMu       sync.RWMutex
 )
 
-func markMultiProgressDirtyLocked() {
-	multiProgressDirty = true
-}
-
 func getProgress() DownloadProgress {
 	multiMu.RLock()
 	defer multiMu.RUnlock()
@@ -64,25 +58,13 @@ func getProgress() DownloadProgress {
 
 func GetMultiProgress() string {
 	multiMu.RLock()
-	if !multiProgressDirty {
-		cached := cachedMultiProgress
-		multiMu.RUnlock()
-		return cached
-	}
-	multiMu.RUnlock()
+	defer multiMu.RUnlock()
 
-	multiMu.Lock()
-	defer multiMu.Unlock()
-	if !multiProgressDirty {
-		return cachedMultiProgress
-	}
 	jsonBytes, err := json.Marshal(multiProgress)
 	if err != nil {
 		return "{\"items\":{}}"
 	}
-	cachedMultiProgress = string(jsonBytes)
-	multiProgressDirty = false
-	return cachedMultiProgress
+	return string(jsonBytes)
 }
 
 func GetItemProgress(itemID string) string {
@@ -108,7 +90,6 @@ func StartItemProgress(itemID string) {
 		IsDownloading: true,
 		Status:        "downloading",
 	}
-	markMultiProgressDirtyLocked()
 }
 
 func SetItemBytesTotal(itemID string, total int64) {
@@ -117,7 +98,6 @@ func SetItemBytesTotal(itemID string, total int64) {
 
 	if item, ok := multiProgress.Items[itemID]; ok {
 		item.BytesTotal = total
-		markMultiProgressDirtyLocked()
 	}
 }
 
@@ -130,7 +110,6 @@ func SetItemBytesReceived(itemID string, received int64) {
 		if item.BytesTotal > 0 {
 			item.Progress = float64(received) / float64(item.BytesTotal)
 		}
-		markMultiProgressDirtyLocked()
 	}
 }
 
@@ -144,7 +123,6 @@ func SetItemBytesReceivedWithSpeed(itemID string, received int64, speedMBps floa
 		if item.BytesTotal > 0 {
 			item.Progress = float64(received) / float64(item.BytesTotal)
 		}
-		markMultiProgressDirtyLocked()
 	}
 }
 
@@ -156,7 +134,6 @@ func CompleteItemProgress(itemID string) {
 		item.Progress = 1.0
 		item.IsDownloading = false
 		item.Status = "completed"
-		markMultiProgressDirtyLocked()
 	}
 }
 
@@ -172,7 +149,6 @@ func SetItemProgress(itemID string, progress float64, bytesReceived, bytesTotal
 		if bytesTotal > 0 {
 			item.BytesTotal = bytesTotal
 		}
-		markMultiProgressDirtyLocked()
 	}
 }
 
@@ -183,7 +159,6 @@ func SetItemFinalizing(itemID string) {
 	if item, ok := multiProgress.Items[itemID]; ok {
 		item.Progress = 1.0
 		item.Status = "finalizing"
-		markMultiProgressDirtyLocked()
 	}
 }
 
@@ -192,7 +167,6 @@ func RemoveItemProgress(itemID string) {
 	defer multiMu.Unlock()
 
 	delete(multiProgress.Items, itemID)
-	markMultiProgressDirtyLocked()
 }
 
 func ClearAllItemProgress() {
@@ -200,7 +174,6 @@ func ClearAllItemProgress() {
 	defer multiMu.Unlock()
 
 	multiProgress.Items = make(map[string]*ItemProgress)
-	markMultiProgressDirtyLocked()
 }
 
 func setDownloadDir(path string) error {

go_backend/qobuz_test.go

@@ -1,98 +1,6 @@
 package gobackend
 
-import (
-	"encoding/json"
-	"testing"
-)
-
-func TestParseQobuzURL(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		wantType  string
-		wantID    string
-		expectErr bool
-	}{
-		{
-			name:     "store album url",
-			input:    "https://www.qobuz.com/us-en/album/harry-styles-harry-styles/0886446451985",
-			wantType: "album",
-			wantID:   "0886446451985",
-		},
-		{
-			name:     "store playlist url",
-			input:    "https://www.qobuz.com/us-en/playlists/new-releases/2049430",
-			wantType: "playlist",
-			wantID:   "2049430",
-		},
-		{
-			name:     "store artist url",
-			input:    "https://www.qobuz.com/us-en/interpreter/harry-styles/729886",
-			wantType: "artist",
-			wantID:   "729886",
-		},
-		{
-			name:     "play track url",
-			input:    "https://play.qobuz.com/track/40681594",
-			wantType: "track",
-			wantID:   "40681594",
-		},
-		{
-			name:     "custom scheme playlist url",
-			input:    "qobuzapp://playlist/2049430",
-			wantType: "playlist",
-			wantID:   "2049430",
-		},
-		{
-			name:      "unsupported url",
-			input:     "https://example.com/not-qobuz",
-			expectErr: true,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			gotType, gotID, err := parseQobuzURL(test.input)
-			if test.expectErr {
-				if err == nil {
-					t.Fatalf("expected error, got none")
-				}
-				return
-			}
-			if err != nil {
-				t.Fatalf("expected no error, got %v", err)
-			}
-			if gotType != test.wantType || gotID != test.wantID {
-				t.Fatalf("parseQobuzURL(%q) = (%q, %q), want (%q, %q)", test.input, gotType, gotID, test.wantType, test.wantID)
-			}
-		})
-	}
-}
-
-func TestExtractQobuzArtistAlbumIDs(t *testing.T) {
-	body := []byte(`
-<div class="product__item">
-  <button data-itemtype="album" data-itemId="yrpbt0lwm3g0y"></button>
-</div>
-<div class="product__item">
-  <button data-itemtype="album" data-itemId="yrpbt0lwm3g0y"></button>
-</div>
-<div class="product__item">
-  <button data-itemtype="album" data-itemId="0886446451985"></button>
-</div>
-`)
-
-	matches := qobuzArtistAlbumIDRegex.FindAllSubmatch(body, -1)
-	if len(matches) != 3 {
-		t.Fatalf("expected 3 regex matches, got %d", len(matches))
-	}
-	if string(matches[0][1]) != "yrpbt0lwm3g0y" {
-		t.Fatalf("unexpected first album id: %q", matches[0][1])
-	}
-	if string(matches[2][1]) != "0886446451985" {
-		t.Fatalf("unexpected last album id: %q", matches[2][1])
-	}
-}
+import "testing"
 
 func TestExtractQobuzDownloadURLFromBody(t *testing.T) {
 	t.Run("reads top-level download_url and quality metadata", func(t *testing.T) {
@@ -198,56 +106,16 @@ func TestGetQobuzDebugKey(t *testing.T) {
 	}
 }
 
-func TestBuildQobuzMusicDLPayloadUsesOpenTrackURL(t *testing.T) {
-	payloadBytes, err := buildQobuzMusicDLPayload(374610875, "7")
-	if err != nil {
-		t.Fatalf("buildQobuzMusicDLPayload returned error: %v", err)
-	}
-
-	var payload map[string]any
-	if err := json.Unmarshal(payloadBytes, &payload); err != nil {
-		t.Fatalf("payload is not valid JSON: %v", err)
-	}
-
-	if got := payload["url"]; got != "https://open.qobuz.com/track/374610875" {
-		t.Fatalf("payload url = %v, want open.qobuz.com track URL", got)
-	}
-	if got := payload["quality"]; got != "hi-res" {
-		t.Fatalf("payload quality = %v, want hi-res", got)
-	}
-	if got := payload["upload_to_r2"]; got != false {
-		t.Fatalf("payload upload_to_r2 = %v, want false", got)
-	}
-}
-
-func TestExtractQobuzAlbumIDsFromArtistHTML(t *testing.T) {
-	body := []byte(`
-		<button data-itemtype="album" data-itemId="0886446451985"></button>
-		<button data-itemtype="album" data-itemId="0886446451985"></button>
-		<button data-itemtype="album" data-itemId="pvv406bth40ya"></button>
-	`)
-
-	got := extractQobuzAlbumIDsFromArtistHTML(body)
-	if len(got) != 2 {
-		t.Fatalf("expected 2 unique album IDs, got %d (%v)", len(got), got)
-	}
-	if got[0] != "0886446451985" || got[1] != "pvv406bth40ya" {
-		t.Fatalf("unexpected album IDs: %v", got)
-	}
-}
-
 func TestQobuzAvailableProviders(t *testing.T) {
 	providers := NewQobuzDownloader().GetAvailableProviders()
-	if len(providers) != 5 {
-		t.Fatalf("expected 5 Qobuz providers, got %d", len(providers))
+	if len(providers) != 3 {
+		t.Fatalf("expected 3 Qobuz providers, got %d", len(providers))
 	}
 
 	want := map[string]string{
 		"musicdl":  qobuzAPIKindMusicDL,
 		"dabmusic": qobuzAPIKindStandard,
 		"deeb":     qobuzAPIKindStandard,
-		"qbz":      qobuzAPIKindStandard,
-		"squid":    qobuzAPIKindStandard,
 	}
 
 	for _, provider := range providers {
@@ -265,174 +133,3 @@ func TestQobuzAvailableProviders(t *testing.T) {
 		t.Fatalf("missing providers: %v", want)
 	}
 }
-
-func testQobuzTrack(id int64, title, artist string, duration int) *QobuzTrack {
-	track := &QobuzTrack{
-		ID:       id,
-		Title:    title,
-		Duration: duration,
-	}
-	track.Performer.Name = artist
-	return track
-}
-
-func TestResolveQobuzTrackForRequestRejectsSongLinkMismatch(t *testing.T) {
-	origGetTrackByID := qobuzGetTrackByIDFunc
-	origSearchISRC := qobuzSearchTrackByISRCWithDurationFunc
-	origSearchMetadata := qobuzSearchTrackByMetadataWithDurationFunc
-	origSongLinkCheck := songLinkCheckTrackAvailabilityFunc
-	t.Cleanup(func() {
-		qobuzGetTrackByIDFunc = origGetTrackByID
-		qobuzSearchTrackByISRCWithDurationFunc = origSearchISRC
-		qobuzSearchTrackByMetadataWithDurationFunc = origSearchMetadata
-		songLinkCheckTrackAvailabilityFunc = origSongLinkCheck
-		GetTrackIDCache().Clear()
-	})
-	GetTrackIDCache().Clear()
-
-	qobuzGetTrackByIDFunc = func(_ *QobuzDownloader, trackID int64) (*QobuzTrack, error) {
-		if trackID != 111 {
-			t.Fatalf("unexpected track ID lookup: %d", trackID)
-		}
-		return testQobuzTrack(111, "Aperture", "Harry Styles", 180), nil
-	}
-	qobuzSearchTrackByISRCWithDurationFunc = func(_ *QobuzDownloader, isrc string, expectedDurationSec int) (*QobuzTrack, error) {
-		if isrc != "TESTISRC1" {
-			t.Fatalf("unexpected ISRC lookup: %q", isrc)
-		}
-		if expectedDurationSec != 180 {
-			t.Fatalf("unexpected duration: %d", expectedDurationSec)
-		}
-		return testQobuzTrack(222, "Taste Back", "Harry Styles", 180), nil
-	}
-	qobuzSearchTrackByMetadataWithDurationFunc = func(_ *QobuzDownloader, _, _ string, _ int) (*QobuzTrack, error) {
-		t.Fatal("metadata fallback should not run when ISRC fallback succeeds")
-		return nil, nil
-	}
-	songLinkCheckTrackAvailabilityFunc = func(_ *SongLinkClient, spotifyTrackID string, isrc string) (*TrackAvailability, error) {
-		if spotifyTrackID != "spotify-track-id" {
-			t.Fatalf("unexpected spotify ID: %q", spotifyTrackID)
-		}
-		if isrc != "TESTISRC1" {
-			t.Fatalf("unexpected SongLink ISRC: %q", isrc)
-		}
-		return &TrackAvailability{QobuzID: "111"}, nil
-	}
-
-	req := DownloadRequest{
-		ISRC:       "TESTISRC1",
-		SpotifyID:  "spotify-track-id",
-		TrackName:  "Taste Back",
-		ArtistName: "Harry Styles",
-		DurationMS: 180000,
-	}
-
-	track, err := resolveQobuzTrackForRequest(req, &QobuzDownloader{}, "Test")
-	if err != nil {
-		t.Fatalf("expected no error, got %v", err)
-	}
-	if track == nil || track.ID != 222 || track.Title != "Taste Back" {
-		t.Fatalf("unexpected resolved track: %+v", track)
-	}
-
-	cached := GetTrackIDCache().Get(req.ISRC)
-	if cached == nil || cached.QobuzTrackID != 222 {
-		t.Fatalf("expected validated fallback track to be cached, got %+v", cached)
-	}
-}
-
-func TestResolveQobuzTrackForRequestRejectsOdesliMismatch(t *testing.T) {
-	origGetTrackByID := qobuzGetTrackByIDFunc
-	origSearchISRC := qobuzSearchTrackByISRCWithDurationFunc
-	origSearchMetadata := qobuzSearchTrackByMetadataWithDurationFunc
-	origSongLinkCheck := songLinkCheckTrackAvailabilityFunc
-	t.Cleanup(func() {
-		qobuzGetTrackByIDFunc = origGetTrackByID
-		qobuzSearchTrackByISRCWithDurationFunc = origSearchISRC
-		qobuzSearchTrackByMetadataWithDurationFunc = origSearchMetadata
-		songLinkCheckTrackAvailabilityFunc = origSongLinkCheck
-	})
-
-	qobuzGetTrackByIDFunc = func(_ *QobuzDownloader, trackID int64) (*QobuzTrack, error) {
-		if trackID != 333 {
-			t.Fatalf("unexpected track ID lookup: %d", trackID)
-		}
-		return testQobuzTrack(333, "American Girls", "Harry Styles", 181), nil
-	}
-	qobuzSearchTrackByISRCWithDurationFunc = func(_ *QobuzDownloader, _ string, _ int) (*QobuzTrack, error) {
-		t.Fatal("ISRC fallback should not run without an ISRC")
-		return nil, nil
-	}
-	qobuzSearchTrackByMetadataWithDurationFunc = func(_ *QobuzDownloader, trackName, artistName string, expectedDurationSec int) (*QobuzTrack, error) {
-		if trackName != "Taste Back" || artistName != "Harry Styles" || expectedDurationSec != 181 {
-			t.Fatalf("unexpected metadata fallback arguments: %q / %q / %d", trackName, artistName, expectedDurationSec)
-		}
-		return testQobuzTrack(444, "Taste Back", "Harry Styles", 181), nil
-	}
-	songLinkCheckTrackAvailabilityFunc = func(_ *SongLinkClient, _, _ string) (*TrackAvailability, error) {
-		t.Fatal("SongLink should not run when Odesli QobuzID is provided")
-		return nil, nil
-	}
-
-	req := DownloadRequest{
-		QobuzID:    "333",
-		TrackName:  "Taste Back",
-		ArtistName: "Harry Styles",
-		DurationMS: 181000,
-	}
-
-	track, err := resolveQobuzTrackForRequest(req, &QobuzDownloader{}, "Test")
-	if err != nil {
-		t.Fatalf("expected no error, got %v", err)
-	}
-	if track == nil || track.ID != 444 || track.Title != "Taste Back" {
-		t.Fatalf("unexpected resolved track: %+v", track)
-	}
-}
-
-func TestResolveQobuzTrackForRequestUsesPrefixedQobuzIDWithoutSongLink(t *testing.T) {
-	origGetTrackByID := qobuzGetTrackByIDFunc
-	origSearchISRC := qobuzSearchTrackByISRCWithDurationFunc
-	origSearchMetadata := qobuzSearchTrackByMetadataWithDurationFunc
-	origSongLinkCheck := songLinkCheckTrackAvailabilityFunc
-	t.Cleanup(func() {
-		qobuzGetTrackByIDFunc = origGetTrackByID
-		qobuzSearchTrackByISRCWithDurationFunc = origSearchISRC
-		qobuzSearchTrackByMetadataWithDurationFunc = origSearchMetadata
-		songLinkCheckTrackAvailabilityFunc = origSongLinkCheck
-	})
-
-	qobuzGetTrackByIDFunc = func(_ *QobuzDownloader, trackID int64) (*QobuzTrack, error) {
-		if trackID != 40681594 {
-			t.Fatalf("unexpected track ID lookup: %d", trackID)
-		}
-		return testQobuzTrack(40681594, "Sign of the Times", "Harry Styles", 341), nil
-	}
-	qobuzSearchTrackByISRCWithDurationFunc = func(_ *QobuzDownloader, _ string, _ int) (*QobuzTrack, error) {
-		t.Fatal("ISRC fallback should not run when request qobuz id succeeds")
-		return nil, nil
-	}
-	qobuzSearchTrackByMetadataWithDurationFunc = func(_ *QobuzDownloader, _, _ string, _ int) (*QobuzTrack, error) {
-		t.Fatal("metadata fallback should not run when request qobuz id succeeds")
-		return nil, nil
-	}
-	songLinkCheckTrackAvailabilityFunc = func(_ *SongLinkClient, _, _ string) (*TrackAvailability, error) {
-		t.Fatal("SongLink should not run when request qobuz id is provided")
-		return nil, nil
-	}
-
-	req := DownloadRequest{
-		QobuzID:    "qobuz:40681594",
-		TrackName:  "Sign of the Times",
-		ArtistName: "Harry Styles",
-		DurationMS: 341000,
-	}
-
-	track, err := resolveQobuzTrackForRequest(req, &QobuzDownloader{}, "Test")
-	if err != nil {
-		t.Fatalf("expected no error, got %v", err)
-	}
-	if track == nil || track.ID != 40681594 {
-		t.Fatalf("unexpected resolved track: %+v", track)
-	}
-}

go_backend/security_hardening_test.go

@@ -0,0 +1,80 @@
+package gobackend
+
+import (
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+func TestSanitizeSensitiveLogText(t *testing.T) {
+	input := "access_token=abc123 Authorization:Bearer xyz456 https://api.example.com/cb?refresh_token=zzz"
+	redacted := sanitizeSensitiveLogText(input)
+
+	if strings.Contains(redacted, "abc123") || strings.Contains(redacted, "xyz456") || strings.Contains(redacted, "zzz") {
+		t.Fatalf("expected sensitive values to be redacted, got: %s", redacted)
+	}
+	if !strings.Contains(redacted, "[REDACTED]") {
+		t.Fatalf("expected redaction marker in output, got: %s", redacted)
+	}
+}
+
+func TestValidateExtensionAuthURL(t *testing.T) {
+	if err := validateExtensionAuthURL("https://accounts.example.com/oauth/authorize"); err != nil {
+		t.Fatalf("expected valid auth URL, got error: %v", err)
+	}
+
+	blocked := []string{
+		"http://accounts.example.com/oauth/authorize",
+		"https://user:pass@accounts.example.com/oauth/authorize",
+		"https://localhost/oauth/authorize",
+	}
+
+	for _, rawURL := range blocked {
+		if err := validateExtensionAuthURL(rawURL); err == nil {
+			t.Fatalf("expected URL to be blocked: %s", rawURL)
+		}
+	}
+}
+
+func TestValidateDomainRejectsEmbeddedCredentials(t *testing.T) {
+	ext := &LoadedExtension{
+		ID: "test-ext",
+		Manifest: &ExtensionManifest{
+			Name: "test-ext",
+			Permissions: ExtensionPermissions{
+				Network: []string{"api.example.com"},
+			},
+		},
+		DataDir: t.TempDir(),
+	}
+
+	runtime := NewExtensionRuntime(ext)
+	if err := runtime.validateDomain("https://user:pass@api.example.com/resource"); err == nil {
+		t.Fatal("expected embedded URL credentials to be rejected")
+	}
+}
+
+func TestBuildStoreExtensionDestPath(t *testing.T) {
+	baseDir := t.TempDir()
+
+	destPath, err := buildStoreExtensionDestPath(baseDir, "../evil/name")
+	if err != nil {
+		t.Fatalf("expected sanitized path to be generated, got error: %v", err)
+	}
+
+	if !isPathWithinBase(baseDir, destPath) {
+		t.Fatalf("expected destination path to remain under base dir: %s", destPath)
+	}
+
+	baseName := filepath.Base(destPath)
+	if strings.Contains(baseName, "/") || strings.Contains(baseName, `\`) {
+		t.Fatalf("expected filename to be sanitized, got: %s", baseName)
+	}
+	if !strings.HasSuffix(baseName, ".spotiflac-ext") {
+		t.Fatalf("expected .spotiflac-ext suffix, got: %s", baseName)
+	}
+
+	if _, err := buildStoreExtensionDestPath(baseDir, "   "); err == nil {
+		t.Fatal("expected empty extension id to be rejected")
+	}
+}

go_backend/songlink.go

@@ -1,7 +1,6 @@
 package gobackend
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -15,10 +14,6 @@ type SongLinkClient struct {
 	client *http.Client
 }
 
-type songLinkPlatformLink struct {
-	URL string `json:"url"`
-}
-
 type TrackAvailability struct {
 	SpotifyID  string `json:"spotify_id"`
 	Tidal      bool   `json:"tidal"`
@@ -48,7 +43,6 @@ var (
 	songLinkCheckAvailabilityFromDeezer = func(s *SongLinkClient, deezerTrackID string) (*TrackAvailability, error) {
 		return s.CheckAvailabilityFromDeezer(deezerTrackID)
 	}
-	songLinkRetryConfig = DefaultRetryConfig
 )
 
 func NewSongLinkClient() *SongLinkClient {
@@ -136,14 +130,7 @@ func (s *SongLinkClient) CheckTrackAvailability(spotifyTrackID string, isrc stri
 }
 
 func (s *SongLinkClient) checkTrackAvailabilityFromSpotify(spotifyTrackID string) (*TrackAvailability, error) {
-	availability, pageErr := s.checkTrackAvailabilityFromSpotifyPage(spotifyTrackID)
-	if pageErr == nil {
-		return availability, nil
-	}
-
-	if !songLinkRateLimiter.TryAcquire() {
-		return nil, fmt.Errorf("song.link page lookup failed: %w (SongLink local rate limit exceeded)", pageErr)
-	}
+	songLinkRateLimiter.WaitForSlot()
 
 	spotifyURL := fmt.Sprintf("https://open.spotify.com/track/%s", spotifyTrackID)
 	apiURL := buildSongLinkURLFromTarget(spotifyURL, "")
@@ -153,10 +140,10 @@ func (s *SongLinkClient) checkTrackAvailabilityFromSpotify(spotifyTrackID string
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	retryConfig := songLinkRetryConfig()
+	retryConfig := DefaultRetryConfig()
 	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
 	if err != nil {
-		return nil, fmt.Errorf("song.link page lookup failed: %w; SongLink API lookup failed: %w", pageErr, err)
+		return nil, fmt.Errorf("failed to check availability: %w", err)
 	}
 	defer resp.Body.Close()
 
@@ -167,10 +154,10 @@ func (s *SongLinkClient) checkTrackAvailabilityFromSpotify(spotifyTrackID string
 		return nil, fmt.Errorf("track not found on any streaming platform")
 	}
 	if resp.StatusCode == 429 {
-		return nil, fmt.Errorf("song.link page lookup failed: %w; SongLink API rate limit exceeded", pageErr)
+		return nil, fmt.Errorf("SongLink rate limit exceeded")
 	}
 	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("song.link page lookup failed: %w; SongLink API returned status %d", pageErr, resp.StatusCode)
+		return nil, fmt.Errorf("SongLink API returned status %d", resp.StatusCode)
 	}
 
 	body, err := ReadResponseBody(resp)
@@ -179,102 +166,59 @@ func (s *SongLinkClient) checkTrackAvailabilityFromSpotify(spotifyTrackID string
 	}
 
 	var songLinkResp struct {
-		LinksByPlatform map[string]songLinkPlatformLink `json:"linksByPlatform"`
+		LinksByPlatform map[string]struct {
+			URL string `json:"url"`
+		} `json:"linksByPlatform"`
 	}
 
 	if err := json.Unmarshal(body, &songLinkResp); err != nil {
 		return nil, fmt.Errorf("failed to decode response: %w", err)
 	}
 
-	LogWarn("SongLink", "Spotify %s resolved via SongLink API after song.link page failure: %v", spotifyTrackID, pageErr)
-	return buildTrackAvailabilityFromSongLinkLinks(spotifyTrackID, songLinkResp.LinksByPlatform), nil
-}
-
-func (s *SongLinkClient) checkTrackAvailabilityFromSpotifyPage(spotifyTrackID string) (*TrackAvailability, error) {
-	pageURL := fmt.Sprintf("https://song.link/s/%s", spotifyTrackID)
-	req, err := http.NewRequest("GET", pageURL, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create song.link page request: %w", err)
+	availability := &TrackAvailability{
+		SpotifyID: spotifyTrackID,
 	}
 
-	req.Header.Set("Accept", "text/html,application/xhtml+xml")
-	req.Header.Set("User-Agent", getRandomUserAgent())
-
-	resp, err := s.client.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch song.link page: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode == 404 {
-		return nil, fmt.Errorf("track not found on song.link page")
-	}
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("song.link page returned status %d", resp.StatusCode)
+	if tidalLink, ok := songLinkResp.LinksByPlatform["tidal"]; ok && tidalLink.URL != "" {
+		availability.Tidal = true
+		availability.TidalURL = tidalLink.URL
+		availability.TidalID = extractTidalIDFromURL(tidalLink.URL)
 	}
 
-	body, err := ReadResponseBody(resp)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read song.link page: %w", err)
+	if amazonLink, ok := songLinkResp.LinksByPlatform["amazonMusic"]; ok && amazonLink.URL != "" {
+		availability.Amazon = true
+		availability.AmazonURL = amazonLink.URL
 	}
 
-	nextDataJSON, err := extractSongLinkNextDataJSON(body)
-	if err != nil {
-		return nil, err
+	if deezerLink, ok := songLinkResp.LinksByPlatform["deezer"]; ok && deezerLink.URL != "" {
+		availability.Deezer = true
+		availability.DeezerURL = deezerLink.URL
+		availability.DeezerID = extractDeezerIDFromURL(deezerLink.URL)
 	}
 
-	var pageData struct {
-		Props struct {
-			PageProps struct {
-				PageData struct {
-					Sections []struct {
-						Links []struct {
-							Platform string `json:"platform"`
-							URL      string `json:"url"`
-							Show     bool   `json:"show"`
-						} `json:"links"`
-					} `json:"sections"`
-				} `json:"pageData"`
-			} `json:"pageProps"`
-		} `json:"props"`
-	}
-	if err := json.Unmarshal(nextDataJSON, &pageData); err != nil {
-		return nil, fmt.Errorf("failed to decode song.link page data: %w", err)
+	if qobuzLink, ok := songLinkResp.LinksByPlatform["qobuz"]; ok && qobuzLink.URL != "" {
+		availability.Qobuz = true
+		availability.QobuzURL = qobuzLink.URL
+		availability.QobuzID = extractQobuzIDFromURL(qobuzLink.URL)
 	}
 
-	linksByPlatform := make(map[string]songLinkPlatformLink)
-	for _, section := range pageData.Props.PageProps.PageData.Sections {
-		for _, link := range section.Links {
-			if !link.Show || strings.TrimSpace(link.URL) == "" {
-				continue
-			}
-			linksByPlatform[link.Platform] = songLinkPlatformLink{URL: link.URL}
+	// Prefer youtubeMusic URLs — they bypass Cobalt login requirements
+	if ytMusicLink, ok := songLinkResp.LinksByPlatform["youtubeMusic"]; ok && ytMusicLink.URL != "" {
+		availability.YouTube = true
+		availability.YouTubeURL = ytMusicLink.URL
+		availability.YouTubeID = extractYouTubeIDFromURL(ytMusicLink.URL)
+	}
+
+	// Fallback to regular youtube if youtubeMusic not available
+	if !availability.YouTube {
+		if youtubeLink, ok := songLinkResp.LinksByPlatform["youtube"]; ok && youtubeLink.URL != "" {
+			availability.YouTube = true
+			availability.YouTubeURL = youtubeLink.URL
+			availability.YouTubeID = extractYouTubeIDFromURL(youtubeLink.URL)
 		}
 	}
 
-	if len(linksByPlatform) == 0 {
-		return nil, fmt.Errorf("song.link page contained no usable platform links")
-	}
-
-	return buildTrackAvailabilityFromSongLinkLinks(spotifyTrackID, linksByPlatform), nil
-}
-
-func extractSongLinkNextDataJSON(body []byte) ([]byte, error) {
-	const startMarker = `<script id="__NEXT_DATA__" type="application/json">`
-	const endMarker = `</script>`
-
-	start := bytes.Index(body, []byte(startMarker))
-	if start < 0 {
-		return nil, fmt.Errorf("song.link page missing __NEXT_DATA__")
-	}
-	start += len(startMarker)
-
-	end := bytes.Index(body[start:], []byte(endMarker))
-	if end < 0 {
-		return nil, fmt.Errorf("song.link page has unterminated __NEXT_DATA__")
-	}
-
-	return body[start : start+end], nil
+	return availability, nil
 }
 
 func (s *SongLinkClient) checkTrackAvailabilityFromISRC(isrc string) (*TrackAvailability, error) {
@@ -515,7 +459,7 @@ func (s *SongLinkClient) CheckAlbumAvailability(spotifyAlbumID string) (*AlbumAv
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	retryConfig := songLinkRetryConfig()
+	retryConfig := DefaultRetryConfig()
 	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to check album availability: %w", err)
@@ -598,7 +542,7 @@ func (s *SongLinkClient) checkAvailabilityFromDeezerSongLink(deezerTrackID strin
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	retryConfig := songLinkRetryConfig()
+	retryConfig := DefaultRetryConfig()
 	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to check availability: %w", err)
@@ -703,7 +647,7 @@ func (s *SongLinkClient) CheckAvailabilityByPlatform(platform, entityType, entit
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	retryConfig := songLinkRetryConfig()
+	retryConfig := DefaultRetryConfig()
 	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to check availability: %w", err)
@@ -784,51 +728,6 @@ func (s *SongLinkClient) CheckAvailabilityByPlatform(platform, entityType, entit
 	return availability, nil
 }
 
-func buildTrackAvailabilityFromSongLinkLinks(spotifyTrackID string, links map[string]songLinkPlatformLink) *TrackAvailability {
-	availability := &TrackAvailability{
-		SpotifyID: spotifyTrackID,
-	}
-
-	if availability.SpotifyID == "" {
-		if spotifyLink, ok := links["spotify"]; ok && spotifyLink.URL != "" {
-			availability.SpotifyID = extractSpotifyIDFromURL(spotifyLink.URL)
-		}
-	}
-	if tidalLink, ok := links["tidal"]; ok && tidalLink.URL != "" {
-		availability.Tidal = true
-		availability.TidalURL = tidalLink.URL
-		availability.TidalID = extractTidalIDFromURL(tidalLink.URL)
-	}
-	if amazonLink, ok := links["amazonMusic"]; ok && amazonLink.URL != "" {
-		availability.Amazon = true
-		availability.AmazonURL = amazonLink.URL
-	}
-	if qobuzLink, ok := links["qobuz"]; ok && qobuzLink.URL != "" {
-		availability.Qobuz = true
-		availability.QobuzURL = qobuzLink.URL
-		availability.QobuzID = extractQobuzIDFromURL(qobuzLink.URL)
-	}
-	if deezerLink, ok := links["deezer"]; ok && deezerLink.URL != "" {
-		availability.Deezer = true
-		availability.DeezerURL = deezerLink.URL
-		availability.DeezerID = extractDeezerIDFromURL(deezerLink.URL)
-	}
-	if ytMusicLink, ok := links["youtubeMusic"]; ok && ytMusicLink.URL != "" {
-		availability.YouTube = true
-		availability.YouTubeURL = ytMusicLink.URL
-		availability.YouTubeID = extractYouTubeIDFromURL(ytMusicLink.URL)
-	}
-	if !availability.YouTube {
-		if youtubeLink, ok := links["youtube"]; ok && youtubeLink.URL != "" {
-			availability.YouTube = true
-			availability.YouTubeURL = youtubeLink.URL
-			availability.YouTubeID = extractYouTubeIDFromURL(youtubeLink.URL)
-		}
-	}
-
-	return availability
-}
-
 func extractSpotifyIDFromURL(spotifyURL string) string {
 	parts := strings.Split(spotifyURL, "/track/")
 	if len(parts) > 1 {
@@ -903,7 +802,7 @@ func (s *SongLinkClient) CheckAvailabilityFromURL(inputURL string) (*TrackAvaila
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	retryConfig := songLinkRetryConfig()
+	retryConfig := DefaultRetryConfig()
 	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to check availability: %w", err)

go_backend/songlink_test.go

@@ -1,127 +0,0 @@
-package gobackend
-
-import (
-	"io"
-	"net/http"
-	"strings"
-	"testing"
-)
-
-type roundTripFunc func(*http.Request) (*http.Response, error)
-
-func (fn roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return fn(req)
-}
-
-func TestGetRetryAfterDurationMissingHeaderReturnsZero(t *testing.T) {
-	resp := &http.Response{
-		Header: make(http.Header),
-	}
-
-	if got := getRetryAfterDuration(resp); got != 0 {
-		t.Fatalf("getRetryAfterDuration() = %v, want 0", got)
-	}
-}
-
-func TestCheckTrackAvailabilityFromSpotifyPrefersSongLinkPage(t *testing.T) {
-	client := &SongLinkClient{
-		client: &http.Client{
-			Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
-				switch {
-				case req.URL.Host == "api.song.link":
-					t.Fatalf("api.song.link should not be called when song.link page succeeds")
-					return nil, nil
-				case req.URL.Host == "song.link" && req.URL.Path == "/s/testspotifyid":
-					body := `<!DOCTYPE html><html><body><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"pageData":{"sections":[{"displayName":"Listen","links":[{"platform":"spotify","url":"https://open.spotify.com/track/testspotifyid","show":true},{"platform":"deezer","url":"https://www.deezer.com/track/908604612","show":true},{"platform":"amazonMusic","url":"https://music.amazon.com/albums/B086Q2QNLH?trackAsin=B086Q41M9C","show":true},{"platform":"tidal","url":"https://listen.tidal.com/track/134858527","show":true},{"platform":"qobuz","url":"https://open.qobuz.com/track/195125822","show":true},{"platform":"youtubeMusic","url":"https://music.youtube.com/watch?v=testvideoid1","show":true}]}]}}}}</script></body></html>`
-					return &http.Response{
-						StatusCode: 200,
-						Header:     make(http.Header),
-						Body:       io.NopCloser(strings.NewReader(body)),
-						Request:    req,
-					}, nil
-				default:
-					t.Fatalf("unexpected request: %s", req.URL.String())
-					return nil, nil
-				}
-			}),
-		},
-	}
-
-	availability, err := client.CheckTrackAvailability("testspotifyid", "")
-	if err != nil {
-		t.Fatalf("CheckTrackAvailability() error = %v", err)
-	}
-
-	if availability.SpotifyID != "testspotifyid" {
-		t.Fatalf("SpotifyID = %q, want %q", availability.SpotifyID, "testspotifyid")
-	}
-	if !availability.Deezer || availability.DeezerID != "908604612" {
-		t.Fatalf("Deezer availability = %+v, want DeezerID 908604612", availability)
-	}
-	if !availability.Amazon || !availability.Tidal || !availability.Qobuz || !availability.YouTube {
-		t.Fatalf("availability flags = %+v, want Amazon/Tidal/Qobuz/YouTube true", availability)
-	}
-	if availability.YouTubeID != "testvideoid1" {
-		t.Fatalf("YouTubeID = %q, want %q", availability.YouTubeID, "testvideoid1")
-	}
-}
-
-func TestCheckTrackAvailabilityFromSpotifyFallsBackToAPIWhenPageFails(t *testing.T) {
-	origRetryConfig := songLinkRetryConfig
-	songLinkRetryConfig = func() RetryConfig {
-		return RetryConfig{
-			MaxRetries:    0,
-			InitialDelay:  0,
-			MaxDelay:      0,
-			BackoffFactor: 1,
-		}
-	}
-	defer func() {
-		songLinkRetryConfig = origRetryConfig
-	}()
-
-	client := &SongLinkClient{
-		client: &http.Client{
-			Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
-				switch {
-				case req.URL.Host == "song.link" && req.URL.Path == "/s/testspotifyid":
-					return &http.Response{
-						StatusCode: 500,
-						Header:     make(http.Header),
-						Body:       io.NopCloser(strings.NewReader("page failure")),
-						Request:    req,
-					}, nil
-				case req.URL.Host == "api.song.link":
-					body := `{"linksByPlatform":{"spotify":{"url":"https://open.spotify.com/track/testspotifyid"},"deezer":{"url":"https://www.deezer.com/track/908604612"},"amazonMusic":{"url":"https://music.amazon.com/albums/B086Q2QNLH?trackAsin=B086Q41M9C"},"tidal":{"url":"https://listen.tidal.com/track/134858527"},"qobuz":{"url":"https://open.qobuz.com/track/195125822"},"youtubeMusic":{"url":"https://music.youtube.com/watch?v=testvideoid1"}}}`
-					return &http.Response{
-						StatusCode: 200,
-						Header:     make(http.Header),
-						Body:       io.NopCloser(strings.NewReader(body)),
-						Request:    req,
-					}, nil
-				default:
-					t.Fatalf("unexpected request: %s", req.URL.String())
-					return nil, nil
-				}
-			}),
-		},
-	}
-
-	availability, err := client.CheckTrackAvailability("testspotifyid", "")
-	if err != nil {
-		t.Fatalf("CheckTrackAvailability() error = %v", err)
-	}
-
-	if availability.SpotifyID != "testspotifyid" {
-		t.Fatalf("SpotifyID = %q, want %q", availability.SpotifyID, "testspotifyid")
-	}
-	if !availability.Deezer || availability.DeezerID != "908604612" {
-		t.Fatalf("Deezer availability = %+v, want DeezerID 908604612", availability)
-	}
-	if !availability.Amazon || !availability.Tidal || !availability.Qobuz || !availability.YouTube {
-		t.Fatalf("availability flags = %+v, want Amazon/Tidal/Qobuz/YouTube true", availability)
-	}
-	if availability.YouTubeID != "testvideoid1" {
-		t.Fatalf("YouTubeID = %q, want %q", availability.YouTubeID, "testvideoid1")
-	}
-}

go_backend/spotfetch_api.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-const DefaultSpotFetchAPIBaseURL = "https://sp.afkarxyz.qzz.io/api"
+const DefaultSpotFetchAPIBaseURL = "https://spotify.afkarxyz.fun/api"
 
 // GetSpotifyDataWithAPI fetches Spotify metadata through SpotFetch-compatible API.
 // This is used as a fallback when direct Spotify API access is blocked/limited.

go_backend/spotify.go

@@ -157,8 +157,6 @@ type AlbumResponsePayload struct {
 }
 
 type PlaylistInfoMetadata struct {
-	Name   string `json:"name,omitempty"`
-	Images string `json:"images,omitempty"`
 	Tracks struct {
 		Total int `json:"total"`
 	} `json:"tracks"`

go_backend/tidal_test.go

@@ -1,222 +0,0 @@
-package gobackend
-
-import "testing"
-
-func TestParseTidalURL(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		wantType  string
-		wantID    string
-		expectErr bool
-	}{
-		{
-			name:     "track url",
-			input:    "https://tidal.com/track/77616174",
-			wantType: "track",
-			wantID:   "77616174",
-		},
-		{
-			name:     "browse album url",
-			input:    "https://listen.tidal.com/browse/album/77616169",
-			wantType: "album",
-			wantID:   "77616169",
-		},
-		{
-			name:     "artist url",
-			input:    "https://www.tidal.com/artist/3852143",
-			wantType: "artist",
-			wantID:   "3852143",
-		},
-		{
-			name:     "playlist url",
-			input:    "https://tidal.com/playlist/edf3b7d2-cb42-41d7-93c0-afa2a395521b",
-			wantType: "playlist",
-			wantID:   "edf3b7d2-cb42-41d7-93c0-afa2a395521b",
-		},
-		{
-			name:      "unsupported host",
-			input:     "https://example.com/track/123",
-			expectErr: true,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			gotType, gotID, err := parseTidalURL(test.input)
-			if test.expectErr {
-				if err == nil {
-					t.Fatalf("expected error, got none")
-				}
-				return
-			}
-			if err != nil {
-				t.Fatalf("expected no error, got %v", err)
-			}
-			if gotType != test.wantType || gotID != test.wantID {
-				t.Fatalf("parseTidalURL(%q) = (%q, %q), want (%q, %q)", test.input, gotType, gotID, test.wantType, test.wantID)
-			}
-		})
-	}
-}
-
-func TestParseTidalRequestTrackID(t *testing.T) {
-	tests := []struct {
-		input string
-		want  int64
-		ok    bool
-	}{
-		{input: "40681594", want: 40681594, ok: true},
-		{input: "tidal:40681594", want: 40681594, ok: true},
-		{input: " tidal:40681594 ", want: 40681594, ok: true},
-		{input: "", want: 0, ok: false},
-		{input: "tidal:not-a-number", want: 0, ok: false},
-	}
-
-	for _, test := range tests {
-		got, ok := parseTidalRequestTrackID(test.input)
-		if got != test.want || ok != test.ok {
-			t.Fatalf("parseTidalRequestTrackID(%q) = (%d, %v), want (%d, %v)", test.input, got, ok, test.want, test.ok)
-		}
-	}
-}
-
-func TestTidalImageURL(t *testing.T) {
-	got := tidalImageURL("fc18a64b-d76b-4582-962a-224cb05193f3", "1280x1280")
-	want := "https://resources.tidal.com/images/fc18a64b/d76b/4582/962a/224cb05193f3/1280x1280.jpg"
-	if got != want {
-		t.Fatalf("tidalImageURL() = %q, want %q", got, want)
-	}
-}
-
-func TestTidalTrackToTrackMetadata(t *testing.T) {
-	track := &TidalTrack{
-		ID:           77616174,
-		Title:        "Bruckner: Symphony No. 5",
-		ISRC:         "GBUM71507433",
-		Duration:     1172,
-		TrackNumber:  5,
-		VolumeNumber: 1,
-		URL:          "http://www.tidal.com/track/77616174",
-	}
-	track.Artist.ID = 3852143
-	track.Artist.Name = "Staatskapelle Berlin"
-	track.Artists = []struct {
-		ID      int64  `json:"id"`
-		Name    string `json:"name"`
-		Type    string `json:"type"`
-		Picture string `json:"picture"`
-	}{
-		{ID: 3852143, Name: "Staatskapelle Berlin", Type: "MAIN"},
-		{ID: 12430, Name: "Daniel Barenboim", Type: "FEATURED"},
-	}
-	track.Album.ID = 77616169
-	track.Album.Title = "Bruckner: Symphonies 4-9"
-	track.Album.Cover = "fc18a64b-d76b-4582-962a-224cb05193f3"
-	track.Album.ReleaseDate = "2016-02-26"
-
-	got := tidalTrackToTrackMetadata(track)
-	if got.SpotifyID != "tidal:77616174" {
-		t.Fatalf("unexpected track ID: %q", got.SpotifyID)
-	}
-	if got.Artists != "Staatskapelle Berlin, Daniel Barenboim" {
-		t.Fatalf("unexpected artists: %q", got.Artists)
-	}
-	if got.AlbumID != "tidal:77616169" {
-		t.Fatalf("unexpected album ID: %q", got.AlbumID)
-	}
-	if got.ArtistID != "tidal:3852143" {
-		t.Fatalf("unexpected artist ID: %q", got.ArtistID)
-	}
-	if got.Images == "" || got.ExternalURL != "https://www.tidal.com/track/77616174" {
-		t.Fatalf("unexpected image/url: %q / %q", got.Images, got.ExternalURL)
-	}
-}
-
-func TestTidalAlbumToArtistAlbum(t *testing.T) {
-	album := &tidalPublicAlbum{
-		ID:             77616169,
-		Title:          "Bruckner: Symphonies 4-9",
-		Type:           "ALBUM",
-		Cover:          "fc18a64b-d76b-4582-962a-224cb05193f3",
-		ReleaseDate:    "2016-02-26",
-		NumberOfTracks: 23,
-		Artists: []tidalPublicArtist{
-			{ID: 3852143, Name: "Staatskapelle Berlin", Type: "MAIN"},
-			{ID: 12430, Name: "Daniel Barenboim", Type: "FEATURED"},
-		},
-	}
-
-	got := tidalAlbumToArtistAlbum(album)
-	if got.ID != "tidal:77616169" {
-		t.Fatalf("unexpected album ID: %q", got.ID)
-	}
-	if got.AlbumType != "album" {
-		t.Fatalf("unexpected album type: %q", got.AlbumType)
-	}
-	if got.Artists != "Staatskapelle Berlin, Daniel Barenboim" {
-		t.Fatalf("unexpected artists: %q", got.Artists)
-	}
-	if got.Images == "" {
-		t.Fatalf("expected image URL, got empty string")
-	}
-}
-
-func TestTidalAlbumToArtistAlbumWithFallbackType(t *testing.T) {
-	album := &tidalPublicAlbum{
-		ID:             490623904,
-		Title:          "LET 'EM KNOW",
-		Cover:          "fc18a64b-d76b-4582-962a-224cb05193f3",
-		NumberOfTracks: 1,
-	}
-
-	got := tidalAlbumToArtistAlbumWithType(album, "single")
-	if got.AlbumType != "single" {
-		t.Fatalf("unexpected fallback album type: %q", got.AlbumType)
-	}
-}
-
-func TestTidalArtistAlbumTypeFromModuleTitle(t *testing.T) {
-	tests := []struct {
-		title string
-		want  string
-	}{
-		{title: "Albums", want: "album"},
-		{title: "EP & Singles", want: "single"},
-		{title: "Compilations", want: "album"},
-		{title: "Appears On", want: "album"},
-		{title: "Unknown", want: ""},
-	}
-
-	for _, test := range tests {
-		if got := tidalArtistAlbumTypeFromModuleTitle(test.title); got != test.want {
-			t.Fatalf("tidalArtistAlbumTypeFromModuleTitle(%q) = %q, want %q", test.title, got, test.want)
-		}
-	}
-}
-
-func TestTidalPlaylistImageUsesOrigin(t *testing.T) {
-	got := tidalImageURL("e6b59fd3-6995-40f0-8a32-174db3a8f4f2", "origin")
-	want := "https://resources.tidal.com/images/e6b59fd3/6995/40f0/8a32/174db3a8f4f2/origin.jpg"
-	if got != want {
-		t.Fatalf("unexpected origin playlist image URL: %q", got)
-	}
-}
-
-func TestTidalPlaylistOwnerName(t *testing.T) {
-	editorial := &tidalPublicPlaylist{Type: "EDITORIAL"}
-	if got := tidalPlaylistOwnerName(editorial); got != "TIDAL" {
-		t.Fatalf("unexpected editorial owner: %q", got)
-	}
-
-	artist := &tidalPublicPlaylist{Type: "ARTIST"}
-	if got := tidalPlaylistOwnerName(artist); got != "Artist" {
-		t.Fatalf("unexpected artist owner: %q", got)
-	}
-
-	user := &tidalPublicPlaylist{}
-	user.Creator.Name = "djtest"
-	if got := tidalPlaylistOwnerName(user); got != "djtest" {
-		t.Fatalf("unexpected creator owner: %q", got)
-	}
-}

go_backend/title_match_utils.go

@@ -3,8 +3,6 @@ package gobackend
 import (
 	"strings"
 	"unicode"
-
-	"golang.org/x/text/unicode/norm"
 )
 
 // normalizeLooseTitle collapses separators/punctuation so titles like
@@ -24,39 +22,11 @@ func normalizeLooseTitle(title string) string {
 			b.WriteRune(r)
 		case unicode.IsSpace(r):
 			b.WriteByte(' ')
+		// Treat common separators as spaces.
 		case r == '/', r == '\\', r == '_', r == '-', r == '|', r == '.', r == '&', r == '+':
 			b.WriteByte(' ')
 		default:
-		}
-	}
-
-	return strings.Join(strings.Fields(b.String()), " ")
-}
-
-// normalizeLooseArtistName folds diacritics and common separators so artist
-// verification is resilient to variants like "Özkent" vs "Ozkent".
-func normalizeLooseArtistName(name string) string {
-	trimmed := strings.TrimSpace(strings.ToLower(name))
-	if trimmed == "" {
-		return ""
-	}
-
-	decomposed := norm.NFD.String(trimmed)
-
-	var b strings.Builder
-	b.Grow(len(decomposed))
-
-	for _, r := range decomposed {
-		switch {
-		case unicode.Is(unicode.Mn, r), unicode.Is(unicode.Mc, r), unicode.Is(unicode.Me, r):
-			continue
-		case unicode.IsLetter(r), unicode.IsNumber(r):
-			b.WriteRune(r)
-		case unicode.IsSpace(r):
-			b.WriteByte(' ')
-		case r == '/', r == '\\', r == '_', r == '-', r == '|', r == '.', r == '&', r == '+':
-			b.WriteByte(' ')
-		default:
+			// Drop other punctuation/symbols (including emoji) for loose matching.
 		}
 	}
 
@@ -98,43 +68,3 @@ func normalizeSymbolOnlyTitle(title string) string {
 
 	return b.String()
 }
-
-// resolvedTrackInfo holds the metadata fetched from a provider for verification.
-type resolvedTrackInfo struct {
-	Title      string
-	ArtistName string
-	Duration   int
-}
-
-// trackMatchesRequest checks whether a resolved track from a provider matches
-// the original download request. Returns true if the track is a plausible match.
-func trackMatchesRequest(req DownloadRequest, resolved resolvedTrackInfo, logPrefix string) bool {
-	if req.ArtistName != "" && resolved.ArtistName != "" &&
-		!artistsMatch(req.ArtistName, resolved.ArtistName) {
-		GoLog("[%s] Verification failed: artist mismatch — expected '%s', got '%s'\n",
-			logPrefix, req.ArtistName, resolved.ArtistName)
-		return false
-	}
-
-	if req.TrackName != "" && resolved.Title != "" &&
-		!titlesMatch(req.TrackName, resolved.Title) {
-		GoLog("[%s] Verification failed: title mismatch — expected '%s', got '%s'\n",
-			logPrefix, req.TrackName, resolved.Title)
-		return false
-	}
-
-	expectedDurationSec := req.DurationMS / 1000
-	if expectedDurationSec > 0 && resolved.Duration > 0 {
-		diff := expectedDurationSec - resolved.Duration
-		if diff < 0 {
-			diff = -diff
-		}
-		if diff > 10 {
-			GoLog("[%s] Verification failed: duration mismatch — expected %ds, got %ds\n",
-				logPrefix, expectedDurationSec, resolved.Duration)
-			return false
-		}
-	}
-
-	return true
-}

go_backend/youtube.go

@@ -0,0 +1,751 @@
+package gobackend
+
+import (
+	"bufio"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+)
+
+type YouTubeDownloader struct {
+	client *http.Client
+	apiURL string
+	mu     sync.Mutex
+}
+
+const spotubeBaseURL = "https://spotubedl.com"
+
+var (
+	globalYouTubeDownloader *YouTubeDownloader
+	youtubeDownloaderOnce   sync.Once
+)
+
+type YouTubeQuality string
+
+const (
+	YouTubeQualityOpus256 YouTubeQuality = "opus_256"
+	YouTubeQualityOpus128 YouTubeQuality = "opus_128"
+	YouTubeQualityMP3128  YouTubeQuality = "mp3_128"
+	YouTubeQualityMP3256  YouTubeQuality = "mp3_256"
+	YouTubeQualityMP3320  YouTubeQuality = "mp3_320"
+)
+
+var (
+	youtubeOpusSupportedBitrates = []int{128, 256}
+	youtubeMp3SupportedBitrates  = []int{128, 256, 320}
+)
+
+type CobaltRequest struct {
+	URL             string `json:"url"`
+	AudioBitrate    string `json:"audioBitrate,omitempty"`
+	AudioFormat     string `json:"audioFormat,omitempty"`
+	DownloadMode    string `json:"downloadMode,omitempty"`
+	FilenameStyle   string `json:"filenameStyle,omitempty"`
+	DisableMetadata bool   `json:"disableMetadata,omitempty"`
+}
+
+type CobaltResponse struct {
+	Status   string `json:"status"`
+	URL      string `json:"url,omitempty"`
+	Filename string `json:"filename,omitempty"`
+	Error    *struct {
+		Code    string `json:"code"`
+		Context *struct {
+			Service string `json:"service,omitempty"`
+			Limit   int    `json:"limit,omitempty"`
+		} `json:"context,omitempty"`
+	} `json:"error,omitempty"`
+}
+
+type YouTubeDownloadResult struct {
+	FilePath    string
+	Title       string
+	Artist      string
+	Album       string
+	ReleaseDate string
+	TrackNumber int
+	DiscNumber  int
+	ISRC        string
+	Format      string // "opus" or "mp3"
+	Bitrate     int
+	LyricsLRC   string
+	CoverData   []byte
+}
+
+func NewYouTubeDownloader() *YouTubeDownloader {
+	youtubeDownloaderOnce.Do(func() {
+		globalYouTubeDownloader = &YouTubeDownloader{
+			client: NewHTTPClientWithTimeout(120 * time.Second),
+			apiURL: "https://api.qwkuns.me",
+		}
+	})
+	return globalYouTubeDownloader
+}
+
+func extractBitrateFromQuality(raw string, defaultBitrate int) int {
+	parts := strings.FieldsFunc(raw, func(r rune) bool {
+		return (r < '0' || r > '9')
+	})
+	for i := len(parts) - 1; i >= 0; i-- {
+		part := parts[i]
+		if part == "" {
+			continue
+		}
+		if parsed, err := strconv.Atoi(part); err == nil {
+			return parsed
+		}
+	}
+	return defaultBitrate
+}
+
+func nearestSupportedBitrate(value int, supported []int) int {
+	nearest := supported[0]
+	nearestDistance := absInt(value - nearest)
+
+	for _, option := range supported[1:] {
+		distance := absInt(value - option)
+		// On tie prefer higher quality.
+		if distance < nearestDistance || (distance == nearestDistance && option > nearest) {
+			nearest = option
+			nearestDistance = distance
+		}
+	}
+
+	return nearest
+}
+
+func absInt(value int) int {
+	if value < 0 {
+		return -value
+	}
+	return value
+}
+
+func parseYouTubeQualityInput(raw string) (format string, bitrate int, normalized YouTubeQuality) {
+	normalizedRaw := strings.ToLower(strings.TrimSpace(raw))
+
+	if strings.HasPrefix(normalizedRaw, "opus") {
+		parsed := extractBitrateFromQuality(normalizedRaw, 256)
+		finalBitrate := nearestSupportedBitrate(parsed, youtubeOpusSupportedBitrates)
+		return "opus", finalBitrate, YouTubeQuality(fmt.Sprintf("opus_%d", finalBitrate))
+	}
+
+	if strings.HasPrefix(normalizedRaw, "mp3") {
+		parsed := extractBitrateFromQuality(normalizedRaw, 320)
+		finalBitrate := nearestSupportedBitrate(parsed, youtubeMp3SupportedBitrates)
+		return "mp3", finalBitrate, YouTubeQuality(fmt.Sprintf("mp3_%d", finalBitrate))
+	}
+
+	// Backward compatibility for legacy symbolic values.
+	switch normalizedRaw {
+	case "opus_256", "opus256", "opus":
+		return "opus", 256, YouTubeQualityOpus256
+	case "opus_128", "opus128":
+		return "opus", 128, YouTubeQualityOpus128
+	case "mp3_320", "mp3320", "mp3", "":
+		return "mp3", 320, YouTubeQualityMP3320
+	case "mp3_256", "mp3256":
+		return "mp3", 256, YouTubeQualityMP3256
+	case "mp3_128", "mp3128":
+		return "mp3", 128, YouTubeQualityMP3128
+	default:
+		return "mp3", 320, YouTubeQualityMP3320
+	}
+}
+
+func (y *YouTubeDownloader) SearchYouTube(trackName, artistName string) (string, error) {
+	query := fmt.Sprintf("%s %s", artistName, trackName)
+	searchQuery := url.QueryEscape(query)
+
+	GoLog("[YouTube] Search query: %s\n", query)
+
+	youtubeMusicURL := fmt.Sprintf("https://music.youtube.com/search?q=%s", searchQuery)
+
+	return youtubeMusicURL, nil
+}
+
+func (y *YouTubeDownloader) GetDownloadURL(youtubeURL string, quality YouTubeQuality) (*CobaltResponse, error) {
+	y.mu.Lock()
+	defer y.mu.Unlock()
+
+	audioFormat, bitrate, _ := parseYouTubeQualityInput(string(quality))
+	audioBitrate := strconv.Itoa(bitrate)
+
+	// Try SpotubeDL first (primary)
+	var spotubeErr error
+	videoID, extractErr := ExtractYouTubeVideoID(youtubeURL)
+	if extractErr == nil {
+		GoLog("[YouTube] Requesting from SpotubeDL: videoID=%s (format: %s, bitrate: %s)\n",
+			videoID, audioFormat, audioBitrate)
+
+		resp, err := y.requestSpotubeDL(videoID, audioFormat, audioBitrate)
+		if err == nil {
+			return resp, nil
+		}
+		spotubeErr = err
+		GoLog("[YouTube] SpotubeDL failed: %v, trying Cobalt fallback...\n", err)
+	} else {
+		GoLog("[YouTube] Could not extract video ID: %v, skipping SpotubeDL\n", extractErr)
+	}
+
+	// Fallback: direct Cobalt API (api.qwkuns.me)
+	cobaltURL := toYouTubeMusicURL(youtubeURL)
+	GoLog("[YouTube] Requesting from Cobalt API: %s (format: %s, bitrate: %s)\n",
+		cobaltURL, audioFormat, audioBitrate)
+
+	resp, err := y.requestCobaltDirect(cobaltURL, audioFormat, audioBitrate)
+	if err != nil {
+		if spotubeErr != nil {
+			return nil, fmt.Errorf("all download methods failed: spotubedl: %v, cobalt: %v", spotubeErr, err)
+		}
+		return nil, fmt.Errorf("all download methods failed: spotubedl: extractErr=%v, cobalt: %v", extractErr, err)
+	}
+
+	return resp, nil
+}
+
+func (y *YouTubeDownloader) requestCobaltDirect(videoURL, audioFormat, audioBitrate string) (*CobaltResponse, error) {
+	reqBody := CobaltRequest{
+		URL:             videoURL,
+		AudioFormat:     audioFormat,
+		AudioBitrate:    audioBitrate,
+		DownloadMode:    "audio",
+		FilenameStyle:   "basic",
+		DisableMetadata: true,
+	}
+
+	jsonData, err := json.Marshal(reqBody)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	req, err := http.NewRequest("POST", y.apiURL, strings.NewReader(string(jsonData)))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Accept", "application/json")
+
+	resp, err := DoRequestWithUserAgent(y.client, req)
+	if err != nil {
+		return nil, fmt.Errorf("cobalt API request failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read response: %w", err)
+	}
+
+	GoLog("[YouTube] Cobalt API response status: %d\n", resp.StatusCode)
+
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("cobalt API returned status %d: %s", resp.StatusCode, string(body))
+	}
+
+	var cobaltResp CobaltResponse
+	if err := json.Unmarshal(body, &cobaltResp); err != nil {
+		return nil, fmt.Errorf("failed to parse response: %w", err)
+	}
+
+	if cobaltResp.Status == "error" && cobaltResp.Error != nil {
+		return nil, fmt.Errorf("cobalt error: %s", cobaltResp.Error.Code)
+	}
+
+	if cobaltResp.Status != "tunnel" && cobaltResp.Status != "redirect" {
+		return nil, fmt.Errorf("unexpected cobalt status: %s", cobaltResp.Status)
+	}
+
+	if cobaltResp.URL == "" {
+		return nil, fmt.Errorf("no download URL in response")
+	}
+
+	GoLog("[YouTube] Got download URL from Cobalt (status: %s)\n", cobaltResp.Status)
+	return &cobaltResp, nil
+}
+
+// requestSpotubeDL uses SpotubeDL as a Cobalt proxy (they handle auth to yt-dl.click instances).
+// Engines v3/v2 are MP3-oriented outputs, so we only use them for MP3 requests.
+func (y *YouTubeDownloader) requestSpotubeDL(videoID, audioFormat, audioBitrate string) (*CobaltResponse, error) {
+	engines := []string{"v1"}
+	if strings.EqualFold(audioFormat, "mp3") {
+		engines = append(engines, "v3", "v2")
+	}
+	var lastErr error
+
+	for _, engine := range engines {
+		resp, err := y.requestSpotubeDLEngine(videoID, audioFormat, audioBitrate, engine)
+		if err == nil {
+			return resp, nil
+		}
+		lastErr = err
+		GoLog("[YouTube] SpotubeDL (%s) failed: %v\n", engine, err)
+	}
+
+	if lastErr == nil {
+		lastErr = fmt.Errorf("no SpotubeDL engine available")
+	}
+	return nil, lastErr
+}
+
+func (y *YouTubeDownloader) requestSpotubeDLEngine(videoID, audioFormat, audioBitrate, engine string) (*CobaltResponse, error) {
+	apiURL := fmt.Sprintf("%s/api/download/%s?engine=%s&format=%s&quality=%s",
+		spotubeBaseURL, videoID, url.QueryEscape(engine), url.QueryEscape(audioFormat), url.QueryEscape(audioBitrate))
+
+	GoLog("[YouTube] Requesting from SpotubeDL (%s): %s\n", engine, apiURL)
+
+	req, err := http.NewRequest("GET", apiURL, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+
+	req.Header.Set("Accept", "application/json")
+
+	resp, err := DoRequestWithUserAgent(y.client, req)
+	if err != nil {
+		return nil, fmt.Errorf("spotubedl request failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read response: %w", err)
+	}
+
+	GoLog("[YouTube] SpotubeDL (%s) response status: %d\n", engine, resp.StatusCode)
+
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("spotubedl(%s) returned status %d: %s", engine, resp.StatusCode, string(body))
+	}
+
+	var result struct {
+		URL      string `json:"url"`
+		Status   string `json:"status"`
+		Error    string `json:"error"`
+		Message  string `json:"message"`
+		Filename string `json:"filename"`
+	}
+	if err := json.Unmarshal(body, &result); err != nil {
+		return nil, fmt.Errorf("failed to parse spotubedl response: %w", err)
+	}
+
+	downloadURL := strings.TrimSpace(result.URL)
+	if downloadURL == "" {
+		if result.Error != "" {
+			return nil, fmt.Errorf("spotubedl(%s) error: %s", engine, result.Error)
+		}
+		if result.Message != "" {
+			return nil, fmt.Errorf("spotubedl(%s) message: %s", engine, result.Message)
+		}
+		return nil, fmt.Errorf("no download URL from spotubedl(%s)", engine)
+	}
+
+	if strings.HasPrefix(downloadURL, "/") {
+		downloadURL = spotubeBaseURL + downloadURL
+	}
+
+	if !strings.HasPrefix(downloadURL, "http://") && !strings.HasPrefix(downloadURL, "https://") {
+		return nil, fmt.Errorf("invalid download URL from spotubedl(%s): %s", engine, downloadURL)
+	}
+
+	filename := strings.TrimSpace(result.Filename)
+	if filename == "" {
+		if parsedURL, parseErr := url.Parse(downloadURL); parseErr == nil {
+			if queryFilename := strings.TrimSpace(parsedURL.Query().Get("filename")); queryFilename != "" {
+				if decodedFilename, decodeErr := url.QueryUnescape(queryFilename); decodeErr == nil {
+					filename = decodedFilename
+				} else {
+					filename = queryFilename
+				}
+			}
+		}
+	}
+
+	GoLog("[YouTube] Got download URL from SpotubeDL (%s)\n", engine)
+	return &CobaltResponse{
+		Status:   "tunnel",
+		URL:      downloadURL,
+		Filename: filename,
+	}, nil
+}
+
+func (y *YouTubeDownloader) DownloadFile(downloadURL, outputPath string, outputFD int, itemID string) error {
+	ctx := context.Background()
+
+	if itemID != "" {
+		StartItemProgress(itemID)
+		defer CompleteItemProgress(itemID)
+		ctx = initDownloadCancel(itemID)
+		defer clearDownloadCancel(itemID)
+	}
+
+	if isDownloadCancelled(itemID) {
+		return ErrDownloadCancelled
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "GET", downloadURL, nil)
+	if err != nil {
+		return fmt.Errorf("failed to create request: %w", err)
+	}
+
+	resp, err := DoRequestWithUserAgent(y.client, req)
+	if err != nil {
+		if isDownloadCancelled(itemID) {
+			return ErrDownloadCancelled
+		}
+		return fmt.Errorf("download request failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != 200 {
+		return fmt.Errorf("download failed: HTTP %d", resp.StatusCode)
+	}
+
+	expectedSize := resp.ContentLength
+	if expectedSize > 0 && itemID != "" {
+		SetItemBytesTotal(itemID, expectedSize)
+	}
+
+	out, err := openOutputForWrite(outputPath, outputFD)
+	if err != nil {
+		return fmt.Errorf("failed to create output file: %w", err)
+	}
+
+	bufWriter := bufio.NewWriterSize(out, 256*1024)
+
+	var written int64
+	if itemID != "" {
+		progressWriter := NewItemProgressWriter(bufWriter, itemID)
+		written, err = io.Copy(progressWriter, resp.Body)
+	} else {
+		written, err = io.Copy(bufWriter, resp.Body)
+	}
+
+	flushErr := bufWriter.Flush()
+	closeErr := out.Close()
+
+	if err != nil {
+		cleanupOutputOnError(outputPath, outputFD)
+		if isDownloadCancelled(itemID) {
+			return ErrDownloadCancelled
+		}
+		return fmt.Errorf("download interrupted: %w", err)
+	}
+	if flushErr != nil {
+		cleanupOutputOnError(outputPath, outputFD)
+		return fmt.Errorf("failed to flush buffer: %w", flushErr)
+	}
+	if closeErr != nil {
+		cleanupOutputOnError(outputPath, outputFD)
+		return fmt.Errorf("failed to close file: %w", closeErr)
+	}
+
+	if expectedSize > 0 && written != expectedSize {
+		cleanupOutputOnError(outputPath, outputFD)
+		return fmt.Errorf("incomplete download: expected %d bytes, got %d bytes", expectedSize, written)
+	}
+
+	GoLog("[YouTube] Download completed: %d bytes written\n", written)
+
+	return nil
+}
+
+func BuildYouTubeSearchURL(trackName, artistName string) string {
+	query := fmt.Sprintf("%s %s official audio", artistName, trackName)
+	return fmt.Sprintf("https://music.youtube.com/search?q=%s", url.QueryEscape(query))
+}
+
+func BuildYouTubeWatchURL(videoID string) string {
+	return fmt.Sprintf("https://music.youtube.com/watch?v=%s", videoID)
+}
+
+func isYouTubeVideoID(s string) bool {
+	if len(s) != 11 {
+		return false
+	}
+	for _, c := range s {
+		if !((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '_') {
+			return false
+		}
+	}
+	return true
+}
+
+func IsYouTubeURL(urlStr string) bool {
+	lower := strings.ToLower(urlStr)
+	return strings.Contains(lower, "youtube.com") ||
+		strings.Contains(lower, "youtu.be") ||
+		strings.Contains(lower, "music.youtube.com")
+}
+
+// toYouTubeMusicURL converts any YouTube URL to music.youtube.com format.
+// YouTube Music URLs bypass the login requirement that affects regular YouTube videos on Cobalt.
+func toYouTubeMusicURL(rawURL string) string {
+	videoID, err := ExtractYouTubeVideoID(rawURL)
+	if err != nil {
+		return rawURL
+	}
+	return fmt.Sprintf("https://music.youtube.com/watch?v=%s", videoID)
+}
+
+func ExtractYouTubeVideoID(urlStr string) (string, error) {
+	if strings.Contains(urlStr, "youtu.be/") {
+		parts := strings.Split(urlStr, "youtu.be/")
+		if len(parts) >= 2 {
+			videoID := strings.Split(parts[1], "?")[0]
+			videoID = strings.Split(videoID, "&")[0]
+			return strings.TrimSpace(videoID), nil
+		}
+	}
+
+	parsed, err := url.Parse(urlStr)
+	if err != nil {
+		return "", fmt.Errorf("invalid URL: %w", err)
+	}
+
+	// /watch?v=
+	if v := parsed.Query().Get("v"); v != "" {
+		return v, nil
+	}
+
+	// /embed/
+	if strings.Contains(parsed.Path, "/embed/") {
+		parts := strings.Split(parsed.Path, "/embed/")
+		if len(parts) >= 2 {
+			return strings.Split(parts[1], "/")[0], nil
+		}
+	}
+
+	// /v/
+	if strings.Contains(parsed.Path, "/v/") {
+		parts := strings.Split(parsed.Path, "/v/")
+		if len(parts) >= 2 {
+			return strings.Split(parts[1], "/")[0], nil
+		}
+	}
+
+	return "", fmt.Errorf("could not extract video ID from URL")
+}
+
+// searchYouTubeMusicViaExtension uses the YT Music extension's customSearch
+// to find a track by artist + title. It filters for tracks only (not videos,
+// albums, or playlists) and returns the YouTube Music watch URL for the first
+// matching track, or "" if nothing was found.
+func searchYouTubeMusicViaExtension(artistName, trackName string) string {
+	extManager := GetExtensionManager()
+	searchProviders := extManager.GetSearchProviders()
+
+	// Find the ytmusic-spotiflac extension
+	var ytProvider *ExtensionProviderWrapper
+	for _, p := range searchProviders {
+		if p.extension.ID == "ytmusic-spotiflac" {
+			ytProvider = p
+			break
+		}
+	}
+	if ytProvider == nil {
+		GoLog("[YouTube] YT Music extension not found or not enabled, skipping fallback\n")
+		return ""
+	}
+
+	query := strings.TrimSpace(artistName + " " + trackName)
+	if query == "" {
+		return ""
+	}
+
+	GoLog("[YouTube] Searching YT Music extension for: %s\n", query)
+	results, err := ytProvider.CustomSearch(query, map[string]interface{}{
+		"filter": "tracks",
+	})
+	if err != nil {
+		GoLog("[YouTube] YT Music extension search failed: %v\n", err)
+		return ""
+	}
+
+	// Find the first track result (item_type == "track" with a valid video ID)
+	for _, track := range results {
+		if track.ItemType != "" && track.ItemType != "track" {
+			continue
+		}
+		videoID := strings.TrimSpace(track.ID)
+		if videoID == "" {
+			continue
+		}
+		if isYouTubeVideoID(videoID) {
+			return BuildYouTubeWatchURL(videoID)
+		}
+	}
+
+	GoLog("[YouTube] YT Music extension returned no matching tracks for: %s\n", query)
+	return ""
+}
+
+func downloadFromYouTube(req DownloadRequest) (YouTubeDownloadResult, error) {
+	downloader := NewYouTubeDownloader()
+
+	format, bitrate, quality := parseYouTubeQualityInput(req.Quality)
+
+	// URL lookup priority: YouTube video ID > YT Music extension > SongLink (Spotify/Deezer/ISRC)
+	var youtubeURL string
+	var lookupErr error
+
+	// SpotifyID might actually be a YouTube video ID (from YT Music extension)
+	if req.SpotifyID != "" && isYouTubeVideoID(req.SpotifyID) {
+		youtubeURL = BuildYouTubeWatchURL(req.SpotifyID)
+		GoLog("[YouTube] SpotifyID appears to be YouTube video ID, using directly: %s\n", youtubeURL)
+	}
+
+	// Try YT Music extension search first (if installed) - more accurate, tracks only
+	if youtubeURL == "" && (req.TrackName != "" || req.ArtistName != "") {
+		youtubeURL = searchYouTubeMusicViaExtension(req.ArtistName, req.TrackName)
+		if youtubeURL != "" {
+			GoLog("[YouTube] Found YouTube URL via YT Music extension: %s\n", youtubeURL)
+		}
+	}
+
+	// Fallback: Try Spotify ID via SongLink
+	if youtubeURL == "" && req.SpotifyID != "" && !isYouTubeVideoID(req.SpotifyID) {
+		GoLog("[YouTube] Looking up YouTube URL via SongLink for Spotify ID: %s\n", req.SpotifyID)
+		songlink := NewSongLinkClient()
+		youtubeURL, lookupErr = songlink.GetYouTubeURLFromSpotify(req.SpotifyID)
+		if lookupErr != nil {
+			GoLog("[YouTube] SongLink Spotify lookup failed: %v\n", lookupErr)
+		} else {
+			GoLog("[YouTube] Found YouTube URL via SongLink (Spotify): %s\n", youtubeURL)
+		}
+	}
+
+	// Fallback: Try Deezer ID via SongLink
+	if youtubeURL == "" && req.DeezerID != "" {
+		GoLog("[YouTube] Looking up YouTube URL via SongLink for Deezer ID: %s\n", req.DeezerID)
+		songlink := NewSongLinkClient()
+		youtubeURL, lookupErr = songlink.GetYouTubeURLFromDeezer(req.DeezerID)
+		if lookupErr != nil {
+			GoLog("[YouTube] SongLink Deezer lookup failed: %v\n", lookupErr)
+		} else {
+			GoLog("[YouTube] Found YouTube URL via SongLink (Deezer): %s\n", youtubeURL)
+		}
+	}
+
+	// Fallback: Try ISRC via SongLink
+	if youtubeURL == "" && req.ISRC != "" {
+		GoLog("[YouTube] Looking up YouTube URL via SongLink for ISRC: %s\n", req.ISRC)
+		songlink := NewSongLinkClient()
+		availability, isrcErr := songlink.CheckTrackAvailability("", req.ISRC)
+		if isrcErr == nil && availability.YouTube && availability.YouTubeURL != "" {
+			youtubeURL = availability.YouTubeURL
+			GoLog("[YouTube] Found YouTube URL via SongLink (ISRC): %s\n", youtubeURL)
+		} else if isrcErr != nil {
+			GoLog("[YouTube] SongLink ISRC lookup failed: %v\n", isrcErr)
+		}
+	}
+
+	// Cobalt requires direct video URLs, not search URLs
+	if youtubeURL == "" {
+		return YouTubeDownloadResult{}, fmt.Errorf("could not find YouTube URL for track: %s - %s (no Spotify/Deezer ID available or track not on YouTube)", req.ArtistName, req.TrackName)
+	}
+
+	GoLog("[YouTube] Requesting download from Cobalt for: %s\n", youtubeURL)
+
+	cobaltResp, err := downloader.GetDownloadURL(youtubeURL, quality)
+	if err != nil {
+		return YouTubeDownloadResult{}, fmt.Errorf("failed to get download URL: %w", err)
+	}
+
+	ext := ".mp3"
+	if format == "opus" {
+		ext = ".opus"
+	}
+
+	// Some SpotubeDL engines may return a different output container than requested.
+	// Respect the provider-reported filename to avoid saving MP3 bytes with .opus extension.
+	if cobaltResp != nil && cobaltResp.Filename != "" {
+		lowerName := strings.ToLower(strings.TrimSpace(cobaltResp.Filename))
+		switch {
+		case strings.HasSuffix(lowerName, ".mp3"):
+			ext = ".mp3"
+			format = "mp3"
+		case strings.HasSuffix(lowerName, ".opus"), strings.HasSuffix(lowerName, ".ogg"):
+			ext = ".opus"
+			format = "opus"
+		}
+	}
+
+	filename := buildFilenameFromTemplate(req.FilenameFormat, map[string]any{
+		"title":  req.TrackName,
+		"artist": req.ArtistName,
+		"album":  req.AlbumName,
+		"track":  req.TrackNumber,
+		"year":   extractYear(req.ReleaseDate),
+		"date":   req.ReleaseDate,
+		"disc":   req.DiscNumber,
+	})
+	filename = sanitizeFilename(filename) + ext
+
+	var outputPath string
+	isSafOutput := isFDOutput(req.OutputFD) || strings.TrimSpace(req.OutputPath) != ""
+	if isSafOutput {
+		outputPath = strings.TrimSpace(req.OutputPath)
+		if outputPath == "" && isFDOutput(req.OutputFD) {
+			outputPath = fmt.Sprintf("/proc/self/fd/%d", req.OutputFD)
+		}
+	} else {
+		outputPath = req.OutputDir + "/" + filename
+	}
+
+	GoLog("[YouTube] Downloading to: %s\n", outputPath)
+
+	var parallelResult *ParallelDownloadResult
+	if req.EmbedLyrics || req.CoverURL != "" {
+		GoLog("[YouTube] Starting parallel fetch for cover and lyrics...\n")
+		parallelResult = FetchCoverAndLyricsParallel(
+			req.CoverURL,
+			req.EmbedMaxQualityCover,
+			req.SpotifyID,
+			req.TrackName,
+			req.ArtistName,
+			req.EmbedLyrics,
+			int64(req.DurationMS),
+		)
+	}
+
+	if err := downloader.DownloadFile(cobaltResp.URL, outputPath, req.OutputFD, req.ItemID); err != nil {
+		return YouTubeDownloadResult{}, fmt.Errorf("download failed: %w", err)
+	}
+
+	lyricsLRC := ""
+	var coverData []byte
+	if parallelResult != nil {
+		if parallelResult.LyricsLRC != "" {
+			lyricsLRC = parallelResult.LyricsLRC
+			GoLog("[YouTube] Got lyrics from lrclib (%d lines)\n", len(parallelResult.LyricsData.Lines))
+		}
+		if parallelResult.CoverData != nil {
+			coverData = parallelResult.CoverData
+			GoLog("[YouTube] Got cover art (%d bytes)\n", len(coverData))
+		}
+	}
+
+	return YouTubeDownloadResult{
+		FilePath:    outputPath,
+		Title:       req.TrackName,
+		Artist:      req.ArtistName,
+		Album:       req.AlbumName,
+		ReleaseDate: req.ReleaseDate,
+		TrackNumber: req.TrackNumber,
+		DiscNumber:  req.DiscNumber,
+		ISRC:        req.ISRC,
+		Format:      format,
+		Bitrate:     bitrate,
+		LyricsLRC:   lyricsLRC,
+		CoverData:   coverData,
+	}, nil
+}

go_backend/youtube_quality_test.go

@@ -0,0 +1,41 @@
+package gobackend
+
+import "testing"
+
+func TestParseYouTubeQualityInput_OpusNormalizesToSupportedBitrates(t *testing.T) {
+	format, bitrate, normalized := parseYouTubeQualityInput("opus_160")
+	if format != "opus" {
+		t.Fatalf("expected opus format, got %s", format)
+	}
+	if bitrate != 128 {
+		t.Fatalf("expected 128 bitrate, got %d", bitrate)
+	}
+	if normalized != YouTubeQualityOpus128 {
+		t.Fatalf("expected %s normalized, got %s", YouTubeQualityOpus128, normalized)
+	}
+}
+
+func TestParseYouTubeQualityInput_Mp3NormalizesToSupportedBitrates(t *testing.T) {
+	format, bitrate, normalized := parseYouTubeQualityInput("mp3_192")
+	if format != "mp3" {
+		t.Fatalf("expected mp3 format, got %s", format)
+	}
+	if bitrate != 256 {
+		t.Fatalf("expected 256 bitrate, got %d", bitrate)
+	}
+	if normalized != YouTubeQualityMP3256 {
+		t.Fatalf("expected %s normalized, got %s", YouTubeQualityMP3256, normalized)
+	}
+}
+
+func TestParseYouTubeQualityInput_PicksNearestSupportedBitrate(t *testing.T) {
+	_, opusBitrate, _ := parseYouTubeQualityInput("opus_999")
+	if opusBitrate != 256 {
+		t.Fatalf("expected opus normalization to 256, got %d", opusBitrate)
+	}
+
+	_, mp3Bitrate, _ := parseYouTubeQualityInput("mp3_1")
+	if mp3Bitrate != 128 {
+		t.Fatalf("expected mp3 normalization to 128, got %d", mp3Bitrate)
+	}
+}

ios/Runner/AppDelegate.swift

@@ -367,26 +367,6 @@ import Gobackend  // Import Go framework
             if let error = error { throw error }
             return response
 
-        case "searchTidalAll":
-            let args = call.arguments as! [String: Any]
-            let query = args["query"] as! String
-            let trackLimit = args["track_limit"] as? Int ?? 15
-            let artistLimit = args["artist_limit"] as? Int ?? 3
-            let filter = args["filter"] as? String ?? ""
-            let response = GobackendSearchTidalAll(query, Int(trackLimit), Int(artistLimit), filter, &error)
-            if let error = error { throw error }
-            return response
-
-        case "searchQobuzAll":
-            let args = call.arguments as! [String: Any]
-            let query = args["query"] as! String
-            let trackLimit = args["track_limit"] as? Int ?? 15
-            let artistLimit = args["artist_limit"] as? Int ?? 3
-            let filter = args["filter"] as? String ?? ""
-            let response = GobackendSearchQobuzAll(query, Int(trackLimit), Int(artistLimit), filter, &error)
-            if let error = error { throw error }
-            return response
-
         case "getDeezerRelatedArtists":
             let args = call.arguments as! [String: Any]
             let artistId = args["artist_id"] as! String
@@ -403,22 +383,6 @@ import Gobackend  // Import Go framework
             if let error = error { throw error }
             return response
 
-        case "getQobuzMetadata":
-            let args = call.arguments as! [String: Any]
-            let resourceType = args["resource_type"] as! String
-            let resourceId = args["resource_id"] as! String
-            let response = GobackendGetQobuzMetadata(resourceType, resourceId, &error)
-            if let error = error { throw error }
-            return response
-
-        case "getTidalMetadata":
-            let args = call.arguments as! [String: Any]
-            let resourceType = args["resource_type"] as! String
-            let resourceId = args["resource_id"] as! String
-            let response = GobackendGetTidalMetadata(resourceType, resourceId, &error)
-            if let error = error { throw error }
-            return response
-
         case "parseDeezerUrl":
             let args = call.arguments as! [String: Any]
             let url = args["url"] as! String
@@ -426,13 +390,6 @@ import Gobackend  // Import Go framework
             if let error = error { throw error }
             return response
 
-        case "parseQobuzUrl":
-            let args = call.arguments as! [String: Any]
-            let url = args["url"] as! String
-            let response = GobackendParseQobuzURLExport(url, &error)
-            if let error = error { throw error }
-            return response
-
         case "parseTidalUrl":
             let args = call.arguments as! [String: Any]
             let url = args["url"] as! String
@@ -643,20 +600,6 @@ import Gobackend  // Import Go framework
             let response = GobackendSearchTracksWithExtensionsJSON(query, Int(limit), &error)
             if let error = error { throw error }
             return response
-
-        case "searchTracksWithMetadataProviders":
-            let args = call.arguments as! [String: Any]
-            let query = args["query"] as! String
-            let limit = args["limit"] as? Int ?? 20
-            let includeExtensions = args["include_extensions"] as? Bool ?? true
-            let response = GobackendSearchTracksWithMetadataProvidersJSON(
-                query,
-                Int(limit),
-                includeExtensions,
-                &error
-            )
-            if let error = error { throw error }
-            return response
             
         case "enrichTrackWithExtension":
             let args = call.arguments as! [String: Any]
@@ -848,23 +791,6 @@ import Gobackend  // Import Go framework
             if let error = error { throw error }
             return nil
             
-        case "setStoreRegistryUrl":
-            let args = call.arguments as! [String: Any]
-            let registryUrl = args["registry_url"] as? String ?? ""
-            GobackendSetStoreRegistryURLJSON(registryUrl, &error)
-            if let error = error { throw error }
-            return nil
-            
-        case "getStoreRegistryUrl":
-            let response = GobackendGetStoreRegistryURLJSON(&error)
-            if let error = error { throw error }
-            return response
-            
-        case "clearStoreRegistryUrl":
-            GobackendClearStoreRegistryURLJSON(&error)
-            if let error = error { throw error }
-            return nil
-            
         case "getStoreExtensions":
             let args = call.arguments as! [String: Any]
             let forceRefresh = args["force_refresh"] as? Bool ?? false

lib/constants/app_info.dart

@@ -1,26 +1,21 @@
-import 'package:flutter/foundation.dart';
-
 /// App version and info constants
 /// Update version here only - all other files will reference this
 class AppInfo {
-  static const String version = '4.1.0';
-  static const String buildNumber = '117';
+  static const String version = '3.7.2';
+  static const String buildNumber = '105';
   static const String fullVersion = '$version+$buildNumber';
-
-  /// Shows "Internal" in debug builds, actual version in release.
-  static String get displayVersion => kDebugMode ? 'Internal' : version;
-
-  static const String appName = 'SpotiFLAC Mobile';
+  
+  
+  static const String appName = 'SpotiFLAC';
   static const String copyright = '© 2026 SpotiFLAC';
-
+  
   static const String mobileAuthor = 'zarzet';
   static const String originalAuthor = 'afkarxyz';
-
+  
   static const String githubRepo = 'zarzet/SpotiFLAC-Mobile';
   static const String githubUrl = 'https://github.com/$githubRepo';
-  static const String originalGithubUrl =
-      'https://github.com/afkarxyz/SpotiFLAC';
-
+  static const String originalGithubUrl = 'https://github.com/afkarxyz/SpotiFLAC';
+  
   static const String kofiUrl = 'https://ko-fi.com/zarzet';
   static const String githubSponsorsUrl = 'https://github.com/sponsors/zarzet/';
 }

lib/l10n/app_localizations_en.dart

@@ -525,9 +525,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get dialogImport => 'Import';
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get dialogDiscard => 'Discard';
 
@@ -759,36 +756,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlists';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Play';
 
@@ -1229,48 +1196,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get storeClearFilters => 'Clear filters';
 
   @override
-  String get storeAddRepoTitle => 'Add Extension Repository';
-
-  @override
-  String get storeAddRepoDescription =>
-      'Enter a GitHub repository URL that contains a registry.json file to browse and install extensions.';
-
-  @override
-  String get storeRepoUrlLabel => 'Repository URL';
-
-  @override
-  String get storeRepoUrlHint => 'https://github.com/user/repo';
-
-  @override
-  String get storeRepoUrlHelper =>
-      'e.g. https://github.com/user/extensions-repo';
-
-  @override
-  String get storeAddRepoButton => 'Add Repository';
-
-  @override
-  String get storeChangeRepoTooltip => 'Change repository';
-
-  @override
-  String get storeRepoDialogTitle => 'Extension Repository';
-
-  @override
-  String get storeRepoDialogCurrent => 'Current repository:';
-
-  @override
-  String get storeNewRepoUrlLabel => 'New Repository URL';
-
-  @override
-  String get storeLoadError => 'Failed to load store';
-
-  @override
-  String get storeEmptyNoExtensions => 'No extensions available';
-
-  @override
-  String get storeEmptyNoResults => 'No extensions found';
-
-  @override
-  String get extensionDefaultProvider => 'Default (Deezer)';
+  String get extensionDefaultProvider => 'Default (Deezer/Spotify)';
 
   @override
   String get extensionDefaultProviderSubtitle => 'Use built-in search';
@@ -1419,42 +1345,20 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get qualityHiResFlacMaxSubtitle => '24-bit / up to 192kHz';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
-  @override
-  String get downloadLossy320Format => 'Lossy 320kbps Format';
-
-  @override
-  String get downloadLossy320FormatDesc =>
-      'Choose the output format for Tidal 320kbps lossy downloads. The original AAC stream will be converted to your selected format.';
-
-  @override
-  String get downloadLossyMp3 => 'MP3 320kbps';
-
-  @override
-  String get downloadLossyMp3Subtitle => 'Best compatibility, ~10MB per track';
-
-  @override
-  String get downloadLossyOpus256 => 'Opus 256kbps';
-
-  @override
-  String get downloadLossyOpus256Subtitle =>
-      'Best quality Opus, ~8MB per track';
-
-  @override
-  String get downloadLossyOpus128 => 'Opus 128kbps';
-
-  @override
-  String get downloadLossyOpus128Subtitle => 'Smallest size, ~4MB per track';
-
   @override
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1552,13 +1456,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1754,25 +1651,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get libraryShowDuplicateIndicatorSubtitle =>
       'Show when searching for existing tracks';
 
-  @override
-  String get libraryAutoScan => 'Auto Scan';
-
-  @override
-  String get libraryAutoScanSubtitle =>
-      'Automatically scan your library for new files';
-
-  @override
-  String get libraryAutoScanOff => 'Off';
-
-  @override
-  String get libraryAutoScanOnOpen => 'Every app open';
-
-  @override
-  String get libraryAutoScanDaily => 'Daily';
-
-  @override
-  String get libraryAutoScanWeekly => 'Weekly';
-
   @override
   String get libraryActions => 'Actions';
 
@@ -2223,28 +2101,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get trackReEnrichFfmpegFailed => 'FFmpeg metadata embed failed';
 
-  @override
-  String get queueFlacAction => 'Queue FLAC';
-
-  @override
-  String queueFlacConfirmMessage(int count) {
-    return 'Search online matches for the selected tracks and queue FLAC downloads.\n\nExisting files will not be modified or deleted.\n\nOnly high-confidence matches are queued automatically.\n\n$count selected';
-  }
-
-  @override
-  String queueFlacFindingProgress(int current, int total) {
-    return 'Finding FLAC matches... ($current/$total)';
-  }
-
-  @override
-  String get queueFlacNoReliableMatches =>
-      'No reliable online matches found for the selection';
-
-  @override
-  String queueFlacQueuedWithSkipped(int addedCount, int skippedCount) {
-    return 'Added $addedCount tracks to queue, skipped $skippedCount';
-  }
-
   @override
   String trackSaveFailed(String error) {
     return 'Failed: $error';
@@ -2254,8 +2110,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get trackConvertFormat => 'Convert Format';
 
   @override
-  String get trackConvertFormatSubtitle =>
-      'Convert to MP3, Opus, ALAC, or FLAC';
+  String get trackConvertFormatSubtitle => 'Convert to MP3 or Opus';
 
   @override
   String get trackConvertTitle => 'Convert Audio';
@@ -2278,18 +2133,6 @@ class AppLocalizationsEn extends AppLocalizations {
     return 'Convert from $sourceFormat to $targetFormat at $bitrate?\n\nThe original file will be deleted after conversion.';
   }
 
-  @override
-  String trackConvertConfirmMessageLossless(
-    String sourceFormat,
-    String targetFormat,
-  ) {
-    return 'Convert from $sourceFormat to $targetFormat? (Lossless — no quality loss)\n\nThe original file will be deleted after conversion.';
-  }
-
-  @override
-  String get trackConvertLosslessHint =>
-      'Lossless conversion — no quality loss';
-
   @override
   String get trackConvertConverting => 'Converting audio...';
 
@@ -2543,17 +2386,6 @@ class AppLocalizationsEn extends AppLocalizations {
     return 'Convert $count $_temp0 to $format at $bitrate?\n\nOriginal files will be deleted after conversion.';
   }
 
-  @override
-  String selectionBatchConvertConfirmMessageLossless(int count, String format) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    return 'Convert $count $_temp0 to $format? (Lossless — no quality loss)\n\nOriginal files will be deleted after conversion.';
-  }
-
   @override
   String selectionBatchConvertProgress(int current, int total) {
     return 'Converting $current of $total...';
@@ -2576,520 +2408,4 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get downloadUseAlbumArtistForFoldersTrackSubtitle =>
       'Artist folders use Track Artist only';
-
-  @override
-  String get lyricsProvidersTitle => 'Lyrics Providers';
-
-  @override
-  String get lyricsProvidersDescription =>
-      'Enable, disable and reorder lyrics sources. Providers are tried top-to-bottom until lyrics are found.';
-
-  @override
-  String get lyricsProvidersInfoText =>
-      'Extension lyrics providers always run before built-in providers. At least one provider must remain enabled.';
-
-  @override
-  String lyricsProvidersEnabledSection(int count) {
-    return 'Enabled ($count)';
-  }
-
-  @override
-  String lyricsProvidersDisabledSection(int count) {
-    return 'Disabled ($count)';
-  }
-
-  @override
-  String get lyricsProvidersAtLeastOne =>
-      'At least one provider must remain enabled';
-
-  @override
-  String get lyricsProvidersSaved => 'Lyrics provider priority saved';
-
-  @override
-  String get lyricsProvidersDiscardContent =>
-      'You have unsaved changes that will be lost.';
-
-  @override
-  String get lyricsProviderSpotifyApiDesc =>
-      'Spotify-sourced synced lyrics via community API';
-
-  @override
-  String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
-
-  @override
-  String get lyricsProviderNeteaseDesc =>
-      'NetEase Cloud Music (good for Asian songs)';
-
-  @override
-  String get lyricsProviderMusixmatchDesc =>
-      'Largest lyrics database (multi-language)';
-
-  @override
-  String get lyricsProviderAppleMusicDesc =>
-      'Word-by-word synced lyrics (via proxy)';
-
-  @override
-  String get lyricsProviderQqMusicDesc =>
-      'QQ Music (good for Chinese songs, via proxy)';
-
-  @override
-  String get lyricsProviderExtensionDesc => 'Extension provider';
-
-  @override
-  String get safMigrationTitle => 'Storage Update Required';
-
-  @override
-  String get safMigrationMessage1 =>
-      'SpotiFLAC now uses Android Storage Access Framework (SAF) for downloads. This fixes \"permission denied\" errors on Android 10+.';
-
-  @override
-  String get safMigrationMessage2 =>
-      'Please select your download folder again to switch to the new storage system.';
-
-  @override
-  String get safMigrationSuccess => 'Download folder updated to SAF mode';
-
-  @override
-  String get settingsDonate => 'Donate';
-
-  @override
-  String get settingsDonateSubtitle => 'Support SpotiFLAC-Mobile development';
-
-  @override
-  String get tooltipLoveAll => 'Love All';
-
-  @override
-  String get tooltipAddToPlaylist => 'Add to Playlist';
-
-  @override
-  String snackbarRemovedTracksFromLoved(int count) {
-    return 'Removed $count tracks from Loved';
-  }
-
-  @override
-  String snackbarAddedTracksToLoved(int count) {
-    return 'Added $count tracks to Loved';
-  }
-
-  @override
-  String get dialogDownloadAllTitle => 'Download All';
-
-  @override
-  String dialogDownloadAllMessage(int count) {
-    return 'Download $count tracks?';
-  }
-
-  @override
-  String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
-
-  @override
-  String get homeGoToAlbum => 'Go to Album';
-
-  @override
-  String get homeAlbumInfoUnavailable => 'Album info not available';
-
-  @override
-  String get snackbarLoadingCueSheet => 'Loading CUE sheet...';
-
-  @override
-  String get snackbarMetadataSaved => 'Metadata saved successfully';
-
-  @override
-  String get snackbarFailedToEmbedLyrics => 'Failed to embed lyrics';
-
-  @override
-  String get snackbarFailedToWriteStorage => 'Failed to write back to storage';
-
-  @override
-  String snackbarError(String error) {
-    return 'Error: $error';
-  }
-
-  @override
-  String get snackbarNoActionDefined => 'No action defined for this button';
-
-  @override
-  String get noTracksFoundForAlbum => 'No tracks found for this album';
-
-  @override
-  String get downloadLocationSubtitle =>
-      'Choose storage mode for downloaded files.';
-
-  @override
-  String get storageModeAppFolder => 'App folder (non-SAF)';
-
-  @override
-  String get storageModeAppFolderSubtitle => 'Use default Music/SpotiFLAC path';
-
-  @override
-  String get storageModeSaf => 'SAF folder';
-
-  @override
-  String get storageModeSafSubtitle =>
-      'Pick folder via Android Storage Access Framework';
-
-  @override
-  String get downloadFilenameDescription =>
-      'Customize how your files are named.';
-
-  @override
-  String get downloadFilenameInsertTag => 'Tap to insert tag:';
-
-  @override
-  String get downloadSeparateSinglesEnabled => 'Albums/ and Singles/ folders';
-
-  @override
-  String get downloadSeparateSinglesDisabled => 'All files in same structure';
-
-  @override
-  String get downloadArtistNameFilters => 'Artist Name Filters';
-
-  @override
-  String get downloadCreatePlaylistSourceFolder =>
-      'Create playlist source folder';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderEnabled =>
-      'Playlist downloads use Playlist/ plus your normal folder structure.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderDisabled =>
-      'Playlist downloads use the normal folder structure only.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderRedundant =>
-      'By Playlist already places downloads inside a playlist folder.';
-
-  @override
-  String get downloadSongLinkRegion => 'SongLink Region';
-
-  @override
-  String get downloadNetworkCompatibilityMode => 'Network compatibility mode';
-
-  @override
-  String get downloadNetworkCompatibilityModeEnabled =>
-      'Enabled: try HTTP + accept invalid TLS certificates (unsafe)';
-
-  @override
-  String get downloadNetworkCompatibilityModeDisabled =>
-      'Off: strict HTTPS certificate validation (recommended)';
-
-  @override
-  String get downloadSelectServiceToEnable =>
-      'Select a built-in service to enable';
-
-  @override
-  String get downloadSelectTidalQobuz =>
-      'Select Tidal or Qobuz above to configure quality';
-
-  @override
-  String get downloadEmbedLyricsDisabled =>
-      'Disabled while Embed Metadata is turned off';
-
-  @override
-  String get downloadNeteaseIncludeTranslation =>
-      'Netease: Include Translation';
-
-  @override
-  String get downloadNeteaseIncludeTranslationEnabled =>
-      'Append translated lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeTranslationDisabled =>
-      'Use original lyrics only';
-
-  @override
-  String get downloadNeteaseIncludeRomanization =>
-      'Netease: Include Romanization';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationEnabled =>
-      'Append romanized lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationDisabled => 'Disabled';
-
-  @override
-  String get downloadAppleQqMultiPerson => 'Apple/QQ Multi-Person Word-by-Word';
-
-  @override
-  String get downloadAppleQqMultiPersonEnabled =>
-      'Enable v1/v2 speaker and [bg:] tags';
-
-  @override
-  String get downloadAppleQqMultiPersonDisabled =>
-      'Simplified word-by-word formatting';
-
-  @override
-  String get downloadMusixmatchLanguage => 'Musixmatch Language';
-
-  @override
-  String get downloadMusixmatchLanguageAuto => 'Auto (original)';
-
-  @override
-  String get downloadFilterContributing =>
-      'Filter contributing artists in Album Artist';
-
-  @override
-  String get downloadFilterContributingEnabled =>
-      'Album Artist metadata uses primary artist only';
-
-  @override
-  String get downloadFilterContributingDisabled =>
-      'Keep full Album Artist metadata value';
-
-  @override
-  String get downloadProvidersNoneEnabled => 'None enabled';
-
-  @override
-  String get downloadMusixmatchLanguageCode => 'Language code';
-
-  @override
-  String get downloadMusixmatchLanguageHint => 'auto / en / es / ja';
-
-  @override
-  String get downloadMusixmatchLanguageDesc =>
-      'Set preferred language code (example: en, es, ja). Leave empty for auto.';
-
-  @override
-  String get downloadMusixmatchAuto => 'Auto';
-
-  @override
-  String get downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
-
-  @override
-  String get downloadNetworkWifiOnlySubtitle =>
-      'Pause downloads on mobile data';
-
-  @override
-  String get downloadSongLinkRegionDesc =>
-      'Used as userCountry for SongLink API lookup.';
-
-  @override
-  String get snackbarUnsupportedAudioFormat => 'Unsupported audio format';
-
-  @override
-  String get cacheRefresh => 'Refresh';
-
-  @override
-  String dialogDownloadPlaylistsMessage(int trackCount, int playlistCount) {
-    String _temp0 = intl.Intl.pluralLogic(
-      trackCount,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    String _temp1 = intl.Intl.pluralLogic(
-      playlistCount,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $trackCount $_temp0 from $playlistCount $_temp1?';
-  }
-
-  @override
-  String bulkDownloadPlaylistsButton(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $count $_temp0';
-  }
-
-  @override
-  String get bulkDownloadSelectPlaylists => 'Select playlists to download';
-
-  @override
-  String get snackbarSelectedPlaylistsEmpty =>
-      'Selected playlists have no tracks';
-
-  @override
-  String playlistsCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count playlists',
-      one: '1 playlist',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get editMetadataAutoFill => 'Auto-fill from online';
-
-  @override
-  String get editMetadataAutoFillDesc =>
-      'Select fields to fill automatically from online metadata';
-
-  @override
-  String get editMetadataAutoFillFetch => 'Fetch & Fill';
-
-  @override
-  String get editMetadataAutoFillSearching => 'Searching online...';
-
-  @override
-  String get editMetadataAutoFillNoResults =>
-      'No matching metadata found online';
-
-  @override
-  String editMetadataAutoFillDone(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'fields',
-      one: 'field',
-    );
-    return 'Filled $count $_temp0 from online metadata';
-  }
-
-  @override
-  String get editMetadataAutoFillNoneSelected =>
-      'Select at least one field to auto-fill';
-
-  @override
-  String get editMetadataFieldTitle => 'Title';
-
-  @override
-  String get editMetadataFieldArtist => 'Artist';
-
-  @override
-  String get editMetadataFieldAlbum => 'Album';
-
-  @override
-  String get editMetadataFieldAlbumArtist => 'Album Artist';
-
-  @override
-  String get editMetadataFieldDate => 'Date';
-
-  @override
-  String get editMetadataFieldTrackNum => 'Track #';
-
-  @override
-  String get editMetadataFieldDiscNum => 'Disc #';
-
-  @override
-  String get editMetadataFieldGenre => 'Genre';
-
-  @override
-  String get editMetadataFieldIsrc => 'ISRC';
-
-  @override
-  String get editMetadataFieldLabel => 'Label';
-
-  @override
-  String get editMetadataFieldCopyright => 'Copyright';
-
-  @override
-  String get editMetadataFieldCover => 'Cover Art';
-
-  @override
-  String get editMetadataSelectAll => 'All';
-
-  @override
-  String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
 }

lib/l10n/app_localizations_fr.dart

@@ -358,7 +358,7 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Download Spotify tracks in lossless quality from Tidal and Qobuz.';
+      'Download Spotify tracks in lossless quality from Tidal, Qobuz, and Amazon Music.';
 
   @override
   String get artistAlbums => 'Albums';
@@ -527,9 +527,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get dialogImport => 'Import';
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get dialogDiscard => 'Discard';
 
@@ -761,36 +758,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlists';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Play';
 
@@ -1230,47 +1197,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get storeClearFilters => 'Clear filters';
 
-  @override
-  String get storeAddRepoTitle => 'Add Extension Repository';
-
-  @override
-  String get storeAddRepoDescription =>
-      'Enter a GitHub repository URL that contains a registry.json file to browse and install extensions.';
-
-  @override
-  String get storeRepoUrlLabel => 'Repository URL';
-
-  @override
-  String get storeRepoUrlHint => 'https://github.com/user/repo';
-
-  @override
-  String get storeRepoUrlHelper =>
-      'e.g. https://github.com/user/extensions-repo';
-
-  @override
-  String get storeAddRepoButton => 'Add Repository';
-
-  @override
-  String get storeChangeRepoTooltip => 'Change repository';
-
-  @override
-  String get storeRepoDialogTitle => 'Extension Repository';
-
-  @override
-  String get storeRepoDialogCurrent => 'Current repository:';
-
-  @override
-  String get storeNewRepoUrlLabel => 'New Repository URL';
-
-  @override
-  String get storeLoadError => 'Failed to load store';
-
-  @override
-  String get storeEmptyNoExtensions => 'No extensions available';
-
-  @override
-  String get storeEmptyNoResults => 'No extensions found';
-
   @override
   String get extensionDefaultProvider => 'Default (Deezer/Spotify)';
 
@@ -1421,42 +1347,20 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get qualityHiResFlacMaxSubtitle => '24-bit / up to 192kHz';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
-  @override
-  String get downloadLossy320Format => 'Lossy 320kbps Format';
-
-  @override
-  String get downloadLossy320FormatDesc =>
-      'Choose the output format for Tidal 320kbps lossy downloads. The original AAC stream will be converted to your selected format.';
-
-  @override
-  String get downloadLossyMp3 => 'MP3 320kbps';
-
-  @override
-  String get downloadLossyMp3Subtitle => 'Best compatibility, ~10MB per track';
-
-  @override
-  String get downloadLossyOpus256 => 'Opus 256kbps';
-
-  @override
-  String get downloadLossyOpus256Subtitle =>
-      'Best quality Opus, ~8MB per track';
-
-  @override
-  String get downloadLossyOpus128 => 'Opus 128kbps';
-
-  @override
-  String get downloadLossyOpus128Subtitle => 'Smallest size, ~4MB per track';
-
   @override
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1554,13 +1458,6 @@ class AppLocalizationsFr extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1756,25 +1653,6 @@ class AppLocalizationsFr extends AppLocalizations {
   String get libraryShowDuplicateIndicatorSubtitle =>
       'Show when searching for existing tracks';
 
-  @override
-  String get libraryAutoScan => 'Auto Scan';
-
-  @override
-  String get libraryAutoScanSubtitle =>
-      'Automatically scan your library for new files';
-
-  @override
-  String get libraryAutoScanOff => 'Off';
-
-  @override
-  String get libraryAutoScanOnOpen => 'Every app open';
-
-  @override
-  String get libraryAutoScanDaily => 'Daily';
-
-  @override
-  String get libraryAutoScanWeekly => 'Weekly';
-
   @override
   String get libraryActions => 'Actions';
 
@@ -1951,7 +1829,7 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Get FLAC quality audio from Tidal, Qobuz, or Deezer';
+      'Get FLAC quality audio from Tidal, Qobuz, or Amazon Music';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2225,28 +2103,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get trackReEnrichFfmpegFailed => 'FFmpeg metadata embed failed';
 
-  @override
-  String get queueFlacAction => 'Queue FLAC';
-
-  @override
-  String queueFlacConfirmMessage(int count) {
-    return 'Search online matches for the selected tracks and queue FLAC downloads.\n\nExisting files will not be modified or deleted.\n\nOnly high-confidence matches are queued automatically.\n\n$count selected';
-  }
-
-  @override
-  String queueFlacFindingProgress(int current, int total) {
-    return 'Finding FLAC matches... ($current/$total)';
-  }
-
-  @override
-  String get queueFlacNoReliableMatches =>
-      'No reliable online matches found for the selection';
-
-  @override
-  String queueFlacQueuedWithSkipped(int addedCount, int skippedCount) {
-    return 'Added $addedCount tracks to queue, skipped $skippedCount';
-  }
-
   @override
   String trackSaveFailed(String error) {
     return 'Failed: $error';
@@ -2279,18 +2135,6 @@ class AppLocalizationsFr extends AppLocalizations {
     return 'Convert from $sourceFormat to $targetFormat at $bitrate?\n\nThe original file will be deleted after conversion.';
   }
 
-  @override
-  String trackConvertConfirmMessageLossless(
-    String sourceFormat,
-    String targetFormat,
-  ) {
-    return 'Convert from $sourceFormat to $targetFormat? (Lossless — no quality loss)\n\nThe original file will be deleted after conversion.';
-  }
-
-  @override
-  String get trackConvertLosslessHint =>
-      'Lossless conversion — no quality loss';
-
   @override
   String get trackConvertConverting => 'Converting audio...';
 
@@ -2544,17 +2388,6 @@ class AppLocalizationsFr extends AppLocalizations {
     return 'Convert $count $_temp0 to $format at $bitrate?\n\nOriginal files will be deleted after conversion.';
   }
 
-  @override
-  String selectionBatchConvertConfirmMessageLossless(int count, String format) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    return 'Convert $count $_temp0 to $format? (Lossless — no quality loss)\n\nOriginal files will be deleted after conversion.';
-  }
-
   @override
   String selectionBatchConvertProgress(int current, int total) {
     return 'Converting $current of $total...';
@@ -2577,520 +2410,4 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get downloadUseAlbumArtistForFoldersTrackSubtitle =>
       'Artist folders use Track Artist only';
-
-  @override
-  String get lyricsProvidersTitle => 'Lyrics Providers';
-
-  @override
-  String get lyricsProvidersDescription =>
-      'Enable, disable and reorder lyrics sources. Providers are tried top-to-bottom until lyrics are found.';
-
-  @override
-  String get lyricsProvidersInfoText =>
-      'Extension lyrics providers always run before built-in providers. At least one provider must remain enabled.';
-
-  @override
-  String lyricsProvidersEnabledSection(int count) {
-    return 'Enabled ($count)';
-  }
-
-  @override
-  String lyricsProvidersDisabledSection(int count) {
-    return 'Disabled ($count)';
-  }
-
-  @override
-  String get lyricsProvidersAtLeastOne =>
-      'At least one provider must remain enabled';
-
-  @override
-  String get lyricsProvidersSaved => 'Lyrics provider priority saved';
-
-  @override
-  String get lyricsProvidersDiscardContent =>
-      'You have unsaved changes that will be lost.';
-
-  @override
-  String get lyricsProviderSpotifyApiDesc =>
-      'Spotify-sourced synced lyrics via community API';
-
-  @override
-  String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
-
-  @override
-  String get lyricsProviderNeteaseDesc =>
-      'NetEase Cloud Music (good for Asian songs)';
-
-  @override
-  String get lyricsProviderMusixmatchDesc =>
-      'Largest lyrics database (multi-language)';
-
-  @override
-  String get lyricsProviderAppleMusicDesc =>
-      'Word-by-word synced lyrics (via proxy)';
-
-  @override
-  String get lyricsProviderQqMusicDesc =>
-      'QQ Music (good for Chinese songs, via proxy)';
-
-  @override
-  String get lyricsProviderExtensionDesc => 'Extension provider';
-
-  @override
-  String get safMigrationTitle => 'Storage Update Required';
-
-  @override
-  String get safMigrationMessage1 =>
-      'SpotiFLAC now uses Android Storage Access Framework (SAF) for downloads. This fixes \"permission denied\" errors on Android 10+.';
-
-  @override
-  String get safMigrationMessage2 =>
-      'Please select your download folder again to switch to the new storage system.';
-
-  @override
-  String get safMigrationSuccess => 'Download folder updated to SAF mode';
-
-  @override
-  String get settingsDonate => 'Donate';
-
-  @override
-  String get settingsDonateSubtitle => 'Support SpotiFLAC-Mobile development';
-
-  @override
-  String get tooltipLoveAll => 'Love All';
-
-  @override
-  String get tooltipAddToPlaylist => 'Add to Playlist';
-
-  @override
-  String snackbarRemovedTracksFromLoved(int count) {
-    return 'Removed $count tracks from Loved';
-  }
-
-  @override
-  String snackbarAddedTracksToLoved(int count) {
-    return 'Added $count tracks to Loved';
-  }
-
-  @override
-  String get dialogDownloadAllTitle => 'Download All';
-
-  @override
-  String dialogDownloadAllMessage(int count) {
-    return 'Download $count tracks?';
-  }
-
-  @override
-  String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
-
-  @override
-  String get homeGoToAlbum => 'Go to Album';
-
-  @override
-  String get homeAlbumInfoUnavailable => 'Album info not available';
-
-  @override
-  String get snackbarLoadingCueSheet => 'Loading CUE sheet...';
-
-  @override
-  String get snackbarMetadataSaved => 'Metadata saved successfully';
-
-  @override
-  String get snackbarFailedToEmbedLyrics => 'Failed to embed lyrics';
-
-  @override
-  String get snackbarFailedToWriteStorage => 'Failed to write back to storage';
-
-  @override
-  String snackbarError(String error) {
-    return 'Error: $error';
-  }
-
-  @override
-  String get snackbarNoActionDefined => 'No action defined for this button';
-
-  @override
-  String get noTracksFoundForAlbum => 'No tracks found for this album';
-
-  @override
-  String get downloadLocationSubtitle =>
-      'Choose storage mode for downloaded files.';
-
-  @override
-  String get storageModeAppFolder => 'App folder (non-SAF)';
-
-  @override
-  String get storageModeAppFolderSubtitle => 'Use default Music/SpotiFLAC path';
-
-  @override
-  String get storageModeSaf => 'SAF folder';
-
-  @override
-  String get storageModeSafSubtitle =>
-      'Pick folder via Android Storage Access Framework';
-
-  @override
-  String get downloadFilenameDescription =>
-      'Customize how your files are named.';
-
-  @override
-  String get downloadFilenameInsertTag => 'Tap to insert tag:';
-
-  @override
-  String get downloadSeparateSinglesEnabled => 'Albums/ and Singles/ folders';
-
-  @override
-  String get downloadSeparateSinglesDisabled => 'All files in same structure';
-
-  @override
-  String get downloadArtistNameFilters => 'Artist Name Filters';
-
-  @override
-  String get downloadCreatePlaylistSourceFolder =>
-      'Create playlist source folder';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderEnabled =>
-      'Playlist downloads use Playlist/ plus your normal folder structure.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderDisabled =>
-      'Playlist downloads use the normal folder structure only.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderRedundant =>
-      'By Playlist already places downloads inside a playlist folder.';
-
-  @override
-  String get downloadSongLinkRegion => 'SongLink Region';
-
-  @override
-  String get downloadNetworkCompatibilityMode => 'Network compatibility mode';
-
-  @override
-  String get downloadNetworkCompatibilityModeEnabled =>
-      'Enabled: try HTTP + accept invalid TLS certificates (unsafe)';
-
-  @override
-  String get downloadNetworkCompatibilityModeDisabled =>
-      'Off: strict HTTPS certificate validation (recommended)';
-
-  @override
-  String get downloadSelectServiceToEnable =>
-      'Select a built-in service to enable';
-
-  @override
-  String get downloadSelectTidalQobuz =>
-      'Select Tidal or Qobuz above to configure quality';
-
-  @override
-  String get downloadEmbedLyricsDisabled =>
-      'Disabled while Embed Metadata is turned off';
-
-  @override
-  String get downloadNeteaseIncludeTranslation =>
-      'Netease: Include Translation';
-
-  @override
-  String get downloadNeteaseIncludeTranslationEnabled =>
-      'Append translated lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeTranslationDisabled =>
-      'Use original lyrics only';
-
-  @override
-  String get downloadNeteaseIncludeRomanization =>
-      'Netease: Include Romanization';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationEnabled =>
-      'Append romanized lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationDisabled => 'Disabled';
-
-  @override
-  String get downloadAppleQqMultiPerson => 'Apple/QQ Multi-Person Word-by-Word';
-
-  @override
-  String get downloadAppleQqMultiPersonEnabled =>
-      'Enable v1/v2 speaker and [bg:] tags';
-
-  @override
-  String get downloadAppleQqMultiPersonDisabled =>
-      'Simplified word-by-word formatting';
-
-  @override
-  String get downloadMusixmatchLanguage => 'Musixmatch Language';
-
-  @override
-  String get downloadMusixmatchLanguageAuto => 'Auto (original)';
-
-  @override
-  String get downloadFilterContributing =>
-      'Filter contributing artists in Album Artist';
-
-  @override
-  String get downloadFilterContributingEnabled =>
-      'Album Artist metadata uses primary artist only';
-
-  @override
-  String get downloadFilterContributingDisabled =>
-      'Keep full Album Artist metadata value';
-
-  @override
-  String get downloadProvidersNoneEnabled => 'None enabled';
-
-  @override
-  String get downloadMusixmatchLanguageCode => 'Language code';
-
-  @override
-  String get downloadMusixmatchLanguageHint => 'auto / en / es / ja';
-
-  @override
-  String get downloadMusixmatchLanguageDesc =>
-      'Set preferred language code (example: en, es, ja). Leave empty for auto.';
-
-  @override
-  String get downloadMusixmatchAuto => 'Auto';
-
-  @override
-  String get downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
-
-  @override
-  String get downloadNetworkWifiOnlySubtitle =>
-      'Pause downloads on mobile data';
-
-  @override
-  String get downloadSongLinkRegionDesc =>
-      'Used as userCountry for SongLink API lookup.';
-
-  @override
-  String get snackbarUnsupportedAudioFormat => 'Unsupported audio format';
-
-  @override
-  String get cacheRefresh => 'Refresh';
-
-  @override
-  String dialogDownloadPlaylistsMessage(int trackCount, int playlistCount) {
-    String _temp0 = intl.Intl.pluralLogic(
-      trackCount,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    String _temp1 = intl.Intl.pluralLogic(
-      playlistCount,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $trackCount $_temp0 from $playlistCount $_temp1?';
-  }
-
-  @override
-  String bulkDownloadPlaylistsButton(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $count $_temp0';
-  }
-
-  @override
-  String get bulkDownloadSelectPlaylists => 'Select playlists to download';
-
-  @override
-  String get snackbarSelectedPlaylistsEmpty =>
-      'Selected playlists have no tracks';
-
-  @override
-  String playlistsCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count playlists',
-      one: '1 playlist',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get editMetadataAutoFill => 'Auto-fill from online';
-
-  @override
-  String get editMetadataAutoFillDesc =>
-      'Select fields to fill automatically from online metadata';
-
-  @override
-  String get editMetadataAutoFillFetch => 'Fetch & Fill';
-
-  @override
-  String get editMetadataAutoFillSearching => 'Searching online...';
-
-  @override
-  String get editMetadataAutoFillNoResults =>
-      'No matching metadata found online';
-
-  @override
-  String editMetadataAutoFillDone(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'fields',
-      one: 'field',
-    );
-    return 'Filled $count $_temp0 from online metadata';
-  }
-
-  @override
-  String get editMetadataAutoFillNoneSelected =>
-      'Select at least one field to auto-fill';
-
-  @override
-  String get editMetadataFieldTitle => 'Title';
-
-  @override
-  String get editMetadataFieldArtist => 'Artist';
-
-  @override
-  String get editMetadataFieldAlbum => 'Album';
-
-  @override
-  String get editMetadataFieldAlbumArtist => 'Album Artist';
-
-  @override
-  String get editMetadataFieldDate => 'Date';
-
-  @override
-  String get editMetadataFieldTrackNum => 'Track #';
-
-  @override
-  String get editMetadataFieldDiscNum => 'Disc #';
-
-  @override
-  String get editMetadataFieldGenre => 'Genre';
-
-  @override
-  String get editMetadataFieldIsrc => 'ISRC';
-
-  @override
-  String get editMetadataFieldLabel => 'Label';
-
-  @override
-  String get editMetadataFieldCopyright => 'Copyright';
-
-  @override
-  String get editMetadataFieldCover => 'Cover Art';
-
-  @override
-  String get editMetadataSelectAll => 'All';
-
-  @override
-  String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
 }

lib/l10n/app_localizations_hi.dart

@@ -356,7 +356,7 @@ class AppLocalizationsHi extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Download Spotify tracks in lossless quality from Tidal and Qobuz.';
+      'Download Spotify tracks in lossless quality from Tidal, Qobuz, and Amazon Music.';
 
   @override
   String get artistAlbums => 'Albums';
@@ -525,9 +525,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get dialogImport => 'Import';
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get dialogDiscard => 'Discard';
 
@@ -759,36 +756,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlists';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Play';
 
@@ -1228,47 +1195,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get storeClearFilters => 'Clear filters';
 
-  @override
-  String get storeAddRepoTitle => 'Add Extension Repository';
-
-  @override
-  String get storeAddRepoDescription =>
-      'Enter a GitHub repository URL that contains a registry.json file to browse and install extensions.';
-
-  @override
-  String get storeRepoUrlLabel => 'Repository URL';
-
-  @override
-  String get storeRepoUrlHint => 'https://github.com/user/repo';
-
-  @override
-  String get storeRepoUrlHelper =>
-      'e.g. https://github.com/user/extensions-repo';
-
-  @override
-  String get storeAddRepoButton => 'Add Repository';
-
-  @override
-  String get storeChangeRepoTooltip => 'Change repository';
-
-  @override
-  String get storeRepoDialogTitle => 'Extension Repository';
-
-  @override
-  String get storeRepoDialogCurrent => 'Current repository:';
-
-  @override
-  String get storeNewRepoUrlLabel => 'New Repository URL';
-
-  @override
-  String get storeLoadError => 'Failed to load store';
-
-  @override
-  String get storeEmptyNoExtensions => 'No extensions available';
-
-  @override
-  String get storeEmptyNoResults => 'No extensions found';
-
   @override
   String get extensionDefaultProvider => 'Default (Deezer/Spotify)';
 
@@ -1419,42 +1345,20 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get qualityHiResFlacMaxSubtitle => '24-bit / up to 192kHz';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
-  @override
-  String get downloadLossy320Format => 'Lossy 320kbps Format';
-
-  @override
-  String get downloadLossy320FormatDesc =>
-      'Choose the output format for Tidal 320kbps lossy downloads. The original AAC stream will be converted to your selected format.';
-
-  @override
-  String get downloadLossyMp3 => 'MP3 320kbps';
-
-  @override
-  String get downloadLossyMp3Subtitle => 'Best compatibility, ~10MB per track';
-
-  @override
-  String get downloadLossyOpus256 => 'Opus 256kbps';
-
-  @override
-  String get downloadLossyOpus256Subtitle =>
-      'Best quality Opus, ~8MB per track';
-
-  @override
-  String get downloadLossyOpus128 => 'Opus 128kbps';
-
-  @override
-  String get downloadLossyOpus128Subtitle => 'Smallest size, ~4MB per track';
-
   @override
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1552,13 +1456,6 @@ class AppLocalizationsHi extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1754,25 +1651,6 @@ class AppLocalizationsHi extends AppLocalizations {
   String get libraryShowDuplicateIndicatorSubtitle =>
       'Show when searching for existing tracks';
 
-  @override
-  String get libraryAutoScan => 'Auto Scan';
-
-  @override
-  String get libraryAutoScanSubtitle =>
-      'Automatically scan your library for new files';
-
-  @override
-  String get libraryAutoScanOff => 'Off';
-
-  @override
-  String get libraryAutoScanOnOpen => 'Every app open';
-
-  @override
-  String get libraryAutoScanDaily => 'Daily';
-
-  @override
-  String get libraryAutoScanWeekly => 'Weekly';
-
   @override
   String get libraryActions => 'Actions';
 
@@ -1949,7 +1827,7 @@ class AppLocalizationsHi extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Get FLAC quality audio from Tidal, Qobuz, or Deezer';
+      'Get FLAC quality audio from Tidal, Qobuz, or Amazon Music';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2223,28 +2101,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get trackReEnrichFfmpegFailed => 'FFmpeg metadata embed failed';
 
-  @override
-  String get queueFlacAction => 'Queue FLAC';
-
-  @override
-  String queueFlacConfirmMessage(int count) {
-    return 'Search online matches for the selected tracks and queue FLAC downloads.\n\nExisting files will not be modified or deleted.\n\nOnly high-confidence matches are queued automatically.\n\n$count selected';
-  }
-
-  @override
-  String queueFlacFindingProgress(int current, int total) {
-    return 'Finding FLAC matches... ($current/$total)';
-  }
-
-  @override
-  String get queueFlacNoReliableMatches =>
-      'No reliable online matches found for the selection';
-
-  @override
-  String queueFlacQueuedWithSkipped(int addedCount, int skippedCount) {
-    return 'Added $addedCount tracks to queue, skipped $skippedCount';
-  }
-
   @override
   String trackSaveFailed(String error) {
     return 'Failed: $error';
@@ -2277,18 +2133,6 @@ class AppLocalizationsHi extends AppLocalizations {
     return 'Convert from $sourceFormat to $targetFormat at $bitrate?\n\nThe original file will be deleted after conversion.';
   }
 
-  @override
-  String trackConvertConfirmMessageLossless(
-    String sourceFormat,
-    String targetFormat,
-  ) {
-    return 'Convert from $sourceFormat to $targetFormat? (Lossless — no quality loss)\n\nThe original file will be deleted after conversion.';
-  }
-
-  @override
-  String get trackConvertLosslessHint =>
-      'Lossless conversion — no quality loss';
-
   @override
   String get trackConvertConverting => 'Converting audio...';
 
@@ -2542,17 +2386,6 @@ class AppLocalizationsHi extends AppLocalizations {
     return 'Convert $count $_temp0 to $format at $bitrate?\n\nOriginal files will be deleted after conversion.';
   }
 
-  @override
-  String selectionBatchConvertConfirmMessageLossless(int count, String format) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    return 'Convert $count $_temp0 to $format? (Lossless — no quality loss)\n\nOriginal files will be deleted after conversion.';
-  }
-
   @override
   String selectionBatchConvertProgress(int current, int total) {
     return 'Converting $current of $total...';
@@ -2575,520 +2408,4 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get downloadUseAlbumArtistForFoldersTrackSubtitle =>
       'Artist folders use Track Artist only';
-
-  @override
-  String get lyricsProvidersTitle => 'Lyrics Providers';
-
-  @override
-  String get lyricsProvidersDescription =>
-      'Enable, disable and reorder lyrics sources. Providers are tried top-to-bottom until lyrics are found.';
-
-  @override
-  String get lyricsProvidersInfoText =>
-      'Extension lyrics providers always run before built-in providers. At least one provider must remain enabled.';
-
-  @override
-  String lyricsProvidersEnabledSection(int count) {
-    return 'Enabled ($count)';
-  }
-
-  @override
-  String lyricsProvidersDisabledSection(int count) {
-    return 'Disabled ($count)';
-  }
-
-  @override
-  String get lyricsProvidersAtLeastOne =>
-      'At least one provider must remain enabled';
-
-  @override
-  String get lyricsProvidersSaved => 'Lyrics provider priority saved';
-
-  @override
-  String get lyricsProvidersDiscardContent =>
-      'You have unsaved changes that will be lost.';
-
-  @override
-  String get lyricsProviderSpotifyApiDesc =>
-      'Spotify-sourced synced lyrics via community API';
-
-  @override
-  String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
-
-  @override
-  String get lyricsProviderNeteaseDesc =>
-      'NetEase Cloud Music (good for Asian songs)';
-
-  @override
-  String get lyricsProviderMusixmatchDesc =>
-      'Largest lyrics database (multi-language)';
-
-  @override
-  String get lyricsProviderAppleMusicDesc =>
-      'Word-by-word synced lyrics (via proxy)';
-
-  @override
-  String get lyricsProviderQqMusicDesc =>
-      'QQ Music (good for Chinese songs, via proxy)';
-
-  @override
-  String get lyricsProviderExtensionDesc => 'Extension provider';
-
-  @override
-  String get safMigrationTitle => 'Storage Update Required';
-
-  @override
-  String get safMigrationMessage1 =>
-      'SpotiFLAC now uses Android Storage Access Framework (SAF) for downloads. This fixes \"permission denied\" errors on Android 10+.';
-
-  @override
-  String get safMigrationMessage2 =>
-      'Please select your download folder again to switch to the new storage system.';
-
-  @override
-  String get safMigrationSuccess => 'Download folder updated to SAF mode';
-
-  @override
-  String get settingsDonate => 'Donate';
-
-  @override
-  String get settingsDonateSubtitle => 'Support SpotiFLAC-Mobile development';
-
-  @override
-  String get tooltipLoveAll => 'Love All';
-
-  @override
-  String get tooltipAddToPlaylist => 'Add to Playlist';
-
-  @override
-  String snackbarRemovedTracksFromLoved(int count) {
-    return 'Removed $count tracks from Loved';
-  }
-
-  @override
-  String snackbarAddedTracksToLoved(int count) {
-    return 'Added $count tracks to Loved';
-  }
-
-  @override
-  String get dialogDownloadAllTitle => 'Download All';
-
-  @override
-  String dialogDownloadAllMessage(int count) {
-    return 'Download $count tracks?';
-  }
-
-  @override
-  String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
-
-  @override
-  String get homeGoToAlbum => 'Go to Album';
-
-  @override
-  String get homeAlbumInfoUnavailable => 'Album info not available';
-
-  @override
-  String get snackbarLoadingCueSheet => 'Loading CUE sheet...';
-
-  @override
-  String get snackbarMetadataSaved => 'Metadata saved successfully';
-
-  @override
-  String get snackbarFailedToEmbedLyrics => 'Failed to embed lyrics';
-
-  @override
-  String get snackbarFailedToWriteStorage => 'Failed to write back to storage';
-
-  @override
-  String snackbarError(String error) {
-    return 'Error: $error';
-  }
-
-  @override
-  String get snackbarNoActionDefined => 'No action defined for this button';
-
-  @override
-  String get noTracksFoundForAlbum => 'No tracks found for this album';
-
-  @override
-  String get downloadLocationSubtitle =>
-      'Choose storage mode for downloaded files.';
-
-  @override
-  String get storageModeAppFolder => 'App folder (non-SAF)';
-
-  @override
-  String get storageModeAppFolderSubtitle => 'Use default Music/SpotiFLAC path';
-
-  @override
-  String get storageModeSaf => 'SAF folder';
-
-  @override
-  String get storageModeSafSubtitle =>
-      'Pick folder via Android Storage Access Framework';
-
-  @override
-  String get downloadFilenameDescription =>
-      'Customize how your files are named.';
-
-  @override
-  String get downloadFilenameInsertTag => 'Tap to insert tag:';
-
-  @override
-  String get downloadSeparateSinglesEnabled => 'Albums/ and Singles/ folders';
-
-  @override
-  String get downloadSeparateSinglesDisabled => 'All files in same structure';
-
-  @override
-  String get downloadArtistNameFilters => 'Artist Name Filters';
-
-  @override
-  String get downloadCreatePlaylistSourceFolder =>
-      'Create playlist source folder';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderEnabled =>
-      'Playlist downloads use Playlist/ plus your normal folder structure.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderDisabled =>
-      'Playlist downloads use the normal folder structure only.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderRedundant =>
-      'By Playlist already places downloads inside a playlist folder.';
-
-  @override
-  String get downloadSongLinkRegion => 'SongLink Region';
-
-  @override
-  String get downloadNetworkCompatibilityMode => 'Network compatibility mode';
-
-  @override
-  String get downloadNetworkCompatibilityModeEnabled =>
-      'Enabled: try HTTP + accept invalid TLS certificates (unsafe)';
-
-  @override
-  String get downloadNetworkCompatibilityModeDisabled =>
-      'Off: strict HTTPS certificate validation (recommended)';
-
-  @override
-  String get downloadSelectServiceToEnable =>
-      'Select a built-in service to enable';
-
-  @override
-  String get downloadSelectTidalQobuz =>
-      'Select Tidal or Qobuz above to configure quality';
-
-  @override
-  String get downloadEmbedLyricsDisabled =>
-      'Disabled while Embed Metadata is turned off';
-
-  @override
-  String get downloadNeteaseIncludeTranslation =>
-      'Netease: Include Translation';
-
-  @override
-  String get downloadNeteaseIncludeTranslationEnabled =>
-      'Append translated lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeTranslationDisabled =>
-      'Use original lyrics only';
-
-  @override
-  String get downloadNeteaseIncludeRomanization =>
-      'Netease: Include Romanization';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationEnabled =>
-      'Append romanized lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationDisabled => 'Disabled';
-
-  @override
-  String get downloadAppleQqMultiPerson => 'Apple/QQ Multi-Person Word-by-Word';
-
-  @override
-  String get downloadAppleQqMultiPersonEnabled =>
-      'Enable v1/v2 speaker and [bg:] tags';
-
-  @override
-  String get downloadAppleQqMultiPersonDisabled =>
-      'Simplified word-by-word formatting';
-
-  @override
-  String get downloadMusixmatchLanguage => 'Musixmatch Language';
-
-  @override
-  String get downloadMusixmatchLanguageAuto => 'Auto (original)';
-
-  @override
-  String get downloadFilterContributing =>
-      'Filter contributing artists in Album Artist';
-
-  @override
-  String get downloadFilterContributingEnabled =>
-      'Album Artist metadata uses primary artist only';
-
-  @override
-  String get downloadFilterContributingDisabled =>
-      'Keep full Album Artist metadata value';
-
-  @override
-  String get downloadProvidersNoneEnabled => 'None enabled';
-
-  @override
-  String get downloadMusixmatchLanguageCode => 'Language code';
-
-  @override
-  String get downloadMusixmatchLanguageHint => 'auto / en / es / ja';
-
-  @override
-  String get downloadMusixmatchLanguageDesc =>
-      'Set preferred language code (example: en, es, ja). Leave empty for auto.';
-
-  @override
-  String get downloadMusixmatchAuto => 'Auto';
-
-  @override
-  String get downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
-
-  @override
-  String get downloadNetworkWifiOnlySubtitle =>
-      'Pause downloads on mobile data';
-
-  @override
-  String get downloadSongLinkRegionDesc =>
-      'Used as userCountry for SongLink API lookup.';
-
-  @override
-  String get snackbarUnsupportedAudioFormat => 'Unsupported audio format';
-
-  @override
-  String get cacheRefresh => 'Refresh';
-
-  @override
-  String dialogDownloadPlaylistsMessage(int trackCount, int playlistCount) {
-    String _temp0 = intl.Intl.pluralLogic(
-      trackCount,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    String _temp1 = intl.Intl.pluralLogic(
-      playlistCount,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $trackCount $_temp0 from $playlistCount $_temp1?';
-  }
-
-  @override
-  String bulkDownloadPlaylistsButton(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $count $_temp0';
-  }
-
-  @override
-  String get bulkDownloadSelectPlaylists => 'Select playlists to download';
-
-  @override
-  String get snackbarSelectedPlaylistsEmpty =>
-      'Selected playlists have no tracks';
-
-  @override
-  String playlistsCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count playlists',
-      one: '1 playlist',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get editMetadataAutoFill => 'Auto-fill from online';
-
-  @override
-  String get editMetadataAutoFillDesc =>
-      'Select fields to fill automatically from online metadata';
-
-  @override
-  String get editMetadataAutoFillFetch => 'Fetch & Fill';
-
-  @override
-  String get editMetadataAutoFillSearching => 'Searching online...';
-
-  @override
-  String get editMetadataAutoFillNoResults =>
-      'No matching metadata found online';
-
-  @override
-  String editMetadataAutoFillDone(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'fields',
-      one: 'field',
-    );
-    return 'Filled $count $_temp0 from online metadata';
-  }
-
-  @override
-  String get editMetadataAutoFillNoneSelected =>
-      'Select at least one field to auto-fill';
-
-  @override
-  String get editMetadataFieldTitle => 'Title';
-
-  @override
-  String get editMetadataFieldArtist => 'Artist';
-
-  @override
-  String get editMetadataFieldAlbum => 'Album';
-
-  @override
-  String get editMetadataFieldAlbumArtist => 'Album Artist';
-
-  @override
-  String get editMetadataFieldDate => 'Date';
-
-  @override
-  String get editMetadataFieldTrackNum => 'Track #';
-
-  @override
-  String get editMetadataFieldDiscNum => 'Disc #';
-
-  @override
-  String get editMetadataFieldGenre => 'Genre';
-
-  @override
-  String get editMetadataFieldIsrc => 'ISRC';
-
-  @override
-  String get editMetadataFieldLabel => 'Label';
-
-  @override
-  String get editMetadataFieldCopyright => 'Copyright';
-
-  @override
-  String get editMetadataFieldCover => 'Cover Art';
-
-  @override
-  String get editMetadataSelectAll => 'All';
-
-  @override
-  String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
 }

lib/l10n/app_localizations_ja.dart

@@ -352,7 +352,7 @@ class AppLocalizationsJa extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Download Spotify tracks in lossless quality from Tidal and Qobuz.';
+      'Tidal、Qobuz、Amazon Music から Spotify のトラックをロスレス品質でダウンロードします。';
 
   @override
   String get artistAlbums => 'アルバム';
@@ -521,9 +521,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get dialogImport => 'インポート';
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get dialogDiscard => '破棄';
 
@@ -754,36 +751,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get searchPlaylists => 'プレイリスト';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => '再生';
 
@@ -791,7 +758,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get filenameFormat => 'ファイル名の形式';
 
   @override
-  String get filenameShowAdvancedTags => '高度なタグを表示';
+  String get filenameShowAdvancedTags => 'Show advanced tags';
 
   @override
   String get filenameShowAdvancedTagsDescription =>
@@ -1168,7 +1135,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get trackLyricsEmbedded => 'Lyrics embedded successfully';
 
   @override
-  String get trackInstrumental => 'インストゥルメンタルのトラック';
+  String get trackInstrumental => 'Instrumental track';
 
   @override
   String get trackCopiedToClipboard => 'クリップボードにコピーしました';
@@ -1222,47 +1189,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get storeClearFilters => 'フィルターを消去';
 
-  @override
-  String get storeAddRepoTitle => 'Add Extension Repository';
-
-  @override
-  String get storeAddRepoDescription =>
-      'Enter a GitHub repository URL that contains a registry.json file to browse and install extensions.';
-
-  @override
-  String get storeRepoUrlLabel => 'Repository URL';
-
-  @override
-  String get storeRepoUrlHint => 'https://github.com/user/repo';
-
-  @override
-  String get storeRepoUrlHelper =>
-      'e.g. https://github.com/user/extensions-repo';
-
-  @override
-  String get storeAddRepoButton => 'Add Repository';
-
-  @override
-  String get storeChangeRepoTooltip => 'Change repository';
-
-  @override
-  String get storeRepoDialogTitle => 'Extension Repository';
-
-  @override
-  String get storeRepoDialogCurrent => 'Current repository:';
-
-  @override
-  String get storeNewRepoUrlLabel => 'New Repository URL';
-
-  @override
-  String get storeLoadError => 'Failed to load store';
-
-  @override
-  String get storeEmptyNoExtensions => 'No extensions available';
-
-  @override
-  String get storeEmptyNoResults => 'No extensions found';
-
   @override
   String get extensionDefaultProvider => 'デフォルト (Deezer/Spotify)';
 
@@ -1409,41 +1335,19 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get qualityHiResFlacMaxSubtitle => '24-bit / 最大 192kHz';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
-  @override
-  String get downloadLossy320Format => 'Lossy 320kbps Format';
-
-  @override
-  String get downloadLossy320FormatDesc =>
-      'Choose the output format for Tidal 320kbps lossy downloads. The original AAC stream will be converted to your selected format.';
-
-  @override
-  String get downloadLossyMp3 => 'MP3 320kbps';
-
-  @override
-  String get downloadLossyMp3Subtitle => 'Best compatibility, ~10MB per track';
-
-  @override
-  String get downloadLossyOpus256 => 'Opus 256kbps';
-
-  @override
-  String get downloadLossyOpus256Subtitle =>
-      'Best quality Opus, ~8MB per track';
-
-  @override
-  String get downloadLossyOpus128 => 'Opus 128kbps';
-
-  @override
-  String get downloadLossyOpus128Subtitle => 'Smallest size, ~4MB per track';
-
   @override
   String get qualityNote => '実際の品質はサービスからのトラックの可用性に依存します';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus のビットレート';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 のビットレート';
+
   @override
   String get downloadAskBeforeDownload => 'ダウンロード前に確認する';
 
@@ -1539,13 +1443,6 @@ class AppLocalizationsJa extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => '選択済みを削除';
 
@@ -1741,25 +1638,6 @@ class AppLocalizationsJa extends AppLocalizations {
   String get libraryShowDuplicateIndicatorSubtitle =>
       'Show when searching for existing tracks';
 
-  @override
-  String get libraryAutoScan => 'Auto Scan';
-
-  @override
-  String get libraryAutoScanSubtitle =>
-      'Automatically scan your library for new files';
-
-  @override
-  String get libraryAutoScanOff => 'Off';
-
-  @override
-  String get libraryAutoScanOnOpen => 'Every app open';
-
-  @override
-  String get libraryAutoScanDaily => 'Daily';
-
-  @override
-  String get libraryAutoScanWeekly => 'Weekly';
-
   @override
   String get libraryActions => 'アクション';
 
@@ -1936,7 +1814,7 @@ class AppLocalizationsJa extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Get FLAC quality audio from Tidal, Qobuz, or Deezer';
+      'Get FLAC quality audio from Tidal, Qobuz, or Amazon Music';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2210,28 +2088,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get trackReEnrichFfmpegFailed => 'FFmpeg metadata embed failed';
 
-  @override
-  String get queueFlacAction => 'Queue FLAC';
-
-  @override
-  String queueFlacConfirmMessage(int count) {
-    return 'Search online matches for the selected tracks and queue FLAC downloads.\n\nExisting files will not be modified or deleted.\n\nOnly high-confidence matches are queued automatically.\n\n$count selected';
-  }
-
-  @override
-  String queueFlacFindingProgress(int current, int total) {
-    return 'Finding FLAC matches... ($current/$total)';
-  }
-
-  @override
-  String get queueFlacNoReliableMatches =>
-      'No reliable online matches found for the selection';
-
-  @override
-  String queueFlacQueuedWithSkipped(int addedCount, int skippedCount) {
-    return 'Added $addedCount tracks to queue, skipped $skippedCount';
-  }
-
   @override
   String trackSaveFailed(String error) {
     return '失敗: $error';
@@ -2264,18 +2120,6 @@ class AppLocalizationsJa extends AppLocalizations {
     return 'Convert from $sourceFormat to $targetFormat at $bitrate?\n\nThe original file will be deleted after conversion.';
   }
 
-  @override
-  String trackConvertConfirmMessageLossless(
-    String sourceFormat,
-    String targetFormat,
-  ) {
-    return 'Convert from $sourceFormat to $targetFormat? (Lossless — no quality loss)\n\nThe original file will be deleted after conversion.';
-  }
-
-  @override
-  String get trackConvertLosslessHint =>
-      'Lossless conversion — no quality loss';
-
   @override
   String get trackConvertConverting => 'オーディオを変換中...';
 
@@ -2288,7 +2132,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get trackConvertFailed => '変換に失敗しました';
 
   @override
-  String get cueSplitTitle => '分割 CUE シート';
+  String get cueSplitTitle => 'Split CUE Sheet';
 
   @override
   String get cueSplitSubtitle => 'Split CUE+FLAC into individual tracks';
@@ -2438,7 +2282,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get collectionRemoveFromPlaylist => 'Remove from playlist';
 
   @override
-  String get collectionRemoveFromFolder => 'フォルダから削除';
+  String get collectionRemoveFromFolder => 'Remove from folder';
 
   @override
   String collectionRemoved(String trackName) {
@@ -2472,26 +2316,26 @@ class AppLocalizationsJa extends AppLocalizations {
   String get trackOptionRemoveFromLoved => 'Remove from Loved';
 
   @override
-  String get trackOptionAddToWishlist => 'ウィッシュリストに追加';
+  String get trackOptionAddToWishlist => 'Add to Wishlist';
 
   @override
-  String get trackOptionRemoveFromWishlist => 'ウィッシュから削除';
+  String get trackOptionRemoveFromWishlist => 'Remove from Wishlist';
 
   @override
-  String get collectionPlaylistChangeCover => 'カバー画像を変更';
+  String get collectionPlaylistChangeCover => 'Change cover image';
 
   @override
-  String get collectionPlaylistRemoveCover => 'カバー画像を削除';
+  String get collectionPlaylistRemoveCover => 'Remove cover image';
 
   @override
   String selectionShareCount(int count) {
     String _temp0 = intl.Intl.pluralLogic(
       count,
       locale: localeName,
-      other: '個のトラック',
-      one: '個のトラック',
+      other: 'tracks',
+      one: 'track',
     );
-    return '$count $_temp0を共有';
+    return 'Share $count $_temp0';
   }
 
   @override
@@ -2512,7 +2356,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get selectionConvertNoConvertible => 'No convertible tracks selected';
 
   @override
-  String get selectionBatchConvertConfirmTitle => '一括変換';
+  String get selectionBatchConvertConfirmTitle => 'Batch Convert';
 
   @override
   String selectionBatchConvertConfirmMessage(
@@ -2529,17 +2373,6 @@ class AppLocalizationsJa extends AppLocalizations {
     return 'Convert $count $_temp0 to $format at $bitrate?\n\nOriginal files will be deleted after conversion.';
   }
 
-  @override
-  String selectionBatchConvertConfirmMessageLossless(int count, String format) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    return 'Convert $count $_temp0 to $format? (Lossless — no quality loss)\n\nOriginal files will be deleted after conversion.';
-  }
-
   @override
   String selectionBatchConvertProgress(int current, int total) {
     return 'Converting $current of $total...';
@@ -2562,520 +2395,4 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get downloadUseAlbumArtistForFoldersTrackSubtitle =>
       'Artist folders use Track Artist only';
-
-  @override
-  String get lyricsProvidersTitle => 'Lyrics Providers';
-
-  @override
-  String get lyricsProvidersDescription =>
-      'Enable, disable and reorder lyrics sources. Providers are tried top-to-bottom until lyrics are found.';
-
-  @override
-  String get lyricsProvidersInfoText =>
-      'Extension lyrics providers always run before built-in providers. At least one provider must remain enabled.';
-
-  @override
-  String lyricsProvidersEnabledSection(int count) {
-    return 'Enabled ($count)';
-  }
-
-  @override
-  String lyricsProvidersDisabledSection(int count) {
-    return 'Disabled ($count)';
-  }
-
-  @override
-  String get lyricsProvidersAtLeastOne =>
-      'At least one provider must remain enabled';
-
-  @override
-  String get lyricsProvidersSaved => 'Lyrics provider priority saved';
-
-  @override
-  String get lyricsProvidersDiscardContent =>
-      'You have unsaved changes that will be lost.';
-
-  @override
-  String get lyricsProviderSpotifyApiDesc =>
-      'Spotify-sourced synced lyrics via community API';
-
-  @override
-  String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
-
-  @override
-  String get lyricsProviderNeteaseDesc =>
-      'NetEase Cloud Music (good for Asian songs)';
-
-  @override
-  String get lyricsProviderMusixmatchDesc =>
-      'Largest lyrics database (multi-language)';
-
-  @override
-  String get lyricsProviderAppleMusicDesc =>
-      'Word-by-word synced lyrics (via proxy)';
-
-  @override
-  String get lyricsProviderQqMusicDesc =>
-      'QQ Music (good for Chinese songs, via proxy)';
-
-  @override
-  String get lyricsProviderExtensionDesc => 'Extension provider';
-
-  @override
-  String get safMigrationTitle => 'Storage Update Required';
-
-  @override
-  String get safMigrationMessage1 =>
-      'SpotiFLAC now uses Android Storage Access Framework (SAF) for downloads. This fixes \"permission denied\" errors on Android 10+.';
-
-  @override
-  String get safMigrationMessage2 =>
-      'Please select your download folder again to switch to the new storage system.';
-
-  @override
-  String get safMigrationSuccess => 'Download folder updated to SAF mode';
-
-  @override
-  String get settingsDonate => 'Donate';
-
-  @override
-  String get settingsDonateSubtitle => 'Support SpotiFLAC-Mobile development';
-
-  @override
-  String get tooltipLoveAll => 'Love All';
-
-  @override
-  String get tooltipAddToPlaylist => 'Add to Playlist';
-
-  @override
-  String snackbarRemovedTracksFromLoved(int count) {
-    return 'Removed $count tracks from Loved';
-  }
-
-  @override
-  String snackbarAddedTracksToLoved(int count) {
-    return 'Added $count tracks to Loved';
-  }
-
-  @override
-  String get dialogDownloadAllTitle => 'Download All';
-
-  @override
-  String dialogDownloadAllMessage(int count) {
-    return 'Download $count tracks?';
-  }
-
-  @override
-  String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
-
-  @override
-  String get homeGoToAlbum => 'Go to Album';
-
-  @override
-  String get homeAlbumInfoUnavailable => 'Album info not available';
-
-  @override
-  String get snackbarLoadingCueSheet => 'Loading CUE sheet...';
-
-  @override
-  String get snackbarMetadataSaved => 'Metadata saved successfully';
-
-  @override
-  String get snackbarFailedToEmbedLyrics => 'Failed to embed lyrics';
-
-  @override
-  String get snackbarFailedToWriteStorage => 'Failed to write back to storage';
-
-  @override
-  String snackbarError(String error) {
-    return 'Error: $error';
-  }
-
-  @override
-  String get snackbarNoActionDefined => 'No action defined for this button';
-
-  @override
-  String get noTracksFoundForAlbum => 'No tracks found for this album';
-
-  @override
-  String get downloadLocationSubtitle =>
-      'Choose storage mode for downloaded files.';
-
-  @override
-  String get storageModeAppFolder => 'App folder (non-SAF)';
-
-  @override
-  String get storageModeAppFolderSubtitle => 'Use default Music/SpotiFLAC path';
-
-  @override
-  String get storageModeSaf => 'SAF folder';
-
-  @override
-  String get storageModeSafSubtitle =>
-      'Pick folder via Android Storage Access Framework';
-
-  @override
-  String get downloadFilenameDescription =>
-      'Customize how your files are named.';
-
-  @override
-  String get downloadFilenameInsertTag => 'Tap to insert tag:';
-
-  @override
-  String get downloadSeparateSinglesEnabled => 'Albums/ and Singles/ folders';
-
-  @override
-  String get downloadSeparateSinglesDisabled => 'All files in same structure';
-
-  @override
-  String get downloadArtistNameFilters => 'Artist Name Filters';
-
-  @override
-  String get downloadCreatePlaylistSourceFolder =>
-      'Create playlist source folder';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderEnabled =>
-      'Playlist downloads use Playlist/ plus your normal folder structure.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderDisabled =>
-      'Playlist downloads use the normal folder structure only.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderRedundant =>
-      'By Playlist already places downloads inside a playlist folder.';
-
-  @override
-  String get downloadSongLinkRegion => 'SongLink Region';
-
-  @override
-  String get downloadNetworkCompatibilityMode => 'Network compatibility mode';
-
-  @override
-  String get downloadNetworkCompatibilityModeEnabled =>
-      'Enabled: try HTTP + accept invalid TLS certificates (unsafe)';
-
-  @override
-  String get downloadNetworkCompatibilityModeDisabled =>
-      'Off: strict HTTPS certificate validation (recommended)';
-
-  @override
-  String get downloadSelectServiceToEnable =>
-      'Select a built-in service to enable';
-
-  @override
-  String get downloadSelectTidalQobuz =>
-      'Select Tidal or Qobuz above to configure quality';
-
-  @override
-  String get downloadEmbedLyricsDisabled =>
-      'Disabled while Embed Metadata is turned off';
-
-  @override
-  String get downloadNeteaseIncludeTranslation =>
-      'Netease: Include Translation';
-
-  @override
-  String get downloadNeteaseIncludeTranslationEnabled =>
-      'Append translated lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeTranslationDisabled =>
-      'Use original lyrics only';
-
-  @override
-  String get downloadNeteaseIncludeRomanization =>
-      'Netease: Include Romanization';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationEnabled =>
-      'Append romanized lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationDisabled => 'Disabled';
-
-  @override
-  String get downloadAppleQqMultiPerson => 'Apple/QQ Multi-Person Word-by-Word';
-
-  @override
-  String get downloadAppleQqMultiPersonEnabled =>
-      'Enable v1/v2 speaker and [bg:] tags';
-
-  @override
-  String get downloadAppleQqMultiPersonDisabled =>
-      'Simplified word-by-word formatting';
-
-  @override
-  String get downloadMusixmatchLanguage => 'Musixmatch Language';
-
-  @override
-  String get downloadMusixmatchLanguageAuto => 'Auto (original)';
-
-  @override
-  String get downloadFilterContributing =>
-      'Filter contributing artists in Album Artist';
-
-  @override
-  String get downloadFilterContributingEnabled =>
-      'Album Artist metadata uses primary artist only';
-
-  @override
-  String get downloadFilterContributingDisabled =>
-      'Keep full Album Artist metadata value';
-
-  @override
-  String get downloadProvidersNoneEnabled => 'None enabled';
-
-  @override
-  String get downloadMusixmatchLanguageCode => 'Language code';
-
-  @override
-  String get downloadMusixmatchLanguageHint => 'auto / en / es / ja';
-
-  @override
-  String get downloadMusixmatchLanguageDesc =>
-      'Set preferred language code (example: en, es, ja). Leave empty for auto.';
-
-  @override
-  String get downloadMusixmatchAuto => 'Auto';
-
-  @override
-  String get downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
-
-  @override
-  String get downloadNetworkWifiOnlySubtitle =>
-      'Pause downloads on mobile data';
-
-  @override
-  String get downloadSongLinkRegionDesc =>
-      'Used as userCountry for SongLink API lookup.';
-
-  @override
-  String get snackbarUnsupportedAudioFormat => 'Unsupported audio format';
-
-  @override
-  String get cacheRefresh => 'Refresh';
-
-  @override
-  String dialogDownloadPlaylistsMessage(int trackCount, int playlistCount) {
-    String _temp0 = intl.Intl.pluralLogic(
-      trackCount,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    String _temp1 = intl.Intl.pluralLogic(
-      playlistCount,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $trackCount $_temp0 from $playlistCount $_temp1?';
-  }
-
-  @override
-  String bulkDownloadPlaylistsButton(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $count $_temp0';
-  }
-
-  @override
-  String get bulkDownloadSelectPlaylists => 'Select playlists to download';
-
-  @override
-  String get snackbarSelectedPlaylistsEmpty =>
-      'Selected playlists have no tracks';
-
-  @override
-  String playlistsCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count playlists',
-      one: '1 playlist',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get editMetadataAutoFill => 'Auto-fill from online';
-
-  @override
-  String get editMetadataAutoFillDesc =>
-      'Select fields to fill automatically from online metadata';
-
-  @override
-  String get editMetadataAutoFillFetch => 'Fetch & Fill';
-
-  @override
-  String get editMetadataAutoFillSearching => 'Searching online...';
-
-  @override
-  String get editMetadataAutoFillNoResults =>
-      'No matching metadata found online';
-
-  @override
-  String editMetadataAutoFillDone(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'fields',
-      one: 'field',
-    );
-    return 'Filled $count $_temp0 from online metadata';
-  }
-
-  @override
-  String get editMetadataAutoFillNoneSelected =>
-      'Select at least one field to auto-fill';
-
-  @override
-  String get editMetadataFieldTitle => 'Title';
-
-  @override
-  String get editMetadataFieldArtist => 'Artist';
-
-  @override
-  String get editMetadataFieldAlbum => 'Album';
-
-  @override
-  String get editMetadataFieldAlbumArtist => 'Album Artist';
-
-  @override
-  String get editMetadataFieldDate => 'Date';
-
-  @override
-  String get editMetadataFieldTrackNum => 'Track #';
-
-  @override
-  String get editMetadataFieldDiscNum => 'Disc #';
-
-  @override
-  String get editMetadataFieldGenre => 'Genre';
-
-  @override
-  String get editMetadataFieldIsrc => 'ISRC';
-
-  @override
-  String get editMetadataFieldLabel => 'Label';
-
-  @override
-  String get editMetadataFieldCopyright => 'Copyright';
-
-  @override
-  String get editMetadataFieldCover => 'Cover Art';
-
-  @override
-  String get editMetadataSelectAll => 'All';
-
-  @override
-  String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
 }

lib/l10n/app_localizations_ko.dart

@@ -344,7 +344,7 @@ class AppLocalizationsKo extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Download Spotify tracks in lossless quality from Tidal and Qobuz.';
+      'Tidal, Qobuz, Amazon Music에서 Spotify 트랙을 무손실 음질로 다운로드하세요.';
 
   @override
   String get artistAlbums => '앨범';
@@ -510,9 +510,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get dialogImport => '불러오기';
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get dialogDiscard => '취소';
 
@@ -741,36 +738,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get searchPlaylists => '재생목록들';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => '재생';
 
@@ -1208,47 +1175,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get storeClearFilters => 'Clear filters';
 
-  @override
-  String get storeAddRepoTitle => 'Add Extension Repository';
-
-  @override
-  String get storeAddRepoDescription =>
-      'Enter a GitHub repository URL that contains a registry.json file to browse and install extensions.';
-
-  @override
-  String get storeRepoUrlLabel => 'Repository URL';
-
-  @override
-  String get storeRepoUrlHint => 'https://github.com/user/repo';
-
-  @override
-  String get storeRepoUrlHelper =>
-      'e.g. https://github.com/user/extensions-repo';
-
-  @override
-  String get storeAddRepoButton => 'Add Repository';
-
-  @override
-  String get storeChangeRepoTooltip => 'Change repository';
-
-  @override
-  String get storeRepoDialogTitle => 'Extension Repository';
-
-  @override
-  String get storeRepoDialogCurrent => 'Current repository:';
-
-  @override
-  String get storeNewRepoUrlLabel => 'New Repository URL';
-
-  @override
-  String get storeLoadError => 'Failed to load store';
-
-  @override
-  String get storeEmptyNoExtensions => 'No extensions available';
-
-  @override
-  String get storeEmptyNoResults => 'No extensions found';
-
   @override
   String get extensionDefaultProvider => 'Default (Deezer/Spotify)';
 
@@ -1399,42 +1325,20 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get qualityHiResFlacMaxSubtitle => '24-bit / up to 192kHz';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
-  @override
-  String get downloadLossy320Format => 'Lossy 320kbps Format';
-
-  @override
-  String get downloadLossy320FormatDesc =>
-      'Choose the output format for Tidal 320kbps lossy downloads. The original AAC stream will be converted to your selected format.';
-
-  @override
-  String get downloadLossyMp3 => 'MP3 320kbps';
-
-  @override
-  String get downloadLossyMp3Subtitle => 'Best compatibility, ~10MB per track';
-
-  @override
-  String get downloadLossyOpus256 => 'Opus 256kbps';
-
-  @override
-  String get downloadLossyOpus256Subtitle =>
-      'Best quality Opus, ~8MB per track';
-
-  @override
-  String get downloadLossyOpus128 => 'Opus 128kbps';
-
-  @override
-  String get downloadLossyOpus128Subtitle => 'Smallest size, ~4MB per track';
-
   @override
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1532,13 +1436,6 @@ class AppLocalizationsKo extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1734,25 +1631,6 @@ class AppLocalizationsKo extends AppLocalizations {
   String get libraryShowDuplicateIndicatorSubtitle =>
       'Show when searching for existing tracks';
 
-  @override
-  String get libraryAutoScan => 'Auto Scan';
-
-  @override
-  String get libraryAutoScanSubtitle =>
-      'Automatically scan your library for new files';
-
-  @override
-  String get libraryAutoScanOff => 'Off';
-
-  @override
-  String get libraryAutoScanOnOpen => 'Every app open';
-
-  @override
-  String get libraryAutoScanDaily => 'Daily';
-
-  @override
-  String get libraryAutoScanWeekly => 'Weekly';
-
   @override
   String get libraryActions => 'Actions';
 
@@ -1929,7 +1807,7 @@ class AppLocalizationsKo extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Get FLAC quality audio from Tidal, Qobuz, or Deezer';
+      'Get FLAC quality audio from Tidal, Qobuz, or Amazon Music';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2203,28 +2081,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get trackReEnrichFfmpegFailed => 'FFmpeg metadata embed failed';
 
-  @override
-  String get queueFlacAction => 'Queue FLAC';
-
-  @override
-  String queueFlacConfirmMessage(int count) {
-    return 'Search online matches for the selected tracks and queue FLAC downloads.\n\nExisting files will not be modified or deleted.\n\nOnly high-confidence matches are queued automatically.\n\n$count selected';
-  }
-
-  @override
-  String queueFlacFindingProgress(int current, int total) {
-    return 'Finding FLAC matches... ($current/$total)';
-  }
-
-  @override
-  String get queueFlacNoReliableMatches =>
-      'No reliable online matches found for the selection';
-
-  @override
-  String queueFlacQueuedWithSkipped(int addedCount, int skippedCount) {
-    return 'Added $addedCount tracks to queue, skipped $skippedCount';
-  }
-
   @override
   String trackSaveFailed(String error) {
     return 'Failed: $error';
@@ -2257,18 +2113,6 @@ class AppLocalizationsKo extends AppLocalizations {
     return 'Convert from $sourceFormat to $targetFormat at $bitrate?\n\nThe original file will be deleted after conversion.';
   }
 
-  @override
-  String trackConvertConfirmMessageLossless(
-    String sourceFormat,
-    String targetFormat,
-  ) {
-    return 'Convert from $sourceFormat to $targetFormat? (Lossless — no quality loss)\n\nThe original file will be deleted after conversion.';
-  }
-
-  @override
-  String get trackConvertLosslessHint =>
-      'Lossless conversion — no quality loss';
-
   @override
   String get trackConvertConverting => 'Converting audio...';
 
@@ -2522,17 +2366,6 @@ class AppLocalizationsKo extends AppLocalizations {
     return 'Convert $count $_temp0 to $format at $bitrate?\n\nOriginal files will be deleted after conversion.';
   }
 
-  @override
-  String selectionBatchConvertConfirmMessageLossless(int count, String format) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    return 'Convert $count $_temp0 to $format? (Lossless — no quality loss)\n\nOriginal files will be deleted after conversion.';
-  }
-
   @override
   String selectionBatchConvertProgress(int current, int total) {
     return 'Converting $current of $total...';
@@ -2555,520 +2388,4 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get downloadUseAlbumArtistForFoldersTrackSubtitle =>
       'Artist folders use Track Artist only';
-
-  @override
-  String get lyricsProvidersTitle => 'Lyrics Providers';
-
-  @override
-  String get lyricsProvidersDescription =>
-      'Enable, disable and reorder lyrics sources. Providers are tried top-to-bottom until lyrics are found.';
-
-  @override
-  String get lyricsProvidersInfoText =>
-      'Extension lyrics providers always run before built-in providers. At least one provider must remain enabled.';
-
-  @override
-  String lyricsProvidersEnabledSection(int count) {
-    return 'Enabled ($count)';
-  }
-
-  @override
-  String lyricsProvidersDisabledSection(int count) {
-    return 'Disabled ($count)';
-  }
-
-  @override
-  String get lyricsProvidersAtLeastOne =>
-      'At least one provider must remain enabled';
-
-  @override
-  String get lyricsProvidersSaved => 'Lyrics provider priority saved';
-
-  @override
-  String get lyricsProvidersDiscardContent =>
-      'You have unsaved changes that will be lost.';
-
-  @override
-  String get lyricsProviderSpotifyApiDesc =>
-      'Spotify-sourced synced lyrics via community API';
-
-  @override
-  String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
-
-  @override
-  String get lyricsProviderNeteaseDesc =>
-      'NetEase Cloud Music (good for Asian songs)';
-
-  @override
-  String get lyricsProviderMusixmatchDesc =>
-      'Largest lyrics database (multi-language)';
-
-  @override
-  String get lyricsProviderAppleMusicDesc =>
-      'Word-by-word synced lyrics (via proxy)';
-
-  @override
-  String get lyricsProviderQqMusicDesc =>
-      'QQ Music (good for Chinese songs, via proxy)';
-
-  @override
-  String get lyricsProviderExtensionDesc => 'Extension provider';
-
-  @override
-  String get safMigrationTitle => 'Storage Update Required';
-
-  @override
-  String get safMigrationMessage1 =>
-      'SpotiFLAC now uses Android Storage Access Framework (SAF) for downloads. This fixes \"permission denied\" errors on Android 10+.';
-
-  @override
-  String get safMigrationMessage2 =>
-      'Please select your download folder again to switch to the new storage system.';
-
-  @override
-  String get safMigrationSuccess => 'Download folder updated to SAF mode';
-
-  @override
-  String get settingsDonate => 'Donate';
-
-  @override
-  String get settingsDonateSubtitle => 'Support SpotiFLAC-Mobile development';
-
-  @override
-  String get tooltipLoveAll => 'Love All';
-
-  @override
-  String get tooltipAddToPlaylist => 'Add to Playlist';
-
-  @override
-  String snackbarRemovedTracksFromLoved(int count) {
-    return 'Removed $count tracks from Loved';
-  }
-
-  @override
-  String snackbarAddedTracksToLoved(int count) {
-    return 'Added $count tracks to Loved';
-  }
-
-  @override
-  String get dialogDownloadAllTitle => 'Download All';
-
-  @override
-  String dialogDownloadAllMessage(int count) {
-    return 'Download $count tracks?';
-  }
-
-  @override
-  String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
-
-  @override
-  String get homeGoToAlbum => 'Go to Album';
-
-  @override
-  String get homeAlbumInfoUnavailable => 'Album info not available';
-
-  @override
-  String get snackbarLoadingCueSheet => 'Loading CUE sheet...';
-
-  @override
-  String get snackbarMetadataSaved => 'Metadata saved successfully';
-
-  @override
-  String get snackbarFailedToEmbedLyrics => 'Failed to embed lyrics';
-
-  @override
-  String get snackbarFailedToWriteStorage => 'Failed to write back to storage';
-
-  @override
-  String snackbarError(String error) {
-    return 'Error: $error';
-  }
-
-  @override
-  String get snackbarNoActionDefined => 'No action defined for this button';
-
-  @override
-  String get noTracksFoundForAlbum => 'No tracks found for this album';
-
-  @override
-  String get downloadLocationSubtitle =>
-      'Choose storage mode for downloaded files.';
-
-  @override
-  String get storageModeAppFolder => 'App folder (non-SAF)';
-
-  @override
-  String get storageModeAppFolderSubtitle => 'Use default Music/SpotiFLAC path';
-
-  @override
-  String get storageModeSaf => 'SAF folder';
-
-  @override
-  String get storageModeSafSubtitle =>
-      'Pick folder via Android Storage Access Framework';
-
-  @override
-  String get downloadFilenameDescription =>
-      'Customize how your files are named.';
-
-  @override
-  String get downloadFilenameInsertTag => 'Tap to insert tag:';
-
-  @override
-  String get downloadSeparateSinglesEnabled => 'Albums/ and Singles/ folders';
-
-  @override
-  String get downloadSeparateSinglesDisabled => 'All files in same structure';
-
-  @override
-  String get downloadArtistNameFilters => 'Artist Name Filters';
-
-  @override
-  String get downloadCreatePlaylistSourceFolder =>
-      'Create playlist source folder';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderEnabled =>
-      'Playlist downloads use Playlist/ plus your normal folder structure.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderDisabled =>
-      'Playlist downloads use the normal folder structure only.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderRedundant =>
-      'By Playlist already places downloads inside a playlist folder.';
-
-  @override
-  String get downloadSongLinkRegion => 'SongLink Region';
-
-  @override
-  String get downloadNetworkCompatibilityMode => 'Network compatibility mode';
-
-  @override
-  String get downloadNetworkCompatibilityModeEnabled =>
-      'Enabled: try HTTP + accept invalid TLS certificates (unsafe)';
-
-  @override
-  String get downloadNetworkCompatibilityModeDisabled =>
-      'Off: strict HTTPS certificate validation (recommended)';
-
-  @override
-  String get downloadSelectServiceToEnable =>
-      'Select a built-in service to enable';
-
-  @override
-  String get downloadSelectTidalQobuz =>
-      'Select Tidal or Qobuz above to configure quality';
-
-  @override
-  String get downloadEmbedLyricsDisabled =>
-      'Disabled while Embed Metadata is turned off';
-
-  @override
-  String get downloadNeteaseIncludeTranslation =>
-      'Netease: Include Translation';
-
-  @override
-  String get downloadNeteaseIncludeTranslationEnabled =>
-      'Append translated lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeTranslationDisabled =>
-      'Use original lyrics only';
-
-  @override
-  String get downloadNeteaseIncludeRomanization =>
-      'Netease: Include Romanization';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationEnabled =>
-      'Append romanized lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationDisabled => 'Disabled';
-
-  @override
-  String get downloadAppleQqMultiPerson => 'Apple/QQ Multi-Person Word-by-Word';
-
-  @override
-  String get downloadAppleQqMultiPersonEnabled =>
-      'Enable v1/v2 speaker and [bg:] tags';
-
-  @override
-  String get downloadAppleQqMultiPersonDisabled =>
-      'Simplified word-by-word formatting';
-
-  @override
-  String get downloadMusixmatchLanguage => 'Musixmatch Language';
-
-  @override
-  String get downloadMusixmatchLanguageAuto => 'Auto (original)';
-
-  @override
-  String get downloadFilterContributing =>
-      'Filter contributing artists in Album Artist';
-
-  @override
-  String get downloadFilterContributingEnabled =>
-      'Album Artist metadata uses primary artist only';
-
-  @override
-  String get downloadFilterContributingDisabled =>
-      'Keep full Album Artist metadata value';
-
-  @override
-  String get downloadProvidersNoneEnabled => 'None enabled';
-
-  @override
-  String get downloadMusixmatchLanguageCode => 'Language code';
-
-  @override
-  String get downloadMusixmatchLanguageHint => 'auto / en / es / ja';
-
-  @override
-  String get downloadMusixmatchLanguageDesc =>
-      'Set preferred language code (example: en, es, ja). Leave empty for auto.';
-
-  @override
-  String get downloadMusixmatchAuto => 'Auto';
-
-  @override
-  String get downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
-
-  @override
-  String get downloadNetworkWifiOnlySubtitle =>
-      'Pause downloads on mobile data';
-
-  @override
-  String get downloadSongLinkRegionDesc =>
-      'Used as userCountry for SongLink API lookup.';
-
-  @override
-  String get snackbarUnsupportedAudioFormat => 'Unsupported audio format';
-
-  @override
-  String get cacheRefresh => 'Refresh';
-
-  @override
-  String dialogDownloadPlaylistsMessage(int trackCount, int playlistCount) {
-    String _temp0 = intl.Intl.pluralLogic(
-      trackCount,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    String _temp1 = intl.Intl.pluralLogic(
-      playlistCount,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $trackCount $_temp0 from $playlistCount $_temp1?';
-  }
-
-  @override
-  String bulkDownloadPlaylistsButton(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $count $_temp0';
-  }
-
-  @override
-  String get bulkDownloadSelectPlaylists => 'Select playlists to download';
-
-  @override
-  String get snackbarSelectedPlaylistsEmpty =>
-      'Selected playlists have no tracks';
-
-  @override
-  String playlistsCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count playlists',
-      one: '1 playlist',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get editMetadataAutoFill => 'Auto-fill from online';
-
-  @override
-  String get editMetadataAutoFillDesc =>
-      'Select fields to fill automatically from online metadata';
-
-  @override
-  String get editMetadataAutoFillFetch => 'Fetch & Fill';
-
-  @override
-  String get editMetadataAutoFillSearching => 'Searching online...';
-
-  @override
-  String get editMetadataAutoFillNoResults =>
-      'No matching metadata found online';
-
-  @override
-  String editMetadataAutoFillDone(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'fields',
-      one: 'field',
-    );
-    return 'Filled $count $_temp0 from online metadata';
-  }
-
-  @override
-  String get editMetadataAutoFillNoneSelected =>
-      'Select at least one field to auto-fill';
-
-  @override
-  String get editMetadataFieldTitle => 'Title';
-
-  @override
-  String get editMetadataFieldArtist => 'Artist';
-
-  @override
-  String get editMetadataFieldAlbum => 'Album';
-
-  @override
-  String get editMetadataFieldAlbumArtist => 'Album Artist';
-
-  @override
-  String get editMetadataFieldDate => 'Date';
-
-  @override
-  String get editMetadataFieldTrackNum => 'Track #';
-
-  @override
-  String get editMetadataFieldDiscNum => 'Disc #';
-
-  @override
-  String get editMetadataFieldGenre => 'Genre';
-
-  @override
-  String get editMetadataFieldIsrc => 'ISRC';
-
-  @override
-  String get editMetadataFieldLabel => 'Label';
-
-  @override
-  String get editMetadataFieldCopyright => 'Copyright';
-
-  @override
-  String get editMetadataFieldCover => 'Cover Art';
-
-  @override
-  String get editMetadataSelectAll => 'All';
-
-  @override
-  String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
 }

lib/l10n/app_localizations_nl.dart

@@ -158,16 +158,16 @@ class AppLocalizationsNl extends AppLocalizations {
   String get optionsConcurrentDownloads => 'Concurrent Downloads';
 
   @override
-  String get optionsConcurrentSequential => 'Sequentiële (1 per keer)';
+  String get optionsConcurrentSequential => 'Sequential (1 at a time)';
 
   @override
   String optionsConcurrentParallel(int count) {
-    return '';
+    return '$count parallel downloads';
   }
 
   @override
   String get optionsConcurrentWarning =>
-      'Parallel downloaden kan leiden tot rate-limiting';
+      'Parallel downloads may trigger rate limiting';
 
   @override
   String get optionsExtensionStore => 'Extension Store';
@@ -271,7 +271,7 @@ class AppLocalizationsNl extends AppLocalizations {
   String get aboutContributors => 'Contributors';
 
   @override
-  String get aboutMobileDeveloper => '';
+  String get aboutMobileDeveloper => 'Mobile version developer';
 
   @override
   String get aboutOriginalCreator => 'Creator of the original SpotiFLAC';
@@ -356,7 +356,7 @@ class AppLocalizationsNl extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Download Spotify tracks in lossless quality from Tidal and Qobuz.';
+      'Download Spotify tracks in lossless quality from Tidal, Qobuz, and Amazon Music.';
 
   @override
   String get artistAlbums => 'Albums';
@@ -525,9 +525,6 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get dialogImport => 'Import';
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get dialogDiscard => 'Discard';
 
@@ -759,36 +756,6 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlists';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Play';
 
@@ -1228,47 +1195,6 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get storeClearFilters => 'Clear filters';
 
-  @override
-  String get storeAddRepoTitle => 'Add Extension Repository';
-
-  @override
-  String get storeAddRepoDescription =>
-      'Enter a GitHub repository URL that contains a registry.json file to browse and install extensions.';
-
-  @override
-  String get storeRepoUrlLabel => 'Repository URL';
-
-  @override
-  String get storeRepoUrlHint => 'https://github.com/user/repo';
-
-  @override
-  String get storeRepoUrlHelper =>
-      'e.g. https://github.com/user/extensions-repo';
-
-  @override
-  String get storeAddRepoButton => 'Add Repository';
-
-  @override
-  String get storeChangeRepoTooltip => 'Change repository';
-
-  @override
-  String get storeRepoDialogTitle => 'Extension Repository';
-
-  @override
-  String get storeRepoDialogCurrent => 'Current repository:';
-
-  @override
-  String get storeNewRepoUrlLabel => 'New Repository URL';
-
-  @override
-  String get storeLoadError => 'Failed to load store';
-
-  @override
-  String get storeEmptyNoExtensions => 'No extensions available';
-
-  @override
-  String get storeEmptyNoResults => 'No extensions found';
-
   @override
   String get extensionDefaultProvider => 'Default (Deezer/Spotify)';
 
@@ -1419,42 +1345,20 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get qualityHiResFlacMaxSubtitle => '24-bit / up to 192kHz';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
-  @override
-  String get downloadLossy320Format => 'Lossy 320kbps Format';
-
-  @override
-  String get downloadLossy320FormatDesc =>
-      'Choose the output format for Tidal 320kbps lossy downloads. The original AAC stream will be converted to your selected format.';
-
-  @override
-  String get downloadLossyMp3 => 'MP3 320kbps';
-
-  @override
-  String get downloadLossyMp3Subtitle => 'Best compatibility, ~10MB per track';
-
-  @override
-  String get downloadLossyOpus256 => 'Opus 256kbps';
-
-  @override
-  String get downloadLossyOpus256Subtitle =>
-      'Best quality Opus, ~8MB per track';
-
-  @override
-  String get downloadLossyOpus128 => 'Opus 128kbps';
-
-  @override
-  String get downloadLossyOpus128Subtitle => 'Smallest size, ~4MB per track';
-
   @override
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1552,13 +1456,6 @@ class AppLocalizationsNl extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1754,25 +1651,6 @@ class AppLocalizationsNl extends AppLocalizations {
   String get libraryShowDuplicateIndicatorSubtitle =>
       'Show when searching for existing tracks';
 
-  @override
-  String get libraryAutoScan => 'Auto Scan';
-
-  @override
-  String get libraryAutoScanSubtitle =>
-      'Automatically scan your library for new files';
-
-  @override
-  String get libraryAutoScanOff => 'Off';
-
-  @override
-  String get libraryAutoScanOnOpen => 'Every app open';
-
-  @override
-  String get libraryAutoScanDaily => 'Daily';
-
-  @override
-  String get libraryAutoScanWeekly => 'Weekly';
-
   @override
   String get libraryActions => 'Actions';
 
@@ -1949,7 +1827,7 @@ class AppLocalizationsNl extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Get FLAC quality audio from Tidal, Qobuz, or Deezer';
+      'Get FLAC quality audio from Tidal, Qobuz, or Amazon Music';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2223,28 +2101,6 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get trackReEnrichFfmpegFailed => 'FFmpeg metadata embed failed';
 
-  @override
-  String get queueFlacAction => 'Queue FLAC';
-
-  @override
-  String queueFlacConfirmMessage(int count) {
-    return 'Search online matches for the selected tracks and queue FLAC downloads.\n\nExisting files will not be modified or deleted.\n\nOnly high-confidence matches are queued automatically.\n\n$count selected';
-  }
-
-  @override
-  String queueFlacFindingProgress(int current, int total) {
-    return 'Finding FLAC matches... ($current/$total)';
-  }
-
-  @override
-  String get queueFlacNoReliableMatches =>
-      'No reliable online matches found for the selection';
-
-  @override
-  String queueFlacQueuedWithSkipped(int addedCount, int skippedCount) {
-    return 'Added $addedCount tracks to queue, skipped $skippedCount';
-  }
-
   @override
   String trackSaveFailed(String error) {
     return 'Failed: $error';
@@ -2277,18 +2133,6 @@ class AppLocalizationsNl extends AppLocalizations {
     return 'Convert from $sourceFormat to $targetFormat at $bitrate?\n\nThe original file will be deleted after conversion.';
   }
 
-  @override
-  String trackConvertConfirmMessageLossless(
-    String sourceFormat,
-    String targetFormat,
-  ) {
-    return 'Convert from $sourceFormat to $targetFormat? (Lossless — no quality loss)\n\nThe original file will be deleted after conversion.';
-  }
-
-  @override
-  String get trackConvertLosslessHint =>
-      'Lossless conversion — no quality loss';
-
   @override
   String get trackConvertConverting => 'Converting audio...';
 
@@ -2542,17 +2386,6 @@ class AppLocalizationsNl extends AppLocalizations {
     return 'Convert $count $_temp0 to $format at $bitrate?\n\nOriginal files will be deleted after conversion.';
   }
 
-  @override
-  String selectionBatchConvertConfirmMessageLossless(int count, String format) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    return 'Convert $count $_temp0 to $format? (Lossless — no quality loss)\n\nOriginal files will be deleted after conversion.';
-  }
-
   @override
   String selectionBatchConvertProgress(int current, int total) {
     return 'Converting $current of $total...';
@@ -2575,520 +2408,4 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get downloadUseAlbumArtistForFoldersTrackSubtitle =>
       'Artist folders use Track Artist only';
-
-  @override
-  String get lyricsProvidersTitle => 'Lyrics Providers';
-
-  @override
-  String get lyricsProvidersDescription =>
-      'Enable, disable and reorder lyrics sources. Providers are tried top-to-bottom until lyrics are found.';
-
-  @override
-  String get lyricsProvidersInfoText =>
-      'Extension lyrics providers always run before built-in providers. At least one provider must remain enabled.';
-
-  @override
-  String lyricsProvidersEnabledSection(int count) {
-    return 'Enabled ($count)';
-  }
-
-  @override
-  String lyricsProvidersDisabledSection(int count) {
-    return 'Disabled ($count)';
-  }
-
-  @override
-  String get lyricsProvidersAtLeastOne =>
-      'At least one provider must remain enabled';
-
-  @override
-  String get lyricsProvidersSaved => 'Lyrics provider priority saved';
-
-  @override
-  String get lyricsProvidersDiscardContent =>
-      'You have unsaved changes that will be lost.';
-
-  @override
-  String get lyricsProviderSpotifyApiDesc =>
-      'Spotify-sourced synced lyrics via community API';
-
-  @override
-  String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
-
-  @override
-  String get lyricsProviderNeteaseDesc =>
-      'NetEase Cloud Music (good for Asian songs)';
-
-  @override
-  String get lyricsProviderMusixmatchDesc =>
-      'Largest lyrics database (multi-language)';
-
-  @override
-  String get lyricsProviderAppleMusicDesc =>
-      'Word-by-word synced lyrics (via proxy)';
-
-  @override
-  String get lyricsProviderQqMusicDesc =>
-      'QQ Music (good for Chinese songs, via proxy)';
-
-  @override
-  String get lyricsProviderExtensionDesc => 'Extension provider';
-
-  @override
-  String get safMigrationTitle => 'Storage Update Required';
-
-  @override
-  String get safMigrationMessage1 =>
-      'SpotiFLAC now uses Android Storage Access Framework (SAF) for downloads. This fixes \"permission denied\" errors on Android 10+.';
-
-  @override
-  String get safMigrationMessage2 =>
-      'Please select your download folder again to switch to the new storage system.';
-
-  @override
-  String get safMigrationSuccess => 'Download folder updated to SAF mode';
-
-  @override
-  String get settingsDonate => 'Donate';
-
-  @override
-  String get settingsDonateSubtitle => 'Support SpotiFLAC-Mobile development';
-
-  @override
-  String get tooltipLoveAll => 'Love All';
-
-  @override
-  String get tooltipAddToPlaylist => 'Add to Playlist';
-
-  @override
-  String snackbarRemovedTracksFromLoved(int count) {
-    return 'Removed $count tracks from Loved';
-  }
-
-  @override
-  String snackbarAddedTracksToLoved(int count) {
-    return 'Added $count tracks to Loved';
-  }
-
-  @override
-  String get dialogDownloadAllTitle => 'Download All';
-
-  @override
-  String dialogDownloadAllMessage(int count) {
-    return 'Download $count tracks?';
-  }
-
-  @override
-  String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
-
-  @override
-  String get homeGoToAlbum => 'Go to Album';
-
-  @override
-  String get homeAlbumInfoUnavailable => 'Album info not available';
-
-  @override
-  String get snackbarLoadingCueSheet => 'Loading CUE sheet...';
-
-  @override
-  String get snackbarMetadataSaved => 'Metadata saved successfully';
-
-  @override
-  String get snackbarFailedToEmbedLyrics => 'Failed to embed lyrics';
-
-  @override
-  String get snackbarFailedToWriteStorage => 'Failed to write back to storage';
-
-  @override
-  String snackbarError(String error) {
-    return 'Error: $error';
-  }
-
-  @override
-  String get snackbarNoActionDefined => 'No action defined for this button';
-
-  @override
-  String get noTracksFoundForAlbum => 'No tracks found for this album';
-
-  @override
-  String get downloadLocationSubtitle =>
-      'Choose storage mode for downloaded files.';
-
-  @override
-  String get storageModeAppFolder => 'App folder (non-SAF)';
-
-  @override
-  String get storageModeAppFolderSubtitle => 'Use default Music/SpotiFLAC path';
-
-  @override
-  String get storageModeSaf => 'SAF folder';
-
-  @override
-  String get storageModeSafSubtitle =>
-      'Pick folder via Android Storage Access Framework';
-
-  @override
-  String get downloadFilenameDescription =>
-      'Customize how your files are named.';
-
-  @override
-  String get downloadFilenameInsertTag => 'Tap to insert tag:';
-
-  @override
-  String get downloadSeparateSinglesEnabled => 'Albums/ and Singles/ folders';
-
-  @override
-  String get downloadSeparateSinglesDisabled => 'All files in same structure';
-
-  @override
-  String get downloadArtistNameFilters => 'Artist Name Filters';
-
-  @override
-  String get downloadCreatePlaylistSourceFolder =>
-      'Create playlist source folder';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderEnabled =>
-      'Playlist downloads use Playlist/ plus your normal folder structure.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderDisabled =>
-      'Playlist downloads use the normal folder structure only.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderRedundant =>
-      'By Playlist already places downloads inside a playlist folder.';
-
-  @override
-  String get downloadSongLinkRegion => 'SongLink Region';
-
-  @override
-  String get downloadNetworkCompatibilityMode => 'Network compatibility mode';
-
-  @override
-  String get downloadNetworkCompatibilityModeEnabled =>
-      'Enabled: try HTTP + accept invalid TLS certificates (unsafe)';
-
-  @override
-  String get downloadNetworkCompatibilityModeDisabled =>
-      'Off: strict HTTPS certificate validation (recommended)';
-
-  @override
-  String get downloadSelectServiceToEnable =>
-      'Select a built-in service to enable';
-
-  @override
-  String get downloadSelectTidalQobuz =>
-      'Select Tidal or Qobuz above to configure quality';
-
-  @override
-  String get downloadEmbedLyricsDisabled =>
-      'Disabled while Embed Metadata is turned off';
-
-  @override
-  String get downloadNeteaseIncludeTranslation =>
-      'Netease: Include Translation';
-
-  @override
-  String get downloadNeteaseIncludeTranslationEnabled =>
-      'Append translated lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeTranslationDisabled =>
-      'Use original lyrics only';
-
-  @override
-  String get downloadNeteaseIncludeRomanization =>
-      'Netease: Include Romanization';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationEnabled =>
-      'Append romanized lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationDisabled => 'Disabled';
-
-  @override
-  String get downloadAppleQqMultiPerson => 'Apple/QQ Multi-Person Word-by-Word';
-
-  @override
-  String get downloadAppleQqMultiPersonEnabled =>
-      'Enable v1/v2 speaker and [bg:] tags';
-
-  @override
-  String get downloadAppleQqMultiPersonDisabled =>
-      'Simplified word-by-word formatting';
-
-  @override
-  String get downloadMusixmatchLanguage => 'Musixmatch Language';
-
-  @override
-  String get downloadMusixmatchLanguageAuto => 'Auto (original)';
-
-  @override
-  String get downloadFilterContributing =>
-      'Filter contributing artists in Album Artist';
-
-  @override
-  String get downloadFilterContributingEnabled =>
-      'Album Artist metadata uses primary artist only';
-
-  @override
-  String get downloadFilterContributingDisabled =>
-      'Keep full Album Artist metadata value';
-
-  @override
-  String get downloadProvidersNoneEnabled => 'None enabled';
-
-  @override
-  String get downloadMusixmatchLanguageCode => 'Language code';
-
-  @override
-  String get downloadMusixmatchLanguageHint => 'auto / en / es / ja';
-
-  @override
-  String get downloadMusixmatchLanguageDesc =>
-      'Set preferred language code (example: en, es, ja). Leave empty for auto.';
-
-  @override
-  String get downloadMusixmatchAuto => 'Auto';
-
-  @override
-  String get downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
-
-  @override
-  String get downloadNetworkWifiOnlySubtitle =>
-      'Pause downloads on mobile data';
-
-  @override
-  String get downloadSongLinkRegionDesc =>
-      'Used as userCountry for SongLink API lookup.';
-
-  @override
-  String get snackbarUnsupportedAudioFormat => 'Unsupported audio format';
-
-  @override
-  String get cacheRefresh => 'Refresh';
-
-  @override
-  String dialogDownloadPlaylistsMessage(int trackCount, int playlistCount) {
-    String _temp0 = intl.Intl.pluralLogic(
-      trackCount,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    String _temp1 = intl.Intl.pluralLogic(
-      playlistCount,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $trackCount $_temp0 from $playlistCount $_temp1?';
-  }
-
-  @override
-  String bulkDownloadPlaylistsButton(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $count $_temp0';
-  }
-
-  @override
-  String get bulkDownloadSelectPlaylists => 'Select playlists to download';
-
-  @override
-  String get snackbarSelectedPlaylistsEmpty =>
-      'Selected playlists have no tracks';
-
-  @override
-  String playlistsCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count playlists',
-      one: '1 playlist',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get editMetadataAutoFill => 'Auto-fill from online';
-
-  @override
-  String get editMetadataAutoFillDesc =>
-      'Select fields to fill automatically from online metadata';
-
-  @override
-  String get editMetadataAutoFillFetch => 'Fetch & Fill';
-
-  @override
-  String get editMetadataAutoFillSearching => 'Searching online...';
-
-  @override
-  String get editMetadataAutoFillNoResults =>
-      'No matching metadata found online';
-
-  @override
-  String editMetadataAutoFillDone(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'fields',
-      one: 'field',
-    );
-    return 'Filled $count $_temp0 from online metadata';
-  }
-
-  @override
-  String get editMetadataAutoFillNoneSelected =>
-      'Select at least one field to auto-fill';
-
-  @override
-  String get editMetadataFieldTitle => 'Title';
-
-  @override
-  String get editMetadataFieldArtist => 'Artist';
-
-  @override
-  String get editMetadataFieldAlbum => 'Album';
-
-  @override
-  String get editMetadataFieldAlbumArtist => 'Album Artist';
-
-  @override
-  String get editMetadataFieldDate => 'Date';
-
-  @override
-  String get editMetadataFieldTrackNum => 'Track #';
-
-  @override
-  String get editMetadataFieldDiscNum => 'Disc #';
-
-  @override
-  String get editMetadataFieldGenre => 'Genre';
-
-  @override
-  String get editMetadataFieldIsrc => 'ISRC';
-
-  @override
-  String get editMetadataFieldLabel => 'Label';
-
-  @override
-  String get editMetadataFieldCopyright => 'Copyright';
-
-  @override
-  String get editMetadataFieldCover => 'Cover Art';
-
-  @override
-  String get editMetadataSelectAll => 'All';
-
-  @override
-  String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
 }

lib/l10n/app_localizations_ru.dart

@@ -363,7 +363,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Скачивайте треки Spotify в lossless качестве с Tidal и Qobuz.';
+      'Скачайте треки Spotify в Lossless качестве из Tidal, Qobuz и Amazon Music.';
 
   @override
   String get artistAlbums => 'Альбомы';
@@ -534,9 +534,6 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get dialogImport => 'Импорт';
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get dialogDiscard => 'Отменить';
 
@@ -706,15 +703,15 @@ class AppLocalizationsRu extends AppLocalizations {
   String get errorNoTracksFound => 'Треки не найдены';
 
   @override
-  String get errorUrlNotRecognized => 'Ссылка не распознана';
+  String get errorUrlNotRecognized => 'Link not recognized';
 
   @override
   String get errorUrlNotRecognizedMessage =>
-      'Эта ссылка не поддерживается. Убедитесь, что URL-адрес указан правильно и установлено совместимое расширение.';
+      'This link is not supported. Make sure the URL is correct and a compatible extension is installed.';
 
   @override
   String get errorUrlFetchFailed =>
-      'Не удалось загрузить контент по этой ссылке. Пожалуйста, попробуйте еще раз.';
+      'Failed to load content from this link. Please try again.';
 
   @override
   String errorMissingExtensionSource(String item) {
@@ -773,36 +770,6 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get searchPlaylists => 'Плейлисты';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Воспроизвести';
 
@@ -820,11 +787,11 @@ class AppLocalizationsRu extends AppLocalizations {
   String get folderOrganizationNone => 'Без организации';
 
   @override
-  String get folderOrganizationByPlaylist => 'По плейлисту';
+  String get folderOrganizationByPlaylist => 'By Playlist';
 
   @override
   String get folderOrganizationByPlaylistSubtitle =>
-      'Отдельная папка для каждого плейлиста';
+      'Separate folder for each playlist';
 
   @override
   String get folderOrganizationByArtist => 'По исполнителю';
@@ -1249,47 +1216,6 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get storeClearFilters => 'Очистить фильтры';
 
-  @override
-  String get storeAddRepoTitle => 'Add Extension Repository';
-
-  @override
-  String get storeAddRepoDescription =>
-      'Enter a GitHub repository URL that contains a registry.json file to browse and install extensions.';
-
-  @override
-  String get storeRepoUrlLabel => 'Repository URL';
-
-  @override
-  String get storeRepoUrlHint => 'https://github.com/user/repo';
-
-  @override
-  String get storeRepoUrlHelper =>
-      'e.g. https://github.com/user/extensions-repo';
-
-  @override
-  String get storeAddRepoButton => 'Add Repository';
-
-  @override
-  String get storeChangeRepoTooltip => 'Change repository';
-
-  @override
-  String get storeRepoDialogTitle => 'Extension Repository';
-
-  @override
-  String get storeRepoDialogCurrent => 'Current repository:';
-
-  @override
-  String get storeNewRepoUrlLabel => 'New Repository URL';
-
-  @override
-  String get storeLoadError => 'Failed to load store';
-
-  @override
-  String get storeEmptyNoExtensions => 'No extensions available';
-
-  @override
-  String get storeEmptyNoResults => 'No extensions found';
-
   @override
   String get extensionDefaultProvider => 'По умолчанию (Deezer/Spotify)';
 
@@ -1444,42 +1370,20 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get qualityHiResFlacMaxSubtitle => '24-бит / до 192кГц';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
-  @override
-  String get downloadLossy320Format => 'Lossy 320kbps Format';
-
-  @override
-  String get downloadLossy320FormatDesc =>
-      'Choose the output format for Tidal 320kbps lossy downloads. The original AAC stream will be converted to your selected format.';
-
-  @override
-  String get downloadLossyMp3 => 'MP3 320kbps';
-
-  @override
-  String get downloadLossyMp3Subtitle => 'Best compatibility, ~10MB per track';
-
-  @override
-  String get downloadLossyOpus256 => 'Opus 256kbps';
-
-  @override
-  String get downloadLossyOpus256Subtitle =>
-      'Best quality Opus, ~8MB per track';
-
-  @override
-  String get downloadLossyOpus128 => 'Opus 128kbps';
-
-  @override
-  String get downloadLossyOpus128Subtitle => 'Smallest size, ~4MB per track';
-
   @override
   String get qualityNote =>
       'Фактическое качество зависит от доступности треков в сервисе';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube обеспечивает только звук с потерями(Lossy).';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'Битрейт YouTube Opus';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'Битрейт YouTube MP3';
+
   @override
   String get downloadAskBeforeDownload => 'Спрашивать перед скачиванием';
 
@@ -1502,7 +1406,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get downloadUsePrimaryArtistOnlyEnabled =>
-      'Список исполнителей, чьи работы были удалены из названия папки (например, Джастин Бибер, Quavo → Джастин Бибер)';
+      'Featured artists removed from folder name (e.g. Justin Bieber, Quavo → Justin Bieber)';
 
   @override
   String get downloadUsePrimaryArtistOnlyDisabled =>
@@ -1581,13 +1485,6 @@ class AppLocalizationsRu extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Исполнитель/Альбом и Исполнитель/Сингл/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Удалить выбранные';
 
@@ -1790,25 +1687,6 @@ class AppLocalizationsRu extends AppLocalizations {
   String get libraryShowDuplicateIndicatorSubtitle =>
       'Показать при поиске существующих треков';
 
-  @override
-  String get libraryAutoScan => 'Auto Scan';
-
-  @override
-  String get libraryAutoScanSubtitle =>
-      'Automatically scan your library for new files';
-
-  @override
-  String get libraryAutoScanOff => 'Off';
-
-  @override
-  String get libraryAutoScanOnOpen => 'Every app open';
-
-  @override
-  String get libraryAutoScanDaily => 'Daily';
-
-  @override
-  String get libraryAutoScanWeekly => 'Weekly';
-
   @override
   String get libraryActions => 'Действия';
 
@@ -1999,7 +1877,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Получите аудио в качестве FLAC от Tidal, Qobuz или Deezer';
+      'Скачайте FLAC с Tidal, Qobuz или Amazon Music';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2095,7 +1973,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String cleanupOrphanedDownloadsResult(int count) {
-    return 'Удалено $count утерянных записей из истории';
+    return 'Removed $count orphaned entries from history';
   }
 
   @override
@@ -2120,7 +1998,7 @@ class AppLocalizationsRu extends AppLocalizations {
   String get cacheSectionStorage => 'Кэшированные данные';
 
   @override
-  String get cacheSectionMaintenance => 'Обслуживание';
+  String get cacheSectionMaintenance => 'Maintenance';
 
   @override
   String get cacheAppDirectory => 'Папка кэша приложения';
@@ -2166,7 +2044,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get cacheCleanupUnusedDesc =>
-      'Удалить записи из истории загрузок и библиотеки, которые остались без файлов.';
+      'Remove orphaned download history and library entries for missing files.';
 
   @override
   String get cacheNoData => 'Нет кэшированных данных';
@@ -2214,7 +2092,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get cacheCleanupUnusedSubtitle =>
-      'Удалить историю загрузок, оставшихся без просмотра, и отсутствующие записи в библиотеке';
+      'Remove orphaned download history and missing library entries';
 
   @override
   String cacheCleanupResult(int downloadCount, int libraryCount) {
@@ -2276,28 +2154,6 @@ class AppLocalizationsRu extends AppLocalizations {
   String get trackReEnrichFfmpegFailed =>
       'Ошибка встраивания метаданных FFmpeg';
 
-  @override
-  String get queueFlacAction => 'Queue FLAC';
-
-  @override
-  String queueFlacConfirmMessage(int count) {
-    return 'Search online matches for the selected tracks and queue FLAC downloads.\n\nExisting files will not be modified or deleted.\n\nOnly high-confidence matches are queued automatically.\n\n$count selected';
-  }
-
-  @override
-  String queueFlacFindingProgress(int current, int total) {
-    return 'Finding FLAC matches... ($current/$total)';
-  }
-
-  @override
-  String get queueFlacNoReliableMatches =>
-      'No reliable online matches found for the selection';
-
-  @override
-  String queueFlacQueuedWithSkipped(int addedCount, int skippedCount) {
-    return 'Added $addedCount tracks to queue, skipped $skippedCount';
-  }
-
   @override
   String trackSaveFailed(String error) {
     return 'Ошибка: $error';
@@ -2330,18 +2186,6 @@ class AppLocalizationsRu extends AppLocalizations {
     return 'Конвертировать из $sourceFormat в $targetFormat $bitrate?\n\nОригинальный файл будет удален после конвертации.';
   }
 
-  @override
-  String trackConvertConfirmMessageLossless(
-    String sourceFormat,
-    String targetFormat,
-  ) {
-    return 'Convert from $sourceFormat to $targetFormat? (Lossless — no quality loss)\n\nThe original file will be deleted after conversion.';
-  }
-
-  @override
-  String get trackConvertLosslessHint =>
-      'Lossless conversion — no quality loss';
-
   @override
   String get trackConvertConverting => 'Конвертация аудио...';
 
@@ -2354,52 +2198,52 @@ class AppLocalizationsRu extends AppLocalizations {
   String get trackConvertFailed => 'Ошибка конвертации';
 
   @override
-  String get cueSplitTitle => 'Разделить CUE Sheet';
+  String get cueSplitTitle => 'Split CUE Sheet';
 
   @override
-  String get cueSplitSubtitle => 'Разделить файл CUE+FLAC на отдельные треки';
+  String get cueSplitSubtitle => 'Split CUE+FLAC into individual tracks';
 
   @override
   String cueSplitAlbum(String album) {
-    return 'Альбом: $album';
+    return 'Album: $album';
   }
 
   @override
   String cueSplitArtist(String artist) {
-    return 'Артист: $artist';
+    return 'Artist: $artist';
   }
 
   @override
   String cueSplitTrackCount(int count) {
-    return '$count треков';
+    return '$count tracks';
   }
 
   @override
-  String get cueSplitConfirmTitle => 'Разделенный CUE-альбом';
+  String get cueSplitConfirmTitle => 'Split CUE Album';
 
   @override
   String cueSplitConfirmMessage(String album, int count) {
-    return 'Разбить \"$album\" на $count отдельных FLAC-файлов?';
+    return 'Split \"$album\" into $count individual FLAC files?\n\nFiles will be saved to the same directory.';
   }
 
   @override
   String cueSplitSplitting(int current, int total) {
-    return 'Разделение CUE sheet... ($current/$total)';
+    return 'Splitting CUE sheet... ($current/$total)';
   }
 
   @override
   String cueSplitSuccess(int count) {
-    return 'Успешно разделено на $count треков';
+    return 'Split into $count tracks successfully';
   }
 
   @override
-  String get cueSplitFailed => 'Разделение CUE не удалось';
+  String get cueSplitFailed => 'CUE split failed';
 
   @override
-  String get cueSplitNoAudioFile => 'Аудиофайл для этого CUE sheet не найден';
+  String get cueSplitNoAudioFile => 'Audio file not found for this CUE sheet';
 
   @override
-  String get cueSplitButton => 'Разделить на Треки';
+  String get cueSplitButton => 'Split into Tracks';
 
   @override
   String get actionCreate => 'Создать';
@@ -2565,8 +2409,7 @@ class AppLocalizationsRu extends AppLocalizations {
   }
 
   @override
-  String get selectionShareNoFiles =>
-      'Файлы, доступные для совместного доступа, не найдены';
+  String get selectionShareNoFiles => 'No shareable files found';
 
   @override
   String selectionConvertCount(int count) {
@@ -2599,18 +2442,7 @@ class AppLocalizationsRu extends AppLocalizations {
       other: 'tracks',
       one: 'track',
     );
-    return 'Преобразовать $count $_temp0 в $format с $bitrate?';
-  }
-
-  @override
-  String selectionBatchConvertConfirmMessageLossless(int count, String format) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    return 'Convert $count $_temp0 to $format? (Lossless — no quality loss)\n\nOriginal files will be deleted after conversion.';
+    return 'Convert $count $_temp0 to $format at $bitrate?\n\nOriginal files will be deleted after conversion.';
   }
 
   @override
@@ -2635,520 +2467,4 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get downloadUseAlbumArtistForFoldersTrackSubtitle =>
       'Папки исполнителя используют только трек исполнителя';
-
-  @override
-  String get lyricsProvidersTitle => 'Lyrics Providers';
-
-  @override
-  String get lyricsProvidersDescription =>
-      'Enable, disable and reorder lyrics sources. Providers are tried top-to-bottom until lyrics are found.';
-
-  @override
-  String get lyricsProvidersInfoText =>
-      'Extension lyrics providers always run before built-in providers. At least one provider must remain enabled.';
-
-  @override
-  String lyricsProvidersEnabledSection(int count) {
-    return 'Enabled ($count)';
-  }
-
-  @override
-  String lyricsProvidersDisabledSection(int count) {
-    return 'Disabled ($count)';
-  }
-
-  @override
-  String get lyricsProvidersAtLeastOne =>
-      'At least one provider must remain enabled';
-
-  @override
-  String get lyricsProvidersSaved => 'Lyrics provider priority saved';
-
-  @override
-  String get lyricsProvidersDiscardContent =>
-      'You have unsaved changes that will be lost.';
-
-  @override
-  String get lyricsProviderSpotifyApiDesc =>
-      'Spotify-sourced synced lyrics via community API';
-
-  @override
-  String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
-
-  @override
-  String get lyricsProviderNeteaseDesc =>
-      'NetEase Cloud Music (good for Asian songs)';
-
-  @override
-  String get lyricsProviderMusixmatchDesc =>
-      'Largest lyrics database (multi-language)';
-
-  @override
-  String get lyricsProviderAppleMusicDesc =>
-      'Word-by-word synced lyrics (via proxy)';
-
-  @override
-  String get lyricsProviderQqMusicDesc =>
-      'QQ Music (good for Chinese songs, via proxy)';
-
-  @override
-  String get lyricsProviderExtensionDesc => 'Extension provider';
-
-  @override
-  String get safMigrationTitle => 'Storage Update Required';
-
-  @override
-  String get safMigrationMessage1 =>
-      'SpotiFLAC now uses Android Storage Access Framework (SAF) for downloads. This fixes \"permission denied\" errors on Android 10+.';
-
-  @override
-  String get safMigrationMessage2 =>
-      'Please select your download folder again to switch to the new storage system.';
-
-  @override
-  String get safMigrationSuccess => 'Download folder updated to SAF mode';
-
-  @override
-  String get settingsDonate => 'Donate';
-
-  @override
-  String get settingsDonateSubtitle => 'Support SpotiFLAC-Mobile development';
-
-  @override
-  String get tooltipLoveAll => 'Love All';
-
-  @override
-  String get tooltipAddToPlaylist => 'Add to Playlist';
-
-  @override
-  String snackbarRemovedTracksFromLoved(int count) {
-    return 'Removed $count tracks from Loved';
-  }
-
-  @override
-  String snackbarAddedTracksToLoved(int count) {
-    return 'Added $count tracks to Loved';
-  }
-
-  @override
-  String get dialogDownloadAllTitle => 'Download All';
-
-  @override
-  String dialogDownloadAllMessage(int count) {
-    return 'Download $count tracks?';
-  }
-
-  @override
-  String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
-
-  @override
-  String get homeGoToAlbum => 'Go to Album';
-
-  @override
-  String get homeAlbumInfoUnavailable => 'Album info not available';
-
-  @override
-  String get snackbarLoadingCueSheet => 'Loading CUE sheet...';
-
-  @override
-  String get snackbarMetadataSaved => 'Metadata saved successfully';
-
-  @override
-  String get snackbarFailedToEmbedLyrics => 'Failed to embed lyrics';
-
-  @override
-  String get snackbarFailedToWriteStorage => 'Failed to write back to storage';
-
-  @override
-  String snackbarError(String error) {
-    return 'Error: $error';
-  }
-
-  @override
-  String get snackbarNoActionDefined => 'No action defined for this button';
-
-  @override
-  String get noTracksFoundForAlbum => 'No tracks found for this album';
-
-  @override
-  String get downloadLocationSubtitle =>
-      'Choose storage mode for downloaded files.';
-
-  @override
-  String get storageModeAppFolder => 'App folder (non-SAF)';
-
-  @override
-  String get storageModeAppFolderSubtitle => 'Use default Music/SpotiFLAC path';
-
-  @override
-  String get storageModeSaf => 'SAF folder';
-
-  @override
-  String get storageModeSafSubtitle =>
-      'Pick folder via Android Storage Access Framework';
-
-  @override
-  String get downloadFilenameDescription =>
-      'Customize how your files are named.';
-
-  @override
-  String get downloadFilenameInsertTag => 'Tap to insert tag:';
-
-  @override
-  String get downloadSeparateSinglesEnabled => 'Albums/ and Singles/ folders';
-
-  @override
-  String get downloadSeparateSinglesDisabled => 'All files in same structure';
-
-  @override
-  String get downloadArtistNameFilters => 'Artist Name Filters';
-
-  @override
-  String get downloadCreatePlaylistSourceFolder =>
-      'Create playlist source folder';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderEnabled =>
-      'Playlist downloads use Playlist/ plus your normal folder structure.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderDisabled =>
-      'Playlist downloads use the normal folder structure only.';
-
-  @override
-  String get downloadCreatePlaylistSourceFolderRedundant =>
-      'By Playlist already places downloads inside a playlist folder.';
-
-  @override
-  String get downloadSongLinkRegion => 'SongLink Region';
-
-  @override
-  String get downloadNetworkCompatibilityMode => 'Network compatibility mode';
-
-  @override
-  String get downloadNetworkCompatibilityModeEnabled =>
-      'Enabled: try HTTP + accept invalid TLS certificates (unsafe)';
-
-  @override
-  String get downloadNetworkCompatibilityModeDisabled =>
-      'Off: strict HTTPS certificate validation (recommended)';
-
-  @override
-  String get downloadSelectServiceToEnable =>
-      'Select a built-in service to enable';
-
-  @override
-  String get downloadSelectTidalQobuz =>
-      'Select Tidal or Qobuz above to configure quality';
-
-  @override
-  String get downloadEmbedLyricsDisabled =>
-      'Disabled while Embed Metadata is turned off';
-
-  @override
-  String get downloadNeteaseIncludeTranslation =>
-      'Netease: Include Translation';
-
-  @override
-  String get downloadNeteaseIncludeTranslationEnabled =>
-      'Append translated lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeTranslationDisabled =>
-      'Use original lyrics only';
-
-  @override
-  String get downloadNeteaseIncludeRomanization =>
-      'Netease: Include Romanization';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationEnabled =>
-      'Append romanized lyrics when available';
-
-  @override
-  String get downloadNeteaseIncludeRomanizationDisabled => 'Disabled';
-
-  @override
-  String get downloadAppleQqMultiPerson => 'Apple/QQ Multi-Person Word-by-Word';
-
-  @override
-  String get downloadAppleQqMultiPersonEnabled =>
-      'Enable v1/v2 speaker and [bg:] tags';
-
-  @override
-  String get downloadAppleQqMultiPersonDisabled =>
-      'Simplified word-by-word formatting';
-
-  @override
-  String get downloadMusixmatchLanguage => 'Musixmatch Language';
-
-  @override
-  String get downloadMusixmatchLanguageAuto => 'Auto (original)';
-
-  @override
-  String get downloadFilterContributing =>
-      'Filter contributing artists in Album Artist';
-
-  @override
-  String get downloadFilterContributingEnabled =>
-      'Album Artist metadata uses primary artist only';
-
-  @override
-  String get downloadFilterContributingDisabled =>
-      'Keep full Album Artist metadata value';
-
-  @override
-  String get downloadProvidersNoneEnabled => 'None enabled';
-
-  @override
-  String get downloadMusixmatchLanguageCode => 'Language code';
-
-  @override
-  String get downloadMusixmatchLanguageHint => 'auto / en / es / ja';
-
-  @override
-  String get downloadMusixmatchLanguageDesc =>
-      'Set preferred language code (example: en, es, ja). Leave empty for auto.';
-
-  @override
-  String get downloadMusixmatchAuto => 'Auto';
-
-  @override
-  String get downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
-
-  @override
-  String get downloadNetworkWifiOnlySubtitle =>
-      'Pause downloads on mobile data';
-
-  @override
-  String get downloadSongLinkRegionDesc =>
-      'Used as userCountry for SongLink API lookup.';
-
-  @override
-  String get snackbarUnsupportedAudioFormat => 'Unsupported audio format';
-
-  @override
-  String get cacheRefresh => 'Refresh';
-
-  @override
-  String dialogDownloadPlaylistsMessage(int trackCount, int playlistCount) {
-    String _temp0 = intl.Intl.pluralLogic(
-      trackCount,
-      locale: localeName,
-      other: 'tracks',
-      one: 'track',
-    );
-    String _temp1 = intl.Intl.pluralLogic(
-      playlistCount,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $trackCount $_temp0 from $playlistCount $_temp1?';
-  }
-
-  @override
-  String bulkDownloadPlaylistsButton(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'playlists',
-      one: 'playlist',
-    );
-    return 'Download $count $_temp0';
-  }
-
-  @override
-  String get bulkDownloadSelectPlaylists => 'Select playlists to download';
-
-  @override
-  String get snackbarSelectedPlaylistsEmpty =>
-      'Selected playlists have no tracks';
-
-  @override
-  String playlistsCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count playlists',
-      one: '1 playlist',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get editMetadataAutoFill => 'Auto-fill from online';
-
-  @override
-  String get editMetadataAutoFillDesc =>
-      'Select fields to fill automatically from online metadata';
-
-  @override
-  String get editMetadataAutoFillFetch => 'Fetch & Fill';
-
-  @override
-  String get editMetadataAutoFillSearching => 'Searching online...';
-
-  @override
-  String get editMetadataAutoFillNoResults =>
-      'No matching metadata found online';
-
-  @override
-  String editMetadataAutoFillDone(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'fields',
-      one: 'field',
-    );
-    return 'Filled $count $_temp0 from online metadata';
-  }
-
-  @override
-  String get editMetadataAutoFillNoneSelected =>
-      'Select at least one field to auto-fill';
-
-  @override
-  String get editMetadataFieldTitle => 'Title';
-
-  @override
-  String get editMetadataFieldArtist => 'Artist';
-
-  @override
-  String get editMetadataFieldAlbum => 'Album';
-
-  @override
-  String get editMetadataFieldAlbumArtist => 'Album Artist';
-
-  @override
-  String get editMetadataFieldDate => 'Date';
-
-  @override
-  String get editMetadataFieldTrackNum => 'Track #';
-
-  @override
-  String get editMetadataFieldDiscNum => 'Disc #';
-
-  @override
-  String get editMetadataFieldGenre => 'Genre';
-
-  @override
-  String get editMetadataFieldIsrc => 'ISRC';
-
-  @override
-  String get editMetadataFieldLabel => 'Label';
-
-  @override
-  String get editMetadataFieldCopyright => 'Copyright';
-
-  @override
-  String get editMetadataFieldCover => 'Cover Art';
-
-  @override
-  String get editMetadataSelectAll => 'All';
-
-  @override
-  String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
 }

lib/l10n/arb/app_de.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Lade Spotify-Titel in verlustfreier Qualität von Tidal und Qobuz herunter.",
+  "aboutAppDescription": "Lade Spotify-Titel in verlustfreier Qualität von Tidal, Qobuz und Amazon Music herunter.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -555,7 +555,7 @@
   "@setupDownloadLocationTitle": {
     "description": "Download location dialog title"
   },
-  "setupDownloadLocationIosMessage": "Auf iOS werden Downloads im Dokumentenordner der App gespeichert. Du kannst sie über die Datei-App aufrufen.",
+  "setupDownloadLocationIosMessage": "Auf iOS werden Downloads im Dokumentenverzeichnis der App gespeichert. Du kannst sie über die Datei-App aufrufen.",
   "@setupDownloadLocationIosMessage": {
     "description": "iOS-specific folder info"
   },
@@ -897,18 +897,6 @@
   "@errorNoTracksFound": {
     "description": "Error - search returned no results"
   },
-  "errorUrlNotRecognized": "Link wurde nicht erkannt",
-  "@errorUrlNotRecognized": {
-    "description": "Error title - URL not handled by any extension or service"
-  },
-  "errorUrlNotRecognizedMessage": "Dieser Link ist inkompatibel. Prüfe die URL und stelle sicher, dass eine kompatible Erweiterung installiert ist.",
-  "@errorUrlNotRecognizedMessage": {
-    "description": "Error message - URL not recognized explanation"
-  },
-  "errorUrlFetchFailed": "Laden fehlgeschlagen. Bitte erneut versuchen.",
-  "@errorUrlFetchFailed": {
-    "description": "Error message - generic URL fetch failure"
-  },
   "errorMissingExtensionSource": "Kann {item} nicht lade wegen fehlender Erweiterungsquelle",
   "@errorMissingExtensionSource": {
     "description": "Error - extension source not available",
@@ -959,7 +947,7 @@
   "@selectionAllSelected": {
     "description": "Status - all items selected"
   },
-  "selectionSelectToDelete": "Titel zum Löschen wählen",
+  "selectionSelectToDelete": "Titel zum Löschen auswählen",
   "@selectionSelectToDelete": {
     "description": "Placeholder when nothing selected"
   },
@@ -987,7 +975,7 @@
   "@searchArtists": {
     "description": "Search result category - artists"
   },
-  "searchAlbums": "Alben",
+  "searchAlbums": "Albums",
   "@searchAlbums": {
     "description": "Search result category - albums"
   },
@@ -1015,14 +1003,6 @@
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "Nach Playlist",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Ordner für jede Playlist trennen",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "Nach Künstler",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1039,7 +1019,7 @@
   "@folderOrganizationDescription": {
     "description": "Folder organization sheet description"
   },
-  "folderOrganizationNoneSubtitle": "Alle Dateien im Download-Ordner",
+  "folderOrganizationNoneSubtitle": "Alle Dateien im Download-Verzeichnis",
   "@folderOrganizationNoneSubtitle": {
     "description": "Subtitle for no organization option"
   },
@@ -1117,7 +1097,7 @@
   },
   "providerBuiltIn": "Integriert",
   "@providerBuiltIn": {
-    "description": "Label for built-in providers (Tidal/Qobuz)"
+    "description": "Label for built-in providers (Tidal/Qobuz/Amazon)"
   },
   "providerExtension": "Erweiterung",
   "@providerExtension": {
@@ -1773,11 +1753,23 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube bietet nur verlustbehaftete Audioqualität. Deswegen ist es kein Teil des verlustfreien Fallbacks.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Qualität vor Download fragen",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
   },
-  "downloadDirectory": "Download-Ordner",
+  "downloadDirectory": "Downloadverzeichnis",
   "@downloadDirectory": {
     "description": "Setting - download folder"
   },
@@ -1785,15 +1777,15 @@
   "@downloadSeparateSinglesFolder": {
     "description": "Setting - separate folder for singles"
   },
-  "downloadAlbumFolderStructure": "Album-Ordnerstruktur",
+  "downloadAlbumFolderStructure": "Album Folder Structure",
   "@downloadAlbumFolderStructure": {
     "description": "Setting - album folder organization"
   },
-  "downloadUseAlbumArtistForFolders": "Album-Künstler für Ordner verwenden",
+  "downloadUseAlbumArtistForFolders": "Use Album Artist for folders",
   "@downloadUseAlbumArtistForFolders": {
     "description": "Setting - choose whether artist folders use Album Artist or Track Artist"
   },
-  "downloadUsePrimaryArtistOnly": "Primärer Künstler nur für Ordner",
+  "downloadUsePrimaryArtistOnly": "Primary artist only for folders",
   "@downloadUsePrimaryArtistOnly": {
     "description": "Setting - strip featured artists from folder name"
   },
@@ -1801,7 +1793,7 @@
   "@downloadUsePrimaryArtistOnlyEnabled": {
     "description": "Subtitle when primary artist only is enabled"
   },
-  "downloadUsePrimaryArtistOnlyDisabled": "Vollständiger Künstler für Ordnername",
+  "downloadUsePrimaryArtistOnlyDisabled": "Full artist string used for folder name",
   "@downloadUsePrimaryArtistOnlyDisabled": {
     "description": "Subtitle when primary artist only is disabled"
   },
@@ -1829,7 +1821,7 @@
   "@queueClearAllMessage": {
     "description": "Clear queue confirmation"
   },
-  "settingsAutoExportFailed": "Auto-Export fehlgeschlagener Downloads",
+  "settingsAutoExportFailed": "Auto-export failed downloads",
   "@settingsAutoExportFailed": {
     "description": "Setting toggle for auto-export"
   },
@@ -1857,15 +1849,15 @@
   "@albumFolderArtistAlbum": {
     "description": "Album folder option"
   },
-  "albumFolderArtistAlbumSubtitle": "Alben/Künster Name/Album Name/",
+  "albumFolderArtistAlbumSubtitle": "Albums/Artist Name/Album Name/",
   "@albumFolderArtistAlbumSubtitle": {
     "description": "Folder structure example"
   },
-  "albumFolderArtistYearAlbum": "Künstler / [Year] Album",
+  "albumFolderArtistYearAlbum": "Artist / [Year] Album",
   "@albumFolderArtistYearAlbum": {
     "description": "Album folder option with year"
   },
-  "albumFolderArtistYearAlbumSubtitle": "Alben/Künster Name/[2005] Album Name/",
+  "albumFolderArtistYearAlbumSubtitle": "Albums/Künster Name/[2005] Album Name/",
   "@albumFolderArtistYearAlbumSubtitle": {
     "description": "Folder structure example"
   },
@@ -1881,15 +1873,15 @@
   "@albumFolderYearAlbum": {
     "description": "Album folder option with year"
   },
-  "albumFolderYearAlbumSubtitle": "Alben/[2005] Album Name/",
+  "albumFolderYearAlbumSubtitle": "Albums/[2005] Album Name/",
   "@albumFolderYearAlbumSubtitle": {
     "description": "Folder structure example"
   },
-  "albumFolderArtistAlbumSingles": "Künstler / Album + Singles",
+  "albumFolderArtistAlbumSingles": "Artist / Album + Singles",
   "@albumFolderArtistAlbumSingles": {
     "description": "Album folder option with singles inside artist"
   },
-  "albumFolderArtistAlbumSinglesSubtitle": "Künstler/Album/ und Künstler/Singles/",
+  "albumFolderArtistAlbumSinglesSubtitle": "Artist/Album/ and Artist/Singles/",
   "@albumFolderArtistAlbumSinglesSubtitle": {
     "description": "Folder structure example"
   },
@@ -1932,7 +1924,7 @@
       }
     }
   },
-  "downloadedAlbumSelectToDelete": "Titel zum Löschen wählen",
+  "downloadedAlbumSelectToDelete": "Select tracks to delete",
   "@downloadedAlbumSelectToDelete": {
     "description": "Placeholder when nothing selected"
   },
@@ -2004,7 +1996,7 @@
   "@discographyAlbumsOnly": {
     "description": "Option - download only albums"
   },
-  "discographyAlbumsOnlySubtitle": "{count} Titel aus {albumCount} Alben",
+  "discographyAlbumsOnlySubtitle": "{count} Titel von {albumCount} Albums",
   "@discographyAlbumsOnlySubtitle": {
     "description": "Subtitle showing album tracks count",
     "placeholders": {
@@ -2036,7 +2028,7 @@
   "@discographySelectAlbums": {
     "description": "Option - manually select albums to download"
   },
-  "discographySelectAlbumsSubtitle": "Wähle bestimmte Alben oder Singles",
+  "discographySelectAlbumsSubtitle": "Choose specific albums or singles",
   "@discographySelectAlbumsSubtitle": {
     "description": "Subtitle for select albums option"
   },
@@ -2044,7 +2036,7 @@
   "@discographyFetchingTracks": {
     "description": "Progress - fetching album tracks"
   },
-  "discographyFetchingAlbum": "Lade {current} von {total}...",
+  "discographyFetchingAlbum": "Fetching {current} of {total}...",
   "@discographyFetchingAlbum": {
     "description": "Progress - fetching specific album",
     "placeholders": {
@@ -2069,7 +2061,7 @@
   "@discographyDownloadSelected": {
     "description": "Button - download selected albums"
   },
-  "discographyAddedToQueue": "{count} Titel zur Warteschlange hinzugefügt",
+  "discographyAddedToQueue": "Added {count} tracks to queue",
   "@discographyAddedToQueue": {
     "description": "Snackbar - tracks added from discography",
     "placeholders": {
@@ -2094,7 +2086,7 @@
   "@discographyNoAlbums": {
     "description": "Error - no albums found for artist"
   },
-  "discographyFailedToFetch": "Fehler beim Abrufen einiger Alben",
+  "discographyFailedToFetch": "Failed to fetch some albums",
   "@discographyFailedToFetch": {
     "description": "Error - some albums failed to load"
   },
@@ -2106,15 +2098,15 @@
   "@allFilesAccess": {
     "description": "Toggle for MANAGE_EXTERNAL_STORAGE permission"
   },
-  "allFilesAccessEnabledSubtitle": "Darf in jeden Ordner schreiben",
+  "allFilesAccessEnabledSubtitle": "Can write to any folder",
   "@allFilesAccessEnabledSubtitle": {
     "description": "Subtitle when all files access is enabled"
   },
-  "allFilesAccessDisabledSubtitle": "Nur auf Medienordner begrenzt",
+  "allFilesAccessDisabledSubtitle": "Limited to media folders only",
   "@allFilesAccessDisabledSubtitle": {
     "description": "Subtitle when all files access is disabled"
   },
-  "allFilesAccessDescription": "Option bei Schreibfehlern bitte aktivieren (erforderlich ab Android 13).",
+  "allFilesAccessDescription": "Aktiviere die Option, wenn beim Speichern in benutzerdefinierten Ordnern Schreibfehler auftreten. Weil Android 13+ standardmäßig den Zugriff auf bestimmte Verzeichnisse einschränkt.",
   "@allFilesAccessDescription": {
     "description": "Description explaining when to enable all files access"
   },
@@ -2130,7 +2122,7 @@
   "@settingsLocalLibrary": {
     "description": "Settings menu item - local library"
   },
-  "settingsLocalLibrarySubtitle": "Musik scannen & Duplikate erkennen",
+  "settingsLocalLibrarySubtitle": "Scan music & detect duplicates",
   "@settingsLocalLibrarySubtitle": {
     "description": "Subtitle for local library settings"
   },
@@ -2138,7 +2130,7 @@
   "@settingsCache": {
     "description": "Settings menu item - cache management"
   },
-  "settingsCacheSubtitle": "Größe anzeigen und Daten im Cache leeren",
+  "settingsCacheSubtitle": "View size and clear cached data",
   "@settingsCacheSubtitle": {
     "description": "Subtitle for cache management menu"
   },
@@ -2154,7 +2146,7 @@
   "@libraryEnableLocalLibrary": {
     "description": "Toggle to enable library scanning"
   },
-  "libraryEnableLocalLibrarySubtitle": "Scan und verfolge deine bestehende Musik",
+  "libraryEnableLocalLibrarySubtitle": "Scan and track your existing music",
   "@libraryEnableLocalLibrarySubtitle": {
     "description": "Subtitle for enable toggle"
   },
@@ -2166,7 +2158,7 @@
   "@libraryFolderHint": {
     "description": "Placeholder when no folder selected"
   },
-  "libraryShowDuplicateIndicator": "Duplikat Indikator anzeigen",
+  "libraryShowDuplicateIndicator": "Show Duplicate Indicator",
   "@libraryShowDuplicateIndicator": {
     "description": "Toggle for duplicate indicator in search"
   },
@@ -2391,7 +2383,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Hole dir FLAC Audio von Tidal, Qobuz oder Deezer",
+  "tutorialWelcomeTip2": "Hole dir FLAC Audio von Tidal, Qobuz oder Amazon Musik",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2463,7 +2455,7 @@
   "@tutorialSettingsDesc": {
     "description": "Tutorial settings page description"
   },
-  "tutorialSettingsTip1": "Download-Ordner und Ordner-Organisation ändern",
+  "tutorialSettingsTip1": "Downloadverzeichnis und Ordnerorganisation ändern",
   "@tutorialSettingsTip1": {
     "description": "Tutorial settings tip 1"
   },
@@ -2537,7 +2529,7 @@
   "@cacheSectionMaintenance": {
     "description": "Section header for cleanup actions"
   },
-  "cacheAppDirectory": "App-Cache Ordner",
+  "cacheAppDirectory": "App-Cache Verzeichnis",
   "@cacheAppDirectory": {
     "description": "Cache item title for app cache directory"
   },
@@ -2545,7 +2537,7 @@
   "@cacheAppDirectoryDesc": {
     "description": "Description of what app cache directory contains"
   },
-  "cacheTempDirectory": "Temporärer Ordner",
+  "cacheTempDirectory": "Temporäres Verzeichnis",
   "@cacheTempDirectory": {
     "description": "Cache item title for temporary files directory"
   },
@@ -2713,7 +2705,7 @@
   "@trackEditMetadata": {
     "description": "Menu action - edit embedded metadata"
   },
-  "trackCoverSaved": "Cover in {fileName} gespeichert",
+  "trackCoverSaved": "Cover art saved to {fileName}",
   "@trackCoverSaved": {
     "description": "Snackbar after cover art saved",
     "placeholders": {
@@ -2722,7 +2714,7 @@
       }
     }
   },
-  "trackCoverNoSource": "Keine Cover Quelle vorhanden",
+  "trackCoverNoSource": "No cover art source available",
   "@trackCoverNoSource": {
     "description": "Snackbar when no cover art URL or embedded cover"
   },
@@ -2816,90 +2808,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "CUE-Sheet aufteilen",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "CUE+FLAC in einzelne Titel aufteilen",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Album: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Künstler: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} Titel",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "CUE-Album aufteilen",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Soll „{album}“ in {count} einzelne FLAC-Dateien aufgeteilt werden?\n\nDie Dateien werden im selben Ordner gespeichert.",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "CUE-Sheet wird geteilt... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "{count} Titel erfolgreich aufgeteilt",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "CUE-Aufteilung fehlgeschlagen",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Audiodatei für dieses CUE-Sheet nicht gefunden",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "In Titel aufteilen",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
   "actionCreate": "Erstellen",
   "@actionCreate": {
     "description": "Generic action button - create"
@@ -3186,11 +3094,11 @@
       }
     }
   },
-  "downloadUseAlbumArtistForFoldersAlbumSubtitle": "Interpret-Ordner verwenden Album-Interpret, sofern vorhanden",
+  "downloadUseAlbumArtistForFoldersAlbumSubtitle": "Künstlerordner verwenden den Album-Interpreten, wenn verfügbar",
   "@downloadUseAlbumArtistForFoldersAlbumSubtitle": {
     "description": "Subtitle when Album Artist is used for folder naming"
   },
-  "downloadUseAlbumArtistForFoldersTrackSubtitle": "Künstler-Ordner nur für Titel-Künstler",
+  "downloadUseAlbumArtistForFoldersTrackSubtitle": "Artist folders use Track Artist only",
   "@downloadUseAlbumArtistForFoldersTrackSubtitle": {
     "description": "Subtitle when Track Artist is used for folder naming"
   }

lib/l10n/arb/app_en.arb

@@ -671,10 +671,6 @@
   "@dialogImport": {
     "description": "Dialog button - import data"
   },
-  "dialogDownload": "Download",
-  "@dialogDownload": {
-    "description": "Dialog button - download action"
-  },
   "dialogDiscard": "Discard",
   "@dialogDiscard": {
     "description": "Dialog button - discard changes"
@@ -999,46 +995,6 @@
   "@searchPlaylists": {
     "description": "Search result category - playlists"
   },
-  "searchSortTitle": "Sort Results",
-  "@searchSortTitle": {
-    "description": "Bottom sheet title for search sort options"
-  },
-  "searchSortDefault": "Default",
-  "@searchSortDefault": {
-    "description": "Sort option - default API order"
-  },
-  "searchSortTitleAZ": "Title (A-Z)",
-  "@searchSortTitleAZ": {
-    "description": "Sort option - title ascending"
-  },
-  "searchSortTitleZA": "Title (Z-A)",
-  "@searchSortTitleZA": {
-    "description": "Sort option - title descending"
-  },
-  "searchSortArtistAZ": "Artist (A-Z)",
-  "@searchSortArtistAZ": {
-    "description": "Sort option - artist ascending"
-  },
-  "searchSortArtistZA": "Artist (Z-A)",
-  "@searchSortArtistZA": {
-    "description": "Sort option - artist descending"
-  },
-  "searchSortDurationShort": "Duration (Shortest)",
-  "@searchSortDurationShort": {
-    "description": "Sort option - shortest duration first"
-  },
-  "searchSortDurationLong": "Duration (Longest)",
-  "@searchSortDurationLong": {
-    "description": "Sort option - longest duration first"
-  },
-  "searchSortDateOldest": "Release Date (Oldest)",
-  "@searchSortDateOldest": {
-    "description": "Sort option - oldest release first"
-  },
-  "searchSortDateNewest": "Release Date (Newest)",
-  "@searchSortDateNewest": {
-    "description": "Sort option - newest release first"
-  },
   "tooltipPlay": "Play",
   "@tooltipPlay": {
     "description": "Tooltip - play button"
@@ -1614,59 +1570,7 @@
   "@storeClearFilters": {
     "description": "Button to clear all filters"
   },
-  "storeAddRepoTitle": "Add Extension Repository",
-  "@storeAddRepoTitle": {
-    "description": "Store setup screen - heading when no repo is configured"
-  },
-  "storeAddRepoDescription": "Enter a GitHub repository URL that contains a registry.json file to browse and install extensions.",
-  "@storeAddRepoDescription": {
-    "description": "Store setup screen - explanatory text"
-  },
-  "storeRepoUrlLabel": "Repository URL",
-  "@storeRepoUrlLabel": {
-    "description": "Label for the repository URL input field"
-  },
-  "storeRepoUrlHint": "https://github.com/user/repo",
-  "@storeRepoUrlHint": {
-    "description": "Hint/placeholder for the repository URL input field"
-  },
-  "storeRepoUrlHelper": "e.g. https://github.com/user/extensions-repo",
-  "@storeRepoUrlHelper": {
-    "description": "Helper text below the repository URL input field"
-  },
-  "storeAddRepoButton": "Add Repository",
-  "@storeAddRepoButton": {
-    "description": "Button to submit a new repository URL"
-  },
-  "storeChangeRepoTooltip": "Change repository",
-  "@storeChangeRepoTooltip": {
-    "description": "Tooltip for the change-repository icon button in the app bar"
-  },
-  "storeRepoDialogTitle": "Extension Repository",
-  "@storeRepoDialogTitle": {
-    "description": "Title of the change/remove repository dialog"
-  },
-  "storeRepoDialogCurrent": "Current repository:",
-  "@storeRepoDialogCurrent": {
-    "description": "Label shown above the current repository URL in the dialog"
-  },
-  "storeNewRepoUrlLabel": "New Repository URL",
-  "@storeNewRepoUrlLabel": {
-    "description": "Label for the new repository URL field inside the dialog"
-  },
-  "storeLoadError": "Failed to load store",
-  "@storeLoadError": {
-    "description": "Error heading when the store cannot be loaded"
-  },
-  "storeEmptyNoExtensions": "No extensions available",
-  "@storeEmptyNoExtensions": {
-    "description": "Message when store has no extensions"
-  },
-  "storeEmptyNoResults": "No extensions found",
-  "@storeEmptyNoResults": {
-    "description": "Message when search/filter returns no results"
-  },
-  "extensionDefaultProvider": "Default (Deezer)",
+  "extensionDefaultProvider": "Default (Deezer/Spotify)",
   "@extensionDefaultProvider": {
     "description": "Default search provider option"
   },
@@ -1865,50 +1769,22 @@
   "@qualityHiResFlacMaxSubtitle": {
     "description": "Technical spec for hi-res max"
   },
-  "downloadLossy320": "Lossy 320kbps",
-  "@downloadLossy320": {
-    "description": "Quality option label for Tidal lossy 320kbps"
-  },
-  "downloadLossyFormat": "Lossy Format",
-  "@downloadLossyFormat": {
-    "description": "Setting title to pick output format for Tidal lossy downloads"
-  },
-  "downloadLossy320Format": "Lossy 320kbps Format",
-  "@downloadLossy320Format": {
-    "description": "Title of the Tidal lossy format picker bottom sheet"
-  },
-  "downloadLossy320FormatDesc": "Choose the output format for Tidal 320kbps lossy downloads. The original AAC stream will be converted to your selected format.",
-  "@downloadLossy320FormatDesc": {
-    "description": "Description in the Tidal lossy format picker"
-  },
-  "downloadLossyMp3": "MP3 320kbps",
-  "@downloadLossyMp3": {
-    "description": "Tidal lossy format option - MP3 320kbps"
-  },
-  "downloadLossyMp3Subtitle": "Best compatibility, ~10MB per track",
-  "@downloadLossyMp3Subtitle": {
-    "description": "Subtitle for MP3 320kbps Tidal lossy option"
-  },
-  "downloadLossyOpus256": "Opus 256kbps",
-  "@downloadLossyOpus256": {
-    "description": "Tidal lossy format option - Opus 256kbps"
-  },
-  "downloadLossyOpus256Subtitle": "Best quality Opus, ~8MB per track",
-  "@downloadLossyOpus256Subtitle": {
-    "description": "Subtitle for Opus 256kbps Tidal lossy option"
-  },
-  "downloadLossyOpus128": "Opus 128kbps",
-  "@downloadLossyOpus128": {
-    "description": "Tidal lossy format option - Opus 128kbps"
-  },
-  "downloadLossyOpus128Subtitle": "Smallest size, ~4MB per track",
-  "@downloadLossyOpus128Subtitle": {
-    "description": "Subtitle for Opus 128kbps Tidal lossy option"
-  },
   "qualityNote": "Actual quality depends on track availability from the service",
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Ask Before Download",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2029,14 +1905,6 @@
   "@albumFolderArtistAlbumSinglesSubtitle": {
     "description": "Folder structure example"
   },
-  "albumFolderArtistAlbumFlat": "Artist / Album (Singles flat)",
-  "@albumFolderArtistAlbumFlat": {
-    "description": "Album folder option with singles directly in artist folder"
-  },
-  "albumFolderArtistAlbumFlatSubtitle": "Artist/Album/ and Artist/song.flac",
-  "@albumFolderArtistAlbumFlatSubtitle": {
-    "description": "Folder structure example for flat singles"
-  },
   "downloadedAlbumDeleteSelected": "Delete Selected",
   "@downloadedAlbumDeleteSelected": {
     "description": "Button - delete selected tracks"
@@ -2318,30 +2186,6 @@
   "@libraryShowDuplicateIndicatorSubtitle": {
     "description": "Subtitle for duplicate indicator toggle"
   },
-  "libraryAutoScan": "Auto Scan",
-  "@libraryAutoScan": {
-    "description": "Setting for automatic library scanning"
-  },
-  "libraryAutoScanSubtitle": "Automatically scan your library for new files",
-  "@libraryAutoScanSubtitle": {
-    "description": "Subtitle for auto scan setting"
-  },
-  "libraryAutoScanOff": "Off",
-  "@libraryAutoScanOff": {
-    "description": "Auto scan disabled"
-  },
-  "libraryAutoScanOnOpen": "Every app open",
-  "@libraryAutoScanOnOpen": {
-    "description": "Auto scan when app opens"
-  },
-  "libraryAutoScanDaily": "Daily",
-  "@libraryAutoScanDaily": {
-    "description": "Auto scan once per day"
-  },
-  "libraryAutoScanWeekly": "Weekly",
-  "@libraryAutoScanWeekly": {
-    "description": "Auto scan once per week"
-  },
   "libraryActions": "Actions",
   "@libraryActions": {
     "description": "Section header for library actions"
@@ -2919,47 +2763,6 @@
   "@trackReEnrichFfmpegFailed": {
     "description": "Snackbar when FFmpeg embed fails for MP3/Opus"
   },
-  "queueFlacAction": "Queue FLAC",
-  "@queueFlacAction": {
-    "description": "Action/button label for queueing FLAC redownloads for local tracks"
-  },
-  "queueFlacConfirmMessage": "Search online matches for the selected tracks and queue FLAC downloads.\n\nExisting files will not be modified or deleted.\n\nOnly high-confidence matches are queued automatically.\n\n{count} selected",
-  "@queueFlacConfirmMessage": {
-    "description": "Confirmation dialog body before queueing FLAC redownloads for local tracks",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "queueFlacFindingProgress": "Finding FLAC matches... ({current}/{total})",
-  "@queueFlacFindingProgress": {
-    "description": "Snackbar while resolving remote matches for local FLAC redownloads",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "queueFlacNoReliableMatches": "No reliable online matches found for the selection",
-  "@queueFlacNoReliableMatches": {
-    "description": "Snackbar when no safe FLAC redownload matches were found"
-  },
-  "queueFlacQueuedWithSkipped": "Added {addedCount} tracks to queue, skipped {skippedCount}",
-  "@queueFlacQueuedWithSkipped": {
-    "description": "Snackbar when some selected local tracks were queued for FLAC redownload and some were skipped",
-    "placeholders": {
-      "addedCount": {
-        "type": "int"
-      },
-      "skippedCount": {
-        "type": "int"
-      }
-    }
-  },
   "trackSaveFailed": "Failed: {error}",
   "@trackSaveFailed": {
     "description": "Snackbar when save operation fails",
@@ -2973,7 +2776,7 @@
   "@trackConvertFormat": {
     "description": "Menu item - convert audio format"
   },
-  "trackConvertFormatSubtitle": "Convert to MP3, Opus, ALAC, or FLAC",
+  "trackConvertFormatSubtitle": "Convert to MP3 or Opus",
   "@trackConvertFormatSubtitle": {
     "description": "Subtitle for convert format menu item"
   },
@@ -3008,22 +2811,6 @@
       }
     }
   },
-  "trackConvertConfirmMessageLossless": "Convert from {sourceFormat} to {targetFormat}? (Lossless — no quality loss)\n\nThe original file will be deleted after conversion.",
-  "@trackConvertConfirmMessageLossless": {
-    "description": "Confirmation dialog message for lossless-to-lossless conversion",
-    "placeholders": {
-      "sourceFormat": {
-        "type": "String"
-      },
-      "targetFormat": {
-        "type": "String"
-      }
-    }
-  },
-  "trackConvertLosslessHint": "Lossless conversion — no quality loss",
-  "@trackConvertLosslessHint": {
-    "description": "Hint shown when converting between lossless formats"
-  },
   "trackConvertConverting": "Converting audio...",
   "@trackConvertConverting": {
     "description": "Snackbar while converting"
@@ -3375,18 +3162,6 @@
       }
     }
   },
-  "selectionBatchConvertConfirmMessageLossless": "Convert {count} {count, plural, =1{track} other{tracks}} to {format}? (Lossless — no quality loss)\n\nOriginal files will be deleted after conversion.",
-  "@selectionBatchConvertConfirmMessageLossless": {
-    "description": "Confirmation dialog message for lossless batch conversion",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      },
-      "format": {
-        "type": "String"
-      }
-    }
-  },
   "selectionBatchConvertProgress": "Converting {current} of {total}...",
   "@selectionBatchConvertProgress": {
     "description": "Snackbar during batch conversion progress",
@@ -3430,638 +3205,5 @@
   "downloadUseAlbumArtistForFoldersTrackSubtitle": "Artist folders use Track Artist only",
   "@downloadUseAlbumArtistForFoldersTrackSubtitle": {
     "description": "Subtitle when Track Artist is used for folder naming"
-  },
-
-  "lyricsProvidersTitle": "Lyrics Providers",
-  "@lyricsProvidersTitle": {
-    "description": "Title for the lyrics provider priority page"
-  },
-  "lyricsProvidersDescription": "Enable, disable and reorder lyrics sources. Providers are tried top-to-bottom until lyrics are found.",
-  "@lyricsProvidersDescription": {
-    "description": "Description on the lyrics provider priority page"
-  },
-  "lyricsProvidersInfoText": "Extension lyrics providers always run before built-in providers. At least one provider must remain enabled.",
-  "@lyricsProvidersInfoText": {
-    "description": "Info tip on lyrics provider priority page"
-  },
-  "lyricsProvidersEnabledSection": "Enabled ({count})",
-  "@lyricsProvidersEnabledSection": {
-    "description": "Section header for enabled providers",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "lyricsProvidersDisabledSection": "Disabled ({count})",
-  "@lyricsProvidersDisabledSection": {
-    "description": "Section header for disabled providers",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "lyricsProvidersAtLeastOne": "At least one provider must remain enabled",
-  "@lyricsProvidersAtLeastOne": {
-    "description": "Snackbar when user tries to disable the last enabled provider"
-  },
-  "lyricsProvidersSaved": "Lyrics provider priority saved",
-  "@lyricsProvidersSaved": {
-    "description": "Snackbar after saving lyrics provider priority"
-  },
-  "lyricsProvidersDiscardContent": "You have unsaved changes that will be lost.",
-  "@lyricsProvidersDiscardContent": {
-    "description": "Body text of the discard-changes dialog on lyrics provider page"
-  },
-  "lyricsProviderSpotifyApiDesc": "Spotify-sourced synced lyrics via community API",
-  "@lyricsProviderSpotifyApiDesc": {
-    "description": "Description for Spotify Lyrics API provider"
-  },
-  "lyricsProviderLrclibDesc": "Open-source synced lyrics database",
-  "@lyricsProviderLrclibDesc": {
-    "description": "Description for LRCLIB provider"
-  },
-  "lyricsProviderNeteaseDesc": "NetEase Cloud Music (good for Asian songs)",
-  "@lyricsProviderNeteaseDesc": {
-    "description": "Description for Netease provider"
-  },
-  "lyricsProviderMusixmatchDesc": "Largest lyrics database (multi-language)",
-  "@lyricsProviderMusixmatchDesc": {
-    "description": "Description for Musixmatch provider"
-  },
-  "lyricsProviderAppleMusicDesc": "Word-by-word synced lyrics (via proxy)",
-  "@lyricsProviderAppleMusicDesc": {
-    "description": "Description for Apple Music provider"
-  },
-  "lyricsProviderQqMusicDesc": "QQ Music (good for Chinese songs, via proxy)",
-  "@lyricsProviderQqMusicDesc": {
-    "description": "Description for QQ Music provider"
-  },
-  "lyricsProviderExtensionDesc": "Extension provider",
-  "@lyricsProviderExtensionDesc": {
-    "description": "Generic description for extension-based lyrics providers"
-  },
-
-  "safMigrationTitle": "Storage Update Required",
-  "@safMigrationTitle": {
-    "description": "Title of SAF migration dialog"
-  },
-  "safMigrationMessage1": "SpotiFLAC now uses Android Storage Access Framework (SAF) for downloads. This fixes \"permission denied\" errors on Android 10+.",
-  "@safMigrationMessage1": {
-    "description": "First paragraph of SAF migration dialog"
-  },
-  "safMigrationMessage2": "Please select your download folder again to switch to the new storage system.",
-  "@safMigrationMessage2": {
-    "description": "Second paragraph of SAF migration dialog"
-  },
-  "safMigrationSuccess": "Download folder updated to SAF mode",
-  "@safMigrationSuccess": {
-    "description": "Snackbar after successfully migrating to SAF"
-  },
-
-  "settingsDonate": "Donate",
-  "@settingsDonate": {
-    "description": "Settings menu item - donate"
-  },
-  "settingsDonateSubtitle": "Support SpotiFLAC-Mobile development",
-  "@settingsDonateSubtitle": {
-    "description": "Subtitle for donate menu item"
-  },
-
-  "tooltipLoveAll": "Love All",
-  "@tooltipLoveAll": {
-    "description": "Tooltip for the Love All button on album/playlist screens"
-  },
-  "tooltipAddToPlaylist": "Add to Playlist",
-  "@tooltipAddToPlaylist": {
-    "description": "Tooltip for the Add to Playlist button"
-  },
-  "snackbarRemovedTracksFromLoved": "Removed {count} tracks from Loved",
-  "@snackbarRemovedTracksFromLoved": {
-    "description": "Snackbar after removing multiple tracks from Loved folder",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "snackbarAddedTracksToLoved": "Added {count} tracks to Loved",
-  "@snackbarAddedTracksToLoved": {
-    "description": "Snackbar after adding multiple tracks to Loved folder",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-
-  "dialogDownloadAllTitle": "Download All",
-  "@dialogDownloadAllTitle": {
-    "description": "Title of the Download All confirmation dialog"
-  },
-  "dialogDownloadAllMessage": "Download {count} tracks?",
-  "@dialogDownloadAllMessage": {
-    "description": "Body of the Download All confirmation dialog",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "dialogDownload": "Download",
-  "@dialogDownload": {
-    "description": "Confirm button in Download All dialog"
-  },
-
-  "homeSkipAlreadyDownloaded": "Skip already downloaded songs",
-  "@homeSkipAlreadyDownloaded": {
-    "description": "Checkbox label in import dialog to skip already-downloaded songs"
-  },
-  "homeGoToAlbum": "Go to Album",
-  "@homeGoToAlbum": {
-    "description": "Context menu item to navigate to the album page"
-  },
-  "homeAlbumInfoUnavailable": "Album info not available",
-  "@homeAlbumInfoUnavailable": {
-    "description": "Snackbar when album info cannot be loaded"
-  },
-
-  "snackbarLoadingCueSheet": "Loading CUE sheet...",
-  "@snackbarLoadingCueSheet": {
-    "description": "Snackbar while loading a CUE sheet file"
-  },
-  "snackbarMetadataSaved": "Metadata saved successfully",
-  "@snackbarMetadataSaved": {
-    "description": "Snackbar after successfully saving track metadata"
-  },
-  "snackbarFailedToEmbedLyrics": "Failed to embed lyrics",
-  "@snackbarFailedToEmbedLyrics": {
-    "description": "Snackbar when lyrics embedding fails"
-  },
-  "snackbarFailedToWriteStorage": "Failed to write back to storage",
-  "@snackbarFailedToWriteStorage": {
-    "description": "Snackbar when writing metadata back to file fails"
-  },
-  "snackbarError": "Error: {error}",
-  "@snackbarError": {
-    "description": "Generic error snackbar with error detail",
-    "placeholders": {
-      "error": {
-        "type": "String"
-      }
-    }
-  },
-  "snackbarNoActionDefined": "No action defined for this button",
-  "@snackbarNoActionDefined": {
-    "description": "Snackbar when an extension button has no action configured"
-  },
-
-  "noTracksFoundForAlbum": "No tracks found for this album",
-  "@noTracksFoundForAlbum": {
-    "description": "Empty state message when an album has no tracks"
-  },
-
-  "downloadLocationSubtitle": "Choose storage mode for downloaded files.",
-  "@downloadLocationSubtitle": {
-    "description": "Subtitle text in Android download location bottom sheet"
-  },
-  "storageModeAppFolder": "App folder (non-SAF)",
-  "@storageModeAppFolder": {
-    "description": "Storage mode option - use legacy app folder"
-  },
-  "storageModeAppFolderSubtitle": "Use default Music/SpotiFLAC path",
-  "@storageModeAppFolderSubtitle": {
-    "description": "Subtitle for app folder storage mode"
-  },
-  "storageModeSaf": "SAF folder",
-  "@storageModeSaf": {
-    "description": "Storage mode option - use Android SAF picker"
-  },
-  "storageModeSafSubtitle": "Pick folder via Android Storage Access Framework",
-  "@storageModeSafSubtitle": {
-    "description": "Subtitle for SAF storage mode"
-  },
-  "downloadFilenameDescription": "Customize how your files are named.",
-  "@downloadFilenameDescription": {
-    "description": "Description text in filename format bottom sheet"
-  },
-  "downloadFilenameInsertTag": "Tap to insert tag:",
-  "@downloadFilenameInsertTag": {
-    "description": "Label above filename tag chips"
-  },
-  "downloadSeparateSinglesEnabled": "Albums/ and Singles/ folders",
-  "@downloadSeparateSinglesEnabled": {
-    "description": "Subtitle when separate singles folder is enabled"
-  },
-  "downloadSeparateSinglesDisabled": "All files in same structure",
-  "@downloadSeparateSinglesDisabled": {
-    "description": "Subtitle when separate singles folder is disabled"
-  },
-  "downloadArtistNameFilters": "Artist Name Filters",
-  "@downloadArtistNameFilters": {
-    "description": "Setting title for artist folder filter options"
-  },
-  "downloadCreatePlaylistSourceFolder": "Create playlist source folder",
-  "@downloadCreatePlaylistSourceFolder": {
-    "description": "Setting title for adding a playlist folder prefix before the normal organization structure"
-  },
-  "downloadCreatePlaylistSourceFolderEnabled": "Playlist downloads use Playlist/ plus your normal folder structure.",
-  "@downloadCreatePlaylistSourceFolderEnabled": {
-    "description": "Subtitle when playlist source folder prefix is enabled"
-  },
-  "downloadCreatePlaylistSourceFolderDisabled": "Playlist downloads use the normal folder structure only.",
-  "@downloadCreatePlaylistSourceFolderDisabled": {
-    "description": "Subtitle when playlist source folder prefix is disabled"
-  },
-  "downloadCreatePlaylistSourceFolderRedundant": "By Playlist already places downloads inside a playlist folder.",
-  "@downloadCreatePlaylistSourceFolderRedundant": {
-    "description": "Subtitle when playlist folder prefix setting is redundant because folder organization is already by playlist"
-  },
-  "downloadSongLinkRegion": "SongLink Region",
-  "@downloadSongLinkRegion": {
-    "description": "Setting title for SongLink country region"
-  },
-  "downloadNetworkCompatibilityMode": "Network compatibility mode",
-  "@downloadNetworkCompatibilityMode": {
-    "description": "Setting title for network compatibility toggle"
-  },
-  "downloadNetworkCompatibilityModeEnabled": "Enabled: try HTTP + accept invalid TLS certificates (unsafe)",
-  "@downloadNetworkCompatibilityModeEnabled": {
-    "description": "Subtitle when network compatibility mode is enabled"
-  },
-  "downloadNetworkCompatibilityModeDisabled": "Off: strict HTTPS certificate validation (recommended)",
-  "@downloadNetworkCompatibilityModeDisabled": {
-    "description": "Subtitle when network compatibility mode is disabled"
-  },
-  "downloadSelectServiceToEnable": "Select a built-in service to enable",
-  "@downloadSelectServiceToEnable": {
-    "description": "Hint shown instead of Ask-quality subtitle when no built-in service selected"
-  },
-
-  "downloadSelectTidalQobuz": "Select Tidal or Qobuz above to configure quality",
-  "@downloadSelectTidalQobuz": {
-    "description": "Info hint when non-Tidal/Qobuz service is selected"
-  },
-  "downloadEmbedLyricsDisabled": "Disabled while Embed Metadata is turned off",
-  "@downloadEmbedLyricsDisabled": {
-    "description": "Subtitle for Embed Lyrics when Embed Metadata is disabled"
-  },
-  "downloadNeteaseIncludeTranslation": "Netease: Include Translation",
-  "@downloadNeteaseIncludeTranslation": {
-    "description": "Toggle title for including Netease translated lyrics"
-  },
-  "downloadNeteaseIncludeTranslationEnabled": "Append translated lyrics when available",
-  "@downloadNeteaseIncludeTranslationEnabled": {
-    "description": "Subtitle when Netease translation is enabled"
-  },
-  "downloadNeteaseIncludeTranslationDisabled": "Use original lyrics only",
-  "@downloadNeteaseIncludeTranslationDisabled": {
-    "description": "Subtitle when Netease translation is disabled"
-  },
-  "downloadNeteaseIncludeRomanization": "Netease: Include Romanization",
-  "@downloadNeteaseIncludeRomanization": {
-    "description": "Toggle title for including Netease romanized lyrics"
-  },
-  "downloadNeteaseIncludeRomanizationEnabled": "Append romanized lyrics when available",
-  "@downloadNeteaseIncludeRomanizationEnabled": {
-    "description": "Subtitle when Netease romanization is enabled"
-  },
-  "downloadNeteaseIncludeRomanizationDisabled": "Disabled",
-  "@downloadNeteaseIncludeRomanizationDisabled": {
-    "description": "Subtitle when Netease romanization is disabled"
-  },
-  "downloadAppleQqMultiPerson": "Apple/QQ Multi-Person Word-by-Word",
-  "@downloadAppleQqMultiPerson": {
-    "description": "Toggle title for Apple/QQ multi-person word-by-word lyrics"
-  },
-  "downloadAppleQqMultiPersonEnabled": "Enable v1/v2 speaker and [bg:] tags",
-  "@downloadAppleQqMultiPersonEnabled": {
-    "description": "Subtitle when multi-person word-by-word is enabled"
-  },
-  "downloadAppleQqMultiPersonDisabled": "Simplified word-by-word formatting",
-  "@downloadAppleQqMultiPersonDisabled": {
-    "description": "Subtitle when multi-person word-by-word is disabled"
-  },
-  "downloadMusixmatchLanguage": "Musixmatch Language",
-  "@downloadMusixmatchLanguage": {
-    "description": "Setting title for Musixmatch language preference"
-  },
-  "downloadMusixmatchLanguageAuto": "Auto (original)",
-  "@downloadMusixmatchLanguageAuto": {
-    "description": "Option label when Musixmatch uses original language"
-  },
-  "downloadFilterContributing": "Filter contributing artists in Album Artist",
-  "@downloadFilterContributing": {
-    "description": "Toggle title for filtering contributing artists in Album Artist metadata"
-  },
-  "downloadFilterContributingEnabled": "Album Artist metadata uses primary artist only",
-  "@downloadFilterContributingEnabled": {
-    "description": "Subtitle when contributing artist filter is enabled"
-  },
-  "downloadFilterContributingDisabled": "Keep full Album Artist metadata value",
-  "@downloadFilterContributingDisabled": {
-    "description": "Subtitle when contributing artist filter is disabled"
-  },
-
-  "downloadProvidersNoneEnabled": "None enabled",
-  "@downloadProvidersNoneEnabled": {
-    "description": "Subtitle for lyrics providers setting when no providers are enabled"
-  },
-  "downloadMusixmatchLanguageCode": "Language code",
-  "@downloadMusixmatchLanguageCode": {
-    "description": "Label for the Musixmatch language code text field"
-  },
-  "downloadMusixmatchLanguageHint": "auto / en / es / ja",
-  "@downloadMusixmatchLanguageHint": {
-    "description": "Hint text for the Musixmatch language code field"
-  },
-  "downloadMusixmatchLanguageDesc": "Set preferred language code (example: en, es, ja). Leave empty for auto.",
-  "@downloadMusixmatchLanguageDesc": {
-    "description": "Description in the Musixmatch language picker"
-  },
-  "downloadMusixmatchAuto": "Auto",
-  "@downloadMusixmatchAuto": {
-    "description": "Button to reset Musixmatch language to automatic"
-  },
-
-  "downloadNetworkAnySubtitle": "WiFi + Mobile Data",
-  "@downloadNetworkAnySubtitle": {
-    "description": "Subtitle for 'Any' network mode option"
-  },
-  "downloadNetworkWifiOnlySubtitle": "Pause downloads on mobile data",
-  "@downloadNetworkWifiOnlySubtitle": {
-    "description": "Subtitle for 'WiFi only' network mode option"
-  },
-  "downloadSongLinkRegionDesc": "Used as userCountry for SongLink API lookup.",
-  "@downloadSongLinkRegionDesc": {
-    "description": "Description in the SongLink region picker"
-  },
-  "downloadFolderOrganization": "Folder Organization",
-  "@downloadFolderOrganization": {
-    "description": "Title of the folder organization picker bottom sheet"
-  },
-  "snackbarUnsupportedAudioFormat": "Unsupported audio format",
-  "@snackbarUnsupportedAudioFormat": {
-    "description": "Snackbar when the audio format is not supported for the requested operation"
-  },
-  "cacheRefresh": "Refresh",
-  "@cacheRefresh": {
-    "description": "Tooltip for refresh button on cache management page"
-  },
-  "dialogDownloadAllTitle": "Download All",
-  "@dialogDownloadAllTitle": {
-    "description": "Dialog title for bulk download confirmation"
-  },
-  "dialogDownloadPlaylistsMessage": "Download {trackCount} {trackCount, plural, =1{track} other{tracks}} from {playlistCount} {playlistCount, plural, =1{playlist} other{playlists}}?",
-  "@dialogDownloadPlaylistsMessage": {
-    "description": "Dialog message for bulk playlist download confirmation",
-    "placeholders": {
-      "trackCount": {
-        "type": "int"
-      },
-      "playlistCount": {
-        "type": "int"
-      }
-    }
-  },
-  "bulkDownloadPlaylistsButton": "Download {count} {count, plural, =1{playlist} other{playlists}}",
-  "@bulkDownloadPlaylistsButton": {
-    "description": "Button label for bulk downloading selected playlists",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "bulkDownloadSelectPlaylists": "Select playlists to download",
-  "@bulkDownloadSelectPlaylists": {
-    "description": "Button label when no playlists are selected for download"
-  },
-  "snackbarSelectedPlaylistsEmpty": "Selected playlists have no tracks",
-  "@snackbarSelectedPlaylistsEmpty": {
-    "description": "Snackbar when selected playlists contain no tracks"
-  },
-  "playlistsCount": "{count, plural, =1{1 playlist} other{{count} playlists}}",
-  "@playlistsCount": {
-    "description": "Playlist count display",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "editMetadataAutoFill": "Auto-fill from online",
-  "@editMetadataAutoFill": {
-    "description": "Section title for selective online metadata auto-fill in the edit metadata sheet"
-  },
-  "editMetadataAutoFillDesc": "Select fields to fill automatically from online metadata",
-  "@editMetadataAutoFillDesc": {
-    "description": "Description for the auto-fill section"
-  },
-  "editMetadataAutoFillFetch": "Fetch & Fill",
-  "@editMetadataAutoFillFetch": {
-    "description": "Button label to fetch online metadata and fill selected fields"
-  },
-  "editMetadataAutoFillSearching": "Searching online...",
-  "@editMetadataAutoFillSearching": {
-    "description": "Snackbar shown while searching for online metadata"
-  },
-  "editMetadataAutoFillNoResults": "No matching metadata found online",
-  "@editMetadataAutoFillNoResults": {
-    "description": "Snackbar when online metadata search returns no results"
-  },
-  "editMetadataAutoFillDone": "Filled {count} {count, plural, =1{field} other{fields}} from online metadata",
-  "@editMetadataAutoFillDone": {
-    "description": "Snackbar confirming how many fields were auto-filled",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "editMetadataAutoFillNoneSelected": "Select at least one field to auto-fill",
-  "@editMetadataAutoFillNoneSelected": {
-    "description": "Snackbar when user taps Fetch without selecting any fields"
-  },
-  "editMetadataFieldTitle": "Title",
-  "@editMetadataFieldTitle": {
-    "description": "Chip label for title field in auto-fill selector"
-  },
-  "editMetadataFieldArtist": "Artist",
-  "@editMetadataFieldArtist": {
-    "description": "Chip label for artist field in auto-fill selector"
-  },
-  "editMetadataFieldAlbum": "Album",
-  "@editMetadataFieldAlbum": {
-    "description": "Chip label for album field in auto-fill selector"
-  },
-  "editMetadataFieldAlbumArtist": "Album Artist",
-  "@editMetadataFieldAlbumArtist": {
-    "description": "Chip label for album artist field in auto-fill selector"
-  },
-  "editMetadataFieldDate": "Date",
-  "@editMetadataFieldDate": {
-    "description": "Chip label for date field in auto-fill selector"
-  },
-  "editMetadataFieldTrackNum": "Track #",
-  "@editMetadataFieldTrackNum": {
-    "description": "Chip label for track number field in auto-fill selector"
-  },
-  "editMetadataFieldDiscNum": "Disc #",
-  "@editMetadataFieldDiscNum": {
-    "description": "Chip label for disc number field in auto-fill selector"
-  },
-  "editMetadataFieldGenre": "Genre",
-  "@editMetadataFieldGenre": {
-    "description": "Chip label for genre field in auto-fill selector"
-  },
-  "editMetadataFieldIsrc": "ISRC",
-  "@editMetadataFieldIsrc": {
-    "description": "Chip label for ISRC field in auto-fill selector"
-  },
-  "editMetadataFieldLabel": "Label",
-  "@editMetadataFieldLabel": {
-    "description": "Chip label for label field in auto-fill selector"
-  },
-  "editMetadataFieldCopyright": "Copyright",
-  "@editMetadataFieldCopyright": {
-    "description": "Chip label for copyright field in auto-fill selector"
-  },
-  "editMetadataFieldCover": "Cover Art",
-  "@editMetadataFieldCover": {
-    "description": "Chip label for cover art field in auto-fill selector"
-  },
-  "editMetadataSelectAll": "All",
-  "@editMetadataSelectAll": {
-    "description": "Button to select all fields for auto-fill"
-  },
-  "editMetadataSelectEmpty": "Empty only",
-  "@editMetadataSelectEmpty": {
-    "description": "Button to select only fields that are currently empty"
-  },
-
-  "queueDownloadingCount": "Downloading ({count})",
-  "@queueDownloadingCount": {
-    "description": "Header for active downloads section with count",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "queueDownloadedHeader": "Downloaded",
-  "@queueDownloadedHeader": {
-    "description": "Header label for downloaded items section in library"
-  },
-  "queueFilteringIndicator": "Filtering...",
-  "@queueFilteringIndicator": {
-    "description": "Shown while filter results are being computed"
-  },
-  "queueTrackCount": "{count, plural, =1{1 track} other{{count} tracks}}",
-  "@queueTrackCount": {
-    "description": "Track count label with plural support",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "queueAlbumCount": "{count, plural, =1{1 album} other{{count} albums}}",
-  "@queueAlbumCount": {
-    "description": "Album count label with plural support",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "queueEmptyAlbums": "No album downloads",
-  "@queueEmptyAlbums": {
-    "description": "Empty state title when no album downloads exist"
-  },
-  "queueEmptyAlbumsSubtitle": "Download multiple tracks from an album to see them here",
-  "@queueEmptyAlbumsSubtitle": {
-    "description": "Empty state subtitle for album downloads"
-  },
-  "queueEmptySingles": "No single downloads",
-  "@queueEmptySingles": {
-    "description": "Empty state title when no single track downloads exist"
-  },
-  "queueEmptySinglesSubtitle": "Single track downloads will appear here",
-  "@queueEmptySinglesSubtitle": {
-    "description": "Empty state subtitle for single track downloads"
-  },
-  "queueEmptyHistory": "No download history",
-  "@queueEmptyHistory": {
-    "description": "Empty state title when download history is empty"
-  },
-  "queueEmptyHistorySubtitle": "Downloaded tracks will appear here",
-  "@queueEmptyHistorySubtitle": {
-    "description": "Empty state subtitle for download history"
-  },
-  "selectionAllPlaylistsSelected": "All playlists selected",
-  "@selectionAllPlaylistsSelected": {
-    "description": "Shown when all playlists are selected in selection mode"
-  },
-  "selectionTapPlaylistsToSelect": "Tap playlists to select",
-  "@selectionTapPlaylistsToSelect": {
-    "description": "Hint shown in playlist selection mode"
-  },
-  "selectionSelectPlaylistsToDelete": "Select playlists to delete",
-  "@selectionSelectPlaylistsToDelete": {
-    "description": "Hint shown when no playlists are selected for deletion"
-  },
-  "audioAnalysisTitle": "Audio Quality Analysis",
-  "@audioAnalysisTitle": {
-    "description": "Title for audio analysis section"
-  },
-  "audioAnalysisDescription": "Verify lossless quality with spectrum analysis",
-  "@audioAnalysisDescription": {
-    "description": "Description for audio analysis tap-to-analyze prompt"
-  },
-  "audioAnalysisAnalyzing": "Analyzing audio...",
-  "@audioAnalysisAnalyzing": {
-    "description": "Loading text while analyzing audio"
-  },
-  "audioAnalysisSampleRate": "Sample Rate",
-  "@audioAnalysisSampleRate": {
-    "description": "Sample rate metric label"
-  },
-  "audioAnalysisBitDepth": "Bit Depth",
-  "@audioAnalysisBitDepth": {
-    "description": "Bit depth metric label"
-  },
-  "audioAnalysisChannels": "Channels",
-  "@audioAnalysisChannels": {
-    "description": "Channels metric label"
-  },
-  "audioAnalysisDuration": "Duration",
-  "@audioAnalysisDuration": {
-    "description": "Duration metric label"
-  },
-  "audioAnalysisNyquist": "Nyquist",
-  "@audioAnalysisNyquist": {
-    "description": "Nyquist frequency metric label"
-  },
-  "audioAnalysisFileSize": "Size",
-  "@audioAnalysisFileSize": {
-    "description": "File size metric label"
-  },
-  "audioAnalysisDynamicRange": "Dynamic Range",
-  "@audioAnalysisDynamicRange": {
-    "description": "Dynamic range metric label"
-  },
-  "audioAnalysisPeak": "Peak",
-  "@audioAnalysisPeak": {
-    "description": "Peak amplitude metric label"
-  },
-  "audioAnalysisRms": "RMS",
-  "@audioAnalysisRms": {
-    "description": "RMS level metric label"
-  },
-  "audioAnalysisSamples": "Samples",
-  "@audioAnalysisSamples": {
-    "description": "Total samples metric label"
   }
 }

lib/l10n/arb/app_es_ES.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal and Qobuz.",
+  "aboutAppDescription": "Descarga pistas de Spotify con calidad sin pérdida de Tidal y Qobuz.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -897,18 +897,6 @@
   "@errorNoTracksFound": {
     "description": "Error - search returned no results"
   },
-  "errorUrlNotRecognized": "Link not recognized",
-  "@errorUrlNotRecognized": {
-    "description": "Error title - URL not handled by any extension or service"
-  },
-  "errorUrlNotRecognizedMessage": "This link is not supported. Make sure the URL is correct and a compatible extension is installed.",
-  "@errorUrlNotRecognizedMessage": {
-    "description": "Error message - URL not recognized explanation"
-  },
-  "errorUrlFetchFailed": "Failed to load content from this link. Please try again.",
-  "@errorUrlFetchFailed": {
-    "description": "Error message - generic URL fetch failure"
-  },
   "errorMissingExtensionSource": "No se puede cargar {item}: falta una fuente de extensión",
   "@errorMissingExtensionSource": {
     "description": "Error - extension source not available",
@@ -1003,26 +991,10 @@
   "@filenameFormat": {
     "description": "Setting title - filename pattern"
   },
-  "filenameShowAdvancedTags": "Show advanced tags",
-  "@filenameShowAdvancedTags": {
-    "description": "Toggle label for showing advanced filename tags"
-  },
-  "filenameShowAdvancedTagsDescription": "Enable formatted tags for track padding and date patterns",
-  "@filenameShowAdvancedTagsDescription": {
-    "description": "Description for advanced filename tag toggle"
-  },
   "folderOrganizationNone": "Ninguna organización",
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "By Playlist",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Separate folder for each playlist",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "Por Artista",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1773,6 +1745,10 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
   "downloadAskBeforeDownload": "Preguntar antes de descargar",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2222,15 +2198,6 @@
   "@libraryAboutDescription": {
     "description": "Description of local library feature"
   },
-  "libraryTracksUnit": "{count, plural, =1{track} other{tracks}}",
-  "@libraryTracksUnit": {
-    "description": "Unit label for tracks count (without the number itself)",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
   "libraryLastScanned": "Last scanned: {time}",
   "@libraryLastScanned": {
     "description": "Last scan time display",
@@ -2391,7 +2358,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Deezer",
+  "tutorialWelcomeTip2": "Obtén audio en calidad FLAC de Tidal, Qobuz o Deezer",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2816,367 +2783,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "Split CUE Sheet",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "Split CUE+FLAC into individual tracks",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Album: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Artist: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} tracks",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "Split CUE Album",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Split \"{album}\" into {count} individual FLAC files?\n\nFiles will be saved to the same directory.",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "Splitting CUE sheet... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "Split into {count} tracks successfully",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "CUE split failed",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Audio file not found for this CUE sheet",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "Split into Tracks",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
-  "actionCreate": "Create",
-  "@actionCreate": {
-    "description": "Generic action button - create"
-  },
-  "collectionFoldersTitle": "My folders",
-  "@collectionFoldersTitle": {
-    "description": "Library section title for custom folders"
-  },
-  "collectionWishlist": "Wishlist",
-  "@collectionWishlist": {
-    "description": "Custom folder for saved tracks to download later"
-  },
-  "collectionLoved": "Loved",
-  "@collectionLoved": {
-    "description": "Custom folder for favorite tracks"
-  },
-  "collectionPlaylists": "Playlists",
-  "@collectionPlaylists": {
-    "description": "Custom user playlists folder"
-  },
-  "collectionPlaylist": "Playlist",
-  "@collectionPlaylist": {
-    "description": "Single playlist label"
-  },
-  "collectionAddToPlaylist": "Add to playlist",
-  "@collectionAddToPlaylist": {
-    "description": "Action to add a track to user playlist"
-  },
-  "collectionCreatePlaylist": "Create playlist",
-  "@collectionCreatePlaylist": {
-    "description": "Action to create a new playlist"
-  },
-  "collectionNoPlaylistsYet": "No playlists yet",
-  "@collectionNoPlaylistsYet": {
-    "description": "Empty state title when user has no playlists"
-  },
-  "collectionNoPlaylistsSubtitle": "Create a playlist to start categorizing tracks",
-  "@collectionNoPlaylistsSubtitle": {
-    "description": "Empty state subtitle when user has no playlists"
-  },
-  "collectionPlaylistTracks": "{count, plural, =1{1 track} other{{count} tracks}}",
-  "@collectionPlaylistTracks": {
-    "description": "Track count label for custom playlists",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "collectionAddedToPlaylist": "Added to \"{playlistName}\"",
-  "@collectionAddedToPlaylist": {
-    "description": "Snackbar after adding track to playlist",
-    "placeholders": {
-      "playlistName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionAlreadyInPlaylist": "Already in \"{playlistName}\"",
-  "@collectionAlreadyInPlaylist": {
-    "description": "Snackbar when track already exists in playlist",
-    "placeholders": {
-      "playlistName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionPlaylistCreated": "Playlist created",
-  "@collectionPlaylistCreated": {
-    "description": "Snackbar after creating playlist"
-  },
-  "collectionPlaylistNameHint": "Playlist name",
-  "@collectionPlaylistNameHint": {
-    "description": "Hint text for playlist name input"
-  },
-  "collectionPlaylistNameRequired": "Playlist name is required",
-  "@collectionPlaylistNameRequired": {
-    "description": "Validation error for empty playlist name"
-  },
-  "collectionRenamePlaylist": "Rename playlist",
-  "@collectionRenamePlaylist": {
-    "description": "Action to rename playlist"
-  },
-  "collectionDeletePlaylist": "Delete playlist",
-  "@collectionDeletePlaylist": {
-    "description": "Action to delete playlist"
-  },
-  "collectionDeletePlaylistMessage": "Delete \"{playlistName}\" and all tracks inside it?",
-  "@collectionDeletePlaylistMessage": {
-    "description": "Confirmation message for deleting playlist",
-    "placeholders": {
-      "playlistName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionPlaylistDeleted": "Playlist deleted",
-  "@collectionPlaylistDeleted": {
-    "description": "Snackbar after deleting playlist"
-  },
-  "collectionPlaylistRenamed": "Playlist renamed",
-  "@collectionPlaylistRenamed": {
-    "description": "Snackbar after renaming playlist"
-  },
-  "collectionWishlistEmptyTitle": "Wishlist is empty",
-  "@collectionWishlistEmptyTitle": {
-    "description": "Wishlist empty state title"
-  },
-  "collectionWishlistEmptySubtitle": "Tap + on tracks to save what you want to download later",
-  "@collectionWishlistEmptySubtitle": {
-    "description": "Wishlist empty state subtitle"
-  },
-  "collectionLovedEmptyTitle": "Loved folder is empty",
-  "@collectionLovedEmptyTitle": {
-    "description": "Loved empty state title"
-  },
-  "collectionLovedEmptySubtitle": "Tap love on tracks to keep your favorites",
-  "@collectionLovedEmptySubtitle": {
-    "description": "Loved empty state subtitle"
-  },
-  "collectionPlaylistEmptyTitle": "Playlist is empty",
-  "@collectionPlaylistEmptyTitle": {
-    "description": "Playlist empty state title"
-  },
-  "collectionPlaylistEmptySubtitle": "Long-press + on any track to add it here",
-  "@collectionPlaylistEmptySubtitle": {
-    "description": "Playlist empty state subtitle"
-  },
-  "collectionRemoveFromPlaylist": "Remove from playlist",
-  "@collectionRemoveFromPlaylist": {
-    "description": "Tooltip for removing track from playlist"
-  },
-  "collectionRemoveFromFolder": "Remove from folder",
-  "@collectionRemoveFromFolder": {
-    "description": "Tooltip for removing track from wishlist/loved folder"
-  },
-  "collectionRemoved": "\"{trackName}\" removed",
-  "@collectionRemoved": {
-    "description": "Snackbar after removing a track from a collection",
-    "placeholders": {
-      "trackName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionAddedToLoved": "\"{trackName}\" added to Loved",
-  "@collectionAddedToLoved": {
-    "description": "Snackbar after adding track to loved folder",
-    "placeholders": {
-      "trackName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionRemovedFromLoved": "\"{trackName}\" removed from Loved",
-  "@collectionRemovedFromLoved": {
-    "description": "Snackbar after removing track from loved folder",
-    "placeholders": {
-      "trackName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionAddedToWishlist": "\"{trackName}\" added to Wishlist",
-  "@collectionAddedToWishlist": {
-    "description": "Snackbar after adding track to wishlist",
-    "placeholders": {
-      "trackName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionRemovedFromWishlist": "\"{trackName}\" removed from Wishlist",
-  "@collectionRemovedFromWishlist": {
-    "description": "Snackbar after removing track from wishlist",
-    "placeholders": {
-      "trackName": {
-        "type": "String"
-      }
-    }
-  },
-  "trackOptionAddToLoved": "Add to Loved",
-  "@trackOptionAddToLoved": {
-    "description": "Bottom sheet action label - add track to loved folder"
-  },
-  "trackOptionRemoveFromLoved": "Remove from Loved",
-  "@trackOptionRemoveFromLoved": {
-    "description": "Bottom sheet action label - remove track from loved folder"
-  },
-  "trackOptionAddToWishlist": "Add to Wishlist",
-  "@trackOptionAddToWishlist": {
-    "description": "Bottom sheet action label - add track to wishlist"
-  },
-  "trackOptionRemoveFromWishlist": "Remove from Wishlist",
-  "@trackOptionRemoveFromWishlist": {
-    "description": "Bottom sheet action label - remove track from wishlist"
-  },
-  "collectionPlaylistChangeCover": "Change cover image",
-  "@collectionPlaylistChangeCover": {
-    "description": "Bottom sheet action to pick a custom cover image for a playlist"
-  },
-  "collectionPlaylistRemoveCover": "Remove cover image",
-  "@collectionPlaylistRemoveCover": {
-    "description": "Bottom sheet action to remove custom cover image from a playlist"
-  },
-  "selectionShareCount": "Share {count} {count, plural, =1{track} other{tracks}}",
-  "@selectionShareCount": {
-    "description": "Share button text with count in selection mode",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "selectionShareNoFiles": "No shareable files found",
-  "@selectionShareNoFiles": {
-    "description": "Snackbar when no selected files exist on disk"
-  },
-  "selectionConvertCount": "Convert {count} {count, plural, =1{track} other{tracks}}",
-  "@selectionConvertCount": {
-    "description": "Convert button text with count in selection mode",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "selectionConvertNoConvertible": "No convertible tracks selected",
-  "@selectionConvertNoConvertible": {
-    "description": "Snackbar when no selected tracks support conversion"
-  },
-  "selectionBatchConvertConfirmTitle": "Batch Convert",
-  "@selectionBatchConvertConfirmTitle": {
-    "description": "Confirmation dialog title for batch conversion"
-  },
-  "selectionBatchConvertConfirmMessage": "Convert {count} {count, plural, =1{track} other{tracks}} to {format} at {bitrate}?\n\nOriginal files will be deleted after conversion.",
-  "@selectionBatchConvertConfirmMessage": {
-    "description": "Confirmation dialog message for batch conversion",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      },
-      "format": {
-        "type": "String"
-      },
-      "bitrate": {
-        "type": "String"
-      }
-    }
-  },
-  "selectionBatchConvertProgress": "Converting {current} of {total}...",
-  "@selectionBatchConvertProgress": {
-    "description": "Snackbar during batch conversion progress",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "selectionBatchConvertSuccess": "Converted {success} of {total} tracks to {format}",
-  "@selectionBatchConvertSuccess": {
-    "description": "Snackbar after batch conversion completes",
-    "placeholders": {
-      "success": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      },
-      "format": {
-        "type": "String"
-      }
-    }
-  },
   "downloadedAlbumDownloadedCount": "{count} descargado",
   "@downloadedAlbumDownloadedCount": {
     "description": "Downloaded tracks count badge",
@@ -3194,4 +2800,4 @@
   "@downloadUseAlbumArtistForFoldersTrackSubtitle": {
     "description": "Subtitle when Track Artist is used for folder naming"
   }
-}
+}

lib/l10n/arb/app_fr.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal and Qobuz.",
+  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal, Qobuz, and Amazon Music.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -897,18 +897,6 @@
   "@errorNoTracksFound": {
     "description": "Error - search returned no results"
   },
-  "errorUrlNotRecognized": "Link not recognized",
-  "@errorUrlNotRecognized": {
-    "description": "Error title - URL not handled by any extension or service"
-  },
-  "errorUrlNotRecognizedMessage": "This link is not supported. Make sure the URL is correct and a compatible extension is installed.",
-  "@errorUrlNotRecognizedMessage": {
-    "description": "Error message - URL not recognized explanation"
-  },
-  "errorUrlFetchFailed": "Failed to load content from this link. Please try again.",
-  "@errorUrlFetchFailed": {
-    "description": "Error message - generic URL fetch failure"
-  },
   "errorMissingExtensionSource": "Cannot load {item}: missing extension source",
   "@errorMissingExtensionSource": {
     "description": "Error - extension source not available",
@@ -1015,14 +1003,6 @@
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "By Playlist",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Separate folder for each playlist",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "By Artist",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1117,7 +1097,7 @@
   },
   "providerBuiltIn": "Built-in",
   "@providerBuiltIn": {
-    "description": "Label for built-in providers (Tidal/Qobuz)"
+    "description": "Label for built-in providers (Tidal/Qobuz/Amazon)"
   },
   "providerExtension": "Extension",
   "@providerExtension": {
@@ -1773,6 +1753,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Ask Before Download",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2391,7 +2383,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Deezer",
+  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Amazon Music",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2816,90 +2808,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "Split CUE Sheet",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "Split CUE+FLAC into individual tracks",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Album: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Artist: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} tracks",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "Split CUE Album",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Split \"{album}\" into {count} individual FLAC files?\n\nFiles will be saved to the same directory.",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "Splitting CUE sheet... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "Split into {count} tracks successfully",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "CUE split failed",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Audio file not found for this CUE sheet",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "Split into Tracks",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
   "actionCreate": "Create",
   "@actionCreate": {
     "description": "Generic action button - create"

lib/l10n/arb/app_hi.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal and Qobuz.",
+  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal, Qobuz, and Amazon Music.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -897,18 +897,6 @@
   "@errorNoTracksFound": {
     "description": "Error - search returned no results"
   },
-  "errorUrlNotRecognized": "Link not recognized",
-  "@errorUrlNotRecognized": {
-    "description": "Error title - URL not handled by any extension or service"
-  },
-  "errorUrlNotRecognizedMessage": "This link is not supported. Make sure the URL is correct and a compatible extension is installed.",
-  "@errorUrlNotRecognizedMessage": {
-    "description": "Error message - URL not recognized explanation"
-  },
-  "errorUrlFetchFailed": "Failed to load content from this link. Please try again.",
-  "@errorUrlFetchFailed": {
-    "description": "Error message - generic URL fetch failure"
-  },
   "errorMissingExtensionSource": "Cannot load {item}: missing extension source",
   "@errorMissingExtensionSource": {
     "description": "Error - extension source not available",
@@ -1015,14 +1003,6 @@
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "By Playlist",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Separate folder for each playlist",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "By Artist",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1117,7 +1097,7 @@
   },
   "providerBuiltIn": "Built-in",
   "@providerBuiltIn": {
-    "description": "Label for built-in providers (Tidal/Qobuz)"
+    "description": "Label for built-in providers (Tidal/Qobuz/Amazon)"
   },
   "providerExtension": "Extension",
   "@providerExtension": {
@@ -1773,6 +1753,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Ask Before Download",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2391,7 +2383,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Deezer",
+  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Amazon Music",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2816,90 +2808,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "Split CUE Sheet",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "Split CUE+FLAC into individual tracks",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Album: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Artist: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} tracks",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "Split CUE Album",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Split \"{album}\" into {count} individual FLAC files?\n\nFiles will be saved to the same directory.",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "Splitting CUE sheet... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "Split into {count} tracks successfully",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "CUE split failed",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Audio file not found for this CUE sheet",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "Split into Tracks",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
   "actionCreate": "Create",
   "@actionCreate": {
     "description": "Generic action button - create"

lib/l10n/arb/app_id.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Unduh lagu-lagu Spotify dalam kualitas lossless dari Tidal dan Qobuz.",
+  "aboutAppDescription": "Unduh lagu Spotify dalam kualitas lossless dari Tidal, Qobuz, dan Amazon Music.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -1003,11 +1003,11 @@
   "@filenameFormat": {
     "description": "Setting title - filename pattern"
   },
-  "filenameShowAdvancedTags": "Tampilkan tag lanjutan",
+  "filenameShowAdvancedTags": "Show advanced tags",
   "@filenameShowAdvancedTags": {
     "description": "Toggle label for showing advanced filename tags"
   },
-  "filenameShowAdvancedTagsDescription": "Aktifkan tag yang diformat untuk padding trek dan pola tanggal",
+  "filenameShowAdvancedTagsDescription": "Enable formatted tags for track padding and date patterns",
   "@filenameShowAdvancedTagsDescription": {
     "description": "Description for advanced filename tag toggle"
   },
@@ -1015,14 +1015,6 @@
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "Berdasarkan Daftar Putar",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Setiap daftar putar memerlukan folder terpisah",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "Berdasarkan Artis",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1117,7 +1109,7 @@
   },
   "providerBuiltIn": "Bawaan",
   "@providerBuiltIn": {
-    "description": "Label for built-in providers (Tidal/Qobuz)"
+    "description": "Label for built-in providers (Tidal/Qobuz/Amazon)"
   },
   "providerExtension": "Ekstensi",
   "@providerExtension": {
@@ -1217,7 +1209,7 @@
   "@credentialsDescription": {
     "description": "Credentials dialog explanation"
   },
-  "credentialsClientId": "ID Klien",
+  "credentialsClientId": "Client ID",
   "@credentialsClientId": {
     "description": "Client ID field label - DO NOT TRANSLATE"
   },
@@ -1225,7 +1217,7 @@
   "@credentialsClientIdHint": {
     "description": "Client ID placeholder"
   },
-  "credentialsClientSecret": "Rahasia Klien",
+  "credentialsClientSecret": "Client Secret",
   "@credentialsClientSecret": {
     "description": "Client Secret field label - DO NOT TRANSLATE"
   },
@@ -1237,7 +1229,7 @@
   "@channelStable": {
     "description": "Update channel - stable releases"
   },
-  "channelPreview": "Pratinjau",
+  "channelPreview": "Preview",
   "@channelPreview": {
     "description": "Update channel - beta/preview releases"
   },
@@ -1277,39 +1269,39 @@
   "@sectionFileSettings": {
     "description": "Settings section header"
   },
-  "sectionLyrics": "Lirik",
+  "sectionLyrics": "Lyrics",
   "@sectionLyrics": {
     "description": "Settings section header"
   },
-  "lyricsMode": "Mode Lirik",
+  "lyricsMode": "Lyrics Mode",
   "@lyricsMode": {
     "description": "Setting - how to save lyrics"
   },
-  "lyricsModeDescription": "Pilih cara lirik disimpan bersama unduhan Anda",
+  "lyricsModeDescription": "Choose how lyrics are saved with your downloads",
   "@lyricsModeDescription": {
     "description": "Lyrics mode picker description"
   },
-  "lyricsModeEmbed": "Sematkan dalam file",
+  "lyricsModeEmbed": "Embed in file",
   "@lyricsModeEmbed": {
     "description": "Lyrics mode option - embed in audio file"
   },
-  "lyricsModeEmbedSubtitle": "Lirik tersimpan di dalam metadata FLAC",
+  "lyricsModeEmbedSubtitle": "Lyrics stored inside FLAC metadata",
   "@lyricsModeEmbedSubtitle": {
     "description": "Subtitle for embed option"
   },
-  "lyricsModeExternal": "File .lrc eksternal",
+  "lyricsModeExternal": "External .lrc file",
   "@lyricsModeExternal": {
     "description": "Lyrics mode option - separate LRC file"
   },
-  "lyricsModeExternalSubtitle": "File .lrc terpisah untuk pemutar musik seperti Samsung Music",
+  "lyricsModeExternalSubtitle": "Separate .lrc file for players like Samsung Music",
   "@lyricsModeExternalSubtitle": {
     "description": "Subtitle for external option"
   },
-  "lyricsModeBoth": "Keduanya",
+  "lyricsModeBoth": "Both",
   "@lyricsModeBoth": {
     "description": "Lyrics mode option - embed and external"
   },
-  "lyricsModeBothSubtitle": "Sematkan dan simpan file .lrc",
+  "lyricsModeBothSubtitle": "Embed and save .lrc file",
   "@lyricsModeBothSubtitle": {
     "description": "Subtitle for both option"
   },
@@ -1455,11 +1447,11 @@
   "@trackGenre": {
     "description": "Metadata label - music genre"
   },
-  "trackLabel": "Lebel",
+  "trackLabel": "Label",
   "@trackLabel": {
     "description": "Metadata label - record label"
   },
-  "trackCopyright": "Hak cipta",
+  "trackCopyright": "Copyright",
   "@trackCopyright": {
     "description": "Metadata label - copyright information"
   },
@@ -1483,15 +1475,15 @@
   "@trackLyricsLoadFailed": {
     "description": "Message when lyrics loading fails"
   },
-  "trackEmbedLyrics": "Sematkan Lirik",
+  "trackEmbedLyrics": "Embed Lyrics",
   "@trackEmbedLyrics": {
     "description": "Action - embed lyrics into audio file"
   },
-  "trackLyricsEmbedded": "Lirik berhasil disematkan",
+  "trackLyricsEmbedded": "Lyrics embedded successfully",
   "@trackLyricsEmbedded": {
     "description": "Snackbar - lyrics saved to file"
   },
-  "trackInstrumental": "Lagu instrumental",
+  "trackInstrumental": "Instrumental track",
   "@trackInstrumental": {
     "description": "Message when track is instrumental (no lyrics)"
   },
@@ -1570,7 +1562,7 @@
   "@storeClearFilters": {
     "description": "Button to clear all filters"
   },
-  "extensionDefaultProvider": "Bawaan (Deezer/Spotify)",
+  "extensionDefaultProvider": "Default (Deezer/Spotify)",
   "@extensionDefaultProvider": {
     "description": "Default search provider option"
   },
@@ -1586,7 +1578,7 @@
   "@extensionId": {
     "description": "Extension detail - unique ID"
   },
-  "extensionError": "Terjadi kesalahan",
+  "extensionError": "Error",
   "@extensionError": {
     "description": "Extension detail - error message"
   },
@@ -1773,6 +1765,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Tanya Sebelum Unduh",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -1789,35 +1793,19 @@
   "@downloadAlbumFolderStructure": {
     "description": "Setting - album folder organization"
   },
-  "downloadUseAlbumArtistForFolders": "Gunakan Artis Album untuk folder",
+  "downloadUseAlbumArtistForFolders": "Use Album Artist for folders",
   "@downloadUseAlbumArtistForFolders": {
     "description": "Setting - choose whether artist folders use Album Artist or Track Artist"
   },
-  "downloadCreatePlaylistSourceFolder": "Buat folder sumber playlist",
-  "@downloadCreatePlaylistSourceFolder": {
-    "description": "Setting title for adding a playlist folder prefix before the normal organization structure"
-  },
-  "downloadCreatePlaylistSourceFolderEnabled": "Unduhan dari playlist memakai Playlist/ lalu struktur folder normal Anda.",
-  "@downloadCreatePlaylistSourceFolderEnabled": {
-    "description": "Subtitle when playlist source folder prefix is enabled"
-  },
-  "downloadCreatePlaylistSourceFolderDisabled": "Unduhan dari playlist hanya memakai struktur folder normal.",
-  "@downloadCreatePlaylistSourceFolderDisabled": {
-    "description": "Subtitle when playlist source folder prefix is disabled"
-  },
-  "downloadCreatePlaylistSourceFolderRedundant": "Mode Berdasarkan Playlist sudah menaruh unduhan ke dalam folder playlist.",
-  "@downloadCreatePlaylistSourceFolderRedundant": {
-    "description": "Subtitle when playlist folder prefix setting is redundant because folder organization is already by playlist"
-  },
-  "downloadUsePrimaryArtistOnly": "Hanya artis utama untuk folder",
+  "downloadUsePrimaryArtistOnly": "Primary artist only for folders",
   "@downloadUsePrimaryArtistOnly": {
     "description": "Setting - strip featured artists from folder name"
   },
-  "downloadUsePrimaryArtistOnlyEnabled": "Artis unggulan dihapus dari nama folder (misalnya Justin Bieber, Quavo → Justin Bieber)",
+  "downloadUsePrimaryArtistOnlyEnabled": "Featured artists removed from folder name (e.g. Justin Bieber, Quavo → Justin Bieber)",
   "@downloadUsePrimaryArtistOnlyEnabled": {
     "description": "Subtitle when primary artist only is enabled"
   },
-  "downloadUsePrimaryArtistOnlyDisabled": "Nama lengkap artis digunakan untuk nama folder",
+  "downloadUsePrimaryArtistOnlyDisabled": "Full artist string used for folder name",
   "@downloadUsePrimaryArtistOnlyDisabled": {
     "description": "Subtitle when primary artist only is disabled"
   },
@@ -1845,27 +1833,27 @@
   "@queueClearAllMessage": {
     "description": "Clear queue confirmation"
   },
-  "settingsAutoExportFailed": "Unduhan yang gagal diekspor otomatis",
+  "settingsAutoExportFailed": "Auto-export failed downloads",
   "@settingsAutoExportFailed": {
     "description": "Setting toggle for auto-export"
   },
-  "settingsAutoExportFailedSubtitle": "Simpan unduhan yang gagal ke file TXT secara otomatis",
+  "settingsAutoExportFailedSubtitle": "Save failed downloads to TXT file automatically",
   "@settingsAutoExportFailedSubtitle": {
     "description": "Subtitle for auto-export setting"
   },
-  "settingsDownloadNetwork": "Jaringan Unduhan",
+  "settingsDownloadNetwork": "Download Network",
   "@settingsDownloadNetwork": {
     "description": "Setting for network type preference"
   },
-  "settingsDownloadNetworkAny": "WiFi + Data Seluler",
+  "settingsDownloadNetworkAny": "WiFi + Mobile Data",
   "@settingsDownloadNetworkAny": {
     "description": "Network option - use any connection"
   },
-  "settingsDownloadNetworkWifiOnly": "Hanya WiFi",
+  "settingsDownloadNetworkWifiOnly": "WiFi Only",
   "@settingsDownloadNetworkWifiOnly": {
     "description": "Network option - only use WiFi"
   },
-  "settingsDownloadNetworkSubtitle": "Pilih jaringan mana yang akan digunakan untuk mengunduh. Jika diatur ke Hanya WiFi, unduhan akan berhenti sementara dan menggunakan data seluler.",
+  "settingsDownloadNetworkSubtitle": "Choose which network to use for downloads. When set to WiFi Only, downloads will pause on mobile data.",
   "@settingsDownloadNetworkSubtitle": {
     "description": "Subtitle explaining network preference"
   },
@@ -1901,11 +1889,11 @@
   "@albumFolderYearAlbumSubtitle": {
     "description": "Folder structure example"
   },
-  "albumFolderArtistAlbumSingles": "Artis / Album + Singel",
+  "albumFolderArtistAlbumSingles": "Artist / Album + Singles",
   "@albumFolderArtistAlbumSingles": {
     "description": "Album folder option with singles inside artist"
   },
-  "albumFolderArtistAlbumSinglesSubtitle": "Artis/Album/ dan Artis/Single/",
+  "albumFolderArtistAlbumSinglesSubtitle": "Artist/Album/ and Artist/Singles/",
   "@albumFolderArtistAlbumSinglesSubtitle": {
     "description": "Folder structure example"
   },
@@ -1974,19 +1962,19 @@
   "@recentTypeSong": {
     "description": "Recent access item type - song/track"
   },
-  "recentTypePlaylist": "Daftar putar",
+  "recentTypePlaylist": "Playlist",
   "@recentTypePlaylist": {
     "description": "Recent access item type - playlist"
   },
-  "recentEmpty": "Belum ada item terbaru",
+  "recentEmpty": "No recent items yet",
   "@recentEmpty": {
     "description": "Empty state text for recent access list"
   },
-  "recentShowAllDownloads": "Tampilkan Semua Unduhan",
+  "recentShowAllDownloads": "Show All Downloads",
   "@recentShowAllDownloads": {
     "description": "Button label to unhide hidden downloads in recent access"
   },
-  "recentPlaylistInfo": "Daftar Putar: {name}",
+  "recentPlaylistInfo": "Playlist: {name}",
   "@recentPlaylistInfo": {
     "description": "Snackbar message when tapping playlist in recent access",
     "placeholders": {
@@ -1996,7 +1984,7 @@
       }
     }
   },
-  "discographyDownload": "Unduh Diskografi",
+  "discographyDownload": "Download Discography",
   "@discographyDownload": {
     "description": "Button - download artist discography"
   },
@@ -2395,47 +2383,47 @@
       }
     }
   },
-  "tutorialWelcomeTitle": "Selamat Datang di SpotiFLAC!",
+  "tutorialWelcomeTitle": "Welcome to SpotiFLAC!",
   "@tutorialWelcomeTitle": {
     "description": "Tutorial welcome page title"
   },
-  "tutorialWelcomeDesc": "Mari kita pelajari cara mengunduh musik favorit Anda dalam kualitas lossless. Tutorial singkat ini akan menunjukkan dasar-dasarnya.",
+  "tutorialWelcomeDesc": "Let's learn how to download your favorite music in lossless quality. This quick tutorial will show you the basics.",
   "@tutorialWelcomeDesc": {
     "description": "Tutorial welcome page description"
   },
-  "tutorialWelcomeTip1": "Unduh musik dari Spotify, Deezer, atau tempel URL yang didukung",
+  "tutorialWelcomeTip1": "Download music from Spotify, Deezer, or paste any supported URL",
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Dapatkan audio berkualitas FLAC dari Tidal, Qobuz, atau Deezer",
+  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Amazon Music",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
-  "tutorialWelcomeTip3": "Penyematan metadata, sampul album, dan lirik secara otomatis",
+  "tutorialWelcomeTip3": "Automatic metadata, cover art, and lyrics embedding",
   "@tutorialWelcomeTip3": {
     "description": "Tutorial welcome tip 3"
   },
-  "tutorialSearchTitle": "Menemukan Musik",
+  "tutorialSearchTitle": "Finding Music",
   "@tutorialSearchTitle": {
     "description": "Tutorial search page title"
   },
-  "tutorialSearchDesc": "Ada dua cara mudah untuk menemukan musik yang ingin Anda unduh.",
+  "tutorialSearchDesc": "There are two easy ways to find music you want to download.",
   "@tutorialSearchDesc": {
     "description": "Tutorial search page description"
   },
-  "tutorialDownloadTitle": "Mengunduh Musik",
+  "tutorialDownloadTitle": "Downloading Music",
   "@tutorialDownloadTitle": {
     "description": "Tutorial download page title"
   },
-  "tutorialDownloadDesc": "Mengunduh musik itu mudah dan cepat. Begini cara kerjanya.",
+  "tutorialDownloadDesc": "Downloading music is simple and fast. Here's how it works.",
   "@tutorialDownloadDesc": {
     "description": "Tutorial download page description"
   },
-  "tutorialLibraryTitle": "Perpustakaan Anda",
+  "tutorialLibraryTitle": "Your Library",
   "@tutorialLibraryTitle": {
     "description": "Tutorial library page title"
   },
-  "tutorialLibraryDesc": "Semua musik yang Anda unduh tersusun rapi di tab Perpustakaan.",
+  "tutorialLibraryDesc": "All your downloaded music is organized in the Library tab.",
   "@tutorialLibraryDesc": {
     "description": "Tutorial library page description"
   },
@@ -2767,47 +2755,6 @@
   "@trackReEnrichFfmpegFailed": {
     "description": "Snackbar when FFmpeg embed fails for MP3/Opus"
   },
-  "queueFlacAction": "Antrekan FLAC",
-  "@queueFlacAction": {
-    "description": "Action/button label for queueing FLAC redownloads for local tracks"
-  },
-  "queueFlacConfirmMessage": "Cari kecocokan online untuk track yang dipilih lalu antrekan download FLAC.\n\nFile yang sudah ada tidak akan diubah atau dihapus.\n\nHanya kecocokan dengan keyakinan tinggi yang akan diantrikan otomatis.\n\n{count} dipilih",
-  "@queueFlacConfirmMessage": {
-    "description": "Confirmation dialog body before queueing FLAC redownloads for local tracks",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "queueFlacFindingProgress": "Mencari kecocokan FLAC... ({current}/{total})",
-  "@queueFlacFindingProgress": {
-    "description": "Snackbar while resolving remote matches for local FLAC redownloads",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "queueFlacNoReliableMatches": "Tidak ada kecocokan online yang cukup meyakinkan untuk pilihan ini",
-  "@queueFlacNoReliableMatches": {
-    "description": "Snackbar when no safe FLAC redownload matches were found"
-  },
-  "queueFlacQueuedWithSkipped": "Menambahkan {addedCount} track ke antrean, melewati {skippedCount}",
-  "@queueFlacQueuedWithSkipped": {
-    "description": "Snackbar when some selected local tracks were queued for FLAC redownload and some were skipped",
-    "placeholders": {
-      "addedCount": {
-        "type": "int"
-      },
-      "skippedCount": {
-        "type": "int"
-      }
-    }
-  },
   "trackSaveFailed": "Failed: {error}",
   "@trackSaveFailed": {
     "description": "Snackbar when save operation fails",
@@ -2821,7 +2768,7 @@
   "@trackConvertFormat": {
     "description": "Menu item - convert audio format"
   },
-  "trackConvertFormatSubtitle": "Konversi ke MP3, Opus, ALAC, atau FLAC",
+  "trackConvertFormatSubtitle": "Convert to MP3 or Opus",
   "@trackConvertFormatSubtitle": {
     "description": "Subtitle for convert format menu item"
   },
@@ -2856,22 +2803,6 @@
       }
     }
   },
-  "trackConvertConfirmMessageLossless": "Konversi dari {sourceFormat} ke {targetFormat}? (Lossless — tanpa kehilangan kualitas)\n\nFile asli akan dihapus setelah konversi.",
-  "@trackConvertConfirmMessageLossless": {
-    "description": "Confirmation dialog message for lossless-to-lossless conversion",
-    "placeholders": {
-      "sourceFormat": {
-        "type": "String"
-      },
-      "targetFormat": {
-        "type": "String"
-      }
-    }
-  },
-  "trackConvertLosslessHint": "Konversi lossless — tanpa kehilangan kualitas",
-  "@trackConvertLosslessHint": {
-    "description": "Hint shown when converting between lossless formats"
-  },
   "trackConvertConverting": "Converting audio...",
   "@trackConvertConverting": {
     "description": "Snackbar while converting"
@@ -2889,90 +2820,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "Split CUE Sheet",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "Split CUE+FLAC into individual tracks",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Album: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Artist: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} tracks",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "Split CUE Album",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Split \"{album}\" into {count} individual FLAC files?\n\nFiles will be saved to the same directory.",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "Splitting CUE sheet... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "Split into {count} tracks successfully",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "CUE split failed",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Audio file not found for this CUE sheet",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "Split into Tracks",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
   "actionCreate": "Create",
   "@actionCreate": {
     "description": "Generic action button - create"
@@ -3267,4 +3114,4 @@
   "@downloadUseAlbumArtistForFoldersTrackSubtitle": {
     "description": "Subtitle when Track Artist is used for folder naming"
   }
-}
+}

lib/l10n/arb/app_ja.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal and Qobuz.",
+  "aboutAppDescription": "Tidal、Qobuz、Amazon Music から Spotify のトラックをロスレス品質でダウンロードします。",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -897,18 +897,6 @@
   "@errorNoTracksFound": {
     "description": "Error - search returned no results"
   },
-  "errorUrlNotRecognized": "Link not recognized",
-  "@errorUrlNotRecognized": {
-    "description": "Error title - URL not handled by any extension or service"
-  },
-  "errorUrlNotRecognizedMessage": "This link is not supported. Make sure the URL is correct and a compatible extension is installed.",
-  "@errorUrlNotRecognizedMessage": {
-    "description": "Error message - URL not recognized explanation"
-  },
-  "errorUrlFetchFailed": "Failed to load content from this link. Please try again.",
-  "@errorUrlFetchFailed": {
-    "description": "Error message - generic URL fetch failure"
-  },
   "errorMissingExtensionSource": "{item} を読み込めません: 拡張ソースがありません",
   "@errorMissingExtensionSource": {
     "description": "Error - extension source not available",
@@ -1003,7 +991,7 @@
   "@filenameFormat": {
     "description": "Setting title - filename pattern"
   },
-  "filenameShowAdvancedTags": "高度なタグを表示",
+  "filenameShowAdvancedTags": "Show advanced tags",
   "@filenameShowAdvancedTags": {
     "description": "Toggle label for showing advanced filename tags"
   },
@@ -1015,14 +1003,6 @@
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "By Playlist",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Separate folder for each playlist",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "アーティスト別",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1117,7 +1097,7 @@
   },
   "providerBuiltIn": "内蔵",
   "@providerBuiltIn": {
-    "description": "Label for built-in providers (Tidal/Qobuz)"
+    "description": "Label for built-in providers (Tidal/Qobuz/Amazon)"
   },
   "providerExtension": "拡張",
   "@providerExtension": {
@@ -1491,7 +1471,7 @@
   "@trackLyricsEmbedded": {
     "description": "Snackbar - lyrics saved to file"
   },
-  "trackInstrumental": "インストゥルメンタルのトラック",
+  "trackInstrumental": "Instrumental track",
   "@trackInstrumental": {
     "description": "Message when track is instrumental (no lyrics)"
   },
@@ -1773,6 +1753,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus のビットレート",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 のビットレート",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "ダウンロード前に確認する",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2391,7 +2383,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Deezer",
+  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Amazon Music",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2816,90 +2808,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "分割 CUE シート",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "Split CUE+FLAC into individual tracks",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Album: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Artist: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} tracks",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "Split CUE Album",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Split \"{album}\" into {count} individual FLAC files?\n\nFiles will be saved to the same directory.",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "Splitting CUE sheet... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "Split into {count} tracks successfully",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "CUE split failed",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Audio file not found for this CUE sheet",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "Split into Tracks",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
   "actionCreate": "Create",
   "@actionCreate": {
     "description": "Generic action button - create"
@@ -3032,7 +2940,7 @@
   "@collectionRemoveFromPlaylist": {
     "description": "Tooltip for removing track from playlist"
   },
-  "collectionRemoveFromFolder": "フォルダから削除",
+  "collectionRemoveFromFolder": "Remove from folder",
   "@collectionRemoveFromFolder": {
     "description": "Tooltip for removing track from wishlist/loved folder"
   },
@@ -3089,23 +2997,23 @@
   "@trackOptionRemoveFromLoved": {
     "description": "Bottom sheet action label - remove track from loved folder"
   },
-  "trackOptionAddToWishlist": "ウィッシュリストに追加",
+  "trackOptionAddToWishlist": "Add to Wishlist",
   "@trackOptionAddToWishlist": {
     "description": "Bottom sheet action label - add track to wishlist"
   },
-  "trackOptionRemoveFromWishlist": "ウィッシュから削除",
+  "trackOptionRemoveFromWishlist": "Remove from Wishlist",
   "@trackOptionRemoveFromWishlist": {
     "description": "Bottom sheet action label - remove track from wishlist"
   },
-  "collectionPlaylistChangeCover": "カバー画像を変更",
+  "collectionPlaylistChangeCover": "Change cover image",
   "@collectionPlaylistChangeCover": {
     "description": "Bottom sheet action to pick a custom cover image for a playlist"
   },
-  "collectionPlaylistRemoveCover": "カバー画像を削除",
+  "collectionPlaylistRemoveCover": "Remove cover image",
   "@collectionPlaylistRemoveCover": {
     "description": "Bottom sheet action to remove custom cover image from a playlist"
   },
-  "selectionShareCount": "{count} {count, plural, =1{個のトラック} other{個のトラック}}を共有",
+  "selectionShareCount": "Share {count} {count, plural, =1{track} other{tracks}}",
   "@selectionShareCount": {
     "description": "Share button text with count in selection mode",
     "placeholders": {
@@ -3131,7 +3039,7 @@
   "@selectionConvertNoConvertible": {
     "description": "Snackbar when no selected tracks support conversion"
   },
-  "selectionBatchConvertConfirmTitle": "一括変換",
+  "selectionBatchConvertConfirmTitle": "Batch Convert",
   "@selectionBatchConvertConfirmTitle": {
     "description": "Confirmation dialog title for batch conversion"
   },

lib/l10n/arb/app_ko.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal and Qobuz.",
+  "aboutAppDescription": "Tidal, Qobuz, Amazon Music에서 Spotify 트랙을 무손실 음질로 다운로드하세요.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -897,18 +897,6 @@
   "@errorNoTracksFound": {
     "description": "Error - search returned no results"
   },
-  "errorUrlNotRecognized": "Link not recognized",
-  "@errorUrlNotRecognized": {
-    "description": "Error title - URL not handled by any extension or service"
-  },
-  "errorUrlNotRecognizedMessage": "This link is not supported. Make sure the URL is correct and a compatible extension is installed.",
-  "@errorUrlNotRecognizedMessage": {
-    "description": "Error message - URL not recognized explanation"
-  },
-  "errorUrlFetchFailed": "Failed to load content from this link. Please try again.",
-  "@errorUrlFetchFailed": {
-    "description": "Error message - generic URL fetch failure"
-  },
   "errorMissingExtensionSource": "확장 소스가 누락되어, {item}(을)를 로드할 수 없습니다",
   "@errorMissingExtensionSource": {
     "description": "Error - extension source not available",
@@ -1015,14 +1003,6 @@
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "By Playlist",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Separate folder for each playlist",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "By Artist",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1117,7 +1097,7 @@
   },
   "providerBuiltIn": "Built-in",
   "@providerBuiltIn": {
-    "description": "Label for built-in providers (Tidal/Qobuz)"
+    "description": "Label for built-in providers (Tidal/Qobuz/Amazon)"
   },
   "providerExtension": "Extension",
   "@providerExtension": {
@@ -1773,6 +1753,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Ask Before Download",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2391,7 +2383,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Deezer",
+  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Amazon Music",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2816,90 +2808,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "Split CUE Sheet",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "Split CUE+FLAC into individual tracks",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Album: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Artist: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} tracks",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "Split CUE Album",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Split \"{album}\" into {count} individual FLAC files?\n\nFiles will be saved to the same directory.",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "Splitting CUE sheet... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "Split into {count} tracks successfully",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "CUE split failed",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Audio file not found for this CUE sheet",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "Split into Tracks",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
   "actionCreate": "Create",
   "@actionCreate": {
     "description": "Generic action button - create"

lib/l10n/arb/app_nl.arb

@@ -194,11 +194,11 @@
   "@optionsConcurrentDownloads": {
     "description": "Number of parallel downloads"
   },
-  "optionsConcurrentSequential": "Sequentiële (1 per keer)",
+  "optionsConcurrentSequential": "Sequential (1 at a time)",
   "@optionsConcurrentSequential": {
     "description": "Download one at a time"
   },
-  "optionsConcurrentParallel": "",
+  "optionsConcurrentParallel": "{count} parallel downloads",
   "@optionsConcurrentParallel": {
     "description": "Multiple parallel downloads",
     "placeholders": {
@@ -207,7 +207,7 @@
       }
     }
   },
-  "optionsConcurrentWarning": "Parallel downloaden kan leiden tot rate-limiting",
+  "optionsConcurrentWarning": "Parallel downloads may trigger rate limiting",
   "@optionsConcurrentWarning": {
     "description": "Warning about rate limits"
   },
@@ -346,7 +346,7 @@
   "@aboutContributors": {
     "description": "Section for contributors"
   },
-  "aboutMobileDeveloper": "",
+  "aboutMobileDeveloper": "Mobile version developer",
   "@aboutMobileDeveloper": {
     "description": "Role description for mobile dev"
   },
@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal and Qobuz.",
+  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal, Qobuz, and Amazon Music.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -897,18 +897,6 @@
   "@errorNoTracksFound": {
     "description": "Error - search returned no results"
   },
-  "errorUrlNotRecognized": "Link not recognized",
-  "@errorUrlNotRecognized": {
-    "description": "Error title - URL not handled by any extension or service"
-  },
-  "errorUrlNotRecognizedMessage": "This link is not supported. Make sure the URL is correct and a compatible extension is installed.",
-  "@errorUrlNotRecognizedMessage": {
-    "description": "Error message - URL not recognized explanation"
-  },
-  "errorUrlFetchFailed": "Failed to load content from this link. Please try again.",
-  "@errorUrlFetchFailed": {
-    "description": "Error message - generic URL fetch failure"
-  },
   "errorMissingExtensionSource": "Cannot load {item}: missing extension source",
   "@errorMissingExtensionSource": {
     "description": "Error - extension source not available",
@@ -1015,14 +1003,6 @@
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "By Playlist",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Separate folder for each playlist",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "By Artist",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1117,7 +1097,7 @@
   },
   "providerBuiltIn": "Built-in",
   "@providerBuiltIn": {
-    "description": "Label for built-in providers (Tidal/Qobuz)"
+    "description": "Label for built-in providers (Tidal/Qobuz/Amazon)"
   },
   "providerExtension": "Extension",
   "@providerExtension": {
@@ -1773,6 +1753,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Ask Before Download",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2391,7 +2383,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Deezer",
+  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Amazon Music",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2816,90 +2808,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "Split CUE Sheet",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "Split CUE+FLAC into individual tracks",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Album: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Artist: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} tracks",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "Split CUE Album",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Split \"{album}\" into {count} individual FLAC files?\n\nFiles will be saved to the same directory.",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "Splitting CUE sheet... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "Split into {count} tracks successfully",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "CUE split failed",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Audio file not found for this CUE sheet",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "Split into Tracks",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
   "actionCreate": "Create",
   "@actionCreate": {
     "description": "Generic action button - create"

lib/l10n/arb/app_pt_PT.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal and Qobuz.",
+  "aboutAppDescription": "Baixe faixas do Spotify em qualidade sem perdas do Tidal e Qobuz.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -897,18 +897,6 @@
   "@errorNoTracksFound": {
     "description": "Error - search returned no results"
   },
-  "errorUrlNotRecognized": "Link not recognized",
-  "@errorUrlNotRecognized": {
-    "description": "Error title - URL not handled by any extension or service"
-  },
-  "errorUrlNotRecognizedMessage": "This link is not supported. Make sure the URL is correct and a compatible extension is installed.",
-  "@errorUrlNotRecognizedMessage": {
-    "description": "Error message - URL not recognized explanation"
-  },
-  "errorUrlFetchFailed": "Failed to load content from this link. Please try again.",
-  "@errorUrlFetchFailed": {
-    "description": "Error message - generic URL fetch failure"
-  },
   "errorMissingExtensionSource": "Não é possível carregar {item}: faltando a fonte da extensão",
   "@errorMissingExtensionSource": {
     "description": "Error - extension source not available",
@@ -1003,26 +991,10 @@
   "@filenameFormat": {
     "description": "Setting title - filename pattern"
   },
-  "filenameShowAdvancedTags": "Show advanced tags",
-  "@filenameShowAdvancedTags": {
-    "description": "Toggle label for showing advanced filename tags"
-  },
-  "filenameShowAdvancedTagsDescription": "Enable formatted tags for track padding and date patterns",
-  "@filenameShowAdvancedTagsDescription": {
-    "description": "Description for advanced filename tag toggle"
-  },
   "folderOrganizationNone": "Nenhuma organização",
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "By Playlist",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Separate folder for each playlist",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "Por Artista",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1773,6 +1745,10 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
   "downloadAskBeforeDownload": "Perguntar qualidade antes de baixar",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2222,15 +2198,6 @@
   "@libraryAboutDescription": {
     "description": "Description of local library feature"
   },
-  "libraryTracksUnit": "{count, plural, =1{track} other{tracks}}",
-  "@libraryTracksUnit": {
-    "description": "Unit label for tracks count (without the number itself)",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
   "libraryLastScanned": "Last scanned: {time}",
   "@libraryLastScanned": {
     "description": "Last scan time display",
@@ -2391,7 +2358,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Deezer",
+  "tutorialWelcomeTip2": "Obtenha áudio em qualidade FLAC do Tidal, Qobuz ou Deezer",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2816,367 +2783,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "Split CUE Sheet",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "Split CUE+FLAC into individual tracks",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Album: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Artist: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} tracks",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "Split CUE Album",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Split \"{album}\" into {count} individual FLAC files?\n\nFiles will be saved to the same directory.",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "Splitting CUE sheet... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "Split into {count} tracks successfully",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "CUE split failed",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Audio file not found for this CUE sheet",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "Split into Tracks",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
-  "actionCreate": "Create",
-  "@actionCreate": {
-    "description": "Generic action button - create"
-  },
-  "collectionFoldersTitle": "My folders",
-  "@collectionFoldersTitle": {
-    "description": "Library section title for custom folders"
-  },
-  "collectionWishlist": "Wishlist",
-  "@collectionWishlist": {
-    "description": "Custom folder for saved tracks to download later"
-  },
-  "collectionLoved": "Loved",
-  "@collectionLoved": {
-    "description": "Custom folder for favorite tracks"
-  },
-  "collectionPlaylists": "Playlists",
-  "@collectionPlaylists": {
-    "description": "Custom user playlists folder"
-  },
-  "collectionPlaylist": "Playlist",
-  "@collectionPlaylist": {
-    "description": "Single playlist label"
-  },
-  "collectionAddToPlaylist": "Add to playlist",
-  "@collectionAddToPlaylist": {
-    "description": "Action to add a track to user playlist"
-  },
-  "collectionCreatePlaylist": "Create playlist",
-  "@collectionCreatePlaylist": {
-    "description": "Action to create a new playlist"
-  },
-  "collectionNoPlaylistsYet": "No playlists yet",
-  "@collectionNoPlaylistsYet": {
-    "description": "Empty state title when user has no playlists"
-  },
-  "collectionNoPlaylistsSubtitle": "Create a playlist to start categorizing tracks",
-  "@collectionNoPlaylistsSubtitle": {
-    "description": "Empty state subtitle when user has no playlists"
-  },
-  "collectionPlaylistTracks": "{count, plural, =1{1 track} other{{count} tracks}}",
-  "@collectionPlaylistTracks": {
-    "description": "Track count label for custom playlists",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "collectionAddedToPlaylist": "Added to \"{playlistName}\"",
-  "@collectionAddedToPlaylist": {
-    "description": "Snackbar after adding track to playlist",
-    "placeholders": {
-      "playlistName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionAlreadyInPlaylist": "Already in \"{playlistName}\"",
-  "@collectionAlreadyInPlaylist": {
-    "description": "Snackbar when track already exists in playlist",
-    "placeholders": {
-      "playlistName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionPlaylistCreated": "Playlist created",
-  "@collectionPlaylistCreated": {
-    "description": "Snackbar after creating playlist"
-  },
-  "collectionPlaylistNameHint": "Playlist name",
-  "@collectionPlaylistNameHint": {
-    "description": "Hint text for playlist name input"
-  },
-  "collectionPlaylistNameRequired": "Playlist name is required",
-  "@collectionPlaylistNameRequired": {
-    "description": "Validation error for empty playlist name"
-  },
-  "collectionRenamePlaylist": "Rename playlist",
-  "@collectionRenamePlaylist": {
-    "description": "Action to rename playlist"
-  },
-  "collectionDeletePlaylist": "Delete playlist",
-  "@collectionDeletePlaylist": {
-    "description": "Action to delete playlist"
-  },
-  "collectionDeletePlaylistMessage": "Delete \"{playlistName}\" and all tracks inside it?",
-  "@collectionDeletePlaylistMessage": {
-    "description": "Confirmation message for deleting playlist",
-    "placeholders": {
-      "playlistName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionPlaylistDeleted": "Playlist deleted",
-  "@collectionPlaylistDeleted": {
-    "description": "Snackbar after deleting playlist"
-  },
-  "collectionPlaylistRenamed": "Playlist renamed",
-  "@collectionPlaylistRenamed": {
-    "description": "Snackbar after renaming playlist"
-  },
-  "collectionWishlistEmptyTitle": "Wishlist is empty",
-  "@collectionWishlistEmptyTitle": {
-    "description": "Wishlist empty state title"
-  },
-  "collectionWishlistEmptySubtitle": "Tap + on tracks to save what you want to download later",
-  "@collectionWishlistEmptySubtitle": {
-    "description": "Wishlist empty state subtitle"
-  },
-  "collectionLovedEmptyTitle": "Loved folder is empty",
-  "@collectionLovedEmptyTitle": {
-    "description": "Loved empty state title"
-  },
-  "collectionLovedEmptySubtitle": "Tap love on tracks to keep your favorites",
-  "@collectionLovedEmptySubtitle": {
-    "description": "Loved empty state subtitle"
-  },
-  "collectionPlaylistEmptyTitle": "Playlist is empty",
-  "@collectionPlaylistEmptyTitle": {
-    "description": "Playlist empty state title"
-  },
-  "collectionPlaylistEmptySubtitle": "Long-press + on any track to add it here",
-  "@collectionPlaylistEmptySubtitle": {
-    "description": "Playlist empty state subtitle"
-  },
-  "collectionRemoveFromPlaylist": "Remove from playlist",
-  "@collectionRemoveFromPlaylist": {
-    "description": "Tooltip for removing track from playlist"
-  },
-  "collectionRemoveFromFolder": "Remove from folder",
-  "@collectionRemoveFromFolder": {
-    "description": "Tooltip for removing track from wishlist/loved folder"
-  },
-  "collectionRemoved": "\"{trackName}\" removed",
-  "@collectionRemoved": {
-    "description": "Snackbar after removing a track from a collection",
-    "placeholders": {
-      "trackName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionAddedToLoved": "\"{trackName}\" added to Loved",
-  "@collectionAddedToLoved": {
-    "description": "Snackbar after adding track to loved folder",
-    "placeholders": {
-      "trackName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionRemovedFromLoved": "\"{trackName}\" removed from Loved",
-  "@collectionRemovedFromLoved": {
-    "description": "Snackbar after removing track from loved folder",
-    "placeholders": {
-      "trackName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionAddedToWishlist": "\"{trackName}\" added to Wishlist",
-  "@collectionAddedToWishlist": {
-    "description": "Snackbar after adding track to wishlist",
-    "placeholders": {
-      "trackName": {
-        "type": "String"
-      }
-    }
-  },
-  "collectionRemovedFromWishlist": "\"{trackName}\" removed from Wishlist",
-  "@collectionRemovedFromWishlist": {
-    "description": "Snackbar after removing track from wishlist",
-    "placeholders": {
-      "trackName": {
-        "type": "String"
-      }
-    }
-  },
-  "trackOptionAddToLoved": "Add to Loved",
-  "@trackOptionAddToLoved": {
-    "description": "Bottom sheet action label - add track to loved folder"
-  },
-  "trackOptionRemoveFromLoved": "Remove from Loved",
-  "@trackOptionRemoveFromLoved": {
-    "description": "Bottom sheet action label - remove track from loved folder"
-  },
-  "trackOptionAddToWishlist": "Add to Wishlist",
-  "@trackOptionAddToWishlist": {
-    "description": "Bottom sheet action label - add track to wishlist"
-  },
-  "trackOptionRemoveFromWishlist": "Remove from Wishlist",
-  "@trackOptionRemoveFromWishlist": {
-    "description": "Bottom sheet action label - remove track from wishlist"
-  },
-  "collectionPlaylistChangeCover": "Change cover image",
-  "@collectionPlaylistChangeCover": {
-    "description": "Bottom sheet action to pick a custom cover image for a playlist"
-  },
-  "collectionPlaylistRemoveCover": "Remove cover image",
-  "@collectionPlaylistRemoveCover": {
-    "description": "Bottom sheet action to remove custom cover image from a playlist"
-  },
-  "selectionShareCount": "Share {count} {count, plural, =1{track} other{tracks}}",
-  "@selectionShareCount": {
-    "description": "Share button text with count in selection mode",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "selectionShareNoFiles": "No shareable files found",
-  "@selectionShareNoFiles": {
-    "description": "Snackbar when no selected files exist on disk"
-  },
-  "selectionConvertCount": "Convert {count} {count, plural, =1{track} other{tracks}}",
-  "@selectionConvertCount": {
-    "description": "Convert button text with count in selection mode",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "selectionConvertNoConvertible": "No convertible tracks selected",
-  "@selectionConvertNoConvertible": {
-    "description": "Snackbar when no selected tracks support conversion"
-  },
-  "selectionBatchConvertConfirmTitle": "Batch Convert",
-  "@selectionBatchConvertConfirmTitle": {
-    "description": "Confirmation dialog title for batch conversion"
-  },
-  "selectionBatchConvertConfirmMessage": "Convert {count} {count, plural, =1{track} other{tracks}} to {format} at {bitrate}?\n\nOriginal files will be deleted after conversion.",
-  "@selectionBatchConvertConfirmMessage": {
-    "description": "Confirmation dialog message for batch conversion",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      },
-      "format": {
-        "type": "String"
-      },
-      "bitrate": {
-        "type": "String"
-      }
-    }
-  },
-  "selectionBatchConvertProgress": "Converting {current} of {total}...",
-  "@selectionBatchConvertProgress": {
-    "description": "Snackbar during batch conversion progress",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "selectionBatchConvertSuccess": "Converted {success} of {total} tracks to {format}",
-  "@selectionBatchConvertSuccess": {
-    "description": "Snackbar after batch conversion completes",
-    "placeholders": {
-      "success": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      },
-      "format": {
-        "type": "String"
-      }
-    }
-  },
   "downloadedAlbumDownloadedCount": "{count} baixado(s)",
   "@downloadedAlbumDownloadedCount": {
     "description": "Downloaded tracks count badge",
@@ -3194,4 +2800,4 @@
   "@downloadUseAlbumArtistForFoldersTrackSubtitle": {
     "description": "Subtitle when Track Artist is used for folder naming"
   }
-}
+}

lib/l10n/arb/app_ru.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Скачивайте треки Spotify в lossless качестве с Tidal и Qobuz.",
+  "aboutAppDescription": "Скачайте треки Spotify в Lossless качестве из Tidal, Qobuz и Amazon Music.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -897,18 +897,6 @@
   "@errorNoTracksFound": {
     "description": "Error - search returned no results"
   },
-  "errorUrlNotRecognized": "Ссылка не распознана",
-  "@errorUrlNotRecognized": {
-    "description": "Error title - URL not handled by any extension or service"
-  },
-  "errorUrlNotRecognizedMessage": "Эта ссылка не поддерживается. Убедитесь, что URL-адрес указан правильно и установлено совместимое расширение.",
-  "@errorUrlNotRecognizedMessage": {
-    "description": "Error message - URL not recognized explanation"
-  },
-  "errorUrlFetchFailed": "Не удалось загрузить контент по этой ссылке. Пожалуйста, попробуйте еще раз.",
-  "@errorUrlFetchFailed": {
-    "description": "Error message - generic URL fetch failure"
-  },
   "errorMissingExtensionSource": "Невозможно загрузить {item}: отсутствует источник расширения",
   "@errorMissingExtensionSource": {
     "description": "Error - extension source not available",
@@ -1015,14 +1003,6 @@
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "По плейлисту",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Отдельная папка для каждого плейлиста",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "По исполнителю",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1117,7 +1097,7 @@
   },
   "providerBuiltIn": "Встроенные",
   "@providerBuiltIn": {
-    "description": "Label for built-in providers (Tidal/Qobuz)"
+    "description": "Label for built-in providers (Tidal/Qobuz/Amazon)"
   },
   "providerExtension": "Расширение",
   "@providerExtension": {
@@ -1773,6 +1753,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube обеспечивает только звук с потерями(Lossy).",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "Битрейт YouTube Opus",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "Битрейт YouTube MP3",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Спрашивать перед скачиванием",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -1797,7 +1789,7 @@
   "@downloadUsePrimaryArtistOnly": {
     "description": "Setting - strip featured artists from folder name"
   },
-  "downloadUsePrimaryArtistOnlyEnabled": "Список исполнителей, чьи работы были удалены из названия папки (например, Джастин Бибер, Quavo → Джастин Бибер)",
+  "downloadUsePrimaryArtistOnlyEnabled": "Featured artists removed from folder name (e.g. Justin Bieber, Quavo → Justin Bieber)",
   "@downloadUsePrimaryArtistOnlyEnabled": {
     "description": "Subtitle when primary artist only is enabled"
   },
@@ -2391,7 +2383,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Получите аудио в качестве FLAC от Tidal, Qobuz или Deezer",
+  "tutorialWelcomeTip2": "Скачайте FLAC с Tidal, Qobuz или Amazon Music",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2495,7 +2487,7 @@
   "@cleanupOrphanedDownloadsSubtitle": {
     "description": "Subtitle for orphaned cleanup button"
   },
-  "cleanupOrphanedDownloadsResult": "Удалено {count} утерянных записей из истории",
+  "cleanupOrphanedDownloadsResult": "Removed {count} orphaned entries from history",
   "@cleanupOrphanedDownloadsResult": {
     "description": "Snackbar after orphan cleanup",
     "placeholders": {
@@ -2533,7 +2525,7 @@
   "@cacheSectionStorage": {
     "description": "Section header for cache entries"
   },
-  "cacheSectionMaintenance": "Обслуживание",
+  "cacheSectionMaintenance": "Maintenance",
   "@cacheSectionMaintenance": {
     "description": "Section header for cleanup actions"
   },
@@ -2585,7 +2577,7 @@
   "@cacheTrackLookupDesc": {
     "description": "Description of what track lookup cache contains"
   },
-  "cacheCleanupUnusedDesc": "Удалить записи из истории загрузок и библиотеки, которые остались без файлов.",
+  "cacheCleanupUnusedDesc": "Remove orphaned download history and library entries for missing files.",
   "@cacheCleanupUnusedDesc": {
     "description": "Description of what cleanup unused data does"
   },
@@ -2661,7 +2653,7 @@
   "@cacheCleanupUnused": {
     "description": "Action title for cleaning unused entries"
   },
-  "cacheCleanupUnusedSubtitle": "Удалить историю загрузок, оставшихся без просмотра, и отсутствующие записи в библиотеке",
+  "cacheCleanupUnusedSubtitle": "Remove orphaned download history and missing library entries",
   "@cacheCleanupUnusedSubtitle": {
     "description": "Subtitle for cleanup unused data action"
   },
@@ -2816,90 +2808,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "Разделить CUE Sheet",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "Разделить файл CUE+FLAC на отдельные треки",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Альбом: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Артист: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} треков",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "Разделенный CUE-альбом",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Разбить \"{album}\" на {count} отдельных FLAC-файлов?",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "Разделение CUE sheet... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "Успешно разделено на {count} треков",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "Разделение CUE не удалось",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Аудиофайл для этого CUE sheet не найден",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "Разделить на Треки",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
   "actionCreate": "Создать",
   "@actionCreate": {
     "description": "Generic action button - create"
@@ -3114,7 +3022,7 @@
       }
     }
   },
-  "selectionShareNoFiles": "Файлы, доступные для совместного доступа, не найдены",
+  "selectionShareNoFiles": "No shareable files found",
   "@selectionShareNoFiles": {
     "description": "Snackbar when no selected files exist on disk"
   },
@@ -3135,7 +3043,7 @@
   "@selectionBatchConvertConfirmTitle": {
     "description": "Confirmation dialog title for batch conversion"
   },
-  "selectionBatchConvertConfirmMessage": "Преобразовать {count} {count, plural, =1{track} other{tracks}} в {format} с {bitrate}?",
+  "selectionBatchConvertConfirmMessage": "Convert {count} {count, plural, =1{track} other{tracks}} to {format} at {bitrate}?\n\nOriginal files will be deleted after conversion.",
   "@selectionBatchConvertConfirmMessage": {
     "description": "Confirmation dialog message for batch conversion",
     "placeholders": {

lib/l10n/arb/app_zh_CN.arb

@@ -5,143 +5,143 @@
   "@appName": {
     "description": "App name - DO NOT TRANSLATE"
   },
-  "navHome": "主页",
+  "navHome": "Home",
   "@navHome": {
     "description": "Bottom navigation - Home tab"
   },
-  "navLibrary": "乐库",
+  "navLibrary": "Library",
   "@navLibrary": {
     "description": "Bottom navigation - Library tab"
   },
-  "navSettings": "设置",
+  "navSettings": "Settings",
   "@navSettings": {
     "description": "Bottom navigation - Settings tab"
   },
-  "navStore": "商店",
+  "navStore": "Store",
   "@navStore": {
     "description": "Bottom navigation - Extension store tab"
   },
-  "homeTitle": "主页",
+  "homeTitle": "Home",
   "@homeTitle": {
     "description": "Home screen title"
   },
-  "homeSubtitle": "粘贴 Spotify 链接或按名称搜索",
+  "homeSubtitle": "Paste a Spotify link or search by name",
   "@homeSubtitle": {
     "description": "Subtitle shown below search box"
   },
-  "homeSupports": "支持：歌曲、专辑、播放列表、艺人网址",
+  "homeSupports": "Supports: Track, Album, Playlist, Artist URLs",
   "@homeSupports": {
     "description": "Info text about supported URL types"
   },
-  "homeRecent": "最近",
+  "homeRecent": "Recent",
   "@homeRecent": {
     "description": "Section header for recent searches"
   },
-  "historyFilterAll": "全部",
+  "historyFilterAll": "All",
   "@historyFilterAll": {
     "description": "Filter chip - show all items"
   },
-  "historyFilterAlbums": "专辑",
+  "historyFilterAlbums": "Albums",
   "@historyFilterAlbums": {
     "description": "Filter chip - show albums only"
   },
-  "historyFilterSingles": "单曲",
+  "historyFilterSingles": "Singles",
   "@historyFilterSingles": {
     "description": "Filter chip - show singles only"
   },
-  "historySearchHint": "搜索历史……",
+  "historySearchHint": "Search history...",
   "@historySearchHint": {
     "description": "Search bar placeholder in history"
   },
-  "settingsTitle": "设置",
+  "settingsTitle": "Settings",
   "@settingsTitle": {
     "description": "Settings screen title"
   },
-  "settingsDownload": "下载",
+  "settingsDownload": "Download",
   "@settingsDownload": {
     "description": "Settings section - download options"
   },
-  "settingsAppearance": "外观",
+  "settingsAppearance": "Appearance",
   "@settingsAppearance": {
     "description": "Settings section - visual customization"
   },
-  "settingsOptions": "选项",
+  "settingsOptions": "Options",
   "@settingsOptions": {
     "description": "Settings section - app options"
   },
-  "settingsExtensions": "扩展",
+  "settingsExtensions": "Extensions",
   "@settingsExtensions": {
     "description": "Settings section - extension management"
   },
-  "settingsAbout": "关于",
+  "settingsAbout": "About",
   "@settingsAbout": {
     "description": "Settings section - app info"
   },
-  "downloadTitle": "下载",
+  "downloadTitle": "Download",
   "@downloadTitle": {
     "description": "Download settings page title"
   },
-  "downloadAskQualitySubtitle": "为每次下载显示质量选择器",
+  "downloadAskQualitySubtitle": "Show quality picker for each download",
   "@downloadAskQualitySubtitle": {
     "description": "Subtitle for ask quality toggle"
   },
-  "downloadFilenameFormat": "文件名格式",
+  "downloadFilenameFormat": "Filename Format",
   "@downloadFilenameFormat": {
     "description": "Setting for output filename pattern"
   },
-  "downloadFolderOrganization": "文件夹结构",
+  "downloadFolderOrganization": "Folder Organization",
   "@downloadFolderOrganization": {
     "description": "Setting for folder structure"
   },
-  "appearanceTitle": "外观",
+  "appearanceTitle": "Appearance",
   "@appearanceTitle": {
     "description": "Appearance settings page title"
   },
-  "appearanceThemeSystem": "系统",
+  "appearanceThemeSystem": "System",
   "@appearanceThemeSystem": {
     "description": "Follow system theme"
   },
-  "appearanceThemeLight": "浅色",
+  "appearanceThemeLight": "Light",
   "@appearanceThemeLight": {
     "description": "Light theme"
   },
-  "appearanceThemeDark": "深色",
+  "appearanceThemeDark": "Dark",
   "@appearanceThemeDark": {
     "description": "Dark theme"
   },
-  "appearanceDynamicColor": "动态色彩",
+  "appearanceDynamicColor": "Dynamic Color",
   "@appearanceDynamicColor": {
     "description": "Material You dynamic colors"
   },
-  "appearanceDynamicColorSubtitle": "使用壁纸的颜色",
+  "appearanceDynamicColorSubtitle": "Use colors from your wallpaper",
   "@appearanceDynamicColorSubtitle": {
     "description": "Subtitle for dynamic color"
   },
-  "appearanceHistoryView": "历史记录",
+  "appearanceHistoryView": "History View",
   "@appearanceHistoryView": {
     "description": "Layout style for history"
   },
-  "appearanceHistoryViewList": "列表",
+  "appearanceHistoryViewList": "List",
   "@appearanceHistoryViewList": {
     "description": "List layout option"
   },
-  "appearanceHistoryViewGrid": "网格",
+  "appearanceHistoryViewGrid": "Grid",
   "@appearanceHistoryViewGrid": {
     "description": "Grid layout option"
   },
-  "optionsTitle": "选项",
+  "optionsTitle": "Options",
   "@optionsTitle": {
     "description": "Options settings page title"
   },
-  "optionsPrimaryProvider": "主要提供者",
+  "optionsPrimaryProvider": "Primary Provider",
   "@optionsPrimaryProvider": {
     "description": "Main search provider setting"
   },
-  "optionsPrimaryProviderSubtitle": "按歌曲名称搜索时使用的服务。",
+  "optionsPrimaryProviderSubtitle": "Service used when searching by track name.",
   "@optionsPrimaryProviderSubtitle": {
     "description": "Subtitle for primary provider"
   },
-  "optionsUsingExtension": "使用扩展：{extensionName}",
+  "optionsUsingExtension": "Using extension: {extensionName}",
   "@optionsUsingExtension": {
     "description": "Shows active extension name",
     "placeholders": {
@@ -150,55 +150,55 @@
       }
     }
   },
-  "optionsSwitchBack": "点击 Deezer 或 Spotify 即可从扩展程序切换回来",
+  "optionsSwitchBack": "Tap Deezer or Spotify to switch back from extension",
   "@optionsSwitchBack": {
     "description": "Hint to switch back to built-in providers"
   },
-  "optionsAutoFallback": "自动回退",
+  "optionsAutoFallback": "Auto Fallback",
   "@optionsAutoFallback": {
     "description": "Auto-retry with other services"
   },
-  "optionsAutoFallbackSubtitle": "如果下载失败，请尝试其他服务",
+  "optionsAutoFallbackSubtitle": "Try other services if download fails",
   "@optionsAutoFallbackSubtitle": {
     "description": "Subtitle for auto fallback"
   },
-  "optionsUseExtensionProviders": "使用扩展提供商",
+  "optionsUseExtensionProviders": "Use Extension Providers",
   "@optionsUseExtensionProviders": {
     "description": "Enable extension download providers"
   },
-  "optionsUseExtensionProvidersOn": "扩展会被最先尝试",
+  "optionsUseExtensionProvidersOn": "Extensions will be tried first",
   "@optionsUseExtensionProvidersOn": {
     "description": "Status when extension providers enabled"
   },
-  "optionsUseExtensionProvidersOff": "仅使用内置提供商",
+  "optionsUseExtensionProvidersOff": "Using built-in providers only",
   "@optionsUseExtensionProvidersOff": {
     "description": "Status when extension providers disabled"
   },
-  "optionsEmbedLyrics": "内嵌歌词",
+  "optionsEmbedLyrics": "Embed Lyrics",
   "@optionsEmbedLyrics": {
     "description": "Embed lyrics in audio files"
   },
-  "optionsEmbedLyricsSubtitle": "嵌入已同步歌词到 FLAC 文件",
+  "optionsEmbedLyricsSubtitle": "Embed synced lyrics into FLAC files",
   "@optionsEmbedLyricsSubtitle": {
     "description": "Subtitle for embed lyrics"
   },
-  "optionsMaxQualityCover": "最高质量封面",
+  "optionsMaxQualityCover": "Max Quality Cover",
   "@optionsMaxQualityCover": {
     "description": "Download highest quality album art"
   },
-  "optionsMaxQualityCoverSubtitle": "下载最高分辨率封面",
+  "optionsMaxQualityCoverSubtitle": "Download highest resolution cover art",
   "@optionsMaxQualityCoverSubtitle": {
     "description": "Subtitle for max quality cover"
   },
-  "optionsConcurrentDownloads": "并行下载数",
+  "optionsConcurrentDownloads": "Concurrent Downloads",
   "@optionsConcurrentDownloads": {
     "description": "Number of parallel downloads"
   },
-  "optionsConcurrentSequential": "按顺序下载（一次一首）",
+  "optionsConcurrentSequential": "Sequential (1 at a time)",
   "@optionsConcurrentSequential": {
     "description": "Download one at a time"
   },
-  "optionsConcurrentParallel": "同时下载 {count} 首",
+  "optionsConcurrentParallel": "{count} parallel downloads",
   "@optionsConcurrentParallel": {
     "description": "Multiple parallel downloads",
     "placeholders": {
@@ -207,67 +207,67 @@
       }
     }
   },
-  "optionsConcurrentWarning": "并行下载可能会触发速率限制",
+  "optionsConcurrentWarning": "Parallel downloads may trigger rate limiting",
   "@optionsConcurrentWarning": {
     "description": "Warning about rate limits"
   },
-  "optionsExtensionStore": "扩展商店",
+  "optionsExtensionStore": "Extension Store",
   "@optionsExtensionStore": {
     "description": "Show/hide store tab"
   },
-  "optionsExtensionStoreSubtitle": "在导航中显示商店标签",
+  "optionsExtensionStoreSubtitle": "Show Store tab in navigation",
   "@optionsExtensionStoreSubtitle": {
     "description": "Subtitle for extension store toggle"
   },
-  "optionsCheckUpdates": "检查更新",
+  "optionsCheckUpdates": "Check for Updates",
   "@optionsCheckUpdates": {
     "description": "Auto update check toggle"
   },
-  "optionsCheckUpdatesSubtitle": "当有新版本可用时通知",
+  "optionsCheckUpdatesSubtitle": "Notify when new version is available",
   "@optionsCheckUpdatesSubtitle": {
     "description": "Subtitle for update check"
   },
-  "optionsUpdateChannel": "更新频道",
+  "optionsUpdateChannel": "Update Channel",
   "@optionsUpdateChannel": {
     "description": "Stable vs preview releases"
   },
-  "optionsUpdateChannelStable": "仅稳定版本",
+  "optionsUpdateChannelStable": "Stable releases only",
   "@optionsUpdateChannelStable": {
     "description": "Only stable updates"
   },
-  "optionsUpdateChannelPreview": "获取预览版本",
+  "optionsUpdateChannelPreview": "Get preview releases",
   "@optionsUpdateChannelPreview": {
     "description": "Include beta/preview updates"
   },
-  "optionsUpdateChannelWarning": "预览版本可能包含错误或者尚未完善的功能",
+  "optionsUpdateChannelWarning": "Preview may contain bugs or incomplete features",
   "@optionsUpdateChannelWarning": {
     "description": "Warning about preview channel"
   },
-  "optionsClearHistory": "清除下载历史记录",
+  "optionsClearHistory": "Clear Download History",
   "@optionsClearHistory": {
     "description": "Delete all download history"
   },
-  "optionsClearHistorySubtitle": "从历史记录中清除所有已下载的曲目",
+  "optionsClearHistorySubtitle": "Remove all downloaded tracks from history",
   "@optionsClearHistorySubtitle": {
     "description": "Subtitle for clear history"
   },
-  "optionsDetailedLogging": "详细日志",
+  "optionsDetailedLogging": "Detailed Logging",
   "@optionsDetailedLogging": {
     "description": "Enable verbose logs for debugging"
   },
-  "optionsDetailedLoggingOn": "正在记录详细日志",
+  "optionsDetailedLoggingOn": "Detailed logs are being recorded",
   "@optionsDetailedLoggingOn": {
     "description": "Status when logging enabled"
   },
-  "optionsDetailedLoggingOff": "为错误报告启用",
+  "optionsDetailedLoggingOff": "Enable for bug reports",
   "@optionsDetailedLoggingOff": {
     "description": "Status when logging disabled"
   },
-  "optionsSpotifyCredentials": "Spotify 凭据",
+  "optionsSpotifyCredentials": "Spotify Credentials",
   "@optionsSpotifyCredentials": {
     "description": "Spotify API credentials setting"
   },
-  "optionsSpotifyCredentialsConfigured": "客户端 ID：{clientId}……",
+  "optionsSpotifyCredentialsConfigured": "Client ID: {clientId}...",
   "@optionsSpotifyCredentialsConfigured": {
     "description": "Shows configured client ID preview",
     "placeholders": {
@@ -276,27 +276,27 @@
       }
     }
   },
-  "optionsSpotifyCredentialsRequired": "必填 - 点击配置",
+  "optionsSpotifyCredentialsRequired": "Required - tap to configure",
   "@optionsSpotifyCredentialsRequired": {
     "description": "Prompt to set up credentials"
   },
-  "optionsSpotifyWarning": "Spotify 需要您自己的 API 凭据。在 developer.spotify.com 免费获取",
+  "optionsSpotifyWarning": "Spotify requires your own API credentials. Get them free from developer.spotify.com",
   "@optionsSpotifyWarning": {
     "description": "Info about Spotify API requirement"
   },
-  "optionsSpotifyDeprecationWarning": "Spotify 搜索将在 2026 年 3 月 3 日因 Spotify API 更改而被废弃。请切换到 Deezer。",
+  "optionsSpotifyDeprecationWarning": "Spotify search will be deprecated on March 3, 2026 due to Spotify API changes. Please switch to Deezer.",
   "@optionsSpotifyDeprecationWarning": {
     "description": "Warning about Spotify API deprecation"
   },
-  "extensionsTitle": "扩展",
+  "extensionsTitle": "Extensions",
   "@extensionsTitle": {
     "description": "Extensions page title"
   },
-  "extensionsDisabled": "禁用",
+  "extensionsDisabled": "Disabled",
   "@extensionsDisabled": {
     "description": "Extension status - inactive"
   },
-  "extensionsVersion": "版本 {version}",
+  "extensionsVersion": "Version {version}",
   "@extensionsVersion": {
     "description": "Extension version display",
     "placeholders": {
@@ -305,7 +305,7 @@
       }
     }
   },
-  "extensionsAuthor": "来自 {author}",
+  "extensionsAuthor": "by {author}",
   "@extensionsAuthor": {
     "description": "Extension author credit",
     "placeholders": {
@@ -314,75 +314,75 @@
       }
     }
   },
-  "extensionsUninstall": "卸载",
+  "extensionsUninstall": "Uninstall",
   "@extensionsUninstall": {
     "description": "Uninstall extension button"
   },
-  "storeTitle": "扩展商店",
+  "storeTitle": "Extension Store",
   "@storeTitle": {
     "description": "Store screen title"
   },
-  "storeSearch": "搜索扩展……",
+  "storeSearch": "Search extensions...",
   "@storeSearch": {
     "description": "Store search placeholder"
   },
-  "storeInstall": "安装",
+  "storeInstall": "Install",
   "@storeInstall": {
     "description": "Install extension button"
   },
-  "storeInstalled": "已安装",
+  "storeInstalled": "Installed",
   "@storeInstalled": {
     "description": "Already installed badge"
   },
-  "storeUpdate": "更新",
+  "storeUpdate": "Update",
   "@storeUpdate": {
     "description": "Update available button"
   },
-  "aboutTitle": "关于",
+  "aboutTitle": "About",
   "@aboutTitle": {
     "description": "About page title"
   },
-  "aboutContributors": "贡献者",
+  "aboutContributors": "Contributors",
   "@aboutContributors": {
     "description": "Section for contributors"
   },
-  "aboutMobileDeveloper": "移动版本开发者",
+  "aboutMobileDeveloper": "Mobile version developer",
   "@aboutMobileDeveloper": {
     "description": "Role description for mobile dev"
   },
-  "aboutOriginalCreator": "原 SpotiLDAC 创建者",
+  "aboutOriginalCreator": "Creator of the original SpotiFLAC",
   "@aboutOriginalCreator": {
     "description": "Role description for original creator"
   },
-  "aboutLogoArtist": "有才华的艺术家创建了我们美丽的应用图标！",
+  "aboutLogoArtist": "The talented artist who created our beautiful app logo!",
   "@aboutLogoArtist": {
     "description": "Role description for logo artist"
   },
-  "aboutTranslators": "译者",
+  "aboutTranslators": "Translators",
   "@aboutTranslators": {
     "description": "Section for translators"
   },
-  "aboutSpecialThanks": "特别鸣谢",
+  "aboutSpecialThanks": "Special Thanks",
   "@aboutSpecialThanks": {
     "description": "Section for special thanks"
   },
-  "aboutLinks": "相关链接",
+  "aboutLinks": "Links",
   "@aboutLinks": {
     "description": "Section for external links"
   },
-  "aboutMobileSource": "移动版本源代码",
+  "aboutMobileSource": "Mobile source code",
   "@aboutMobileSource": {
     "description": "Link to mobile GitHub repo"
   },
-  "aboutPCSource": "桌面版本源代码",
+  "aboutPCSource": "PC source code",
   "@aboutPCSource": {
     "description": "Link to PC GitHub repo"
   },
-  "aboutReportIssue": "报告一个问题",
+  "aboutReportIssue": "Report an issue",
   "@aboutReportIssue": {
     "description": "Link to report bugs"
   },
-  "aboutReportIssueSubtitle": "报告您遇到的任何问题",
+  "aboutReportIssueSubtitle": "Report any problems you encounter",
   "@aboutReportIssueSubtitle": {
     "description": "Subtitle for report issue"
   },
@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal and Qobuz.",
+  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal, Qobuz, and Amazon Music.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -603,23 +603,23 @@
   "@setupNotificationGranted": {
     "description": "Success message for notification permission"
   },
-  "setupNotificationEnable": "启用通知",
+  "setupNotificationEnable": "Enable Notifications",
   "@setupNotificationEnable": {
     "description": "Button to enable notifications"
   },
-  "setupFolderChoose": "选择下载文件夹",
+  "setupFolderChoose": "Choose Download Folder",
   "@setupFolderChoose": {
     "description": "Button to choose folder"
   },
-  "setupFolderDescription": "选择保存您下载的音乐的文件夹。",
+  "setupFolderDescription": "Select a folder where your downloaded music will be saved.",
   "@setupFolderDescription": {
     "description": "Explanation for folder selection"
   },
-  "setupSelectFolder": "选择文件夹",
+  "setupSelectFolder": "Select Folder",
   "@setupSelectFolder": {
     "description": "Button to select folder"
   },
-  "setupEnableNotifications": "启用通知",
+  "setupEnableNotifications": "Enable Notifications",
   "@setupEnableNotifications": {
     "description": "Button to enable notifications"
   },
@@ -889,26 +889,14 @@
   "@errorRateLimited": {
     "description": "Error title - too many requests"
   },
-  "errorRateLimitedMessage": "请求过多。请等一会再搜索。",
+  "errorRateLimitedMessage": "Too many requests. Please wait a moment before searching again.",
   "@errorRateLimitedMessage": {
     "description": "Error message - rate limit explanation"
   },
-  "errorNoTracksFound": "未找到曲目",
+  "errorNoTracksFound": "No tracks found",
   "@errorNoTracksFound": {
     "description": "Error - search returned no results"
   },
-  "errorUrlNotRecognized": "Link not recognized",
-  "@errorUrlNotRecognized": {
-    "description": "Error title - URL not handled by any extension or service"
-  },
-  "errorUrlNotRecognizedMessage": "This link is not supported. Make sure the URL is correct and a compatible extension is installed.",
-  "@errorUrlNotRecognizedMessage": {
-    "description": "Error message - URL not recognized explanation"
-  },
-  "errorUrlFetchFailed": "Failed to load content from this link. Please try again.",
-  "@errorUrlFetchFailed": {
-    "description": "Error message - generic URL fetch failure"
-  },
   "errorMissingExtensionSource": "Cannot load {item}: missing extension source",
   "@errorMissingExtensionSource": {
     "description": "Error - extension source not available",
@@ -1015,14 +1003,6 @@
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "By Playlist",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Separate folder for each playlist",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "By Artist",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1117,7 +1097,7 @@
   },
   "providerBuiltIn": "Built-in",
   "@providerBuiltIn": {
-    "description": "Label for built-in providers (Tidal/Qobuz)"
+    "description": "Label for built-in providers (Tidal/Qobuz/Amazon)"
   },
   "providerExtension": "Extension",
   "@providerExtension": {
@@ -1773,6 +1753,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Ask Before Download",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2391,7 +2383,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Deezer",
+  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Amazon Music",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2816,90 +2808,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "Split CUE Sheet",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "Split CUE+FLAC into individual tracks",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Album: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Artist: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} tracks",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "Split CUE Album",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Split \"{album}\" into {count} individual FLAC files?\n\nFiles will be saved to the same directory.",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "Splitting CUE sheet... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "Split into {count} tracks successfully",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "CUE split failed",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Audio file not found for this CUE sheet",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "Split into Tracks",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
   "actionCreate": "Create",
   "@actionCreate": {
     "description": "Generic action button - create"

lib/l10n/arb/app_zh_TW.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal and Qobuz.",
+  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal, Qobuz, and Amazon Music.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -897,18 +897,6 @@
   "@errorNoTracksFound": {
     "description": "Error - search returned no results"
   },
-  "errorUrlNotRecognized": "Link not recognized",
-  "@errorUrlNotRecognized": {
-    "description": "Error title - URL not handled by any extension or service"
-  },
-  "errorUrlNotRecognizedMessage": "This link is not supported. Make sure the URL is correct and a compatible extension is installed.",
-  "@errorUrlNotRecognizedMessage": {
-    "description": "Error message - URL not recognized explanation"
-  },
-  "errorUrlFetchFailed": "Failed to load content from this link. Please try again.",
-  "@errorUrlFetchFailed": {
-    "description": "Error message - generic URL fetch failure"
-  },
   "errorMissingExtensionSource": "Cannot load {item}: missing extension source",
   "@errorMissingExtensionSource": {
     "description": "Error - extension source not available",
@@ -1015,14 +1003,6 @@
   "@folderOrganizationNone": {
     "description": "Folder option - flat structure"
   },
-  "folderOrganizationByPlaylist": "By Playlist",
-  "@folderOrganizationByPlaylist": {
-    "description": "Folder option - playlist folders"
-  },
-  "folderOrganizationByPlaylistSubtitle": "Separate folder for each playlist",
-  "@folderOrganizationByPlaylistSubtitle": {
-    "description": "Subtitle for playlist folder option"
-  },
   "folderOrganizationByArtist": "By Artist",
   "@folderOrganizationByArtist": {
     "description": "Folder option - artist folders"
@@ -1117,7 +1097,7 @@
   },
   "providerBuiltIn": "Built-in",
   "@providerBuiltIn": {
-    "description": "Label for built-in providers (Tidal/Qobuz)"
+    "description": "Label for built-in providers (Tidal/Qobuz/Amazon)"
   },
   "providerExtension": "Extension",
   "@providerExtension": {
@@ -1773,6 +1753,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Ask Before Download",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2391,7 +2383,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Deezer",
+  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Amazon Music",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2816,90 +2808,6 @@
   "@trackConvertFailed": {
     "description": "Snackbar when conversion fails"
   },
-  "cueSplitTitle": "Split CUE Sheet",
-  "@cueSplitTitle": {
-    "description": "Title for CUE split bottom sheet"
-  },
-  "cueSplitSubtitle": "Split CUE+FLAC into individual tracks",
-  "@cueSplitSubtitle": {
-    "description": "Subtitle for CUE split menu item"
-  },
-  "cueSplitAlbum": "Album: {album}",
-  "@cueSplitAlbum": {
-    "description": "Album name in CUE split sheet",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitArtist": "Artist: {artist}",
-  "@cueSplitArtist": {
-    "description": "Artist name in CUE split sheet",
-    "placeholders": {
-      "artist": {
-        "type": "String"
-      }
-    }
-  },
-  "cueSplitTrackCount": "{count} tracks",
-  "@cueSplitTrackCount": {
-    "description": "Number of tracks in CUE sheet",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitConfirmTitle": "Split CUE Album",
-  "@cueSplitConfirmTitle": {
-    "description": "CUE split confirmation dialog title"
-  },
-  "cueSplitConfirmMessage": "Split \"{album}\" into {count} individual FLAC files?\n\nFiles will be saved to the same directory.",
-  "@cueSplitConfirmMessage": {
-    "description": "CUE split confirmation dialog message",
-    "placeholders": {
-      "album": {
-        "type": "String"
-      },
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSplitting": "Splitting CUE sheet... ({current}/{total})",
-  "@cueSplitSplitting": {
-    "description": "Snackbar while splitting CUE",
-    "placeholders": {
-      "current": {
-        "type": "int"
-      },
-      "total": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitSuccess": "Split into {count} tracks successfully",
-  "@cueSplitSuccess": {
-    "description": "Snackbar after successful CUE split",
-    "placeholders": {
-      "count": {
-        "type": "int"
-      }
-    }
-  },
-  "cueSplitFailed": "CUE split failed",
-  "@cueSplitFailed": {
-    "description": "Snackbar when CUE split fails"
-  },
-  "cueSplitNoAudioFile": "Audio file not found for this CUE sheet",
-  "@cueSplitNoAudioFile": {
-    "description": "Error when CUE audio file is missing"
-  },
-  "cueSplitButton": "Split into Tracks",
-  "@cueSplitButton": {
-    "description": "Button text to start CUE splitting"
-  },
   "actionCreate": "Create",
   "@actionCreate": {
     "description": "Generic action button - create"

lib/main.dart

@@ -1,20 +1,16 @@
-import 'dart:async';
 import 'dart:io';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:spotiflac_android/app.dart';
 import 'package:spotiflac_android/providers/download_queue_provider.dart';
 import 'package:spotiflac_android/providers/extension_provider.dart';
 import 'package:spotiflac_android/providers/library_collections_provider.dart';
 import 'package:spotiflac_android/providers/local_library_provider.dart';
-import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/services/notification_service.dart';
 import 'package:spotiflac_android/services/share_intent_service.dart';
 import 'package:spotiflac_android/services/cover_cache_manager.dart';
-import 'package:spotiflac_android/utils/local_library_scan_prefs.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -92,139 +88,15 @@ class _EagerInitialization extends ConsumerStatefulWidget {
       _EagerInitializationState();
 }
 
-class _EagerInitializationState extends ConsumerState<_EagerInitialization>
-    with WidgetsBindingObserver {
-  ProviderSubscription<bool>? _localLibraryEnabledSub;
-  Timer? _downloadHistoryWarmupTimer;
-  Timer? _libraryCollectionsWarmupTimer;
-  Timer? _localLibraryWarmupTimer;
-  bool _localLibraryWarmupScheduled = false;
-  bool _autoScanTriggeredOnLaunch = false;
-
+class _EagerInitializationState extends ConsumerState<_EagerInitialization> {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addObserver(this);
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!mounted) return;
-      _initializeAppServices();
-      _initializeExtensions();
-      _initializeDeferredProviders();
-    });
-  }
-
-  @override
-  void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
-    _localLibraryEnabledSub?.close();
-    _downloadHistoryWarmupTimer?.cancel();
-    _libraryCollectionsWarmupTimer?.cancel();
-    _localLibraryWarmupTimer?.cancel();
-    super.dispose();
-  }
-
-  @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-    if (state == AppLifecycleState.resumed) {
-      _maybeAutoScanLocalLibrary();
-    }
-  }
-
-  void _initializeDeferredProviders() {
-    _downloadHistoryWarmupTimer = _scheduleProviderWarmup(
-      const Duration(milliseconds: 400),
-      () => ref.read(downloadHistoryProvider),
-    );
-    _libraryCollectionsWarmupTimer = _scheduleProviderWarmup(
-      const Duration(milliseconds: 900),
-      () => ref.read(libraryCollectionsProvider),
-    );
-
-    _maybeScheduleLocalLibraryWarmup(
-      ref.read(
-        settingsProvider.select((settings) => settings.localLibraryEnabled),
-      ),
-    );
-
-    _localLibraryEnabledSub = ref.listenManual<bool>(
-      settingsProvider.select((settings) => settings.localLibraryEnabled),
-      (previous, next) {
-        if (next == true) {
-          _maybeScheduleLocalLibraryWarmup(true);
-        }
-      },
-    );
-  }
-
-  Timer _scheduleProviderWarmup(Duration delay, VoidCallback action) {
-    return Timer(delay, () {
-      if (!mounted) return;
-      action();
-    });
-  }
-
-  void _maybeScheduleLocalLibraryWarmup(bool enabled) {
-    if (!enabled || _localLibraryWarmupScheduled) return;
-    _localLibraryWarmupScheduled = true;
-    _localLibraryWarmupTimer = _scheduleProviderWarmup(
-      const Duration(milliseconds: 1600),
-      () {
-        ref.read(localLibraryProvider);
-        // Trigger auto-scan after initial warmup on first app launch.
-        if (!_autoScanTriggeredOnLaunch) {
-          _autoScanTriggeredOnLaunch = true;
-          // Give the provider a moment to load existing data before scanning.
-          Future.delayed(const Duration(milliseconds: 500), () {
-            if (mounted) _maybeAutoScanLocalLibrary();
-          });
-        }
-      },
-    );
-  }
-
-  /// Checks whether an automatic incremental scan should be triggered based on
-  /// the user's auto-scan preference and the time since the last scan.
-  Future<void> _maybeAutoScanLocalLibrary() async {
-    if (!mounted) return;
-
-    final settings = ref.read(settingsProvider);
-    if (!settings.localLibraryEnabled) return;
-    if (settings.localLibraryPath.isEmpty) return;
-    if (settings.localLibraryAutoScan == 'off') return;
-
-    final libraryState = ref.read(localLibraryProvider);
-    if (libraryState.isScanning) return;
-
-    final now = DateTime.now();
-    final prefs = await SharedPreferences.getInstance();
-    final lastScanned = readLocalLibraryLastScannedAt(prefs);
-
-    if (lastScanned != null) {
-      final elapsed = now.difference(lastScanned);
-
-      switch (settings.localLibraryAutoScan) {
-        case 'on_open':
-          // Cooldown of 10 minutes to prevent rapid re-scans.
-          if (elapsed.inMinutes < 10) return;
-          break;
-        case 'daily':
-          if (elapsed.inHours < 24) return;
-          break;
-        case 'weekly':
-          if (elapsed.inDays < 7) return;
-          break;
-        default:
-          return;
-      }
-    }
-
-    final iosBookmark = settings.localLibraryBookmark;
-    ref
-        .read(localLibraryProvider.notifier)
-        .startScan(
-          settings.localLibraryPath,
-          iosBookmark: iosBookmark.isNotEmpty ? iosBookmark : null,
-        );
+    _initializeAppServices();
+    _initializeExtensions();
+    ref.read(downloadHistoryProvider);
+    ref.read(localLibraryProvider);
+    ref.read(libraryCollectionsProvider);
   }
 
   Future<void> _initializeAppServices() async {

lib/models/settings.dart

@@ -20,7 +20,6 @@ class AppSettings {
   final String updateChannel;
   final bool hasSearchedBefore;
   final String folderOrganization;
-  final bool createPlaylistFolder;
   final bool useAlbumArtistForFolders;
   final bool usePrimaryArtistOnly; // Strip featured artists from folder name
   final bool filterContributingArtistsInAlbumArtist;
@@ -34,7 +33,6 @@ class AppSettings {
   final bool enableLogging;
   final bool useExtensionProviders;
   final String? searchProvider;
-  final String? homeFeedProvider;
   final bool separateSingles;
   final String albumFolderStructure;
   final bool showExtensionStore;
@@ -42,6 +40,10 @@ class AppSettings {
   final String lyricsMode;
   final String
   tidalHighFormat; // Format for Tidal HIGH quality: 'mp3_320', 'opus_256', or 'opus_128'
+  final int
+  youtubeOpusBitrate; // YouTube Opus bitrate (supported: 128/256 kbps)
+  final int
+  youtubeMp3Bitrate; // YouTube MP3 bitrate (supported: 128/256/320 kbps)
   final bool
   useAllFilesAccess; // Android 13+ only: enable MANAGE_EXTERNAL_STORAGE
   final bool
@@ -59,8 +61,6 @@ class AppSettings {
   localLibraryBookmark; // Base64-encoded iOS security-scoped bookmark
   final bool
   localLibraryShowDuplicates; // Show indicator when searching for existing tracks
-  final String
-  localLibraryAutoScan; // Auto-scan mode: 'off', 'on_open', 'daily', 'weekly'
 
   final bool
   hasCompletedTutorial; // Track if user has completed the app tutorial
@@ -96,7 +96,6 @@ class AppSettings {
     this.updateChannel = 'stable',
     this.hasSearchedBefore = false,
     this.folderOrganization = 'none',
-    this.createPlaylistFolder = false,
     this.useAlbumArtistForFolders = true,
     this.usePrimaryArtistOnly = false,
     this.filterContributingArtistsInAlbumArtist = false,
@@ -110,13 +109,14 @@ class AppSettings {
     this.enableLogging = false,
     this.useExtensionProviders = true,
     this.searchProvider,
-    this.homeFeedProvider,
     this.separateSingles = false,
     this.albumFolderStructure = 'artist_album',
     this.showExtensionStore = true,
     this.locale = 'system',
     this.lyricsMode = 'embed',
     this.tidalHighFormat = 'mp3_320',
+    this.youtubeOpusBitrate = 256,
+    this.youtubeMp3Bitrate = 320,
     this.useAllFilesAccess = false,
     this.autoExportFailedDownloads = false,
     this.downloadNetworkMode = 'any',
@@ -126,7 +126,6 @@ class AppSettings {
     this.localLibraryPath = '',
     this.localLibraryBookmark = '',
     this.localLibraryShowDuplicates = true,
-    this.localLibraryAutoScan = 'off',
     this.hasCompletedTutorial = false,
     this.lyricsProviders = const [
       'lrclib',
@@ -160,7 +159,6 @@ class AppSettings {
     String? updateChannel,
     bool? hasSearchedBefore,
     String? folderOrganization,
-    bool? createPlaylistFolder,
     bool? useAlbumArtistForFolders,
     bool? usePrimaryArtistOnly,
     bool? filterContributingArtistsInAlbumArtist,
@@ -175,14 +173,14 @@ class AppSettings {
     bool? useExtensionProviders,
     String? searchProvider,
     bool clearSearchProvider = false,
-    String? homeFeedProvider,
-    bool clearHomeFeedProvider = false,
     bool? separateSingles,
     String? albumFolderStructure,
     bool? showExtensionStore,
     String? locale,
     String? lyricsMode,
     String? tidalHighFormat,
+    int? youtubeOpusBitrate,
+    int? youtubeMp3Bitrate,
     bool? useAllFilesAccess,
     bool? autoExportFailedDownloads,
     String? downloadNetworkMode,
@@ -192,7 +190,6 @@ class AppSettings {
     String? localLibraryPath,
     String? localLibraryBookmark,
     bool? localLibraryShowDuplicates,
-    String? localLibraryAutoScan,
     bool? hasCompletedTutorial,
     List<String>? lyricsProviders,
     bool? lyricsIncludeTranslationNetease,
@@ -218,7 +215,6 @@ class AppSettings {
       updateChannel: updateChannel ?? this.updateChannel,
       hasSearchedBefore: hasSearchedBefore ?? this.hasSearchedBefore,
       folderOrganization: folderOrganization ?? this.folderOrganization,
-      createPlaylistFolder: createPlaylistFolder ?? this.createPlaylistFolder,
       useAlbumArtistForFolders:
           useAlbumArtistForFolders ?? this.useAlbumArtistForFolders,
       usePrimaryArtistOnly: usePrimaryArtistOnly ?? this.usePrimaryArtistOnly,
@@ -240,15 +236,14 @@ class AppSettings {
       searchProvider: clearSearchProvider
           ? null
           : (searchProvider ?? this.searchProvider),
-      homeFeedProvider: clearHomeFeedProvider
-          ? null
-          : (homeFeedProvider ?? this.homeFeedProvider),
       separateSingles: separateSingles ?? this.separateSingles,
       albumFolderStructure: albumFolderStructure ?? this.albumFolderStructure,
       showExtensionStore: showExtensionStore ?? this.showExtensionStore,
       locale: locale ?? this.locale,
       lyricsMode: lyricsMode ?? this.lyricsMode,
       tidalHighFormat: tidalHighFormat ?? this.tidalHighFormat,
+      youtubeOpusBitrate: youtubeOpusBitrate ?? this.youtubeOpusBitrate,
+      youtubeMp3Bitrate: youtubeMp3Bitrate ?? this.youtubeMp3Bitrate,
       useAllFilesAccess: useAllFilesAccess ?? this.useAllFilesAccess,
       autoExportFailedDownloads:
           autoExportFailedDownloads ?? this.autoExportFailedDownloads,
@@ -261,7 +256,6 @@ class AppSettings {
       localLibraryBookmark: localLibraryBookmark ?? this.localLibraryBookmark,
       localLibraryShowDuplicates:
           localLibraryShowDuplicates ?? this.localLibraryShowDuplicates,
-      localLibraryAutoScan: localLibraryAutoScan ?? this.localLibraryAutoScan,
       hasCompletedTutorial: hasCompletedTutorial ?? this.hasCompletedTutorial,
       lyricsProviders: lyricsProviders ?? this.lyricsProviders,
       lyricsIncludeTranslationNetease:

lib/models/settings.g.dart

@@ -23,7 +23,6 @@ AppSettings _$AppSettingsFromJson(Map<String, dynamic> json) => AppSettings(
   updateChannel: json['updateChannel'] as String? ?? 'stable',
   hasSearchedBefore: json['hasSearchedBefore'] as bool? ?? false,
   folderOrganization: json['folderOrganization'] as String? ?? 'none',
-  createPlaylistFolder: json['createPlaylistFolder'] as bool? ?? false,
   useAlbumArtistForFolders: json['useAlbumArtistForFolders'] as bool? ?? true,
   usePrimaryArtistOnly: json['usePrimaryArtistOnly'] as bool? ?? false,
   filterContributingArtistsInAlbumArtist:
@@ -39,7 +38,6 @@ AppSettings _$AppSettingsFromJson(Map<String, dynamic> json) => AppSettings(
   enableLogging: json['enableLogging'] as bool? ?? false,
   useExtensionProviders: json['useExtensionProviders'] as bool? ?? true,
   searchProvider: json['searchProvider'] as String?,
-  homeFeedProvider: json['homeFeedProvider'] as String?,
   separateSingles: json['separateSingles'] as bool? ?? false,
   albumFolderStructure:
       json['albumFolderStructure'] as String? ?? 'artist_album',
@@ -47,6 +45,8 @@ AppSettings _$AppSettingsFromJson(Map<String, dynamic> json) => AppSettings(
   locale: json['locale'] as String? ?? 'system',
   lyricsMode: json['lyricsMode'] as String? ?? 'embed',
   tidalHighFormat: json['tidalHighFormat'] as String? ?? 'mp3_320',
+  youtubeOpusBitrate: (json['youtubeOpusBitrate'] as num?)?.toInt() ?? 256,
+  youtubeMp3Bitrate: (json['youtubeMp3Bitrate'] as num?)?.toInt() ?? 320,
   useAllFilesAccess: json['useAllFilesAccess'] as bool? ?? false,
   autoExportFailedDownloads:
       json['autoExportFailedDownloads'] as bool? ?? false,
@@ -58,7 +58,6 @@ AppSettings _$AppSettingsFromJson(Map<String, dynamic> json) => AppSettings(
   localLibraryBookmark: json['localLibraryBookmark'] as String? ?? '',
   localLibraryShowDuplicates:
       json['localLibraryShowDuplicates'] as bool? ?? true,
-  localLibraryAutoScan: json['localLibraryAutoScan'] as String? ?? 'off',
   hasCompletedTutorial: json['hasCompletedTutorial'] as bool? ?? false,
   lyricsProviders:
       (json['lyricsProviders'] as List<dynamic>?)
@@ -101,7 +100,6 @@ Map<String, dynamic> _$AppSettingsToJson(
   'updateChannel': instance.updateChannel,
   'hasSearchedBefore': instance.hasSearchedBefore,
   'folderOrganization': instance.folderOrganization,
-  'createPlaylistFolder': instance.createPlaylistFolder,
   'useAlbumArtistForFolders': instance.useAlbumArtistForFolders,
   'usePrimaryArtistOnly': instance.usePrimaryArtistOnly,
   'filterContributingArtistsInAlbumArtist':
@@ -116,13 +114,14 @@ Map<String, dynamic> _$AppSettingsToJson(
   'enableLogging': instance.enableLogging,
   'useExtensionProviders': instance.useExtensionProviders,
   'searchProvider': instance.searchProvider,
-  'homeFeedProvider': instance.homeFeedProvider,
   'separateSingles': instance.separateSingles,
   'albumFolderStructure': instance.albumFolderStructure,
   'showExtensionStore': instance.showExtensionStore,
   'locale': instance.locale,
   'lyricsMode': instance.lyricsMode,
   'tidalHighFormat': instance.tidalHighFormat,
+  'youtubeOpusBitrate': instance.youtubeOpusBitrate,
+  'youtubeMp3Bitrate': instance.youtubeMp3Bitrate,
   'useAllFilesAccess': instance.useAllFilesAccess,
   'autoExportFailedDownloads': instance.autoExportFailedDownloads,
   'downloadNetworkMode': instance.downloadNetworkMode,
@@ -132,7 +131,6 @@ Map<String, dynamic> _$AppSettingsToJson(
   'localLibraryPath': instance.localLibraryPath,
   'localLibraryBookmark': instance.localLibraryBookmark,
   'localLibraryShowDuplicates': instance.localLibraryShowDuplicates,
-  'localLibraryAutoScan': instance.localLibraryAutoScan,
   'hasCompletedTutorial': instance.hasCompletedTutorial,
   'lyricsProviders': instance.lyricsProviders,
   'lyricsIncludeTranslationNetease': instance.lyricsIncludeTranslationNetease,

lib/providers/explore_provider.dart

@@ -4,14 +4,13 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/utils/logger.dart';
 import 'package:spotiflac_android/providers/extension_provider.dart';
-import 'package:spotiflac_android/providers/settings_provider.dart';
 
 final _log = AppLogger('ExploreProvider');
 
 class ExploreItem {
   final String id;
   final String uri;
-  final String type;
+  final String type; // track, album, playlist, artist, station
   final String name;
   final String artists;
   final String? description;
@@ -168,6 +167,7 @@ class ExploreNotifier extends Notifier<ExploreState> {
     return const ExploreState();
   }
 
+  /// Restore cached home feed from SharedPreferences immediately on startup
   Future<void> _restoreFromCache() async {
     try {
       final prefs = await SharedPreferences.getInstance();
@@ -198,10 +198,13 @@ class ExploreNotifier extends Notifier<ExploreState> {
     }
   }
 
+  /// Save home feed to SharedPreferences for instant restore on next launch
   Future<void> _saveToCache(List<ExploreSection> sections) async {
     try {
       final prefs = await SharedPreferences.getInstance();
-      final data = {'sections': sections.map((s) => s.toJson()).toList()};
+      final data = {
+        'sections': sections.map((s) => s.toJson()).toList(),
+      };
       await prefs.setString(_cacheKey, jsonEncode(data));
       await prefs.setInt(_cacheTsKey, DateTime.now().millisecondsSinceEpoch);
       _log.d('Saved ${sections.length} explore sections to cache');
@@ -210,52 +213,45 @@ class ExploreNotifier extends Notifier<ExploreState> {
     }
   }
 
+  /// Fetch home feed from spotify-web extension
   Future<void> fetchHomeFeed({bool forceRefresh = false}) async {
     _log.i('fetchHomeFeed called, forceRefresh=$forceRefresh');
-
-    if (!forceRefresh &&
-        state.hasContent &&
+    
+    // If we have cached content and it's fresh enough, skip network fetch
+    if (!forceRefresh && 
+        state.hasContent && 
         state.lastFetched != null &&
         DateTime.now().difference(state.lastFetched!).inMinutes < 5) {
       _log.d('Using cached home feed (fresh enough)');
       return;
     }
-
+    
     if (state.isLoading) {
       _log.d('Home feed fetch already in progress');
       return;
     }
 
+    // Only show loading spinner if we have no cached content to display
     final showLoading = !state.hasContent;
     state = state.copyWith(isLoading: showLoading, error: null);
 
     try {
       final extState = ref.read(extensionProvider);
-      final settings = ref.read(settingsProvider);
-      final preferredId = settings.homeFeedProvider;
-      _log.d(
-        'Extensions count: ${extState.extensions.length}, preferred home feed: $preferredId',
-      );
-
+      _log.d('Extensions count: ${extState.extensions.length}');
+      
       Extension? targetExt;
       for (final extension in extState.extensions) {
         if (!extension.enabled || !extension.hasHomeFeed) {
           continue;
         }
-        if (preferredId != null &&
-            preferredId.isNotEmpty &&
-            extension.id == preferredId) {
-          targetExt = extension;
-          break;
-        }
         if (targetExt == null || extension.id == 'spotify-web') {
           targetExt = extension;
-          if (preferredId == null && extension.id == 'spotify-web') {
+          if (extension.id == 'spotify-web') {
             break;
           }
         }
       }
-
+      
       if (targetExt == null) {
         _log.w('No extension with homeFeed capability found');
         state = state.copyWith(
@@ -264,7 +260,7 @@ class ExploreNotifier extends Notifier<ExploreState> {
         );
         return;
       }
-
+      
       _log.i('Fetching home feed from ${targetExt.id}...');
       final result = await PlatformBridge.getExtensionHomeFeed(targetExt.id);
 
@@ -280,7 +276,10 @@ class ExploreNotifier extends Notifier<ExploreState> {
       _log.d('getExtensionHomeFeed success=$success');
       if (!success) {
         final error = result['error'] as String? ?? 'Unknown error';
-        state = state.copyWith(isLoading: false, error: error);
+        state = state.copyWith(
+          isLoading: false,
+          error: error,
+        );
         return;
       }
 
@@ -292,12 +291,10 @@ class ExploreNotifier extends Notifier<ExploreState> {
           .toList();
 
       _log.i('Fetched ${sections.length} sections');
-
+      
       if (sections.isNotEmpty && sections.first.items.isNotEmpty) {
         final firstItem = sections.first.items.first;
-        _log.d(
-          'First item: name=${firstItem.name}, artists=${firstItem.artists}, type=${firstItem.type}',
-        );
+        _log.d('First item: name=${firstItem.name}, artists=${firstItem.artists}, type=${firstItem.type}');
       }
 
       final localGreeting = _getLocalGreeting();
@@ -310,10 +307,14 @@ class ExploreNotifier extends Notifier<ExploreState> {
         lastFetched: DateTime.now(),
       );
 
+      // Save to disk cache for instant restore on next app launch
       _saveToCache(sections);
     } catch (e, stack) {
       _log.e('Error fetching home feed: $e', e, stack);
-      state = state.copyWith(isLoading: false, error: e.toString());
+      state = state.copyWith(
+        isLoading: false,
+        error: e.toString(),
+      );
     }
   }
 
@@ -324,6 +325,7 @@ class ExploreNotifier extends Notifier<ExploreState> {
   Future<void> refresh() => fetchHomeFeed(forceRefresh: true);
 }
 
+
 final exploreProvider = NotifierProvider<ExploreNotifier, ExploreState>(() {
   return ExploreNotifier();
 });

lib/providers/extension_provider.dart

@@ -32,12 +32,14 @@ class Extension {
   final bool hasMetadataProvider;
   final bool hasDownloadProvider;
   final bool hasLyricsProvider;
-  final bool skipMetadataEnrichment;
+  final bool
+  skipMetadataEnrichment; // If true, use metadata from extension instead of enriching
   final SearchBehavior? searchBehavior;
   final URLHandler? urlHandler;
   final TrackMatching? trackMatching;
   final PostProcessing? postProcessing;
-  final Map<String, dynamic> capabilities;
+  final Map<String, dynamic>
+  capabilities; // Extension capabilities (homeFeed, browseCategories, etc.)
 
   const Extension({
     required this.id,
@@ -196,10 +198,12 @@ class SearchBehavior {
   final String? placeholder;
   final bool primary;
   final String? icon;
-  final String? thumbnailRatio;
+  final String?
+  thumbnailRatio; // "square" (1:1), "wide" (16:9), "portrait" (2:3)
   final int? thumbnailWidth;
   final int? thumbnailHeight;
-  final List<SearchFilter> filters;
+  final List<SearchFilter>
+  filters; // Available search filters (e.g., track, album, artist, playlist)
 
   const SearchBehavior({
     required this.enabled,
@@ -235,11 +239,11 @@ class SearchBehavior {
     }
 
     switch (thumbnailRatio) {
-      case 'wide':
+      case 'wide': // 16:9 - YouTube style
         return (defaultSize * 16 / 9, defaultSize);
-      case 'portrait':
+      case 'portrait': // 2:3 - Poster style
         return (defaultSize * 2 / 3, defaultSize);
-      case 'square':
+      case 'square': // 1:1 - Album art style
       default:
         return (defaultSize, defaultSize);
     }
@@ -286,6 +290,7 @@ class PostProcessing {
   }
 }
 
+/// URL handler configuration for custom URL patterns
 class URLHandler {
   final bool enabled;
   final List<String> patterns;
@@ -299,6 +304,7 @@ class URLHandler {
     );
   }
 
+  /// Check if a URL matches any of the patterns
   bool matchesURL(String url) {
     if (!enabled || patterns.isEmpty) return false;
     final lowerUrl = url.toLowerCase();
@@ -498,11 +504,6 @@ class ExtensionNotifier extends Notifier<ExtensionState> {
   }
 
   Future<void> _cleanupExtensions({required String reason}) async {
-    if (!PlatformBridge.supportsExtensionSystem) {
-      _cleanupInFlight = false;
-      return;
-    }
-
     try {
       await PlatformBridge.cleanupExtensions();
       _log.d('Extensions cleaned up ($reason)');
@@ -518,17 +519,6 @@ class ExtensionNotifier extends Notifier<ExtensionState> {
 
     state = state.copyWith(isLoading: true, error: null);
 
-    if (!PlatformBridge.supportsExtensionSystem) {
-      state = state.copyWith(
-        isInitialized: true,
-        isLoading: false,
-        extensions: const [],
-        error: null,
-      );
-      _log.i('Extension system disabled on this platform');
-      return;
-    }
-
     try {
       await PlatformBridge.initExtensionSystem(extensionsDir, dataDir);
       await loadExtensions(extensionsDir);
@@ -902,7 +892,7 @@ class ExtensionNotifier extends Notifier<ExtensionState> {
   }
 
   List<String> getAllMetadataProviders() {
-    final providers = ['deezer', 'qobuz', 'tidal'];
+    final providers = ['deezer'];
     for (final ext in state.extensions) {
       if (ext.enabled && ext.hasMetadataProvider) {
         providers.add(ext.id);
@@ -921,10 +911,8 @@ class ExtensionNotifier extends Notifier<ExtensionState> {
       }
     }
 
-    for (final provider in const ['deezer', 'qobuz', 'tidal']) {
-      if (!result.contains(provider)) {
-        result.add(provider);
-      }
+    if (!result.contains('deezer')) {
+      result.insert(0, 'deezer');
     }
 
     return result;

lib/providers/library_collections_provider.dart

@@ -666,6 +666,7 @@ class LibraryCollectionsNotifier extends Notifier<LibraryCollectionsState> {
     final destPath = p.join(coversDir.path, '$playlistId$ext');
     if (playlist.coverImagePath == destPath) return;
 
+    // Copy image to persistent location
     await File(sourceFilePath).copy(destPath);
 
     final now = DateTime.now();
@@ -685,6 +686,7 @@ class LibraryCollectionsNotifier extends Notifier<LibraryCollectionsState> {
     final playlist = state.playlistById(playlistId);
     if (playlist == null || playlist.coverImagePath == null) return;
 
+    // Delete the file if it exists
     final path = playlist.coverImagePath;
     if (path != null) {
       final file = File(path);

lib/providers/local_library_provider.dart

@@ -9,11 +9,11 @@ import 'package:spotiflac_android/services/library_database.dart';
 import 'package:spotiflac_android/services/notification_service.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/utils/logger.dart';
-import 'package:spotiflac_android/utils/local_library_scan_prefs.dart';
 import 'package:spotiflac_android/utils/path_match_keys.dart';
 
 final _log = AppLogger('LocalLibrary');
 
+const _lastScannedAtKey = 'local_library_last_scanned_at';
 const _excludedDownloadedCountKey = 'local_library_excluded_downloaded_count';
 final _prefs = SharedPreferences.getInstance();
 
@@ -120,7 +120,7 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
   final LibraryDatabase _db = LibraryDatabase.instance;
   final HistoryDatabase _historyDb = HistoryDatabase.instance;
   final NotificationService _notificationService = NotificationService();
-  static const _progressPollingInterval = Duration(milliseconds: 1200);
+  static const _progressPollingInterval = Duration(milliseconds: 800);
   Timer? _progressTimer;
   Timer? _progressStreamBootstrapTimer;
   StreamSubscription<Map<String, dynamic>>? _progressStreamSub;
@@ -165,7 +165,10 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
       var excludedDownloadedCount = 0;
       try {
         final prefs = await prefsFuture;
-        lastScannedAt = readLocalLibraryLastScannedAt(prefs);
+        final lastScannedAtStr = prefs.getString(_lastScannedAtKey);
+        if (lastScannedAtStr != null && lastScannedAtStr.isNotEmpty) {
+          lastScannedAt = DateTime.tryParse(lastScannedAtStr);
+        }
         excludedDownloadedCount =
             prefs.getInt(_excludedDownloadedCountKey) ?? 0;
       } catch (e) {
@@ -252,6 +255,8 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
 
     _startProgressPolling();
 
+    // On iOS, start accessing the security-scoped bookmark so the Go backend
+    // can read files outside the app sandbox.
     String? resolvedPath;
     bool didStartSecurityAccess = false;
     if (Platform.isIOS && iosBookmark != null && iosBookmark.isNotEmpty) {
@@ -273,6 +278,9 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
     try {
       final isSaf = effectiveFolderPath.startsWith('content://');
 
+      // Get all file paths from download history to exclude them.
+      // Merge DB + in-memory state to avoid race when a fresh download has not
+      // been flushed to SQLite yet.
       final downloadedPaths = await _historyDb.getAllFilePaths();
       final inMemoryHistoryPaths = ref
           .read(downloadHistoryProvider)
@@ -293,6 +301,7 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
       );
 
       if (forceFullScan) {
+        // Full scan path - ignores existing data
         final results = isSaf
             ? await PlatformBridge.scanSafTree(effectiveFolderPath)
             : await PlatformBridge.scanLibraryFolder(effectiveFolderPath);
@@ -306,6 +315,7 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
         int skippedDownloads = 0;
         for (final json in results) {
           final filePath = json['filePath'] as String?;
+          // Skip files that are already in download history
           if (_isDownloadedPath(filePath, downloadedPathKeys)) {
             skippedDownloads++;
             continue;
@@ -318,13 +328,16 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
           _log.i('Skipped $skippedDownloads files already in download history');
         }
 
-        await _db.replaceAll(items.map((e) => e.toJson()).toList());
-        final persistedItems = [...items]..sort(_compareLibraryItems);
+        // Full scan should replace library index entirely.
+        await _db.clearAll();
+        if (items.isNotEmpty) {
+          await _db.upsertBatch(items.map((e) => e.toJson()).toList());
+        }
 
         final now = DateTime.now();
         try {
           final prefs = await SharedPreferences.getInstance();
-          await writeLocalLibraryLastScannedAt(prefs, now);
+          await prefs.setString(_lastScannedAtKey, now.toIso8601String());
           await prefs.setInt(_excludedDownloadedCountKey, skippedDownloads);
           _log.d('Saved lastScannedAt: $now');
         } catch (e) {
@@ -332,7 +345,7 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
         }
 
         state = state.copyWith(
-          items: persistedItems,
+          items: items,
           isScanning: false,
           scanProgress: 100,
           lastScannedAt: now,
@@ -341,15 +354,16 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
         );
 
         _log.i(
-          'Full scan complete: ${persistedItems.length} tracks found, '
+          'Full scan complete: ${items.length} tracks found, '
           '$skippedDownloads already in downloads',
         );
         await _showScanCompleteNotification(
-          totalTracks: persistedItems.length,
+          totalTracks: items.length,
           excludedDownloadedCount: skippedDownloads,
           errorCount: state.scanErrorCount,
         );
       } else {
+        // Incremental scan path - only scans new/modified files
         final existingFiles = await _db.getFileModTimes();
         _log.i(
           'Incremental scan: ${existingFiles.length} existing files in database',
@@ -365,41 +379,18 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
           _log.i('Backfilled ${backfilledModTimes.length} legacy mod times');
         }
 
-        final useSnapshotBridge =
-            Platform.isAndroid && existingFiles.isNotEmpty;
-        final snapshotPath = useSnapshotBridge
-            ? await _db.writeFileModTimesSnapshot()
-            : null;
-
-        Map<String, dynamic> result;
-        try {
-          if (isSaf) {
-            result = useSnapshotBridge && snapshotPath != null
-                ? await PlatformBridge.scanSafTreeIncrementalFromSnapshot(
-                    effectiveFolderPath,
-                    snapshotPath,
-                  )
-                : await PlatformBridge.scanSafTreeIncremental(
-                    effectiveFolderPath,
-                    existingFiles,
-                  );
-          } else {
-            result = useSnapshotBridge && snapshotPath != null
-                ? await PlatformBridge.scanLibraryFolderIncrementalFromSnapshot(
-                    effectiveFolderPath,
-                    snapshotPath,
-                  )
-                : await PlatformBridge.scanLibraryFolderIncremental(
-                    effectiveFolderPath,
-                    existingFiles,
-                  );
-          }
-        } finally {
-          if (snapshotPath != null) {
-            try {
-              await File(snapshotPath).delete();
-            } catch (_) {}
-          }
+        // Use appropriate incremental scan method based on SAF or not
+        final Map<String, dynamic> result;
+        if (isSaf) {
+          result = await PlatformBridge.scanSafTreeIncremental(
+            effectiveFolderPath,
+            existingFiles,
+          );
+        } else {
+          result = await PlatformBridge.scanLibraryFolderIncremental(
+            effectiveFolderPath,
+            existingFiles,
+          );
         }
 
         if (_scanCancelRequested) {
@@ -408,6 +399,8 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
           return;
         }
 
+        // Parse incremental scan result
+        // SAF returns 'files' and 'removedUris', non-SAF returns 'scanned' and 'deletedPaths'
         final scannedList =
             (result['files'] as List<dynamic>?) ??
             (result['scanned'] as List<dynamic>?) ??
@@ -428,10 +421,8 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
           '$skippedCount skipped, ${deletedPaths.length} deleted, $totalFiles total',
         );
 
-        final existingJson = await _db.getAll();
         final currentByPath = <String, LocalLibraryItem>{
-          for (final item in existingJson.map(LocalLibraryItem.fromJson))
-            item.filePath: item,
+          for (final item in state.items) item.filePath: item,
         };
         final existingDownloadedPaths = <String>[];
         currentByPath.removeWhere((path, _) {
@@ -448,6 +439,7 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
           );
         }
 
+        // Upsert new/modified items (excluding downloaded files)
         final updatedItems = <LocalLibraryItem>[];
         int skippedDownloads = existingDownloadedPaths.length;
         if (scannedList.isNotEmpty) {
@@ -473,6 +465,7 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
           }
         }
 
+        // Delete removed items
         if (deletedPaths.isNotEmpty) {
           final deleteCount = await _db.deleteByPaths(deletedPaths);
           for (final path in deletedPaths) {
@@ -487,7 +480,7 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
         final now = DateTime.now();
         try {
           final prefs = await SharedPreferences.getInstance();
-          await writeLocalLibraryLastScannedAt(prefs, now);
+          await prefs.setString(_lastScannedAtKey, now.toIso8601String());
           await prefs.setInt(_excludedDownloadedCountKey, skippedDownloads);
           _log.d('Saved lastScannedAt: $now');
         } catch (e) {
@@ -805,7 +798,7 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
 
     try {
       final prefs = await SharedPreferences.getInstance();
-      await clearLocalLibraryLastScannedAt(prefs);
+      await prefs.remove(_lastScannedAtKey);
       await prefs.remove(_excludedDownloadedCountKey);
     } catch (e) {
       _log.w('Failed to clear lastScannedAt: $e');

lib/providers/recent_access_provider.dart

@@ -5,16 +5,18 @@ import 'package:spotiflac_android/services/app_state_database.dart';
 
 const _maxRecentItems = 20;
 
+/// Types of items that can be accessed
 enum RecentAccessType { artist, album, track, playlist }
 
+/// Represents a recently accessed item
 class RecentAccessItem {
   final String id;
   final String name;
-  final String? subtitle;
+  final String? subtitle; // Artist name for tracks/albums, null for artists
   final String? imageUrl;
   final RecentAccessType type;
   final DateTime accessedAt;
-  final String? providerId;
+  final String? providerId; // Extension ID or 'deezer' for built-in
 
   const RecentAccessItem({
     required this.id,
@@ -51,6 +53,7 @@ class RecentAccessItem {
     );
   }
 
+  /// Create a unique key for deduplication
   String get uniqueKey => '${type.name}:${providerId ?? 'default'}:$id';
 
   @override
@@ -64,9 +67,10 @@ class RecentAccessItem {
   int get hashCode => uniqueKey.hashCode;
 }
 
+/// State for recent access history
 class RecentAccessState {
   final List<RecentAccessItem> items;
-  final Set<String> hiddenDownloadIds;
+  final Set<String> hiddenDownloadIds; // IDs of downloads hidden from recents
   final bool isLoaded;
 
   const RecentAccessState({
@@ -88,6 +92,7 @@ class RecentAccessState {
   }
 }
 
+/// Provider for managing recent access history
 class RecentAccessNotifier extends Notifier<RecentAccessState> {
   final AppStateDatabase _appStateDb = AppStateDatabase.instance;
 
@@ -130,6 +135,7 @@ class RecentAccessNotifier extends Notifier<RecentAccessState> {
     }
   }
 
+  /// Record an access to an artist
   void recordArtistAccess({
     required String id,
     required String name,
@@ -148,6 +154,7 @@ class RecentAccessNotifier extends Notifier<RecentAccessState> {
     );
   }
 
+  /// Record an access to an album
   void recordAlbumAccess({
     required String id,
     required String name,
@@ -168,6 +175,7 @@ class RecentAccessNotifier extends Notifier<RecentAccessState> {
     );
   }
 
+  /// Record an access to a track
   void recordTrackAccess({
     required String id,
     required String name,
@@ -188,6 +196,7 @@ class RecentAccessNotifier extends Notifier<RecentAccessState> {
     );
   }
 
+  /// Record an access to a playlist
   void recordPlaylistAccess({
     required String id,
     required String name,
@@ -233,6 +242,7 @@ class RecentAccessNotifier extends Notifier<RecentAccessState> {
     }
   }
 
+  /// Remove a specific item from history
   void removeItem(RecentAccessItem item) {
     final updatedItems = state.items
         .where((e) => e.uniqueKey != item.uniqueKey)
@@ -241,21 +251,25 @@ class RecentAccessNotifier extends Notifier<RecentAccessState> {
     unawaited(_appStateDb.deleteRecentAccessRow(item.uniqueKey));
   }
 
+  /// Hide a download item from recents (without deleting the actual download)
   void hideDownloadFromRecents(String downloadId) {
     final updatedHidden = {...state.hiddenDownloadIds, downloadId};
     state = state.copyWith(hiddenDownloadIds: updatedHidden);
     unawaited(_appStateDb.addHiddenRecentDownloadId(downloadId));
   }
 
+  /// Check if a download is hidden from recents
   bool isDownloadHidden(String downloadId) {
     return state.hiddenDownloadIds.contains(downloadId);
   }
 
+  /// Clear all history
   void clearHistory() {
     state = state.copyWith(items: []);
     unawaited(_appStateDb.clearRecentAccessRows());
   }
 
+  /// Clear hidden downloads (show all again)
   void clearHiddenDownloads() {
     state = state.copyWith(hiddenDownloadIds: {});
     unawaited(_appStateDb.clearHiddenRecentDownloadIds());

lib/providers/settings_provider.dart

@@ -1,21 +1,21 @@
 import 'dart:convert';
-import 'dart:io';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:spotiflac_android/models/settings.dart';
 import 'package:spotiflac_android/constants/app_info.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
-import 'package:spotiflac_android/utils/file_access.dart';
 import 'package:spotiflac_android/utils/logger.dart';
 
 const _settingsKey = 'app_settings';
 const _migrationVersionKey = 'settings_migration_version';
-const _currentMigrationVersion = 7;
+const _currentMigrationVersion = 5;
 const _spotifyClientSecretKey = 'spotify_client_secret';
 final _log = AppLogger('SettingsProvider');
 
 class SettingsNotifier extends Notifier<AppSettings> {
+  static const List<int> _youtubeOpusSupportedBitrates = [128, 256];
+  static const List<int> _youtubeMp3SupportedBitrates = [128, 256, 320];
   static final RegExp _isoRegionPattern = RegExp(r'^[A-Z]{2}$');
 
   final Future<SharedPreferences> _prefs = SharedPreferences.getInstance();
@@ -37,7 +37,7 @@ class SettingsNotifier extends Notifier<AppSettings> {
       state = AppSettings.fromJson(jsonDecode(json));
 
       await _runMigrations(prefs);
-      await _normalizeIosDownloadDirectoryIfNeeded();
+      await _normalizeYouTubeBitratesIfNeeded();
       await _normalizeSongLinkRegionIfNeeded();
     }
 
@@ -50,8 +50,6 @@ class SettingsNotifier extends Notifier<AppSettings> {
   }
 
   void _syncLyricsSettingsToBackend() {
-    if (!PlatformBridge.supportsCoreBackend) return;
-
     PlatformBridge.setLyricsProviders(state.lyricsProviders).catchError((e) {
       _log.w('Failed to sync lyrics providers to backend: $e');
     });
@@ -67,8 +65,6 @@ class SettingsNotifier extends Notifier<AppSettings> {
   }
 
   void _syncNetworkCompatibilitySettingsToBackend() {
-    if (!PlatformBridge.supportsCoreBackend) return;
-
     final compatibilityMode = state.networkCompatibilityMode;
     PlatformBridge.setNetworkCompatibilityOptions(
       allowHttp: compatibilityMode,
@@ -119,10 +115,6 @@ class SettingsNotifier extends Notifier<AppSettings> {
         );
       }
       state = state.copyWith(lastSeenVersion: AppInfo.version);
-      // Migration 7: YouTube is no longer a built-in service — reset to Tidal
-      if (state.defaultService == 'youtube') {
-        state = state.copyWith(defaultService: 'tidal');
-      }
       await prefs.setInt(_migrationVersionKey, _currentMigrationVersion);
       await _saveSettings();
     }
@@ -154,17 +146,46 @@ class SettingsNotifier extends Notifier<AppSettings> {
     }
   }
 
-  Future<void> _normalizeIosDownloadDirectoryIfNeeded() async {
-    if (!Platform.isIOS) return;
+  int _nearestSupportedBitrate(int value, List<int> supported) {
+    var nearest = supported.first;
+    var nearestDistance = (value - nearest).abs();
 
-    final currentDir = state.downloadDirectory.trim();
-    if (currentDir.isEmpty) return;
+    for (final option in supported.skip(1)) {
+      final distance = (value - option).abs();
+      // On tie, prefer higher quality bitrate.
+      if (distance < nearestDistance ||
+          (distance == nearestDistance && option > nearest)) {
+        nearest = option;
+        nearestDistance = distance;
+      }
+    }
 
-    final normalizedDir = await validateOrFixIosPath(currentDir);
-    if (normalizedDir == currentDir) return;
+    return nearest;
+  }
 
-    _log.i('Normalized iOS download directory: $currentDir -> $normalizedDir');
-    state = state.copyWith(downloadDirectory: normalizedDir);
+  int _normalizeYouTubeOpusBitrate(int bitrate) {
+    return _nearestSupportedBitrate(bitrate, _youtubeOpusSupportedBitrates);
+  }
+
+  int _normalizeYouTubeMp3Bitrate(int bitrate) {
+    return _nearestSupportedBitrate(bitrate, _youtubeMp3SupportedBitrates);
+  }
+
+  Future<void> _normalizeYouTubeBitratesIfNeeded() async {
+    final normalizedOpus = _normalizeYouTubeOpusBitrate(
+      state.youtubeOpusBitrate,
+    );
+    final normalizedMp3 = _normalizeYouTubeMp3Bitrate(state.youtubeMp3Bitrate);
+
+    if (normalizedOpus == state.youtubeOpusBitrate &&
+        normalizedMp3 == state.youtubeMp3Bitrate) {
+      return;
+    }
+
+    state = state.copyWith(
+      youtubeOpusBitrate: normalizedOpus,
+      youtubeMp3Bitrate: normalizedMp3,
+    );
     await _saveSettings();
   }
 
@@ -333,11 +354,6 @@ class SettingsNotifier extends Notifier<AppSettings> {
     _saveSettings();
   }
 
-  void setCreatePlaylistFolder(bool enabled) {
-    state = state.copyWith(createPlaylistFolder: enabled);
-    _saveSettings();
-  }
-
   void setUseAlbumArtistForFolders(bool enabled) {
     state = state.copyWith(useAlbumArtistForFolders: enabled);
     _saveSettings();
@@ -369,7 +385,8 @@ class SettingsNotifier extends Notifier<AppSettings> {
   }
 
   void setMetadataSource(String source) {
-    state = state.copyWith(metadataSource: source);
+    final normalized = source == 'deezer' ? 'deezer' : 'deezer';
+    state = state.copyWith(metadataSource: normalized);
     _saveSettings();
   }
 
@@ -382,15 +399,6 @@ class SettingsNotifier extends Notifier<AppSettings> {
     _saveSettings();
   }
 
-  void setHomeFeedProvider(String? provider) {
-    if (provider == null || provider.isEmpty) {
-      state = state.copyWith(clearHomeFeedProvider: true);
-    } else {
-      state = state.copyWith(homeFeedProvider: provider);
-    }
-    _saveSettings();
-  }
-
   void setEnableLogging(bool enabled) {
     state = state.copyWith(enableLogging: enabled);
     _saveSettings();
@@ -427,6 +435,18 @@ class SettingsNotifier extends Notifier<AppSettings> {
     _saveSettings();
   }
 
+  void setYoutubeOpusBitrate(int bitrate) {
+    final normalized = _normalizeYouTubeOpusBitrate(bitrate);
+    state = state.copyWith(youtubeOpusBitrate: normalized);
+    _saveSettings();
+  }
+
+  void setYoutubeMp3Bitrate(int bitrate) {
+    final normalized = _normalizeYouTubeMp3Bitrate(bitrate);
+    state = state.copyWith(youtubeMp3Bitrate: normalized);
+    _saveSettings();
+  }
+
   void setUseAllFilesAccess(bool enabled) {
     state = state.copyWith(useAllFilesAccess: enabled);
     _saveSettings();
@@ -482,11 +502,6 @@ class SettingsNotifier extends Notifier<AppSettings> {
     _saveSettings();
   }
 
-  void setLocalLibraryAutoScan(String mode) {
-    state = state.copyWith(localLibraryAutoScan: mode);
-    _saveSettings();
-  }
-
   void setTutorialComplete() {
     state = state.copyWith(hasCompletedTutorial: true);
     _saveSettings();

lib/providers/store_provider.dart

@@ -1,5 +1,4 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:spotiflac_android/constants/app_info.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/utils/logger.dart';
@@ -7,18 +6,17 @@ import 'package:spotiflac_android/providers/extension_provider.dart';
 
 final _log = AppLogger('StoreProvider');
 final RegExp _leadingVersionPrefix = RegExp(r'^v');
-const _registryUrlPrefKey = 'store_registry_url';
 
 int compareVersions(String v1, String v2) {
   final parts1 = v1.replaceAll(_leadingVersionPrefix, '').split('.');
   final parts2 = v2.replaceAll(_leadingVersionPrefix, '').split('.');
-
+  
   final maxLen = parts1.length > parts2.length ? parts1.length : parts2.length;
-
+  
   for (var i = 0; i < maxLen; i++) {
     final n1 = i < parts1.length ? (int.tryParse(parts1[i]) ?? 0) : 0;
     final n2 = i < parts2.length ? (int.tryParse(parts2[i]) ?? 0) : 0;
-
+    
     if (n1 < n2) return -1;
     if (n1 > n2) return 1;
   }
@@ -26,19 +24,14 @@ int compareVersions(String v1, String v2) {
 }
 
 class StoreCategory {
+
   static const String metadata = 'metadata';
   static const String download = 'download';
   static const String utility = 'utility';
   static const String lyrics = 'lyrics';
   static const String integration = 'integration';
 
-  static const List<String> all = [
-    metadata,
-    download,
-    utility,
-    lyrics,
-    integration,
-  ];
+  static const List<String> all = [metadata, download, utility, lyrics, integration];
 
   static String getDisplayName(String category) {
     switch (category) {
@@ -99,8 +92,7 @@ class StoreExtension {
     return StoreExtension(
       id: json['id'] as String? ?? '',
       name: json['name'] as String? ?? '',
-      displayName:
-          json['display_name'] as String? ?? json['name'] as String? ?? '',
+      displayName: json['display_name'] as String? ?? json['name'] as String? ?? '',
       version: json['version'] as String? ?? '0.0.0',
       author: json['author'] as String? ?? 'Unknown',
       description: json['description'] as String? ?? '',
@@ -123,6 +115,7 @@ class StoreExtension {
   }
 }
 
+
 class StoreState {
   final List<StoreExtension> extensions;
   final String? selectedCategory;
@@ -132,7 +125,6 @@ class StoreState {
   final String? downloadingId;
   final String? error;
   final bool isInitialized;
-  final String registryUrl;
 
   const StoreState({
     this.extensions = const [],
@@ -143,12 +135,8 @@ class StoreState {
     this.downloadingId,
     this.error,
     this.isInitialized = false,
-    this.registryUrl = '',
   });
 
-  /// Whether a registry URL has been configured by the user.
-  bool get hasRegistryUrl => registryUrl.isNotEmpty;
-
   StoreState copyWith({
     List<StoreExtension>? extensions,
     String? selectedCategory,
@@ -161,22 +149,16 @@ class StoreState {
     String? error,
     bool clearError = false,
     bool? isInitialized,
-    String? registryUrl,
   }) {
     return StoreState(
       extensions: extensions ?? this.extensions,
-      selectedCategory: clearCategory
-          ? null
-          : (selectedCategory ?? this.selectedCategory),
+      selectedCategory: clearCategory ? null : (selectedCategory ?? this.selectedCategory),
       searchQuery: searchQuery ?? this.searchQuery,
       isLoading: isLoading ?? this.isLoading,
       isDownloading: isDownloading ?? this.isDownloading,
-      downloadingId: clearDownloadingId
-          ? null
-          : (downloadingId ?? this.downloadingId),
+      downloadingId: clearDownloadingId ? null : (downloadingId ?? this.downloadingId),
       error: clearError ? null : (error ?? this.error),
       isInitialized: isInitialized ?? this.isInitialized,
-      registryUrl: registryUrl ?? this.registryUrl,
     );
   }
 
@@ -189,16 +171,13 @@ class StoreState {
 
     if (searchQuery.isNotEmpty) {
       final query = searchQuery.toLowerCase();
-      result = result
-          .where(
-            (e) =>
-                e.name.toLowerCase().contains(query) ||
-                e.displayName.toLowerCase().contains(query) ||
-                e.description.toLowerCase().contains(query) ||
-                e.author.toLowerCase().contains(query) ||
-                e.tags.any((t) => t.toLowerCase().contains(query)),
-          )
-          .toList();
+      result = result.where((e) =>
+        e.name.toLowerCase().contains(query) ||
+        e.displayName.toLowerCase().contains(query) ||
+        e.description.toLowerCase().contains(query) ||
+        e.author.toLowerCase().contains(query) ||
+        e.tags.any((t) => t.toLowerCase().contains(query))
+      ).toList();
     }
 
     return result;
@@ -218,99 +197,24 @@ class StoreNotifier extends Notifier<StoreState> {
   Future<void> initialize(String cacheDir) async {
     if (state.isInitialized) return;
 
-    // Load saved registry URL early to avoid UI flash (empty → setup screen)
-    final prefs = await SharedPreferences.getInstance();
-    final savedUrl = prefs.getString(_registryUrlPrefKey) ?? '';
-
-    state = state.copyWith(
-      isLoading: true,
-      clearError: true,
-      registryUrl: savedUrl,
-    );
-
-    try {
-      await PlatformBridge.initExtensionStore(cacheDir);
-
-      if (savedUrl.isNotEmpty) {
-        await PlatformBridge.setStoreRegistryUrl(savedUrl);
-        await refresh();
-      }
-
-      state = state.copyWith(isInitialized: true, isLoading: false);
-      _log.i(
-        'Extension store initialized (registryUrl: ${savedUrl.isEmpty ? "not set" : savedUrl})',
-      );
-    } catch (e) {
-      _log.e('Failed to initialize store: $e');
-      state = state.copyWith(isLoading: false, error: e.toString());
-    }
-  }
-
-  /// Sets the registry URL, saves it, and refreshes the store.
-  /// The Go backend handles URL normalisation (GitHub repo → raw URL, branch detection).
-  Future<void> setRegistryUrl(String url) async {
-    final trimmed = url.trim();
-    if (trimmed.isEmpty) {
-      state = state.copyWith(error: 'Please enter a valid URL');
-      return;
-    }
-
     state = state.copyWith(isLoading: true, clearError: true);
 
     try {
-      // Go backend resolves GitHub URLs (detects default branch) and validates HTTPS.
-      await PlatformBridge.setStoreRegistryUrl(trimmed);
-
-      // Read back the resolved URL (may differ from input after normalisation).
-      final resolvedUrl = await PlatformBridge.getStoreRegistryUrl();
-
-      final prefs = await SharedPreferences.getInstance();
-      await prefs.setString(_registryUrlPrefKey, resolvedUrl);
-
-      state = state.copyWith(
-        registryUrl: resolvedUrl,
-        extensions: const [],
-      );
-
-      _log.i('Registry URL set to: $resolvedUrl');
-      await refresh(forceRefresh: true);
+      await PlatformBridge.initExtensionStore(cacheDir);
+      await refresh();
+      state = state.copyWith(isInitialized: true, isLoading: false);
+      _log.i('Extension store initialized');
     } catch (e) {
-      _log.e('Failed to set registry URL: $e');
+      _log.e('Failed to initialize store: $e');
       state = state.copyWith(isLoading: false, error: e.toString());
     }
   }
 
-  /// Removes the saved registry URL and fully detaches the repo from backend.
-  Future<void> removeRegistryUrl() async {
-    try {
-      final prefs = await SharedPreferences.getInstance();
-      await prefs.remove(_registryUrlPrefKey);
-
-      // Reset the URL in Go backend memory AND clear its cache
-      await PlatformBridge.clearStoreRegistryUrl();
-
-      state = state.copyWith(
-        registryUrl: '',
-        extensions: const [],
-        clearCategory: true,
-        searchQuery: '',
-        clearError: true,
-      );
-
-      _log.i('Registry URL removed');
-    } catch (e) {
-      _log.e('Failed to remove registry URL: $e');
-      state = state.copyWith(error: e.toString());
-    }
-  }
-
   Future<void> refresh({bool forceRefresh = false}) async {
     state = state.copyWith(isLoading: true, clearError: true);
 
     try {
-      final extensions = await PlatformBridge.getStoreExtensions(
-        forceRefresh: forceRefresh,
-      );
+      final extensions = await PlatformBridge.getStoreExtensions(forceRefresh: forceRefresh);
       state = state.copyWith(
         extensions: extensions.map((e) => StoreExtension.fromJson(e)).toList(),
         isLoading: false,
@@ -338,23 +242,12 @@ class StoreNotifier extends Notifier<StoreState> {
     state = state.copyWith(searchQuery: '', clearCategory: true);
   }
 
-  Future<bool> installExtension(
-    String extensionId,
-    String tempDir,
-    String extensionsDir,
-  ) async {
-    state = state.copyWith(
-      isDownloading: true,
-      downloadingId: extensionId,
-      clearError: true,
-    );
+  Future<bool> installExtension(String extensionId, String tempDir, String extensionsDir) async {
+    state = state.copyWith(isDownloading: true, downloadingId: extensionId, clearError: true);
 
     try {
       _log.i('Downloading extension: $extensionId');
-      final downloadPath = await PlatformBridge.downloadStoreExtension(
-        extensionId,
-        tempDir,
-      );
+      final downloadPath = await PlatformBridge.downloadStoreExtension(extensionId, tempDir);
 
       _log.i('Installing extension from: $downloadPath');
       final extNotifier = ref.read(extensionProvider.notifier);
@@ -369,28 +262,18 @@ class StoreNotifier extends Notifier<StoreState> {
       return success;
     } catch (e) {
       _log.e('Failed to install extension: $e');
-      state = state.copyWith(
-        isDownloading: false,
-        clearDownloadingId: true,
-        error: e.toString(),
-      );
+      state = state.copyWith(isDownloading: false, clearDownloadingId: true, error: e.toString());
       return false;
     }
   }
 
+
   Future<bool> updateExtension(String extensionId, String tempDir) async {
-    state = state.copyWith(
-      isDownloading: true,
-      downloadingId: extensionId,
-      clearError: true,
-    );
+    state = state.copyWith(isDownloading: true, downloadingId: extensionId, clearError: true);
 
     try {
       _log.i('Downloading update for: $extensionId');
-      final downloadPath = await PlatformBridge.downloadStoreExtension(
-        extensionId,
-        tempDir,
-      );
+      final downloadPath = await PlatformBridge.downloadStoreExtension(extensionId, tempDir);
 
       _log.i('Upgrading extension from: $downloadPath');
       final extNotifier = ref.read(extensionProvider.notifier);
@@ -405,11 +288,7 @@ class StoreNotifier extends Notifier<StoreState> {
       return success;
     } catch (e) {
       _log.e('Failed to update extension: $e');
-      state = state.copyWith(
-        isDownloading: false,
-        clearDownloadingId: true,
-        error: e.toString(),
-      );
+      state = state.copyWith(isDownloading: false, clearDownloadingId: true, error: e.toString());
       return false;
     }
   }

lib/providers/theme_provider.dart

@@ -57,6 +57,7 @@ class ThemeNotifier extends Notifier<ThemeSettings> {
     await _saveToStorage();
   }
 
+  /// Set custom seed color (used when dynamic color is disabled)
   Future<void> setSeedColor(Color color) async {
     state = state.copyWith(seedColorValue: color.toARGB32());
     await _saveToStorage();
@@ -80,3 +81,4 @@ class ThemeNotifier extends Notifier<ThemeSettings> {
     );
   }
 }
+

lib/providers/track_provider.dart

@@ -2,7 +2,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spotiflac_android/models/track.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/utils/logger.dart';
-import 'package:spotiflac_android/utils/string_utils.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/providers/extension_provider.dart';
 
@@ -18,18 +17,19 @@ class TrackState {
   final String? artistId;
   final String? artistName;
   final String? coverUrl;
-  final String? headerImageUrl;
-  final int? monthlyListeners;
-  final List<ArtistAlbum>? artistAlbums;
-  final List<Track>? artistTopTracks;
-  final List<SearchArtist>? searchArtists;
-  final List<SearchAlbum>? searchAlbums;
-  final List<SearchPlaylist>? searchPlaylists;
-  final bool hasSearchText;
-  final bool isShowingRecentAccess;
-  final String? searchExtensionId;
-  final String? selectedSearchFilter;
-  final String? searchSource;
+  final String? headerImageUrl; // Artist header image for background
+  final int? monthlyListeners; // Artist monthly listeners
+  final List<ArtistAlbum>? artistAlbums; // For artist page
+  final List<Track>? artistTopTracks; // Artist's popular tracks
+  final List<SearchArtist>? searchArtists; // For search results
+  final List<SearchAlbum>? searchAlbums; // For search results (albums)
+  final List<SearchPlaylist>? searchPlaylists; // For search results (playlists)
+  final bool hasSearchText; // For back button handling
+  final bool isShowingRecentAccess; // For recent access mode
+  final String?
+  searchExtensionId; // Extension ID used for current search results
+  final String?
+  selectedSearchFilter; // Currently selected search filter (e.g., "track", "album", "artist", "playlist")
 
   const TrackState({
     this.tracks = const [],
@@ -52,7 +52,6 @@ class TrackState {
     this.isShowingRecentAccess = false,
     this.searchExtensionId,
     this.selectedSearchFilter,
-    this.searchSource,
   });
 
   bool get hasContent =>
@@ -84,8 +83,6 @@ class TrackState {
     String? searchExtensionId,
     String? selectedSearchFilter,
     bool clearSelectedSearchFilter = false,
-    String? searchSource,
-    bool clearSearchSource = false,
   }) {
     return TrackState(
       tracks: tracks ?? this.tracks,
@@ -111,9 +108,6 @@ class TrackState {
       selectedSearchFilter: clearSelectedSearchFilter
           ? null
           : (selectedSearchFilter ?? this.selectedSearchFilter),
-      searchSource: clearSearchSource
-          ? null
-          : (searchSource ?? this.searchSource),
     );
   }
 }
@@ -124,9 +118,9 @@ class ArtistAlbum {
   final String releaseDate;
   final int totalTracks;
   final String? coverUrl;
-  final String albumType;
+  final String albumType; // album, single, compilation
   final String artists;
-  final String? providerId;
+  final String? providerId; // Extension ID if from extension
 
   const ArtistAlbum({
     required this.id,
@@ -201,6 +195,7 @@ class TrackNotifier extends Notifier<TrackState> {
     return const TrackState();
   }
 
+  /// Check if request is still valid (not cancelled by newer request)
   bool _isRequestValid(int requestId) => requestId == _currentRequestId;
 
   Future<void> fetchFromUrl(String url, {bool useDeezerFallback = true}) async {
@@ -213,6 +208,7 @@ class TrackNotifier extends Notifier<TrackState> {
       if (extensionHandler != null) {
         _log.i('Found extension URL handler: $extensionHandler for URL: $url');
 
+        // Retry logic for extension URL handlers (up to 3 attempts)
         Map<String, dynamic>? result;
         for (int attempt = 1; attempt <= 3; attempt++) {
           result = await PlatformBridge.handleURLWithExtension(url);
@@ -282,9 +278,7 @@ class TrackNotifier extends Notifier<TrackState> {
               playlistName: type == 'playlist'
                   ? result['name'] as String?
                   : null,
-              coverUrl: normalizeCoverReference(
-                result['cover_url']?.toString(),
-              ),
+              coverUrl: result['cover_url'] as String?,
               searchExtensionId: extensionId,
             );
             return;
@@ -311,12 +305,10 @@ class TrackNotifier extends Notifier<TrackState> {
               isLoading: false,
               artistId: artistData['id'] as String?,
               artistName: artistData['name'] as String?,
-              coverUrl: normalizeRemoteHttpUrl(
-                (artistData['image_url'] ?? artistData['images'])?.toString(),
-              ),
-              headerImageUrl: normalizeRemoteHttpUrl(
-                artistData['header_image']?.toString(),
-              ),
+              coverUrl:
+                  artistData['image_url'] as String? ??
+                  artistData['images'] as String?,
+              headerImageUrl: artistData['header_image'] as String?,
               monthlyListeners: artistData['listeners'] as int?,
               artistAlbums: albums,
               artistTopTracks: topTracks.isNotEmpty ? topTracks : null,
@@ -357,7 +349,7 @@ class TrackNotifier extends Notifier<TrackState> {
             isLoading: false,
             albumId: id,
             albumName: albumInfo['name'] as String?,
-            coverUrl: normalizeRemoteHttpUrl(albumInfo['images']?.toString()),
+            coverUrl: albumInfo['images'] as String?,
           );
           _preWarmCacheForTracks(tracks);
         } else if (type == 'playlist') {
@@ -371,9 +363,7 @@ class TrackNotifier extends Notifier<TrackState> {
             tracks: tracks,
             isLoading: false,
             playlistName: playlistInfo['name'] as String?,
-            coverUrl: normalizeRemoteHttpUrl(
-              playlistInfo['images']?.toString(),
-            ),
+            coverUrl: playlistInfo['images'] as String?,
           );
           _preWarmCacheForTracks(tracks);
         } else if (type == 'artist') {
@@ -387,78 +377,7 @@ class TrackNotifier extends Notifier<TrackState> {
             isLoading: false,
             artistId: artistInfo['id'] as String?,
             artistName: artistInfo['name'] as String?,
-            coverUrl: normalizeRemoteHttpUrl(artistInfo['images']?.toString()),
-            artistAlbums: albums,
-          );
-        }
-        return;
-      }
-
-      if (url.contains('qobuz.com') || url.startsWith('qobuzapp://')) {
-        _log.i('Detected Qobuz URL, parsing...');
-        final parsed = await PlatformBridge.parseQobuzUrl(url);
-        if (!_isRequestValid(requestId)) return;
-
-        final type = parsed['type'] as String;
-        final id = parsed['id'] as String;
-
-        final metadata = await PlatformBridge.getQobuzMetadata(type, id);
-        if (!_isRequestValid(requestId)) return;
-
-        if (type == 'track') {
-          final trackData = metadata['track'] as Map<String, dynamic>;
-          final track = _parseTrack(trackData);
-          state = TrackState(
-            tracks: [track],
-            isLoading: false,
-            coverUrl: track.coverUrl,
-          );
-        } else if (type == 'album') {
-          final albumInfo = metadata['album_info'] as Map<String, dynamic>;
-          final trackList = metadata['track_list'] as List<dynamic>;
-          final tracks = trackList
-              .map((t) => _parseTrack(t as Map<String, dynamic>))
-              .toList();
-          state = TrackState(
-            tracks: tracks,
-            isLoading: false,
-            albumId: 'qobuz:$id',
-            albumName: albumInfo['name'] as String?,
-            coverUrl: normalizeRemoteHttpUrl(albumInfo['images']?.toString()),
-          );
-          _preWarmCacheForTracks(tracks);
-        } else if (type == 'playlist') {
-          final playlistInfo =
-              metadata['playlist_info'] as Map<String, dynamic>;
-          final trackList = metadata['track_list'] as List<dynamic>;
-          final tracks = trackList
-              .map((t) => _parseTrack(t as Map<String, dynamic>))
-              .toList();
-          final owner = playlistInfo['owner'] as Map<String, dynamic>?;
-          final playlistName =
-              (playlistInfo['name'] ?? owner?['name']) as String?;
-          final coverUrl = normalizeRemoteHttpUrl(
-            (playlistInfo['images'] ?? owner?['images'])?.toString(),
-          );
-          state = TrackState(
-            tracks: tracks,
-            isLoading: false,
-            playlistName: playlistName,
-            coverUrl: coverUrl,
-          );
-          _preWarmCacheForTracks(tracks);
-        } else if (type == 'artist') {
-          final artistInfo = metadata['artist_info'] as Map<String, dynamic>;
-          final albumsList = metadata['albums'] as List<dynamic>;
-          final albums = albumsList
-              .map((a) => _parseArtistAlbum(a as Map<String, dynamic>))
-              .toList();
-          state = TrackState(
-            tracks: [],
-            isLoading: false,
-            artistId: artistInfo['id'] as String?,
-            artistName: artistInfo['name'] as String?,
-            coverUrl: normalizeRemoteHttpUrl(artistInfo['images']?.toString()),
+            coverUrl: artistInfo['images'] as String?,
             artistAlbums: albums,
           );
         }
@@ -473,69 +392,72 @@ class TrackNotifier extends Notifier<TrackState> {
         final type = parsed['type'] as String;
         final id = parsed['id'] as String;
 
-        final metadata = await PlatformBridge.getTidalMetadata(type, id);
-        if (!_isRequestValid(requestId)) return;
+        _log.i('Tidal URL parsed: type=$type, id=$id');
 
+        // For track URLs, convert to Spotify/Deezer and fetch metadata from there
         if (type == 'track') {
-          final trackData = metadata['track'] as Map<String, dynamic>;
-          final track = _parseTrack(trackData);
-          state = TrackState(
-            tracks: [track],
-            isLoading: false,
-            coverUrl: track.coverUrl,
-          );
-        } else if (type == 'album') {
-          final albumInfo = metadata['album_info'] as Map<String, dynamic>;
-          final trackList = metadata['track_list'] as List<dynamic>;
-          final tracks = trackList
-              .map((t) => _parseTrack(t as Map<String, dynamic>))
-              .toList();
-          state = TrackState(
-            tracks: tracks,
-            isLoading: false,
-            albumId: 'tidal:$id',
-            albumName: albumInfo['name'] as String?,
-            coverUrl: normalizeRemoteHttpUrl(albumInfo['images']?.toString()),
-          );
-          _preWarmCacheForTracks(tracks);
-        } else if (type == 'playlist') {
-          final playlistInfo =
-              metadata['playlist_info'] as Map<String, dynamic>;
-          final trackList = metadata['track_list'] as List<dynamic>;
-          final tracks = trackList
-              .map((t) => _parseTrack(t as Map<String, dynamic>))
-              .toList();
-          final owner = playlistInfo['owner'] as Map<String, dynamic>?;
-          final playlistName =
-              (playlistInfo['name'] ?? owner?['name']) as String?;
-          final coverUrl = normalizeRemoteHttpUrl(
-            (playlistInfo['images'] ?? owner?['images'])?.toString(),
-          );
-          state = TrackState(
-            tracks: tracks,
-            isLoading: false,
-            playlistName: playlistName,
-            coverUrl: coverUrl,
-          );
-          _preWarmCacheForTracks(tracks);
-        } else if (type == 'artist') {
-          final artistInfo = metadata['artist_info'] as Map<String, dynamic>;
-          final albumsList = metadata['albums'] as List<dynamic>;
-          final albums = albumsList
-              .map((a) => _parseArtistAlbum(a as Map<String, dynamic>))
-              .toList();
-          state = TrackState(
-            tracks: [],
-            isLoading: false,
-            artistId: artistInfo['id'] as String?,
-            artistName: artistInfo['name'] as String?,
-            coverUrl: normalizeRemoteHttpUrl(artistInfo['images']?.toString()),
-            artistAlbums: albums,
-          );
+          try {
+            _log.i('Converting Tidal track to Spotify/Deezer via SongLink...');
+            final conversion = await PlatformBridge.convertTidalToSpotifyDeezer(
+              url,
+            );
+            if (!_isRequestValid(requestId)) return;
+
+            final spotifyUrl = conversion['spotify_url'] as String?;
+            final deezerUrl = conversion['deezer_url'] as String?;
+
+            if (spotifyUrl != null && spotifyUrl.isNotEmpty) {
+              _log.i('Found Spotify URL: $spotifyUrl, fetching metadata...');
+              final metadata =
+                  await PlatformBridge.getSpotifyMetadataWithFallback(
+                    spotifyUrl,
+                  );
+              if (!_isRequestValid(requestId)) return;
+
+              final trackData = metadata['track'] as Map<String, dynamic>;
+              final track = _parseTrack(trackData);
+              state = TrackState(
+                tracks: [track],
+                isLoading: false,
+                coverUrl: track.coverUrl,
+              );
+              return;
+            } else if (deezerUrl != null && deezerUrl.isNotEmpty) {
+              _log.i('Found Deezer URL: $deezerUrl, fetching metadata...');
+              final deezerParsed = await PlatformBridge.parseDeezerUrl(
+                deezerUrl,
+              );
+              final metadata = await PlatformBridge.getDeezerMetadata(
+                'track',
+                deezerParsed['id'] as String,
+              );
+              if (!_isRequestValid(requestId)) return;
+
+              final trackData = metadata['track'] as Map<String, dynamic>;
+              final track = _parseTrack(trackData);
+              state = TrackState(
+                tracks: [track],
+                isLoading: false,
+                coverUrl: track.coverUrl,
+              );
+              return;
+            }
+          } catch (e) {
+            _log.w('Failed to convert Tidal URL via SongLink: $e');
+          }
         }
+
+        // For album/artist/playlist, not yet supported
+        state = TrackState(
+          isLoading: false,
+          error:
+              'Tidal $type links are not fully supported yet. Only track links work via SongLink conversion.',
+          hasSearchText: state.hasSearchText,
+        );
         return;
       }
 
+      // If URL doesn't match any known service, it's unrecognized
       final isSpotifyUrl =
           url.contains('open.spotify.com') ||
           url.contains('spotify.link') ||
@@ -583,7 +505,7 @@ class TrackNotifier extends Notifier<TrackState> {
           isLoading: false,
           albumId: parsed['id'] as String?,
           albumName: albumInfo['name'] as String?,
-          coverUrl: normalizeRemoteHttpUrl(albumInfo['images']?.toString()),
+          coverUrl: albumInfo['images'] as String?,
         );
         _preWarmCacheForTracks(tracks);
       } else if (type == 'playlist') {
@@ -593,16 +515,11 @@ class TrackNotifier extends Notifier<TrackState> {
             .map((t) => _parseTrack(t as Map<String, dynamic>))
             .toList();
         final owner = playlistInfo['owner'] as Map<String, dynamic>?;
-        final playlistName =
-            (playlistInfo['name'] ?? owner?['name']) as String?;
-        final coverUrl = normalizeRemoteHttpUrl(
-          (playlistInfo['images'] ?? owner?['images'])?.toString(),
-        );
         state = TrackState(
           tracks: tracks,
           isLoading: false,
-          playlistName: playlistName,
-          coverUrl: coverUrl,
+          playlistName: owner?['name'] as String?,
+          coverUrl: owner?['images'] as String?,
         );
         _preWarmCacheForTracks(tracks);
       } else if (type == 'artist') {
@@ -616,7 +533,7 @@ class TrackNotifier extends Notifier<TrackState> {
           isLoading: false,
           artistId: artistInfo['id'] as String?,
           artistName: artistInfo['name'] as String?,
-          coverUrl: normalizeRemoteHttpUrl(artistInfo['images']?.toString()),
+          coverUrl: artistInfo['images'] as String?,
           artistAlbums: albums,
         );
       }
@@ -630,13 +547,10 @@ class TrackNotifier extends Notifier<TrackState> {
     }
   }
 
-  Future<void> search(
-    String query, {
-    String? filterOverride,
-    String? builtInSearchProvider,
-  }) async {
+  Future<void> search(String query, {String? filterOverride}) async {
     final requestId = ++_currentRequestId;
 
+    // Preserve selected filter during loading
     final currentFilter = filterOverride ?? state.selectedSearchFilter;
 
     state = TrackState(
@@ -652,68 +566,52 @@ class TrackNotifier extends Notifier<TrackState> {
       final hasActiveMetadataExtensions = extensionState.extensions.any(
         (e) => e.enabled && e.hasMetadataProvider,
       );
-      final includeExtensions =
-          settings.useExtensionProviders && hasActiveMetadataExtensions;
+      final searchProvider = settings.searchProvider;
+      final useExtensions =
+          settings.useExtensionProviders &&
+          hasActiveMetadataExtensions &&
+          searchProvider != null &&
+          searchProvider.isNotEmpty;
 
-      final effectiveProvider = builtInSearchProvider ?? 'deezer';
+      const source = 'deezer';
 
       _log.i(
-        'Search started: provider=$effectiveProvider, query="$query", includeExtensions=$includeExtensions, filter=$currentFilter',
+        'Search started: source=$source, query="$query", useExtensions=$useExtensions, filter=$currentFilter',
       );
 
       Map<String, dynamic> results;
-      List<Map<String, dynamic>> metadataTrackResults = [];
+      List<Track> extensionTracks = [];
 
-      if (effectiveProvider == 'deezer') {
+      if (useExtensions) {
         try {
-          _log.d('Calling metadata provider search API...');
-          metadataTrackResults =
-              await PlatformBridge.searchTracksWithMetadataProviders(
-                query,
-                limit: 20,
-                includeExtensions: includeExtensions,
-              );
-          _log.i(
-            'Metadata providers returned ${metadataTrackResults.length} tracks',
+          _log.d('Calling extension search API...');
+          final extResults = await PlatformBridge.searchTracksWithExtensions(
+            query,
+            limit: 20,
           );
+          _log.i('Extensions returned ${extResults.length} tracks');
+
+          for (final t in extResults) {
+            try {
+              extensionTracks.add(_parseSearchTrack(t));
+            } catch (e) {
+              _log.e('Failed to parse extension track: $e', e);
+            }
+          }
         } catch (e) {
-          _log.w(
-            'Metadata provider search failed, falling back to Deezer tracks: $e',
-          );
+          _log.w('Extension search failed, falling back to Deezer: $e');
         }
       }
 
-      switch (effectiveProvider) {
-        case 'tidal':
-          _log.d('Calling Tidal search API...');
-          results = await PlatformBridge.searchTidalAll(
-            query,
-            trackLimit: 20,
-            artistLimit: 2,
-            filter: currentFilter,
-          );
-          break;
-        case 'qobuz':
-          _log.d('Calling Qobuz search API...');
-          results = await PlatformBridge.searchQobuzAll(
-            query,
-            trackLimit: 20,
-            artistLimit: 2,
-            filter: currentFilter,
-          );
-          break;
-        default:
-          _log.d('Calling Deezer search API...');
-          results = await PlatformBridge.searchDeezerAll(
-            query,
-            trackLimit: 20,
-            artistLimit: 2,
-            filter: currentFilter,
-          );
-          break;
-      }
+      _log.d('Calling Deezer search API...');
+      results = await PlatformBridge.searchDeezerAll(
+        query,
+        trackLimit: 20,
+        artistLimit: 2,
+        filter: currentFilter,
+      );
       _log.i(
-        '$effectiveProvider returned ${(results['tracks'] as List?)?.length ?? 0} tracks, ${(results['artists'] as List?)?.length ?? 0} artists, ${(results['albums'] as List?)?.length ?? 0} albums',
+        'Deezer returned ${(results['tracks'] as List?)?.length ?? 0} tracks, ${(results['artists'] as List?)?.length ?? 0} artists, ${(results['albums'] as List?)?.length ?? 0} albums',
       );
 
       if (!_isRequestValid(requestId)) {
@@ -724,20 +622,32 @@ class TrackNotifier extends Notifier<TrackState> {
       final trackList = results['tracks'] as List<dynamic>? ?? [];
       final artistList = results['artists'] as List<dynamic>? ?? [];
       final albumList = results['albums'] as List<dynamic>? ?? [];
-      final trackSearchResults = metadataTrackResults.isNotEmpty
-          ? metadataTrackResults
-          : trackList.whereType<Map<String, dynamic>>().toList();
 
       _log.d(
-        'Raw results: ${trackSearchResults.length} tracks, ${artistList.length} artists, ${albumList.length} albums',
+        'Raw results: ${trackList.length} tracks, ${artistList.length} artists, ${albumList.length} albums',
       );
 
       final tracks = <Track>[];
 
-      for (int i = 0; i < trackSearchResults.length; i++) {
-        final t = trackSearchResults[i];
+      tracks.addAll(extensionTracks);
+
+      final existingIsrcs = extensionTracks
+          .where((t) => t.isrc != null && t.isrc!.isNotEmpty)
+          .map((t) => t.isrc!)
+          .toSet();
+
+      for (int i = 0; i < trackList.length; i++) {
+        final t = trackList[i];
         try {
-          tracks.add(_parseSearchTrack(t));
+          if (t is Map<String, dynamic>) {
+            final track = _parseSearchTrack(t);
+            if (track.isrc != null && existingIsrcs.contains(track.isrc)) {
+              continue;
+            }
+            tracks.add(track);
+          } else {
+            _log.w('Track[$i] is not a Map: ${t.runtimeType}');
+          }
         } catch (e) {
           _log.e('Failed to parse track[$i]: $e', e);
         }
@@ -787,7 +697,7 @@ class TrackNotifier extends Notifier<TrackState> {
       }
 
       _log.i(
-        'Search complete: ${tracks.length} tracks, ${artists.length} artists, ${albums.length} albums, ${playlists.length} playlists parsed successfully',
+        'Search complete: ${tracks.length} tracks (${extensionTracks.length} from extensions), ${artists.length} artists, ${albums.length} albums, ${playlists.length} playlists parsed successfully',
       );
 
       state = TrackState(
@@ -798,8 +708,7 @@ class TrackNotifier extends Notifier<TrackState> {
         isLoading: false,
         hasSearchText: state.hasSearchText,
         isShowingRecentAccess: state.isShowingRecentAccess,
-        selectedSearchFilter: currentFilter,
-        searchSource: effectiveProvider,
+        selectedSearchFilter: currentFilter, // Preserve filter in results
       );
     } catch (e, stackTrace) {
       if (!_isRequestValid(requestId)) return;
@@ -826,7 +735,7 @@ class TrackNotifier extends Notifier<TrackState> {
       hasSearchText: state.hasSearchText,
       isShowingRecentAccess: state.isShowingRecentAccess,
       selectedSearchFilter:
-          state.selectedSearchFilter,
+          state.selectedSearchFilter, // Preserve filter during loading
     );
 
     try {
@@ -865,8 +774,9 @@ class TrackNotifier extends Notifier<TrackState> {
         isLoading: false,
         hasSearchText: state.hasSearchText,
         isShowingRecentAccess: state.isShowingRecentAccess,
-        searchExtensionId: extensionId,
-        selectedSearchFilter: state.selectedSearchFilter,
+        searchExtensionId: extensionId, // Store which extension was used
+        selectedSearchFilter:
+            state.selectedSearchFilter, // Preserve selected filter
       );
     } catch (e, stackTrace) {
       if (!_isRequestValid(requestId)) return;
@@ -922,6 +832,7 @@ class TrackNotifier extends Notifier<TrackState> {
       tracks[index] = updatedTrack;
       state = state.copyWith(tracks: tracks);
     } catch (_) {
+      // Silently ignore update failures - track may have been removed
     }
   }
 
@@ -929,6 +840,7 @@ class TrackNotifier extends Notifier<TrackState> {
     state = const TrackState();
   }
 
+  /// Set selected search filter for extension search
   void setSearchFilter(String? filter) {
     if (state.selectedSearchFilter == filter) return;
     state = state.copyWith(
@@ -937,6 +849,7 @@ class TrackNotifier extends Notifier<TrackState> {
     );
   }
 
+  /// Set search text state for back button handling
   void setSearchText(bool hasText) {
     if (state.hasSearchText == hasText) {
       return;
@@ -951,6 +864,7 @@ class TrackNotifier extends Notifier<TrackState> {
     state = state.copyWith(isShowingRecentAccess: showing);
   }
 
+  /// Set tracks from a collection (album/playlist) opened from search results
   void setTracksFromCollection({
     required List<Track> tracks,
     String? albumName,
@@ -970,17 +884,15 @@ class TrackNotifier extends Notifier<TrackState> {
 
   Track _parseTrack(Map<String, dynamic> data) {
     final durationMs = _extractDurationMs(data);
-    final spotifyId = (data['spotify_id'] ?? '').toString();
-    final nativeId = (data['id'] ?? '').toString();
     return Track(
-      id: spotifyId.isNotEmpty ? spotifyId : nativeId,
+      id: data['spotify_id'] as String? ?? '',
       name: data['name'] as String? ?? '',
       artistName: data['artists'] as String? ?? '',
       albumName: data['album_name'] as String? ?? '',
       albumArtist: data['album_artist'] as String?,
       artistId: (data['artist_id'] ?? data['artistId'])?.toString(),
       albumId: data['album_id']?.toString(),
-      coverUrl: normalizeCoverReference(data['images']?.toString()),
+      coverUrl: data['images'] as String?,
       isrc: data['isrc'] as String?,
       duration: (durationMs / 1000).round(),
       trackNumber: data['track_number'] as int?,
@@ -995,32 +907,26 @@ class TrackNotifier extends Notifier<TrackState> {
     final durationMs = _extractDurationMs(data);
 
     final itemType = data['item_type']?.toString();
-    final effectiveSource =
-        source ?? data['source']?.toString() ?? data['provider_id']?.toString();
-    final spotifyId = (data['spotify_id'] ?? '').toString();
-    final nativeId = (data['id'] ?? '').toString();
-    final preferredId = effectiveSource != null && effectiveSource.isNotEmpty
-        ? (nativeId.isNotEmpty ? nativeId : spotifyId)
-        : (spotifyId.isNotEmpty ? spotifyId : nativeId);
 
     return Track(
-      id: preferredId,
+      id: (data['spotify_id'] ?? data['id'] ?? '').toString(),
       name: (data['name'] ?? '').toString(),
       artistName: (data['artists'] ?? data['artist'] ?? '').toString(),
       albumName: (data['album_name'] ?? data['album'] ?? '').toString(),
       albumArtist: data['album_artist']?.toString(),
       artistId: (data['artist_id'] ?? data['artistId'])?.toString(),
       albumId: data['album_id']?.toString(),
-      coverUrl: normalizeCoverReference(
-        (data['cover_url'] ?? data['images'])?.toString(),
-      ),
+      coverUrl: (data['cover_url'] ?? data['images'])?.toString(),
       isrc: data['isrc']?.toString(),
       duration: (durationMs / 1000).round(),
       trackNumber: data['track_number'] as int?,
       discNumber: data['disc_number'] as int?,
       releaseDate: data['release_date']?.toString(),
       totalTracks: data['total_tracks'] as int?,
-      source: effectiveSource,
+      source:
+          source ??
+          data['source']?.toString() ??
+          data['provider_id']?.toString(),
       albumType: data['album_type']?.toString(),
       itemType: itemType,
     );
@@ -1058,9 +964,7 @@ class TrackNotifier extends Notifier<TrackState> {
       name: data['name'] as String? ?? '',
       releaseDate: data['release_date'] as String? ?? '',
       totalTracks: data['total_tracks'] as int? ?? 0,
-      coverUrl: normalizeCoverReference(
-        (data['cover_url'] ?? data['images'])?.toString(),
-      ),
+      coverUrl: (data['cover_url'] ?? data['images'])?.toString(),
       albumType: data['album_type'] as String? ?? 'album',
       artists: data['artists'] as String? ?? '',
       providerId: data['provider_id']?.toString(),
@@ -1071,7 +975,7 @@ class TrackNotifier extends Notifier<TrackState> {
     return SearchArtist(
       id: data['id'] as String? ?? '',
       name: data['name'] as String? ?? '',
-      imageUrl: normalizeRemoteHttpUrl(data['images']?.toString()),
+      imageUrl: data['images'] as String?,
       followers: data['followers'] as int? ?? 0,
       popularity: data['popularity'] as int? ?? 0,
     );
@@ -1082,7 +986,7 @@ class TrackNotifier extends Notifier<TrackState> {
       id: data['id'] as String? ?? '',
       name: data['name'] as String? ?? '',
       artists: data['artists'] as String? ?? '',
-      imageUrl: normalizeRemoteHttpUrl(data['images']?.toString()),
+      imageUrl: data['images'] as String?,
       releaseDate: data['release_date'] as String?,
       totalTracks: data['total_tracks'] as int? ?? 0,
       albumType: data['album_type'] as String? ?? 'album',
@@ -1094,7 +998,7 @@ class TrackNotifier extends Notifier<TrackState> {
       id: data['id'] as String? ?? '',
       name: data['name'] as String? ?? '',
       owner: data['owner'] as String? ?? '',
-      imageUrl: normalizeRemoteHttpUrl(data['images']?.toString()),
+      imageUrl: data['images'] as String?,
       totalTracks: data['total_tracks'] as int? ?? 0,
     );
   }
@@ -1111,7 +1015,7 @@ class TrackNotifier extends Notifier<TrackState> {
         'isrc': isrc,
         'track_name': track.name,
         'artist_name': track.artistName,
-        'spotify_id': track.id,
+        'spotify_id': track.id, // Include Spotify ID for Amazon lookup
         'service': 'tidal',
       });
       if (cacheRequests.length >= _maxPreWarmTracksPerRequest) {

lib/screens/album_screen.dart

@@ -11,10 +11,8 @@ import 'package:spotiflac_android/providers/local_library_provider.dart';
 import 'package:spotiflac_android/providers/playback_provider.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/utils/file_access.dart';
-import 'package:spotiflac_android/utils/string_utils.dart';
 import 'package:spotiflac_android/widgets/track_collection_quick_actions.dart';
 import 'package:spotiflac_android/widgets/download_service_picker.dart';
-import 'package:spotiflac_android/widgets/animation_utils.dart';
 import 'package:spotiflac_android/providers/library_collections_provider.dart';
 import 'package:spotiflac_android/widgets/playlist_picker_sheet.dart';
 import 'package:spotiflac_android/utils/clickable_metadata.dart';
@@ -83,23 +81,16 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
     _scrollController.addListener(_onScroll);
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
+      // Use extensionId if available, otherwise detect from albumId prefix
       final providerId =
           widget.extensionId ??
-          (() {
-            if (widget.albumId.startsWith('deezer:')) return 'deezer';
-            if (widget.albumId.startsWith('qobuz:')) return 'qobuz';
-            if (widget.albumId.startsWith('tidal:')) return 'tidal';
-            return 'spotify';
-          })();
+          (widget.albumId.startsWith('deezer:') ? 'deezer' : 'spotify');
       ref
           .read(recentAccessProvider.notifier)
           .recordAlbumAccess(
             id: widget.albumId,
             name: widget.albumName,
-            artistName:
-                widget.artistName ??
-                widget.tracks?.firstOrNull?.albumArtist ??
-                widget.tracks?.firstOrNull?.artistName,
+            artistName: widget.tracks?.firstOrNull?.artistName,
             imageUrl: widget.coverUrl,
             providerId: providerId,
           );
@@ -138,7 +129,9 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
     return (mediaSize.height * 0.55).clamp(360.0, 520.0);
   }
 
-  /// Upgrade cover URL to a higher resolution for full-screen display.
+  /// Upgrade cover URL to a reasonable resolution for full-screen display.
+  /// Spotify CDN only has 300, 640, ~2000 — we stay at 640 (no intermediate).
+  /// Deezer CDN: upgrade to 1000x1000 (available: 56, 250, 500, 1000, 1400, 1800).
   String? _highResCoverUrl(String? url) {
     if (url == null) return null;
     // Spotify CDN: upgrade 300 → 640 only (no intermediate between 640 and 2000)
@@ -182,12 +175,6 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
           'album',
           deezerAlbumId,
         );
-      } else if (widget.albumId.startsWith('qobuz:')) {
-        final qobuzAlbumId = widget.albumId.replaceFirst('qobuz:', '');
-        metadata = await PlatformBridge.getQobuzMetadata('album', qobuzAlbumId);
-      } else if (widget.albumId.startsWith('tidal:')) {
-        final tidalAlbumId = widget.albumId.replaceFirst('tidal:', '');
-        metadata = await PlatformBridge.getTidalMetadata('album', tidalAlbumId);
       } else {
         final url = 'https://open.spotify.com/album/${widget.albumId}';
         metadata = await PlatformBridge.getSpotifyMetadataWithFallback(url);
@@ -231,7 +218,7 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
       artistId:
           (data['artist_id'] ?? data['artistId'])?.toString() ?? _artistId,
       albumId: data['album_id']?.toString() ?? widget.albumId,
-      coverUrl: normalizeCoverReference(data['images']?.toString()),
+      coverUrl: data['images'] as String?,
       isrc: data['isrc'] as String?,
       duration: ((data['duration_ms'] as int? ?? 0) / 1000).round(),
       trackNumber: data['track_number'] as int?,
@@ -242,16 +229,6 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
     );
   }
 
-  String? _recommendedDownloadService() {
-    if (widget.extensionId != null && widget.extensionId!.isNotEmpty) {
-      return widget.extensionId;
-    }
-    if (widget.albumId.startsWith('tidal:')) return 'tidal';
-    if (widget.albumId.startsWith('qobuz:')) return 'qobuz';
-    if (widget.albumId.startsWith('deezer:')) return 'deezer';
-    return null;
-  }
-
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
@@ -268,8 +245,8 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
           if (_isLoading)
             const SliverToBoxAdapter(
               child: Padding(
-                padding: EdgeInsets.all(16),
-                child: AlbumTrackListSkeleton(itemCount: 10),
+                padding: EdgeInsets.all(32),
+                child: Center(child: CircularProgressIndicator()),
               ),
             ),
           if (_error != null)
@@ -295,11 +272,7 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
   ) {
     final expandedHeight = _calculateExpandedHeight(context);
     final tracks = _tracks ?? [];
-    final artistName =
-        widget.artistName ??
-        (tracks.isNotEmpty
-            ? (tracks.first.albumArtist ?? tracks.first.artistName)
-            : null);
+    final artistName = tracks.isNotEmpty ? tracks.first.artistName : null;
     final releaseDate = tracks.isNotEmpty ? tracks.first.releaseDate : null;
 
     return SliverAppBar(
@@ -532,6 +505,7 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
   }
 
   Widget _buildInfoCard(BuildContext context, ColorScheme colorScheme) {
+    // Info is now displayed in the full-screen cover overlay
     return const SliverToBoxAdapter(child: SizedBox.shrink());
   }
 
@@ -545,12 +519,9 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
         final track = tracks[index];
         return KeyedSubtree(
           key: ValueKey(track.id),
-          child: StaggeredListItem(
-            index: index,
-            child: _AlbumTrackItem(
-              track: track,
-              onDownload: () => _downloadTrack(context, track),
-            ),
+          child: _AlbumTrackItem(
+            track: track,
+            onDownload: () => _downloadTrack(context, track),
           ),
         );
       }, childCount: tracks.length),
@@ -565,7 +536,6 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
         trackName: track.name,
         artistName: track.artistName,
         coverUrl: track.coverUrl,
-        recommendedService: _recommendedDownloadService(),
         onSelect: (quality, service) {
           ref
               .read(downloadQueueProvider.notifier)
@@ -590,82 +560,37 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
   void _downloadAll(BuildContext context) {
     final tracks = _tracks;
     if (tracks == null || tracks.isEmpty) return;
-
-    final historyState = ref.read(downloadHistoryProvider);
     final settings = ref.read(settingsProvider);
-    final localLibState =
-        (settings.localLibraryEnabled && settings.localLibraryShowDuplicates)
-        ? ref.read(localLibraryProvider)
-        : null;
-    final tracksToQueue = <Track>[];
-    int skippedCount = 0;
-
-    for (final track in tracks) {
-      final isInHistory =
-          historyState.isDownloaded(track.id) ||
-          (track.isrc != null && historyState.getByIsrc(track.isrc!) != null) ||
-          historyState.findByTrackAndArtist(track.name, track.artistName) !=
-              null;
-      final isInLocal =
-          localLibState?.existsInLibrary(
-            isrc: track.isrc,
-            trackName: track.name,
-            artistName: track.artistName,
-          ) ??
-          false;
-
-      if (isInHistory || isInLocal) {
-        skippedCount++;
-      } else {
-        tracksToQueue.add(track);
-      }
-    }
-
-    if (tracksToQueue.isEmpty) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(
-            context.l10n.discographySkippedDownloaded(0, skippedCount),
-          ),
-        ),
-      );
-      return;
-    }
-
     if (settings.askQualityBeforeDownload) {
       DownloadServicePicker.show(
         context,
-        trackName: '${tracksToQueue.length} tracks',
+        trackName: '${tracks.length} tracks',
         artistName: widget.albumName,
-        recommendedService: _recommendedDownloadService(),
         onSelect: (quality, service) {
           ref
               .read(downloadQueueProvider.notifier)
-              .addMultipleToQueue(
-                tracksToQueue,
-                service,
-                qualityOverride: quality,
-              );
-          _showQueuedSnackbar(context, tracksToQueue.length, skippedCount);
+              .addMultipleToQueue(tracks, service, qualityOverride: quality);
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(
+                context.l10n.snackbarAddedTracksToQueue(tracks.length),
+              ),
+            ),
+          );
         },
       );
     } else {
       ref
           .read(downloadQueueProvider.notifier)
-          .addMultipleToQueue(tracksToQueue, settings.defaultService);
-      _showQueuedSnackbar(context, tracksToQueue.length, skippedCount);
+          .addMultipleToQueue(tracks, settings.defaultService);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(context.l10n.snackbarAddedTracksToQueue(tracks.length)),
+        ),
+      );
     }
   }
 
-  void _showQueuedSnackbar(BuildContext context, int added, int skipped) {
-    final message = skipped > 0
-        ? context.l10n.discographySkippedDownloaded(added, skipped)
-        : context.l10n.snackbarAddedTracksToQueue(added);
-    ScaffoldMessenger.of(
-      context,
-    ).showSnackBar(SnackBar(content: Text(message)));
-  }
-
   Widget _buildLoveAllButton() {
     final collectionsState = ref.watch(libraryCollectionsProvider);
     final tracks = _tracks;
@@ -694,9 +619,7 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
           size: 22,
           color: allLoved ? Colors.redAccent : Colors.white,
         ),
-        tooltip: allLoved
-            ? context.l10n.trackOptionRemoveFromLoved
-            : context.l10n.tooltipLoveAll,
+        tooltip: allLoved ? 'Remove from Loved' : 'Love All',
         padding: EdgeInsets.zero,
       ),
     );
@@ -719,7 +642,7 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
             ? null
             : () => showAddTracksToPlaylistSheet(context, ref, _tracks!),
         icon: const Icon(Icons.add, size: 22, color: Colors.white),
-        tooltip: context.l10n.tooltipAddToPlaylist,
+        tooltip: 'Add to Playlist',
         padding: EdgeInsets.zero,
       ),
     );
@@ -737,11 +660,7 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
       }
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(
-              context.l10n.snackbarRemovedTracksFromLoved(tracks.length),
-            ),
-          ),
+          SnackBar(content: Text('Removed ${tracks.length} tracks from Loved')),
         );
       }
     } else {
@@ -754,9 +673,7 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
       }
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(context.l10n.snackbarAddedTracksToLoved(addedCount)),
-          ),
+          SnackBar(content: Text('Added $addedCount tracks to Loved')),
         );
       }
     }

lib/screens/artist_screen.dart

@@ -14,13 +14,11 @@ import 'package:spotiflac_android/providers/local_library_provider.dart';
 import 'package:spotiflac_android/providers/playback_provider.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/utils/file_access.dart';
-import 'package:spotiflac_android/utils/string_utils.dart';
 import 'package:spotiflac_android/screens/album_screen.dart';
 import 'package:spotiflac_android/screens/home_tab.dart'
     show ExtensionAlbumScreen;
 import 'package:spotiflac_android/widgets/download_service_picker.dart';
 import 'package:spotiflac_android/widgets/track_collection_quick_actions.dart';
-import 'package:spotiflac_android/widgets/animation_utils.dart';
 import 'package:spotiflac_android/utils/clickable_metadata.dart';
 
 class _ArtistCache {
@@ -40,14 +38,12 @@ class _ArtistCache {
   static void set(
     String artistId, {
     required List<ArtistAlbum> albums,
-    List<ArtistAlbum>? releases,
     List<Track>? topTracks,
     String? headerImageUrl,
     int? monthlyListeners,
   }) {
     _cache[artistId] = _CacheEntry(
       albums: albums,
-      releases: releases,
       topTracks: topTracks,
       headerImageUrl: headerImageUrl,
       monthlyListeners: monthlyListeners,
@@ -58,7 +54,6 @@ class _ArtistCache {
 
 class _CacheEntry {
   final List<ArtistAlbum> albums;
-  final List<ArtistAlbum>? releases;
   final List<Track>? topTracks;
   final String? headerImageUrl;
   final int? monthlyListeners;
@@ -66,7 +61,6 @@ class _CacheEntry {
 
   _CacheEntry({
     required this.albums,
-    this.releases,
     this.topTracks,
     this.headerImageUrl,
     this.monthlyListeners,
@@ -103,7 +97,6 @@ class ArtistScreen extends ConsumerStatefulWidget {
 class _ArtistScreenState extends ConsumerState<ArtistScreen> {
   bool _isLoadingDiscography = false;
   List<ArtistAlbum>? _albums;
-  List<ArtistAlbum>? _releases;
   List<Track>? _topTracks;
   String? _headerImageUrl;
   int? _monthlyListeners;
@@ -111,8 +104,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
 
   bool _showTitleInAppBar = false;
   final ScrollController _scrollController = ScrollController();
-  final PageController _popularPageController = PageController();
-  int _popularCurrentPage = 0;
 
   bool _isSelectionMode = false;
   final Set<String> _selectedAlbumIds = {};
@@ -153,16 +144,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
     return tileSize + 64 + ((textScale - 1) * 14);
   }
 
-  String? _recommendedDownloadService() {
-    if (widget.extensionId != null && widget.extensionId!.isNotEmpty) {
-      return widget.extensionId;
-    }
-    if (widget.artistId.startsWith('tidal:')) return 'tidal';
-    if (widget.artistId.startsWith('qobuz:')) return 'qobuz';
-    if (widget.artistId.startsWith('deezer:')) return 'deezer';
-    return null;
-  }
-
   @override
   void initState() {
     super.initState();
@@ -172,12 +153,7 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       final providerId =
           widget.extensionId ??
-          (() {
-            if (widget.artistId.startsWith('deezer:')) return 'deezer';
-            if (widget.artistId.startsWith('qobuz:')) return 'qobuz';
-            if (widget.artistId.startsWith('tidal:')) return 'tidal';
-            return 'spotify';
-          })();
+          (widget.artistId.startsWith('deezer:') ? 'deezer' : 'spotify');
       ref
           .read(recentAccessProvider.notifier)
           .recordArtistAccess(
@@ -193,11 +169,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
       _topTracks = widget.topTracks;
       _headerImageUrl = widget.headerImageUrl;
       _monthlyListeners = widget.monthlyListeners;
-
-      if ((_albums == null || _albums!.isEmpty) ||
-          (_topTracks == null || _topTracks!.isEmpty)) {
-        _fetchDiscography();
-      }
       return;
     }
 
@@ -214,7 +185,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
       }
     } else if (cached != null) {
       _albums = cached.albums;
-      _releases = cached.releases;
       _topTracks = cached.topTracks;
       _headerImageUrl = cached.headerImageUrl;
       _monthlyListeners = cached.monthlyListeners;
@@ -239,7 +209,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
   void dispose() {
     _scrollController.removeListener(_onScroll);
     _scrollController.dispose();
-    _popularPageController.dispose();
     super.dispose();
   }
 
@@ -247,7 +216,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
     setState(() => _isLoadingDiscography = true);
     try {
       List<ArtistAlbum> albums;
-      List<ArtistAlbum>? releases;
       List<Track>? topTracks;
       String? headerImage;
       int? listeners;
@@ -262,65 +230,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
         albums = albumsList
             .map((a) => _parseArtistAlbum(a as Map<String, dynamic>))
             .toList();
-      } else if (widget.artistId.startsWith('qobuz:')) {
-        final qobuzArtistId = widget.artistId.replaceFirst('qobuz:', '');
-        final metadata = await PlatformBridge.getQobuzMetadata(
-          'artist',
-          qobuzArtistId,
-        );
-        final albumsList = metadata['albums'] as List<dynamic>;
-        albums = albumsList
-            .map((a) => _parseArtistAlbum(a as Map<String, dynamic>))
-            .toList();
-        final artistInfo = metadata['artist_info'] as Map<String, dynamic>?;
-        headerImage = artistInfo?['images'] as String?;
-      } else if (widget.artistId.startsWith('tidal:')) {
-        final tidalArtistId = widget.artistId.replaceFirst('tidal:', '');
-        final metadata = await PlatformBridge.getTidalMetadata(
-          'artist',
-          tidalArtistId,
-        );
-        final albumsList = metadata['albums'] as List<dynamic>;
-        albums = albumsList
-            .map((a) => _parseArtistAlbum(a as Map<String, dynamic>))
-            .toList();
-        final artistInfo = metadata['artist_info'] as Map<String, dynamic>?;
-        headerImage = artistInfo?['images'] as String?;
-      } else if (widget.extensionId != null && widget.extensionId!.isNotEmpty) {
-        final result = await PlatformBridge.getArtistWithExtension(
-          widget.extensionId!,
-          widget.artistId,
-        );
-
-        if (result == null) {
-          throw Exception('Failed to load artist from extension');
-        }
-
-        final artistData = result;
-        final albumsList = artistData['albums'] as List<dynamic>? ?? [];
-        albums = albumsList
-            .map((a) => _parseArtistAlbum(a as Map<String, dynamic>))
-            .toList();
-
-        final releasesList = artistData['releases'] as List<dynamic>? ?? [];
-        if (releasesList.isNotEmpty) {
-          releases = releasesList
-              .map((a) => _parseArtistAlbum(a as Map<String, dynamic>))
-              .toList();
-        }
-
-        final topTracksList = artistData['top_tracks'] as List<dynamic>? ?? [];
-        if (topTracksList.isNotEmpty) {
-          topTracks = topTracksList
-              .map((t) => _parseTrack(t as Map<String, dynamic>))
-              .toList();
-        }
-
-        headerImage =
-            artistData['header_image'] as String? ??
-            artistData['cover_url'] as String? ??
-            artistData['image_url'] as String?;
-        listeners = artistData['listeners'] as int?;
       } else {
         final url = 'https://open.spotify.com/artist/${widget.artistId}';
         final result = await PlatformBridge.handleURLWithExtension(url);
@@ -361,7 +270,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
       _ArtistCache.set(
         widget.artistId,
         albums: albums,
-        releases: releases,
         topTracks: topTracks,
         headerImageUrl: finalHeaderImage,
         monthlyListeners: finalListeners,
@@ -370,7 +278,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
       if (mounted) {
         setState(() {
           _albums = albums;
-          _releases = releases;
           _topTracks = topTracks;
           _headerImageUrl = finalHeaderImage;
           _monthlyListeners = finalListeners;
@@ -396,11 +303,8 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
       durationMs = durationValue.toInt();
     }
 
-    final spotifyId = (data['spotify_id'] ?? '').toString();
-    final nativeId = (data['id'] ?? '').toString();
-
     return Track(
-      id: spotifyId.isNotEmpty ? spotifyId : nativeId,
+      id: (data['spotify_id'] ?? data['id'] ?? '').toString(),
       name: (data['name'] ?? '').toString(),
       artistName: (data['artists'] ?? data['artist'] ?? '').toString(),
       albumName: (data['album_name'] ?? data['album'] ?? album?.name ?? '')
@@ -410,9 +314,8 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
           (data['artist_id'] ?? data['artistId'])?.toString() ??
           widget.artistId,
       albumId: data['album_id']?.toString() ?? album?.id,
-      coverUrl: normalizeCoverReference(
-        (data['cover_url'] ?? data['images'] ?? album?.coverUrl)?.toString(),
-      ),
+      coverUrl: (data['cover_url'] ?? data['images'] ?? album?.coverUrl)
+          ?.toString(),
       isrc: data['isrc']?.toString(),
       duration: (durationMs / 1000).round(),
       trackNumber: data['track_number'] as int?,
@@ -420,28 +323,20 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
       releaseDate: data['release_date']?.toString(),
       albumType: data['album_type']?.toString() ?? album?.albumType,
       totalTracks: data['total_tracks'] as int? ?? album?.totalTracks,
-      source: data['provider_id']?.toString() ?? widget.extensionId,
+      source: data['provider_id']?.toString(),
     );
   }
 
   ArtistAlbum _parseArtistAlbum(Map<String, dynamic> data) {
-    final totalTracksValue = data['total_tracks'];
-    final totalTracks = totalTracksValue is int
-        ? totalTracksValue
-        : int.tryParse(totalTracksValue?.toString() ?? '') ?? 0;
-
     return ArtistAlbum(
       id: data['id'] as String? ?? '',
-      name: (data['name'] ?? data['title'] ?? '').toString(),
-      releaseDate: (data['release_date'] ?? '').toString(),
-      totalTracks: totalTracks,
-      coverUrl: normalizeCoverReference(
-        (data['cover_url'] ?? data['images'] ?? data['cover_art'])?.toString(),
-      ),
-      albumType: (data['album_type'] ?? data['type'] ?? 'album').toString(),
-      artists: (data['artists'] ?? data['artist'] ?? widget.artistName)
-          .toString(),
-      providerId: data['provider_id']?.toString() ?? widget.extensionId,
+      name: data['name'] as String? ?? '',
+      releaseDate: data['release_date'] as String? ?? '',
+      totalTracks: data['total_tracks'] as int? ?? 0,
+      coverUrl: (data['cover_url'] ?? data['images'])?.toString(),
+      albumType: data['album_type'] as String? ?? 'album',
+      artists: data['artists'] as String? ?? '',
+      providerId: data['provider_id']?.toString(),
     );
   }
 
@@ -464,7 +359,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
     final colorScheme = Theme.of(context).colorScheme;
     final albums = _albums ?? [];
     _ensureAlbumBuckets(albums);
-    final releases = _releases ?? const <ArtistAlbum>[];
     final albumsOnly = _albumsOnlyBucket;
     final singles = _singlesBucket;
     final compilations = _compilationsBucket;
@@ -492,7 +386,12 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
                   hasDiscography: hasDiscography,
                 ),
                 if (_isLoadingDiscography)
-                  const SliverToBoxAdapter(child: ArtistScreenSkeleton()),
+                  const SliverToBoxAdapter(
+                    child: Padding(
+                      padding: EdgeInsets.all(32),
+                      child: Center(child: CircularProgressIndicator()),
+                    ),
+                  ),
                 if (_error != null)
                   SliverToBoxAdapter(
                     child: Padding(
@@ -505,14 +404,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
                     SliverToBoxAdapter(
                       child: _buildPopularSection(colorScheme),
                     ),
-                  if (releases.isNotEmpty)
-                    SliverToBoxAdapter(
-                      child: _buildAlbumSection(
-                        'Releases',
-                        releases,
-                        colorScheme,
-                      ),
-                    ),
                   if (albumsOnly.isNotEmpty)
                     SliverToBoxAdapter(
                       child: _buildAlbumSection(
@@ -895,7 +786,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
     if (settings.askQualityBeforeDownload) {
       DownloadServicePicker.show(
         context,
-        recommendedService: _recommendedDownloadService(),
         onSelect: (quality, service) {
           _fetchAndQueueAlbums(albums, service, quality);
         },
@@ -955,6 +845,7 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
 
       fetchedCount++;
 
+      // Update progress dialog
       if (mounted) {
         _FetchingProgressDialog.updateProgress(
           context,
@@ -985,6 +876,7 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
       return;
     }
 
+    // Check which tracks are already downloaded
     final historyState = ref.read(downloadHistoryProvider);
     final tracksToQueue = <Track>[];
     int skippedCount = 0;
@@ -1035,7 +927,10 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
           content: Text(message),
           action: SnackBarAction(
             label: context.l10n.snackbarViewQueue,
-            onPressed: () {},
+            onPressed: () {
+              // Navigate to queue tab (index 1)
+              // This will be handled by the navigation system
+            },
           ),
         ),
       );
@@ -1066,24 +961,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
             .map((t) => _parseTrackFromDeezer(t as Map<String, dynamic>, album))
             .toList();
       }
-    } else if (album.id.startsWith('qobuz:')) {
-      final qobuzId = album.id.replaceFirst('qobuz:', '');
-      final metadata = await PlatformBridge.getQobuzMetadata('album', qobuzId);
-      if (metadata['track_list'] != null) {
-        final tracksList = metadata['track_list'] as List<dynamic>;
-        return tracksList
-            .map((t) => _parseTrack(t as Map<String, dynamic>, album: album))
-            .toList();
-      }
-    } else if (album.id.startsWith('tidal:')) {
-      final tidalId = album.id.replaceFirst('tidal:', '');
-      final metadata = await PlatformBridge.getTidalMetadata('album', tidalId);
-      if (metadata['track_list'] != null) {
-        final tracksList = metadata['track_list'] as List<dynamic>;
-        return tracksList
-            .map((t) => _parseTrack(t as Map<String, dynamic>, album: album))
-            .toList();
-      }
     } else {
       final url = 'https://open.spotify.com/album/${album.id}';
       final result = await PlatformBridge.handleURLWithExtension(url);
@@ -1156,8 +1033,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
         imageUrl.isNotEmpty &&
         Uri.tryParse(imageUrl)?.hasAuthority == true;
 
-    final isDark = Theme.of(context).brightness == Brightness.dark;
-
     String? listenersText;
     final listeners = _monthlyListeners ?? widget.monthlyListeners;
     if (listeners != null && listeners > 0) {
@@ -1228,9 +1103,7 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
                     Colors.transparent,
                     Colors.black.withValues(alpha: 0.3),
                     Colors.black.withValues(alpha: 0.7),
-                    isDark
-                        ? colorScheme.surface
-                        : Colors.black.withValues(alpha: 0.85),
+                    colorScheme.surface,
                   ],
                   stops: const [0.0, 0.5, 0.75, 1.0],
                 ),
@@ -1271,7 +1144,7 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
                             listenersText,
                             style: Theme.of(context).textTheme.bodyMedium
                                 ?.copyWith(
-                                  color: Colors.white,
+                                  color: Colors.white.withValues(alpha: 0.8),
                                   shadows: [
                                     Shadow(
                                       offset: const Offset(0, 1),
@@ -1338,9 +1211,7 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
       return const SizedBox.shrink();
     }
 
-    final tracks = _topTracks!;
-    const tracksPerPage = 5;
-    final pageCount = (tracks.length / tracksPerPage).ceil();
+    final tracks = _topTracks!.take(5).toList();
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -1354,60 +1225,11 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
             ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
           ),
         ),
-        SizedBox(
-          height: tracksPerPage * 64.0,
-          child: PageView.builder(
-            controller: _popularPageController,
-            itemCount: pageCount,
-            onPageChanged: (page) {
-              setState(() {
-                _popularCurrentPage = page;
-              });
-            },
-            itemBuilder: (context, pageIndex) {
-              final startIndex = pageIndex * tracksPerPage;
-              final endIndex = (startIndex + tracksPerPage).clamp(
-                0,
-                tracks.length,
-              );
-              final pageTracks = tracks.sublist(startIndex, endIndex);
-
-              return Column(
-                children: pageTracks.asMap().entries.map((entry) {
-                  final globalIndex = startIndex + entry.key;
-                  return _buildPopularTrackItem(
-                    globalIndex + 1,
-                    entry.value,
-                    colorScheme,
-                  );
-                }).toList(),
-              );
-            },
-          ),
-        ),
-        if (pageCount > 1)
-          Center(
-            child: Padding(
-              padding: const EdgeInsets.only(top: 8),
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: List.generate(pageCount, (index) {
-                  final isActive = _popularCurrentPage == index;
-                  return Container(
-                    margin: const EdgeInsets.symmetric(horizontal: 3),
-                    width: isActive ? 8 : 6,
-                    height: isActive ? 8 : 6,
-                    decoration: BoxDecoration(
-                      shape: BoxShape.circle,
-                      color: isActive
-                          ? colorScheme.primary
-                          : colorScheme.onSurfaceVariant.withValues(alpha: 0.3),
-                    ),
-                  );
-                }),
-              ),
-            ),
-          ),
+        ...tracks.asMap().entries.map((entry) {
+          final index = entry.key;
+          final track = entry.value;
+          return _buildPopularTrackItem(index + 1, track, colorScheme);
+        }),
       ],
     );
   }
@@ -1695,7 +1517,6 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
     if (settings.askQualityBeforeDownload) {
       DownloadServicePicker.show(
         context,
-        recommendedService: _recommendedDownloadService(),
         onSelect: (quality, service) {
           if (!mounted) return;
           enqueue(service, quality: quality);
@@ -1846,14 +1667,29 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
                     Positioned(
                       top: 8,
                       right: 8,
-                      child: AnimatedSelectionCheckbox(
-                        visible: true,
-                        selected: isSelected,
-                        colorScheme: colorScheme,
-                        size: 28,
-                        unselectedColor: colorScheme.surface.withValues(
-                          alpha: 0.9,
+                      child: AnimatedContainer(
+                        duration: const Duration(milliseconds: 200),
+                        width: 28,
+                        height: 28,
+                        decoration: BoxDecoration(
+                          color: isSelected
+                              ? colorScheme.primary
+                              : colorScheme.surface.withValues(alpha: 0.9),
+                          shape: BoxShape.circle,
+                          border: Border.all(
+                            color: isSelected
+                                ? colorScheme.primary
+                                : colorScheme.outline,
+                            width: 2,
+                          ),
                         ),
+                        child: isSelected
+                            ? Icon(
+                                Icons.check,
+                                color: colorScheme.onPrimary,
+                                size: 18,
+                              )
+                            : null,
                       ),
                     ),
                   if (showTypeBadge)
@@ -2062,6 +1898,7 @@ class _FetchingProgressDialog extends StatefulWidget {
     required this.onCancel,
   });
 
+  // Static method to update progress from outside
   static void updateProgress(BuildContext context, int current, int total) {
     final state = context
         .findAncestorStateOfType<_FetchingProgressDialogState>();
@@ -2134,6 +1971,7 @@ class _FetchingProgressDialogState extends State<_FetchingProgressDialog> {
             ),
           ),
           const SizedBox(height: 8),
+          // Progress bar
           ClipRRect(
             borderRadius: BorderRadius.circular(4),
             child: LinearProgressIndicator(

lib/screens/downloaded_album_screen.dart

@@ -17,7 +17,6 @@ import 'package:spotiflac_android/providers/playback_provider.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/screens/track_metadata_screen.dart';
 import 'package:spotiflac_android/services/downloaded_embedded_cover_resolver.dart';
-import 'package:spotiflac_android/widgets/animation_utils.dart';
 
 class DownloadedAlbumScreen extends ConsumerStatefulWidget {
   final String albumName;
@@ -121,14 +120,17 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
 
     final tracks =
         allItems.where((item) {
+          // Use albumArtist if available and not empty, otherwise artistName
           final itemArtist =
               (item.albumArtist != null && item.albumArtist!.isNotEmpty)
               ? item.albumArtist!
               : item.artistName;
+          // Use lowercase for case-insensitive matching
           final itemKey =
               '${item.albumName.toLowerCase()}|${itemArtist.toLowerCase()}';
           return itemKey == _albumLookupKey;
         }).toList()..sort((a, b) {
+          // Sort by disc number first, then by track number
           final aDisc = a.discNumber ?? 1;
           final bDisc = b.discNumber ?? 1;
           if (aDisc != bDisc) return aDisc.compareTo(bDisc);
@@ -309,7 +311,14 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
     if (!mounted) return;
 
     final result = await navigator.push(
-      slidePageRoute(page: TrackMetadataScreen(item: item)),
+      PageRouteBuilder(
+        transitionDuration: const Duration(milliseconds: 300),
+        reverseTransitionDuration: const Duration(milliseconds: 250),
+        pageBuilder: (context, animation, secondaryAnimation) =>
+            TrackMetadataScreen(item: item),
+        transitionsBuilder: (context, animation, secondaryAnimation, child) =>
+            FadeTransition(opacity: animation, child: child),
+      ),
     );
     await DownloadedEmbeddedCoverResolver.scheduleRefreshForPath(
       item.filePath,
@@ -354,7 +363,7 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
     if (tracks.isEmpty) {
       return Scaffold(
         appBar: AppBar(title: Text(widget.albumName)),
-        body: Center(child: Text(context.l10n.noTracksFoundForAlbum)),
+        body: Center(child: Text('No tracks found for this album')),
       );
     }
 
@@ -685,10 +694,7 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
           final track = tracks[index];
           return KeyedSubtree(
             key: ValueKey(track.id),
-            child: StaggeredListItem(
-              index: index,
-              child: _buildTrackItem(context, colorScheme, track),
-            ),
+            child: _buildTrackItem(context, colorScheme, track),
           );
         }, childCount: tracks.length),
       );
@@ -696,7 +702,6 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
 
     final discNumbers = _getSortedDiscNumbers(tracks);
     final List<Widget> children = [];
-    var revealIndex = 0;
 
     for (final discNumber in discNumbers) {
       final discTracks = discMap[discNumber];
@@ -708,10 +713,7 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
         children.add(
           KeyedSubtree(
             key: ValueKey(track.id),
-            child: StaggeredListItem(
-              index: revealIndex++,
-              child: _buildTrackItem(context, colorScheme, track),
-            ),
+            child: _buildTrackItem(context, colorScheme, track),
           ),
         );
       }
@@ -795,11 +797,28 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
             mainAxisSize: MainAxisSize.min,
             children: [
               if (_isSelectionMode) ...[
-                AnimatedSelectionCheckbox(
-                  visible: true,
-                  selected: isSelected,
-                  colorScheme: colorScheme,
-                  size: 24,
+                Container(
+                  width: 24,
+                  height: 24,
+                  decoration: BoxDecoration(
+                    color: isSelected
+                        ? colorScheme.primary
+                        : Colors.transparent,
+                    shape: BoxShape.circle,
+                    border: Border.all(
+                      color: isSelected
+                          ? colorScheme.primary
+                          : colorScheme.outline,
+                      width: 2,
+                    ),
+                  ),
+                  child: isSelected
+                      ? Icon(
+                          Icons.check,
+                          color: colorScheme.onPrimary,
+                          size: 16,
+                        )
+                      : null,
                 ),
                 const SizedBox(width: 12),
               ],
@@ -892,45 +911,8 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
     BuildContext context,
     List<DownloadHistoryItem> allTracks,
   ) {
-    final tracksById = {for (final t in allTracks) t.id: t};
-    final sourceFormats = <String>{};
-    for (final id in _selectedIds) {
-      final item = tracksById[id];
-      if (item == null) continue;
-      final nameToCheck =
-          (item.safFileName != null && item.safFileName!.isNotEmpty)
-          ? item.safFileName!.toLowerCase()
-          : item.filePath.toLowerCase();
-      final ext = nameToCheck.endsWith('.flac')
-          ? 'FLAC'
-          : nameToCheck.endsWith('.m4a')
-          ? 'M4A'
-          : nameToCheck.endsWith('.mp3')
-          ? 'MP3'
-          : (nameToCheck.endsWith('.opus') || nameToCheck.endsWith('.ogg'))
-          ? 'Opus'
-          : null;
-      if (ext != null) sourceFormats.add(ext);
-    }
-
-    final formats = ['ALAC', 'FLAC', 'MP3', 'Opus'].where((target) {
-      return sourceFormats.any((src) {
-        if (src == target) return false;
-        final isLosslessTarget = target == 'ALAC' || target == 'FLAC';
-        final isLosslessSource = src == 'FLAC' || src == 'M4A';
-        if (isLosslessTarget && !isLosslessSource) return false;
-        return true;
-      });
-    }).toList();
-
-    if (formats.isEmpty) return;
-
-    String selectedFormat = formats.first;
-    bool isLosslessTarget =
-        selectedFormat == 'ALAC' || selectedFormat == 'FLAC';
-    String selectedBitrate = isLosslessTarget
-        ? '320k'
-        : (selectedFormat == 'Opus' ? '128k' : '320k');
+    String selectedFormat = 'MP3';
+    String selectedBitrate = '320k';
 
     showModalBottomSheet(
       context: context,
@@ -942,6 +924,7 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
         return StatefulBuilder(
           builder: (context, setSheetState) {
             final colorScheme = Theme.of(context).colorScheme;
+            final formats = ['MP3', 'Opus'];
             final bitrates = ['128k', '192k', '256k', '320k'];
 
             return SafeArea(
@@ -978,73 +961,51 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
                       ),
                     ),
                     const SizedBox(height: 8),
-                    Wrap(
-                      spacing: 8,
+                    Row(
                       children: formats.map((format) {
                         final isSelected = format == selectedFormat;
-                        return ChoiceChip(
-                          label: Text(format),
-                          selected: isSelected,
-                          onSelected: (selected) {
-                            if (selected) {
-                              setSheetState(() {
-                                selectedFormat = format;
-                                isLosslessTarget =
-                                    format == 'ALAC' || format == 'FLAC';
-                                if (!isLosslessTarget) {
+                        return Padding(
+                          padding: const EdgeInsets.only(right: 8),
+                          child: ChoiceChip(
+                            label: Text(format),
+                            selected: isSelected,
+                            onSelected: (selected) {
+                              if (selected) {
+                                setSheetState(() {
+                                  selectedFormat = format;
                                   selectedBitrate = format == 'Opus'
                                       ? '128k'
                                       : '320k';
-                                }
-                              });
+                                });
+                              }
+                            },
+                          ),
+                        );
+                      }).toList(),
+                    ),
+                    const SizedBox(height: 16),
+                    Text(
+                      context.l10n.trackConvertBitrate,
+                      style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                        color: colorScheme.onSurfaceVariant,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Wrap(
+                      spacing: 8,
+                      children: bitrates.map((br) {
+                        final isSelected = br == selectedBitrate;
+                        return ChoiceChip(
+                          label: Text(br),
+                          selected: isSelected,
+                          onSelected: (selected) {
+                            if (selected) {
+                              setSheetState(() => selectedBitrate = br);
                             }
                           },
                         );
                       }).toList(),
                     ),
-                    if (!isLosslessTarget) ...[
-                      const SizedBox(height: 16),
-                      Text(
-                        context.l10n.trackConvertBitrate,
-                        style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                          color: colorScheme.onSurfaceVariant,
-                        ),
-                      ),
-                      const SizedBox(height: 8),
-                      Wrap(
-                        spacing: 8,
-                        children: bitrates.map((br) {
-                          final isSelected = br == selectedBitrate;
-                          return ChoiceChip(
-                            label: Text(br),
-                            selected: isSelected,
-                            onSelected: (selected) {
-                              if (selected) {
-                                setSheetState(() => selectedBitrate = br);
-                              }
-                            },
-                          );
-                        }).toList(),
-                      ),
-                    ],
-                    if (isLosslessTarget) ...[
-                      const SizedBox(height: 16),
-                      Row(
-                        children: [
-                          Icon(
-                            Icons.verified,
-                            size: 16,
-                            color: colorScheme.primary,
-                          ),
-                          const SizedBox(width: 6),
-                          Text(
-                            context.l10n.trackConvertLosslessHint,
-                            style: Theme.of(context).textTheme.bodySmall
-                                ?.copyWith(color: colorScheme.primary),
-                          ),
-                        ],
-                      ),
-                    ],
                     const SizedBox(height: 24),
                     SizedBox(
                       width: double.infinity,
@@ -1097,18 +1058,12 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
           : item.filePath.toLowerCase();
       final ext = nameToCheck.endsWith('.flac')
           ? 'FLAC'
-          : nameToCheck.endsWith('.m4a')
-          ? 'M4A'
           : nameToCheck.endsWith('.mp3')
           ? 'MP3'
           : (nameToCheck.endsWith('.opus') || nameToCheck.endsWith('.ogg'))
           ? 'Opus'
           : null;
-      if (ext == null || ext == targetFormat) continue;
-      final isLosslessTarget = targetFormat == 'ALAC' || targetFormat == 'FLAC';
-      final isLosslessSource = ext == 'FLAC' || ext == 'M4A';
-      if (isLosslessTarget && !isLosslessSource) continue;
-      selected.add(item);
+      if (ext != null && ext != targetFormat) selected.add(item);
     }
 
     if (selected.isEmpty) {
@@ -1120,22 +1075,16 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
       return;
     }
 
-    final isLossless = targetFormat == 'ALAC' || targetFormat == 'FLAC';
     final confirmed = await showDialog<bool>(
       context: context,
       builder: (ctx) => AlertDialog(
         title: Text(context.l10n.selectionBatchConvertConfirmTitle),
         content: Text(
-          isLossless
-              ? context.l10n.selectionBatchConvertConfirmMessageLossless(
-                  selected.length,
-                  targetFormat,
-                )
-              : context.l10n.selectionBatchConvertConfirmMessage(
-                  selected.length,
-                  targetFormat,
-                  bitrate,
-                ),
+          context.l10n.selectionBatchConvertConfirmMessage(
+            selected.length,
+            targetFormat,
+            bitrate,
+          ),
         ),
         actions: [
           TextButton(
@@ -1156,10 +1105,7 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
     final total = selected.length;
     final historyDb = HistoryDatabase.instance;
     final newQuality =
-        (targetFormat.toUpperCase() == 'ALAC' ||
-            targetFormat.toUpperCase() == 'FLAC')
-        ? '${targetFormat.toUpperCase()} Lossless'
-        : '${targetFormat.toUpperCase()} ${bitrate.trim().toLowerCase()}';
+        '${targetFormat.toUpperCase()} ${bitrate.trim().toLowerCase()}';
     final settings = ref.read(settingsProvider);
     final shouldEmbedLyrics =
         settings.embedLyrics && settings.lyricsMode != 'external';
@@ -1187,7 +1133,12 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
         try {
           final result = await PlatformBridge.readFileMetadata(item.filePath);
           if (result['error'] == null) {
-            mergePlatformMetadataForTagEmbed(target: metadata, source: result);
+            result.forEach((key, value) {
+              if (key == 'error' || value == null) return;
+              final v = value.toString().trim();
+              if (v.isEmpty) return;
+              metadata[key.toUpperCase()] = v;
+            });
           }
         } catch (_) {}
         await ensureLyricsMetadataForConversion(
@@ -1257,27 +1208,13 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
             final baseName = dotIdx > 0
                 ? oldFileName.substring(0, dotIdx)
                 : oldFileName;
-            String newExt;
-            String mimeType;
-            switch (targetFormat.toLowerCase()) {
-              case 'opus':
-                newExt = '.opus';
-                mimeType = 'audio/opus';
-                break;
-              case 'alac':
-                newExt = '.m4a';
-                mimeType = 'audio/mp4';
-                break;
-              case 'flac':
-                newExt = '.flac';
-                mimeType = 'audio/flac';
-                break;
-              default:
-                newExt = '.mp3';
-                mimeType = 'audio/mpeg';
-                break;
-            }
+            final newExt = targetFormat.toLowerCase() == 'opus'
+                ? '.opus'
+                : '.mp3';
             final newFileName = '$baseName$newExt';
+            final mimeType = targetFormat.toLowerCase() == 'opus'
+                ? 'audio/opus'
+                : 'audio/mpeg';
 
             final safUri = await PlatformBridge.createSafFileFromPath(
               treeUri: treeUri,

lib/screens/library_playlists_screen.dart

@@ -8,7 +8,6 @@ import 'package:spotiflac_android/l10n/l10n.dart';
 import 'package:spotiflac_android/providers/library_collections_provider.dart';
 import 'package:spotiflac_android/screens/library_tracks_folder_screen.dart';
 import 'package:spotiflac_android/services/cover_cache_manager.dart';
-import 'package:spotiflac_android/widgets/bottom_sheet_option_tile.dart';
 import 'package:spotiflac_android/utils/app_bar_layout.dart';
 
 class LibraryPlaylistsScreen extends ConsumerWidget {
@@ -211,7 +210,7 @@ class LibraryPlaylistsScreen extends ConsumerWidget {
               color: colorScheme.outlineVariant.withValues(alpha: 0.5),
             ),
 
-            BottomSheetOptionTile(
+            _PlaylistOptionTile(
               icon: Icons.edit_outlined,
               title: context.l10n.collectionRenamePlaylist,
               onTap: () {
@@ -225,7 +224,7 @@ class LibraryPlaylistsScreen extends ConsumerWidget {
               },
             ),
 
-            BottomSheetOptionTile(
+            _PlaylistOptionTile(
               icon: Icons.image_outlined,
               title: context.l10n.collectionPlaylistChangeCover,
               onTap: () {
@@ -234,7 +233,7 @@ class LibraryPlaylistsScreen extends ConsumerWidget {
               },
             ),
 
-            BottomSheetOptionTile(
+            _PlaylistOptionTile(
               icon: Icons.delete_outline,
               iconColor: colorScheme.error,
               title: context.l10n.collectionDeletePlaylist,
@@ -544,3 +543,40 @@ class LibraryPlaylistsScreen extends ConsumerWidget {
     );
   }
 }
+
+/// Styled like _OptionTile in track_collection_quick_actions.dart
+class _PlaylistOptionTile extends StatelessWidget {
+  final IconData icon;
+  final Color? iconColor;
+  final String title;
+  final VoidCallback onTap;
+
+  const _PlaylistOptionTile({
+    required this.icon,
+    this.iconColor,
+    required this.title,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return ListTile(
+      contentPadding: const EdgeInsets.symmetric(horizontal: 24, vertical: 4),
+      leading: Container(
+        padding: const EdgeInsets.all(10),
+        decoration: BoxDecoration(
+          color: colorScheme.primaryContainer,
+          borderRadius: BorderRadius.circular(12),
+        ),
+        child: Icon(
+          icon,
+          color: iconColor ?? colorScheme.onPrimaryContainer,
+          size: 20,
+        ),
+      ),
+      title: Text(title, style: const TextStyle(fontWeight: FontWeight.w500)),
+      onTap: onTap,
+    );
+  }
+}

lib/screens/library_tracks_folder_screen.dart

@@ -15,9 +15,7 @@ import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/services/cover_cache_manager.dart';
 import 'package:spotiflac_android/screens/track_metadata_screen.dart';
 import 'package:spotiflac_android/widgets/download_service_picker.dart';
-import 'package:spotiflac_android/widgets/bottom_sheet_option_tile.dart';
 import 'package:spotiflac_android/widgets/playlist_picker_sheet.dart';
-import 'package:spotiflac_android/widgets/animation_utils.dart';
 
 class LibraryTracksFolderScreen extends ConsumerStatefulWidget {
   final LibraryTracksFolderMode mode;
@@ -41,7 +39,6 @@ class _LibraryTracksFolderScreenState
 
   bool _isSelectionMode = false;
   final Set<String> _selectedKeys = {};
-  UserPlaylistCollection? playlist;
 
   @override
   void initState() {
@@ -246,6 +243,7 @@ class _LibraryTracksFolderScreenState
     final colorScheme = Theme.of(context).colorScheme;
     ref.watch(localLibraryProvider.select((s) => s.items));
     final localState = ref.read(localLibraryProvider);
+    final UserPlaylistCollection? playlist;
     final List<CollectionTrackEntry> entries;
 
     switch (widget.mode) {
@@ -274,6 +272,7 @@ class _LibraryTracksFolderScreenState
         break;
     }
 
+    // Stale selection cleanup
     if (_isSelectionMode) {
       final validKeys = entries.map((e) => e.key).toSet();
       _selectedKeys.removeWhere((key) => !validKeys.contains(key));
@@ -349,23 +348,20 @@ class _LibraryTracksFolderScreenState
                       final isSelected = _selectedKeys.contains(entry.key);
                       return KeyedSubtree(
                         key: ValueKey(entry.key),
-                        child: StaggeredListItem(
-                          index: index,
-                          child: _CollectionTrackTile(
-                            entry: entry,
-                            mode: widget.mode,
-                            playlistId: widget.playlistId,
-                            localLibraryState: localState,
-                            folderTracks: folderTracks,
-                            isSelectionMode: _isSelectionMode,
-                            isSelected: isSelected,
-                            onTap: _isSelectionMode
-                                ? () => _toggleSelection(entry.key)
-                                : null,
-                            onLongPress: _isSelectionMode
-                                ? null
-                                : () => _enterSelectionMode(entry.key),
-                          ),
+                        child: _CollectionTrackTile(
+                          entry: entry,
+                          mode: widget.mode,
+                          playlistId: widget.playlistId,
+                          localLibraryState: localState,
+                          folderTracks: folderTracks,
+                          isSelectionMode: _isSelectionMode,
+                          isSelected: isSelected,
+                          onTap: _isSelectionMode
+                              ? () => _toggleSelection(entry.key)
+                              : null,
+                          onLongPress: _isSelectionMode
+                              ? null
+                              : () => _enterSelectionMode(entry.key),
                         ),
                       );
                     }, childCount: entries.length),
@@ -376,6 +372,7 @@ class _LibraryTracksFolderScreenState
               ],
             ),
 
+            // Selection bottom bar
             AnimatedPositioned(
               duration: const Duration(milliseconds: 250),
               curve: Curves.easeOutCubic,
@@ -853,8 +850,8 @@ class _LibraryTracksFolderScreenState
         final colorScheme = Theme.of(dialogContext).colorScheme;
         return AlertDialog(
           backgroundColor: colorScheme.surfaceContainerHigh,
-          title: Text(context.l10n.dialogDownloadAllTitle),
-          content: Text(context.l10n.dialogDownloadAllMessage(tracks.length)),
+          title: const Text('Download All'),
+          content: Text('Download ${tracks.length} tracks?'),
           actions: [
             TextButton(
               onPressed: () => Navigator.pop(dialogContext),
@@ -865,7 +862,7 @@ class _LibraryTracksFolderScreenState
                 Navigator.pop(dialogContext);
                 _downloadAll(tracks);
               },
-              child: Text(context.l10n.dialogDownload),
+              child: const Text('Download'),
             ),
           ],
         );
@@ -875,54 +872,11 @@ class _LibraryTracksFolderScreenState
 
   void _downloadAll(List<Track> tracks) {
     if (tracks.isEmpty) return;
-    final historyState = ref.read(downloadHistoryProvider);
     final settings = ref.read(settingsProvider);
-    final localLibState =
-        (settings.localLibraryEnabled && settings.localLibraryShowDuplicates)
-        ? ref.read(localLibraryProvider)
-        : null;
-    final playlistName = widget.mode == LibraryTracksFolderMode.playlist
-        ? playlist?.name ?? context.l10n.collectionPlaylist
-        : null;
-    final tracksToQueue = <Track>[];
-    var skippedCount = 0;
-
-    for (final track in tracks) {
-      final isInHistory =
-          historyState.isDownloaded(track.id) ||
-          (track.isrc != null && historyState.getByIsrc(track.isrc!) != null) ||
-          historyState.findByTrackAndArtist(track.name, track.artistName) !=
-              null;
-      final isInLocal =
-          localLibState?.existsInLibrary(
-            isrc: track.isrc,
-            trackName: track.name,
-            artistName: track.artistName,
-          ) ??
-          false;
-
-      if (isInHistory || isInLocal) {
-        skippedCount++;
-      } else {
-        tracksToQueue.add(track);
-      }
-    }
-
-    if (tracksToQueue.isEmpty) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(
-            context.l10n.discographySkippedDownloaded(0, skippedCount),
-          ),
-        ),
-      );
-      return;
-    }
-
     if (settings.askQualityBeforeDownload) {
       DownloadServicePicker.show(
         context,
-        trackName: '${tracksToQueue.length} tracks',
+        trackName: '${tracks.length} tracks',
         artistName: switch (widget.mode) {
           LibraryTracksFolderMode.wishlist => context.l10n.collectionWishlist,
           LibraryTracksFolderMode.loved => context.l10n.collectionLoved,
@@ -931,24 +885,12 @@ class _LibraryTracksFolderScreenState
         onSelect: (quality, service) {
           ref
               .read(downloadQueueProvider.notifier)
-              .addMultipleToQueue(
-                tracksToQueue,
-                service,
-                qualityOverride: quality,
-                playlistName: playlistName,
-              );
+              .addMultipleToQueue(tracks, service, qualityOverride: quality);
           if (!mounted) return;
           ScaffoldMessenger.of(context).showSnackBar(
             SnackBar(
               content: Text(
-                skippedCount > 0
-                    ? context.l10n.discographySkippedDownloaded(
-                        tracksToQueue.length,
-                        skippedCount,
-                      )
-                    : context.l10n.snackbarAddedTracksToQueue(
-                        tracksToQueue.length,
-                      ),
+                context.l10n.snackbarAddedTracksToQueue(tracks.length),
               ),
             ),
           );
@@ -957,21 +899,10 @@ class _LibraryTracksFolderScreenState
     } else {
       ref
           .read(downloadQueueProvider.notifier)
-          .addMultipleToQueue(
-            tracksToQueue,
-            settings.defaultService,
-            playlistName: playlistName,
-          );
+          .addMultipleToQueue(tracks, settings.defaultService);
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-          content: Text(
-            skippedCount > 0
-                ? context.l10n.discographySkippedDownloaded(
-                    tracksToQueue.length,
-                    skippedCount,
-                  )
-                : context.l10n.snackbarAddedTracksToQueue(tracksToQueue.length),
-          ),
+          content: Text(context.l10n.snackbarAddedTracksToQueue(tracks.length)),
         ),
       );
     }
@@ -1084,19 +1015,14 @@ class _CollectionTrackTile extends ConsumerWidget {
     final track = entry.track;
     final colorScheme = Theme.of(context).colorScheme;
     final effectiveCoverUrl = _resolveCoverUrl(track);
-
-    // Fine-grained provider watches – only this tile rebuilds when its own
-    // history / local-library entry changes.
-    final historyItem = ref.watch(
+    final isInHistory = ref.watch(
       downloadHistoryProvider.select((state) {
-        final byId = state.getBySpotifyId(track.id);
-        if (byId != null) return byId;
+        if (state.isDownloaded(track.id)) return true;
         final isrc = track.isrc?.trim();
-        if (isrc != null && isrc.isNotEmpty) {
-          final byIsrc = state.getByIsrc(isrc);
-          if (byIsrc != null) return byIsrc;
+        if (isrc != null && isrc.isNotEmpty && state.getByIsrc(isrc) != null) {
+          return true;
         }
-        return state.findByTrackAndArtist(track.name, track.artistName);
+        return state.findByTrackAndArtist(track.name, track.artistName) != null;
       }),
     );
     final showLocalLibraryIndicator = ref.watch(
@@ -1104,26 +1030,17 @@ class _CollectionTrackTile extends ConsumerWidget {
         (s) => s.localLibraryEnabled && s.localLibraryShowDuplicates,
       ),
     );
-    final localItem = showLocalLibraryIndicator
+    final isInLocalLibrary = showLocalLibraryIndicator
         ? ref.watch(
-            localLibraryProvider.select((state) {
-              final isrc = track.isrc?.trim();
-              if (isrc != null && isrc.isNotEmpty) {
-                final byIsrc = state.getByIsrc(isrc);
-                if (byIsrc != null) return byIsrc;
-              }
-              return state.findByTrackAndArtist(track.name, track.artistName);
-            }),
+            localLibraryProvider.select(
+              (state) => state.existsInLibrary(
+                isrc: track.isrc,
+                trackName: track.name,
+                artistName: track.artistName,
+              ),
+            ),
           )
-        : null;
-
-    final isInHistory = historyItem != null;
-    final isInLocalLibrary = localItem != null;
-    final heroTag = historyItem != null
-        ? 'cover_${historyItem.id}'
-        : localItem != null
-        ? 'cover_lib_${localItem.id}'
-        : null;
+        : false;
 
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 8),
@@ -1141,51 +1058,43 @@ class _CollectionTrackTile extends ConsumerWidget {
             mainAxisSize: MainAxisSize.min,
             children: [
               if (isSelectionMode) ...[
-                AnimatedSelectionCheckbox(
-                  visible: true,
-                  selected: isSelected,
-                  colorScheme: colorScheme,
-                  size: 24,
+                Container(
+                  width: 24,
+                  height: 24,
+                  decoration: BoxDecoration(
+                    color: isSelected
+                        ? colorScheme.primary
+                        : Colors.transparent,
+                    shape: BoxShape.circle,
+                    border: Border.all(
+                      color: isSelected
+                          ? colorScheme.primary
+                          : colorScheme.outline,
+                      width: 2,
+                    ),
+                  ),
+                  child: isSelected
+                      ? Icon(
+                          Icons.check,
+                          color: colorScheme.onPrimary,
+                          size: 16,
+                        )
+                      : null,
                 ),
                 const SizedBox(width: 12),
               ],
-              HeroMode(
-                enabled: heroTag != null,
-                child: heroTag != null
-                    ? Hero(
-                        tag: heroTag,
-                        child: ClipRRect(
-                          borderRadius: BorderRadius.circular(8),
-                          child:
-                              effectiveCoverUrl != null &&
-                                  effectiveCoverUrl.isNotEmpty
-                              ? _buildTrackCover(context, effectiveCoverUrl, 52)
-                              : Container(
-                                  width: 52,
-                                  height: 52,
-                                  color: colorScheme.surfaceContainerHighest,
-                                  child: Icon(
-                                    Icons.music_note,
-                                    color: colorScheme.onSurfaceVariant,
-                                  ),
-                                ),
+              ClipRRect(
+                borderRadius: BorderRadius.circular(8),
+                child: effectiveCoverUrl != null && effectiveCoverUrl.isNotEmpty
+                    ? _buildTrackCover(context, effectiveCoverUrl, 52)
+                    : Container(
+                        width: 52,
+                        height: 52,
+                        color: colorScheme.surfaceContainerHighest,
+                        child: Icon(
+                          Icons.music_note,
+                          color: colorScheme.onSurfaceVariant,
                         ),
-                      )
-                    : ClipRRect(
-                        borderRadius: BorderRadius.circular(8),
-                        child:
-                            effectiveCoverUrl != null &&
-                                effectiveCoverUrl.isNotEmpty
-                            ? _buildTrackCover(context, effectiveCoverUrl, 52)
-                            : Container(
-                                width: 52,
-                                height: 52,
-                                color: colorScheme.surfaceContainerHighest,
-                                child: Icon(
-                                  Icons.music_note,
-                                  color: colorScheme.onSurfaceVariant,
-                                ),
-                              ),
                       ),
               ),
             ],
@@ -1415,8 +1324,9 @@ class _CollectionTrackTile extends ConsumerWidget {
               color: colorScheme.outlineVariant.withValues(alpha: 0.5),
             ),
 
+            // Add to playlist (hidden in wishlist unless already downloaded)
             if (showAddToPlaylist)
-              BottomSheetOptionTile(
+              _CollectionOptionTile(
                 icon: Icons.playlist_add,
                 title: context.l10n.collectionAddToPlaylist,
                 onTap: () {
@@ -1425,7 +1335,8 @@ class _CollectionTrackTile extends ConsumerWidget {
                 },
               ),
 
-            BottomSheetOptionTile(
+            // Remove from folder / playlist
+            _CollectionOptionTile(
               icon: Icons.remove_circle_outline,
               iconColor: colorScheme.error,
               title: mode == LibraryTracksFolderMode.playlist
@@ -1523,9 +1434,16 @@ class _CollectionTrackTile extends ConsumerWidget {
     );
 
     if (historyItem != null) {
-      await Navigator.of(
-        context,
-      ).push(slidePageRoute(page: TrackMetadataScreen(item: historyItem)));
+      await Navigator.of(context).push(
+        PageRouteBuilder(
+          transitionDuration: const Duration(milliseconds: 300),
+          reverseTransitionDuration: const Duration(milliseconds: 250),
+          pageBuilder: (context, animation, secondaryAnimation) =>
+              TrackMetadataScreen(item: historyItem),
+          transitionsBuilder: (context, animation, secondaryAnimation, child) =>
+              FadeTransition(opacity: animation, child: child),
+        ),
+      );
       return;
     }
 
@@ -1540,9 +1458,16 @@ class _CollectionTrackTile extends ConsumerWidget {
     localItem ??= localState.findByTrackAndArtist(track.name, track.artistName);
 
     if (localItem != null) {
-      await Navigator.of(
-        context,
-      ).push(slidePageRoute(page: TrackMetadataScreen(localItem: localItem)));
+      await Navigator.of(context).push(
+        PageRouteBuilder(
+          transitionDuration: const Duration(milliseconds: 300),
+          reverseTransitionDuration: const Duration(milliseconds: 250),
+          pageBuilder: (context, animation, secondaryAnimation) =>
+              TrackMetadataScreen(localItem: localItem),
+          transitionsBuilder: (context, animation, secondaryAnimation, child) =>
+              FadeTransition(opacity: animation, child: child),
+        ),
+      );
       return;
     }
 
@@ -1551,6 +1476,43 @@ class _CollectionTrackTile extends ConsumerWidget {
   }
 }
 
+/// Styled like _OptionTile in track_collection_quick_actions.dart
+class _CollectionOptionTile extends StatelessWidget {
+  final IconData icon;
+  final Color? iconColor;
+  final String title;
+  final VoidCallback onTap;
+
+  const _CollectionOptionTile({
+    required this.icon,
+    this.iconColor,
+    required this.title,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    return ListTile(
+      contentPadding: const EdgeInsets.symmetric(horizontal: 24, vertical: 4),
+      leading: Container(
+        padding: const EdgeInsets.all(10),
+        decoration: BoxDecoration(
+          color: colorScheme.primaryContainer,
+          borderRadius: BorderRadius.circular(12),
+        ),
+        child: Icon(
+          icon,
+          color: iconColor ?? colorScheme.onPrimaryContainer,
+          size: 20,
+        ),
+      ),
+      title: Text(title, style: const TextStyle(fontWeight: FontWeight.w500)),
+      onTap: onTap,
+    );
+  }
+}
+
 class _SelectionActionButton extends StatelessWidget {
   final IconData icon;
   final String label;

lib/screens/local_album_screen.dart

@@ -4,19 +4,14 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:spotiflac_android/l10n/l10n.dart';
-import 'package:spotiflac_android/models/track.dart';
-import 'package:spotiflac_android/providers/download_queue_provider.dart';
-import 'package:spotiflac_android/providers/extension_provider.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/utils/file_access.dart';
 import 'package:spotiflac_android/utils/lyrics_metadata_helper.dart';
 import 'package:spotiflac_android/services/library_database.dart';
 import 'package:spotiflac_android/services/ffmpeg_service.dart';
-import 'package:spotiflac_android/services/local_track_redownload_service.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/providers/local_library_provider.dart';
 import 'package:spotiflac_android/providers/playback_provider.dart';
-import 'package:spotiflac_android/widgets/animation_utils.dart';
 
 class LocalAlbumScreen extends ConsumerStatefulWidget {
   final String albumName;
@@ -46,10 +41,11 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
 
   void _showCueVirtualTrackSnackBar() {
     ScaffoldMessenger.of(context).showSnackBar(
-      const SnackBar(content: Text(cueVirtualTrackRequiresSplitMessage)),
+      const SnackBar(
+        content: Text(cueVirtualTrackRequiresSplitMessage),
+      ),
     );
   }
-
   late List<int> _sortedDiscNumbersCache;
   late bool _hasMultipleDiscsCache;
   String? _commonQualityCache;
@@ -251,7 +247,7 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
     if (tracks.isEmpty) {
       return Scaffold(
         appBar: AppBar(title: Text(widget.albumName)),
-        body: Center(child: Text(context.l10n.noTracksFoundForAlbum)),
+        body: const Center(child: Text('No tracks found for this album')),
       );
     }
 
@@ -532,6 +528,7 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
     if (tracks.isEmpty) return null;
     final first = tracks.first;
 
+    // For lossy formats, use bitrate
     if (first.bitrate != null && first.bitrate! > 0) {
       final fmt = first.format?.toUpperCase() ?? '';
       final firstBitrate = first.bitrate;
@@ -543,6 +540,7 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
       return '$fmt ${firstBitrate}kbps'.trim();
     }
 
+    // For lossless formats, use bit depth / sample rate
     if (first.bitDepth == null ||
         first.bitDepth == 0 ||
         first.sampleRate == null) {
@@ -625,16 +623,11 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
 
       slivers.add(
         SliverList(
-          delegate: SliverChildBuilderDelegate((context, index) {
-            final track = discTracks[index];
-            return KeyedSubtree(
-              key: ValueKey(track.id),
-              child: StaggeredListItem(
-                index: index,
-                child: _buildTrackItem(context, colorScheme, track),
-              ),
-            );
-          }, childCount: discTracks.length),
+          delegate: SliverChildBuilderDelegate(
+            (context, index) =>
+                _buildTrackItem(context, colorScheme, discTracks[index]),
+            childCount: discTracks.length,
+          ),
         ),
       );
     }
@@ -671,11 +664,28 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
             mainAxisSize: MainAxisSize.min,
             children: [
               if (_isSelectionMode) ...[
-                AnimatedSelectionCheckbox(
-                  visible: true,
-                  selected: isSelected,
-                  colorScheme: colorScheme,
-                  size: 24,
+                Container(
+                  width: 24,
+                  height: 24,
+                  decoration: BoxDecoration(
+                    color: isSelected
+                        ? colorScheme.primary
+                        : Colors.transparent,
+                    shape: BoxShape.circle,
+                    border: Border.all(
+                      color: isSelected
+                          ? colorScheme.primary
+                          : colorScheme.outline,
+                      width: 2,
+                    ),
+                  ),
+                  child: isSelected
+                      ? Icon(
+                          Icons.check,
+                          color: colorScheme.onPrimary,
+                          size: 16,
+                        )
+                      : null,
                 ),
                 const SizedBox(width: 12),
               ],
@@ -805,11 +815,6 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
     final format = item.format?.toLowerCase();
     final lowerPath = item.filePath.toLowerCase();
     final isMp3 = format == 'mp3' || lowerPath.endsWith('.mp3');
-    final isM4A =
-        format == 'm4a' ||
-        format == 'aac' ||
-        lowerPath.endsWith('.m4a') ||
-        lowerPath.endsWith('.aac');
     final isOpus =
         format == 'opus' ||
         format == 'ogg' ||
@@ -823,12 +828,6 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
         coverPath: effectiveCoverPath,
         metadata: metadata,
       );
-    } else if (isM4A) {
-      ffmpegResult = await FFmpegService.embedMetadataToM4a(
-        m4aPath: ffmpegTarget,
-        coverPath: effectiveCoverPath,
-        metadata: metadata,
-      );
     } else if (isOpus) {
       ffmpegResult = await FFmpegService.embedMetadataToOpus(
         opusPath: ffmpegTarget,
@@ -898,128 +897,6 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
     return false;
   }
 
-  List<LocalLibraryItem> _selectedFlacEligibleItems(
-    List<LocalLibraryItem> allTracks,
-  ) {
-    final tracksById = {for (final t in allTracks) t.id: t};
-    return _selectedIds
-        .map((id) => tracksById[id])
-        .whereType<LocalLibraryItem>()
-        .where(LocalTrackRedownloadService.isFlacUpgradeEligible)
-        .toList(growable: false);
-  }
-
-  Future<void> _queueSelectedAsFlac(List<LocalLibraryItem> allTracks) async {
-    final selected = _selectedFlacEligibleItems(allTracks);
-
-    if (selected.isEmpty) {
-      return;
-    }
-
-    final confirmed = await showDialog<bool>(
-      context: context,
-      builder: (ctx) => AlertDialog(
-        title: Text(context.l10n.queueFlacAction),
-        content: Text(context.l10n.queueFlacConfirmMessage(selected.length)),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(ctx, false),
-            child: Text(context.l10n.dialogCancel),
-          ),
-          FilledButton(
-            onPressed: () => Navigator.pop(ctx, true),
-            child: Text(context.l10n.queueFlacAction),
-          ),
-        ],
-      ),
-    );
-
-    if (confirmed != true || !mounted) {
-      return;
-    }
-
-    final settings = ref.read(settingsProvider);
-    final extensionState = ref.read(extensionProvider);
-    final includeExtensions =
-        settings.useExtensionProviders &&
-        extensionState.extensions.any(
-          (ext) => ext.enabled && ext.hasMetadataProvider,
-        );
-    final targetService = LocalTrackRedownloadService.preferredFlacService(
-      settings,
-    );
-    final targetQuality =
-        LocalTrackRedownloadService.preferredFlacQualityForService(
-          targetService,
-        );
-
-    final matchedTracks = <Track>[];
-    var skippedCount = 0;
-    final total = selected.length;
-
-    for (var i = 0; i < total; i++) {
-      if (!mounted) break;
-
-      ScaffoldMessenger.of(context).clearSnackBars();
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(context.l10n.queueFlacFindingProgress(i + 1, total)),
-          duration: const Duration(seconds: 30),
-        ),
-      );
-
-      try {
-        final resolution = await LocalTrackRedownloadService.resolveBestMatch(
-          selected[i],
-          includeExtensions: includeExtensions,
-        );
-        if (resolution.canQueue && resolution.match != null) {
-          matchedTracks.add(resolution.match!);
-        } else {
-          skippedCount++;
-        }
-      } catch (_) {
-        skippedCount++;
-      }
-    }
-
-    if (!mounted) {
-      return;
-    }
-
-    ScaffoldMessenger.of(context).clearSnackBars();
-
-    if (matchedTracks.isEmpty) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text(context.l10n.queueFlacNoReliableMatches)),
-      );
-      return;
-    }
-
-    ref
-        .read(downloadQueueProvider.notifier)
-        .addMultipleToQueue(
-          matchedTracks,
-          targetService,
-          qualityOverride: targetQuality,
-        );
-
-    final summary = skippedCount == 0
-        ? context.l10n.snackbarAddedTracksToQueue(matchedTracks.length)
-        : context.l10n.queueFlacQueuedWithSkipped(
-            matchedTracks.length,
-            skippedCount,
-          );
-
-    ScaffoldMessenger.of(
-      context,
-    ).showSnackBar(SnackBar(content: Text(summary)));
-    setState(() {
-      _selectedIds.clear();
-      _isSelectionMode = false;
-    });
-  }
-
   Future<void> _reEnrichSelected(List<LocalLibraryItem> allTracks) async {
     final tracksById = {for (final t in allTracks) t.id: t};
     final selected = <LocalLibraryItem>[];
@@ -1128,57 +1005,8 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
     BuildContext context,
     List<LocalLibraryItem> allTracks,
   ) {
-    final tracksById = {for (final t in allTracks) t.id: t};
-    final sourceFormats = <String>{};
-    for (final id in _selectedIds) {
-      final item = tracksById[id];
-      if (item == null) continue;
-      String? ext;
-      if (item.format != null && item.format!.isNotEmpty) {
-        final fmt = item.format!.toLowerCase();
-        if (fmt == 'flac') {
-          ext = 'FLAC';
-        } else if (fmt == 'm4a') {
-          ext = 'M4A';
-        } else if (fmt == 'mp3') {
-          ext = 'MP3';
-        } else if (fmt == 'opus' || fmt == 'ogg') {
-          ext = 'Opus';
-        }
-      }
-      if (ext == null) {
-        final lower = item.filePath.toLowerCase();
-        if (lower.endsWith('.flac')) {
-          ext = 'FLAC';
-        } else if (lower.endsWith('.m4a')) {
-          ext = 'M4A';
-        } else if (lower.endsWith('.mp3')) {
-          ext = 'MP3';
-        } else if (lower.endsWith('.opus') || lower.endsWith('.ogg')) {
-          ext = 'Opus';
-        }
-      }
-      if (ext != null) sourceFormats.add(ext);
-    }
-
-    final formats = ['ALAC', 'FLAC', 'MP3', 'Opus'].where((target) {
-      return sourceFormats.any((src) {
-        if (src == target) return false;
-        final isLosslessTarget = target == 'ALAC' || target == 'FLAC';
-        final isLosslessSource = src == 'FLAC' || src == 'M4A';
-        if (isLosslessTarget && !isLosslessSource) return false;
-        return true;
-      });
-    }).toList();
-
-    if (formats.isEmpty) return;
-
-    String selectedFormat = formats.first;
-    bool isLosslessTarget =
-        selectedFormat == 'ALAC' || selectedFormat == 'FLAC';
-    String selectedBitrate = isLosslessTarget
-        ? '320k'
-        : (selectedFormat == 'Opus' ? '128k' : '320k');
+    String selectedFormat = 'MP3';
+    String selectedBitrate = '320k';
 
     showModalBottomSheet(
       context: context,
@@ -1190,6 +1018,7 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
         return StatefulBuilder(
           builder: (context, setSheetState) {
             final colorScheme = Theme.of(context).colorScheme;
+            final formats = ['MP3', 'Opus'];
             final bitrates = ['128k', '192k', '256k', '320k'];
 
             return SafeArea(
@@ -1226,73 +1055,51 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
                       ),
                     ),
                     const SizedBox(height: 8),
-                    Wrap(
-                      spacing: 8,
+                    Row(
                       children: formats.map((format) {
                         final isSelected = format == selectedFormat;
-                        return ChoiceChip(
-                          label: Text(format),
-                          selected: isSelected,
-                          onSelected: (selected) {
-                            if (selected) {
-                              setSheetState(() {
-                                selectedFormat = format;
-                                isLosslessTarget =
-                                    format == 'ALAC' || format == 'FLAC';
-                                if (!isLosslessTarget) {
+                        return Padding(
+                          padding: const EdgeInsets.only(right: 8),
+                          child: ChoiceChip(
+                            label: Text(format),
+                            selected: isSelected,
+                            onSelected: (selected) {
+                              if (selected) {
+                                setSheetState(() {
+                                  selectedFormat = format;
                                   selectedBitrate = format == 'Opus'
                                       ? '128k'
                                       : '320k';
-                                }
-                              });
+                                });
+                              }
+                            },
+                          ),
+                        );
+                      }).toList(),
+                    ),
+                    const SizedBox(height: 16),
+                    Text(
+                      context.l10n.trackConvertBitrate,
+                      style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                        color: colorScheme.onSurfaceVariant,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    Wrap(
+                      spacing: 8,
+                      children: bitrates.map((br) {
+                        final isSelected = br == selectedBitrate;
+                        return ChoiceChip(
+                          label: Text(br),
+                          selected: isSelected,
+                          onSelected: (selected) {
+                            if (selected) {
+                              setSheetState(() => selectedBitrate = br);
                             }
                           },
                         );
                       }).toList(),
                     ),
-                    if (!isLosslessTarget) ...[
-                      const SizedBox(height: 16),
-                      Text(
-                        context.l10n.trackConvertBitrate,
-                        style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                          color: colorScheme.onSurfaceVariant,
-                        ),
-                      ),
-                      const SizedBox(height: 8),
-                      Wrap(
-                        spacing: 8,
-                        children: bitrates.map((br) {
-                          final isSelected = br == selectedBitrate;
-                          return ChoiceChip(
-                            label: Text(br),
-                            selected: isSelected,
-                            onSelected: (selected) {
-                              if (selected) {
-                                setSheetState(() => selectedBitrate = br);
-                              }
-                            },
-                          );
-                        }).toList(),
-                      ),
-                    ],
-                    if (isLosslessTarget) ...[
-                      const SizedBox(height: 16),
-                      Row(
-                        children: [
-                          Icon(
-                            Icons.verified,
-                            size: 16,
-                            color: colorScheme.primary,
-                          ),
-                          const SizedBox(width: 6),
-                          Text(
-                            context.l10n.trackConvertLosslessHint,
-                            style: Theme.of(context).textTheme.bodySmall
-                                ?.copyWith(color: colorScheme.primary),
-                          ),
-                        ],
-                      ),
-                    ],
                     const SizedBox(height: 24),
                     SizedBox(
                       width: double.infinity,
@@ -1345,8 +1152,6 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
         final fmt = item.format!.toLowerCase();
         if (fmt == 'flac') {
           currentFormat = 'FLAC';
-        } else if (fmt == 'm4a') {
-          currentFormat = 'M4A';
         } else if (fmt == 'mp3') {
           currentFormat = 'MP3';
         } else if (fmt == 'opus' || fmt == 'ogg') {
@@ -1358,20 +1163,15 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
         final lower = item.filePath.toLowerCase();
         if (lower.endsWith('.flac')) {
           currentFormat = 'FLAC';
-        } else if (lower.endsWith('.m4a')) {
-          currentFormat = 'M4A';
         } else if (lower.endsWith('.mp3')) {
           currentFormat = 'MP3';
         } else if (lower.endsWith('.opus') || lower.endsWith('.ogg')) {
           currentFormat = 'Opus';
         }
       }
-      if (currentFormat == null || currentFormat == targetFormat) continue;
-      final isLosslessTarget = targetFormat == 'ALAC' || targetFormat == 'FLAC';
-      final isLosslessSource =
-          currentFormat == 'FLAC' || currentFormat == 'M4A';
-      if (isLosslessTarget && !isLosslessSource) continue;
-      selected.add(item);
+      if (currentFormat != null && currentFormat != targetFormat) {
+        selected.add(item);
+      }
     }
 
     if (selected.isEmpty) {
@@ -1383,22 +1183,16 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
       return;
     }
 
-    final isLossless = targetFormat == 'ALAC' || targetFormat == 'FLAC';
     final confirmed = await showDialog<bool>(
       context: context,
       builder: (ctx) => AlertDialog(
         title: Text(context.l10n.selectionBatchConvertConfirmTitle),
         content: Text(
-          isLossless
-              ? context.l10n.selectionBatchConvertConfirmMessageLossless(
-                  selected.length,
-                  targetFormat,
-                )
-              : context.l10n.selectionBatchConvertConfirmMessage(
-                  selected.length,
-                  targetFormat,
-                  bitrate,
-                ),
+          context.l10n.selectionBatchConvertConfirmMessage(
+            selected.length,
+            targetFormat,
+            bitrate,
+          ),
         ),
         actions: [
           TextButton(
@@ -1445,7 +1239,12 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
         try {
           final result = await PlatformBridge.readFileMetadata(item.filePath);
           if (result['error'] == null) {
-            mergePlatformMetadataForTagEmbed(target: metadata, source: result);
+            result.forEach((key, value) {
+              if (key == 'error' || value == null) return;
+              final v = value.toString().trim();
+              if (v.isEmpty) return;
+              metadata[key.toUpperCase()] = v;
+            });
           }
         } catch (_) {}
         await ensureLyricsMetadataForConversion(
@@ -1487,7 +1286,7 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
           bitrate: bitrate,
           metadata: metadata,
           coverPath: coverPath,
-          deleteOriginal: !isSaf,
+          deleteOriginal: !isSaf, // Only delete original for regular files
         );
 
         if (coverPath != null) {
@@ -1506,9 +1305,15 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
         }
 
         if (isSaf) {
+          // For SAF: derive the parent tree URI and relative dir from the content URI,
+          // then create new SAF file and delete old one
+          // Parse the SAF URI to get the tree document path:
+          // content://...tree/...document/.../oldName.flac
+          // We need tree URI and relative dir to create the new file
           final uri = Uri.parse(item.filePath);
           final pathSegments = uri.pathSegments;
 
+          // Try to find 'tree' and 'document' segments
           String? treeUri;
           String relativeDir = '';
           String oldFileName = '';
@@ -1552,27 +1357,13 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
             final baseName = dotIdx > 0
                 ? oldFileName.substring(0, dotIdx)
                 : oldFileName;
-            String newExt;
-            String mimeType;
-            switch (targetFormat.toLowerCase()) {
-              case 'opus':
-                newExt = '.opus';
-                mimeType = 'audio/opus';
-                break;
-              case 'alac':
-                newExt = '.m4a';
-                mimeType = 'audio/mp4';
-                break;
-              case 'flac':
-                newExt = '.flac';
-                mimeType = 'audio/flac';
-                break;
-              default:
-                newExt = '.mp3';
-                mimeType = 'audio/mpeg';
-                break;
-            }
+            final newExt = targetFormat.toLowerCase() == 'opus'
+                ? '.opus'
+                : '.mp3';
             final newFileName = '$baseName$newExt';
+            final mimeType = targetFormat.toLowerCase() == 'opus'
+                ? 'audio/opus'
+                : 'audio/mpeg';
 
             final safUri = await PlatformBridge.createSafFileFromPath(
               treeUri: treeUri,
@@ -1643,7 +1434,6 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
     double bottomPadding,
   ) {
     final selectedCount = _selectedIds.length;
-    final flacEligibleCount = _selectedFlacEligibleItems(tracks).length;
     final allSelected = selectedCount == tracks.length && tracks.isNotEmpty;
 
     return Container(
@@ -1735,18 +1525,6 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
 
               Row(
                 children: [
-                  if (flacEligibleCount > 0) ...[
-                    Expanded(
-                      child: _LocalAlbumSelectionActionButton(
-                        icon: Icons.download_for_offline_outlined,
-                        label:
-                            '${context.l10n.queueFlacAction} ($flacEligibleCount)',
-                        onPressed: () => _queueSelectedAsFlac(tracks),
-                        colorScheme: colorScheme,
-                      ),
-                    ),
-                    const SizedBox(width: 8),
-                  ],
                   Expanded(
                     child: _LocalAlbumSelectionActionButton(
                       icon: Icons.auto_fix_high_outlined,