New translations app_en.arb (Ukrainian)

- Replace app_es-ES.arb, app_pt-PT.arb, app_tr-TR.arb (hyphen format)
  with properly named app_es_ES.arb, app_pt_PT.arb, app_tr.arb
- Fix @@locale values to match Flutter filename convention (underscore)
- Fix ICU plural syntax: remove redundant 'one {}' before '=1{...}'
  in es_ES, pt_PT, tr translations
- Regenerate l10n output files

.fvmrc

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

.github/workflows/release.yml

@@ -393,6 +393,63 @@ 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]

.gitignore

@@ -77,3 +77,6 @@ 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 `spotify.afkarxyz.fun/api`
+  - New backend client for `sp.afkarxyz.qzz.io/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 `amazon.afkarxyz.fun` API flow (ASIN-based track endpoint + legacy fallback) with encrypted stream support
+- Amazon now uses the new `amzn.afkarxyz.qzz.io` 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,17 +86,31 @@ Translation files are located in `lib/l10n/arb/`.
    git remote add upstream https://github.com/zarzet/SpotiFLAC-Mobile.git
    ```
 
-3. **Install dependencies**
+3. **Use FVM (Flutter Version: 3.38.1)**
+   ```bash
+   fvm use
+   ```
+
+4. **Install dependencies**
    ```bash
    flutter pub get
    ```
 
-4. **Generate code** (for Riverpod, JSON serialization, etc.)
+5. **Generate code** (for Riverpod, JSON serialization, etc.)
    ```bash
    dart run build_runner build --delete-conflicting-outputs
    ```
 
-5. **Run the app**
+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**
    ```bash
    flutter run
    ```

README.md

@@ -14,6 +14,17 @@
 
 </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">
@@ -23,68 +34,141 @@
   <img src="assets/images/4.jpg?v=2" width="200" />
 </p>
 
-<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/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 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.
+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.
 
 ### Installing Extensions
-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**
+
+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**
 
 ### Developing Extensions
-Want to create your own extension? Check out the [Extension Development Guide](https://zarzet.github.io/SpotiFLAC-Mobile/docs) for complete documentation.
 
-## Other project
+> [!NOTE]
+> Want to build your own extension? The [Extension Development Guide](https://zarzet.github.io/SpotiFLAC-Mobile/docs) has everything you need.
+
+---
+
+## Related Projects
 
 ### [SpotiFLAC (Desktop)](https://github.com/afkarxyz/SpotiFLAC)
-Download music in true lossless FLAC from Tidal, Qobuz & Amazon Music for Windows, macOS & Linux
+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).
+
+---
 
 ## FAQ
 
-**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.
+<details>
+<summary><b>Why does the Store tab ask me to enter a URL?</b></summary>
+<br>
 
-**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.
+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: 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>
 
-**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.
+<details>
+<summary><b>Why is my download failing with "Song not found"?</b></summary>
+<br>
 
-**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).
+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: 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>
 
+<details>
+<summary><b>Why are some tracks downloading in lower quality?</b></summary>
+<br>
 
-### Want to support SpotiFLAC-Mobile?
+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
 
-_If this software is useful and brings you value, consider supporting the project. Your support helps keep development going._
+</details>
 
-[![Ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/zarzet)
+<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>
+
+---
+
+## 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!
+
+---
 
 ## 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) | |
 
+> [!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)
 
 > [!TIP]
->
-> **Star Us**, You will receive all release notifications from GitHub without any delay ~
+> **Star the repo** to get notified about all new releases directly from GitHub.

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

@@ -30,6 +30,7 @@ import org.json.JSONObject
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
+import java.security.MessageDigest
 import java.util.Locale
 
 class MainActivity: FlutterFragmentActivity() {
@@ -111,6 +112,13 @@ class MainActivity: FlutterFragmentActivity() {
         }
     }
 
+    private fun buildStableLibraryId(filePath: String): String {
+        val digest = MessageDigest.getInstance("SHA-1")
+        val bytes = digest.digest(filePath.toByteArray(Charsets.UTF_8))
+        val hex = bytes.joinToString("") { "%02x".format(it) }
+        return "lib_$hex"
+    }
+
     data class SafScanProgress(
         var totalFiles: Int = 0,
         var scannedFiles: Int = 0,
@@ -1263,7 +1271,9 @@ class MainActivity: FlutterFragmentActivity() {
             } else {
                 try {
                     val lastModified = try { doc.lastModified() } catch (_: Exception) { 0L }
-                    metadataObj.put("filePath", doc.uri.toString())
+                    val stableUri = doc.uri.toString()
+                    metadataObj.put("id", buildStableLibraryId(stableUri))
+                    metadataObj.put("filePath", stableUri)
                     metadataObj.put("fileModTime", lastModified)
                     results.put(metadataObj)
                 } catch (_: Exception) {
@@ -1680,7 +1690,9 @@ class MainActivity: FlutterFragmentActivity() {
             } else {
                 try {
                     val safeLastModified = try { doc.lastModified() } catch (_: Exception) { lastModified }
-                    metadataObj.put("filePath", doc.uri.toString())
+                    val stableUri = doc.uri.toString()
+                    metadataObj.put("id", buildStableLibraryId(stableUri))
+                    metadataObj.put("filePath", stableUri)
                     metadataObj.put("fileModTime", safeLastModified)
                     metadataObj.put("lastModified", safeLastModified)
                     results.put(metadataObj)
@@ -2630,6 +2642,28 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        // Tidal search API
+                        "searchTidalAll" -> {
+                            val query = call.argument<String>("query") ?: ""
+                            val trackLimit = call.argument<Int>("track_limit") ?: 15
+                            val artistLimit = call.argument<Int>("artist_limit") ?: 2
+                            val filter = call.argument<String>("filter") ?: ""
+                            val response = withContext(Dispatchers.IO) {
+                                Gobackend.searchTidalAll(query, trackLimit.toLong(), artistLimit.toLong(), filter)
+                            }
+                            result.success(response)
+                        }
+                        // Qobuz search API
+                        "searchQobuzAll" -> {
+                            val query = call.argument<String>("query") ?: ""
+                            val trackLimit = call.argument<Int>("track_limit") ?: 15
+                            val artistLimit = call.argument<Int>("artist_limit") ?: 2
+                            val filter = call.argument<String>("filter") ?: ""
+                            val response = withContext(Dispatchers.IO) {
+                                Gobackend.searchQobuzAll(query, trackLimit.toLong(), artistLimit.toLong(), filter)
+                            }
+                            result.success(response)
+                        }
                         "getDeezerRelatedArtists" -> {
                             val artistId = call.argument<String>("artist_id") ?: ""
                             val limit = call.argument<Int>("limit") ?: 12

apps.json

@@ -0,0 +1,18 @@
+{
+  "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
+    }
+  ]
+}

go_backend/audio_metadata.go

@@ -1594,7 +1594,19 @@ func extractAnyCoverArtWithHint(filePath, displayNameHint string) ([]byte, strin
 		return extractOggCoverArt(filePath)
 
 	case ".m4a":
-		return nil, "", fmt.Errorf("M4A cover extraction not yet supported")
+		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
 
 	default:
 		return nil, "", fmt.Errorf("unsupported format: %s", ext)

go_backend/deezer.go

@@ -256,6 +256,7 @@ 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"`
@@ -1084,8 +1085,9 @@ func (c *DeezerClient) getBestAlbumImage(album deezerAlbumFull) string {
 }
 
 type AlbumExtendedMetadata struct {
-	Genre string
-	Label string
+	Genre     string
+	Label     string
+	Copyright string
 }
 
 func (c *DeezerClient) GetAlbumExtendedMetadata(ctx context.Context, albumID string) (*AlbumExtendedMetadata, error) {
@@ -1116,8 +1118,9 @@ func (c *DeezerClient) GetAlbumExtendedMetadata(ctx context.Context, albumID str
 	}
 
 	result := &AlbumExtendedMetadata{
-		Genre: strings.Join(genres, ", "),
-		Label: album.Label,
+		Genre:     strings.Join(genres, ", "),
+		Label:     album.Label,
+		Copyright: album.Copyright,
 	}
 
 	c.cacheMu.Lock()
@@ -1129,7 +1132,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\n", result.Genre, result.Label)
+	GoLog("[Deezer] Album metadata fetched - Genre: %s, Label: %s, Copyright: %s\n", result.Genre, result.Label, result.Copyright)
 
 	return result, nil
 }

go_backend/deezer_download.go

@@ -203,29 +203,48 @@ func resolveDeezerTrackURL(req DownloadRequest) (string, error) {
 		}
 	}
 	if deezerID != "" {
-		return fmt.Sprintf("https://www.deezer.com/track/%s", deezerID), nil
+		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
 	}
 
-	// Try resolving Deezer ID from Spotify ID via SongLink
+	// Try SongLink
 	spotifyID := strings.TrimSpace(req.SpotifyID)
 	if spotifyID != "" && isLikelySpotifyTrackID(spotifyID) {
 		songlink := NewSongLinkClient()
 		availability, err := songlink.CheckTrackAvailability(spotifyID, "")
 		if err == nil && availability.Deezer && availability.DeezerURL != "" {
-			return availability.DeezerURL, nil
+			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
+			}
 		}
 	}
 
-	// Try resolving from ISRC
+	// Try 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 {
-			deezerID = songLinkExtractDeezerTrackID(track)
-			if deezerID != "" {
-				return fmt.Sprintf("https://www.deezer.com/track/%s", deezerID), 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
 			}
 		}
 	}
@@ -233,6 +252,26 @@ 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"`

go_backend/exports.go

@@ -128,6 +128,7 @@ type DownloadResult struct {
 	TrackNumber   int
 	DiscNumber    int
 	ISRC          string
+	CoverURL      string
 	Genre         string
 	Label         string
 	Copyright     string
@@ -135,6 +136,36 @@ 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,
@@ -153,25 +184,16 @@ func buildDownloadSuccessResponse(
 		artist = req.ArtistName
 	}
 
-	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
-	}
+	// 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,
+	)
 
 	isrc := result.ISRC
 	if isrc == "" {
@@ -193,6 +215,11 @@ func buildDownloadSuccessResponse(
 		copyright = req.Copyright
 	}
 
+	coverURL := strings.TrimSpace(result.CoverURL)
+	if coverURL == "" {
+		coverURL = strings.TrimSpace(req.CoverURL)
+	}
+
 	return DownloadResponse{
 		Success:          true,
 		Message:          message,
@@ -209,7 +236,7 @@ func buildDownloadSuccessResponse(
 		TrackNumber:      trackNumber,
 		DiscNumber:       discNumber,
 		ISRC:             isrc,
-		CoverURL:         req.CoverURL,
+		CoverURL:         coverURL,
 		Genre:            genre,
 		Label:            label,
 		Copyright:        copyright,
@@ -262,7 +289,7 @@ func enrichRequestExtendedMetadata(req *DownloadRequest) {
 		return
 	}
 
-	if req.ISRC == "" || (req.Genre != "" && req.Label != "") {
+	if req.ISRC == "" || (req.Genre != "" && req.Label != "" && req.Copyright != "") {
 		return
 	}
 
@@ -284,8 +311,11 @@ func enrichRequestExtendedMetadata(req *DownloadRequest) {
 	if req.Label == "" && extMeta.Label != "" {
 		req.Label = extMeta.Label
 	}
-	if req.Genre != "" || req.Label != "" {
-		GoLog("[DownloadWithFallback] Extended metadata ready: genre=%s, label=%s\n", req.Genre, req.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)
 	}
 }
 
@@ -354,6 +384,7 @@ func DownloadTrack(requestJSON string) (string, error) {
 				TrackNumber: qobuzResult.TrackNumber,
 				DiscNumber:  qobuzResult.DiscNumber,
 				ISRC:        qobuzResult.ISRC,
+				CoverURL:    qobuzResult.CoverURL,
 				LyricsLRC:   qobuzResult.LyricsLRC,
 			}
 		}
@@ -562,6 +593,7 @@ 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) {
@@ -715,6 +747,26 @@ func ReadFileMetadata(filePath string) (string, error) {
 			}
 		}
 	} 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
@@ -1103,6 +1155,36 @@ 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()
@@ -1314,10 +1396,7 @@ func GetDeezerExtendedMetadata(trackID string) (string, error) {
 		return "", err
 	}
 
-	result := map[string]string{
-		"genre": metadata.Genre,
-		"label": metadata.Label,
-	}
+	result := buildDeezerExtendedMetadataResult(metadata)
 
 	jsonBytes, err := json.Marshal(result)
 	if err != nil {
@@ -1337,7 +1416,8 @@ func SearchDeezerByISRC(isrc string) (string, error) {
 		return "", err
 	}
 
-	jsonBytes, err := json.Marshal(track)
+	result := buildDeezerISRCSearchResult(track)
+	jsonBytes, err := json.Marshal(result)
 	if err != nil {
 		return "", err
 	}
@@ -1345,6 +1425,55 @@ 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()
@@ -1623,6 +1752,8 @@ 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") {
@@ -1803,8 +1934,8 @@ func ReEnrichFile(requestJSON string) (string, error) {
 			GoLog("[ReEnrich] Metadata provider search failed: %v\n", searchErr)
 		}
 
-		// Try to get extended metadata (genre, label) from Deezer if not already set
-		if found && req.ISRC != "" && (req.Genre == "" || req.Label == "") {
+		// Try to get extended metadata from Deezer if not already set
+		if found && req.ISRC != "" && (req.Genre == "" || req.Label == "" || req.Copyright == "") {
 			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 			extMeta, err := deezerClient.GetExtendedMetadataByISRC(ctx, req.ISRC)
 			cancel()
@@ -1815,7 +1946,10 @@ func ReEnrichFile(requestJSON string) (string, error) {
 				if req.Label == "" && extMeta.Label != "" {
 					req.Label = extMeta.Label
 				}
-				GoLog("[ReEnrich] Extended metadata: genre=%s, label=%s\n", req.Genre, req.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)
 			}
 		}
 
@@ -1884,8 +2018,15 @@ func ReEnrichFile(requestJSON string) (string, error) {
 		}
 	}()
 
-	// Fetch lyrics
+	// 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
 	if req.EmbedLyrics {
 		client := NewLyricsClient()
 		durationSec := float64(req.DurationMs) / 1000.0
@@ -1966,7 +2107,6 @@ 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{}{

go_backend/exports_deezer_metadata_test.go

@@ -0,0 +1,59 @@
+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

@@ -0,0 +1,115 @@
+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_providers.go

@@ -1065,8 +1065,9 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 			GoLog("[DownloadWithExtensionFallback] Metadata provider search failed (non-fatal): %v\n", searchErr)
 		}
 
-		// Try Deezer extended metadata for genre/label if we have ISRC
-		if req.ISRC != "" && (req.Genre == "" || req.Label == "") {
+		// 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()
@@ -1077,7 +1078,10 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 				if req.Label == "" && extMeta.Label != "" {
 					req.Label = extMeta.Label
 				}
-				GoLog("[DownloadWithExtensionFallback] Extended metadata from Deezer: genre=%s, label=%s\n", req.Genre, req.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)
 			}
 		}
 	}
@@ -1249,7 +1253,8 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 		GoLog("[DownloadWithExtensionFallback] Trying provider: %s\n", providerID)
 
 		if isBuiltInProvider(providerIDNormalized) {
-			if (req.Genre == "" || req.Label == "") && req.ISRC != "" {
+			if (req.Genre == "" || req.Label == "" || req.Copyright == "") &&
+				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()
@@ -1264,6 +1269,10 @@ 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)
 				}
@@ -1471,6 +1480,7 @@ func tryBuiltInProvider(providerID string, req DownloadRequest) (*DownloadRespon
 				TrackNumber: qobuzResult.TrackNumber,
 				DiscNumber:  qobuzResult.DiscNumber,
 				ISRC:        qobuzResult.ISRC,
+				CoverURL:    qobuzResult.CoverURL,
 			}
 		}
 		err = qobuzErr
@@ -1513,6 +1523,7 @@ 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,

go_backend/extension_runtime.go

@@ -81,13 +81,14 @@ func SetExtensionTokens(extensionID string, accessToken, refreshToken string, ex
 }
 
 type ExtensionRuntime struct {
-	extensionID string
-	manifest    *ExtensionManifest
-	settings    map[string]interface{}
-	httpClient  *http.Client
-	cookieJar   http.CookieJar
-	dataDir     string
-	vm          *goja.Runtime
+	extensionID    string
+	manifest       *ExtensionManifest
+	settings       map[string]interface{}
+	httpClient     *http.Client
+	downloadClient *http.Client
+	cookieJar      http.CookieJar
+	dataDir        string
+	vm             *goja.Runtime
 
 	storageMu      sync.RWMutex
 	storageCache   map[string]interface{}
@@ -132,13 +133,20 @@ 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:   30 * time.Second,
+		Timeout:   timeout,
 		Jar:       jar,
 	}
 	client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
@@ -165,9 +173,7 @@ func NewExtensionRuntime(ext *LoadedExtension) *ExtensionRuntime {
 		}
 		return nil
 	}
-	runtime.httpClient = client
-
-	return runtime
+	return client
 }
 
 type RedirectBlockedError struct {

go_backend/extension_runtime_file.go

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

go_backend/httputil.go

@@ -346,11 +346,12 @@ func calculateNextDelay(currentDelay time.Duration, config RetryConfig) time.Dur
 	return min(nextDelay, config.MaxDelay)
 }
 
-// Returns 60 seconds as default if header is missing or invalid
+// Returns 0 if the header is missing or invalid so callers can keep their
+// normal exponential backoff instead of stalling for an arbitrary minute.
 func getRetryAfterDuration(resp *http.Response) time.Duration {
 	retryAfter := resp.Header.Get("Retry-After")
 	if retryAfter == "" {
-		return 60 * time.Second
+		return 0
 	}
 
 	if seconds, err := strconv.Atoi(retryAfter); err == nil {
@@ -364,7 +365,7 @@ func getRetryAfterDuration(resp *http.Response) time.Duration {
 		}
 	}
 
-	return 60 * time.Second
+	return 0
 }
 
 func ReadResponseBody(resp *http.Response) ([]byte, error) {

go_backend/library_scan.go

@@ -293,7 +293,7 @@ func scanAudioFileWithKnownModTimeAndDisplayName(filePath, displayNameHint, scan
 	libraryCoverCacheMu.RLock()
 	coverCacheDir := libraryCoverCacheDir
 	libraryCoverCacheMu.RUnlock()
-	if coverCacheDir != "" && ext != ".m4a" {
+	if coverCacheDir != "" {
 		coverPath, err := SaveCoverToCacheWithHint(filePath, displayNameHint, coverCacheDir)
 		if err == nil && coverPath != "" {
 			result.CoverPath = coverPath
@@ -373,13 +373,30 @@ func scanFLACFile(filePath string, result *LibraryScanResult) (*LibraryScanResul
 }
 
 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
 	}
 
-	return scanFromFilename(filePath, "", result)
+	applyDefaultLibraryMetadata(filePath, "", result)
+	return result, nil
 }
 
 func scanMP3File(filePath string, result *LibraryScanResult) (*LibraryScanResult, error) {

go_backend/lyrics.go

@@ -3,6 +3,7 @@ package gobackend
 import (
 	"encoding/json"
 	"fmt"
+	"io"
 	"math"
 	"net/http"
 	"net/url"
@@ -121,12 +122,12 @@ func GetLyricsProviderOrder() []string {
 // 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 synced lyrics via community API"},
+		{"id": LyricsProviderSpotifyAPI, "name": "Spotify Lyrics API", "has_proxy_dependency": true, "description": "Spotify-sourced lyrics via Paxsenix"},
 		{"id": LyricsProviderLRCLIB, "name": "LRCLIB", "has_proxy_dependency": false, "description": "Open-source synced lyrics database"},
-		{"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)"},
+		{"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"},
 	}
 }
 
@@ -431,6 +432,99 @@ 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) {
@@ -449,7 +543,7 @@ func (c *LyricsClient) FetchLyricsFromSpotifyAPI(spotifyID string) (*LyricsRespo
 		spotifyID = parsed.ID
 	}
 
-	apiURL := fmt.Sprintf("https://spotify-lyrics-api-pi.vercel.app/?trackid=%s&format=lrc", url.QueryEscape(spotifyID))
+	apiURL := fmt.Sprintf("https://lyrics.paxsenix.org/spotify/lyrics?id=%s", url.QueryEscape(spotifyID))
 	req, err := http.NewRequest("GET", apiURL, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
@@ -462,13 +556,18 @@ 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.NewDecoder(resp.Body).Decode(&payload); err == nil {
+		if err := json.Unmarshal(bodyBytes, &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))
 			}
@@ -479,63 +578,7 @@ func (c *LyricsClient) FetchLyricsFromSpotifyAPI(spotifyID string) (*LyricsRespo
 		return nil, fmt.Errorf("Spotify Lyrics API returned status %d", resp.StatusCode)
 	}
 
-	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
+	return parseSpotifyLyricsResponseBody(bodyBytes)
 }
 
 func (c *LyricsClient) findBestMatch(results []LRCLibResponse, targetDurationSec float64) *LRCLibResponse {

go_backend/lyrics_apple.go

@@ -4,121 +4,25 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"math"
 	"net/http"
 	"net/url"
-	"regexp"
 	"strings"
-	"sync"
 	"time"
 )
 
 // AppleMusicClient fetches lyrics from Apple Music.
-// Uses a scraped JWT token for search and a proxy for lyrics.
+// Uses Paxsenix endpoints for search and lyrics.
 type AppleMusicClient struct {
 	httpClient *http.Client
 }
 
-// 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"`
+type appleMusicSearchResult struct {
+	ID         string `json:"id"`
+	SongName   string `json:"songName"`
+	ArtistName string `json:"artistName"`
+	AlbumName  string `json:"albumName"`
+	Duration   int    `json:"duration"`
 }
 
 // PaxResponse represents the lyrics proxy response for word-by-word / line lyrics
@@ -149,32 +53,71 @@ 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) (string, error) {
+func (c *AppleMusicClient) SearchSong(trackName, artistName string, durationSec float64) (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://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,
-	)
+	searchURL := fmt.Sprintf("https://lyrics.paxsenix.org/apple-music/search?q=%s", 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")
 
@@ -184,25 +127,21 @@ func (c *AppleMusicClient) SearchSong(trackName, artistName string) (string, err
 	}
 	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 appleMusicSearchResponse
+	var searchResp []appleMusicSearchResult
 	if err := json.NewDecoder(resp.Body).Decode(&searchResp); err != nil {
 		return "", fmt.Errorf("failed to decode apple music response: %w", err)
 	}
 
-	if searchResp.Results.Songs == nil || len(searchResp.Results.Songs.Data) == 0 {
+	best := selectBestAppleMusicSearchResult(searchResp, trackName, artistName, durationSec)
+	if best == nil || strings.TrimSpace(best.ID) == "" {
 		return "", fmt.Errorf("no songs found on apple music")
 	}
 
-	return searchResp.Results.Songs.Data[0].ID, nil
+	return strings.TrimSpace(best.ID), nil
 }
 
 // FetchLyricsByID fetches lyrics from the paxsenix proxy using Apple Music song ID.
@@ -320,7 +259,7 @@ func (c *AppleMusicClient) FetchLyrics(
 	durationSec float64,
 	multiPersonWordByWord bool,
 ) (*LyricsResponse, error) {
-	songID, err := c.SearchSong(trackName, artistName)
+	songID, err := c.SearchSong(trackName, artistName, durationSec)
 	if err != nil {
 		return nil, err
 	}

go_backend/lyrics_musixmatch.go

@@ -3,6 +3,8 @@ package gobackend
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"math"
 	"net/http"
 	"net/url"
 	"strings"
@@ -45,100 +47,105 @@ type musixmatchLyricsResponse struct {
 func NewMusixmatchClient() *MusixmatchClient {
 	return &MusixmatchClient{
 		httpClient: NewMetadataHTTPClient(15 * time.Second),
-		baseURL:    "http://158.180.60.95",
+		baseURL:    "https://lyrics.paxsenix.org/musixmatch/lyrics",
 	}
 }
 
-// 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) {
+func (c *MusixmatchClient) fetchLyricsPayload(trackName, artistName string, durationSec float64, lyricsType, language string) (string, error) {
 	if strings.TrimSpace(trackName) == "" || strings.TrimSpace(artistName) == "" {
-		return nil, fmt.Errorf("empty track or artist name")
+		return "", fmt.Errorf("empty track or artist name")
 	}
 
-	encodedArtist := url.QueryEscape(artistName)
-	encodedTrack := url.QueryEscape(trackName)
-
-	fullURL := fmt.Sprintf("%s/v2/full?artist=%s&track=%s", c.baseURL, encodedArtist, encodedTrack)
+	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()
 
 	req, err := http.NewRequest("GET", fullURL, nil)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create request: %w", err)
+		return "", 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 nil, fmt.Errorf("musixmatch search failed: %w", err)
+		return "", fmt.Errorf("musixmatch request 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 {
-		return nil, fmt.Errorf("musixmatch proxy returned HTTP %d", resp.StatusCode)
+		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)
 	}
 
-	var result musixmatchSearchResponse
-	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
-		return nil, fmt.Errorf("failed to decode musixmatch response: %w", err)
+	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
 	}
 
-	return &result, nil
+	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")
 }
 
 // FetchLyricsInLanguage retrieves lyrics from Musixmatch for a specific language code.
-func (c *MusixmatchClient) FetchLyricsInLanguage(songID int64, language string) (*LyricsResponse, error) {
+func (c *MusixmatchClient) FetchLyricsInLanguage(trackName, artistName string, durationSec float64, language string) (*LyricsResponse, error) {
 	lang := strings.ToLower(strings.TrimSpace(language))
-	if songID <= 0 || lang == "" {
-		return nil, fmt.Errorf("invalid song id or language")
+	if lang == "" {
+		return nil, fmt.Errorf("invalid language")
 	}
 
-	fullURL := fmt.Sprintf("%s/v2/full?id=%d&lang=%s", c.baseURL, songID, url.QueryEscape(lang))
-
-	req, err := http.NewRequest("GET", fullURL, nil)
+	lrcText, err := c.fetchLyricsPayload(trackName, artistName, durationSec, "translate", lang)
 	if err != nil {
-		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)
+		return nil, err
 	}
 
-	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)
+	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
 	}
 
-	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
-		}
+	plainLines := plainTextLyricsLines(lrcText)
+	if len(plainLines) > 0 {
+		return &LyricsResponse{
+			Lines:       plainLines,
+			SyncType:    "UNSYNCED",
+			PlainLyrics: lrcText,
+			Provider:    "Musixmatch",
+			Source:      fmt.Sprintf("Musixmatch (%s)", lang),
+		}, nil
 	}
 
 	return nil, fmt.Errorf("no lyrics found on musixmatch for language %s", lang)
@@ -146,43 +153,39 @@ func (c *MusixmatchClient) FetchLyricsInLanguage(songID int64, language string)
 
 // FetchLyrics searches Musixmatch and returns parsed LyricsResponse.
 func (c *MusixmatchClient) FetchLyrics(trackName, artistName string, durationSec float64, preferredLanguage string) (*LyricsResponse, error) {
-	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 preferred := strings.ToLower(strings.TrimSpace(preferredLanguage)); preferred != "" {
+		localized, localizedErr := c.FetchLyricsInLanguage(trackName, artistName, durationSec, preferred)
 		if localizedErr == nil {
 			return localized, nil
 		}
 		GoLog("[Musixmatch] Language override '%s' failed: %v\n", preferred, localizedErr)
 	}
 
-	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
-		}
+	lrcText, err := c.fetchLyricsPayload(trackName, artistName, durationSec, "word", "")
+	if err != nil {
+		return nil, err
 	}
 
-	if result.UnsyncedLyrics != nil && strings.TrimSpace(result.UnsyncedLyrics.Lyrics) != "" {
-		lines := plainTextLyricsLines(result.UnsyncedLyrics.Lyrics)
+	lines := parseSyncedLyrics(lrcText)
+	if len(lines) > 0 {
+		return &LyricsResponse{
+			Lines:       lines,
+			SyncType:    "LINE_SYNCED",
+			PlainLyrics: plainLyricsFromTimedLines(lines),
+			Provider:    "Musixmatch",
+			Source:      "Musixmatch",
+		}, nil
+	}
 
-		if len(lines) > 0 {
-			return &LyricsResponse{
-				Lines:       lines,
-				SyncType:    "UNSYNCED",
-				PlainLyrics: result.UnsyncedLyrics.Lyrics,
-				Provider:    "Musixmatch",
-				Source:      "Musixmatch",
-			}, nil
-		}
+	plainLines := plainTextLyricsLines(lrcText)
+	if len(plainLines) > 0 {
+		return &LyricsResponse{
+			Lines:       plainLines,
+			SyncType:    "UNSYNCED",
+			PlainLyrics: lrcText,
+			Provider:    "Musixmatch",
+			Source:      "Musixmatch",
+		}, nil
 	}
 
 	return nil, fmt.Errorf("no lyrics found on musixmatch")

go_backend/lyrics_netease.go

@@ -9,8 +9,7 @@ import (
 	"time"
 )
 
-// NeteaseClient fetches lyrics from NetEase Cloud Music (music.163.com).
-// This is a direct public API — no proxy dependency.
+// NeteaseClient fetches lyrics through Paxsenix's NetEase endpoints.
 type NeteaseClient struct {
 	httpClient *http.Client
 }
@@ -59,12 +58,9 @@ func (c *NeteaseClient) SearchSong(trackName, artistName string) (int64, error)
 		return 0, fmt.Errorf("empty search query")
 	}
 
-	searchURL := "http://music.163.com/api/search/pc"
+	searchURL := "https://lyrics.paxsenix.org/netease/search"
 	params := url.Values{}
-	params.Set("s", query)
-	params.Set("type", "1")
-	params.Set("limit", "1")
-	params.Set("offset", "0")
+	params.Set("q", query)
 
 	fullURL := searchURL + "?" + params.Encode()
 
@@ -102,12 +98,9 @@ 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 := "http://music.163.com/api/song/lyric"
+	lyricsURL := "https://lyrics.paxsenix.org/netease/lyrics"
 	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,45 +1,31 @@
 package gobackend
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
+	"math"
 	"net/http"
-	"net/url"
 	"strings"
 	"time"
 )
 
 // QQMusicClient fetches lyrics from QQ Music.
-// Search uses public QQ Music API, lyrics use the paxsenix proxy.
+// Uses Paxsenix metadata lookup for lyrics.
 type QQMusicClient struct {
 	httpClient *http.Client
 }
 
-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 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"`
 }
 
-// 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"`
+type qqLyricsMetadataResponse struct {
+	Lyrics []paxLyrics `json:"lyrics"`
 }
 
 func NewQQMusicClient() *QQMusicClient {
@@ -48,79 +34,29 @@ func NewQQMusicClient() *QQMusicClient {
 	}
 }
 
-// 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")
+// 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))
 	}
 
-	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"
+	lyricsURL := "https://lyrics.paxsenix.org/qq/lyrics-metadata"
 
 	payloadBytes, err := json.Marshal(payload)
 	if err != nil {
 		return "", fmt.Errorf("failed to marshal payload: %w", err)
 	}
 
-	req, err := http.NewRequest("POST", lyricsURL, bytes.NewReader(payloadBytes))
+	req, err := http.NewRequest("POST", lyricsURL, strings.NewReader(string(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)
@@ -146,6 +82,17 @@ func (c *QQMusicClient) fetchLyricsByPayload(payload *qqLyricsPayload) (string,
 	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,
@@ -153,12 +100,7 @@ func (c *QQMusicClient) FetchLyrics(
 	durationSec float64,
 	multiPersonWordByWord bool,
 ) (*LyricsResponse, error) {
-	payload, err := c.searchSong(trackName, artistName)
-	if err != nil {
-		return nil, err
-	}
-
-	rawLyrics, err := c.fetchLyricsByPayload(payload)
+	rawLyrics, err := c.fetchLyricsByMetadata(trackName, artistName, durationSec)
 	if err != nil {
 		return nil, err
 	}
@@ -166,11 +108,13 @@ func (c *QQMusicClient) FetchLyrics(
 		return nil, fmt.Errorf("qqmusic proxy returned non-lyric payload: %s", errMsg)
 	}
 
-	// Try to parse as pax format (word-by-word or line)
-	lrcText, err := formatPaxLyricsToLRC(rawLyrics, multiPersonWordByWord)
+	lrcText, err := formatQQLyricsMetadataToLRC(rawLyrics, multiPersonWordByWord)
 	if err != nil {
-		// If pax parsing fails, try to use as direct LRC text
-		lrcText = rawLyrics
+		if fallback, fallbackErr := formatPaxLyricsToLRC(rawLyrics, multiPersonWordByWord); fallbackErr == nil {
+			lrcText = fallback
+		} else {
+			lrcText = rawLyrics
+		}
 	}
 
 	lines := parseSyncedLyrics(lrcText)

go_backend/metadata.go

@@ -552,6 +552,14 @@ 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 {
@@ -581,6 +589,299 @@ 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)
@@ -743,15 +1044,28 @@ func GetM4AQuality(filePath string) (AudioQuality, error) {
 		return AudioQuality{}, err
 	}
 
-	buf := make([]byte, 24)
+	buf := make([]byte, 32)
 	if _, err := f.ReadAt(buf, sampleOffset); err != nil {
 		return AudioQuality{}, fmt.Errorf("failed to read audio sample entry: %w", err)
 	}
 
-	sampleRate := int(buf[22])<<8 | int(buf[23])
-	bitDepth := 16
-	if atomType == "alac" {
-		bitDepth = 24
+	// 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
+		}
 	}
 
 	return AudioQuality{BitDepth: bitDepth, SampleRate: sampleRate}, nil
@@ -874,7 +1188,7 @@ func findAudioSampleEntry(f *os.File, start, end, fileSize int64) (int64, string
 
 		if bestIdx >= 0 {
 			absolute := readPos - int64(len(tail)) + int64(bestIdx)
-			if absolute+24 > fileSize {
+			if absolute+32 > fileSize {
 				return 0, "", fmt.Errorf("audio info not found in M4A file")
 			}
 			return absolute, bestType, nil

go_backend/qobuz.go

@@ -49,11 +49,13 @@ const (
 	qobuzArtistGetBaseURL   = "https://www.qobuz.com/api.json/0.2/artist/get?artist_id="
 	qobuzPlaylistGetBaseURL = "https://www.qobuz.com/api.json/0.2/playlist/get?playlist_id="
 	qobuzStoreSearchBaseURL = "https://www.qobuz.com/us-en/search/tracks/"
+	qobuzTrackOpenBaseURL   = "https://open.qobuz.com/track/"
 	qobuzTrackPlayBaseURL   = "https://play.qobuz.com/track/"
 	qobuzStoreBaseURL       = "https://www.qobuz.com/us-en"
-	qobuzDownloadAPIURL     = "https://www.musicdl.me/api/qobuz/download"
+	qobuzDownloadAPIURL     = "https://dl.musicdl.me/qobuz/download"
 	qobuzDabMusicAPIURL     = "https://dabmusic.xyz/api/stream?trackId="
 	qobuzDeebAPIURL         = "https://dab.yeet.su/api/stream?trackId="
+	qobuzAfkarAPIURL        = "https://qbz.afkarxyz.qzz.io/api/track/"
 	qobuzSquidAPIURL        = "https://qobuz.squid.wtf/api/download-music?country=US&track_id="
 	qobuzDebugKeyXORMask    = byte(0x5A)
 )
@@ -477,8 +479,8 @@ func parseQobuzURL(input string) (string, string, error) {
 }
 
 func qobuzArtistsMatch(expectedArtist, foundArtist string) bool {
-	normExpected := strings.ToLower(strings.TrimSpace(expectedArtist))
-	normFound := strings.ToLower(strings.TrimSpace(foundArtist))
+	normExpected := normalizeLooseArtistName(expectedArtist)
+	normFound := normalizeLooseArtistName(foundArtist)
 
 	if normExpected == normFound {
 		return true
@@ -1019,6 +1021,10 @@ func (q *QobuzDownloader) GetArtistMetadata(resourceID string) (*ArtistResponseP
 func (q *QobuzDownloader) GetAvailableAPIs() []string {
 	return []string{
 		qobuzDownloadAPIURL,
+		qobuzDabMusicAPIURL,
+		qobuzDeebAPIURL,
+		qobuzAfkarAPIURL,
+		qobuzSquidAPIURL,
 	}
 }
 
@@ -1039,6 +1045,8 @@ func (q *QobuzDownloader) GetAvailableProviders() []qobuzAPIProvider {
 		{Name: "dabmusic", URL: qobuzDabMusicAPIURL, Kind: qobuzAPIKindStandard},
 		// "deeb" is mapped from the legacy reference fallback endpoint.
 		{Name: "deeb", URL: qobuzDeebAPIURL, Kind: qobuzAPIKindStandard},
+		// "qbz" comes from the desktop reference app and uses /api/track/{id}?quality=...
+		{Name: "qbz", URL: qobuzAfkarAPIURL, Kind: qobuzAPIKindStandard},
 		{Name: "squid", URL: qobuzSquidAPIURL, Kind: qobuzAPIKindStandard},
 	}
 }
@@ -1299,6 +1307,134 @@ func (q *QobuzDownloader) SearchTracks(query string, limit int) ([]ExtTrackMetad
 	return results, nil
 }
 
+// SearchAll searches Qobuz for tracks, artists, and albums matching the query.
+// Returns results in the same SearchAllResult format as Deezer's SearchAll.
+func (q *QobuzDownloader) SearchAll(query string, trackLimit, artistLimit int, filter string) (*SearchAllResult, error) {
+	GoLog("[Qobuz] SearchAll: query=%q, trackLimit=%d, artistLimit=%d, filter=%q\n", query, trackLimit, artistLimit, filter)
+
+	cleanQuery := strings.TrimSpace(query)
+	if cleanQuery == "" {
+		return nil, fmt.Errorf("empty qobuz search query")
+	}
+
+	albumLimit := 5
+
+	if filter != "" {
+		switch filter {
+		case "track":
+			trackLimit = 50
+			artistLimit = 0
+			albumLimit = 0
+		case "artist":
+			trackLimit = 0
+			artistLimit = 20
+			albumLimit = 0
+		case "album":
+			trackLimit = 0
+			artistLimit = 0
+			albumLimit = 20
+		}
+	}
+
+	result := &SearchAllResult{
+		Tracks:    make([]TrackMetadata, 0, trackLimit),
+		Artists:   make([]SearchArtistResult, 0, artistLimit),
+		Albums:    make([]SearchAlbumResult, 0, albumLimit),
+		Playlists: make([]SearchPlaylistResult, 0),
+	}
+
+	if trackLimit > 0 {
+		tracks, err := q.searchQobuzTracksWithFallback(cleanQuery, trackLimit)
+		if err != nil {
+			GoLog("[Qobuz] Track search failed: %v\n", err)
+			return nil, fmt.Errorf("qobuz track search failed: %w", err)
+		}
+		GoLog("[Qobuz] Got %d tracks from API\n", len(tracks))
+		for i := range tracks {
+			result.Tracks = append(result.Tracks, qobuzTrackToTrackMetadata(&tracks[i]))
+		}
+	}
+
+	if artistLimit > 0 {
+		searchURL := fmt.Sprintf("https://www.qobuz.com/api.json/0.2/artist/search?query=%s&limit=%d&app_id=%s",
+			url.QueryEscape(cleanQuery), artistLimit, q.appID)
+		req, err := http.NewRequest("GET", searchURL, nil)
+		if err == nil {
+			resp, reqErr := DoRequestWithUserAgent(q.client, req)
+			if reqErr == nil {
+				defer resp.Body.Close()
+				if resp.StatusCode == 200 {
+					var artistResp struct {
+						Artists struct {
+							Items []struct {
+								ID    int64         `json:"id"`
+								Name  string        `json:"name"`
+								Image qobuzImageSet `json:"image"`
+							} `json:"items"`
+						} `json:"artists"`
+					}
+					if decErr := json.NewDecoder(resp.Body).Decode(&artistResp); decErr == nil {
+						GoLog("[Qobuz] Got %d artists from API\n", len(artistResp.Artists.Items))
+						for _, artist := range artistResp.Artists.Items {
+							imageURL := qobuzFirstNonEmpty(artist.Image.Large, artist.Image.Small, artist.Image.Thumbnail)
+							result.Artists = append(result.Artists, SearchArtistResult{
+								ID:     qobuzPrefixedNumericID(artist.ID),
+								Name:   strings.TrimSpace(artist.Name),
+								Images: imageURL,
+							})
+						}
+					} else {
+						GoLog("[Qobuz] Artist search decode failed: %v\n", decErr)
+					}
+				}
+			} else {
+				GoLog("[Qobuz] Artist search request failed: %v\n", reqErr)
+			}
+		}
+	}
+
+	if albumLimit > 0 {
+		searchURL := fmt.Sprintf("https://www.qobuz.com/api.json/0.2/album/search?query=%s&limit=%d&app_id=%s",
+			url.QueryEscape(cleanQuery), albumLimit, q.appID)
+		req, err := http.NewRequest("GET", searchURL, nil)
+		if err == nil {
+			resp, reqErr := DoRequestWithUserAgent(q.client, req)
+			if reqErr == nil {
+				defer resp.Body.Close()
+				if resp.StatusCode == 200 {
+					var albumResp struct {
+						Albums struct {
+							Items []qobuzAlbumDetails `json:"items"`
+						} `json:"albums"`
+					}
+					if decErr := json.NewDecoder(resp.Body).Decode(&albumResp); decErr == nil {
+						GoLog("[Qobuz] Got %d albums from API\n", len(albumResp.Albums.Items))
+						for i := range albumResp.Albums.Items {
+							album := &albumResp.Albums.Items[i]
+							result.Albums = append(result.Albums, SearchAlbumResult{
+								ID:          qobuzPrefixedID(album.ID),
+								Name:        strings.TrimSpace(album.Title),
+								Artists:     qobuzArtistsDisplayName(album.Artists, album.Artist.Name),
+								Images:      qobuzAlbumImage(album),
+								ReleaseDate: qobuzNormalizeReleaseDate(album.ReleaseDateOriginal),
+								TotalTracks: album.TracksCount,
+								AlbumType:   qobuzNormalizeAlbumType(album.ReleaseType, album.ProductType, album.TracksCount),
+							})
+						}
+					} else {
+						GoLog("[Qobuz] Album search decode failed: %v\n", decErr)
+					}
+				}
+			} else {
+				GoLog("[Qobuz] Album search request failed: %v\n", reqErr)
+			}
+		}
+	}
+
+	GoLog("[Qobuz] SearchAll complete: %d tracks, %d artists, %d albums\n", len(result.Tracks), len(result.Artists), len(result.Albums))
+	return result, nil
+}
+
 func (q *QobuzDownloader) SearchTrackByMetadataWithDuration(trackName, artistName string, expectedDurationSec int) (*QobuzTrack, error) {
 	queries := []string{}
 
@@ -1624,19 +1760,23 @@ func fetchQobuzURLWithRetry(provider qobuzAPIProvider, trackID int64, quality st
 	return fetchQobuzURLSingleAttempt(provider, trackID, quality, timeout, "")
 }
 
+func buildQobuzMusicDLPayload(trackID int64, quality string) ([]byte, error) {
+	requestQuality := mapQobuzQualityCodeToAPI(quality)
+	payload := map[string]any{
+		"quality":      requestQuality,
+		"upload_to_r2": false,
+		"url":          fmt.Sprintf("%s%d", qobuzTrackOpenBaseURL, trackID),
+	}
+	return json.Marshal(payload)
+}
+
 func fetchQobuzURLSingleAttempt(provider qobuzAPIProvider, trackID int64, quality string, timeout time.Duration, country string) (qobuzDownloadInfo, error) {
 	var lastErr error
 	retryDelay := qobuzRetryDelay
 	var payloadBytes []byte
 	if provider.Kind == qobuzAPIKindMusicDL {
-		requestQuality := mapQobuzQualityCodeToAPI(quality)
-		payload := map[string]any{
-			"quality":      requestQuality,
-			"upload_to_r2": false,
-			"url":          fmt.Sprintf("%s%d", qobuzTrackPlayBaseURL, trackID),
-		}
 		var err error
-		payloadBytes, err = json.Marshal(payload)
+		payloadBytes, err = buildQobuzMusicDLPayload(trackID, quality)
 		if err != nil {
 			return qobuzDownloadInfo{}, fmt.Errorf("failed to encode qobuz request: %w", err)
 		}
@@ -1681,7 +1821,6 @@ func fetchQobuzURLSingleAttempt(provider qobuzAPIProvider, trackID int64, qualit
 		}
 		if provider.Kind == qobuzAPIKindMusicDL {
 			req.Header.Set("Content-Type", "application/json")
-			req.Header.Set("X-Debug-Key", getQobuzDebugKey())
 		}
 
 		resp, err := DoRequestWithUserAgent(client, req)
@@ -1928,6 +2067,7 @@ type QobuzDownloadResult struct {
 	TrackNumber int
 	DiscNumber  int
 	ISRC        string
+	CoverURL    string
 	LyricsLRC   string
 }
 
@@ -1989,8 +2129,8 @@ func resolveQobuzTrackForRequest(req DownloadRequest, downloader *QobuzDownloade
 		}
 	}
 
-	// Strategy 3: Try to get QobuzID from SongLink if we have SpotifyID
-	if track == nil && req.SpotifyID != "" && req.QobuzID == "" {
+	// Strategy 3: Try to get QobuzID from SongLink if we have SpotifyID but no ISRC
+	if track == nil && req.SpotifyID != "" && req.QobuzID == "" && req.ISRC == "" {
 		GoLog("[%s] Trying to get Qobuz ID from SongLink for Spotify ID: %s\n", logPrefix, req.SpotifyID)
 		songLinkClient := NewSongLinkClient()
 		availability, slErr := songLinkCheckTrackAvailabilityFunc(songLinkClient, req.SpotifyID, req.ISRC)
@@ -2121,7 +2261,10 @@ func downloadFromQobuz(req DownloadRequest) (QobuzDownloadResult, error) {
 	parallelDone := make(chan struct{})
 	go func() {
 		defer close(parallelDone)
-		coverURL := req.CoverURL
+		coverURL := strings.TrimSpace(req.CoverURL)
+		if coverURL == "" {
+			coverURL = strings.TrimSpace(qobuzTrackAlbumImage(track))
+		}
 		embedLyrics := req.EmbedLyrics
 		if !req.EmbedMetadata {
 			coverURL = ""
@@ -2156,6 +2299,10 @@ func downloadFromQobuz(req DownloadRequest) (QobuzDownloadResult, error) {
 	if req.AlbumName != "" {
 		albumName = req.AlbumName
 	}
+	releaseDate := track.Album.ReleaseDate
+	if req.ReleaseDate != "" {
+		releaseDate = req.ReleaseDate
+	}
 
 	actualTrackNumber := req.TrackNumber
 	if actualTrackNumber == 0 {
@@ -2167,7 +2314,7 @@ func downloadFromQobuz(req DownloadRequest) (QobuzDownloadResult, error) {
 		Artist:      track.Performer.Name,
 		Album:       albumName,
 		AlbumArtist: req.AlbumArtist,
-		Date:        track.Album.ReleaseDate,
+		Date:        releaseDate,
 		TrackNumber: actualTrackNumber,
 		TotalTracks: req.TotalTracks,
 		DiscNumber:  req.DiscNumber,
@@ -2231,17 +2378,26 @@ func downloadFromQobuz(req DownloadRequest) (QobuzDownloadResult, error) {
 		lyricsLRC = parallelResult.LyricsLRC
 	}
 
+	resultAlbum, resultReleaseDate, resultTrackNumber, resultDiscNumber := preferredReleaseMetadata(
+		req,
+		track.Album.Title,
+		track.Album.ReleaseDate,
+		actualTrackNumber,
+		req.DiscNumber,
+	)
+
 	return QobuzDownloadResult{
 		FilePath:    outputPath,
 		BitDepth:    actualBitDepth,
 		SampleRate:  actualSampleRate,
 		Title:       track.Title,
 		Artist:      track.Performer.Name,
-		Album:       track.Album.Title,
-		ReleaseDate: track.Album.ReleaseDate,
-		TrackNumber: actualTrackNumber,
-		DiscNumber:  req.DiscNumber,
+		Album:       resultAlbum,
+		ReleaseDate: resultReleaseDate,
+		TrackNumber: resultTrackNumber,
+		DiscNumber:  resultDiscNumber,
 		ISRC:        track.ISRC,
+		CoverURL:    strings.TrimSpace(qobuzTrackAlbumImage(track)),
 		LyricsLRC:   lyricsLRC,
 	}, nil
 }

go_backend/qobuz_test.go

@@ -1,6 +1,9 @@
 package gobackend
 
-import "testing"
+import (
+	"encoding/json"
+	"testing"
+)
 
 func TestParseQobuzURL(t *testing.T) {
 	tests := []struct {
@@ -195,6 +198,28 @@ 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>
@@ -213,14 +238,16 @@ func TestExtractQobuzAlbumIDsFromArtistHTML(t *testing.T) {
 
 func TestQobuzAvailableProviders(t *testing.T) {
 	providers := NewQobuzDownloader().GetAvailableProviders()
-	if len(providers) != 3 {
-		t.Fatalf("expected 3 Qobuz providers, got %d", len(providers))
+	if len(providers) != 5 {
+		t.Fatalf("expected 5 Qobuz providers, got %d", len(providers))
 	}
 
 	want := map[string]string{
 		"musicdl":  qobuzAPIKindMusicDL,
 		"dabmusic": qobuzAPIKindStandard,
 		"deeb":     qobuzAPIKindStandard,
+		"qbz":      qobuzAPIKindStandard,
+		"squid":    qobuzAPIKindStandard,
 	}
 
 	for _, provider := range providers {

go_backend/security_hardening_test.go

@@ -1,80 +0,0 @@
-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,6 +1,7 @@
 package gobackend
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -14,6 +15,10 @@ 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"`
@@ -43,6 +48,7 @@ var (
 	songLinkCheckAvailabilityFromDeezer = func(s *SongLinkClient, deezerTrackID string) (*TrackAvailability, error) {
 		return s.CheckAvailabilityFromDeezer(deezerTrackID)
 	}
+	songLinkRetryConfig = DefaultRetryConfig
 )
 
 func NewSongLinkClient() *SongLinkClient {
@@ -130,7 +136,14 @@ func (s *SongLinkClient) CheckTrackAvailability(spotifyTrackID string, isrc stri
 }
 
 func (s *SongLinkClient) checkTrackAvailabilityFromSpotify(spotifyTrackID string) (*TrackAvailability, error) {
-	songLinkRateLimiter.WaitForSlot()
+	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)
+	}
 
 	spotifyURL := fmt.Sprintf("https://open.spotify.com/track/%s", spotifyTrackID)
 	apiURL := buildSongLinkURLFromTarget(spotifyURL, "")
@@ -140,10 +153,10 @@ func (s *SongLinkClient) checkTrackAvailabilityFromSpotify(spotifyTrackID string
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	retryConfig := DefaultRetryConfig()
+	retryConfig := songLinkRetryConfig()
 	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
 	if err != nil {
-		return nil, fmt.Errorf("failed to check availability: %w", err)
+		return nil, fmt.Errorf("song.link page lookup failed: %w; SongLink API lookup failed: %w", pageErr, err)
 	}
 	defer resp.Body.Close()
 
@@ -154,10 +167,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("SongLink rate limit exceeded")
+		return nil, fmt.Errorf("song.link page lookup failed: %w; SongLink API rate limit exceeded", pageErr)
 	}
 	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("SongLink API returned status %d", resp.StatusCode)
+		return nil, fmt.Errorf("song.link page lookup failed: %w; SongLink API returned status %d", pageErr, resp.StatusCode)
 	}
 
 	body, err := ReadResponseBody(resp)
@@ -166,59 +179,102 @@ func (s *SongLinkClient) checkTrackAvailabilityFromSpotify(spotifyTrackID string
 	}
 
 	var songLinkResp struct {
-		LinksByPlatform map[string]struct {
-			URL string `json:"url"`
-		} `json:"linksByPlatform"`
+		LinksByPlatform map[string]songLinkPlatformLink `json:"linksByPlatform"`
 	}
 
 	if err := json.Unmarshal(body, &songLinkResp); err != nil {
 		return nil, fmt.Errorf("failed to decode response: %w", err)
 	}
 
-	availability := &TrackAvailability{
-		SpotifyID: spotifyTrackID,
+	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)
 	}
 
-	if tidalLink, ok := songLinkResp.LinksByPlatform["tidal"]; ok && tidalLink.URL != "" {
-		availability.Tidal = true
-		availability.TidalURL = tidalLink.URL
-		availability.TidalID = extractTidalIDFromURL(tidalLink.URL)
+	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 amazonLink, ok := songLinkResp.LinksByPlatform["amazonMusic"]; ok && amazonLink.URL != "" {
-		availability.Amazon = true
-		availability.AmazonURL = amazonLink.URL
+	body, err := ReadResponseBody(resp)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read song.link page: %w", err)
 	}
 
-	if deezerLink, ok := songLinkResp.LinksByPlatform["deezer"]; ok && deezerLink.URL != "" {
-		availability.Deezer = true
-		availability.DeezerURL = deezerLink.URL
-		availability.DeezerID = extractDeezerIDFromURL(deezerLink.URL)
+	nextDataJSON, err := extractSongLinkNextDataJSON(body)
+	if err != nil {
+		return nil, err
 	}
 
-	if qobuzLink, ok := songLinkResp.LinksByPlatform["qobuz"]; ok && qobuzLink.URL != "" {
-		availability.Qobuz = true
-		availability.QobuzURL = qobuzLink.URL
-		availability.QobuzID = extractQobuzIDFromURL(qobuzLink.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)
 	}
 
-	// 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)
+	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}
 		}
 	}
 
-	return availability, nil
+	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
 }
 
 func (s *SongLinkClient) checkTrackAvailabilityFromISRC(isrc string) (*TrackAvailability, error) {
@@ -459,7 +515,7 @@ func (s *SongLinkClient) CheckAlbumAvailability(spotifyAlbumID string) (*AlbumAv
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	retryConfig := DefaultRetryConfig()
+	retryConfig := songLinkRetryConfig()
 	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to check album availability: %w", err)
@@ -542,7 +598,7 @@ func (s *SongLinkClient) checkAvailabilityFromDeezerSongLink(deezerTrackID strin
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	retryConfig := DefaultRetryConfig()
+	retryConfig := songLinkRetryConfig()
 	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to check availability: %w", err)
@@ -647,7 +703,7 @@ func (s *SongLinkClient) CheckAvailabilityByPlatform(platform, entityType, entit
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	retryConfig := DefaultRetryConfig()
+	retryConfig := songLinkRetryConfig()
 	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to check availability: %w", err)
@@ -728,6 +784,51 @@ 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 {
@@ -802,7 +903,7 @@ func (s *SongLinkClient) CheckAvailabilityFromURL(inputURL string) (*TrackAvaila
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	retryConfig := DefaultRetryConfig()
+	retryConfig := songLinkRetryConfig()
 	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

@@ -0,0 +1,127 @@
+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://spotify.afkarxyz.fun/api"
+const DefaultSpotFetchAPIBaseURL = "https://sp.afkarxyz.qzz.io/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/tidal.go

@@ -26,8 +26,14 @@ type TidalDownloader struct {
 }
 
 var (
-	globalTidalDownloader *TidalDownloader
-	tidalDownloaderOnce   sync.Once
+	globalTidalDownloader       *TidalDownloader
+	tidalDownloaderOnce         sync.Once
+	tidalGetTrackSearchPageFunc = func(t *TidalDownloader, query string, limit int) (*tidalPublicTrackSearchResponse, error) {
+		return t.getTrackSearchPage(query, limit)
+	}
+	tidalGetPublicTrackFunc = func(t *TidalDownloader, resourceID string) (*TidalTrack, error) {
+		return t.getPublicTrack(resourceID)
+	}
 )
 
 const (
@@ -758,15 +764,101 @@ func (t *TidalDownloader) GetTrackInfoByID(trackID int64) (*TidalTrack, error) {
 }
 
 func (t *TidalDownloader) SearchTrackByISRC(isrc string) (*TidalTrack, error) {
-	return nil, fmt.Errorf("tidal ISRC search API disabled: no client credentials mode")
+	normalizedISRC := strings.ToUpper(strings.TrimSpace(isrc))
+	if normalizedISRC == "" {
+		return nil, fmt.Errorf("empty tidal ISRC")
+	}
+
+	page, err := tidalGetTrackSearchPageFunc(t, normalizedISRC, 20)
+	if err != nil {
+		return nil, err
+	}
+
+	for i := range page.Items {
+		if strings.EqualFold(strings.TrimSpace(page.Items[i].ISRC), normalizedISRC) {
+			return &page.Items[i], nil
+		}
+	}
+
+	return nil, fmt.Errorf("no exact tidal ISRC match found for %s", normalizedISRC)
 }
 
 func (t *TidalDownloader) SearchTrackByMetadataWithISRC(trackName, artistName, albumName, spotifyISRC string, expectedDuration int) (*TidalTrack, error) {
-	return nil, fmt.Errorf("tidal metadata search API disabled: no client credentials mode")
+	queryParts := make([]string, 0, 3)
+	if trimmed := strings.TrimSpace(trackName); trimmed != "" {
+		queryParts = append(queryParts, trimmed)
+	}
+	if trimmed := strings.TrimSpace(artistName); trimmed != "" {
+		queryParts = append(queryParts, trimmed)
+	}
+	if len(queryParts) == 0 {
+		return nil, fmt.Errorf("tidal metadata search requires track or artist name")
+	}
+
+	queries := []string{strings.Join(queryParts, " ")}
+	if trimmedAlbum := strings.TrimSpace(albumName); trimmedAlbum != "" {
+		queries = append(queries, strings.Join(append(queryParts, trimmedAlbum), " "))
+	}
+
+	req := DownloadRequest{
+		TrackName:  strings.TrimSpace(trackName),
+		ArtistName: strings.TrimSpace(artistName),
+		AlbumName:  strings.TrimSpace(albumName),
+		ISRC:       strings.ToUpper(strings.TrimSpace(spotifyISRC)),
+		DurationMS: expectedDuration * 1000,
+	}
+
+	seenQueries := make(map[string]struct{}, len(queries))
+	for _, query := range queries {
+		if _, seen := seenQueries[query]; seen {
+			continue
+		}
+		seenQueries[query] = struct{}{}
+
+		page, err := tidalGetTrackSearchPageFunc(t, query, 20)
+		if err != nil {
+			return nil, err
+		}
+
+		var candidates []*TidalTrack
+		for i := range page.Items {
+			track := &page.Items[i]
+			if req.ISRC != "" && !strings.EqualFold(strings.TrimSpace(track.ISRC), req.ISRC) {
+				continue
+			}
+			resolved := resolvedTrackInfo{
+				Title:      strings.TrimSpace(track.Title),
+				ArtistName: tidalTrackArtistsDisplay(track),
+				Duration:   track.Duration,
+			}
+			if trackMatchesRequest(req, resolved, "Tidal search") {
+				candidates = append(candidates, track)
+			}
+		}
+
+		if len(candidates) == 0 {
+			continue
+		}
+
+		if req.AlbumName != "" {
+			for _, candidate := range candidates {
+				if titlesMatch(req.AlbumName, candidate.Album.Title) {
+					return candidate, nil
+				}
+			}
+		}
+
+		return candidates[0], nil
+	}
+
+	if req.ISRC != "" {
+		return nil, fmt.Errorf("no tidal metadata match found for exact ISRC %s", req.ISRC)
+	}
+	return nil, fmt.Errorf("no tidal metadata match found")
 }
 
 func (t *TidalDownloader) SearchTrackByMetadata(trackName, artistName string) (*TidalTrack, error) {
-	return nil, fmt.Errorf("tidal metadata search API disabled: no client credentials mode")
+	return t.SearchTrackByMetadataWithISRC(trackName, artistName, "", "", 0)
 }
 
 func (t *TidalDownloader) SearchTracks(query string, limit int) ([]ExtTrackMetadata, error) {
@@ -782,6 +874,121 @@ func (t *TidalDownloader) SearchTracks(query string, limit int) ([]ExtTrackMetad
 	return results, nil
 }
 
+// SearchAll searches Tidal for tracks, artists, and albums matching the query.
+// Returns results in the same SearchAllResult format as Deezer's SearchAll.
+func (t *TidalDownloader) SearchAll(query string, trackLimit, artistLimit int, filter string) (*SearchAllResult, error) {
+	GoLog("[Tidal] SearchAll: query=%q, trackLimit=%d, artistLimit=%d, filter=%q\n", query, trackLimit, artistLimit, filter)
+
+	cleanQuery := strings.TrimSpace(query)
+	if cleanQuery == "" {
+		return nil, fmt.Errorf("empty tidal search query")
+	}
+
+	albumLimit := 5
+
+	if filter != "" {
+		switch filter {
+		case "track":
+			trackLimit = 50
+			artistLimit = 0
+			albumLimit = 0
+		case "artist":
+			trackLimit = 0
+			artistLimit = 20
+			albumLimit = 0
+		case "album":
+			trackLimit = 0
+			artistLimit = 0
+			albumLimit = 20
+		}
+	}
+
+	result := &SearchAllResult{
+		Tracks:    make([]TrackMetadata, 0, trackLimit),
+		Artists:   make([]SearchArtistResult, 0, artistLimit),
+		Albums:    make([]SearchAlbumResult, 0, albumLimit),
+		Playlists: make([]SearchPlaylistResult, 0),
+	}
+
+	if trackLimit > 0 {
+		page, err := t.getTrackSearchPage(cleanQuery, trackLimit)
+		if err != nil {
+			GoLog("[Tidal] Track search failed: %v\n", err)
+			return nil, fmt.Errorf("tidal track search failed: %w", err)
+		}
+		GoLog("[Tidal] Got %d tracks from API\n", len(page.Items))
+		for i := range page.Items {
+			result.Tracks = append(result.Tracks, tidalTrackToTrackMetadata(&page.Items[i]))
+		}
+	}
+
+	if artistLimit > 0 {
+		requestURL := tidalBuildMetadataURL("search/artists", url.Values{
+			"query":  {cleanQuery},
+			"limit":  {strconv.Itoa(artistLimit)},
+			"offset": {"0"},
+		})
+		var artistResp struct {
+			Items []struct {
+				ID         int64  `json:"id"`
+				Name       string `json:"name"`
+				Picture    string `json:"picture"`
+				Popularity int    `json:"popularity"`
+				URL        string `json:"url"`
+			} `json:"items"`
+		}
+		if err := t.getTidalMetadataJSON(requestURL, &artistResp); err == nil {
+			GoLog("[Tidal] Got %d artists from API\n", len(artistResp.Items))
+			for _, artist := range artistResp.Items {
+				result.Artists = append(result.Artists, SearchArtistResult{
+					ID:         tidalPrefixedNumericID(artist.ID),
+					Name:       strings.TrimSpace(artist.Name),
+					Images:     tidalImageURL(artist.Picture, "750x750"),
+					Followers:  0,
+					Popularity: artist.Popularity,
+				})
+			}
+		} else {
+			GoLog("[Tidal] Artist search failed: %v\n", err)
+		}
+	}
+
+	if albumLimit > 0 {
+		requestURL := tidalBuildMetadataURL("search/albums", url.Values{
+			"query":  {cleanQuery},
+			"limit":  {strconv.Itoa(albumLimit)},
+			"offset": {"0"},
+		})
+		var albumResp struct {
+			Items []tidalPublicAlbum `json:"items"`
+		}
+		if err := t.getTidalMetadataJSON(requestURL, &albumResp); err == nil {
+			GoLog("[Tidal] Got %d albums from API\n", len(albumResp.Items))
+			for i := range albumResp.Items {
+				album := &albumResp.Items[i]
+				albumType := strings.ToLower(strings.TrimSpace(album.Type))
+				if albumType == "" {
+					albumType = "album"
+				}
+				result.Albums = append(result.Albums, SearchAlbumResult{
+					ID:          tidalPrefixedNumericID(album.ID),
+					Name:        strings.TrimSpace(album.Title),
+					Artists:     tidalAlbumArtistsDisplay(album),
+					Images:      tidalImageURL(album.Cover, "1280x1280"),
+					ReleaseDate: strings.TrimSpace(album.ReleaseDate),
+					TotalTracks: album.NumberOfTracks,
+					AlbumType:   albumType,
+				})
+			}
+		} else {
+			GoLog("[Tidal] Album search failed: %v\n", err)
+		}
+	}
+
+	GoLog("[Tidal] SearchAll complete: %d tracks, %d artists, %d albums\n", len(result.Tracks), len(result.Artists), len(result.Albums))
+	return result, nil
+}
+
 func (t *TidalDownloader) GetTrackMetadata(resourceID string) (*TrackResponse, error) {
 	track, err := t.getPublicTrack(resourceID)
 	if err != nil {
@@ -1537,8 +1744,8 @@ type TidalDownloadResult struct {
 }
 
 func artistsMatch(spotifyArtist, tidalArtist string) bool {
-	normSpotify := strings.ToLower(strings.TrimSpace(spotifyArtist))
-	normTidal := strings.ToLower(strings.TrimSpace(tidalArtist))
+	normSpotify := normalizeLooseArtistName(spotifyArtist)
+	normTidal := normalizeLooseArtistName(tidalArtist)
 
 	if normSpotify == normTidal {
 		return true
@@ -1847,6 +2054,36 @@ func resolveTidalTrackForRequest(req DownloadRequest, downloader *TidalDownloade
 		}
 	}
 
+	if !gotTidalID && req.ISRC != "" {
+		GoLog("[%s] Trying direct Tidal ISRC search: %s\n", logPrefix, req.ISRC)
+		directTrack, directErr := downloader.SearchTrackByISRC(req.ISRC)
+		if directErr == nil && directTrack != nil && directTrack.ID > 0 {
+			trackID = directTrack.ID
+			gotTidalID = true
+			GoLog("[%s] Got Tidal ID %d from direct ISRC search\n", logPrefix, trackID)
+		} else if directErr != nil {
+			GoLog("[%s] Direct Tidal ISRC search failed: %v\n", logPrefix, directErr)
+		}
+	}
+
+	if !gotTidalID && req.ISRC != "" && req.TrackName != "" && req.ArtistName != "" {
+		GoLog("[%s] Trying Tidal public metadata search with ISRC\n", logPrefix)
+		searchTrack, searchErr := downloader.SearchTrackByMetadataWithISRC(
+			req.TrackName,
+			req.ArtistName,
+			req.AlbumName,
+			req.ISRC,
+			expectedDurationSec,
+		)
+		if searchErr == nil && searchTrack != nil && searchTrack.ID > 0 {
+			trackID = searchTrack.ID
+			gotTidalID = true
+			GoLog("[%s] Got Tidal ID %d from public metadata search\n", logPrefix, trackID)
+		} else if searchErr != nil {
+			GoLog("[%s] Tidal public metadata search failed: %v\n", logPrefix, searchErr)
+		}
+	}
+
 	if !gotTidalID && (req.SpotifyID != "" || req.DeezerID != "") {
 		GoLog("[%s] Trying SongLink for Tidal ID...\n", logPrefix)
 
@@ -1911,6 +2148,32 @@ func resolveTidalTrackForRequest(req DownloadRequest, downloader *TidalDownloade
 		return nil, fmt.Errorf("failed to find tidal track id from request/cache/songlink")
 	}
 
+	// Verify the resolved track matches the request.
+	actualTrack, fetchErr := tidalGetPublicTrackFunc(downloader, strconv.FormatInt(trackID, 10))
+	if fetchErr != nil {
+		GoLog("[%s] Warning: could not fetch Tidal track %d for verification: %v\n", logPrefix, trackID, fetchErr)
+		// Continue without verification — better than failing entirely.
+	} else {
+		providerArtist := actualTrack.Artist.Name
+		if providerArtist == "" && len(actualTrack.Artists) > 0 {
+			providerArtist = actualTrack.Artists[0].Name
+		}
+		resolved := resolvedTrackInfo{
+			Title:      actualTrack.Title,
+			ArtistName: providerArtist,
+			Duration:   actualTrack.Duration,
+		}
+		if !trackMatchesRequest(req, resolved, logPrefix) {
+			// Invalidate the cached ID so future requests don't reuse it.
+			if req.ISRC != "" {
+				GetTrackIDCache().SetTidal(req.ISRC, 0)
+			}
+			return nil, fmt.Errorf("tidal track %d does not match request: expected '%s - %s', got '%s - %s'",
+				trackID, req.ArtistName, req.TrackName, resolved.ArtistName, resolved.Title)
+		}
+		GoLog("[%s] Track %d verified: '%s - %s' ✓\n", logPrefix, trackID, resolved.ArtistName, resolved.Title)
+	}
+
 	track := &TidalTrack{
 		ID:           trackID,
 		Title:        strings.TrimSpace(req.TrackName),
@@ -2180,25 +2443,33 @@ func downloadFromTidal(req DownloadRequest) (TidalDownloadResult, error) {
 
 	bitDepth := downloadInfo.BitDepth
 	sampleRate := downloadInfo.SampleRate
-	lyricsLRC := ""
 	if quality == "HIGH" {
 		bitDepth = 0
 		sampleRate = 44100
 	}
+	lyricsLRC := ""
 	if req.EmbedMetadata && req.EmbedLyrics && parallelResult != nil && parallelResult.LyricsLRC != "" {
 		lyricsLRC = parallelResult.LyricsLRC
 	}
 
+	resultAlbum, resultReleaseDate, resultTrackNumber, resultDiscNumber := preferredReleaseMetadata(
+		req,
+		track.Album.Title,
+		track.Album.ReleaseDate,
+		actualTrackNumber,
+		actualDiscNumber,
+	)
+
 	return TidalDownloadResult{
 		FilePath:    actualOutputPath,
 		BitDepth:    bitDepth,
 		SampleRate:  sampleRate,
 		Title:       track.Title,
 		Artist:      track.Artist.Name,
-		Album:       track.Album.Title,
-		ReleaseDate: track.Album.ReleaseDate,
-		TrackNumber: actualTrackNumber,
-		DiscNumber:  actualDiscNumber,
+		Album:       resultAlbum,
+		ReleaseDate: resultReleaseDate,
+		TrackNumber: resultTrackNumber,
+		DiscNumber:  resultDiscNumber,
 		ISRC:        track.ISRC,
 		LyricsLRC:   lyricsLRC,
 	}, nil

go_backend/title_match_utils.go

@@ -3,6 +3,8 @@ package gobackend
 import (
 	"strings"
 	"unicode"
+
+	"golang.org/x/text/unicode/norm"
 )
 
 // normalizeLooseTitle collapses separators/punctuation so titles like
@@ -33,6 +35,37 @@ func normalizeLooseTitle(title string) string {
 	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 remaining punctuation/symbols for loose artist matching.
+		}
+	}
+
+	return strings.Join(strings.Fields(b.String()), " ")
+}
+
 func hasAlphaNumericRunes(value string) bool {
 	for _, r := range value {
 		if unicode.IsLetter(r) || unicode.IsNumber(r) {
@@ -68,3 +101,45 @@ func normalizeSymbolOnlyTitle(title string) string {
 
 	return b.String()
 }
+
+// ==================== Shared Track Verification ====================
+
+// resolvedTrackInfo holds the metadata fetched from a provider for verification.
+type resolvedTrackInfo struct {
+	Title      string
+	ArtistName string
+	Duration   int // seconds
+}
+
+// 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

@@ -29,6 +29,7 @@ var (
 type YouTubeQuality string
 
 const (
+	YouTubeQualityOpus320 YouTubeQuality = "opus_320"
 	YouTubeQualityOpus256 YouTubeQuality = "opus_256"
 	YouTubeQualityOpus128 YouTubeQuality = "opus_128"
 	YouTubeQualityMP3128  YouTubeQuality = "mp3_128"
@@ -37,7 +38,7 @@ const (
 )
 
 var (
-	youtubeOpusSupportedBitrates = []int{128, 256}
+	youtubeOpusSupportedBitrates = []int{128, 256, 320}
 	youtubeMp3SupportedBitrates  = []int{128, 256, 320}
 )
 
@@ -146,6 +147,8 @@ func parseYouTubeQualityInput(raw string) (format string, bitrate int, normalize
 	switch normalizedRaw {
 	case "opus_256", "opus256", "opus":
 		return "opus", 256, YouTubeQualityOpus256
+	case "opus_320", "opus320":
+		return "opus", 320, YouTubeQualityOpus320
 	case "opus_128", "opus128":
 		return "opus", 128, YouTubeQualityOpus128
 	case "mp3_320", "mp3320", "mp3", "":

go_backend/youtube_quality_test.go

@@ -30,8 +30,8 @@ func TestParseYouTubeQualityInput_Mp3NormalizesToSupportedBitrates(t *testing.T)
 
 func TestParseYouTubeQualityInput_PicksNearestSupportedBitrate(t *testing.T) {
 	_, opusBitrate, _ := parseYouTubeQualityInput("opus_999")
-	if opusBitrate != 256 {
-		t.Fatalf("expected opus normalization to 256, got %d", opusBitrate)
+	if opusBitrate != 320 {
+		t.Fatalf("expected opus normalization to 320, got %d", opusBitrate)
 	}
 
 	_, mp3Bitrate, _ := parseYouTubeQualityInput("mp3_1")
@@ -39,3 +39,16 @@ func TestParseYouTubeQualityInput_PicksNearestSupportedBitrate(t *testing.T) {
 		t.Fatalf("expected mp3 normalization to 128, got %d", mp3Bitrate)
 	}
 }
+
+func TestParseYouTubeQualityInput_Opus320(t *testing.T) {
+	format, bitrate, normalized := parseYouTubeQualityInput("opus_320")
+	if format != "opus" {
+		t.Fatalf("expected opus format, got %s", format)
+	}
+	if bitrate != 320 {
+		t.Fatalf("expected 320 bitrate, got %d", bitrate)
+	}
+	if normalized != YouTubeQualityOpus320 {
+		t.Fatalf("expected %s normalized, got %s", YouTubeQualityOpus320, normalized)
+	}
+}

ios/Runner/AppDelegate.swift

@@ -367,6 +367,26 @@ 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

lib/constants/app_info.dart

@@ -3,24 +3,24 @@ 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 = '3.8.0';
-  static const String buildNumber = '106';
+  static const String version = '3.9.0';
+  static const String buildNumber = '115';
   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';
   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.dart

@@ -1066,6 +1066,12 @@ abstract class AppLocalizations {
   /// **'Import'**
   String get dialogImport;
 
+  /// Confirm button in Download All dialog
+  ///
+  /// In en, this message translates to:
+  /// **'Download'**
+  String get dialogDownload;
+
   /// Dialog button - discard changes
   ///
   /// In en, this message translates to:
@@ -2317,7 +2323,7 @@ abstract class AppLocalizations {
   /// Default search provider option
   ///
   /// In en, this message translates to:
-  /// **'Default (Deezer/Spotify)'**
+  /// **'Default (Deezer)'**
   String get extensionDefaultProvider;
 
   /// Subtitle for default provider
@@ -2590,6 +2596,66 @@ abstract class AppLocalizations {
   /// **'24-bit / up to 192kHz'**
   String get qualityHiResFlacMaxSubtitle;
 
+  /// Quality option label for Tidal lossy 320kbps
+  ///
+  /// In en, this message translates to:
+  /// **'Lossy 320kbps'**
+  String get downloadLossy320;
+
+  /// Setting title to pick output format for Tidal lossy downloads
+  ///
+  /// In en, this message translates to:
+  /// **'Lossy Format'**
+  String get downloadLossyFormat;
+
+  /// Title of the Tidal lossy format picker bottom sheet
+  ///
+  /// In en, this message translates to:
+  /// **'Lossy 320kbps Format'**
+  String get downloadLossy320Format;
+
+  /// Description in the Tidal lossy format picker
+  ///
+  /// In en, this message translates to:
+  /// **'Choose the output format for Tidal 320kbps lossy downloads. The original AAC stream will be converted to your selected format.'**
+  String get downloadLossy320FormatDesc;
+
+  /// Tidal lossy format option - MP3 320kbps
+  ///
+  /// In en, this message translates to:
+  /// **'MP3 320kbps'**
+  String get downloadLossyMp3;
+
+  /// Subtitle for MP3 320kbps Tidal lossy option
+  ///
+  /// In en, this message translates to:
+  /// **'Best compatibility, ~10MB per track'**
+  String get downloadLossyMp3Subtitle;
+
+  /// Tidal lossy format option - Opus 256kbps
+  ///
+  /// In en, this message translates to:
+  /// **'Opus 256kbps'**
+  String get downloadLossyOpus256;
+
+  /// Subtitle for Opus 256kbps Tidal lossy option
+  ///
+  /// In en, this message translates to:
+  /// **'Best quality Opus, ~8MB per track'**
+  String get downloadLossyOpus256Subtitle;
+
+  /// Tidal lossy format option - Opus 128kbps
+  ///
+  /// In en, this message translates to:
+  /// **'Opus 128kbps'**
+  String get downloadLossyOpus128;
+
+  /// Subtitle for Opus 128kbps Tidal lossy option
+  ///
+  /// In en, this message translates to:
+  /// **'Smallest size, ~4MB per track'**
+  String get downloadLossyOpus128Subtitle;
+
   /// Note about quality availability
   ///
   /// In en, this message translates to:
@@ -3100,6 +3166,42 @@ abstract class AppLocalizations {
   /// **'Show when searching for existing tracks'**
   String get libraryShowDuplicateIndicatorSubtitle;
 
+  /// Setting for automatic library scanning
+  ///
+  /// In en, this message translates to:
+  /// **'Auto Scan'**
+  String get libraryAutoScan;
+
+  /// Subtitle for auto scan setting
+  ///
+  /// In en, this message translates to:
+  /// **'Automatically scan your library for new files'**
+  String get libraryAutoScanSubtitle;
+
+  /// Auto scan disabled
+  ///
+  /// In en, this message translates to:
+  /// **'Off'**
+  String get libraryAutoScanOff;
+
+  /// Auto scan when app opens
+  ///
+  /// In en, this message translates to:
+  /// **'Every app open'**
+  String get libraryAutoScanOnOpen;
+
+  /// Auto scan once per day
+  ///
+  /// In en, this message translates to:
+  /// **'Daily'**
+  String get libraryAutoScanDaily;
+
+  /// Auto scan once per week
+  ///
+  /// In en, this message translates to:
+  /// **'Weekly'**
+  String get libraryAutoScanWeekly;
+
   /// Section header for library actions
   ///
   /// In en, this message translates to:
@@ -3832,6 +3934,36 @@ abstract class AppLocalizations {
   /// **'FFmpeg metadata embed failed'**
   String get trackReEnrichFfmpegFailed;
 
+  /// Action/button label for queueing FLAC redownloads for local tracks
+  ///
+  /// In en, this message translates to:
+  /// **'Queue FLAC'**
+  String get queueFlacAction;
+
+  /// Confirmation dialog body before queueing FLAC redownloads for local tracks
+  ///
+  /// In en, this message translates to:
+  /// **'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'**
+  String queueFlacConfirmMessage(int count);
+
+  /// Snackbar while resolving remote matches for local FLAC redownloads
+  ///
+  /// In en, this message translates to:
+  /// **'Finding FLAC matches... ({current}/{total})'**
+  String queueFlacFindingProgress(int current, int total);
+
+  /// Snackbar when no safe FLAC redownload matches were found
+  ///
+  /// In en, this message translates to:
+  /// **'No reliable online matches found for the selection'**
+  String get queueFlacNoReliableMatches;
+
+  /// Snackbar when some selected local tracks were queued for FLAC redownload and some were skipped
+  ///
+  /// In en, this message translates to:
+  /// **'Added {addedCount} tracks to queue, skipped {skippedCount}'**
+  String queueFlacQueuedWithSkipped(int addedCount, int skippedCount);
+
   /// Snackbar when save operation fails
   ///
   /// In en, this message translates to:
@@ -3847,7 +3979,7 @@ abstract class AppLocalizations {
   /// Subtitle for convert format menu item
   ///
   /// In en, this message translates to:
-  /// **'Convert to MP3 or Opus'**
+  /// **'Convert to MP3, Opus, ALAC, or FLAC'**
   String get trackConvertFormatSubtitle;
 
   /// Title of convert bottom sheet
@@ -3884,6 +4016,21 @@ abstract class AppLocalizations {
     String bitrate,
   );
 
+  /// Confirmation dialog message for lossless-to-lossless conversion
+  ///
+  /// In en, this message translates to:
+  /// **'Convert from {sourceFormat} to {targetFormat}? (Lossless — no quality loss)\n\nThe original file will be deleted after conversion.'**
+  String trackConvertConfirmMessageLossless(
+    String sourceFormat,
+    String targetFormat,
+  );
+
+  /// Hint shown when converting between lossless formats
+  ///
+  /// In en, this message translates to:
+  /// **'Lossless conversion — no quality loss'**
+  String get trackConvertLosslessHint;
+
   /// Snackbar while converting
   ///
   /// In en, this message translates to:
@@ -4254,6 +4401,12 @@ abstract class AppLocalizations {
     String bitrate,
   );
 
+  /// Confirmation dialog message for lossless batch conversion
+  ///
+  /// In en, this message translates to:
+  /// **'Convert {count} {count, plural, =1{track} other{tracks}} to {format}? (Lossless — no quality loss)\n\nOriginal files will be deleted after conversion.'**
+  String selectionBatchConvertConfirmMessageLossless(int count, String format);
+
   /// Snackbar during batch conversion progress
   ///
   /// In en, this message translates to:
@@ -4434,7 +4587,7 @@ abstract class AppLocalizations {
   /// **'Added {count} tracks to Loved'**
   String snackbarAddedTracksToLoved(int count);
 
-  /// Title of the Download All confirmation dialog
+  /// Dialog title for bulk download confirmation
   ///
   /// In en, this message translates to:
   /// **'Download All'**
@@ -4446,12 +4599,6 @@ abstract class AppLocalizations {
   /// **'Download {count} tracks?'**
   String dialogDownloadAllMessage(int count);
 
-  /// Confirm button in Download All dialog
-  ///
-  /// In en, this message translates to:
-  /// **'Download'**
-  String get dialogDownload;
-
   /// Checkbox label in import dialog to skip already-downloaded songs
   ///
   /// In en, this message translates to:
@@ -4572,6 +4719,30 @@ abstract class AppLocalizations {
   /// **'Artist Name Filters'**
   String get downloadArtistNameFilters;
 
+  /// Setting title for adding a playlist folder prefix before the normal organization structure
+  ///
+  /// In en, this message translates to:
+  /// **'Create playlist source folder'**
+  String get downloadCreatePlaylistSourceFolder;
+
+  /// Subtitle when playlist source folder prefix is enabled
+  ///
+  /// In en, this message translates to:
+  /// **'Playlist downloads use Playlist/ plus your normal folder structure.'**
+  String get downloadCreatePlaylistSourceFolderEnabled;
+
+  /// Subtitle when playlist source folder prefix is disabled
+  ///
+  /// In en, this message translates to:
+  /// **'Playlist downloads use the normal folder structure only.'**
+  String get downloadCreatePlaylistSourceFolderDisabled;
+
+  /// Subtitle when playlist folder prefix setting is redundant because folder organization is already by playlist
+  ///
+  /// In en, this message translates to:
+  /// **'By Playlist already places downloads inside a playlist folder.'**
+  String get downloadCreatePlaylistSourceFolderRedundant;
+
   /// Setting title for SongLink country region
   ///
   /// In en, this message translates to:
@@ -4602,18 +4773,6 @@ abstract class AppLocalizations {
   /// **'Select a built-in service to enable'**
   String get downloadSelectServiceToEnable;
 
-  /// Quality option label for Tidal lossy 320kbps
-  ///
-  /// In en, this message translates to:
-  /// **'Lossy 320kbps'**
-  String get downloadLossy320;
-
-  /// Setting title to pick output format for Tidal lossy downloads
-  ///
-  /// In en, this message translates to:
-  /// **'Lossy Format'**
-  String get downloadLossyFormat;
-
   /// Info hint when non-Tidal/Qobuz service is selected
   ///
   /// In en, this message translates to:
@@ -4740,54 +4899,6 @@ abstract class AppLocalizations {
   /// **'Auto'**
   String get downloadMusixmatchAuto;
 
-  /// Title of the Tidal lossy format picker bottom sheet
-  ///
-  /// In en, this message translates to:
-  /// **'Lossy 320kbps Format'**
-  String get downloadLossy320Format;
-
-  /// Description in the Tidal lossy format picker
-  ///
-  /// In en, this message translates to:
-  /// **'Choose the output format for Tidal 320kbps lossy downloads. The original AAC stream will be converted to your selected format.'**
-  String get downloadLossy320FormatDesc;
-
-  /// Tidal lossy format option - MP3 320kbps
-  ///
-  /// In en, this message translates to:
-  /// **'MP3 320kbps'**
-  String get downloadLossyMp3;
-
-  /// Subtitle for MP3 320kbps option
-  ///
-  /// In en, this message translates to:
-  /// **'Best compatibility, ~10MB per track'**
-  String get downloadLossyMp3Subtitle;
-
-  /// Tidal lossy format option - Opus 256kbps
-  ///
-  /// In en, this message translates to:
-  /// **'Opus 256kbps'**
-  String get downloadLossyOpus256;
-
-  /// Subtitle for Opus 256kbps option
-  ///
-  /// In en, this message translates to:
-  /// **'Best quality Opus, ~8MB per track'**
-  String get downloadLossyOpus256Subtitle;
-
-  /// Tidal lossy format option - Opus 128kbps
-  ///
-  /// In en, this message translates to:
-  /// **'Opus 128kbps'**
-  String get downloadLossyOpus128;
-
-  /// Subtitle for Opus 128kbps option
-  ///
-  /// In en, this message translates to:
-  /// **'Smallest size, ~4MB per track'**
-  String get downloadLossyOpus128Subtitle;
-
   /// Subtitle for 'Any' network mode option
   ///
   /// In en, this message translates to:
@@ -4817,6 +4928,162 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Refresh'**
   String get cacheRefresh;
+
+  /// Dialog message for bulk playlist download confirmation
+  ///
+  /// In en, this message translates to:
+  /// **'Download {trackCount} {trackCount, plural, =1{track} other{tracks}} from {playlistCount} {playlistCount, plural, =1{playlist} other{playlists}}?'**
+  String dialogDownloadPlaylistsMessage(int trackCount, int playlistCount);
+
+  /// Button label for bulk downloading selected playlists
+  ///
+  /// In en, this message translates to:
+  /// **'Download {count} {count, plural, =1{playlist} other{playlists}}'**
+  String bulkDownloadPlaylistsButton(int count);
+
+  /// Button label when no playlists are selected for download
+  ///
+  /// In en, this message translates to:
+  /// **'Select playlists to download'**
+  String get bulkDownloadSelectPlaylists;
+
+  /// Snackbar when selected playlists contain no tracks
+  ///
+  /// In en, this message translates to:
+  /// **'Selected playlists have no tracks'**
+  String get snackbarSelectedPlaylistsEmpty;
+
+  /// Playlist count display
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =1{1 playlist} other{{count} playlists}}'**
+  String playlistsCount(int count);
+
+  /// Section title for selective online metadata auto-fill in the edit metadata sheet
+  ///
+  /// In en, this message translates to:
+  /// **'Auto-fill from online'**
+  String get editMetadataAutoFill;
+
+  /// Description for the auto-fill section
+  ///
+  /// In en, this message translates to:
+  /// **'Select fields to fill automatically from online metadata'**
+  String get editMetadataAutoFillDesc;
+
+  /// Button label to fetch online metadata and fill selected fields
+  ///
+  /// In en, this message translates to:
+  /// **'Fetch & Fill'**
+  String get editMetadataAutoFillFetch;
+
+  /// Snackbar shown while searching for online metadata
+  ///
+  /// In en, this message translates to:
+  /// **'Searching online...'**
+  String get editMetadataAutoFillSearching;
+
+  /// Snackbar when online metadata search returns no results
+  ///
+  /// In en, this message translates to:
+  /// **'No matching metadata found online'**
+  String get editMetadataAutoFillNoResults;
+
+  /// Snackbar confirming how many fields were auto-filled
+  ///
+  /// In en, this message translates to:
+  /// **'Filled {count} {count, plural, =1{field} other{fields}} from online metadata'**
+  String editMetadataAutoFillDone(int count);
+
+  /// Snackbar when user taps Fetch without selecting any fields
+  ///
+  /// In en, this message translates to:
+  /// **'Select at least one field to auto-fill'**
+  String get editMetadataAutoFillNoneSelected;
+
+  /// Chip label for title field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'Title'**
+  String get editMetadataFieldTitle;
+
+  /// Chip label for artist field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'Artist'**
+  String get editMetadataFieldArtist;
+
+  /// Chip label for album field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'Album'**
+  String get editMetadataFieldAlbum;
+
+  /// Chip label for album artist field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'Album Artist'**
+  String get editMetadataFieldAlbumArtist;
+
+  /// Chip label for date field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'Date'**
+  String get editMetadataFieldDate;
+
+  /// Chip label for track number field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'Track #'**
+  String get editMetadataFieldTrackNum;
+
+  /// Chip label for disc number field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'Disc #'**
+  String get editMetadataFieldDiscNum;
+
+  /// Chip label for genre field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'Genre'**
+  String get editMetadataFieldGenre;
+
+  /// Chip label for ISRC field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'ISRC'**
+  String get editMetadataFieldIsrc;
+
+  /// Chip label for label field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'Label'**
+  String get editMetadataFieldLabel;
+
+  /// Chip label for copyright field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'Copyright'**
+  String get editMetadataFieldCopyright;
+
+  /// Chip label for cover art field in auto-fill selector
+  ///
+  /// In en, this message translates to:
+  /// **'Cover Art'**
+  String get editMetadataFieldCover;
+
+  /// Button to select all fields for auto-fill
+  ///
+  /// In en, this message translates to:
+  /// **'All'**
+  String get editMetadataSelectAll;
+
+  /// Button to select only fields that are currently empty
+  ///
+  /// In en, this message translates to:
+  /// **'Empty only'**
+  String get editMetadataSelectEmpty;
 }
 
 class _AppLocalizationsDelegate

lib/l10n/app_localizations_de.dart

@@ -365,7 +365,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Lade Spotify-Titel in verlustfreier Qualität von Tidal, Qobuz und Amazon Music herunter.';
+      'Lade Spotify-Titel in verlustfreier Qualität von Tidal und Qobuz herunter.';
 
   @override
   String get artistAlbums => 'Alben';
@@ -441,7 +441,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get setupDownloadLocationIosMessage =>
-      'Auf iOS werden Downloads im Dokumentenverzeichnis der App gespeichert. Du kannst sie über die Datei-App aufrufen.';
+      'Auf iOS werden Downloads im Dokumentenordner der App gespeichert. Du kannst sie über die Datei-App aufrufen.';
 
   @override
   String get setupAppDocumentsFolder => 'App-Dokumentenordner';
@@ -536,6 +536,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get dialogImport => 'Importieren';
 
+  @override
+  String get dialogDownload => 'Download';
+
   @override
   String get dialogDiscard => 'Verwerfen';
 
@@ -702,15 +705,15 @@ class AppLocalizationsDe extends AppLocalizations {
   String get errorNoTracksFound => 'Keine Titel gefunden';
 
   @override
-  String get errorUrlNotRecognized => 'Link not recognized';
+  String get errorUrlNotRecognized => 'Link wurde nicht erkannt';
 
   @override
   String get errorUrlNotRecognizedMessage =>
-      'This link is not supported. Make sure the URL is correct and a compatible extension is installed.';
+      'Dieser Link ist inkompatibel. Prüfe die URL und stelle sicher, dass eine kompatible Erweiterung installiert ist.';
 
   @override
   String get errorUrlFetchFailed =>
-      'Failed to load content from this link. Please try again.';
+      'Laden fehlgeschlagen. Bitte erneut versuchen.';
 
   @override
   String errorMissingExtensionSource(String item) {
@@ -747,7 +750,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get selectionAllSelected => 'Alle Titel sind ausgewählt';
 
   @override
-  String get selectionSelectToDelete => 'Titel zum Löschen auswählen';
+  String get selectionSelectToDelete => 'Titel zum Löschen wählen';
 
   @override
   String progressFetchingMetadata(int current, int total) {
@@ -764,7 +767,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get searchArtists => 'Künstler';
 
   @override
-  String get searchAlbums => 'Albums';
+  String get searchAlbums => 'Alben';
 
   @override
   String get searchPlaylists => 'Playlisten';
@@ -786,11 +789,11 @@ class AppLocalizationsDe extends AppLocalizations {
   String get folderOrganizationNone => 'Keine Organisation';
 
   @override
-  String get folderOrganizationByPlaylist => 'By Playlist';
+  String get folderOrganizationByPlaylist => 'Nach Playlist';
 
   @override
   String get folderOrganizationByPlaylistSubtitle =>
-      'Separate folder for each playlist';
+      'Ordner für jede Playlist trennen';
 
   @override
   String get folderOrganizationByArtist => 'Nach Künstler';
@@ -807,7 +810,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get folderOrganizationNoneSubtitle =>
-      'Alle Dateien im Download-Verzeichnis';
+      'Alle Dateien im Download-Ordner';
 
   @override
   String get folderOrganizationByArtistSubtitle =>
@@ -1410,6 +1413,38 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get qualityHiResFlacMaxSubtitle => '24-Bit / bis 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 =>
       'Die eigentliche Qualität hängt von der Verfügbarkeit des Dienstes ab';
@@ -1428,19 +1463,20 @@ class AppLocalizationsDe extends AppLocalizations {
   String get downloadAskBeforeDownload => 'Qualität vor Download fragen';
 
   @override
-  String get downloadDirectory => 'Downloadverzeichnis';
+  String get downloadDirectory => 'Download-Ordner';
 
   @override
   String get downloadSeparateSinglesFolder => 'Singles Ordner trennen';
 
   @override
-  String get downloadAlbumFolderStructure => 'Album Folder Structure';
+  String get downloadAlbumFolderStructure => 'Album-Ordnerstruktur';
 
   @override
-  String get downloadUseAlbumArtistForFolders => 'Use Album Artist for folders';
+  String get downloadUseAlbumArtistForFolders =>
+      'Album-Künstler für Ordner verwenden';
 
   @override
-  String get downloadUsePrimaryArtistOnly => 'Primary artist only for folders';
+  String get downloadUsePrimaryArtistOnly => 'Primärer Künstler nur für Ordner';
 
   @override
   String get downloadUsePrimaryArtistOnlyEnabled =>
@@ -1448,7 +1484,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get downloadUsePrimaryArtistOnlyDisabled =>
-      'Full artist string used for folder name';
+      'Vollständiger Künstler für Ordnername';
 
   @override
   String get downloadSelectQuality => 'Qualität wählen';
@@ -1470,7 +1506,8 @@ class AppLocalizationsDe extends AppLocalizations {
       'Bist du dir sicher, dass du alle Downloads löschen möchten?';
 
   @override
-  String get settingsAutoExportFailed => 'Auto-export failed downloads';
+  String get settingsAutoExportFailed =>
+      'Auto-Export fehlgeschlagener Downloads';
 
   @override
   String get settingsAutoExportFailedSubtitle =>
@@ -1493,14 +1530,14 @@ class AppLocalizationsDe extends AppLocalizations {
   String get albumFolderArtistAlbum => 'Künstler/Album';
 
   @override
-  String get albumFolderArtistAlbumSubtitle => 'Albums/Artist Name/Album Name/';
+  String get albumFolderArtistAlbumSubtitle => 'Alben/Künster Name/Album Name/';
 
   @override
-  String get albumFolderArtistYearAlbum => 'Artist / [Year] Album';
+  String get albumFolderArtistYearAlbum => 'Künstler / [Year] Album';
 
   @override
   String get albumFolderArtistYearAlbumSubtitle =>
-      'Albums/Künster Name/[2005] Album Name/';
+      'Alben/Künster Name/[2005] Album Name/';
 
   @override
   String get albumFolderAlbumOnly => 'Nur Alben';
@@ -1512,14 +1549,14 @@ class AppLocalizationsDe extends AppLocalizations {
   String get albumFolderYearAlbum => '[Year] Album';
 
   @override
-  String get albumFolderYearAlbumSubtitle => 'Albums/[2005] Album Name/';
+  String get albumFolderYearAlbumSubtitle => 'Alben/[2005] Album Name/';
 
   @override
-  String get albumFolderArtistAlbumSingles => 'Artist / Album + Singles';
+  String get albumFolderArtistAlbumSingles => 'Künstler / Album + Singles';
 
   @override
   String get albumFolderArtistAlbumSinglesSubtitle =>
-      'Artist/Album/ and Artist/Singles/';
+      'Künstler/Album/ und Künstler/Singles/';
 
   @override
   String get downloadedAlbumDeleteSelected => 'Ausgewählte löschen';
@@ -1558,7 +1595,7 @@ class AppLocalizationsDe extends AppLocalizations {
   }
 
   @override
-  String get downloadedAlbumSelectToDelete => 'Select tracks to delete';
+  String get downloadedAlbumSelectToDelete => 'Titel zum Löschen wählen';
 
   @override
   String downloadedAlbumDiscHeader(int discNumber) {
@@ -1604,7 +1641,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String discographyAlbumsOnlySubtitle(int count, int albumCount) {
-    return '$count Titel von $albumCount Albums';
+    return '$count Titel aus $albumCount Alben';
   }
 
   @override
@@ -1620,14 +1657,14 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get discographySelectAlbumsSubtitle =>
-      'Choose specific albums or singles';
+      'Wähle bestimmte Alben oder Singles';
 
   @override
   String get discographyFetchingTracks => 'Lade Titel...';
 
   @override
   String discographyFetchingAlbum(int current, int total) {
-    return 'Fetching $current of $total...';
+    return 'Lade $current von $total...';
   }
 
   @override
@@ -1640,7 +1677,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String discographyAddedToQueue(int count) {
-    return 'Added $count tracks to queue';
+    return '$count Titel zur Warteschlange hinzugefügt';
   }
 
   @override
@@ -1652,7 +1689,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get discographyNoAlbums => 'Es sind keine Alben verfügbar';
 
   @override
-  String get discographyFailedToFetch => 'Failed to fetch some albums';
+  String get discographyFailedToFetch => 'Fehler beim Abrufen einiger Alben';
 
   @override
   String get sectionStorageAccess => 'Speicherzugriff';
@@ -1661,14 +1698,14 @@ class AppLocalizationsDe extends AppLocalizations {
   String get allFilesAccess => 'Zugriff auf alle Dateien';
 
   @override
-  String get allFilesAccessEnabledSubtitle => 'Can write to any folder';
+  String get allFilesAccessEnabledSubtitle => 'Darf in jeden Ordner schreiben';
 
   @override
-  String get allFilesAccessDisabledSubtitle => 'Limited to media folders only';
+  String get allFilesAccessDisabledSubtitle => 'Nur auf Medienordner begrenzt';
 
   @override
   String get allFilesAccessDescription =>
-      'Aktiviere die Option, wenn beim Speichern in benutzerdefinierten Ordnern Schreibfehler auftreten. Weil Android 13+ standardmäßig den Zugriff auf bestimmte Verzeichnisse einschränkt.';
+      'Option bei Schreibfehlern bitte aktivieren (erforderlich ab Android 13).';
 
   @override
   String get allFilesAccessDeniedMessage =>
@@ -1682,13 +1719,15 @@ class AppLocalizationsDe extends AppLocalizations {
   String get settingsLocalLibrary => 'Lokale Bibliothek';
 
   @override
-  String get settingsLocalLibrarySubtitle => 'Scan music & detect duplicates';
+  String get settingsLocalLibrarySubtitle =>
+      'Musik scannen & Duplikate erkennen';
 
   @override
   String get settingsCache => 'Speicher & Cache';
 
   @override
-  String get settingsCacheSubtitle => 'View size and clear cached data';
+  String get settingsCacheSubtitle =>
+      'Größe anzeigen und Daten im Cache leeren';
 
   @override
   String get libraryTitle => 'Lokale Bibliothek';
@@ -1701,7 +1740,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get libraryEnableLocalLibrarySubtitle =>
-      'Scan and track your existing music';
+      'Scan und verfolge deine bestehende Musik';
 
   @override
   String get libraryFolder => 'Bibliotheksordner';
@@ -1710,12 +1749,31 @@ class AppLocalizationsDe extends AppLocalizations {
   String get libraryFolderHint => 'Tippe um Ordner auszuwählen';
 
   @override
-  String get libraryShowDuplicateIndicator => 'Show Duplicate Indicator';
+  String get libraryShowDuplicateIndicator => 'Duplikat Indikator anzeigen';
 
   @override
   String get libraryShowDuplicateIndicatorSubtitle =>
       'Bei der Suche nach vorhandenen Titeln anzeigen';
 
+  @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 => 'Aktionen';
 
@@ -1892,7 +1950,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Hole dir FLAC Audio von Tidal, Qobuz oder Amazon Musik';
+      'Hole dir FLAC Audio von Tidal, Qobuz oder Deezer';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -1959,7 +2017,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get tutorialSettingsTip1 =>
-      'Downloadverzeichnis und Ordnerorganisation ändern';
+      'Download-Ordner und Ordner-Organisation ändern';
 
   @override
   String get tutorialSettingsTip2 =>
@@ -2017,14 +2075,14 @@ class AppLocalizationsDe extends AppLocalizations {
   String get cacheSectionMaintenance => 'Wartung';
 
   @override
-  String get cacheAppDirectory => 'App-Cache Verzeichnis';
+  String get cacheAppDirectory => 'App-Cache Ordner';
 
   @override
   String get cacheAppDirectoryDesc =>
       'HTTP-Antworten, WebView Daten und andere temporäre App-Daten.';
 
   @override
-  String get cacheTempDirectory => 'Temporäres Verzeichnis';
+  String get cacheTempDirectory => 'Temporärer Ordner';
 
   @override
   String get cacheTempDirectoryDesc =>
@@ -2145,11 +2203,11 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String trackCoverSaved(String fileName) {
-    return 'Cover art saved to $fileName';
+    return 'Cover in $fileName gespeichert';
   }
 
   @override
-  String get trackCoverNoSource => 'No cover art source available';
+  String get trackCoverNoSource => 'Keine Cover Quelle vorhanden';
 
   @override
   String trackLyricsSaved(String fileName) {
@@ -2169,6 +2227,28 @@ class AppLocalizationsDe extends AppLocalizations {
   String get trackReEnrichFfmpegFailed =>
       'FFmpeg Metadaten-Einbettung fehlgeschlagen';
 
+  @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 'Fehler: $error';
@@ -2201,6 +2281,18 @@ class AppLocalizationsDe extends AppLocalizations {
     return 'Konvertieren von $sourceFormat in $targetFormat bei $bitrate?\n\nDie Originaldatei wird nach der Konvertierung gelöscht.';
   }
 
+  @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 => 'Konvertiere Audio...';
 
@@ -2213,10 +2305,10 @@ class AppLocalizationsDe extends AppLocalizations {
   String get trackConvertFailed => 'Konvertierung fehlgeschlagen';
 
   @override
-  String get cueSplitTitle => 'Split CUE Sheet';
+  String get cueSplitTitle => 'CUE-Sheet aufteilen';
 
   @override
-  String get cueSplitSubtitle => 'Split CUE+FLAC into individual tracks';
+  String get cueSplitSubtitle => 'CUE+FLAC in einzelne Titel aufteilen';
 
   @override
   String cueSplitAlbum(String album) {
@@ -2225,40 +2317,41 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String cueSplitArtist(String artist) {
-    return 'Artist: $artist';
+    return 'Künstler: $artist';
   }
 
   @override
   String cueSplitTrackCount(int count) {
-    return '$count tracks';
+    return '$count Titel';
   }
 
   @override
-  String get cueSplitConfirmTitle => 'Split CUE Album';
+  String get cueSplitConfirmTitle => 'CUE-Album aufteilen';
 
   @override
   String cueSplitConfirmMessage(String album, int count) {
-    return 'Split \"$album\" into $count individual FLAC files?\n\nFiles will be saved to the same directory.';
+    return 'Soll „$album“ in $count einzelne FLAC-Dateien aufgeteilt werden?\n\nDie Dateien werden im selben Ordner gespeichert.';
   }
 
   @override
   String cueSplitSplitting(int current, int total) {
-    return 'Splitting CUE sheet... ($current/$total)';
+    return 'CUE-Sheet wird geteilt... ($current/$total)';
   }
 
   @override
   String cueSplitSuccess(int count) {
-    return 'Split into $count tracks successfully';
+    return '$count Titel erfolgreich aufgeteilt';
   }
 
   @override
-  String get cueSplitFailed => 'CUE split failed';
+  String get cueSplitFailed => 'CUE-Aufteilung fehlgeschlagen';
 
   @override
-  String get cueSplitNoAudioFile => 'Audio file not found for this CUE sheet';
+  String get cueSplitNoAudioFile =>
+      'Audiodatei für dieses CUE-Sheet nicht gefunden';
 
   @override
-  String get cueSplitButton => 'Split into Tracks';
+  String get cueSplitButton => 'In Titel aufteilen';
 
   @override
   String get actionCreate => 'Erstellen';
@@ -2455,6 +2548,17 @@ class AppLocalizationsDe extends AppLocalizations {
     return 'Konvertiere $count $format $_temp0 zu $bitrate?\n\nOriginaldateien werden nach der Konvertierung gelöscht.';
   }
 
+  @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 'Konvertiere $current von $total...';
@@ -2472,11 +2576,11 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get downloadUseAlbumArtistForFoldersAlbumSubtitle =>
-      'Künstlerordner verwenden den Album-Interpreten, wenn verfügbar';
+      'Interpret-Ordner verwenden Album-Interpret, sofern vorhanden';
 
   @override
   String get downloadUseAlbumArtistForFoldersTrackSubtitle =>
-      'Artist folders use Track Artist only';
+      'Künstler-Ordner nur für Titel-Künstler';
 
   @override
   String get lyricsProvidersTitle => 'Lyrics Providers';
@@ -2580,9 +2684,6 @@ class AppLocalizationsDe extends AppLocalizations {
     return 'Download $count tracks?';
   }
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
 
@@ -2648,6 +2749,22 @@ class AppLocalizationsDe extends AppLocalizations {
   @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';
 
@@ -2666,12 +2783,6 @@ class AppLocalizationsDe extends AppLocalizations {
   String get downloadSelectServiceToEnable =>
       'Select a built-in service to enable';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
   @override
   String get downloadSelectTidalQobuz =>
       'Select Tidal or Qobuz above to configure quality';
@@ -2748,32 +2859,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get downloadMusixmatchAuto => 'Auto';
 
-  @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 downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
 
@@ -2790,4 +2875,124 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @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';
 }

lib/l10n/app_localizations_en.dart

@@ -525,6 +525,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get dialogImport => 'Import';
 
+  @override
+  String get dialogDownload => 'Download';
+
   @override
   String get dialogDiscard => 'Discard';
 
@@ -1237,7 +1240,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get storeEmptyNoResults => 'No extensions found';
 
   @override
-  String get extensionDefaultProvider => 'Default (Deezer/Spotify)';
+  String get extensionDefaultProvider => 'Default (Deezer)';
 
   @override
   String get extensionDefaultProviderSubtitle => 'Use built-in search';
@@ -1386,6 +1389,38 @@ 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';
@@ -1692,6 +1727,25 @@ 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';
 
@@ -2142,6 +2196,28 @@ 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';
@@ -2151,7 +2227,8 @@ class AppLocalizationsEn extends AppLocalizations {
   String get trackConvertFormat => 'Convert Format';
 
   @override
-  String get trackConvertFormatSubtitle => 'Convert to MP3 or Opus';
+  String get trackConvertFormatSubtitle =>
+      'Convert to MP3, Opus, ALAC, or FLAC';
 
   @override
   String get trackConvertTitle => 'Convert Audio';
@@ -2174,6 +2251,18 @@ 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...';
 
@@ -2427,6 +2516,17 @@ 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...';
@@ -2552,9 +2652,6 @@ class AppLocalizationsEn extends AppLocalizations {
     return 'Download $count tracks?';
   }
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
 
@@ -2620,6 +2717,22 @@ class AppLocalizationsEn extends AppLocalizations {
   @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';
 
@@ -2638,12 +2751,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get downloadSelectServiceToEnable =>
       'Select a built-in service to enable';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
   @override
   String get downloadSelectTidalQobuz =>
       'Select Tidal or Qobuz above to configure quality';
@@ -2720,32 +2827,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get downloadMusixmatchAuto => 'Auto';
 
-  @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 downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
 
@@ -2762,4 +2843,124 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @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';
 }

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, Qobuz, and Amazon Music.';
+      'Download Spotify tracks in lossless quality from Tidal and Qobuz.';
 
   @override
   String get artistAlbums => 'Albums';
@@ -527,6 +527,9 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get dialogImport => 'Import';
 
+  @override
+  String get dialogDownload => 'Download';
+
   @override
   String get dialogDiscard => 'Discard';
 
@@ -1388,6 +1391,38 @@ 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';
@@ -1694,6 +1729,25 @@ 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';
 
@@ -1870,7 +1924,7 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Get FLAC quality audio from Tidal, Qobuz, or Amazon Music';
+      'Get FLAC quality audio from Tidal, Qobuz, or Deezer';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2144,6 +2198,28 @@ 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';
@@ -2176,6 +2252,18 @@ 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...';
 
@@ -2429,6 +2517,17 @@ 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...';
@@ -2554,9 +2653,6 @@ class AppLocalizationsFr extends AppLocalizations {
     return 'Download $count tracks?';
   }
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
 
@@ -2622,6 +2718,22 @@ class AppLocalizationsFr extends AppLocalizations {
   @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';
 
@@ -2640,12 +2752,6 @@ class AppLocalizationsFr extends AppLocalizations {
   String get downloadSelectServiceToEnable =>
       'Select a built-in service to enable';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
   @override
   String get downloadSelectTidalQobuz =>
       'Select Tidal or Qobuz above to configure quality';
@@ -2722,32 +2828,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get downloadMusixmatchAuto => 'Auto';
 
-  @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 downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
 
@@ -2764,4 +2844,124 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @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';
 }

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, Qobuz, and Amazon Music.';
+      'Download Spotify tracks in lossless quality from Tidal and Qobuz.';
 
   @override
   String get artistAlbums => 'Albums';
@@ -525,6 +525,9 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get dialogImport => 'Import';
 
+  @override
+  String get dialogDownload => 'Download';
+
   @override
   String get dialogDiscard => 'Discard';
 
@@ -1386,6 +1389,38 @@ 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';
@@ -1692,6 +1727,25 @@ 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';
 
@@ -1868,7 +1922,7 @@ class AppLocalizationsHi extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Get FLAC quality audio from Tidal, Qobuz, or Amazon Music';
+      'Get FLAC quality audio from Tidal, Qobuz, or Deezer';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2142,6 +2196,28 @@ 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';
@@ -2174,6 +2250,18 @@ 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...';
 
@@ -2427,6 +2515,17 @@ 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...';
@@ -2552,9 +2651,6 @@ class AppLocalizationsHi extends AppLocalizations {
     return 'Download $count tracks?';
   }
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
 
@@ -2620,6 +2716,22 @@ class AppLocalizationsHi extends AppLocalizations {
   @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';
 
@@ -2638,12 +2750,6 @@ class AppLocalizationsHi extends AppLocalizations {
   String get downloadSelectServiceToEnable =>
       'Select a built-in service to enable';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
   @override
   String get downloadSelectTidalQobuz =>
       'Select Tidal or Qobuz above to configure quality';
@@ -2720,32 +2826,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get downloadMusixmatchAuto => 'Auto';
 
-  @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 downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
 
@@ -2762,4 +2842,124 @@ class AppLocalizationsHi extends AppLocalizations {
 
   @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';
 }

lib/l10n/app_localizations_id.dart

@@ -359,7 +359,7 @@ class AppLocalizationsId extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Unduh lagu Spotify dalam kualitas lossless dari Tidal, Qobuz, dan Amazon Music.';
+      'Unduh lagu-lagu Spotify dalam kualitas lossless dari Tidal dan Qobuz.';
 
   @override
   String get artistAlbums => 'Album';
@@ -528,6 +528,9 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get dialogImport => 'Impor';
 
+  @override
+  String get dialogDownload => 'Download';
+
   @override
   String get dialogDiscard => 'Buang';
 
@@ -766,21 +769,21 @@ class AppLocalizationsId extends AppLocalizations {
   String get filenameFormat => 'Format Nama File';
 
   @override
-  String get filenameShowAdvancedTags => 'Show advanced tags';
+  String get filenameShowAdvancedTags => 'Tampilkan tag lanjutan';
 
   @override
   String get filenameShowAdvancedTagsDescription =>
-      'Enable formatted tags for track padding and date patterns';
+      'Aktifkan tag yang diformat untuk padding trek dan pola tanggal';
 
   @override
   String get folderOrganizationNone => 'Tidak ada';
 
   @override
-  String get folderOrganizationByPlaylist => 'By Playlist';
+  String get folderOrganizationByPlaylist => 'Berdasarkan Daftar Putar';
 
   @override
   String get folderOrganizationByPlaylistSubtitle =>
-      'Separate folder for each playlist';
+      'Setiap daftar putar memerlukan folder terpisah';
 
   @override
   String get folderOrganizationByArtist => 'Berdasarkan Artis';
@@ -936,13 +939,13 @@ class AppLocalizationsId extends AppLocalizations {
       'Masukkan Client ID dan Secret Anda untuk menggunakan kuota aplikasi Spotify Anda sendiri.';
 
   @override
-  String get credentialsClientId => 'Client ID';
+  String get credentialsClientId => 'ID Klien';
 
   @override
   String get credentialsClientIdHint => 'Tempel Client ID';
 
   @override
-  String get credentialsClientSecret => 'Client Secret';
+  String get credentialsClientSecret => 'Rahasia Klien';
 
   @override
   String get credentialsClientSecretHint => 'Tempel Client Secret';
@@ -951,7 +954,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get channelStable => 'Stabil';
 
   @override
-  String get channelPreview => 'Preview';
+  String get channelPreview => 'Pratinjau';
 
   @override
   String get sectionSearchSource => 'Sumber Pencarian';
@@ -981,33 +984,34 @@ class AppLocalizationsId extends AppLocalizations {
   String get sectionFileSettings => 'Pengaturan File';
 
   @override
-  String get sectionLyrics => 'Lyrics';
+  String get sectionLyrics => 'Lirik';
 
   @override
-  String get lyricsMode => 'Lyrics Mode';
+  String get lyricsMode => 'Mode Lirik';
 
   @override
   String get lyricsModeDescription =>
-      'Choose how lyrics are saved with your downloads';
+      'Pilih cara lirik disimpan bersama unduhan Anda';
 
   @override
-  String get lyricsModeEmbed => 'Embed in file';
+  String get lyricsModeEmbed => 'Sematkan dalam file';
 
   @override
-  String get lyricsModeEmbedSubtitle => 'Lyrics stored inside FLAC metadata';
+  String get lyricsModeEmbedSubtitle =>
+      'Lirik tersimpan di dalam metadata FLAC';
 
   @override
-  String get lyricsModeExternal => 'External .lrc file';
+  String get lyricsModeExternal => 'File .lrc eksternal';
 
   @override
   String get lyricsModeExternalSubtitle =>
-      'Separate .lrc file for players like Samsung Music';
+      'File .lrc terpisah untuk pemutar musik seperti Samsung Music';
 
   @override
-  String get lyricsModeBoth => 'Both';
+  String get lyricsModeBoth => 'Keduanya';
 
   @override
-  String get lyricsModeBothSubtitle => 'Embed and save .lrc file';
+  String get lyricsModeBothSubtitle => 'Sematkan dan simpan file .lrc';
 
   @override
   String get sectionColor => 'Warna';
@@ -1119,10 +1123,10 @@ class AppLocalizationsId extends AppLocalizations {
   String get trackGenre => 'Genre';
 
   @override
-  String get trackLabel => 'Label';
+  String get trackLabel => 'Lebel';
 
   @override
-  String get trackCopyright => 'Copyright';
+  String get trackCopyright => 'Hak cipta';
 
   @override
   String get trackDownloaded => 'Diunduh';
@@ -1140,13 +1144,13 @@ class AppLocalizationsId extends AppLocalizations {
   String get trackLyricsLoadFailed => 'Gagal memuat lirik';
 
   @override
-  String get trackEmbedLyrics => 'Embed Lyrics';
+  String get trackEmbedLyrics => 'Sematkan Lirik';
 
   @override
-  String get trackLyricsEmbedded => 'Lyrics embedded successfully';
+  String get trackLyricsEmbedded => 'Lirik berhasil disematkan';
 
   @override
-  String get trackInstrumental => 'Instrumental track';
+  String get trackInstrumental => 'Lagu instrumental';
 
   @override
   String get trackCopiedToClipboard => 'Disalin ke clipboard';
@@ -1242,7 +1246,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get storeEmptyNoResults => 'No extensions found';
 
   @override
-  String get extensionDefaultProvider => 'Default (Deezer/Spotify)';
+  String get extensionDefaultProvider => 'Bawaan (Deezer/Spotify)';
 
   @override
   String get extensionDefaultProviderSubtitle => 'Gunakan pencarian bawaan';
@@ -1254,7 +1258,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get extensionId => 'ID';
 
   @override
-  String get extensionError => 'Error';
+  String get extensionError => 'Terjadi kesalahan';
 
   @override
   String get extensionCapabilities => 'Kemampuan';
@@ -1393,19 +1397,51 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get qualityHiResFlacMaxSubtitle => '24-bit / hingga 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 =>
       'Kualitas sebenarnya tergantung ketersediaan lagu dari layanan';
 
   @override
   String get youtubeQualityNote =>
-      'YouTube provides lossy audio only. Not part of lossless fallback.';
+      'YouTube hanya menyediakan audio terkompresi (lossy). Bukan bagian dari fallback lossless.';
 
   @override
-  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+  String get youtubeOpusBitrateTitle => 'Bitrate YouTube Opus';
 
   @override
-  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+  String get youtubeMp3BitrateTitle => 'Kecepatan Bit MP3 YouTube';
 
   @override
   String get downloadAskBeforeDownload => 'Tanya Sebelum Unduh';
@@ -1420,18 +1456,19 @@ class AppLocalizationsId extends AppLocalizations {
   String get downloadAlbumFolderStructure => 'Struktur Folder Album';
 
   @override
-  String get downloadUseAlbumArtistForFolders => 'Use Album Artist for folders';
+  String get downloadUseAlbumArtistForFolders =>
+      'Gunakan Artis Album untuk folder';
 
   @override
-  String get downloadUsePrimaryArtistOnly => 'Primary artist only for folders';
+  String get downloadUsePrimaryArtistOnly => 'Hanya artis utama untuk folder';
 
   @override
   String get downloadUsePrimaryArtistOnlyEnabled =>
-      'Featured artists removed from folder name (e.g. Justin Bieber, Quavo → Justin Bieber)';
+      'Artis unggulan dihapus dari nama folder (misalnya Justin Bieber, Quavo → Justin Bieber)';
 
   @override
   String get downloadUsePrimaryArtistOnlyDisabled =>
-      'Full artist string used for folder name';
+      'Nama lengkap artis digunakan untuk nama folder';
 
   @override
   String get downloadSelectQuality => 'Pilih Kualitas';
@@ -1453,24 +1490,24 @@ class AppLocalizationsId extends AppLocalizations {
       'Apakah Anda yakin ingin menghapus semua unduhan?';
 
   @override
-  String get settingsAutoExportFailed => 'Auto-export failed downloads';
+  String get settingsAutoExportFailed => 'Unduhan yang gagal diekspor otomatis';
 
   @override
   String get settingsAutoExportFailedSubtitle =>
-      'Save failed downloads to TXT file automatically';
+      'Simpan unduhan yang gagal ke file TXT secara otomatis';
 
   @override
-  String get settingsDownloadNetwork => 'Download Network';
+  String get settingsDownloadNetwork => 'Jaringan Unduhan';
 
   @override
-  String get settingsDownloadNetworkAny => 'WiFi + Mobile Data';
+  String get settingsDownloadNetworkAny => 'WiFi + Data Seluler';
 
   @override
-  String get settingsDownloadNetworkWifiOnly => 'WiFi Only';
+  String get settingsDownloadNetworkWifiOnly => 'Hanya WiFi';
 
   @override
   String get settingsDownloadNetworkSubtitle =>
-      'Choose which network to use for downloads. When set to WiFi Only, downloads will pause on mobile data.';
+      'Pilih jaringan mana yang akan digunakan untuk mengunduh. Jika diatur ke Hanya WiFi, unduhan akan berhenti sementara dan menggunakan data seluler.';
 
   @override
   String get albumFolderArtistAlbum => 'Artis / Album';
@@ -1498,11 +1535,11 @@ class AppLocalizationsId extends AppLocalizations {
   String get albumFolderYearAlbumSubtitle => 'Albums/[2005] Nama Album/';
 
   @override
-  String get albumFolderArtistAlbumSingles => 'Artist / Album + Singles';
+  String get albumFolderArtistAlbumSingles => 'Artis / Album + Singel';
 
   @override
   String get albumFolderArtistAlbumSinglesSubtitle =>
-      'Artist/Album/ and Artist/Singles/';
+      'Artis/Album/ dan Artis/Single/';
 
   @override
   String get downloadedAlbumDeleteSelected => 'Hapus yang Dipilih';
@@ -1558,21 +1595,21 @@ class AppLocalizationsId extends AppLocalizations {
   String get recentTypeSong => 'Lagu';
 
   @override
-  String get recentTypePlaylist => 'Playlist';
+  String get recentTypePlaylist => 'Daftar putar';
 
   @override
-  String get recentEmpty => 'No recent items yet';
+  String get recentEmpty => 'Belum ada item terbaru';
 
   @override
-  String get recentShowAllDownloads => 'Show All Downloads';
+  String get recentShowAllDownloads => 'Tampilkan Semua Unduhan';
 
   @override
   String recentPlaylistInfo(String name) {
-    return 'Playlist: $name';
+    return 'Daftar Putar: $name';
   }
 
   @override
-  String get discographyDownload => 'Download Discography';
+  String get discographyDownload => 'Unduh Diskografi';
 
   @override
   String get discographyDownloadAll => 'Unduh Semua';
@@ -1699,6 +1736,25 @@ class AppLocalizationsId 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';
 
@@ -1863,44 +1919,44 @@ class AppLocalizationsId extends AppLocalizations {
   }
 
   @override
-  String get tutorialWelcomeTitle => 'Welcome to SpotiFLAC!';
+  String get tutorialWelcomeTitle => 'Selamat Datang di SpotiFLAC!';
 
   @override
   String get tutorialWelcomeDesc =>
-      'Let\'s learn how to download your favorite music in lossless quality. This quick tutorial will show you the basics.';
+      'Mari kita pelajari cara mengunduh musik favorit Anda dalam kualitas lossless. Tutorial singkat ini akan menunjukkan dasar-dasarnya.';
 
   @override
   String get tutorialWelcomeTip1 =>
-      'Download music from Spotify, Deezer, or paste any supported URL';
+      'Unduh musik dari Spotify, Deezer, atau tempel URL yang didukung';
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Get FLAC quality audio from Tidal, Qobuz, or Amazon Music';
+      'Dapatkan audio berkualitas FLAC dari Tidal, Qobuz, atau Deezer';
 
   @override
   String get tutorialWelcomeTip3 =>
-      'Automatic metadata, cover art, and lyrics embedding';
+      'Penyematan metadata, sampul album, dan lirik secara otomatis';
 
   @override
-  String get tutorialSearchTitle => 'Finding Music';
+  String get tutorialSearchTitle => 'Menemukan Musik';
 
   @override
   String get tutorialSearchDesc =>
-      'There are two easy ways to find music you want to download.';
+      'Ada dua cara mudah untuk menemukan musik yang ingin Anda unduh.';
 
   @override
-  String get tutorialDownloadTitle => 'Downloading Music';
+  String get tutorialDownloadTitle => 'Mengunduh Musik';
 
   @override
   String get tutorialDownloadDesc =>
-      'Downloading music is simple and fast. Here\'s how it works.';
+      'Mengunduh musik itu mudah dan cepat. Begini cara kerjanya.';
 
   @override
-  String get tutorialLibraryTitle => 'Your Library';
+  String get tutorialLibraryTitle => 'Perpustakaan Anda';
 
   @override
   String get tutorialLibraryDesc =>
-      'All your downloaded music is organized in the Library tab.';
+      'Semua musik yang Anda unduh tersusun rapi di tab Perpustakaan.';
 
   @override
   String get tutorialLibraryTip1 =>
@@ -2149,6 +2205,28 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get trackReEnrichFfmpegFailed => 'FFmpeg metadata embed failed';
 
+  @override
+  String get queueFlacAction => 'Antrekan FLAC';
+
+  @override
+  String queueFlacConfirmMessage(int count) {
+    return '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';
+  }
+
+  @override
+  String queueFlacFindingProgress(int current, int total) {
+    return 'Mencari kecocokan FLAC... ($current/$total)';
+  }
+
+  @override
+  String get queueFlacNoReliableMatches =>
+      'Tidak ada kecocokan online yang cukup meyakinkan untuk pilihan ini';
+
+  @override
+  String queueFlacQueuedWithSkipped(int addedCount, int skippedCount) {
+    return 'Menambahkan $addedCount track ke antrean, melewati $skippedCount';
+  }
+
   @override
   String trackSaveFailed(String error) {
     return 'Failed: $error';
@@ -2158,7 +2236,8 @@ class AppLocalizationsId extends AppLocalizations {
   String get trackConvertFormat => 'Convert Format';
 
   @override
-  String get trackConvertFormatSubtitle => 'Convert to MP3 or Opus';
+  String get trackConvertFormatSubtitle =>
+      'Konversi ke MP3, Opus, ALAC, atau FLAC';
 
   @override
   String get trackConvertTitle => 'Convert Audio';
@@ -2181,6 +2260,18 @@ class AppLocalizationsId 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 'Konversi dari $sourceFormat ke $targetFormat? (Lossless — tanpa kehilangan kualitas)\n\nFile asli akan dihapus setelah konversi.';
+  }
+
+  @override
+  String get trackConvertLosslessHint =>
+      'Konversi lossless — tanpa kehilangan kualitas';
+
   @override
   String get trackConvertConverting => 'Converting audio...';
 
@@ -2434,6 +2525,17 @@ class AppLocalizationsId 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...';
@@ -2559,9 +2661,6 @@ class AppLocalizationsId extends AppLocalizations {
     return 'Download $count tracks?';
   }
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
 
@@ -2627,6 +2726,22 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get downloadArtistNameFilters => 'Artist Name Filters';
 
+  @override
+  String get downloadCreatePlaylistSourceFolder =>
+      'Buat folder sumber playlist';
+
+  @override
+  String get downloadCreatePlaylistSourceFolderEnabled =>
+      'Unduhan dari playlist memakai Playlist/ lalu struktur folder normal Anda.';
+
+  @override
+  String get downloadCreatePlaylistSourceFolderDisabled =>
+      'Unduhan dari playlist hanya memakai struktur folder normal.';
+
+  @override
+  String get downloadCreatePlaylistSourceFolderRedundant =>
+      'Mode Berdasarkan Playlist sudah menaruh unduhan ke dalam folder playlist.';
+
   @override
   String get downloadSongLinkRegion => 'SongLink Region';
 
@@ -2645,12 +2760,6 @@ class AppLocalizationsId extends AppLocalizations {
   String get downloadSelectServiceToEnable =>
       'Select a built-in service to enable';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
   @override
   String get downloadSelectTidalQobuz =>
       'Select Tidal or Qobuz above to configure quality';
@@ -2727,32 +2836,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get downloadMusixmatchAuto => 'Auto';
 
-  @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 downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
 
@@ -2769,4 +2852,124 @@ class AppLocalizationsId extends AppLocalizations {
 
   @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';
 }

lib/l10n/app_localizations_ja.dart

@@ -352,7 +352,7 @@ class AppLocalizationsJa extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Tidal、Qobuz、Amazon Music から Spotify のトラックをロスレス品質でダウンロードします。';
+      'Download Spotify tracks in lossless quality from Tidal and Qobuz.';
 
   @override
   String get artistAlbums => 'アルバム';
@@ -521,6 +521,9 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get dialogImport => 'インポート';
 
+  @override
+  String get dialogDownload => 'Download';
+
   @override
   String get dialogDiscard => '破棄';
 
@@ -758,7 +761,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get filenameFormat => 'ファイル名の形式';
 
   @override
-  String get filenameShowAdvancedTags => 'Show advanced tags';
+  String get filenameShowAdvancedTags => '高度なタグを表示';
 
   @override
   String get filenameShowAdvancedTagsDescription =>
@@ -1135,7 +1138,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get trackLyricsEmbedded => 'Lyrics embedded successfully';
 
   @override
-  String get trackInstrumental => 'Instrumental track';
+  String get trackInstrumental => 'インストゥルメンタルのトラック';
 
   @override
   String get trackCopiedToClipboard => 'クリップボードにコピーしました';
@@ -1376,6 +1379,38 @@ 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 => '実際の品質はサービスからのトラックの可用性に依存します';
 
@@ -1679,6 +1714,25 @@ 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 => 'アクション';
 
@@ -1855,7 +1909,7 @@ class AppLocalizationsJa extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Get FLAC quality audio from Tidal, Qobuz, or Amazon Music';
+      'Get FLAC quality audio from Tidal, Qobuz, or Deezer';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2129,6 +2183,28 @@ 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';
@@ -2161,6 +2237,18 @@ 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 => 'オーディオを変換中...';
 
@@ -2173,7 +2261,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get trackConvertFailed => '変換に失敗しました';
 
   @override
-  String get cueSplitTitle => 'Split CUE Sheet';
+  String get cueSplitTitle => '分割 CUE シート';
 
   @override
   String get cueSplitSubtitle => 'Split CUE+FLAC into individual tracks';
@@ -2323,7 +2411,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get collectionRemoveFromPlaylist => 'Remove from playlist';
 
   @override
-  String get collectionRemoveFromFolder => 'Remove from folder';
+  String get collectionRemoveFromFolder => 'フォルダから削除';
 
   @override
   String collectionRemoved(String trackName) {
@@ -2357,26 +2445,26 @@ class AppLocalizationsJa extends AppLocalizations {
   String get trackOptionRemoveFromLoved => 'Remove from Loved';
 
   @override
-  String get trackOptionAddToWishlist => 'Add to Wishlist';
+  String get trackOptionAddToWishlist => 'ウィッシュリストに追加';
 
   @override
-  String get trackOptionRemoveFromWishlist => 'Remove from Wishlist';
+  String get trackOptionRemoveFromWishlist => 'ウィッシュから削除';
 
   @override
-  String get collectionPlaylistChangeCover => 'Change cover image';
+  String get collectionPlaylistChangeCover => 'カバー画像を変更';
 
   @override
-  String get collectionPlaylistRemoveCover => 'Remove cover image';
+  String get collectionPlaylistRemoveCover => 'カバー画像を削除';
 
   @override
   String selectionShareCount(int count) {
     String _temp0 = intl.Intl.pluralLogic(
       count,
       locale: localeName,
-      other: 'tracks',
-      one: 'track',
+      other: '個のトラック',
+      one: '個のトラック',
     );
-    return 'Share $count $_temp0';
+    return '$count $_temp0を共有';
   }
 
   @override
@@ -2397,7 +2485,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get selectionConvertNoConvertible => 'No convertible tracks selected';
 
   @override
-  String get selectionBatchConvertConfirmTitle => 'Batch Convert';
+  String get selectionBatchConvertConfirmTitle => '一括変換';
 
   @override
   String selectionBatchConvertConfirmMessage(
@@ -2414,6 +2502,17 @@ 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...';
@@ -2539,9 +2638,6 @@ class AppLocalizationsJa extends AppLocalizations {
     return 'Download $count tracks?';
   }
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
 
@@ -2607,6 +2703,22 @@ class AppLocalizationsJa extends AppLocalizations {
   @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';
 
@@ -2625,12 +2737,6 @@ class AppLocalizationsJa extends AppLocalizations {
   String get downloadSelectServiceToEnable =>
       'Select a built-in service to enable';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
   @override
   String get downloadSelectTidalQobuz =>
       'Select Tidal or Qobuz above to configure quality';
@@ -2707,32 +2813,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get downloadMusixmatchAuto => 'Auto';
 
-  @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 downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
 
@@ -2749,4 +2829,124 @@ class AppLocalizationsJa extends AppLocalizations {
 
   @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';
 }

lib/l10n/app_localizations_ko.dart

@@ -344,7 +344,7 @@ class AppLocalizationsKo extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Tidal, Qobuz, Amazon Music에서 Spotify 트랙을 무손실 음질로 다운로드하세요.';
+      'Download Spotify tracks in lossless quality from Tidal and Qobuz.';
 
   @override
   String get artistAlbums => '앨범';
@@ -510,6 +510,9 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get dialogImport => '불러오기';
 
+  @override
+  String get dialogDownload => 'Download';
+
   @override
   String get dialogDiscard => '취소';
 
@@ -1366,6 +1369,38 @@ 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';
@@ -1672,6 +1707,25 @@ 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';
 
@@ -1848,7 +1902,7 @@ class AppLocalizationsKo extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Get FLAC quality audio from Tidal, Qobuz, or Amazon Music';
+      'Get FLAC quality audio from Tidal, Qobuz, or Deezer';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2122,6 +2176,28 @@ 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';
@@ -2154,6 +2230,18 @@ 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...';
 
@@ -2407,6 +2495,17 @@ 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...';
@@ -2532,9 +2631,6 @@ class AppLocalizationsKo extends AppLocalizations {
     return 'Download $count tracks?';
   }
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
 
@@ -2600,6 +2696,22 @@ class AppLocalizationsKo extends AppLocalizations {
   @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';
 
@@ -2618,12 +2730,6 @@ class AppLocalizationsKo extends AppLocalizations {
   String get downloadSelectServiceToEnable =>
       'Select a built-in service to enable';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
   @override
   String get downloadSelectTidalQobuz =>
       'Select Tidal or Qobuz above to configure quality';
@@ -2700,32 +2806,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get downloadMusixmatchAuto => 'Auto';
 
-  @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 downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
 
@@ -2742,4 +2822,124 @@ class AppLocalizationsKo extends AppLocalizations {
 
   @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';
 }

lib/l10n/app_localizations_nl.dart

@@ -158,16 +158,16 @@ class AppLocalizationsNl extends AppLocalizations {
   String get optionsConcurrentDownloads => 'Concurrent Downloads';
 
   @override
-  String get optionsConcurrentSequential => 'Sequential (1 at a time)';
+  String get optionsConcurrentSequential => 'Sequentiële (1 per keer)';
 
   @override
   String optionsConcurrentParallel(int count) {
-    return '$count parallel downloads';
+    return '';
   }
 
   @override
   String get optionsConcurrentWarning =>
-      'Parallel downloads may trigger rate limiting';
+      'Parallel downloaden kan leiden tot rate-limiting';
 
   @override
   String get optionsExtensionStore => 'Extension Store';
@@ -271,7 +271,7 @@ class AppLocalizationsNl extends AppLocalizations {
   String get aboutContributors => 'Contributors';
 
   @override
-  String get aboutMobileDeveloper => 'Mobile version developer';
+  String get aboutMobileDeveloper => '';
 
   @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, Qobuz, and Amazon Music.';
+      'Download Spotify tracks in lossless quality from Tidal and Qobuz.';
 
   @override
   String get artistAlbums => 'Albums';
@@ -525,6 +525,9 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get dialogImport => 'Import';
 
+  @override
+  String get dialogDownload => 'Download';
+
   @override
   String get dialogDiscard => 'Discard';
 
@@ -1386,6 +1389,38 @@ 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';
@@ -1692,6 +1727,25 @@ 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';
 
@@ -1868,7 +1922,7 @@ class AppLocalizationsNl extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Get FLAC quality audio from Tidal, Qobuz, or Amazon Music';
+      'Get FLAC quality audio from Tidal, Qobuz, or Deezer';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2142,6 +2196,28 @@ 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';
@@ -2174,6 +2250,18 @@ 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...';
 
@@ -2427,6 +2515,17 @@ 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...';
@@ -2552,9 +2651,6 @@ class AppLocalizationsNl extends AppLocalizations {
     return 'Download $count tracks?';
   }
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
 
@@ -2620,6 +2716,22 @@ class AppLocalizationsNl extends AppLocalizations {
   @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';
 
@@ -2638,12 +2750,6 @@ class AppLocalizationsNl extends AppLocalizations {
   String get downloadSelectServiceToEnable =>
       'Select a built-in service to enable';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
   @override
   String get downloadSelectTidalQobuz =>
       'Select Tidal or Qobuz above to configure quality';
@@ -2720,32 +2826,6 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get downloadMusixmatchAuto => 'Auto';
 
-  @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 downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
 
@@ -2762,4 +2842,124 @@ class AppLocalizationsNl extends AppLocalizations {
 
   @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';
 }

lib/l10n/app_localizations_ru.dart

@@ -363,7 +363,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Скачайте треки Spotify в Lossless качестве из Tidal, Qobuz и Amazon Music.';
+      'Скачивайте треки Spotify в lossless качестве с Tidal и Qobuz.';
 
   @override
   String get artistAlbums => 'Альбомы';
@@ -534,6 +534,9 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get dialogImport => 'Импорт';
 
+  @override
+  String get dialogDownload => 'Download';
+
   @override
   String get dialogDiscard => 'Отменить';
 
@@ -703,15 +706,15 @@ class AppLocalizationsRu extends AppLocalizations {
   String get errorNoTracksFound => 'Треки не найдены';
 
   @override
-  String get errorUrlNotRecognized => 'Link not recognized';
+  String get errorUrlNotRecognized => 'Ссылка не распознана';
 
   @override
   String get errorUrlNotRecognizedMessage =>
-      'This link is not supported. Make sure the URL is correct and a compatible extension is installed.';
+      'Эта ссылка не поддерживается. Убедитесь, что URL-адрес указан правильно и установлено совместимое расширение.';
 
   @override
   String get errorUrlFetchFailed =>
-      'Failed to load content from this link. Please try again.';
+      'Не удалось загрузить контент по этой ссылке. Пожалуйста, попробуйте еще раз.';
 
   @override
   String errorMissingExtensionSource(String item) {
@@ -787,11 +790,11 @@ class AppLocalizationsRu extends AppLocalizations {
   String get folderOrganizationNone => 'Без организации';
 
   @override
-  String get folderOrganizationByPlaylist => 'By Playlist';
+  String get folderOrganizationByPlaylist => 'По плейлисту';
 
   @override
   String get folderOrganizationByPlaylistSubtitle =>
-      'Separate folder for each playlist';
+      'Отдельная папка для каждого плейлиста';
 
   @override
   String get folderOrganizationByArtist => 'По исполнителю';
@@ -1411,6 +1414,38 @@ 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 =>
       'Фактическое качество зависит от доступности треков в сервисе';
@@ -1447,7 +1482,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get downloadUsePrimaryArtistOnlyEnabled =>
-      'Featured artists removed from folder name (e.g. Justin Bieber, Quavo → Justin Bieber)';
+      'Список исполнителей, чьи работы были удалены из названия папки (например, Джастин Бибер, Quavo → Джастин Бибер)';
 
   @override
   String get downloadUsePrimaryArtistOnlyDisabled =>
@@ -1728,6 +1763,25 @@ 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 => 'Действия';
 
@@ -1918,7 +1972,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Скачайте FLAC с Tidal, Qobuz или Amazon Music';
+      'Получите аудио в качестве FLAC от Tidal, Qobuz или Deezer';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2014,7 +2068,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String cleanupOrphanedDownloadsResult(int count) {
-    return 'Removed $count orphaned entries from history';
+    return 'Удалено $count утерянных записей из истории';
   }
 
   @override
@@ -2039,7 +2093,7 @@ class AppLocalizationsRu extends AppLocalizations {
   String get cacheSectionStorage => 'Кэшированные данные';
 
   @override
-  String get cacheSectionMaintenance => 'Maintenance';
+  String get cacheSectionMaintenance => 'Обслуживание';
 
   @override
   String get cacheAppDirectory => 'Папка кэша приложения';
@@ -2085,7 +2139,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get cacheCleanupUnusedDesc =>
-      'Remove orphaned download history and library entries for missing files.';
+      'Удалить записи из истории загрузок и библиотеки, которые остались без файлов.';
 
   @override
   String get cacheNoData => 'Нет кэшированных данных';
@@ -2133,7 +2187,7 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get cacheCleanupUnusedSubtitle =>
-      'Remove orphaned download history and missing library entries';
+      'Удалить историю загрузок, оставшихся без просмотра, и отсутствующие записи в библиотеке';
 
   @override
   String cacheCleanupResult(int downloadCount, int libraryCount) {
@@ -2195,6 +2249,28 @@ 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';
@@ -2227,6 +2303,18 @@ 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 => 'Конвертация аудио...';
 
@@ -2239,52 +2327,52 @@ class AppLocalizationsRu extends AppLocalizations {
   String get trackConvertFailed => 'Ошибка конвертации';
 
   @override
-  String get cueSplitTitle => 'Split CUE Sheet';
+  String get cueSplitTitle => 'Разделить CUE Sheet';
 
   @override
-  String get cueSplitSubtitle => 'Split CUE+FLAC into individual tracks';
+  String get cueSplitSubtitle => 'Разделить файл CUE+FLAC на отдельные треки';
 
   @override
   String cueSplitAlbum(String album) {
-    return 'Album: $album';
+    return 'Альбом: $album';
   }
 
   @override
   String cueSplitArtist(String artist) {
-    return 'Artist: $artist';
+    return 'Артист: $artist';
   }
 
   @override
   String cueSplitTrackCount(int count) {
-    return '$count tracks';
+    return '$count треков';
   }
 
   @override
-  String get cueSplitConfirmTitle => 'Split CUE Album';
+  String get cueSplitConfirmTitle => 'Разделенный CUE-альбом';
 
   @override
   String cueSplitConfirmMessage(String album, int count) {
-    return 'Split \"$album\" into $count individual FLAC files?\n\nFiles will be saved to the same directory.';
+    return 'Разбить \"$album\" на $count отдельных FLAC-файлов?';
   }
 
   @override
   String cueSplitSplitting(int current, int total) {
-    return 'Splitting CUE sheet... ($current/$total)';
+    return 'Разделение CUE sheet... ($current/$total)';
   }
 
   @override
   String cueSplitSuccess(int count) {
-    return 'Split into $count tracks successfully';
+    return 'Успешно разделено на $count треков';
   }
 
   @override
-  String get cueSplitFailed => 'CUE split failed';
+  String get cueSplitFailed => 'Разделение CUE не удалось';
 
   @override
-  String get cueSplitNoAudioFile => 'Audio file not found for this CUE sheet';
+  String get cueSplitNoAudioFile => 'Аудиофайл для этого CUE sheet не найден';
 
   @override
-  String get cueSplitButton => 'Split into Tracks';
+  String get cueSplitButton => 'Разделить на Треки';
 
   @override
   String get actionCreate => 'Создать';
@@ -2450,7 +2538,8 @@ class AppLocalizationsRu extends AppLocalizations {
   }
 
   @override
-  String get selectionShareNoFiles => 'No shareable files found';
+  String get selectionShareNoFiles =>
+      'Файлы, доступные для совместного доступа, не найдены';
 
   @override
   String selectionConvertCount(int count) {
@@ -2483,7 +2572,18 @@ class AppLocalizationsRu extends AppLocalizations {
       other: 'tracks',
       one: 'track',
     );
-    return 'Convert $count $_temp0 to $format at $bitrate?\n\nOriginal files will be deleted after conversion.';
+    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.';
   }
 
   @override
@@ -2611,9 +2711,6 @@ class AppLocalizationsRu extends AppLocalizations {
     return 'Download $count tracks?';
   }
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
 
@@ -2679,6 +2776,22 @@ class AppLocalizationsRu extends AppLocalizations {
   @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';
 
@@ -2697,12 +2810,6 @@ class AppLocalizationsRu extends AppLocalizations {
   String get downloadSelectServiceToEnable =>
       'Select a built-in service to enable';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
   @override
   String get downloadSelectTidalQobuz =>
       'Select Tidal or Qobuz above to configure quality';
@@ -2779,32 +2886,6 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get downloadMusixmatchAuto => 'Auto';
 
-  @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 downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
 
@@ -2821,4 +2902,124 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @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';
 }

lib/l10n/app_localizations_tr.dart

@@ -361,7 +361,7 @@ class AppLocalizationsTr extends AppLocalizations {
 
   @override
   String get aboutAppDescription =>
-      'Spotify şarkılarını Tidal ve Qobuz\'den yüksek kalitede indir.';
+      'Download Spotify tracks in lossless quality from Tidal and Qobuz.';
 
   @override
   String get artistAlbums => 'Albümler';
@@ -530,6 +530,9 @@ class AppLocalizationsTr extends AppLocalizations {
   @override
   String get dialogImport => 'İçe aktar';
 
+  @override
+  String get dialogDownload => 'Download';
+
   @override
   String get dialogDiscard => 'Vazgeç';
 
@@ -661,11 +664,11 @@ class AppLocalizationsTr extends AppLocalizations {
   String get snackbarSelectExtFile => 'Lütfen .spotiflac-ext dosyasını seçin';
 
   @override
-  String get snackbarProviderPrioritySaved => 'Sağlayıcı önceliği kaydedildi';
+  String get snackbarProviderPrioritySaved => 'Provider priority saved';
 
   @override
   String get snackbarMetadataProviderSaved =>
-      'Metadata sağlayıcı önceliği kaydedildi';
+      'Metadata provider priority saved';
 
   @override
   String snackbarExtensionInstalled(String extensionName) {
@@ -866,21 +869,21 @@ class AppLocalizationsTr extends AppLocalizations {
   String get providerExtension => 'Eklenti';
 
   @override
-  String get metadataProviderPriorityTitle => 'Metadata Önceliği';
+  String get metadataProviderPriorityTitle => 'Metadata Priority';
 
   @override
   String get metadataProviderPriorityDescription =>
-      'Metadata sağlayıcılarını sıralamak için kaydır. Uygulama şarkı ararken ve metadata alırken sağlayıcıları yukarıdan aşağıya doğru deneyecektir.';
+      'Drag to reorder metadata providers. The app will try providers from top to bottom when searching for tracks and fetching metadata.';
 
   @override
   String get metadataProviderPriorityInfo =>
-      'Deezer\'ın istek sınırı yok ve birincil olarak önerilir. Spotify çok fazla istekten sonra sınırlama yapabilir.';
+      'Deezer has no rate limits and is recommended as primary. Spotify may rate limit after many requests.';
 
   @override
-  String get metadataNoRateLimits => 'İstek sınırı yok';
+  String get metadataNoRateLimits => 'No rate limits';
 
   @override
-  String get metadataMayRateLimit => 'Sınırlama yapabilir';
+  String get metadataMayRateLimit => 'May rate limit';
 
   @override
   String get logTitle => 'Kayıtlar';
@@ -911,14 +914,13 @@ class AppLocalizationsTr extends AppLocalizations {
       'Tüm kayıtları temizlemek istediğinize emin misiniz?';
 
   @override
-  String get logFilterBySeverity => 'Kayıtları önem derecesine göre filtrele';
+  String get logFilterBySeverity => 'Filter logs by severity';
 
   @override
-  String get logNoLogsYet => 'Henüz kayıt yok';
+  String get logNoLogsYet => 'No logs yet';
 
   @override
-  String get logNoLogsYetSubtitle =>
-      'Uygulamayı kullandıkça kayıtlar burada görünecek';
+  String get logNoLogsYetSubtitle => 'Logs will appear here as you use the app';
 
   @override
   String logEntriesFiltered(int count) {
@@ -931,128 +933,125 @@ class AppLocalizationsTr extends AppLocalizations {
   }
 
   @override
-  String get credentialsTitle => 'Spotify Kimlik Bilgileri';
+  String get credentialsTitle => 'Spotify Credentials';
 
   @override
   String get credentialsDescription =>
-      'Kendi Spotify uygulama kotanızı kullanmak için Client ID ve Secret girin.';
+      'Enter your Client ID and Secret to use your own Spotify application quota.';
 
   @override
   String get credentialsClientId => 'Client ID';
 
   @override
-  String get credentialsClientIdHint => 'Client ID yapıştır';
+  String get credentialsClientIdHint => 'Paste Client ID';
 
   @override
   String get credentialsClientSecret => 'Client Secret';
 
   @override
-  String get credentialsClientSecretHint => 'Client Secret yapıştır';
+  String get credentialsClientSecretHint => 'Paste Client Secret';
 
   @override
-  String get channelStable => 'Kararlı';
+  String get channelStable => 'Stable';
 
   @override
-  String get channelPreview => 'Önizleme';
+  String get channelPreview => 'Preview';
 
   @override
-  String get sectionSearchSource => 'Arama Kaynağı';
+  String get sectionSearchSource => 'Search Source';
 
   @override
-  String get sectionDownload => 'İndirme';
+  String get sectionDownload => 'Download';
 
   @override
-  String get sectionPerformance => 'Performans';
+  String get sectionPerformance => 'Performance';
 
   @override
-  String get sectionApp => 'Uygulama';
+  String get sectionApp => 'App';
 
   @override
-  String get sectionData => 'Veri';
+  String get sectionData => 'Data';
 
   @override
-  String get sectionDebug => 'Hata Ayıklama';
+  String get sectionDebug => 'Debug';
 
   @override
-  String get sectionService => 'Hizmet';
+  String get sectionService => 'Service';
 
   @override
-  String get sectionAudioQuality => 'Ses Kalitesi';
+  String get sectionAudioQuality => 'Audio Quality';
 
   @override
-  String get sectionFileSettings => 'Dosya Ayarları';
+  String get sectionFileSettings => 'File Settings';
 
   @override
-  String get sectionLyrics => 'Şarkı Sözleri';
+  String get sectionLyrics => 'Lyrics';
 
   @override
-  String get lyricsMode => 'Şarkı Sözü Modu';
+  String get lyricsMode => 'Lyrics Mode';
 
   @override
   String get lyricsModeDescription =>
-      'Şarkı sözlerinin indirmelerle nasıl kaydedileceğini seçin';
+      'Choose how lyrics are saved with your downloads';
 
   @override
-  String get lyricsModeEmbed => 'Dosyaya göm';
+  String get lyricsModeEmbed => 'Embed in file';
 
   @override
-  String get lyricsModeEmbedSubtitle =>
-      'Şarkı sözleri FLAC metadata içinde saklanır';
+  String get lyricsModeEmbedSubtitle => 'Lyrics stored inside FLAC metadata';
 
   @override
-  String get lyricsModeExternal => 'Harici .lrc dosyası';
+  String get lyricsModeExternal => 'External .lrc file';
 
   @override
   String get lyricsModeExternalSubtitle =>
-      'Samsung Music gibi oynatıcılar için ayrı .lrc dosyası';
+      'Separate .lrc file for players like Samsung Music';
 
   @override
-  String get lyricsModeBoth => 'Her ikisi';
+  String get lyricsModeBoth => 'Both';
 
   @override
-  String get lyricsModeBothSubtitle => 'Göm ve .lrc dosyası kaydet';
+  String get lyricsModeBothSubtitle => 'Embed and save .lrc file';
 
   @override
-  String get sectionColor => 'Renk';
+  String get sectionColor => 'Color';
 
   @override
-  String get sectionTheme => 'Tema';
+  String get sectionTheme => 'Theme';
 
   @override
-  String get sectionLayout => 'Düzen';
+  String get sectionLayout => 'Layout';
 
   @override
-  String get sectionLanguage => 'Dil';
+  String get sectionLanguage => 'Language';
 
   @override
-  String get appearanceLanguage => 'Uygulama Dili';
+  String get appearanceLanguage => 'App Language';
 
   @override
-  String get settingsAppearanceSubtitle => 'Tema, renkler, görünüm';
+  String get settingsAppearanceSubtitle => 'Theme, colors, display';
 
   @override
-  String get settingsDownloadSubtitle => 'Hizmet, kalite, dosya adı formatı';
+  String get settingsDownloadSubtitle => 'Service, quality, filename format';
 
   @override
-  String get settingsOptionsSubtitle =>
-      'Yedek, şarkı sözleri, kapak resmi, güncellemeler';
+  String get settingsOptionsSubtitle => 'Fallback, lyrics, cover art, updates';
 
   @override
-  String get settingsExtensionsSubtitle => 'İndirme sağlayıcılarını yönet';
+  String get settingsExtensionsSubtitle => 'Manage download providers';
 
   @override
-  String get settingsLogsSubtitle =>
-      'Hata ayıklama için uygulama kayıtlarını görüntüle';
+  String get settingsLogsSubtitle => 'View app logs for debugging';
 
   @override
-  String get loadingSharedLink => 'Paylaşılan bağlantı yükleniyor...';
+  String get loadingSharedLink => 'Loading shared link...';
 
   @override
-  String get pressBackAgainToExit => 'Çıkmak için tekrar geri basın';
+  String get pressBackAgainToExit => 'Press back again to exit';
 
   @override
   String downloadAllCount(int count) {
-    return 'Tümünü İndir ($count)';
+    return 'Download All ($count)';
   }
 
   @override
@@ -1060,151 +1059,150 @@ class AppLocalizationsTr extends AppLocalizations {
     String _temp0 = intl.Intl.pluralLogic(
       count,
       locale: localeName,
-      other: '$count şarkı',
-      one: '1 şarkı',
+      other: '$count tracks',
+      one: '1 track',
     );
     return '$_temp0';
   }
 
   @override
-  String get trackCopyFilePath => 'Dosya yolunu kopyala';
+  String get trackCopyFilePath => 'Copy file path';
 
   @override
-  String get trackRemoveFromDevice => 'Cihazdan kaldır';
+  String get trackRemoveFromDevice => 'Remove from device';
 
   @override
-  String get trackLoadLyrics => 'Şarkı Sözlerini Yükle';
+  String get trackLoadLyrics => 'Load Lyrics';
 
   @override
   String get trackMetadata => 'Metadata';
 
   @override
-  String get trackFileInfo => 'Dosya Bilgisi';
+  String get trackFileInfo => 'File Info';
 
   @override
-  String get trackLyrics => 'Şarkı Sözleri';
+  String get trackLyrics => 'Lyrics';
 
   @override
-  String get trackFileNotFound => 'Dosya bulunamadı';
+  String get trackFileNotFound => 'File not found';
 
   @override
-  String get trackOpenInDeezer => 'Deezer\'da aç';
+  String get trackOpenInDeezer => 'Open in Deezer';
 
   @override
-  String get trackOpenInSpotify => 'Spotify\'da aç';
+  String get trackOpenInSpotify => 'Open in Spotify';
 
   @override
-  String get trackTrackName => 'Şarkı adı';
+  String get trackTrackName => 'Track name';
 
   @override
-  String get trackArtist => 'Sanatçı';
+  String get trackArtist => 'Artist';
 
   @override
-  String get trackAlbumArtist => 'Albüm sanatçısı';
+  String get trackAlbumArtist => 'Album artist';
 
   @override
-  String get trackAlbum => 'Albüm';
+  String get trackAlbum => 'Album';
 
   @override
-  String get trackTrackNumber => 'Şarkı numarası';
+  String get trackTrackNumber => 'Track number';
 
   @override
-  String get trackDiscNumber => 'Disk numarası';
+  String get trackDiscNumber => 'Disc number';
 
   @override
-  String get trackDuration => 'Süre';
+  String get trackDuration => 'Duration';
 
   @override
-  String get trackAudioQuality => 'Ses kalitesi';
+  String get trackAudioQuality => 'Audio quality';
 
   @override
-  String get trackReleaseDate => 'Yayın tarihi';
+  String get trackReleaseDate => 'Release date';
 
   @override
-  String get trackGenre => 'Tür';
+  String get trackGenre => 'Genre';
 
   @override
-  String get trackLabel => 'Plak şirketi';
+  String get trackLabel => 'Label';
 
   @override
-  String get trackCopyright => 'Telif hakkı';
+  String get trackCopyright => 'Copyright';
 
   @override
-  String get trackDownloaded => 'İndirildi';
+  String get trackDownloaded => 'Downloaded';
 
   @override
-  String get trackCopyLyrics => 'Şarkı sözlerini kopyala';
+  String get trackCopyLyrics => 'Copy lyrics';
 
   @override
-  String get trackLyricsNotAvailable => 'Bu şarkı için şarkı sözü mevcut değil';
+  String get trackLyricsNotAvailable => 'Lyrics not available for this track';
 
   @override
-  String get trackLyricsTimeout =>
-      'İstek zaman aşımına uğradı. Daha sonra tekrar deneyin.';
+  String get trackLyricsTimeout => 'Request timed out. Try again later.';
 
   @override
-  String get trackLyricsLoadFailed => 'Şarkı sözleri yüklenemedi';
+  String get trackLyricsLoadFailed => 'Failed to load lyrics';
 
   @override
-  String get trackEmbedLyrics => 'Şarkı Sözlerini Göm';
+  String get trackEmbedLyrics => 'Embed Lyrics';
 
   @override
-  String get trackLyricsEmbedded => 'Şarkı sözleri başarıyla gömüldü';
+  String get trackLyricsEmbedded => 'Lyrics embedded successfully';
 
   @override
-  String get trackInstrumental => 'Enstrümantal şarkı';
+  String get trackInstrumental => 'Instrumental track';
 
   @override
-  String get trackCopiedToClipboard => 'Panoya kopyalandı';
+  String get trackCopiedToClipboard => 'Copied to clipboard';
 
   @override
-  String get trackDeleteConfirmTitle => 'Cihazdan kaldırılsın mı?';
+  String get trackDeleteConfirmTitle => 'Remove from device?';
 
   @override
   String get trackDeleteConfirmMessage =>
-      'Bu işlem indirilen dosyayı kalıcı olarak silecek ve geçmişten kaldıracaktır.';
+      'This will permanently delete the downloaded file and remove it from your history.';
 
   @override
-  String get dateToday => 'Bugün';
+  String get dateToday => 'Today';
 
   @override
-  String get dateYesterday => 'Dün';
+  String get dateYesterday => 'Yesterday';
 
   @override
   String dateDaysAgo(int count) {
-    return '$count gün önce';
+    return '$count days ago';
   }
 
   @override
   String dateWeeksAgo(int count) {
-    return '$count hafta önce';
+    return '$count weeks ago';
   }
 
   @override
   String dateMonthsAgo(int count) {
-    return '$count ay önce';
+    return '$count months ago';
   }
 
   @override
-  String get storeFilterAll => 'Tümü';
+  String get storeFilterAll => 'All';
 
   @override
   String get storeFilterMetadata => 'Metadata';
 
   @override
-  String get storeFilterDownload => 'İndirme';
+  String get storeFilterDownload => 'Download';
 
   @override
-  String get storeFilterUtility => 'Araç';
+  String get storeFilterUtility => 'Utility';
 
   @override
-  String get storeFilterLyrics => 'Şarkı Sözleri';
+  String get storeFilterLyrics => 'Lyrics';
 
   @override
-  String get storeFilterIntegration => 'Entegrasyon';
+  String get storeFilterIntegration => 'Integration';
 
   @override
-  String get storeClearFilters => 'Filtreleri temizle';
+  String get storeClearFilters => 'Clear filters';
 
   @override
   String get storeAddRepoTitle => 'Add Extension Repository';
@@ -1248,137 +1246,136 @@ class AppLocalizationsTr extends AppLocalizations {
   String get storeEmptyNoResults => 'No extensions found';
 
   @override
-  String get extensionDefaultProvider => 'Varsayılan (Deezer/Spotify)';
+  String get extensionDefaultProvider => 'Default (Deezer/Spotify)';
 
   @override
-  String get extensionDefaultProviderSubtitle => 'Dahili aramayı kullan';
+  String get extensionDefaultProviderSubtitle => 'Use built-in search';
 
   @override
-  String get extensionAuthor => 'Yazar';
+  String get extensionAuthor => 'Author';
 
   @override
   String get extensionId => 'ID';
 
   @override
-  String get extensionError => 'Hata';
+  String get extensionError => 'Error';
 
   @override
-  String get extensionCapabilities => 'Yetenekler';
+  String get extensionCapabilities => 'Capabilities';
 
   @override
-  String get extensionMetadataProvider => 'Metadata Sağlayıcı';
+  String get extensionMetadataProvider => 'Metadata Provider';
 
   @override
-  String get extensionDownloadProvider => 'İndirme Sağlayıcı';
+  String get extensionDownloadProvider => 'Download Provider';
 
   @override
-  String get extensionLyricsProvider => 'Şarkı Sözü Sağlayıcı';
+  String get extensionLyricsProvider => 'Lyrics Provider';
 
   @override
-  String get extensionUrlHandler => 'URL İşleyici';
+  String get extensionUrlHandler => 'URL Handler';
 
   @override
-  String get extensionQualityOptions => 'Kalite Seçenekleri';
+  String get extensionQualityOptions => 'Quality Options';
 
   @override
-  String get extensionPostProcessingHooks => 'İşlem Sonrası Kancalar';
+  String get extensionPostProcessingHooks => 'Post-Processing Hooks';
 
   @override
-  String get extensionPermissions => 'İzinler';
+  String get extensionPermissions => 'Permissions';
 
   @override
-  String get extensionSettings => 'Ayarlar';
+  String get extensionSettings => 'Settings';
 
   @override
-  String get extensionRemoveButton => 'Eklentiyi Kaldır';
+  String get extensionRemoveButton => 'Remove Extension';
 
   @override
-  String get extensionUpdated => 'Güncellendi';
+  String get extensionUpdated => 'Updated';
 
   @override
-  String get extensionMinAppVersion => 'Min Uygulama Sürümü';
+  String get extensionMinAppVersion => 'Min App Version';
 
   @override
-  String get extensionCustomTrackMatching => 'Özel Şarkı Eşleştirme';
+  String get extensionCustomTrackMatching => 'Custom Track Matching';
 
   @override
-  String get extensionPostProcessing => 'İşlem Sonrası';
+  String get extensionPostProcessing => 'Post-Processing';
 
   @override
   String extensionHooksAvailable(int count) {
-    return '$count kanca mevcut';
+    return '$count hook(s) available';
   }
 
   @override
   String extensionPatternsCount(int count) {
-    return '$count desen';
+    return '$count pattern(s)';
   }
 
   @override
   String extensionStrategy(String strategy) {
-    return 'Strateji: $strategy';
+    return 'Strategy: $strategy';
   }
 
   @override
-  String get extensionsProviderPrioritySection => 'Sağlayıcı Önceliği';
+  String get extensionsProviderPrioritySection => 'Provider Priority';
 
   @override
-  String get extensionsInstalledSection => 'Yüklü Eklentiler';
+  String get extensionsInstalledSection => 'Installed Extensions';
 
   @override
-  String get extensionsNoExtensions => 'Yüklü eklenti yok';
+  String get extensionsNoExtensions => 'No extensions installed';
 
   @override
   String get extensionsNoExtensionsSubtitle =>
-      'Yeni sağlayıcılar eklemek için .spotiflac-ext dosyalarını yükleyin';
+      'Install .spotiflac-ext files to add new providers';
 
   @override
-  String get extensionsInstallButton => 'Eklenti Yükle';
+  String get extensionsInstallButton => 'Install Extension';
 
   @override
   String get extensionsInfoTip =>
-      'Eklentiler yeni metadata ve indirme sağlayıcıları ekleyebilir. Sadece güvenilir kaynaklardan eklenti yükleyin.';
+      'Extensions can add new metadata and download providers. Only install extensions from trusted sources.';
 
   @override
-  String get extensionsInstalledSuccess => 'Eklenti başarıyla yüklendi';
+  String get extensionsInstalledSuccess => 'Extension installed successfully';
 
   @override
-  String get extensionsDownloadPriority => 'İndirme Önceliği';
+  String get extensionsDownloadPriority => 'Download Priority';
 
   @override
-  String get extensionsDownloadPrioritySubtitle =>
-      'İndirme hizmeti sırasını ayarla';
+  String get extensionsDownloadPrioritySubtitle => 'Set download service order';
 
   @override
   String get extensionsNoDownloadProvider =>
-      'İndirme sağlayıcısı olan eklenti yok';
+      'No extensions with download provider';
 
   @override
-  String get extensionsMetadataPriority => 'Metadata Önceliği';
+  String get extensionsMetadataPriority => 'Metadata Priority';
 
   @override
   String get extensionsMetadataPrioritySubtitle =>
-      'Arama ve metadata kaynağı sırasını ayarla';
+      'Set search & metadata source order';
 
   @override
   String get extensionsNoMetadataProvider =>
-      'Metadata sağlayıcısı olan eklenti yok';
+      'No extensions with metadata provider';
 
   @override
-  String get extensionsSearchProvider => 'Arama Sağlayıcı';
+  String get extensionsSearchProvider => 'Search Provider';
 
   @override
-  String get extensionsNoCustomSearch => 'Özel arama olan eklenti yok';
+  String get extensionsNoCustomSearch => 'No extensions with custom search';
 
   @override
   String get extensionsSearchProviderDescription =>
-      'Şarkı aramak için hangi hizmetin kullanılacağını seçin';
+      'Choose which service to use for searching tracks';
 
   @override
-  String get extensionsCustomSearch => 'Özel arama';
+  String get extensionsCustomSearch => 'Custom search';
 
   @override
-  String get extensionsErrorLoading => 'Eklenti yüklenirken hata oluştu';
+  String get extensionsErrorLoading => 'Error loading extension';
 
   @override
   String get qualityFlacLossless => 'FLAC Lossless';
@@ -1398,6 +1395,38 @@ class AppLocalizationsTr 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';
@@ -1628,19 +1657,19 @@ class AppLocalizationsTr extends AppLocalizations {
 
   @override
   String discographyAddedToQueue(int count) {
-    return '$count şarkı kuyruğa eklendi';
+    return 'Added $count tracks to queue';
   }
 
   @override
   String discographySkippedDownloaded(int added, int skipped) {
-    return '$added eklendi, $skipped zaten indirilmiş';
+    return '$added added, $skipped already downloaded';
   }
 
   @override
-  String get discographyNoAlbums => 'Albüm mevcut değil';
+  String get discographyNoAlbums => 'No albums available';
 
   @override
-  String get discographyFailedToFetch => 'Bazı albümler alınamadı';
+  String get discographyFailedToFetch => 'Failed to fetch some albums';
 
   @override
   String get sectionStorageAccess => 'Storage Access';
@@ -1704,6 +1733,25 @@ class AppLocalizationsTr 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';
 
@@ -1880,7 +1928,7 @@ class AppLocalizationsTr extends AppLocalizations {
 
   @override
   String get tutorialWelcomeTip2 =>
-      'Tidal, Qobuz veya Deezer\'den FLAC kalitesinde ses alın';
+      'Get FLAC quality audio from Tidal, Qobuz, or Deezer';
 
   @override
   String get tutorialWelcomeTip3 =>
@@ -2154,6 +2202,28 @@ class AppLocalizationsTr 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';
@@ -2186,6 +2256,18 @@ class AppLocalizationsTr 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...';
 
@@ -2439,6 +2521,17 @@ class AppLocalizationsTr 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...';
@@ -2564,9 +2657,6 @@ class AppLocalizationsTr extends AppLocalizations {
     return 'Download $count tracks?';
   }
 
-  @override
-  String get dialogDownload => 'Download';
-
   @override
   String get homeSkipAlreadyDownloaded => 'Skip already downloaded songs';
 
@@ -2632,6 +2722,22 @@ class AppLocalizationsTr extends AppLocalizations {
   @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';
 
@@ -2650,12 +2756,6 @@ class AppLocalizationsTr extends AppLocalizations {
   String get downloadSelectServiceToEnable =>
       'Select a built-in service to enable';
 
-  @override
-  String get downloadLossy320 => 'Lossy 320kbps';
-
-  @override
-  String get downloadLossyFormat => 'Lossy Format';
-
   @override
   String get downloadSelectTidalQobuz =>
       'Select Tidal or Qobuz above to configure quality';
@@ -2732,32 +2832,6 @@ class AppLocalizationsTr extends AppLocalizations {
   @override
   String get downloadMusixmatchAuto => 'Auto';
 
-  @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 downloadNetworkAnySubtitle => 'WiFi + Mobile Data';
 
@@ -2774,4 +2848,124 @@ class AppLocalizationsTr extends AppLocalizations {
 
   @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';
 }

lib/l10n/arb/app_es_ES.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Descarga pistas de Spotify con calidad sin pérdida de Tidal y Qobuz.",
+  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal and Qobuz.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -897,6 +897,18 @@
   "@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",
@@ -991,10 +1003,26 @@
   "@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"
@@ -1749,6 +1777,14 @@
   "@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": "Preguntar antes de descargar",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2198,6 +2234,15 @@
   "@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",
@@ -2358,7 +2403,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Obtén audio en calidad FLAC de Tidal, Qobuz o Deezer",
+  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Deezer",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2783,6 +2828,367 @@
   "@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",
@@ -2800,4 +3206,4 @@
   "@downloadUseAlbumArtistForFoldersTrackSubtitle": {
     "description": "Subtitle when Track Artist is used for folder naming"
   }
-}
+}

lib/l10n/arb/app_pt_PT.arb

@@ -450,7 +450,7 @@
   "@aboutSpotiSaverDesc": {
     "description": "Credit for SpotiSaver API"
   },
-  "aboutAppDescription": "Baixe faixas do Spotify em qualidade sem perdas do Tidal e Qobuz.",
+  "aboutAppDescription": "Download Spotify tracks in lossless quality from Tidal and Qobuz.",
   "@aboutAppDescription": {
     "description": "App description in header card"
   },
@@ -897,6 +897,18 @@
   "@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",
@@ -991,10 +1003,26 @@
   "@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"
@@ -1749,6 +1777,14 @@
   "@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": "Perguntar qualidade antes de baixar",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"
@@ -2198,6 +2234,15 @@
   "@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",
@@ -2358,7 +2403,7 @@
   "@tutorialWelcomeTip1": {
     "description": "Tutorial welcome tip 1"
   },
-  "tutorialWelcomeTip2": "Obtenha áudio em qualidade FLAC do Tidal, Qobuz ou Deezer",
+  "tutorialWelcomeTip2": "Get FLAC quality audio from Tidal, Qobuz, or Deezer",
   "@tutorialWelcomeTip2": {
     "description": "Tutorial welcome tip 2"
   },
@@ -2783,6 +2828,367 @@
   "@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",
@@ -2800,4 +3206,4 @@
   "@downloadUseAlbumArtistForFoldersTrackSubtitle": {
     "description": "Subtitle when Track Artist is used for folder naming"
   }
-}
+}

lib/main.dart

@@ -4,6 +4,7 @@ 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';
@@ -13,6 +14,7 @@ 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();
@@ -90,16 +92,19 @@ class _EagerInitialization extends ConsumerStatefulWidget {
       _EagerInitializationState();
 }
 
-class _EagerInitializationState extends ConsumerState<_EagerInitialization> {
+class _EagerInitializationState extends ConsumerState<_EagerInitialization>
+    with WidgetsBindingObserver {
   ProviderSubscription<bool>? _localLibraryEnabledSub;
   Timer? _downloadHistoryWarmupTimer;
   Timer? _libraryCollectionsWarmupTimer;
   Timer? _localLibraryWarmupTimer;
   bool _localLibraryWarmupScheduled = false;
+  bool _autoScanTriggeredOnLaunch = false;
 
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!mounted) return;
       _initializeAppServices();
@@ -110,6 +115,7 @@ class _EagerInitializationState extends ConsumerState<_EagerInitialization> {
 
   @override
   void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
     _localLibraryEnabledSub?.close();
     _downloadHistoryWarmupTimer?.cancel();
     _libraryCollectionsWarmupTimer?.cancel();
@@ -117,6 +123,13 @@ class _EagerInitializationState extends ConsumerState<_EagerInitialization> {
     super.dispose();
   }
 
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.resumed) {
+      _maybeAutoScanLocalLibrary();
+    }
+  }
+
   void _initializeDeferredProviders() {
     _downloadHistoryWarmupTimer = _scheduleProviderWarmup(
       const Duration(milliseconds: 400),
@@ -155,10 +168,68 @@ class _EagerInitializationState extends ConsumerState<_EagerInitialization> {
     _localLibraryWarmupScheduled = true;
     _localLibraryWarmupTimer = _scheduleProviderWarmup(
       const Duration(milliseconds: 1600),
-      () => ref.read(localLibraryProvider),
+      () {
+        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;
+
+    // Don't start a scan if one is already running.
+    final libraryState = ref.read(localLibraryProvider);
+    if (libraryState.isScanning) return;
+
+    // Determine cooldown based on auto-scan mode.
+    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;
+      }
+    }
+
+    // All checks passed -- start an incremental scan.
+    final iosBookmark = settings.localLibraryBookmark;
+    ref
+        .read(localLibraryProvider.notifier)
+        .startScan(
+          settings.localLibraryPath,
+          iosBookmark: iosBookmark.isNotEmpty ? iosBookmark : null,
+        );
+  }
+
   Future<void> _initializeAppServices() async {
     try {
       await CoverCacheManager.initialize();

lib/models/settings.dart

@@ -20,6 +20,7 @@ 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;
@@ -33,6 +34,7 @@ class AppSettings {
   final bool enableLogging;
   final bool useExtensionProviders;
   final String? searchProvider;
+  final String? homeFeedProvider;
   final bool separateSingles;
   final String albumFolderStructure;
   final bool showExtensionStore;
@@ -41,7 +43,7 @@ class AppSettings {
   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)
+  youtubeOpusBitrate; // YouTube Opus bitrate (supported: 128/256/320 kbps)
   final int
   youtubeMp3Bitrate; // YouTube MP3 bitrate (supported: 128/256/320 kbps)
   final bool
@@ -61,6 +63,8 @@ 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,6 +100,7 @@ class AppSettings {
     this.updateChannel = 'stable',
     this.hasSearchedBefore = false,
     this.folderOrganization = 'none',
+    this.createPlaylistFolder = false,
     this.useAlbumArtistForFolders = true,
     this.usePrimaryArtistOnly = false,
     this.filterContributingArtistsInAlbumArtist = false,
@@ -109,6 +114,7 @@ class AppSettings {
     this.enableLogging = false,
     this.useExtensionProviders = true,
     this.searchProvider,
+    this.homeFeedProvider,
     this.separateSingles = false,
     this.albumFolderStructure = 'artist_album',
     this.showExtensionStore = true,
@@ -126,6 +132,7 @@ class AppSettings {
     this.localLibraryPath = '',
     this.localLibraryBookmark = '',
     this.localLibraryShowDuplicates = true,
+    this.localLibraryAutoScan = 'off',
     this.hasCompletedTutorial = false,
     this.lyricsProviders = const [
       'lrclib',
@@ -159,6 +166,7 @@ class AppSettings {
     String? updateChannel,
     bool? hasSearchedBefore,
     String? folderOrganization,
+    bool? createPlaylistFolder,
     bool? useAlbumArtistForFolders,
     bool? usePrimaryArtistOnly,
     bool? filterContributingArtistsInAlbumArtist,
@@ -173,6 +181,8 @@ class AppSettings {
     bool? useExtensionProviders,
     String? searchProvider,
     bool clearSearchProvider = false,
+    String? homeFeedProvider,
+    bool clearHomeFeedProvider = false,
     bool? separateSingles,
     String? albumFolderStructure,
     bool? showExtensionStore,
@@ -190,6 +200,7 @@ class AppSettings {
     String? localLibraryPath,
     String? localLibraryBookmark,
     bool? localLibraryShowDuplicates,
+    String? localLibraryAutoScan,
     bool? hasCompletedTutorial,
     List<String>? lyricsProviders,
     bool? lyricsIncludeTranslationNetease,
@@ -215,6 +226,7 @@ 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,
@@ -236,6 +248,9 @@ 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,
@@ -256,6 +271,7 @@ 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,6 +23,7 @@ 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:
@@ -38,6 +39,7 @@ 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',
@@ -58,6 +60,7 @@ 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>?)
@@ -100,6 +103,7 @@ Map<String, dynamic> _$AppSettingsToJson(
   'updateChannel': instance.updateChannel,
   'hasSearchedBefore': instance.hasSearchedBefore,
   'folderOrganization': instance.folderOrganization,
+  'createPlaylistFolder': instance.createPlaylistFolder,
   'useAlbumArtistForFolders': instance.useAlbumArtistForFolders,
   'usePrimaryArtistOnly': instance.usePrimaryArtistOnly,
   'filterContributingArtistsInAlbumArtist':
@@ -114,6 +118,7 @@ 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,
@@ -131,6 +136,7 @@ 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/download_queue_provider.dart

@@ -122,7 +122,7 @@ class DownloadHistoryItem {
         artistName: json['artistName'] as String,
         albumName: json['albumName'] as String,
         albumArtist: normalizeOptionalString(json['albumArtist'] as String?),
-        coverUrl: json['coverUrl'] as String?,
+        coverUrl: normalizeCoverReference(json['coverUrl']?.toString()),
         filePath: json['filePath'] as String,
         storageMode: json['storageMode'] as String?,
         downloadTreeUri: json['downloadTreeUri'] as String?,
@@ -176,7 +176,7 @@ class DownloadHistoryItem {
       artistName: artistName ?? this.artistName,
       albumName: albumName ?? this.albumName,
       albumArtist: albumArtist ?? this.albumArtist,
-      coverUrl: coverUrl ?? this.coverUrl,
+      coverUrl: normalizeCoverReference(coverUrl ?? this.coverUrl),
       filePath: filePath ?? this.filePath,
       storageMode: storageMode ?? this.storageMode,
       downloadTreeUri: downloadTreeUri ?? this.downloadTreeUri,
@@ -770,6 +770,37 @@ class DownloadHistoryNotifier extends Notifier<DownloadHistoryState> {
 
   /// Remove history entries where the file no longer exists on disk
   /// Returns the number of orphaned entries removed
+  /// Audio file extensions that the app commonly produces or converts between.
+  static const _audioExtensions = [
+    '.flac',
+    '.m4a',
+    '.mp3',
+    '.opus',
+    '.ogg',
+    '.wav',
+    '.aac',
+  ];
+
+  /// When the original file is missing, check whether a sibling with a
+  /// different audio extension exists (e.g. the user converted .flac → .opus).
+  /// Returns the path of the first match found, or `null` if none exist.
+  Future<String?> _findConvertedSibling(String originalPath) async {
+    // Strip the current extension to get the base path.
+    final dotIndex = originalPath.lastIndexOf('.');
+    if (dotIndex < 0) return null;
+    final basePath = originalPath.substring(0, dotIndex);
+    final originalExt = originalPath.substring(dotIndex).toLowerCase();
+
+    for (final ext in _audioExtensions) {
+      if (ext == originalExt) continue;
+      final candidatePath = '$basePath$ext';
+      try {
+        if (await fileExists(candidatePath)) return candidatePath;
+      } catch (_) {}
+    }
+    return null;
+  }
+
   Future<int> cleanupOrphanedDownloads() async {
     _historyLog.i('Starting orphaned downloads cleanup...');
 
@@ -791,7 +822,21 @@ class DownloadHistoryNotifier extends Notifier<DownloadHistoryState> {
           if (filePath == null || filePath.isEmpty) return null;
           pathById[id] = filePath;
           try {
-            return MapEntry(id, await fileExists(filePath));
+            if (await fileExists(filePath)) return MapEntry(id, true);
+
+            // Original file missing -- check for a converted sibling.
+            final sibling = await _findConvertedSibling(filePath);
+            if (sibling != null) {
+              _historyLog.i(
+                'Found converted sibling for $id: $filePath → $sibling',
+              );
+              // Update the stored path so future checks succeed immediately.
+              await _db.updateFilePath(id, sibling);
+              pathById[id] = sibling;
+              return MapEntry(id, true);
+            }
+
+            return MapEntry(id, false);
           } catch (e) {
             _historyLog.w('Error checking file existence for $id: $e');
             return MapEntry(id, false);
@@ -960,6 +1005,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
   int _lastNotifPercent = -1;
   int _lastNotifQueueCount = -1;
   final Set<String> _locallyCancelledItemIds = {};
+  final Set<String> _pausePendingItemIds = {};
 
   double _normalizeProgressForUi(double value) {
     final clamped = value.clamp(0.0, 1.0).toDouble();
@@ -1279,6 +1325,10 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       if (localItem == null) {
         continue;
       }
+      if (_isPausePending(itemId)) {
+        PlatformBridge.clearItemProgress(itemId).catchError((_) {});
+        continue;
+      }
       if (localItem.status == DownloadStatus.skipped) {
         PlatformBridge.clearItemProgress(itemId).catchError((_) {});
         continue;
@@ -1601,12 +1651,23 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     String folderOrganization, {
     bool separateSingles = false,
     String albumFolderStructure = 'artist_album',
+    bool createPlaylistFolder = false,
     bool useAlbumArtistForFolders = true,
     bool usePrimaryArtistOnly = false,
     bool filterContributingArtistsInAlbumArtist = false,
     String? playlistName,
   }) async {
     String baseDir = state.outputDir;
+    if (createPlaylistFolder &&
+        folderOrganization != 'playlist' &&
+        playlistName != null &&
+        playlistName.isNotEmpty) {
+      final playlistFolder = _sanitizeFolderName(playlistName);
+      if (playlistFolder.isNotEmpty) {
+        baseDir = '$baseDir${Platform.pathSeparator}$playlistFolder';
+        await _ensureDirExists(baseDir, label: 'Playlist folder');
+      }
+    }
     final normalizedAlbumArtist = normalizeOptionalString(track.albumArtist);
     var folderArtist = useAlbumArtistForFolders
         ? normalizedAlbumArtist ?? track.artistName
@@ -1759,11 +1820,19 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     String folderOrganization, {
     bool separateSingles = false,
     String albumFolderStructure = 'artist_album',
+    bool createPlaylistFolder = false,
     bool useAlbumArtistForFolders = true,
     bool usePrimaryArtistOnly = false,
     bool filterContributingArtistsInAlbumArtist = false,
     String? playlistName,
   }) async {
+    final playlistPrefix =
+        createPlaylistFolder &&
+            folderOrganization != 'playlist' &&
+            playlistName != null &&
+            playlistName.isNotEmpty
+        ? _sanitizeFolderName(playlistName)
+        : '';
     final normalizedAlbumArtist = normalizeOptionalString(track.albumArtist);
     var folderArtist = useAlbumArtistForFolders
         ? normalizedAlbumArtist ?? track.artistName
@@ -1783,34 +1852,40 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
 
       if (albumFolderStructure == 'artist_album_singles') {
         if (isSingle) {
-          return '$artistName/Singles';
+          return _joinRelativePath(playlistPrefix, '$artistName/Singles');
         }
         final albumName = _sanitizeFolderName(track.albumName);
-        return '$artistName/$albumName';
+        return _joinRelativePath(playlistPrefix, '$artistName/$albumName');
       }
 
       if (isSingle) {
-        return 'Singles';
+        return _joinRelativePath(playlistPrefix, 'Singles');
       }
 
       final albumName = _sanitizeFolderName(track.albumName);
       final year = _extractYear(track.releaseDate);
       switch (albumFolderStructure) {
         case 'album_only':
-          return 'Albums/$albumName';
+          return _joinRelativePath(playlistPrefix, 'Albums/$albumName');
         case 'artist_year_album':
           final yearAlbum = year != null ? '[$year] $albumName' : albumName;
-          return 'Albums/$artistName/$yearAlbum';
+          return _joinRelativePath(
+            playlistPrefix,
+            'Albums/$artistName/$yearAlbum',
+          );
         case 'year_album':
           final yearAlbum = year != null ? '[$year] $albumName' : albumName;
-          return 'Albums/$yearAlbum';
+          return _joinRelativePath(playlistPrefix, 'Albums/$yearAlbum');
         default:
-          return 'Albums/$artistName/$albumName';
+          return _joinRelativePath(
+            playlistPrefix,
+            'Albums/$artistName/$albumName',
+          );
       }
     }
 
     if (folderOrganization == 'none') {
-      return '';
+      return playlistPrefix;
     }
 
     switch (folderOrganization) {
@@ -1820,18 +1895,30 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         }
         return '';
       case 'artist':
-        return _sanitizeFolderName(folderArtist);
+        return _joinRelativePath(
+          playlistPrefix,
+          _sanitizeFolderName(folderArtist),
+        );
       case 'album':
-        return _sanitizeFolderName(track.albumName);
+        return _joinRelativePath(
+          playlistPrefix,
+          _sanitizeFolderName(track.albumName),
+        );
       case 'artist_album':
         final artistName = _sanitizeFolderName(folderArtist);
         final albumName = _sanitizeFolderName(track.albumName);
-        return '$artistName/$albumName';
+        return _joinRelativePath(playlistPrefix, '$artistName/$albumName');
       default:
-        return '';
+        return playlistPrefix;
     }
   }
 
+  String _joinRelativePath(String prefix, String suffix) {
+    if (prefix.isEmpty) return suffix;
+    if (suffix.isEmpty) return prefix;
+    return '$prefix/$suffix';
+  }
+
   String _determineOutputExt(String quality, String service) {
     if (service.toLowerCase() == 'youtube') {
       if (quality.toLowerCase().contains('mp3')) {
@@ -2078,12 +2165,42 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     return resolved?.status == DownloadStatus.skipped;
   }
 
+  bool _isPausePending(String id) => _pausePendingItemIds.contains(id);
+
+  void _requeueItemForPause(String id) {
+    final updatedItems = state.items
+        .map((item) {
+          if (item.id != id) return item;
+          if (item.status == DownloadStatus.completed ||
+              item.status == DownloadStatus.failed ||
+              item.status == DownloadStatus.skipped) {
+            return item;
+          }
+          return item.copyWith(
+            status: DownloadStatus.queued,
+            progress: 0,
+            speedMBps: 0,
+            bytesReceived: 0,
+          );
+        })
+        .toList(growable: false);
+
+    final currentDownload = state.currentDownload?.id == id
+        ? null
+        : state.currentDownload;
+    state = state.copyWith(
+      items: updatedItems,
+      currentDownload: currentDownload,
+    );
+  }
+
   void _requestNativeCancel(String id) {
     PlatformBridge.cancelDownload(id).catchError((_) {});
     PlatformBridge.clearItemProgress(id).catchError((_) {});
   }
 
   void cancelItem(String id) {
+    _pausePendingItemIds.remove(id);
     _locallyCancelledItemIds.add(id);
     updateItemStatus(id, DownloadStatus.skipped);
     _requestNativeCancel(id);
@@ -2116,6 +2233,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         .toList(growable: false);
 
     if (activeIds.isNotEmpty) {
+      _pausePendingItemIds.addAll(activeIds);
       _locallyCancelledItemIds.addAll(activeIds);
       for (final id in activeIds) {
         _requestNativeCancel(id);
@@ -2128,11 +2246,29 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     if (!wasProcessing) {
       _locallyCancelledItemIds.clear();
     }
+    _pausePendingItemIds.clear();
   }
 
   void pauseQueue() {
     if (state.isProcessing && !state.isPaused) {
-      state = state.copyWith(isPaused: true);
+      final activeIds = state.items
+          .where(
+            (item) =>
+                item.status == DownloadStatus.downloading ||
+                item.status == DownloadStatus.finalizing,
+          )
+          .map((item) => item.id)
+          .toSet();
+
+      if (activeIds.isNotEmpty) {
+        _pausePendingItemIds.addAll(activeIds);
+        for (final id in activeIds) {
+          _requestNativeCancel(id);
+          _requeueItemForPause(id);
+        }
+      }
+
+      state = state.copyWith(isPaused: true, currentDownload: null);
       _notificationService.cancelDownloadNotification();
       _log.i('Queue paused');
     }
@@ -2334,7 +2470,11 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     }
   }
 
+  /// Deezer CDN cover size pattern: /WxH-0-0-0-0.jpg
+  static final _deezerSizeRegex = RegExp(r'/(\d+)x(\d+)-\d+-\d+-\d+-\d+\.jpg$');
+
   String _upgradeToMaxQualityCover(String coverUrl) {
+    // Spotify CDN upgrade (hash-based size identifiers)
     const spotifySize300 = 'ab67616d00001e02';
     const spotifySize640 = 'ab67616d0000b273';
     const spotifySizeMax = 'ab67616d000082c1';
@@ -2343,11 +2483,29 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     if (result.contains(spotifySize300)) {
       result = result.replaceFirst(spotifySize300, spotifySize640);
     }
-
     if (result.contains(spotifySize640)) {
       result = result.replaceFirst(spotifySize640, spotifySizeMax);
     }
 
+    // Deezer CDN upgrade (1000x1000 → 1800x1800)
+    if (result.contains('cdn-images.dzcdn.net')) {
+      final upgraded = result.replaceFirst(
+        _deezerSizeRegex,
+        '/1800x1800-000000-80-0-0.jpg',
+      );
+      if (upgraded != result) {
+        _log.d('Cover URL upgraded (Deezer): 1800x1800');
+        result = upgraded;
+      }
+    }
+
+    // Tidal CDN upgrade (1280x1280 → origin)
+    if (result.contains('resources.tidal.com') &&
+        result.contains('/1280x1280.jpg')) {
+      result = result.replaceFirst('/1280x1280.jpg', '/origin.jpg');
+      _log.d('Cover URL upgraded (Tidal): origin');
+    }
+
     return result;
   }
 
@@ -2376,14 +2534,15 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     final backendIsrc = normalizeOptionalString(
       backendResult['isrc'] as String?,
     );
-    final backendCoverUrl = normalizeOptionalString(
-      backendResult['cover_url'] as String?,
+    final backendCoverUrl = normalizeCoverReference(
+      backendResult['cover_url']?.toString(),
     );
     final backendAlbumArtist = normalizeOptionalString(
       backendResult['album_artist'] as String?,
     );
 
-    final hasOverrides = backendTrackNum != null ||
+    final hasOverrides =
+        backendTrackNum != null ||
         backendDiscNum != null ||
         backendYear != null ||
         backendAlbum != null ||
@@ -2432,7 +2591,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     }
 
     String? coverPath;
-    var coverUrl = track.coverUrl;
+    var coverUrl = normalizeRemoteHttpUrl(track.coverUrl);
     if (coverUrl != null && coverUrl.isNotEmpty) {
       try {
         if (settings.maxQualityCover) {
@@ -2618,7 +2777,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     }
 
     String? coverPath;
-    var coverUrl = track.coverUrl;
+    var coverUrl = normalizeRemoteHttpUrl(track.coverUrl);
     if (coverUrl != null && coverUrl.isNotEmpty) {
       try {
         if (settings.maxQualityCover) {
@@ -2786,7 +2945,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     }
 
     String? coverPath;
-    var coverUrl = track.coverUrl;
+    var coverUrl = normalizeRemoteHttpUrl(track.coverUrl);
     if (coverUrl != null && coverUrl.isNotEmpty) {
       try {
         if (settings.maxQualityCover) {
@@ -3126,6 +3285,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     }
     _log.d('Concurrent downloads: ${state.concurrentDownloads}');
     await _processQueueParallel();
+    final stoppedWhilePaused = state.isPaused;
 
     _stopProgressPolling();
 
@@ -3151,7 +3311,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     _log.i(
       'Queue stats - completed: $_completedInSession, failed: $_failedInSession, totalAtStart: $_totalQueuedAtStart',
     );
-    if (_totalQueuedAtStart > 0) {
+    if (!stoppedWhilePaused && _totalQueuedAtStart > 0) {
       await _notificationService.showQueueComplete(
         completedCount: _completedInSession,
         failedCount: _failedInSession,
@@ -3166,13 +3326,17 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       }
     }
 
-    _log.i('Queue processing finished');
+    if (stoppedWhilePaused) {
+      _log.i('Queue processing paused');
+    } else {
+      _log.i('Queue processing finished');
+    }
     state = state.copyWith(isProcessing: false, currentDownload: null);
 
     final hasQueuedItems = state.items.any(
       (item) => item.status == DownloadStatus.queued,
     );
-    if (hasQueuedItems) {
+    if (hasQueuedItems && !state.isPaused) {
       _log.i(
         'Found queued items after processing finished, restarting queue...',
       );
@@ -3188,8 +3352,15 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
 
     while (true) {
       if (state.isPaused) {
+        if (activeDownloads.isEmpty) {
+          _log.d('Queue is paused and no active downloads remain');
+          break;
+        }
         _log.d('Queue is paused, waiting for active downloads...');
-        await Future.delayed(_queueSchedulingInterval);
+        await Future.any([
+          Future.wait(activeDownloads.values),
+          Future.delayed(_queueSchedulingInterval),
+        ]);
         continue;
       }
 
@@ -3200,7 +3371,11 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       }
 
       final queuedItems = state.items
-          .where((item) => item.status == DownloadStatus.queued)
+          .where(
+            (item) =>
+                item.status == DownloadStatus.queued &&
+                !_pausePendingItemIds.contains(item.id),
+          )
           .toList();
 
       if (queuedItems.isEmpty && activeDownloads.isEmpty) {
@@ -3245,11 +3420,13 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
     _stopProgressPolling();
     final remainingIds = state.items.map((item) => item.id).toSet();
     _locallyCancelledItemIds.removeWhere((id) => !remainingIds.contains(id));
+    _pausePendingItemIds.removeWhere((id) => !remainingIds.contains(id));
   }
 
   Future<void> _downloadSingleItem(DownloadItem item) async {
     _log.d('Processing: ${item.track.name} by ${item.track.artistName}');
     _log.d('Cover URL: ${item.track.coverUrl}');
+    var pausedDuringThisRun = false;
 
     final currentItem = _findItemById(item.id) ?? item;
     if (_isLocallyCancelled(item.id, item: currentItem)) {
@@ -3257,11 +3434,33 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       return;
     }
 
+    if (_isPausePending(item.id)) {
+      pausedDuringThisRun = true;
+      _requeueItemForPause(item.id);
+      _log.i('Download is pause-pending before start, skipping');
+      return;
+    }
+
     state = state.copyWith(currentDownload: item);
 
     updateItemStatus(item.id, DownloadStatus.downloading);
 
     try {
+      bool shouldAbortWork(String stage) {
+        final current = _findItemById(item.id);
+        if (_isLocallyCancelled(item.id, item: current)) {
+          _log.i('Download was cancelled $stage, skipping');
+          return true;
+        }
+        if (_isPausePending(item.id)) {
+          pausedDuringThisRun = true;
+          _requeueItemForPause(item.id);
+          _log.i('Download pause requested $stage, re-queueing');
+          return true;
+        }
+        return false;
+      }
+
       final settings = ref.read(settingsProvider);
       final metadataEmbeddingEnabled = settings.embedMetadata;
 
@@ -3342,6 +3541,10 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
           _log.w('Failed to enrich metadata: $e');
           _log.w('Stack trace: $stack');
         }
+
+        if (shouldAbortWork('during metadata enrichment')) {
+          return;
+        }
       }
 
       _log.d('Track coverUrl after enrichment: ${trackToDownload.coverUrl}');
@@ -3381,6 +3584,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
               settings.folderOrganization,
               separateSingles: settings.separateSingles,
               albumFolderStructure: settings.albumFolderStructure,
+              createPlaylistFolder: settings.createPlaylistFolder,
               useAlbumArtistForFolders: settings.useAlbumArtistForFolders,
               usePrimaryArtistOnly: settings.usePrimaryArtistOnly,
               filterContributingArtistsInAlbumArtist:
@@ -3396,6 +3600,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
               settings.folderOrganization,
               separateSingles: settings.separateSingles,
               albumFolderStructure: settings.albumFolderStructure,
+              createPlaylistFolder: settings.createPlaylistFolder,
               useAlbumArtistForFolders: settings.useAlbumArtistForFolders,
               usePrimaryArtistOnly: settings.usePrimaryArtistOnly,
               filterContributingArtistsInAlbumArtist:
@@ -3428,6 +3633,24 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       String? genre;
       String? label;
       String? copyright;
+      final extensionState = ref.read(extensionProvider);
+      final selectedExtensionDownloadProvider =
+          settings.useExtensionProviders &&
+          extensionState.extensions.any(
+            (e) =>
+                e.enabled &&
+                e.hasDownloadProvider &&
+                e.id.toLowerCase() == item.service.toLowerCase(),
+          );
+      final trackSource = (trackToDownload.source ?? '').trim().toLowerCase();
+      final shouldSkipExtensionSongLinkPrelookup =
+          trackSource.isNotEmpty &&
+          extensionState.extensions.any(
+            (e) =>
+                e.enabled &&
+                e.hasMetadataProvider &&
+                e.id.toLowerCase() == trackSource,
+          );
 
       String? deezerTrackId = trackToDownload.deezerId;
       if (deezerTrackId == null && trackToDownload.id.startsWith('deezer:')) {
@@ -3455,10 +3678,16 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         } catch (e) {
           _log.w('Failed to search Deezer by ISRC: $e');
         }
+
+        if (shouldAbortWork('during Deezer ISRC lookup')) {
+          return;
+        }
       }
 
       // Fallback: Use SongLink to convert Spotify ID to Deezer ID
-      if (deezerTrackId == null &&
+      if (!selectedExtensionDownloadProvider &&
+          deezerTrackId == null &&
+          !shouldSkipExtensionSongLinkPrelookup &&
           trackToDownload.id.isNotEmpty &&
           !trackToDownload.id.startsWith('deezer:') &&
           !trackToDownload.id.startsWith('extension:')) {
@@ -3522,7 +3751,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
                 albumArtist: trackToDownload.albumArtist,
                 artistId: trackToDownload.artistId,
                 albumId: trackToDownload.albumId,
-                coverUrl: trackToDownload.coverUrl,
+                coverUrl: normalizeCoverReference(trackToDownload.coverUrl),
                 duration: trackToDownload.duration,
                 isrc: (deezerIsrc != null && _isValidISRC(deezerIsrc))
                     ? deezerIsrc
@@ -3555,6 +3784,19 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         } catch (e) {
           _log.w('Failed to convert Spotify to Deezer via SongLink: $e');
         }
+
+        if (shouldAbortWork('during SongLink availability lookup')) {
+          return;
+        }
+      } else if (selectedExtensionDownloadProvider && deezerTrackId == null) {
+        _log.d(
+          'Skipping Flutter SongLink Deezer prelookup for extension provider: ${item.service}',
+        );
+      } else if (shouldSkipExtensionSongLinkPrelookup &&
+          deezerTrackId == null) {
+        _log.d(
+          'Skipping Flutter SongLink Deezer prelookup for extension-sourced track; backend metadata enrichment will resolve identifiers first',
+        );
       }
 
       if (deezerTrackId != null && deezerTrackId.isNotEmpty) {
@@ -3574,11 +3816,14 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         } catch (e) {
           _log.w('Failed to fetch extended metadata from Deezer: $e');
         }
+
+        if (shouldAbortWork('during extended metadata lookup')) {
+          return;
+        }
       }
 
       Map<String, dynamic> result;
 
-      final extensionState = ref.read(extensionProvider);
       final hasActiveExtensions = extensionState.extensions.any(
         (e) => e.enabled,
       );
@@ -3612,6 +3857,11 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
             'Quality: $quality${item.qualityOverride != null ? ' (override)' : ''}',
           );
         }
+
+        if (!useSaf) {
+          await _ensureDirExists(outputDir, label: 'Output folder');
+        }
+
         _log.d('Output dir: $outputDir');
 
         final normalizedTrackNumber =
@@ -3687,8 +3937,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         );
       }
 
-      if (_isLocallyCancelled(item.id)) {
-        _log.i('Download was cancelled before native download start, skipping');
+      if (shouldAbortWork('before native download start')) {
         return;
       }
 
@@ -3710,10 +3959,12 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
           settings.folderOrganization,
           separateSingles: settings.separateSingles,
           albumFolderStructure: settings.albumFolderStructure,
+          createPlaylistFolder: settings.createPlaylistFolder,
           useAlbumArtistForFolders: settings.useAlbumArtistForFolders,
           usePrimaryArtistOnly: settings.usePrimaryArtistOnly,
           filterContributingArtistsInAlbumArtist:
               settings.filterContributingArtistsInAlbumArtist,
+          playlistName: item.playlistName,
         );
         final fallbackResult = await runDownload(
           useSaf: false,
@@ -3730,10 +3981,8 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       _log.d('Result: $result');
 
       final itemAfterResult = _findItemById(item.id);
-      final cancelledAfterResult =
-          itemAfterResult == null ||
-          _isLocallyCancelled(item.id, item: itemAfterResult);
-      if (cancelledAfterResult) {
+      if (itemAfterResult == null ||
+          _isLocallyCancelled(item.id, item: itemAfterResult)) {
         _log.i('Download was cancelled, skipping result processing');
         final filePath = result['file_path'] as String?;
         if (filePath != null && result['success'] == true) {
@@ -3743,6 +3992,18 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         return;
       }
 
+      if (_isPausePending(item.id)) {
+        pausedDuringThisRun = true;
+        final filePath = result['file_path'] as String?;
+        if (filePath != null && result['success'] == true) {
+          await deleteFile(filePath);
+          _log.d('Deleted paused download file: $filePath');
+        }
+        _requeueItemForPause(item.id);
+        _log.i('Download pause requested after result, re-queueing');
+        return;
+      }
+
       if (result['success'] == true) {
         var filePath = result['file_path'] as String?;
         final reportedFileName = result['file_name'] as String?;
@@ -3780,6 +4041,14 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
             item.service.toLowerCase();
         final decryptionKey =
             (result['decryption_key'] as String?)?.trim() ?? '';
+        trackToDownload = _buildTrackForMetadataEmbedding(
+          trackToDownload,
+          result,
+          resolvedAlbumArtist,
+        );
+        _log.d(
+          'Track coverUrl after download result: ${trackToDownload.coverUrl}',
+        );
 
         if (!wasExisting && decryptionKey.isNotEmpty && filePath != null) {
           _log.i('Encrypted stream detected, decrypting via FFmpeg...');
@@ -3903,7 +4172,6 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
             isContentUriPath &&
             effectiveSafMode &&
             actualService == 'tidal' &&
-            quality != 'HIGH' &&
             filePath.endsWith('.flac') &&
             (mimeType == null || mimeType.contains('flac'));
 
@@ -4013,7 +4281,6 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
                   _log.w('SAF M4A conversion failed: $e');
                   actualQuality = 'AAC 320kbps';
                 } finally {
-                  // Clean up temp files
                   try {
                     await File(tempPath).delete();
                   } catch (_) {}
@@ -4091,7 +4358,6 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
                 } catch (e) {
                   _log.w('SAF M4A->FLAC conversion failed: $e');
                 } finally {
-                  // Clean up temp files
                   try {
                     await File(tempPath).delete();
                   } catch (_) {}
@@ -4467,6 +4733,19 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
           return;
         }
 
+        if (_isPausePending(item.id)) {
+          pausedDuringThisRun = true;
+          if (filePath != null) {
+            await deleteFile(filePath);
+            _log.d(
+              'Deleted paused download file during finalization: $filePath',
+            );
+          }
+          _requeueItemForPause(item.id);
+          _log.i('Download pause requested during finalization, re-queueing');
+          return;
+        }
+
         // SAF downloads should end with content URI. If we still have a
         // transient FD path, recover URI from SAF metadata to keep history
         // dedup/exclusion stable.
@@ -4688,7 +4967,7 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
                       ? backendAlbum
                       : trackToDownload.albumName,
                   albumArtist: historyAlbumArtist,
-                  coverUrl: trackToDownload.coverUrl,
+                  coverUrl: normalizeCoverReference(trackToDownload.coverUrl),
                   filePath: filePath,
                   storageMode: effectiveSafMode ? 'saf' : 'app',
                   downloadTreeUri: effectiveSafMode
@@ -4734,11 +5013,26 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
           return;
         }
 
+        if (_isPausePending(item.id)) {
+          pausedDuringThisRun = true;
+          _requeueItemForPause(item.id);
+          _log.i('Download pause requested after backend failure, re-queueing');
+          return;
+        }
+
         final errorMsg = result['error'] as String? ?? 'Download failed';
         final errorTypeStr = result['error_type'] as String? ?? 'unknown';
         if (errorTypeStr == 'cancelled') {
-          _log.i('Download was cancelled by backend, skipping error handling');
-          updateItemStatus(item.id, DownloadStatus.skipped);
+          if (_isPausePending(item.id)) {
+            pausedDuringThisRun = true;
+            _requeueItemForPause(item.id);
+            _log.i('Download was paused by backend cancellation, re-queueing');
+          } else {
+            _log.i(
+              'Download was cancelled by backend, skipping error handling',
+            );
+            updateItemStatus(item.id, DownloadStatus.skipped);
+          }
           return;
         }
 
@@ -4797,6 +5091,13 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         return;
       }
 
+      if (_isPausePending(item.id)) {
+        pausedDuringThisRun = true;
+        _requeueItemForPause(item.id);
+        _log.i('Download pause requested after exception, re-queueing');
+        return;
+      }
+
       _log.e('Exception: $e', e, stackTrace);
 
       String errorMsg = e.toString();
@@ -4822,6 +5123,10 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
       } catch (cleanupErr) {
         _log.e('Post-exception connection cleanup failed: $cleanupErr');
       }
+    } finally {
+      if (pausedDuringThisRun) {
+        _pausePendingItemIds.remove(item.id);
+      }
     }
   }
 }

lib/providers/explore_provider.dart

@@ -4,6 +4,7 @@ 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');
 
@@ -202,9 +203,7 @@ class ExploreNotifier extends Notifier<ExploreState> {
   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');
@@ -216,16 +215,16 @@ 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 we have cached content and it's fresh enough, skip network fetch
-    if (!forceRefresh && 
-        state.hasContent && 
+    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;
@@ -237,21 +236,33 @@ class ExploreNotifier extends Notifier<ExploreState> {
 
     try {
       final extState = ref.read(extensionProvider);
-      _log.d('Extensions count: ${extState.extensions.length}');
-      
+      final settings = ref.read(settingsProvider);
+      final preferredId = settings.homeFeedProvider;
+      _log.d(
+        'Extensions count: ${extState.extensions.length}, preferred home feed: $preferredId',
+      );
+
       Extension? targetExt;
       for (final extension in extState.extensions) {
         if (!extension.enabled || !extension.hasHomeFeed) {
           continue;
         }
+        // If user has a preference, use that
+        if (preferredId != null &&
+            preferredId.isNotEmpty &&
+            extension.id == preferredId) {
+          targetExt = extension;
+          break;
+        }
+        // Otherwise take the first available (fallback to spotify-web if found)
         if (targetExt == null || extension.id == 'spotify-web') {
           targetExt = extension;
-          if (extension.id == 'spotify-web') {
+          if (preferredId == null && extension.id == 'spotify-web') {
             break;
           }
         }
       }
-      
+
       if (targetExt == null) {
         _log.w('No extension with homeFeed capability found');
         state = state.copyWith(
@@ -260,7 +271,7 @@ class ExploreNotifier extends Notifier<ExploreState> {
         );
         return;
       }
-      
+
       _log.i('Fetching home feed from ${targetExt.id}...');
       final result = await PlatformBridge.getExtensionHomeFeed(targetExt.id);
 
@@ -276,10 +287,7 @@ 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;
       }
 
@@ -291,10 +299,12 @@ 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();
@@ -311,10 +321,7 @@ class ExploreNotifier extends Notifier<ExploreState> {
       _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());
     }
   }
 
@@ -325,7 +332,6 @@ class ExploreNotifier extends Notifier<ExploreState> {
   Future<void> refresh() => fetchHomeFeed(forceRefresh: true);
 }
 
-
 final exploreProvider = NotifierProvider<ExploreNotifier, ExploreState>(() {
   return ExploreNotifier();
 });

lib/providers/extension_provider.dart

@@ -504,6 +504,11 @@ 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)');
@@ -519,6 +524,17 @@ 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);

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();
 
@@ -165,10 +165,7 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
       var excludedDownloadedCount = 0;
       try {
         final prefs = await prefsFuture;
-        final lastScannedAtStr = prefs.getString(_lastScannedAtKey);
-        if (lastScannedAtStr != null && lastScannedAtStr.isNotEmpty) {
-          lastScannedAt = DateTime.tryParse(lastScannedAtStr);
-        }
+        lastScannedAt = readLocalLibraryLastScannedAt(prefs);
         excludedDownloadedCount =
             prefs.getInt(_excludedDownloadedCountKey) ?? 0;
       } catch (e) {
@@ -332,11 +329,16 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
         if (items.isNotEmpty) {
           await _db.upsertBatch(items.map((e) => e.toJson()).toList());
         }
+        final persistedItems =
+            (await _db.getAll())
+                .map(LocalLibraryItem.fromJson)
+                .toList(growable: false)
+              ..sort(_compareLibraryItems);
 
         final now = DateTime.now();
         try {
           final prefs = await SharedPreferences.getInstance();
-          await prefs.setString(_lastScannedAtKey, now.toIso8601String());
+          await writeLocalLibraryLastScannedAt(prefs, now);
           await prefs.setInt(_excludedDownloadedCountKey, skippedDownloads);
           _log.d('Saved lastScannedAt: $now');
         } catch (e) {
@@ -344,7 +346,7 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
         }
 
         state = state.copyWith(
-          items: items,
+          items: persistedItems,
           isScanning: false,
           scanProgress: 100,
           lastScannedAt: now,
@@ -353,11 +355,11 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
         );
 
         _log.i(
-          'Full scan complete: ${items.length} tracks found, '
+          'Full scan complete: ${persistedItems.length} tracks found, '
           '$skippedDownloads already in downloads',
         );
         await _showScanCompleteNotification(
-          totalTracks: items.length,
+          totalTracks: persistedItems.length,
           excludedDownloadedCount: skippedDownloads,
           errorCount: state.scanErrorCount,
         );
@@ -442,8 +444,14 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
           '$skippedCount skipped, ${deletedPaths.length} deleted, $totalFiles total',
         );
 
+        // Build the incremental merge base from SQLite, not the current
+        // provider state. Startup auto-scan can fire before `state.items` has
+        // finished loading, which would otherwise drop unchanged rows from the
+        // in-memory library until a manual full rescan.
+        final existingJson = await _db.getAll();
         final currentByPath = <String, LocalLibraryItem>{
-          for (final item in state.items) item.filePath: item,
+          for (final item in existingJson.map(LocalLibraryItem.fromJson))
+            item.filePath: item,
         };
         final existingDownloadedPaths = <String>[];
         currentByPath.removeWhere((path, _) {
@@ -494,13 +502,16 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
           _log.i('Deleted $deleteCount items from database');
         }
 
-        final items = currentByPath.values.toList(growable: false)
-          ..sort(_compareLibraryItems);
+        final items =
+            (await _db.getAll())
+                .map(LocalLibraryItem.fromJson)
+                .toList(growable: false)
+              ..sort(_compareLibraryItems);
 
         final now = DateTime.now();
         try {
           final prefs = await SharedPreferences.getInstance();
-          await prefs.setString(_lastScannedAtKey, now.toIso8601String());
+          await writeLocalLibraryLastScannedAt(prefs, now);
           await prefs.setInt(_excludedDownloadedCountKey, skippedDownloads);
           _log.d('Saved lastScannedAt: $now');
         } catch (e) {
@@ -818,7 +829,7 @@ class LocalLibraryNotifier extends Notifier<LocalLibraryState> {
 
     try {
       final prefs = await SharedPreferences.getInstance();
-      await prefs.remove(_lastScannedAtKey);
+      await clearLocalLibraryLastScannedAt(prefs);
       await prefs.remove(_excludedDownloadedCountKey);
     } catch (e) {
       _log.w('Failed to clear lastScannedAt: $e');

lib/providers/settings_provider.dart

@@ -1,20 +1,22 @@
 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 = 5;
+const _currentMigrationVersion = 6;
 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> _youtubeOpusSupportedBitrates = [128, 256, 320];
   static const List<int> _youtubeMp3SupportedBitrates = [128, 256, 320];
   static final RegExp _isoRegionPattern = RegExp(r'^[A-Z]{2}$');
 
@@ -37,6 +39,7 @@ class SettingsNotifier extends Notifier<AppSettings> {
       state = AppSettings.fromJson(jsonDecode(json));
 
       await _runMigrations(prefs);
+      await _normalizeIosDownloadDirectoryIfNeeded();
       await _normalizeYouTubeBitratesIfNeeded();
       await _normalizeSongLinkRegionIfNeeded();
     }
@@ -50,6 +53,8 @@ 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');
     });
@@ -65,6 +70,8 @@ class SettingsNotifier extends Notifier<AppSettings> {
   }
 
   void _syncNetworkCompatibilitySettingsToBackend() {
+    if (!PlatformBridge.supportsCoreBackend) return;
+
     final compatibilityMode = state.networkCompatibilityMode;
     PlatformBridge.setNetworkCompatibilityOptions(
       allowHttp: compatibilityMode,
@@ -189,6 +196,20 @@ class SettingsNotifier extends Notifier<AppSettings> {
     await _saveSettings();
   }
 
+  Future<void> _normalizeIosDownloadDirectoryIfNeeded() async {
+    if (!Platform.isIOS) return;
+
+    final currentDir = state.downloadDirectory.trim();
+    if (currentDir.isEmpty) return;
+
+    final normalizedDir = await validateOrFixIosPath(currentDir);
+    if (normalizedDir == currentDir) return;
+
+    _log.i('Normalized iOS download directory: $currentDir -> $normalizedDir');
+    state = state.copyWith(downloadDirectory: normalizedDir);
+    await _saveSettings();
+  }
+
   String _normalizeSongLinkRegion(String region) {
     final normalized = region.trim().toUpperCase();
     if (_isoRegionPattern.hasMatch(normalized)) return normalized;
@@ -354,6 +375,11 @@ 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();
@@ -385,8 +411,7 @@ class SettingsNotifier extends Notifier<AppSettings> {
   }
 
   void setMetadataSource(String source) {
-    final normalized = source == 'deezer' ? 'deezer' : 'deezer';
-    state = state.copyWith(metadataSource: normalized);
+    state = state.copyWith(metadataSource: source);
     _saveSettings();
   }
 
@@ -399,6 +424,15 @@ 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();
@@ -502,6 +536,11 @@ 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/track_provider.dart

@@ -2,6 +2,7 @@ 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';
 
@@ -30,6 +31,8 @@ class TrackState {
   searchExtensionId; // Extension ID used for current search results
   final String?
   selectedSearchFilter; // Currently selected search filter (e.g., "track", "album", "artist", "playlist")
+  final String?
+  searchSource; // Built-in search provider used for current results (e.g., "deezer", "tidal", "qobuz")
 
   const TrackState({
     this.tracks = const [],
@@ -52,6 +55,7 @@ class TrackState {
     this.isShowingRecentAccess = false,
     this.searchExtensionId,
     this.selectedSearchFilter,
+    this.searchSource,
   });
 
   bool get hasContent =>
@@ -83,6 +87,8 @@ class TrackState {
     String? searchExtensionId,
     String? selectedSearchFilter,
     bool clearSelectedSearchFilter = false,
+    String? searchSource,
+    bool clearSearchSource = false,
   }) {
     return TrackState(
       tracks: tracks ?? this.tracks,
@@ -108,6 +114,9 @@ class TrackState {
       selectedSearchFilter: clearSelectedSearchFilter
           ? null
           : (selectedSearchFilter ?? this.selectedSearchFilter),
+      searchSource: clearSearchSource
+          ? null
+          : (searchSource ?? this.searchSource),
     );
   }
 }
@@ -278,7 +287,9 @@ class TrackNotifier extends Notifier<TrackState> {
               playlistName: type == 'playlist'
                   ? result['name'] as String?
                   : null,
-              coverUrl: result['cover_url'] as String?,
+              coverUrl: normalizeCoverReference(
+                result['cover_url']?.toString(),
+              ),
               searchExtensionId: extensionId,
             );
             return;
@@ -305,10 +316,12 @@ class TrackNotifier extends Notifier<TrackState> {
               isLoading: false,
               artistId: artistData['id'] as String?,
               artistName: artistData['name'] as String?,
-              coverUrl:
-                  artistData['image_url'] as String? ??
-                  artistData['images'] as String?,
-              headerImageUrl: artistData['header_image'] as String?,
+              coverUrl: normalizeRemoteHttpUrl(
+                (artistData['image_url'] ?? artistData['images'])?.toString(),
+              ),
+              headerImageUrl: normalizeRemoteHttpUrl(
+                artistData['header_image']?.toString(),
+              ),
               monthlyListeners: artistData['listeners'] as int?,
               artistAlbums: albums,
               artistTopTracks: topTracks.isNotEmpty ? topTracks : null,
@@ -349,7 +362,7 @@ class TrackNotifier extends Notifier<TrackState> {
             isLoading: false,
             albumId: id,
             albumName: albumInfo['name'] as String?,
-            coverUrl: albumInfo['images'] as String?,
+            coverUrl: normalizeRemoteHttpUrl(albumInfo['images']?.toString()),
           );
           _preWarmCacheForTracks(tracks);
         } else if (type == 'playlist') {
@@ -363,7 +376,9 @@ class TrackNotifier extends Notifier<TrackState> {
             tracks: tracks,
             isLoading: false,
             playlistName: playlistInfo['name'] as String?,
-            coverUrl: playlistInfo['images'] as String?,
+            coverUrl: normalizeRemoteHttpUrl(
+              playlistInfo['images']?.toString(),
+            ),
           );
           _preWarmCacheForTracks(tracks);
         } else if (type == 'artist') {
@@ -377,7 +392,7 @@ class TrackNotifier extends Notifier<TrackState> {
             isLoading: false,
             artistId: artistInfo['id'] as String?,
             artistName: artistInfo['name'] as String?,
-            coverUrl: artistInfo['images'] as String?,
+            coverUrl: normalizeRemoteHttpUrl(artistInfo['images']?.toString()),
             artistAlbums: albums,
           );
         }
@@ -414,7 +429,7 @@ class TrackNotifier extends Notifier<TrackState> {
             isLoading: false,
             albumId: 'qobuz:$id',
             albumName: albumInfo['name'] as String?,
-            coverUrl: albumInfo['images'] as String?,
+            coverUrl: normalizeRemoteHttpUrl(albumInfo['images']?.toString()),
           );
           _preWarmCacheForTracks(tracks);
         } else if (type == 'playlist') {
@@ -427,8 +442,9 @@ class TrackNotifier extends Notifier<TrackState> {
           final owner = playlistInfo['owner'] as Map<String, dynamic>?;
           final playlistName =
               (playlistInfo['name'] ?? owner?['name']) as String?;
-          final coverUrl =
-              (playlistInfo['images'] ?? owner?['images']) as String?;
+          final coverUrl = normalizeRemoteHttpUrl(
+            (playlistInfo['images'] ?? owner?['images'])?.toString(),
+          );
           state = TrackState(
             tracks: tracks,
             isLoading: false,
@@ -447,7 +463,7 @@ class TrackNotifier extends Notifier<TrackState> {
             isLoading: false,
             artistId: artistInfo['id'] as String?,
             artistName: artistInfo['name'] as String?,
-            coverUrl: artistInfo['images'] as String?,
+            coverUrl: normalizeRemoteHttpUrl(artistInfo['images']?.toString()),
             artistAlbums: albums,
           );
         }
@@ -484,7 +500,7 @@ class TrackNotifier extends Notifier<TrackState> {
             isLoading: false,
             albumId: 'tidal:$id',
             albumName: albumInfo['name'] as String?,
-            coverUrl: albumInfo['images'] as String?,
+            coverUrl: normalizeRemoteHttpUrl(albumInfo['images']?.toString()),
           );
           _preWarmCacheForTracks(tracks);
         } else if (type == 'playlist') {
@@ -497,8 +513,9 @@ class TrackNotifier extends Notifier<TrackState> {
           final owner = playlistInfo['owner'] as Map<String, dynamic>?;
           final playlistName =
               (playlistInfo['name'] ?? owner?['name']) as String?;
-          final coverUrl =
-              (playlistInfo['images'] ?? owner?['images']) as String?;
+          final coverUrl = normalizeRemoteHttpUrl(
+            (playlistInfo['images'] ?? owner?['images'])?.toString(),
+          );
           state = TrackState(
             tracks: tracks,
             isLoading: false,
@@ -517,7 +534,7 @@ class TrackNotifier extends Notifier<TrackState> {
             isLoading: false,
             artistId: artistInfo['id'] as String?,
             artistName: artistInfo['name'] as String?,
-            coverUrl: artistInfo['images'] as String?,
+            coverUrl: normalizeRemoteHttpUrl(artistInfo['images']?.toString()),
             artistAlbums: albums,
           );
         }
@@ -572,7 +589,7 @@ class TrackNotifier extends Notifier<TrackState> {
           isLoading: false,
           albumId: parsed['id'] as String?,
           albumName: albumInfo['name'] as String?,
-          coverUrl: albumInfo['images'] as String?,
+          coverUrl: normalizeRemoteHttpUrl(albumInfo['images']?.toString()),
         );
         _preWarmCacheForTracks(tracks);
       } else if (type == 'playlist') {
@@ -584,8 +601,9 @@ class TrackNotifier extends Notifier<TrackState> {
         final owner = playlistInfo['owner'] as Map<String, dynamic>?;
         final playlistName =
             (playlistInfo['name'] ?? owner?['name']) as String?;
-        final coverUrl =
-            (playlistInfo['images'] ?? owner?['images']) as String?;
+        final coverUrl = normalizeRemoteHttpUrl(
+          (playlistInfo['images'] ?? owner?['images'])?.toString(),
+        );
         state = TrackState(
           tracks: tracks,
           isLoading: false,
@@ -604,7 +622,7 @@ class TrackNotifier extends Notifier<TrackState> {
           isLoading: false,
           artistId: artistInfo['id'] as String?,
           artistName: artistInfo['name'] as String?,
-          coverUrl: artistInfo['images'] as String?,
+          coverUrl: normalizeRemoteHttpUrl(artistInfo['images']?.toString()),
           artistAlbums: albums,
         );
       }
@@ -618,7 +636,11 @@ class TrackNotifier extends Notifier<TrackState> {
     }
   }
 
-  Future<void> search(String query, {String? filterOverride}) async {
+  Future<void> search(
+    String query, {
+    String? filterOverride,
+    String? builtInSearchProvider,
+  }) async {
     final requestId = ++_currentRequestId;
 
     // Preserve selected filter during loading
@@ -640,39 +662,68 @@ class TrackNotifier extends Notifier<TrackState> {
       final includeExtensions =
           settings.useExtensionProviders && hasActiveMetadataExtensions;
 
+      // Determine the effective search provider
+      final effectiveProvider = builtInSearchProvider ?? 'deezer';
+
       _log.i(
-        'Search started: metadataProviders, query="$query", includeExtensions=$includeExtensions, filter=$currentFilter',
+        'Search started: provider=$effectiveProvider, query="$query", includeExtensions=$includeExtensions, filter=$currentFilter',
       );
 
       Map<String, dynamic> results;
       List<Map<String, dynamic>> metadataTrackResults = [];
 
-      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',
-        );
-      } catch (e) {
-        _log.w(
-          'Metadata provider search failed, falling back to Deezer tracks: $e',
-        );
+      // Only use metadata providers for Deezer search (default behavior)
+      if (effectiveProvider == 'deezer') {
+        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',
+          );
+        } catch (e) {
+          _log.w(
+            'Metadata provider search failed, falling back to Deezer tracks: $e',
+          );
+        }
       }
 
-      _log.d('Calling Deezer search API...');
-      results = await PlatformBridge.searchDeezerAll(
-        query,
-        trackLimit: 20,
-        artistLimit: 2,
-        filter: currentFilter,
-      );
+      // Call the appropriate search API
+      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.i(
-        'Deezer returned ${(results['tracks'] as List?)?.length ?? 0} tracks, ${(results['artists'] as List?)?.length ?? 0} artists, ${(results['albums'] as List?)?.length ?? 0} albums',
+        '$effectiveProvider 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)) {
@@ -758,6 +809,8 @@ class TrackNotifier extends Notifier<TrackState> {
         hasSearchText: state.hasSearchText,
         isShowingRecentAccess: state.isShowingRecentAccess,
         selectedSearchFilter: currentFilter, // Preserve filter in results
+        searchSource:
+            effectiveProvider, // Track which service was used for search
       );
     } catch (e, stackTrace) {
       if (!_isRequestValid(requestId)) return;
@@ -943,7 +996,7 @@ class TrackNotifier extends Notifier<TrackState> {
       albumArtist: data['album_artist'] as String?,
       artistId: (data['artist_id'] ?? data['artistId'])?.toString(),
       albumId: data['album_id']?.toString(),
-      coverUrl: data['images'] as String?,
+      coverUrl: normalizeCoverReference(data['images']?.toString()),
       isrc: data['isrc'] as String?,
       duration: (durationMs / 1000).round(),
       trackNumber: data['track_number'] as int?,
@@ -958,26 +1011,32 @@ 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: (data['spotify_id'] ?? data['id'] ?? '').toString(),
+      id: preferredId,
       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: (data['cover_url'] ?? data['images'])?.toString(),
+      coverUrl: normalizeCoverReference(
+        (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:
-          source ??
-          data['source']?.toString() ??
-          data['provider_id']?.toString(),
+      source: effectiveSource,
       albumType: data['album_type']?.toString(),
       itemType: itemType,
     );
@@ -1015,7 +1074,9 @@ class TrackNotifier extends Notifier<TrackState> {
       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(),
+      coverUrl: normalizeCoverReference(
+        (data['cover_url'] ?? data['images'])?.toString(),
+      ),
       albumType: data['album_type'] as String? ?? 'album',
       artists: data['artists'] as String? ?? '',
       providerId: data['provider_id']?.toString(),
@@ -1026,7 +1087,7 @@ class TrackNotifier extends Notifier<TrackState> {
     return SearchArtist(
       id: data['id'] as String? ?? '',
       name: data['name'] as String? ?? '',
-      imageUrl: data['images'] as String?,
+      imageUrl: normalizeRemoteHttpUrl(data['images']?.toString()),
       followers: data['followers'] as int? ?? 0,
       popularity: data['popularity'] as int? ?? 0,
     );
@@ -1037,7 +1098,7 @@ class TrackNotifier extends Notifier<TrackState> {
       id: data['id'] as String? ?? '',
       name: data['name'] as String? ?? '',
       artists: data['artists'] as String? ?? '',
-      imageUrl: data['images'] as String?,
+      imageUrl: normalizeRemoteHttpUrl(data['images']?.toString()),
       releaseDate: data['release_date'] as String?,
       totalTracks: data['total_tracks'] as int? ?? 0,
       albumType: data['album_type'] as String? ?? 'album',
@@ -1049,7 +1110,7 @@ class TrackNotifier extends Notifier<TrackState> {
       id: data['id'] as String? ?? '',
       name: data['name'] as String? ?? '',
       owner: data['owner'] as String? ?? '',
-      imageUrl: data['images'] as String?,
+      imageUrl: normalizeRemoteHttpUrl(data['images']?.toString()),
       totalTracks: data['total_tracks'] as int? ?? 0,
     );
   }

lib/screens/album_screen.dart

@@ -11,6 +11,7 @@ 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/providers/library_collections_provider.dart';
@@ -81,7 +82,6 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
     _scrollController.addListener(_onScroll);
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      // Use extensionId if available, otherwise detect from albumId prefix
       final providerId =
           widget.extensionId ??
           (() {
@@ -95,7 +95,10 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
           .recordAlbumAccess(
             id: widget.albumId,
             name: widget.albumName,
-            artistName: widget.tracks?.firstOrNull?.artistName,
+            artistName:
+                widget.artistName ??
+                widget.tracks?.firstOrNull?.albumArtist ??
+                widget.tracks?.firstOrNull?.artistName,
             imageUrl: widget.coverUrl,
             providerId: providerId,
           );
@@ -134,9 +137,7 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
     return (mediaSize.height * 0.55).clamp(360.0, 520.0);
   }
 
-  /// 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).
+  /// Upgrade cover URL to a higher resolution for full-screen display.
   String? _highResCoverUrl(String? url) {
     if (url == null) return null;
     // Spotify CDN: upgrade 300 → 640 only (no intermediate between 640 and 2000)
@@ -229,7 +230,7 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
       artistId:
           (data['artist_id'] ?? data['artistId'])?.toString() ?? _artistId,
       albumId: data['album_id']?.toString() ?? widget.albumId,
-      coverUrl: data['images'] as String?,
+      coverUrl: normalizeCoverReference(data['images']?.toString()),
       isrc: data['isrc'] as String?,
       duration: ((data['duration_ms'] as int? ?? 0) / 1000).round(),
       trackNumber: data['track_number'] as int?,
@@ -283,7 +284,11 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
   ) {
     final expandedHeight = _calculateExpandedHeight(context);
     final tracks = _tracks ?? [];
-    final artistName = tracks.isNotEmpty ? tracks.first.artistName : null;
+    final artistName =
+        widget.artistName ??
+        (tracks.isNotEmpty
+            ? (tracks.first.albumArtist ?? tracks.first.artistName)
+            : null);
     final releaseDate = tracks.isNotEmpty ? tracks.first.releaseDate : null;
 
     return SliverAppBar(
@@ -516,7 +521,6 @@ 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());
   }
 
@@ -571,37 +575,82 @@ class _AlbumScreenState extends ConsumerState<AlbumScreen> {
   void _downloadAll(BuildContext context) {
     final tracks = _tracks;
     if (tracks == null || tracks.isEmpty) return;
+
+    // Skip already-downloaded tracks
+    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: '${tracks.length} tracks',
+        trackName: '${tracksToQueue.length} tracks',
         artistName: widget.albumName,
         onSelect: (quality, service) {
           ref
               .read(downloadQueueProvider.notifier)
-              .addMultipleToQueue(tracks, service, qualityOverride: quality);
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(
-                context.l10n.snackbarAddedTracksToQueue(tracks.length),
-              ),
-            ),
-          );
+              .addMultipleToQueue(
+                tracksToQueue,
+                service,
+                qualityOverride: quality,
+              );
+          _showQueuedSnackbar(context, tracksToQueue.length, skippedCount);
         },
       );
     } else {
       ref
           .read(downloadQueueProvider.notifier)
-          .addMultipleToQueue(tracks, settings.defaultService);
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(context.l10n.snackbarAddedTracksToQueue(tracks.length)),
-        ),
-      );
+          .addMultipleToQueue(tracksToQueue, settings.defaultService);
+      _showQueuedSnackbar(context, tracksToQueue.length, skippedCount);
     }
   }
 
+  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;

lib/screens/artist_screen.dart

@@ -14,6 +14,7 @@ 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;
@@ -297,8 +298,7 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
               .toList();
         }
 
-        final topTracksList =
-            artistData['top_tracks'] as List<dynamic>? ?? [];
+        final topTracksList = artistData['top_tracks'] as List<dynamic>? ?? [];
         if (topTracksList.isNotEmpty) {
           topTracks = topTracksList
               .map((t) => _parseTrack(t as Map<String, dynamic>))
@@ -399,8 +399,9 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
           (data['artist_id'] ?? data['artistId'])?.toString() ??
           widget.artistId,
       albumId: data['album_id']?.toString() ?? album?.id,
-      coverUrl: (data['cover_url'] ?? data['images'] ?? album?.coverUrl)
-          ?.toString(),
+      coverUrl: normalizeCoverReference(
+        (data['cover_url'] ?? data['images'] ?? album?.coverUrl)?.toString(),
+      ),
       isrc: data['isrc']?.toString(),
       duration: (durationMs / 1000).round(),
       trackNumber: data['track_number'] as int?,
@@ -414,18 +415,18 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
 
   ArtistAlbum _parseArtistAlbum(Map<String, dynamic> data) {
     final totalTracksValue = data['total_tracks'];
-    final totalTracks =
-        totalTracksValue is int
-            ? totalTracksValue
-            : int.tryParse(totalTracksValue?.toString() ?? '') ?? 0;
+    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: (data['cover_url'] ?? data['images'] ?? data['cover_art'])
-          ?.toString(),
+      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(),
@@ -1359,8 +1360,10 @@ class _ArtistScreenState extends ConsumerState<ArtistScreen> {
             },
             itemBuilder: (context, pageIndex) {
               final startIndex = pageIndex * tracksPerPage;
-              final endIndex =
-                  (startIndex + tracksPerPage).clamp(0, tracks.length);
+              final endIndex = (startIndex + tracksPerPage).clamp(
+                0,
+                tracks.length,
+              );
               final pageTracks = tracks.sublist(startIndex, endIndex);
 
               return Column(

lib/screens/downloaded_album_screen.dart

@@ -910,8 +910,45 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
     BuildContext context,
     List<DownloadHistoryItem> allTracks,
   ) {
-    String selectedFormat = 'MP3';
-    String selectedBitrate = '320k';
+    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');
 
     showModalBottomSheet(
       context: context,
@@ -923,7 +960,6 @@ 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(
@@ -960,51 +996,73 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
                       ),
                     ),
                     const SizedBox(height: 8),
-                    Row(
-                      children: formats.map((format) {
-                        final isSelected = format == selectedFormat;
-                        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;
+                      children: formats.map((format) {
+                        final isSelected = format == selectedFormat;
                         return ChoiceChip(
-                          label: Text(br),
+                          label: Text(format),
                           selected: isSelected,
                           onSelected: (selected) {
                             if (selected) {
-                              setSheetState(() => selectedBitrate = br);
+                              setSheetState(() {
+                                selectedFormat = format;
+                                isLosslessTarget =
+                                    format == 'ALAC' || format == 'FLAC';
+                                if (!isLosslessTarget) {
+                                  selectedBitrate = format == 'Opus'
+                                      ? '128k'
+                                      : '320k';
+                                }
+                              });
                             }
                           },
                         );
                       }).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,
@@ -1057,12 +1115,19 @@ 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) selected.add(item);
+      if (ext == null || ext == targetFormat) continue;
+      // Skip lossy sources when target is lossless (pointless re-encoding)
+      final isLosslessTarget = targetFormat == 'ALAC' || targetFormat == 'FLAC';
+      final isLosslessSource = ext == 'FLAC' || ext == 'M4A';
+      if (isLosslessTarget && !isLosslessSource) continue;
+      selected.add(item);
     }
 
     if (selected.isEmpty) {
@@ -1074,16 +1139,22 @@ 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(
-          context.l10n.selectionBatchConvertConfirmMessage(
-            selected.length,
-            targetFormat,
-            bitrate,
-          ),
+          isLossless
+              ? context.l10n.selectionBatchConvertConfirmMessageLossless(
+                  selected.length,
+                  targetFormat,
+                )
+              : context.l10n.selectionBatchConvertConfirmMessage(
+                  selected.length,
+                  targetFormat,
+                  bitrate,
+                ),
         ),
         actions: [
           TextButton(
@@ -1104,7 +1175,10 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
     final total = selected.length;
     final historyDb = HistoryDatabase.instance;
     final newQuality =
-        '${targetFormat.toUpperCase()} ${bitrate.trim().toLowerCase()}';
+        (targetFormat.toUpperCase() == 'ALAC' ||
+            targetFormat.toUpperCase() == 'FLAC')
+        ? '${targetFormat.toUpperCase()} Lossless'
+        : '${targetFormat.toUpperCase()} ${bitrate.trim().toLowerCase()}';
     final settings = ref.read(settingsProvider);
     final shouldEmbedLyrics =
         settings.embedLyrics && settings.lyricsMode != 'external';
@@ -1132,12 +1206,7 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
         try {
           final result = await PlatformBridge.readFileMetadata(item.filePath);
           if (result['error'] == null) {
-            result.forEach((key, value) {
-              if (key == 'error' || value == null) return;
-              final v = value.toString().trim();
-              if (v.isEmpty) return;
-              metadata[key.toUpperCase()] = v;
-            });
+            mergePlatformMetadataForTagEmbed(target: metadata, source: result);
           }
         } catch (_) {}
         await ensureLyricsMetadataForConversion(
@@ -1207,13 +1276,27 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
             final baseName = dotIdx > 0
                 ? oldFileName.substring(0, dotIdx)
                 : oldFileName;
-            final newExt = targetFormat.toLowerCase() == 'opus'
-                ? '.opus'
-                : '.mp3';
+            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 newFileName = '$baseName$newExt';
-            final mimeType = targetFormat.toLowerCase() == 'opus'
-                ? 'audio/opus'
-                : 'audio/mpeg';
 
             final safUri = await PlatformBridge.createSafFileFromPath(
               treeUri: treeUri,

lib/screens/home_tab.dart

@@ -23,6 +23,7 @@ import 'package:spotiflac_android/services/downloaded_embedded_cover_resolver.da
 import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/utils/app_bar_layout.dart';
 import 'package:spotiflac_android/utils/file_access.dart';
+import 'package:spotiflac_android/utils/string_utils.dart';
 import 'package:spotiflac_android/screens/playlist_screen.dart';
 import 'package:spotiflac_android/screens/downloaded_album_screen.dart';
 import 'package:spotiflac_android/widgets/download_service_picker.dart';
@@ -489,6 +490,9 @@ class _HomeTabState extends ConsumerState<HomeTab>
 
     if (searchProvider == null || searchProvider.isEmpty) return false;
 
+    // Built-in providers (tidal, qobuz) also support live search
+    if (_builtInSearchProviders.contains(searchProvider)) return true;
+
     final extension = extState.extensions
         .where((e) => e.id == searchProvider && e.enabled)
         .firstOrNull;
@@ -546,6 +550,9 @@ class _HomeTabState extends ConsumerState<HomeTab>
     }
   }
 
+  /// Built-in search providers that are not extensions
+  static const _builtInSearchProviders = {'tidal', 'qobuz'};
+
   Future<void> _performSearch(String query, {String? filterOverride}) async {
     final settings = ref.read(settingsProvider);
     final extState = ref.read(extensionProvider);
@@ -558,9 +565,14 @@ class _HomeTabState extends ConsumerState<HomeTab>
     if (_lastSearchQuery == searchKey) return;
     _lastSearchQuery = searchKey;
 
+    final isBuiltInProvider =
+        searchProvider != null &&
+        _builtInSearchProviders.contains(searchProvider);
+
     final isExtensionEnabled =
         searchProvider != null &&
         searchProvider.isNotEmpty &&
+        !isBuiltInProvider &&
         extState.extensions.any((e) => e.id == searchProvider && e.enabled);
 
     if (isExtensionEnabled) {
@@ -571,10 +583,20 @@ class _HomeTabState extends ConsumerState<HomeTab>
       await ref
           .read(trackProvider.notifier)
           .customSearch(searchProvider, query, options: options);
+    } else if (isBuiltInProvider) {
+      // Use built-in Tidal or Qobuz search
+      await ref
+          .read(trackProvider.notifier)
+          .search(
+            query,
+            filterOverride: selectedFilter,
+            builtInSearchProvider: searchProvider,
+          );
     } else {
       if (searchProvider != null &&
           searchProvider.isNotEmpty &&
-          !isExtensionEnabled) {
+          !isExtensionEnabled &&
+          !isBuiltInProvider) {
         ref.read(settingsProvider.notifier).setSearchProvider(null);
       }
       await ref
@@ -718,6 +740,7 @@ class _HomeTabState extends ConsumerState<HomeTab>
           trackName: track.name,
           artistName: track.artistName,
           coverUrl: track.coverUrl,
+          recommendedService: trackState.searchSource,
           onSelect: (quality, service) {
             ref
                 .read(downloadQueueProvider.notifier)
@@ -2770,6 +2793,14 @@ class _HomeTabState extends ConsumerState<HomeTab>
     }
 
     if (searchProvider != null && searchProvider.isNotEmpty) {
+      // Check built-in providers first
+      if (searchProvider == 'tidal') {
+        return 'Search with Tidal...';
+      }
+      if (searchProvider == 'qobuz') {
+        return 'Search with Qobuz...';
+      }
+
       final ext = extState.extensions
           .where((e) => e.id == searchProvider)
           .firstOrNull;
@@ -3004,6 +3035,11 @@ class _SearchProviderDropdown extends ConsumerWidget {
           .firstOrNull;
     }
 
+    // Check if current provider is a built-in provider (tidal/qobuz)
+    const builtInProviders = {'tidal', 'qobuz'};
+    final isBuiltInProvider =
+        currentProvider != null && builtInProviders.contains(currentProvider);
+
     IconData displayIcon = Icons.search;
     String? iconPath;
     if (currentExt != null) {
@@ -3011,10 +3047,8 @@ class _SearchProviderDropdown extends ConsumerWidget {
       if (currentExt.searchBehavior?.icon != null) {
         displayIcon = _getIconFromName(currentExt.searchBehavior!.icon!);
       }
-    }
-
-    if (searchProviders.isEmpty) {
-      return const Icon(Icons.search);
+    } else if (isBuiltInProvider) {
+      displayIcon = Icons.music_note;
     }
 
     return Padding(
@@ -3081,6 +3115,62 @@ class _SearchProviderDropdown extends ConsumerWidget {
               ],
             ),
           ),
+          // Built-in Tidal search option
+          PopupMenuItem<String>(
+            value: 'tidal',
+            child: Row(
+              children: [
+                Icon(
+                  Icons.music_note,
+                  size: 20,
+                  color: currentProvider == 'tidal'
+                      ? colorScheme.primary
+                      : colorScheme.onSurfaceVariant,
+                ),
+                const SizedBox(width: 12),
+                Expanded(
+                  child: Text(
+                    'Tidal',
+                    style: TextStyle(
+                      fontWeight: currentProvider == 'tidal'
+                          ? FontWeight.w600
+                          : FontWeight.normal,
+                    ),
+                  ),
+                ),
+                if (currentProvider == 'tidal')
+                  Icon(Icons.check, size: 18, color: colorScheme.primary),
+              ],
+            ),
+          ),
+          // Built-in Qobuz search option
+          PopupMenuItem<String>(
+            value: 'qobuz',
+            child: Row(
+              children: [
+                Icon(
+                  Icons.music_note,
+                  size: 20,
+                  color: currentProvider == 'qobuz'
+                      ? colorScheme.primary
+                      : colorScheme.onSurfaceVariant,
+                ),
+                const SizedBox(width: 12),
+                Expanded(
+                  child: Text(
+                    'Qobuz',
+                    style: TextStyle(
+                      fontWeight: currentProvider == 'qobuz'
+                          ? FontWeight.w600
+                          : FontWeight.normal,
+                    ),
+                  ),
+                ),
+                if (currentProvider == 'qobuz')
+                  Icon(Icons.check, size: 18, color: colorScheme.primary),
+              ],
+            ),
+          ),
           if (searchProviders.isNotEmpty) const PopupMenuDivider(),
           ...searchProviders.map(
             (ext) => PopupMenuItem<String>(
@@ -3909,6 +3999,7 @@ class _ExtensionAlbumScreenState extends ConsumerState<ExtensionAlbumScreen> {
       name: (data['name'] ?? '').toString(),
       artistName: (data['artists'] ?? data['artist'] ?? '').toString(),
       albumName: (data['album_name'] ?? widget.albumName).toString(),
+      albumArtist: (data['album_artist'] ?? _artistName)?.toString(),
       artistId:
           (data['artist_id'] ?? data['artistId'])?.toString() ?? _artistId,
       albumId: data['album_id']?.toString() ?? widget.albumId,
@@ -4216,7 +4307,7 @@ class _ExtensionArtistScreenState extends ConsumerState<ExtensionArtistScreen> {
       artists: (data['artists'] ?? '').toString(),
       releaseDate: (data['release_date'] ?? '').toString(),
       totalTracks: data['total_tracks'] as int? ?? 0,
-      coverUrl: data['cover_url']?.toString(),
+      coverUrl: normalizeCoverReference(data['cover_url']?.toString()),
       albumType: (data['album_type'] ?? 'album').toString(),
       providerId: (data['provider_id'] ?? widget.extensionId).toString(),
     );
@@ -4241,7 +4332,9 @@ class _ExtensionArtistScreenState extends ConsumerState<ExtensionArtistScreen> {
           (data['artist_id'] ?? data['artistId'])?.toString() ??
           widget.artistId,
       albumId: data['album_id']?.toString(),
-      coverUrl: (data['cover_url'] ?? data['images'])?.toString(),
+      coverUrl: normalizeCoverReference(
+        (data['cover_url'] ?? data['images'])?.toString(),
+      ),
       isrc: data['isrc']?.toString(),
       duration: (durationMs / 1000).round(),
       trackNumber: data['track_number'] as int?,

lib/screens/library_tracks_folder_screen.dart

@@ -39,6 +39,7 @@ class _LibraryTracksFolderScreenState
 
   bool _isSelectionMode = false;
   final Set<String> _selectedKeys = {};
+  UserPlaylistCollection? playlist;
 
   @override
   void initState() {
@@ -243,7 +244,6 @@ 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) {
@@ -872,11 +872,54 @@ 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: '${tracks.length} tracks',
+        trackName: '${tracksToQueue.length} tracks',
         artistName: switch (widget.mode) {
           LibraryTracksFolderMode.wishlist => context.l10n.collectionWishlist,
           LibraryTracksFolderMode.loved => context.l10n.collectionLoved,
@@ -885,12 +928,24 @@ class _LibraryTracksFolderScreenState
         onSelect: (quality, service) {
           ref
               .read(downloadQueueProvider.notifier)
-              .addMultipleToQueue(tracks, service, qualityOverride: quality);
+              .addMultipleToQueue(
+                tracksToQueue,
+                service,
+                qualityOverride: quality,
+                playlistName: playlistName,
+              );
           if (!mounted) return;
           ScaffoldMessenger.of(context).showSnackBar(
             SnackBar(
               content: Text(
-                context.l10n.snackbarAddedTracksToQueue(tracks.length),
+                skippedCount > 0
+                    ? context.l10n.discographySkippedDownloaded(
+                        tracksToQueue.length,
+                        skippedCount,
+                      )
+                    : context.l10n.snackbarAddedTracksToQueue(
+                        tracksToQueue.length,
+                      ),
               ),
             ),
           );
@@ -899,10 +954,21 @@ class _LibraryTracksFolderScreenState
     } else {
       ref
           .read(downloadQueueProvider.notifier)
-          .addMultipleToQueue(tracks, settings.defaultService);
+          .addMultipleToQueue(
+            tracksToQueue,
+            settings.defaultService,
+            playlistName: playlistName,
+          );
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-          content: Text(context.l10n.snackbarAddedTracksToQueue(tracks.length)),
+          content: Text(
+            skippedCount > 0
+                ? context.l10n.discographySkippedDownloaded(
+                    tracksToQueue.length,
+                    skippedCount,
+                  )
+                : context.l10n.snackbarAddedTracksToQueue(tracksToQueue.length),
+          ),
         ),
       );
     }

lib/screens/local_album_screen.dart

@@ -4,11 +4,15 @@ 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';
@@ -41,11 +45,10 @@ 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;
@@ -623,11 +626,13 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
 
       slivers.add(
         SliverList(
-          delegate: SliverChildBuilderDelegate(
-            (context, index) =>
-                _buildTrackItem(context, colorScheme, discTracks[index]),
-            childCount: discTracks.length,
-          ),
+          delegate: SliverChildBuilderDelegate((context, index) {
+            final track = discTracks[index];
+            return KeyedSubtree(
+              key: ValueKey(track.id),
+              child: _buildTrackItem(context, colorScheme, track),
+            );
+          }, childCount: discTracks.length),
         ),
       );
     }
@@ -815,6 +820,11 @@ 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' ||
@@ -828,6 +838,12 @@ 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,
@@ -897,6 +913,128 @@ 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>[];
@@ -1005,8 +1143,57 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
     BuildContext context,
     List<LocalLibraryItem> allTracks,
   ) {
-    String selectedFormat = 'MP3';
-    String selectedBitrate = '320k';
+    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');
 
     showModalBottomSheet(
       context: context,
@@ -1018,7 +1205,6 @@ 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(
@@ -1055,51 +1241,73 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
                       ),
                     ),
                     const SizedBox(height: 8),
-                    Row(
-                      children: formats.map((format) {
-                        final isSelected = format == selectedFormat;
-                        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;
+                      children: formats.map((format) {
+                        final isSelected = format == selectedFormat;
                         return ChoiceChip(
-                          label: Text(br),
+                          label: Text(format),
                           selected: isSelected,
                           onSelected: (selected) {
                             if (selected) {
-                              setSheetState(() => selectedBitrate = br);
+                              setSheetState(() {
+                                selectedFormat = format;
+                                isLosslessTarget =
+                                    format == 'ALAC' || format == 'FLAC';
+                                if (!isLosslessTarget) {
+                                  selectedBitrate = format == 'Opus'
+                                      ? '128k'
+                                      : '320k';
+                                }
+                              });
                             }
                           },
                         );
                       }).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,
@@ -1152,6 +1360,8 @@ 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') {
@@ -1163,15 +1373,21 @@ 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) {
-        selected.add(item);
-      }
+      if (currentFormat == null || currentFormat == targetFormat) continue;
+      // Skip lossy sources when target is lossless (pointless re-encoding)
+      final isLosslessTarget = targetFormat == 'ALAC' || targetFormat == 'FLAC';
+      final isLosslessSource =
+          currentFormat == 'FLAC' || currentFormat == 'M4A';
+      if (isLosslessTarget && !isLosslessSource) continue;
+      selected.add(item);
     }
 
     if (selected.isEmpty) {
@@ -1183,16 +1399,22 @@ 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(
-          context.l10n.selectionBatchConvertConfirmMessage(
-            selected.length,
-            targetFormat,
-            bitrate,
-          ),
+          isLossless
+              ? context.l10n.selectionBatchConvertConfirmMessageLossless(
+                  selected.length,
+                  targetFormat,
+                )
+              : context.l10n.selectionBatchConvertConfirmMessage(
+                  selected.length,
+                  targetFormat,
+                  bitrate,
+                ),
         ),
         actions: [
           TextButton(
@@ -1239,12 +1461,7 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
         try {
           final result = await PlatformBridge.readFileMetadata(item.filePath);
           if (result['error'] == null) {
-            result.forEach((key, value) {
-              if (key == 'error' || value == null) return;
-              final v = value.toString().trim();
-              if (v.isEmpty) return;
-              metadata[key.toUpperCase()] = v;
-            });
+            mergePlatformMetadataForTagEmbed(target: metadata, source: result);
           }
         } catch (_) {}
         await ensureLyricsMetadataForConversion(
@@ -1357,13 +1574,27 @@ class _LocalAlbumScreenState extends ConsumerState<LocalAlbumScreen> {
             final baseName = dotIdx > 0
                 ? oldFileName.substring(0, dotIdx)
                 : oldFileName;
-            final newExt = targetFormat.toLowerCase() == 'opus'
-                ? '.opus'
-                : '.mp3';
+            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 newFileName = '$baseName$newExt';
-            final mimeType = targetFormat.toLowerCase() == 'opus'
-                ? 'audio/opus'
-                : 'audio/mpeg';
 
             final safUri = await PlatformBridge.createSafFileFromPath(
               treeUri: treeUri,
@@ -1434,6 +1665,7 @@ 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(
@@ -1525,6 +1757,18 @@ 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,

lib/screens/main_shell.dart

@@ -83,7 +83,6 @@ class _MainShellState extends ConsumerState<MainShell> {
     final extState = ref.read(extensionProvider);
     if (!extState.isInitialized) {
       _log.d('Waiting for extensions to initialize before handling URL...');
-      // Wait up to 5 seconds for extensions to initialize
       for (int i = 0; i < 50; i++) {
         await Future.delayed(const Duration(milliseconds: 100));
         if (!mounted) return;

lib/screens/playlist_screen.dart

@@ -8,6 +8,7 @@ import 'package:spotiflac_android/models/track.dart';
 import 'package:spotiflac_android/providers/download_queue_provider.dart';
 import 'package:spotiflac_android/providers/library_collections_provider.dart';
 import 'package:spotiflac_android/utils/file_access.dart';
+import 'package:spotiflac_android/utils/string_utils.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/providers/local_library_provider.dart';
 import 'package:spotiflac_android/providers/playback_provider.dart';
@@ -128,7 +129,9 @@ class _PlaylistScreenState extends ConsumerState<PlaylistScreen> {
       albumArtist: data['album_artist']?.toString(),
       artistId: (data['artist_id'] ?? data['artistId'])?.toString(),
       albumId: data['album_id']?.toString(),
-      coverUrl: (data['cover_url'] ?? data['images'])?.toString(),
+      coverUrl: normalizeCoverReference(
+        (data['cover_url'] ?? data['images'])?.toString(),
+      ),
       isrc: data['isrc']?.toString(),
       duration: (durationMs / 1000).round(),
       trackNumber: data['track_number'] as int?,
@@ -350,7 +353,6 @@ class _PlaylistScreenState extends ConsumerState<PlaylistScreen> {
   }
 
   Widget _buildInfoCard(BuildContext context, ColorScheme colorScheme) {
-    // Info is now displayed in the full-screen cover overlay
     return const SliverToBoxAdapter(child: SizedBox.shrink());
   }
 
@@ -533,7 +535,12 @@ class _PlaylistScreenState extends ConsumerState<PlaylistScreen> {
       tooltip: context.l10n.tooltipAddToPlaylist,
       onPressed: _tracks.isEmpty
           ? null
-          : () => showAddTracksToPlaylistSheet(context, ref, _tracks),
+          : () => showAddTracksToPlaylistSheet(
+              context,
+              ref,
+              _tracks,
+              playlistNamePrefill: widget.playlistName,
+            ),
     );
   }
 
@@ -608,45 +615,86 @@ class _PlaylistScreenState extends ConsumerState<PlaylistScreen> {
 
   void _downloadTracks(BuildContext context, List<Track> tracks) {
     if (tracks.isEmpty) return;
+
+    // Skip already-downloaded tracks
+    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: '${tracks.length} tracks',
+        trackName: '${tracksToQueue.length} tracks',
         artistName: _playlistName,
         onSelect: (quality, service) {
           ref
               .read(downloadQueueProvider.notifier)
               .addMultipleToQueue(
-                tracks,
+                tracksToQueue,
                 service,
                 qualityOverride: quality,
                 playlistName: _playlistName,
               );
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(
-                context.l10n.snackbarAddedTracksToQueue(tracks.length),
-              ),
-            ),
-          );
+          _showQueuedSnackbar(context, tracksToQueue.length, skippedCount);
         },
       );
     } else {
       ref
           .read(downloadQueueProvider.notifier)
           .addMultipleToQueue(
-            tracks,
+            tracksToQueue,
             settings.defaultService,
             playlistName: _playlistName,
           );
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(context.l10n.snackbarAddedTracksToQueue(tracks.length)),
-        ),
-      );
+      _showQueuedSnackbar(context, tracksToQueue.length, skippedCount);
     }
   }
+
+  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)));
+  }
 }
 
 /// Separate Consumer widget for each track - only rebuilds when this specific track's status changes

lib/screens/queue_tab.dart

@@ -17,11 +17,13 @@ import 'package:spotiflac_android/utils/lyrics_metadata_helper.dart';
 import 'package:spotiflac_android/models/download_item.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/library_collections_provider.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/providers/local_library_provider.dart';
 import 'package:spotiflac_android/providers/playback_provider.dart';
 import 'package:spotiflac_android/services/library_database.dart';
+import 'package:spotiflac_android/services/local_track_redownload_service.dart';
 import 'package:spotiflac_android/services/history_database.dart';
 import 'package:spotiflac_android/services/downloaded_embedded_cover_resolver.dart';
 import 'package:spotiflac_android/screens/track_metadata_screen.dart';
@@ -31,6 +33,7 @@ import 'package:spotiflac_android/screens/local_album_screen.dart';
 import 'package:spotiflac_android/utils/clickable_metadata.dart';
 import 'package:spotiflac_android/utils/path_match_keys.dart';
 import 'package:spotiflac_android/utils/string_utils.dart';
+import 'package:spotiflac_android/widgets/download_service_picker.dart';
 
 enum LibraryItemSource { downloaded, local }
 
@@ -1314,6 +1317,94 @@ class _QueueTabState extends ConsumerState<QueueTab> {
     });
   }
 
+  Future<void> _downloadAllSelectedPlaylists(BuildContext context) async {
+    final collectionsState = ref.read(libraryCollectionsProvider);
+    final selectedPlaylists = collectionsState.playlists
+        .where((p) => _selectedPlaylistIds.contains(p.id))
+        .toList();
+
+    final totalTracks = selectedPlaylists.fold<int>(
+      0,
+      (sum, p) => sum + p.tracks.length,
+    );
+
+    if (totalTracks == 0) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(context.l10n.snackbarSelectedPlaylistsEmpty)),
+      );
+      return;
+    }
+
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: Text(ctx.l10n.dialogDownloadAllTitle),
+        content: Text(
+          ctx.l10n.dialogDownloadPlaylistsMessage(
+            totalTracks,
+            selectedPlaylists.length,
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(ctx, false),
+            child: Text(ctx.l10n.dialogCancel),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.pop(ctx, true),
+            child: Text(ctx.l10n.dialogDownload),
+          ),
+        ],
+      ),
+    );
+
+    if (confirmed != true || !context.mounted) return;
+
+    final settings = ref.read(settingsProvider);
+    final queueNotifier = ref.read(downloadQueueProvider.notifier);
+
+    void enqueueAll({String? qualityOverride, String? service}) {
+      final svc = service ?? settings.defaultService;
+      for (final playlist in selectedPlaylists) {
+        final tracks = playlist.tracks.map((e) => e.track).toList();
+        queueNotifier.addMultipleToQueue(
+          tracks,
+          svc,
+          qualityOverride: qualityOverride,
+          playlistName: playlist.name,
+        );
+      }
+    }
+
+    if (settings.askQualityBeforeDownload) {
+      DownloadServicePicker.show(
+        context,
+        trackName: context.l10n.tracksCount(totalTracks),
+        artistName: context.l10n.playlistsCount(selectedPlaylists.length),
+        onSelect: (quality, service) {
+          enqueueAll(qualityOverride: quality, service: service);
+          if (!mounted) return;
+          _exitPlaylistSelectionMode();
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(
+                context.l10n.snackbarAddedTracksToQueue(totalTracks),
+              ),
+            ),
+          );
+        },
+      );
+    } else {
+      enqueueAll();
+      _exitPlaylistSelectionMode();
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(context.l10n.snackbarAddedTracksToQueue(totalTracks)),
+        ),
+      );
+    }
+  }
+
   Future<void> _deleteSelectedPlaylists(BuildContext context) async {
     final count = _selectedPlaylistIds.length;
     final confirmed = await showDialog<bool>(
@@ -1452,6 +1543,37 @@ class _QueueTabState extends ConsumerState<QueueTab> {
 
               const SizedBox(height: 12),
 
+              SizedBox(
+                width: double.infinity,
+                child: FilledButton.icon(
+                  onPressed: selectedCount > 0
+                      ? () => _downloadAllSelectedPlaylists(context)
+                      : null,
+                  icon: const Icon(Icons.download_rounded),
+                  label: Text(
+                    selectedCount > 0
+                        ? context.l10n.bulkDownloadPlaylistsButton(
+                            selectedCount,
+                          )
+                        : context.l10n.bulkDownloadSelectPlaylists,
+                  ),
+                  style: FilledButton.styleFrom(
+                    backgroundColor: selectedCount > 0
+                        ? colorScheme.primary
+                        : colorScheme.surfaceContainerHighest,
+                    foregroundColor: selectedCount > 0
+                        ? colorScheme.onPrimary
+                        : colorScheme.onSurfaceVariant,
+                    padding: const EdgeInsets.symmetric(vertical: 16),
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(16),
+                    ),
+                  ),
+                ),
+              ),
+
+              const SizedBox(height: 8),
+
               SizedBox(
                 width: double.infinity,
                 child: FilledButton.icon(
@@ -4278,6 +4400,11 @@ class _QueueTabState extends ConsumerState<QueueTab> {
     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' ||
@@ -4291,6 +4418,12 @@ class _QueueTabState extends ConsumerState<QueueTab> {
         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,
@@ -4362,6 +4495,132 @@ class _QueueTabState extends ConsumerState<QueueTab> {
     return false;
   }
 
+  List<LocalLibraryItem> _selectedFlacEligibleLocalItems(
+    List<UnifiedLibraryItem> allItems,
+  ) {
+    final selectedItems = _selectedItemsFromAll(allItems);
+    return selectedItems
+        .map((item) => item.localItem)
+        .whereType<LocalLibraryItem>()
+        .where(LocalTrackRedownloadService.isFlacUpgradeEligible)
+        .toList(growable: false);
+  }
+
+  Future<void> _queueSelectedLocalAsFlac(
+    List<UnifiedLibraryItem> allItems,
+  ) async {
+    final selectedLocalItems = _selectedFlacEligibleLocalItems(allItems);
+
+    if (selectedLocalItems.isEmpty) {
+      return;
+    }
+
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: Text(context.l10n.queueFlacAction),
+        content: Text(
+          context.l10n.queueFlacConfirmMessage(selectedLocalItems.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 = selectedLocalItems.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(
+          selectedLocalItems[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> _reEnrichSelectedLocalFromQueue(
     List<UnifiedLibraryItem> allItems,
   ) async {
@@ -4512,8 +4771,51 @@ class _QueueTabState extends ConsumerState<QueueTab> {
     BuildContext context,
     List<UnifiedLibraryItem> allItems,
   ) async {
-    String selectedFormat = 'MP3';
-    String selectedBitrate = '320k';
+    final itemsById = {for (final item in allItems) item.id: item};
+    final sourceFormats = <String>{};
+    for (final id in _selectedIds) {
+      final item = itemsById[id];
+      if (item == null) continue;
+      String nameToCheck;
+      if (item.historyItem?.safFileName != null &&
+          item.historyItem!.safFileName!.isNotEmpty) {
+        nameToCheck = item.historyItem!.safFileName!.toLowerCase();
+      } else if (item.localItem?.format != null &&
+          item.localItem!.format!.isNotEmpty) {
+        nameToCheck = '.${item.localItem!.format!.toLowerCase()}';
+      } else {
+        nameToCheck = 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');
     var didStartConversion = false;
 
     _hideSelectionOverlay();
@@ -4529,7 +4831,6 @@ class _QueueTabState extends ConsumerState<QueueTab> {
         return StatefulBuilder(
           builder: (context, setSheetState) {
             final colorScheme = Theme.of(context).colorScheme;
-            final formats = ['MP3', 'Opus'];
             final bitrates = ['128k', '192k', '256k', '320k'];
 
             return SafeArea(
@@ -4566,51 +4867,73 @@ class _QueueTabState extends ConsumerState<QueueTab> {
                       ),
                     ),
                     const SizedBox(height: 8),
-                    Row(
-                      children: formats.map((format) {
-                        final isSelected = format == selectedFormat;
-                        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;
+                      children: formats.map((format) {
+                        final isSelected = format == selectedFormat;
                         return ChoiceChip(
-                          label: Text(br),
+                          label: Text(format),
                           selected: isSelected,
                           onSelected: (selected) {
                             if (selected) {
-                              setSheetState(() => selectedBitrate = br);
+                              setSheetState(() {
+                                selectedFormat = format;
+                                isLosslessTarget =
+                                    format == 'ALAC' || format == 'FLAC';
+                                if (!isLosslessTarget) {
+                                  selectedBitrate = format == 'Opus'
+                                      ? '128k'
+                                      : '320k';
+                                }
+                              });
                             }
                           },
                         );
                       }).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,
@@ -4686,14 +5009,19 @@ class _QueueTabState extends ConsumerState<QueueTab> {
       }
       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) {
-        selectedItems.add(item);
-      }
+      if (ext == null || ext == targetFormat) continue;
+      // Skip lossy sources when target is lossless (pointless re-encoding)
+      final isLosslessTarget = targetFormat == 'ALAC' || targetFormat == 'FLAC';
+      final isLosslessSource = ext == 'FLAC' || ext == 'M4A';
+      if (isLosslessTarget && !isLosslessSource) continue;
+      selectedItems.add(item);
     }
 
     if (selectedItems.isEmpty) {
@@ -4706,16 +5034,22 @@ class _QueueTabState extends ConsumerState<QueueTab> {
     }
 
     // Confirm
+    final isLossless = targetFormat == 'ALAC' || targetFormat == 'FLAC';
     final confirmed = await showDialog<bool>(
       context: context,
       builder: (ctx) => AlertDialog(
         title: Text(context.l10n.selectionBatchConvertConfirmTitle),
         content: Text(
-          context.l10n.selectionBatchConvertConfirmMessage(
-            selectedItems.length,
-            targetFormat,
-            bitrate,
-          ),
+          isLossless
+              ? context.l10n.selectionBatchConvertConfirmMessageLossless(
+                  selectedItems.length,
+                  targetFormat,
+                )
+              : context.l10n.selectionBatchConvertConfirmMessage(
+                  selectedItems.length,
+                  targetFormat,
+                  bitrate,
+                ),
         ),
         actions: [
           TextButton(
@@ -4736,7 +5070,10 @@ class _QueueTabState extends ConsumerState<QueueTab> {
     final total = selectedItems.length;
     final historyDb = HistoryDatabase.instance;
     final newQuality =
-        '${targetFormat.toUpperCase()} ${bitrate.trim().toLowerCase()}';
+        (targetFormat.toUpperCase() == 'ALAC' ||
+            targetFormat.toUpperCase() == 'FLAC')
+        ? '${targetFormat.toUpperCase()} Lossless'
+        : '${targetFormat.toUpperCase()} ${bitrate.trim().toLowerCase()}';
     final settings = ref.read(settingsProvider);
     final shouldEmbedLyrics =
         settings.embedLyrics && settings.lyricsMode != 'external';
@@ -4756,7 +5093,6 @@ class _QueueTabState extends ConsumerState<QueueTab> {
       );
 
       try {
-        // Read metadata from file
         final metadata = <String, String>{
           'TITLE': item.trackName,
           'ARTIST': item.artistName,
@@ -4765,12 +5101,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {
         try {
           final result = await PlatformBridge.readFileMetadata(item.filePath);
           if (result['error'] == null) {
-            result.forEach((key, value) {
-              if (key == 'error' || value == null) return;
-              final v = value.toString().trim();
-              if (v.isEmpty) return;
-              metadata[key.toUpperCase()] = v;
-            });
+            mergePlatformMetadataForTagEmbed(target: metadata, source: result);
           }
         } catch (_) {}
         await ensureLyricsMetadataForConversion(
@@ -4785,7 +5116,6 @@ class _QueueTabState extends ConsumerState<QueueTab> {
               1000,
         );
 
-        // Extract cover art
         String? coverPath;
         try {
           final tempDir = await getTemporaryDirectory();
@@ -4800,7 +5130,6 @@ class _QueueTabState extends ConsumerState<QueueTab> {
           }
         } catch (_) {}
 
-        // Handle SAF vs regular file
         String workingPath = item.filePath;
         final isSaf = isContentUri(item.filePath);
         String? safTempPath;
@@ -4813,7 +5142,6 @@ class _QueueTabState extends ConsumerState<QueueTab> {
           workingPath = safTempPath;
         }
 
-        // Convert
         final newPath = await FFmpegService.convertAudioFormat(
           inputPath: workingPath,
           targetFormat: targetFormat.toLowerCase(),
@@ -4823,7 +5151,6 @@ class _QueueTabState extends ConsumerState<QueueTab> {
           deleteOriginal: !isSaf,
         );
 
-        // Cleanup cover temp
         if (coverPath != null) {
           try {
             await File(coverPath).delete();
@@ -4850,13 +5177,27 @@ class _QueueTabState extends ConsumerState<QueueTab> {
             final baseName = dotIdx > 0
                 ? oldFileName.substring(0, dotIdx)
                 : oldFileName;
-            final newExt = targetFormat.toLowerCase() == 'opus'
-                ? '.opus'
-                : '.mp3';
+            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 newFileName = '$baseName$newExt';
-            final mimeType = targetFormat.toLowerCase() == 'opus'
-                ? 'audio/opus'
-                : 'audio/mpeg';
 
             final safUri = await PlatformBridge.createSafFileFromPath(
               treeUri: treeUri,
@@ -5040,6 +5381,9 @@ class _QueueTabState extends ConsumerState<QueueTab> {
     final allSelected =
         selectedCount == unifiedItems.length && unifiedItems.isNotEmpty;
     final localOnlySelection = _isLocalOnlySelection(unifiedItems);
+    final flacEligibleCount = _selectedFlacEligibleLocalItems(
+      unifiedItems,
+    ).length;
 
     return Container(
       decoration: BoxDecoration(
@@ -5129,6 +5473,19 @@ class _QueueTabState extends ConsumerState<QueueTab> {
               // Action buttons row: Share/Re-enrich, Convert, Delete
               Row(
                 children: [
+                  if (localOnlySelection && flacEligibleCount > 0) ...[
+                    Expanded(
+                      child: _SelectionActionButton(
+                        icon: Icons.download_for_offline_outlined,
+                        label:
+                            '${context.l10n.queueFlacAction} ($flacEligibleCount)',
+                        onPressed: () =>
+                            _queueSelectedLocalAsFlac(unifiedItems),
+                        colorScheme: colorScheme,
+                      ),
+                    ),
+                    const SizedBox(width: 8),
+                  ],
                   Expanded(
                     child: _SelectionActionButton(
                       icon: localOnlySelection

lib/screens/settings/about_page.dart

@@ -511,6 +511,30 @@ class _TranslatorsSection extends StatelessWidget {
       language: 'Japanese',
       flag: '🇯🇵',
     ),
+    _Translator(
+      name: 'unkn0wn',
+      crowdinUsername: 'rdclvi',
+      language: 'Indonesian',
+      flag: '🇮🇩',
+    ),
+    _Translator(
+      name: 'lunching1272',
+      crowdinUsername: 'lunching1272',
+      language: 'Chinese Simplified',
+      flag: '🇨🇳',
+    ),
+    _Translator(
+      name: 'Сергей Ильченко',
+      crowdinUsername: 'Sega_Mostky',
+      language: 'Russian',
+      flag: '🇷🇺',
+    ),
+    _Translator(
+      name: 'Girl-lass',
+      crowdinUsername: 'Girl-lass',
+      language: 'Chinese Simplified',
+      flag: '🇨🇳',
+    ),
     _Translator(
       name: 'Kaan',
       crowdinUsername: 'glai',

lib/screens/settings/donate_page.dart

@@ -164,7 +164,13 @@ class _RecentDonorsCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final isDark = Theme.of(context).brightness == Brightness.dark;
-    const donorNames = <String>['a fan'];
+    const donorNames = <String>[
+      'McNuggets Jimmy',
+      'zcc09',
+      'micahRichie',
+      'a fan',
+      'CJBGR',
+    ];
 
     // Match SettingsGroup color logic
     final cardColor = isDark
@@ -479,32 +485,78 @@ int _cr(String v) {
   return r;
 }
 
-// Highlighted supporters (hashes of names): none for now.
-const _cv = <int>{};
+// Highlighted supporters (hashes of names).
+const _cv = <int>{1211573191, 1003219236};
 
-class _SupporterChip extends StatelessWidget {
+// Diamond tier supporters ($50+ donors).
+const _dv = <int>{560908930};
+
+enum _SupporterTier { normal, gold, diamond }
+
+_SupporterTier _tierOf(String name) {
+  final h = _cr(name);
+  if (_dv.contains(h)) return _SupporterTier.diamond;
+  if (_cv.contains(h)) return _SupporterTier.gold;
+  return _SupporterTier.normal;
+}
+
+class _SupporterChip extends StatefulWidget {
   final String name;
   final ColorScheme colorScheme;
 
   const _SupporterChip({required this.name, required this.colorScheme});
 
+  @override
+  State<_SupporterChip> createState() => _SupporterChipState();
+}
+
+class _SupporterChipState extends State<_SupporterChip>
+    with SingleTickerProviderStateMixin {
+  late final _SupporterTier _tier;
+  AnimationController? _shimmerController;
+
+  @override
+  void initState() {
+    super.initState();
+    _tier = _tierOf(widget.name);
+    if (_tier == _SupporterTier.diamond) {
+      _shimmerController = AnimationController(
+        vsync: this,
+        duration: const Duration(milliseconds: 2400),
+      )..repeat();
+    }
+  }
+
+  @override
+  void dispose() {
+    _shimmerController?.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
-    final e = _cv.contains(_cr(name));
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+
+    if (_tier == _SupporterTier.diamond) {
+      return _buildDiamondChip(isDark);
+    }
+
+    final isGold = _tier == _SupporterTier.gold;
     const goldChipColor = Color(0xFFFFF8DC);
     const goldAccentColor = Color(0xFFB8860B);
     const goldDarkChipColor = Color(0xFF3A3000);
 
-    final chipColor = e ? goldChipColor : colorScheme.secondaryContainer;
-    final accentColor = e ? goldAccentColor : colorScheme.primary;
-    final isDark = Theme.of(context).brightness == Brightness.dark;
-    final effectiveChipColor = e && isDark ? goldDarkChipColor : chipColor;
+    final chipColor = isGold
+        ? goldChipColor
+        : widget.colorScheme.secondaryContainer;
+    final accentColor = isGold ? goldAccentColor : widget.colorScheme.primary;
+    final effectiveChipColor = isGold && isDark ? goldDarkChipColor : chipColor;
 
     return Material(
       color: effectiveChipColor,
       borderRadius: BorderRadius.circular(20),
       child: Container(
-        decoration: e
+        decoration: isGold
             ? BoxDecoration(
                 borderRadius: BorderRadius.circular(20),
                 border: Border.all(
@@ -520,10 +572,12 @@ class _SupporterChip extends StatelessWidget {
             CircleAvatar(
               radius: 10,
               backgroundColor: accentColor.withValues(alpha: 0.2),
-              child: e
+              child: isGold
                   ? Icon(Icons.star_rounded, size: 12, color: accentColor)
                   : Text(
-                      name.isNotEmpty ? name[0].toUpperCase() : '?',
+                      widget.name.isNotEmpty
+                          ? widget.name[0].toUpperCase()
+                          : '?',
                       style: TextStyle(
                         fontSize: 10,
                         fontWeight: FontWeight.bold,
@@ -533,10 +587,12 @@ class _SupporterChip extends StatelessWidget {
             ),
             const SizedBox(width: 8),
             Text(
-              name,
+              widget.name,
               style: Theme.of(context).textTheme.labelLarge?.copyWith(
-                color: e ? accentColor : colorScheme.onSecondaryContainer,
-                fontWeight: e ? FontWeight.w600 : FontWeight.w500,
+                color: isGold
+                    ? accentColor
+                    : widget.colorScheme.onSecondaryContainer,
+                fontWeight: isGold ? FontWeight.w600 : FontWeight.w500,
               ),
             ),
           ],
@@ -544,6 +600,92 @@ class _SupporterChip extends StatelessWidget {
       ),
     );
   }
+
+  Widget _buildDiamondChip(bool isDark) {
+    const diamondLight = Color(0xFFE8F4FD);
+    const diamondDark = Color(0xFF0D2B3E);
+    const diamondAccent = Color(0xFF4FC3F7);
+    const diamondHighlight = Color(0xFFB3E5FC);
+
+    final chipBg = isDark ? diamondDark : diamondLight;
+
+    return AnimatedBuilder(
+      animation: _shimmerController!,
+      builder: (context, child) {
+        final t = _shimmerController!.value;
+        return Material(
+          color: Colors.transparent,
+          borderRadius: BorderRadius.circular(20),
+          child: Container(
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(20),
+              gradient: LinearGradient(
+                begin: Alignment(-2.0 + 4.0 * t, 0.0),
+                end: Alignment(-1.0 + 4.0 * t, 0.0),
+                colors: [
+                  chipBg,
+                  isDark
+                      ? diamondAccent.withValues(alpha: 0.18)
+                      : diamondHighlight.withValues(alpha: 0.7),
+                  chipBg,
+                ],
+                stops: const [0.0, 0.5, 1.0],
+              ),
+              border: Border.all(
+                color: diamondAccent.withValues(
+                  alpha: 0.5 + 0.3 * (0.5 - (t - 0.5).abs()),
+                ),
+                width: 1.2,
+              ),
+              boxShadow: [
+                BoxShadow(
+                  color: diamondAccent.withValues(
+                    alpha: 0.15 + 0.1 * (0.5 - (t - 0.5).abs()),
+                  ),
+                  blurRadius: 8,
+                  spreadRadius: 0,
+                ),
+              ],
+            ),
+            padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Container(
+                  width: 20,
+                  height: 20,
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    gradient: LinearGradient(
+                      begin: Alignment.topLeft,
+                      end: Alignment.bottomRight,
+                      colors: [
+                        diamondAccent.withValues(alpha: 0.3),
+                        diamondAccent.withValues(alpha: 0.15),
+                      ],
+                    ),
+                  ),
+                  child: const Icon(
+                    Icons.diamond_rounded,
+                    size: 12,
+                    color: diamondAccent,
+                  ),
+                ),
+                const SizedBox(width: 8),
+                Text(
+                  widget.name,
+                  style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                    color: isDark ? diamondHighlight : diamondAccent,
+                    fontWeight: FontWeight.w700,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
 }
 
 class _NoticeLine extends StatelessWidget {

lib/screens/settings/download_settings_page.dart

@@ -6,6 +6,7 @@ import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:spotiflac_android/l10n/l10n.dart';
+import 'package:spotiflac_android/models/settings.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/providers/extension_provider.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
@@ -410,11 +411,12 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
                           .setAudioQuality('HI_RES_LOSSLESS'),
                       showDivider: isTidalService,
                     ),
-                    // Lossy 320kbps option (Tidal only) - downloads M4A, converts to MP3/Opus
+                    // Lossy 320kbps option (Tidal only) - downloads M4A AAC from server, converts to MP3/Opus
                     if (isTidalService)
                       _QualityOption(
                         title: context.l10n.downloadLossy320,
                         subtitle: _getTidalHighFormatLabel(
+                          context,
                           settings.tidalHighFormat,
                         ),
                         isSelected: settings.audioQuality == 'HIGH',
@@ -428,6 +430,7 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
                         icon: Icons.tune,
                         title: context.l10n.downloadLossyFormat,
                         subtitle: _getTidalHighFormatLabel(
+                          context,
                           settings.tidalHighFormat,
                         ),
                         onTap: () => _showTidalHighFormatPicker(
@@ -464,12 +467,13 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
                   ],
                   SettingsItem(
                     title: context.l10n.youtubeOpusBitrateTitle,
-                    subtitle: '${settings.youtubeOpusBitrate}kbps (128/256)',
+                    subtitle:
+                        '${settings.youtubeOpusBitrate}kbps (128/256/320)',
                     onTap: () => _showYoutubeBitratePicker(
                       context: context,
                       title: context.l10n.youtubeOpusBitrateTitle,
                       currentValue: settings.youtubeOpusBitrate,
-                      options: const [128, 256],
+                      options: const [128, 256, 320],
                       onSave: (value) => ref
                           .read(settingsProvider.notifier)
                           .setYoutubeOpusBitrate(value),
@@ -543,8 +547,12 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
                       icon: Icons.translate_outlined,
                       title: context.l10n.downloadNeteaseIncludeTranslation,
                       subtitle: settings.lyricsIncludeTranslationNetease
-                          ? context.l10n.downloadNeteaseIncludeTranslationEnabled
-                          : context.l10n.downloadNeteaseIncludeTranslationDisabled,
+                          ? context
+                                .l10n
+                                .downloadNeteaseIncludeTranslationEnabled
+                          : context
+                                .l10n
+                                .downloadNeteaseIncludeTranslationDisabled,
                       value: settings.lyricsIncludeTranslationNetease,
                       onChanged: (value) => ref
                           .read(settingsProvider.notifier)
@@ -554,8 +562,12 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
                       icon: Icons.text_fields_outlined,
                       title: context.l10n.downloadNeteaseIncludeRomanization,
                       subtitle: settings.lyricsIncludeRomanizationNetease
-                          ? context.l10n.downloadNeteaseIncludeRomanizationEnabled
-                          : context.l10n.downloadNeteaseIncludeRomanizationDisabled,
+                          ? context
+                                .l10n
+                                .downloadNeteaseIncludeRomanizationEnabled
+                          : context
+                                .l10n
+                                .downloadNeteaseIncludeRomanizationDisabled,
                       value: settings.lyricsIncludeRomanizationNetease,
                       onChanged: (value) => ref
                           .read(settingsProvider.notifier)
@@ -655,6 +667,15 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
                         settings.folderOrganization,
                       ),
                     ),
+                  SettingsSwitchItem(
+                    icon: Icons.playlist_play_outlined,
+                    title: context.l10n.downloadCreatePlaylistSourceFolder,
+                    subtitle: _getPlaylistFolderSubtitle(settings),
+                    value: settings.createPlaylistFolder,
+                    onChanged: (value) => ref
+                        .read(settingsProvider.notifier)
+                        .setCreatePlaylistFolder(value),
+                  ),
                   SettingsSwitchItem(
                     icon: Icons.person_search_outlined,
                     title: context.l10n.downloadUseAlbumArtistForFolders,
@@ -670,7 +691,7 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
                         .read(settingsProvider.notifier)
                         .setUseAlbumArtistForFolders(value),
                   ),
-                    SettingsItem(
+                  SettingsItem(
                     icon: Icons.filter_alt_outlined,
                     title: context.l10n.downloadArtistNameFilters,
                     subtitle: _getArtistFolderFilterSubtitle(
@@ -1170,7 +1191,7 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
   Future<void> _pickDirectory(BuildContext context, WidgetRef ref) async {
     if (Platform.isIOS) {
       _showIOSDirectoryOptions(context, ref);
-    } else {
+    } else if (Platform.isAndroid) {
       _showAndroidDirectoryOptions(context, ref);
     }
   }
@@ -1338,8 +1359,27 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
               subtitle: Text(context.l10n.setupChooseFromFilesSubtitle),
               onTap: () async {
                 Navigator.pop(ctx);
+                if (Platform.isIOS) {
+                  await Future<void>.delayed(const Duration(milliseconds: 250));
+                }
+
                 // Note: iOS requires folder to have at least one file to be selectable
-                final result = await FilePicker.platform.getDirectoryPath();
+                String? result;
+                try {
+                  result = await FilePicker.platform.getDirectoryPath();
+                } catch (e) {
+                  if (ctx.mounted) {
+                    ScaffoldMessenger.of(ctx).showSnackBar(
+                      SnackBar(
+                        content: Text('Failed to open folder picker: $e'),
+                        backgroundColor: Theme.of(ctx).colorScheme.error,
+                        duration: const Duration(seconds: 4),
+                      ),
+                    );
+                  }
+                  return;
+                }
+
                 if (result != null) {
                   // iOS: Validate the selected path is writable (not iCloud or container root)
                   if (Platform.isIOS) {
@@ -1416,6 +1456,16 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
     }
   }
 
+  String _getPlaylistFolderSubtitle(AppSettings settings) {
+    if (settings.folderOrganization == 'playlist') {
+      return context.l10n.downloadCreatePlaylistSourceFolderRedundant;
+    }
+    if (settings.createPlaylistFolder) {
+      return context.l10n.downloadCreatePlaylistSourceFolderEnabled;
+    }
+    return context.l10n.downloadCreatePlaylistSourceFolderDisabled;
+  }
+
   String _getArtistFolderFilterSubtitle(
     BuildContext context, {
     required bool usePrimaryArtistOnly,
@@ -1541,6 +1591,104 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
     return normalized.replaceAll(RegExp(r'[^a-z0-9\-_]'), '');
   }
 
+  String _getTidalHighFormatLabel(BuildContext context, String format) {
+    switch (format) {
+      case 'mp3_320':
+        return context.l10n.downloadLossyMp3;
+      case 'opus_256':
+        return context.l10n.downloadLossyOpus256;
+      case 'opus_128':
+        return context.l10n.downloadLossyOpus128;
+      default:
+        return context.l10n.downloadLossyMp3;
+    }
+  }
+
+  void _showTidalHighFormatPicker(
+    BuildContext context,
+    WidgetRef ref,
+    String current,
+  ) {
+    final colorScheme = Theme.of(context).colorScheme;
+    showModalBottomSheet(
+      context: context,
+      useRootNavigator: true,
+      backgroundColor: colorScheme.surfaceContainerHigh,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(28)),
+      ),
+      builder: (context) => SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Padding(
+              padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
+              child: Text(
+                context.l10n.downloadLossy320Format,
+                style: Theme.of(
+                  context,
+                ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.fromLTRB(24, 0, 24, 16),
+              child: Text(
+                context.l10n.downloadLossy320FormatDesc,
+                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                  color: colorScheme.onSurfaceVariant,
+                ),
+              ),
+            ),
+            ListTile(
+              leading: const Icon(Icons.audiotrack),
+              title: Text(context.l10n.downloadLossyMp3),
+              subtitle: Text(context.l10n.downloadLossyMp3Subtitle),
+              trailing: current == 'mp3_320'
+                  ? Icon(Icons.check, color: colorScheme.primary)
+                  : null,
+              onTap: () {
+                ref
+                    .read(settingsProvider.notifier)
+                    .setTidalHighFormat('mp3_320');
+                Navigator.pop(context);
+              },
+            ),
+            ListTile(
+              leading: const Icon(Icons.graphic_eq),
+              title: Text(context.l10n.downloadLossyOpus256),
+              subtitle: Text(context.l10n.downloadLossyOpus256Subtitle),
+              trailing: current == 'opus_256'
+                  ? Icon(Icons.check, color: colorScheme.primary)
+                  : null,
+              onTap: () {
+                ref
+                    .read(settingsProvider.notifier)
+                    .setTidalHighFormat('opus_256');
+                Navigator.pop(context);
+              },
+            ),
+            ListTile(
+              leading: const Icon(Icons.graphic_eq),
+              title: Text(context.l10n.downloadLossyOpus128),
+              subtitle: Text(context.l10n.downloadLossyOpus128Subtitle),
+              trailing: current == 'opus_128'
+                  ? Icon(Icons.check, color: colorScheme.primary)
+                  : null,
+              onTap: () {
+                ref
+                    .read(settingsProvider.notifier)
+                    .setTidalHighFormat('opus_128');
+                Navigator.pop(context);
+              },
+            ),
+            const SizedBox(height: 16),
+          ],
+        ),
+      ),
+    );
+  }
+
   void _showYoutubeBitratePicker({
     required BuildContext context,
     required String title,
@@ -1691,104 +1839,6 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
     );
   }
 
-  String _getTidalHighFormatLabel(String format) {
-    switch (format) {
-      case 'mp3_320':
-        return 'MP3 320kbps';
-      case 'opus_256':
-        return 'Opus 256kbps';
-      case 'opus_128':
-        return 'Opus 128kbps';
-      default:
-        return 'MP3 320kbps';
-    }
-  }
-
-  void _showTidalHighFormatPicker(
-    BuildContext context,
-    WidgetRef ref,
-    String current,
-  ) {
-    final colorScheme = Theme.of(context).colorScheme;
-    showModalBottomSheet(
-      context: context,
-      useRootNavigator: true,
-      backgroundColor: colorScheme.surfaceContainerHigh,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(28)),
-      ),
-      builder: (context) => SafeArea(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
-              child: Text(
-                context.l10n.downloadLossy320Format,
-                style: Theme.of(
-                  context,
-                ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.fromLTRB(24, 0, 24, 16),
-              child: Text(
-                context.l10n.downloadLossy320FormatDesc,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                  color: colorScheme.onSurfaceVariant,
-                ),
-              ),
-            ),
-            ListTile(
-              leading: const Icon(Icons.audiotrack),
-              title: Text(context.l10n.downloadLossyMp3),
-              subtitle: Text(context.l10n.downloadLossyMp3Subtitle),
-              trailing: current == 'mp3_320'
-                  ? Icon(Icons.check, color: colorScheme.primary)
-                  : null,
-              onTap: () {
-                ref
-                    .read(settingsProvider.notifier)
-                    .setTidalHighFormat('mp3_320');
-                Navigator.pop(context);
-              },
-            ),
-            ListTile(
-              leading: const Icon(Icons.graphic_eq),
-              title: Text(context.l10n.downloadLossyOpus256),
-              subtitle: Text(context.l10n.downloadLossyOpus256Subtitle),
-              trailing: current == 'opus_256'
-                  ? Icon(Icons.check, color: colorScheme.primary)
-                  : null,
-              onTap: () {
-                ref
-                    .read(settingsProvider.notifier)
-                    .setTidalHighFormat('opus_256');
-                Navigator.pop(context);
-              },
-            ),
-            ListTile(
-              leading: const Icon(Icons.graphic_eq),
-              title: Text(context.l10n.downloadLossyOpus128),
-              subtitle: Text(context.l10n.downloadLossyOpus128Subtitle),
-              trailing: current == 'opus_128'
-                  ? Icon(Icons.check, color: colorScheme.primary)
-                  : null,
-              onTap: () {
-                ref
-                    .read(settingsProvider.notifier)
-                    .setTidalHighFormat('opus_128');
-                Navigator.pop(context);
-              },
-            ),
-            const SizedBox(height: 16),
-          ],
-        ),
-      ),
-    );
-  }
-
   void _showNetworkModePicker(
     BuildContext context,
     WidgetRef ref,
@@ -1883,17 +1933,17 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
             children: [
               Padding(
                 padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
-              child: Text(
-                context.l10n.downloadSongLinkRegion,
-                style: Theme.of(
-                  context,
-                ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+                child: Text(
+                  context.l10n.downloadSongLinkRegion,
+                  style: Theme.of(
+                    context,
+                  ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+                ),
               ),
-            ),
-            Padding(
-              padding: const EdgeInsets.fromLTRB(24, 0, 24, 16),
-              child: Text(
-                context.l10n.downloadSongLinkRegionDesc,
+              Padding(
+                padding: const EdgeInsets.fromLTRB(24, 0, 24, 16),
+                child: Text(
+                  context.l10n.downloadSongLinkRegionDesc,
                   style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                     color: colorScheme.onSurfaceVariant,
                   ),
@@ -1954,12 +2004,12 @@ class _DownloadSettingsPageState extends ConsumerState<DownloadSettingsPage> {
             children: [
               Padding(
                 padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
-              child: Text(
-                context.l10n.downloadFolderOrganization,
-                style: Theme.of(
-                  context,
-                ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
-              ),
+                child: Text(
+                  context.l10n.downloadFolderOrganization,
+                  style: Theme.of(
+                    context,
+                  ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+                ),
               ),
               Padding(
                 padding: const EdgeInsets.fromLTRB(24, 0, 24, 16),

lib/screens/settings/extensions_page.dart

@@ -5,6 +5,7 @@ import 'package:file_picker/file_picker.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:spotiflac_android/l10n/l10n.dart';
 import 'package:spotiflac_android/providers/extension_provider.dart';
+import 'package:spotiflac_android/providers/explore_provider.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/screens/settings/extension_detail_page.dart';
 import 'package:spotiflac_android/screens/settings/provider_priority_page.dart';
@@ -151,6 +152,7 @@ class _ExtensionsPageState extends ConsumerState<ExtensionsPage> {
                   _DownloadPriorityItem(),
                   _MetadataPriorityItem(),
                   _SearchProviderSelector(),
+                  _HomeFeedProviderSelector(),
                 ],
               ),
             ),
@@ -586,6 +588,8 @@ class _MetadataPriorityItem extends ConsumerWidget {
 class _SearchProviderSelector extends ConsumerWidget {
   const _SearchProviderSelector();
 
+  static const _builtInProviders = {'tidal': 'Tidal', 'qobuz': 'Qobuz'};
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final settings = ref.watch(settingsProvider);
@@ -596,20 +600,29 @@ class _SearchProviderSelector extends ConsumerWidget {
         .where((e) => e.enabled && e.hasCustomSearch)
         .toList();
 
+    // Always allow tapping: built-in providers are always available
+    final hasAnyProvider =
+        searchProviders.isNotEmpty || _builtInProviders.isNotEmpty;
+
     String currentProviderName = context.l10n.extensionDefaultProvider;
     if (settings.searchProvider != null &&
         settings.searchProvider!.isNotEmpty) {
-      final ext = searchProviders
-          .where((e) => e.id == settings.searchProvider)
-          .firstOrNull;
-      currentProviderName = ext?.displayName ?? settings.searchProvider!;
+      // Check built-in first
+      if (_builtInProviders.containsKey(settings.searchProvider)) {
+        currentProviderName = _builtInProviders[settings.searchProvider]!;
+      } else {
+        final ext = searchProviders
+            .where((e) => e.id == settings.searchProvider)
+            .firstOrNull;
+        currentProviderName = ext?.displayName ?? settings.searchProvider!;
+      }
     }
 
     return Column(
       mainAxisSize: MainAxisSize.min,
       children: [
         InkWell(
-          onTap: searchProviders.isEmpty
+          onTap: !hasAnyProvider
               ? null
               : () => _showSearchProviderPicker(
                   context,
@@ -623,7 +636,7 @@ class _SearchProviderSelector extends ConsumerWidget {
               children: [
                 Icon(
                   Icons.manage_search,
-                  color: searchProviders.isEmpty
+                  color: !hasAnyProvider
                       ? colorScheme.outline
                       : colorScheme.onSurfaceVariant,
                 ),
@@ -635,14 +648,12 @@ class _SearchProviderSelector extends ConsumerWidget {
                       Text(
                         context.l10n.extensionsSearchProvider,
                         style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                          color: searchProviders.isEmpty
-                              ? colorScheme.outline
-                              : null,
+                          color: !hasAnyProvider ? colorScheme.outline : null,
                         ),
                       ),
                       const SizedBox(height: 2),
                       Text(
-                        searchProviders.isEmpty
+                        !hasAnyProvider
                             ? context.l10n.extensionsNoCustomSearch
                             : currentProviderName,
                         style: Theme.of(context).textTheme.bodySmall?.copyWith(
@@ -654,7 +665,7 @@ class _SearchProviderSelector extends ConsumerWidget {
                 ),
                 Icon(
                   Icons.chevron_right,
-                  color: searchProviders.isEmpty
+                  color: !hasAnyProvider
                       ? colorScheme.outline
                       : colorScheme.onSurfaceVariant,
                 ),
@@ -682,61 +693,245 @@ class _SearchProviderSelector extends ConsumerWidget {
         borderRadius: BorderRadius.vertical(top: Radius.circular(28)),
       ),
       builder: (ctx) => SafeArea(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
-              child: Text(
-                ctx.l10n.extensionsSearchProvider,
-                style: Theme.of(
-                  context,
-                ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.fromLTRB(24, 0, 24, 16),
-              child: Text(
-                ctx.l10n.extensionsSearchProviderDescription,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                  color: colorScheme.onSurfaceVariant,
+        child: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Padding(
+                padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
+                child: Text(
+                  ctx.l10n.extensionsSearchProvider,
+                  style: Theme.of(
+                    context,
+                  ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
                 ),
               ),
-            ),
-            ListTile(
-              leading: Icon(Icons.music_note, color: colorScheme.primary),
-              title: Text(ctx.l10n.extensionDefaultProvider),
-              subtitle: Text(ctx.l10n.extensionDefaultProviderSubtitle),
-              trailing:
-                  (settings.searchProvider == null ||
-                      settings.searchProvider!.isEmpty)
-                  ? Icon(Icons.check_circle, color: colorScheme.primary)
-                  : Icon(Icons.circle_outlined, color: colorScheme.outline),
-              onTap: () {
-                ref.read(settingsProvider.notifier).setSearchProvider(null);
-                Navigator.pop(ctx);
-              },
-            ),
-            ...searchProviders.map(
-              (ext) => ListTile(
-                leading: Icon(Icons.extension, color: colorScheme.secondary),
-                title: Text(ext.displayName),
-                subtitle: Text(
-                  ext.searchBehavior?.placeholder ??
-                      ctx.l10n.extensionsCustomSearch,
+              Padding(
+                padding: const EdgeInsets.fromLTRB(24, 0, 24, 16),
+                child: Text(
+                  ctx.l10n.extensionsSearchProviderDescription,
+                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                    color: colorScheme.onSurfaceVariant,
+                  ),
                 ),
-                trailing: settings.searchProvider == ext.id
+              ),
+              ListTile(
+                leading: Icon(Icons.music_note, color: colorScheme.primary),
+                title: Text(ctx.l10n.extensionDefaultProvider),
+                subtitle: Text(ctx.l10n.extensionDefaultProviderSubtitle),
+                trailing:
+                    (settings.searchProvider == null ||
+                        settings.searchProvider!.isEmpty)
                     ? Icon(Icons.check_circle, color: colorScheme.primary)
                     : Icon(Icons.circle_outlined, color: colorScheme.outline),
                 onTap: () {
-                  ref.read(settingsProvider.notifier).setSearchProvider(ext.id);
+                  ref.read(settingsProvider.notifier).setSearchProvider(null);
                   Navigator.pop(ctx);
                 },
               ),
-            ),
-            const SizedBox(height: 16),
-          ],
+              ..._builtInProviders.entries.map(
+                (entry) => ListTile(
+                  leading: Icon(Icons.search, color: colorScheme.tertiary),
+                  title: Text(entry.value),
+                  subtitle: Text('Search with ${entry.value}'),
+                  trailing: settings.searchProvider == entry.key
+                      ? Icon(Icons.check_circle, color: colorScheme.primary)
+                      : Icon(Icons.circle_outlined, color: colorScheme.outline),
+                  onTap: () {
+                    ref
+                        .read(settingsProvider.notifier)
+                        .setSearchProvider(entry.key);
+                    Navigator.pop(ctx);
+                  },
+                ),
+              ),
+              if (searchProviders.isNotEmpty) const Divider(height: 1),
+              ...searchProviders.map(
+                (ext) => ListTile(
+                  leading: Icon(Icons.extension, color: colorScheme.secondary),
+                  title: Text(ext.displayName),
+                  subtitle: Text(
+                    ext.searchBehavior?.placeholder ??
+                        ctx.l10n.extensionsCustomSearch,
+                  ),
+                  trailing: settings.searchProvider == ext.id
+                      ? Icon(Icons.check_circle, color: colorScheme.primary)
+                      : Icon(Icons.circle_outlined, color: colorScheme.outline),
+                  onTap: () {
+                    ref
+                        .read(settingsProvider.notifier)
+                        .setSearchProvider(ext.id);
+                    Navigator.pop(ctx);
+                  },
+                ),
+              ),
+              const SizedBox(height: 16),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _HomeFeedProviderSelector extends ConsumerWidget {
+  const _HomeFeedProviderSelector();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final settings = ref.watch(settingsProvider);
+    final extState = ref.watch(extensionProvider);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    final homeFeedProviders = extState.extensions
+        .where((e) => e.enabled && e.hasHomeFeed)
+        .toList();
+
+    final hasAnyProvider = homeFeedProviders.isNotEmpty;
+
+    String currentProviderName = 'Auto';
+    if (settings.homeFeedProvider != null &&
+        settings.homeFeedProvider!.isNotEmpty) {
+      final ext = homeFeedProviders
+          .where((e) => e.id == settings.homeFeedProvider)
+          .firstOrNull;
+      currentProviderName = ext?.displayName ?? settings.homeFeedProvider!;
+    }
+
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        InkWell(
+          onTap: !hasAnyProvider
+              ? null
+              : () => _showHomeFeedProviderPicker(
+                  context,
+                  ref,
+                  settings,
+                  homeFeedProviders,
+                ),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+            child: Row(
+              children: [
+                Icon(
+                  Icons.explore_outlined,
+                  color: !hasAnyProvider
+                      ? colorScheme.outline
+                      : colorScheme.onSurfaceVariant,
+                ),
+                const SizedBox(width: 16),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        'Home Feed Provider',
+                        style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                          color: !hasAnyProvider ? colorScheme.outline : null,
+                        ),
+                      ),
+                      const SizedBox(height: 2),
+                      Text(
+                        !hasAnyProvider
+                            ? 'No extensions with home feed'
+                            : currentProviderName,
+                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                          color: colorScheme.onSurfaceVariant,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                Icon(
+                  Icons.chevron_right,
+                  color: !hasAnyProvider
+                      ? colorScheme.outline
+                      : colorScheme.onSurfaceVariant,
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  void _showHomeFeedProviderPicker(
+    BuildContext context,
+    WidgetRef ref,
+    dynamic settings,
+    List<Extension> homeFeedProviders,
+  ) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    showModalBottomSheet(
+      context: context,
+      useRootNavigator: true,
+      backgroundColor: colorScheme.surfaceContainerHigh,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(28)),
+      ),
+      builder: (ctx) => SafeArea(
+        child: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Padding(
+                padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
+                child: Text(
+                  'Home Feed Provider',
+                  style: Theme.of(
+                    context,
+                  ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+                ),
+              ),
+              Padding(
+                padding: const EdgeInsets.fromLTRB(24, 0, 24, 16),
+                child: Text(
+                  'Choose which extension provides the home feed on the main screen',
+                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                    color: colorScheme.onSurfaceVariant,
+                  ),
+                ),
+              ),
+              ListTile(
+                leading: Icon(Icons.auto_awesome, color: colorScheme.primary),
+                title: const Text('Auto'),
+                subtitle: const Text('Automatically select the best available'),
+                trailing:
+                    (settings.homeFeedProvider == null ||
+                        settings.homeFeedProvider!.isEmpty)
+                    ? Icon(Icons.check_circle, color: colorScheme.primary)
+                    : Icon(Icons.circle_outlined, color: colorScheme.outline),
+                onTap: () {
+                  ref.read(settingsProvider.notifier).setHomeFeedProvider(null);
+                  ref.read(exploreProvider.notifier).refresh();
+                  Navigator.pop(ctx);
+                },
+              ),
+              ...homeFeedProviders.map(
+                (ext) => ListTile(
+                  leading: Icon(Icons.extension, color: colorScheme.secondary),
+                  title: Text(ext.displayName),
+                  subtitle: Text('Use ${ext.displayName} home feed'),
+                  trailing: settings.homeFeedProvider == ext.id
+                      ? Icon(Icons.check_circle, color: colorScheme.primary)
+                      : Icon(Icons.circle_outlined, color: colorScheme.outline),
+                  onTap: () {
+                    ref
+                        .read(settingsProvider.notifier)
+                        .setHomeFeedProvider(ext.id);
+                    ref.read(exploreProvider.notifier).refresh();
+                    Navigator.pop(ctx);
+                  },
+                ),
+              ),
+              const SizedBox(height: 16),
+            ],
+          ),
         ),
       ),
     );

lib/screens/settings/library_settings_page.dart

@@ -73,11 +73,13 @@ class _LibrarySettingsPageState extends ConsumerState<LibrarySettingsPage> {
     } else if (Platform.isIOS) {
       // iOS doesn't need explicit storage permission for app documents
       setState(() => _hasStoragePermission = true);
+    } else {
+      setState(() => _hasStoragePermission = true);
     }
   }
 
   Future<bool> _requestStoragePermission() async {
-    if (Platform.isIOS) return true;
+    if (!Platform.isAndroid) return true;
     // SAF on Android 10+ doesn't need MANAGE_EXTERNAL_STORAGE
     if (_androidSdkVersion >= 29) return true;
 
@@ -135,8 +137,9 @@ class _LibrarySettingsPageState extends ConsumerState<LibrarySettingsPage> {
         if (Platform.isIOS) {
           // On iOS, create a security-scoped bookmark so we can access
           // this folder across app restarts and from the Go backend.
-          final bookmark =
-              await PlatformBridge.createIosBookmarkFromPath(result);
+          final bookmark = await PlatformBridge.createIosBookmarkFromPath(
+            result,
+          );
           if (bookmark != null && bookmark.isNotEmpty) {
             ref
                 .read(settingsProvider.notifier)
@@ -182,11 +185,13 @@ class _LibrarySettingsPageState extends ConsumerState<LibrarySettingsPage> {
       return;
     }
 
-    await ref.read(localLibraryProvider.notifier).startScan(
-      libraryPath,
-      forceFullScan: forceFullScan,
-      iosBookmark: iosBookmark.isNotEmpty ? iosBookmark : null,
-    );
+    await ref
+        .read(localLibraryProvider.notifier)
+        .startScan(
+          libraryPath,
+          forceFullScan: forceFullScan,
+          iosBookmark: iosBookmark.isNotEmpty ? iosBookmark : null,
+        );
   }
 
   Future<void> _cancelScan() async {
@@ -241,6 +246,106 @@ class _LibrarySettingsPageState extends ConsumerState<LibrarySettingsPage> {
     }
   }
 
+  String _getAutoScanLabel(BuildContext context, String mode) {
+    switch (mode) {
+      case 'on_open':
+        return context.l10n.libraryAutoScanOnOpen;
+      case 'daily':
+        return context.l10n.libraryAutoScanDaily;
+      case 'weekly':
+        return context.l10n.libraryAutoScanWeekly;
+      default:
+        return context.l10n.libraryAutoScanOff;
+    }
+  }
+
+  void _showAutoScanPicker(BuildContext context, String current) {
+    final colorScheme = Theme.of(context).colorScheme;
+    showModalBottomSheet(
+      context: context,
+      useRootNavigator: true,
+      backgroundColor: colorScheme.surfaceContainerHigh,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(28)),
+      ),
+      builder: (context) => SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Padding(
+              padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
+              child: Text(
+                context.l10n.libraryAutoScan,
+                style: Theme.of(
+                  context,
+                ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.fromLTRB(24, 0, 24, 16),
+              child: Text(
+                context.l10n.libraryAutoScanSubtitle,
+                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                  color: colorScheme.onSurfaceVariant,
+                ),
+              ),
+            ),
+            _AutoScanOption(
+              icon: Icons.block,
+              title: context.l10n.libraryAutoScanOff,
+              selected: current == 'off',
+              colorScheme: colorScheme,
+              onTap: () {
+                ref
+                    .read(settingsProvider.notifier)
+                    .setLocalLibraryAutoScan('off');
+                Navigator.pop(context);
+              },
+            ),
+            _AutoScanOption(
+              icon: Icons.open_in_new,
+              title: context.l10n.libraryAutoScanOnOpen,
+              selected: current == 'on_open',
+              colorScheme: colorScheme,
+              onTap: () {
+                ref
+                    .read(settingsProvider.notifier)
+                    .setLocalLibraryAutoScan('on_open');
+                Navigator.pop(context);
+              },
+            ),
+            _AutoScanOption(
+              icon: Icons.today,
+              title: context.l10n.libraryAutoScanDaily,
+              selected: current == 'daily',
+              colorScheme: colorScheme,
+              onTap: () {
+                ref
+                    .read(settingsProvider.notifier)
+                    .setLocalLibraryAutoScan('daily');
+                Navigator.pop(context);
+              },
+            ),
+            _AutoScanOption(
+              icon: Icons.date_range,
+              title: context.l10n.libraryAutoScanWeekly,
+              selected: current == 'weekly',
+              colorScheme: colorScheme,
+              onTap: () {
+                ref
+                    .read(settingsProvider.notifier)
+                    .setLocalLibraryAutoScan('weekly');
+                Navigator.pop(context);
+              },
+            ),
+            const SizedBox(height: 16),
+          ],
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final settings = ref.watch(settingsProvider);
@@ -344,7 +449,24 @@ class _LibrarySettingsPageState extends ConsumerState<LibrarySettingsPage> {
                   onChanged: (value) => ref
                       .read(settingsProvider.notifier)
                       .setLocalLibraryShowDuplicates(value),
-                  showDivider: false,
+                ),
+                Opacity(
+                  opacity: settings.localLibraryEnabled ? 1.0 : 0.5,
+                  child: SettingsItem(
+                    icon: Icons.autorenew_rounded,
+                    title: context.l10n.libraryAutoScan,
+                    subtitle: _getAutoScanLabel(
+                      context,
+                      settings.localLibraryAutoScan,
+                    ),
+                    onTap: settings.localLibraryEnabled
+                        ? () => _showAutoScanPicker(
+                            context,
+                            settings.localLibraryAutoScan,
+                          )
+                        : null,
+                    showDivider: false,
+                  ),
                 ),
               ],
             ),
@@ -825,3 +947,29 @@ class _ScanProgressTile extends StatelessWidget {
     );
   }
 }
+
+class _AutoScanOption extends StatelessWidget {
+  final IconData icon;
+  final String title;
+  final bool selected;
+  final ColorScheme colorScheme;
+  final VoidCallback onTap;
+
+  const _AutoScanOption({
+    required this.icon,
+    required this.title,
+    required this.selected,
+    required this.colorScheme,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      leading: Icon(icon),
+      title: Text(title),
+      trailing: selected ? Icon(Icons.check, color: colorScheme.primary) : null,
+      onTap: onTap,
+    );
+  }
+}

lib/screens/settings/options_settings_page.dart

@@ -611,24 +611,34 @@ class _MetadataSourceSelector extends ConsumerWidget {
   final ValueChanged<String> onChanged;
   const _MetadataSourceSelector({required this.onChanged});
 
+  static const _builtInProviders = {'tidal': 'Tidal', 'qobuz': 'Qobuz'};
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final colorScheme = Theme.of(context).colorScheme;
     final settings = ref.watch(settingsProvider);
     final extState = ref.watch(extensionProvider);
 
+    final searchProvider = settings.searchProvider ?? '';
+    final isBuiltIn = _builtInProviders.containsKey(searchProvider);
+
     Extension? activeExtension;
-    if (settings.searchProvider != null &&
-        settings.searchProvider!.isNotEmpty) {
+    if (searchProvider.isNotEmpty && !isBuiltIn) {
       activeExtension = extState.extensions
-          .where((e) => e.id == settings.searchProvider && e.enabled)
+          .where((e) => e.id == searchProvider && e.enabled)
           .firstOrNull;
     }
-    final hasExtensionSearch = activeExtension != null;
+    final hasNonDefaultProvider = isBuiltIn || activeExtension != null;
 
-    String? extensionName;
-    if (hasExtensionSearch) {
-      extensionName = activeExtension.displayName;
+    String subtitle;
+    if (isBuiltIn) {
+      subtitle = 'Using ${_builtInProviders[searchProvider]}';
+    } else if (activeExtension != null) {
+      subtitle = context.l10n.optionsUsingExtension(
+        activeExtension.displayName,
+      );
+    } else {
+      subtitle = context.l10n.optionsPrimaryProviderSubtitle;
     }
 
     return Padding(
@@ -644,11 +654,9 @@ class _MetadataSourceSelector extends ConsumerWidget {
           ),
           const SizedBox(height: 4),
           Text(
-            hasExtensionSearch
-                ? context.l10n.optionsUsingExtension(extensionName!)
-                : context.l10n.optionsPrimaryProviderSubtitle,
+            subtitle,
             style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-              color: hasExtensionSearch
+              color: hasNonDefaultProvider
                   ? colorScheme.primary
                   : colorScheme.onSurfaceVariant,
             ),
@@ -659,17 +667,41 @@ class _MetadataSourceSelector extends ConsumerWidget {
               _SourceChip(
                 icon: Icons.graphic_eq,
                 label: 'Deezer',
-                isSelected: !hasExtensionSearch,
+                isSelected: searchProvider.isEmpty,
                 onTap: () {
-                  if (hasExtensionSearch) {
+                  if (hasNonDefaultProvider) {
                     ref.read(settingsProvider.notifier).setSearchProvider(null);
                   }
                   onChanged('deezer');
                 },
               ),
+              const SizedBox(width: 8),
+              _SourceChip(
+                icon: Icons.waves,
+                label: 'Tidal',
+                isSelected: searchProvider == 'tidal',
+                onTap: () {
+                  ref
+                      .read(settingsProvider.notifier)
+                      .setSearchProvider('tidal');
+                  onChanged('tidal');
+                },
+              ),
+              const SizedBox(width: 8),
+              _SourceChip(
+                icon: Icons.album,
+                label: 'Qobuz',
+                isSelected: searchProvider == 'qobuz',
+                onTap: () {
+                  ref
+                      .read(settingsProvider.notifier)
+                      .setSearchProvider('qobuz');
+                  onChanged('qobuz');
+                },
+              ),
             ],
           ),
-          if (hasExtensionSearch) ...[
+          if (activeExtension != null) ...[
             const SizedBox(height: 12),
             Row(
               children: [

lib/screens/setup_screen.dart

@@ -91,6 +91,11 @@ class _SetupScreenState extends ConsumerState<SetupScreen> {
           _notificationPermissionGranted = notificationStatus.isGranted;
         });
       }
+    } else {
+      setState(() {
+        _storagePermissionGranted = true;
+        _notificationPermissionGranted = true;
+      });
     }
   }
 
@@ -139,6 +144,8 @@ class _SetupScreenState extends ConsumerState<SetupScreen> {
             SnackBar(content: Text(context.l10n.setupPermissionDeniedMessage)),
           );
         }
+      } else {
+        setState(() => _storagePermissionGranted = true);
       }
     } catch (e) {
       debugPrint('Permission error: $e');
@@ -225,7 +232,7 @@ class _SetupScreenState extends ConsumerState<SetupScreen> {
     try {
       if (Platform.isIOS) {
         await _showIOSDirectoryOptions();
-      } else {
+      } else if (Platform.isAndroid) {
         final result = await PlatformBridge.pickSafTree();
         if (result != null) {
           final treeUri = result['tree_uri'] as String? ?? '';
@@ -321,7 +328,26 @@ class _SetupScreenState extends ConsumerState<SetupScreen> {
               title: Text(context.l10n.setupChooseFromFiles),
               onTap: () async {
                 Navigator.pop(ctx);
-                final result = await FilePicker.platform.getDirectoryPath();
+                if (Platform.isIOS) {
+                  await Future<void>.delayed(const Duration(milliseconds: 250));
+                }
+
+                String? result;
+                try {
+                  result = await FilePicker.platform.getDirectoryPath();
+                } catch (e) {
+                  if (mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      SnackBar(
+                        content: Text('Failed to open folder picker: $e'),
+                        backgroundColor: Theme.of(context).colorScheme.error,
+                        duration: const Duration(seconds: 4),
+                      ),
+                    );
+                  }
+                  return;
+                }
+
                 if (result != null) {
                   // iOS: Validate the selected path is writable
                   if (Platform.isIOS) {

lib/screens/store_tab.dart

@@ -269,22 +269,19 @@ class _StoreTabState extends ConsumerState<StoreTab> {
                 ),
 
                 SliverToBoxAdapter(
-                  child: Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 16),
-                    child: SettingsGroup(
-                      children: filteredExtensions.asMap().entries.map((entry) {
-                        final index = entry.key;
-                        final ext = entry.value;
-                        return _ExtensionItem(
-                          extension: ext,
-                          showDivider: index < filteredExtensions.length - 1,
-                          isDownloading: downloadingId == ext.id,
-                          onInstall: () => _installExtension(ext),
-                          onUpdate: () => _updateExtension(ext),
-                          onTap: () => _showExtensionDetails(ext),
-                        );
-                      }).toList(),
-                    ),
+                  child: SettingsGroup(
+                    children: filteredExtensions.asMap().entries.map((entry) {
+                      final index = entry.key;
+                      final ext = entry.value;
+                      return _ExtensionItem(
+                        extension: ext,
+                        showDivider: index < filteredExtensions.length - 1,
+                        isDownloading: downloadingId == ext.id,
+                        onInstall: () => _installExtension(ext),
+                        onUpdate: () => _updateExtension(ext),
+                        onTap: () => _showExtensionDetails(ext),
+                      );
+                    }).toList(),
                   ),
                 ),
 

lib/services/cover_cache_manager.dart

@@ -37,7 +37,6 @@ class CoverCacheManager {
       final appDir = await getApplicationSupportDirectory();
       _cachePath = p.join(appDir.path, 'cover_cache');
       
-      // Ensure cache directory exists
       await Directory(_cachePath!).create(recursive: true);
       
       debugPrint('CoverCacheManager: Initializing at $_cachePath');
@@ -48,7 +47,6 @@ class CoverCacheManager {
       debugPrint('CoverCacheManager: Initialized successfully');
     } catch (e) {
       debugPrint('CoverCacheManager: Failed to initialize: $e');
-      // Will fallback to DefaultCacheManager
     }
   }
 

lib/services/ffmpeg_service.dart

@@ -130,6 +130,25 @@ class FFmpegService {
     }
   }
 
+  static Future<FFmpegResult> _executeWithArguments(
+    List<String> arguments,
+  ) async {
+    try {
+      final session = await FFmpegKit.executeWithArguments(arguments);
+      final returnCode = await session.getReturnCode();
+      final output = await session.getOutput() ?? '';
+
+      return FFmpegResult(
+        success: ReturnCode.isSuccess(returnCode),
+        returnCode: returnCode?.getValue() ?? -1,
+        output: output,
+      );
+    } catch (e) {
+      _log.e('FFmpeg executeWithArguments error: $e');
+      return FFmpegResult(success: false, returnCode: -1, output: e.toString());
+    }
+  }
+
   static Future<String?> convertM4aToFlac(String inputPath) async {
     final outputPath = _buildOutputPath(inputPath, '.flac');
 
@@ -1030,18 +1049,24 @@ class FFmpegService {
   }) async {
     final tempDir = await getTemporaryDirectory();
     final tempOutput = _nextTempEmbedPath(tempDir.path, '.opus');
-
-    final StringBuffer cmdBuffer = StringBuffer();
-    cmdBuffer.write('-i "$opusPath" ');
-    cmdBuffer.write('-map 0:a ');
-    cmdBuffer.write('-map_metadata -1 ');
-    cmdBuffer.write('-map_metadata:s:a -1 ');
-    cmdBuffer.write('-c:a copy ');
+    final arguments = <String>[
+      '-i',
+      opusPath,
+      '-map',
+      '0:a',
+      '-map_metadata',
+      '-1',
+      '-map_metadata:s:a',
+      '-1',
+      '-c:a',
+      'copy',
+    ];
 
     if (metadata != null) {
       metadata.forEach((key, value) {
-        final sanitizedValue = value.replaceAll('"', '\\"');
-        cmdBuffer.write('-metadata $key="$sanitizedValue" ');
+        arguments
+          ..add('-metadata')
+          ..add('$key=$value');
       });
     }
 
@@ -1049,8 +1074,9 @@ class FFmpegService {
       try {
         final pictureBlock = await _createMetadataBlockPicture(coverPath);
         if (pictureBlock != null) {
-          final escapedBlock = pictureBlock.replaceAll('"', '\\"');
-          cmdBuffer.write('-metadata METADATA_BLOCK_PICTURE="$escapedBlock" ');
+          arguments
+            ..add('-metadata')
+            ..add('METADATA_BLOCK_PICTURE=$pictureBlock');
           _log.d(
             'Created METADATA_BLOCK_PICTURE for Opus (${pictureBlock.length} chars)',
           );
@@ -1062,12 +1088,12 @@ class FFmpegService {
       }
     }
 
-    cmdBuffer.write('"$tempOutput" -y');
-
-    final command = cmdBuffer.toString();
+    arguments
+      ..add(tempOutput)
+      ..add('-y');
     _log.d('Executing FFmpeg Opus embed command');
 
-    final result = await _execute(command);
+    final result = await _executeWithArguments(arguments);
 
     if (result.success) {
       try {
@@ -1106,6 +1132,88 @@ class FFmpegService {
     return null;
   }
 
+  static Future<String?> embedMetadataToM4a({
+    required String m4aPath,
+    String? coverPath,
+    Map<String, String>? metadata,
+  }) async {
+    final tempDir = await getTemporaryDirectory();
+    final tempOutput = _nextTempEmbedPath(tempDir.path, '.m4a');
+
+    final cmdBuffer = StringBuffer();
+    cmdBuffer.write('-i "$m4aPath" ');
+
+    final hasCover = coverPath != null && await File(coverPath).exists();
+    if (hasCover) {
+      cmdBuffer.write('-i "$coverPath" ');
+    }
+
+    cmdBuffer.write('-map 0:a ');
+    cmdBuffer.write('-map_metadata -1 ');
+
+    // For M4A/MP4, cover art is mapped as a video stream and stored in the
+    // 'covr' atom automatically by FFmpeg. The '-disposition attached_pic'
+    // flag is only valid for Matroska/WebM containers and must NOT be used here.
+    if (hasCover) {
+      cmdBuffer.write('-map 1:v -c:v copy ');
+    }
+
+    cmdBuffer.write('-c:a copy ');
+
+    if (metadata != null) {
+      final m4aMetadata = _convertToM4aTags(metadata);
+      for (final entry in m4aMetadata.entries) {
+        final sanitizedValue = entry.value.replaceAll('"', '\\"');
+        cmdBuffer.write('-metadata ${entry.key}="$sanitizedValue" ');
+      }
+    }
+
+    cmdBuffer.write('"$tempOutput" -y');
+
+    final command = cmdBuffer.toString();
+    _log.d(
+      'Executing FFmpeg M4A embed command: ${_previewCommandForLog(command)}',
+    );
+
+    final result = await _execute(command);
+
+    if (result.success) {
+      try {
+        final tempFile = File(tempOutput);
+        final originalFile = File(m4aPath);
+
+        if (await tempFile.exists()) {
+          if (await originalFile.exists()) {
+            await originalFile.delete();
+          }
+          await tempFile.copy(m4aPath);
+          await tempFile.delete();
+
+          _log.d('M4A metadata embedded successfully');
+          return m4aPath;
+        } else {
+          _log.e('Temp M4A output file not found: $tempOutput');
+          return null;
+        }
+      } catch (e) {
+        _log.e('Failed to replace M4A file after metadata embed: $e');
+        return null;
+      }
+    }
+
+    try {
+      final tempFile = File(tempOutput);
+      if (await tempFile.exists()) {
+        await tempFile.delete();
+      }
+    } catch (e) {
+      _log.w('Failed to cleanup temp M4A file: $e');
+    }
+
+    _log.e('M4A Metadata embed failed: ${result.output}');
+    return null;
+  }
+
   static Future<String?> _createMetadataBlockPicture(String imagePath) async {
     try {
       final file = File(imagePath);
@@ -1209,7 +1317,8 @@ class FFmpegService {
   }
 
   /// Unified audio format conversion with full metadata + cover preservation.
-  /// Supports: FLAC/MP3/Opus -> MP3/Opus (any direction except same format).
+  /// Supports: FLAC/M4A/MP3/Opus -> MP3/Opus/ALAC/FLAC.
+  /// ALAC and FLAC targets are lossless (bitrate parameter is ignored).
   /// Returns the new file path on success, null on failure.
   static Future<String?> convertAudioFormat({
     required String inputPath,
@@ -1220,11 +1329,30 @@ class FFmpegService {
     bool deleteOriginal = true,
   }) async {
     final format = targetFormat.toLowerCase();
-    if (format != 'mp3' && format != 'opus') {
+    if (!const {'mp3', 'opus', 'alac', 'flac'}.contains(format)) {
       _log.e('Unsupported target format: $targetFormat');
       return null;
     }
 
+    // Lossless targets: dedicated single-pass methods
+    if (format == 'alac') {
+      return _convertToAlac(
+        inputPath: inputPath,
+        metadata: metadata,
+        coverPath: coverPath,
+        deleteOriginal: deleteOriginal,
+      );
+    }
+    if (format == 'flac') {
+      return _convertToFlac(
+        inputPath: inputPath,
+        metadata: metadata,
+        coverPath: coverPath,
+        deleteOriginal: deleteOriginal,
+      );
+    }
+
+    // Lossy targets: MP3 / Opus
     final extension = format == 'opus' ? '.opus' : '.mp3';
     final outputPath = _buildOutputPath(inputPath, extension);
 
@@ -1296,6 +1424,266 @@ class FFmpegService {
     return outputPath;
   }
 
+  /// Convert any audio format to ALAC (Apple Lossless) in an M4A container.
+  /// Metadata and cover art are embedded in a single FFmpeg pass.
+  static Future<String?> _convertToAlac({
+    required String inputPath,
+    required Map<String, String> metadata,
+    String? coverPath,
+    bool deleteOriginal = true,
+  }) async {
+    final outputPath = _buildOutputPath(inputPath, '.m4a');
+
+    final cmdBuffer = StringBuffer();
+    cmdBuffer.write('-i "$inputPath" ');
+
+    // Cover art as second input for M4A attached picture
+    final hasCover =
+        coverPath != null &&
+        coverPath.trim().isNotEmpty &&
+        await File(coverPath).exists();
+    if (hasCover) {
+      cmdBuffer.write('-i "$coverPath" ');
+    }
+
+    cmdBuffer.write('-map 0:a ');
+    // M4A/MP4 containers store cover art in the 'covr' atom automatically.
+    // '-disposition attached_pic' is only for Matroska/WebM and must NOT be used here.
+    if (hasCover) {
+      cmdBuffer.write('-map 1:v -c:v copy ');
+    }
+    cmdBuffer.write('-c:a alac ');
+    cmdBuffer.write('-map_metadata -1 ');
+
+    // Embed M4A metadata tags
+    final m4aTags = _convertToM4aTags(metadata);
+    for (final entry in m4aTags.entries) {
+      final sanitized = entry.value.replaceAll('"', '\\"');
+      cmdBuffer.write('-metadata ${entry.key}="$sanitized" ');
+    }
+
+    cmdBuffer.write('"$outputPath" -y');
+
+    _log.i(
+      'Converting ${inputPath.split(Platform.pathSeparator).last} to ALAC',
+    );
+    final result = await _execute(cmdBuffer.toString());
+
+    if (!result.success) {
+      _log.e('ALAC conversion failed: ${result.output}');
+      return null;
+    }
+
+    if (deleteOriginal) {
+      try {
+        await File(inputPath).delete();
+        _log.i(
+          'Deleted original: ${inputPath.split(Platform.pathSeparator).last}',
+        );
+      } catch (e) {
+        _log.w('Failed to delete original: $e');
+      }
+    }
+
+    return outputPath;
+  }
+
+  /// Convert any audio format to FLAC with metadata and cover art preservation.
+  static Future<String?> _convertToFlac({
+    required String inputPath,
+    required Map<String, String> metadata,
+    String? coverPath,
+    bool deleteOriginal = true,
+  }) async {
+    final outputPath = _buildOutputPath(inputPath, '.flac');
+
+    final cmdBuffer = StringBuffer();
+    cmdBuffer.write('-i "$inputPath" ');
+
+    final hasCover =
+        coverPath != null &&
+        coverPath.trim().isNotEmpty &&
+        await File(coverPath).exists();
+    if (hasCover) {
+      cmdBuffer.write('-i "$coverPath" ');
+    }
+
+    cmdBuffer.write('-map 0:a ');
+    if (hasCover) {
+      cmdBuffer.write('-map 1:v -c:v copy -disposition:v:0 attached_pic ');
+      cmdBuffer.write('-metadata:s:v title="Album cover" ');
+      cmdBuffer.write('-metadata:s:v comment="Cover (front)" ');
+    }
+    cmdBuffer.write('-c:a flac -compression_level 8 ');
+    cmdBuffer.write('-map_metadata 0 ');
+
+    final vorbisComments = _normalizeToVorbisComments(metadata);
+    for (final entry in vorbisComments.entries) {
+      final sanitized = entry.value.replaceAll('"', '\\"');
+      cmdBuffer.write('-metadata ${entry.key}="$sanitized" ');
+    }
+
+    cmdBuffer.write('"$outputPath" -y');
+
+    _log.i(
+      'Converting ${inputPath.split(Platform.pathSeparator).last} to FLAC',
+    );
+    final result = await _execute(cmdBuffer.toString());
+
+    if (!result.success) {
+      _log.e('FLAC conversion failed: ${result.output}');
+      return null;
+    }
+
+    if (deleteOriginal) {
+      try {
+        await File(inputPath).delete();
+        _log.i(
+          'Deleted original: ${inputPath.split(Platform.pathSeparator).last}',
+        );
+      } catch (e) {
+        _log.w('Failed to delete original: $e');
+      }
+    }
+
+    return outputPath;
+  }
+
+  /// Normalize metadata keys to standard Vorbis comment names, filtering out
+  /// technical fields (bit_depth, sample_rate, duration, etc.).
+  static Map<String, String> _normalizeToVorbisComments(
+    Map<String, String> metadata,
+  ) {
+    final vorbis = <String, String>{};
+
+    for (final entry in metadata.entries) {
+      final key = entry.key.toUpperCase().replaceAll(RegExp(r'[^A-Z0-9]'), '');
+      final value = entry.value;
+      if (value.trim().isEmpty) continue;
+
+      switch (key) {
+        case 'TITLE':
+          vorbis['TITLE'] = value;
+          break;
+        case 'ARTIST':
+          vorbis['ARTIST'] = value;
+          break;
+        case 'ALBUM':
+          vorbis['ALBUM'] = value;
+          break;
+        case 'ALBUMARTIST':
+          vorbis['ALBUMARTIST'] = value;
+          break;
+        case 'TRACKNUMBER':
+        case 'TRACKNBR':
+        case 'TRACK':
+        case 'TRCK':
+          if (value != '0') vorbis['TRACKNUMBER'] = value;
+          break;
+        case 'DISCNUMBER':
+        case 'DISC':
+        case 'TPOS':
+          if (value != '0') vorbis['DISCNUMBER'] = value;
+          break;
+        case 'DATE':
+        case 'YEAR':
+          vorbis['DATE'] = value;
+          break;
+        case 'GENRE':
+          vorbis['GENRE'] = value;
+          break;
+        case 'ISRC':
+          vorbis['ISRC'] = value;
+          break;
+        case 'LABEL':
+        case 'ORGANIZATION':
+          vorbis['ORGANIZATION'] = value;
+          break;
+        case 'COPYRIGHT':
+          vorbis['COPYRIGHT'] = value;
+          break;
+        case 'COMPOSER':
+          vorbis['COMPOSER'] = value;
+          break;
+        case 'COMMENT':
+          vorbis['COMMENT'] = value;
+          break;
+        case 'LYRICS':
+        case 'UNSYNCEDLYRICS':
+          vorbis['LYRICS'] = value;
+          vorbis['UNSYNCEDLYRICS'] = value;
+          break;
+      }
+    }
+
+    return vorbis;
+  }
+
+  /// Map Vorbis comment keys to M4A/MP4 metadata tag names for FFmpeg.
+  static Map<String, String> _convertToM4aTags(Map<String, String> metadata) {
+    final m4aMap = <String, String>{};
+
+    for (final entry in metadata.entries) {
+      final key = entry.key.toUpperCase().replaceAll(RegExp(r'[^A-Z0-9]'), '');
+      final value = entry.value;
+      if (value.trim().isEmpty) continue;
+
+      switch (key) {
+        case 'TITLE':
+          m4aMap['title'] = value;
+          break;
+        case 'ARTIST':
+          m4aMap['artist'] = value;
+          break;
+        case 'ALBUM':
+          m4aMap['album'] = value;
+          break;
+        case 'ALBUMARTIST':
+          m4aMap['album_artist'] = value;
+          break;
+        case 'TRACKNUMBER':
+        case 'TRACK':
+        case 'TRCK':
+          m4aMap['track'] = value;
+          break;
+        case 'DISCNUMBER':
+        case 'DISC':
+        case 'TPOS':
+          m4aMap['disc'] = value;
+          break;
+        case 'DATE':
+        case 'YEAR':
+          m4aMap['date'] = value;
+          break;
+        case 'GENRE':
+          m4aMap['genre'] = value;
+          break;
+        case 'ISRC':
+          m4aMap['isrc'] = value;
+          break;
+        case 'COMPOSER':
+          m4aMap['composer'] = value;
+          break;
+        case 'COMMENT':
+          m4aMap['comment'] = value;
+          break;
+        case 'COPYRIGHT':
+          m4aMap['copyright'] = value;
+          break;
+        case 'LABEL':
+        case 'ORGANIZATION':
+          m4aMap['organization'] = value;
+          break;
+        case 'LYRICS':
+        case 'UNSYNCEDLYRICS':
+          m4aMap['lyrics'] = value;
+          break;
+      }
+    }
+
+    return m4aMap;
+  }
+
   static Map<String, String> _convertToId3Tags(
     Map<String, String> vorbisMetadata,
   ) {
@@ -1377,7 +1765,11 @@ class FFmpegService {
     final outputPaths = <String>[];
     final inputExt = audioPath.toLowerCase().split('.').last;
     // For lossless formats, keep as FLAC; for others, keep original format
-    final outputExt = (inputExt == 'flac' || inputExt == 'wav' || inputExt == 'ape' || inputExt == 'wv')
+    final outputExt =
+        (inputExt == 'flac' ||
+            inputExt == 'wav' ||
+            inputExt == 'ape' ||
+            inputExt == 'wv')
         ? 'flac'
         : inputExt;
 
@@ -1410,7 +1802,9 @@ class FFmpegService {
         cmdBuffer.write('-c:a copy ');
       }
 
-      final artist = track.artist.isNotEmpty ? track.artist : (albumMetadata['artist'] ?? '');
+      final artist = track.artist.isNotEmpty
+          ? track.artist
+          : (albumMetadata['artist'] ?? '');
       final album = albumMetadata['album'] ?? '';
       final genre = albumMetadata['genre'] ?? '';
       final date = albumMetadata['date'] ?? '';
@@ -1435,7 +1829,9 @@ class FFmpegService {
       cmdBuffer.write('"$outputPath" -y');
 
       final command = cmdBuffer.toString();
-      _log.d('CUE split track ${track.number}: ${_previewCommandForLog(command)}');
+      _log.d(
+        'CUE split track ${track.number}: ${_previewCommandForLog(command)}',
+      );
 
       final result = await _execute(command);
       if (!result.success) {

lib/services/history_database.dart

@@ -12,7 +12,6 @@ final Future<SharedPreferences> _prefs = SharedPreferences.getInstance();
 /// Cached current iOS container path for path normalization
 String? _currentContainerPath;
 
-/// SQLite database service for download history
 /// Provides O(1) lookups by spotify_id and isrc with proper indexing
 class HistoryDatabase {
   static final HistoryDatabase instance = HistoryDatabase._init();
@@ -78,7 +77,6 @@ class HistoryDatabase {
       )
     ''');
 
-    // Indexes for fast lookups
     await db.execute('CREATE INDEX idx_spotify_id ON history(spotify_id)');
     await db.execute('CREATE INDEX idx_isrc ON history(isrc)');
     await db.execute(
@@ -171,7 +169,6 @@ class HistoryDatabase {
     try {
       final db = await database;
 
-      // Get all items with iOS paths
       final rows = await db.query('history', columns: ['id', 'file_path']);
       int updatedCount = 0;
       final batch = db.batch();
@@ -198,7 +195,6 @@ class HistoryDatabase {
         await batch.commit(noResult: true);
       }
 
-      // Save current container path
       await prefs.setString('ios_last_container_path', _currentContainerPath!);
 
       _log.i('iOS path migration complete: $updatedCount paths updated');
@@ -323,7 +319,6 @@ class HistoryDatabase {
     };
   }
 
-  /// Insert or update a history item
   Future<void> upsert(Map<String, dynamic> json) async {
     final db = await database;
     await db.insert(
@@ -345,7 +340,6 @@ class HistoryDatabase {
     return rows.map(_dbRowToJson).toList();
   }
 
-  /// Get item by ID
   Future<Map<String, dynamic>?> getById(String id) async {
     final db = await database;
     final rows = await db.query(
@@ -403,26 +397,22 @@ class HistoryDatabase {
     return rows.map((r) => r['spotify_id'] as String).toSet();
   }
 
-  /// Delete by ID
   Future<void> deleteById(String id) async {
     final db = await database;
     await db.delete('history', where: 'id = ?', whereArgs: [id]);
   }
 
-  /// Delete by Spotify ID
   Future<void> deleteBySpotifyId(String spotifyId) async {
     final db = await database;
     await db.delete('history', where: 'spotify_id = ?', whereArgs: [spotifyId]);
   }
 
-  /// Clear all history
   Future<void> clearAll() async {
     final db = await database;
     await db.delete('history');
     _log.i('Cleared all history');
   }
 
-  /// Get total count
   Future<int> getCount() async {
     final db = await database;
     final result = await db.rawQuery('SELECT COUNT(*) as count FROM history');
@@ -459,7 +449,6 @@ class HistoryDatabase {
     return null;
   }
 
-  /// Close database
   Future<void> close() async {
     final db = await database;
     await db.close();

lib/services/library_database.dart

@@ -123,7 +123,7 @@ class LibraryDatabase {
 
     return await openDatabase(
       path,
-      version: 4, // Bumped version for bitrate column
+      version: 4,
       onConfigure: (db) async {
         await db.rawQuery('PRAGMA journal_mode = WAL');
         await db.execute('PRAGMA synchronous = NORMAL');
@@ -331,13 +331,11 @@ class LibraryDatabase {
     String? trackName,
     String? artistName,
   }) async {
-    // First try ISRC if available
     if (isrc != null && isrc.isNotEmpty) {
       final byIsrc = await getByIsrc(isrc);
       if (byIsrc != null) return byIsrc;
     }
 
-    // Then try name matching
     if (trackName != null && artistName != null) {
       final matches = await findByTrackAndArtist(trackName, artistName);
       if (matches.isNotEmpty) return matches.first;
@@ -523,7 +521,6 @@ class LibraryDatabase {
     return rows.map((r) => r['file_path'] as String).toSet();
   }
 
-  /// Delete multiple items by their file paths
   Future<int> deleteByPaths(List<String> filePaths) async {
     if (filePaths.isEmpty) return 0;
     final db = await database;