New translations app_en.arb (Ukrainian)

.fvmrc

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

.github/ISSUE_TEMPLATE/config.yml

@@ -4,5 +4,5 @@ contact_links:
     url: https://github.com/zarzet/SpotiFLAC-Mobile#readme
     about: Check the README for setup instructions and FAQ
   - name: Extension Development Guide
-    url: https://spotiflac.zarz.moe/docs
+    url: https://zarz.moe/docs
     about: Documentation for building SpotiFLAC extensions

.github/workflows/release.yml

@@ -71,7 +71,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.25.8"
+          go-version: "1.25.7"
           cache-dependency-path: go_backend/go.sum
 
       # Cache Gradle for faster builds
@@ -93,12 +93,12 @@ jobs:
           # Accept licenses
           yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses || true
 
-          # Install NDK r29 (supports 16KB page size for Android 15+)
+          # Install NDK r27d LTS (required for 16KB page size support on Android 15+)
           # Platform android-36 and build-tools 36.0.0 for targetSdk 36 (Android 16)
-          $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "ndk;29.0.14206865" "platforms;android-36" "build-tools;36.0.0"
+          $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "ndk;27.3.13750724" "platforms;android-36" "build-tools;36.0.0"
 
           # Set NDK path
-          echo "ANDROID_NDK_HOME=$ANDROID_HOME/ndk/29.0.14206865" >> $GITHUB_ENV
+          echo "ANDROID_NDK_HOME=$ANDROID_HOME/ndk/27.3.13750724" >> $GITHUB_ENV
 
       - name: Install gomobile
         run: |
@@ -174,7 +174,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.25.8"
+          go-version: "1.25.7"
           cache-dependency-path: go_backend/go.sum
 
       # Cache CocoaPods

.gitignore

@@ -77,7 +77,6 @@ flutter_*.log
 # Development tools
 tool/
 .claude/settings.local.json
-.playwright-mcp/
 
 # FVM Version Cache
 .fvm/

README.md

@@ -17,7 +17,7 @@
 <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/31d1bf3c3b2015c13e83c4f909a7c6093a9423e3e702f0c582a3e0035c849424)
+[![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)
@@ -141,11 +141,6 @@ In AltStore/SideStore, go to **Browse > Sources**, tap **+**, and paste the link
 
 </details>
 
-> [!NOTE]
-> If SpotiFLAC is useful to you, consider supporting development:
->
-> [![Ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/zarzet)
-
 ---
 
 ## Contributors
@@ -170,18 +165,10 @@ Interested in contributing? Check out the [Contributing Guide](CONTRIBUTING.md)
 | [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) | |
 
----
-
-## Disclaimer
-
-This repository and its contents are provided strictly for educational and research purposes. The software is provided "as-is" without warranty of any kind, express or implied, as stated in the [MIT License](LICENSE).
-
-- No copyrighted content is hosted, stored, mirrored, or distributed by this repository.
-- Users must ensure that their use of this software is properly authorized and complies with all applicable laws, regulations, and third-party terms of service.
-- This software is provided free of charge by the maintainer. If you paid a third party for access to this software in its original form from this repository, you may have been misled or scammed. Any redistribution or commercial use by third parties must comply with the terms of the repository license. No affiliation, endorsement, or support by the maintainer is implied unless explicitly stated in writing.
-- SpotiFLAC Mobile is an independent project. It is not affiliated with, endorsed by, or connected to any other project or version on other platforms that may share a similar name. The maintainer of this repository has no control over or responsibility for third-party projects.
-- The author(s) disclaim all liability for any direct, indirect, incidental, or consequential damages arising from the use or misuse of this software. Users assume all risk associated with its use.
-- If you are a copyright holder or authorized representative and believe this repository infringes upon your rights, please contact the maintainer with sufficient detail (including relevant URLs and proof of ownership). The matter will be promptly investigated and appropriate action will be taken, which may include removal of the referenced material.
+> [!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 the repo** to get notified about all new releases directly from GitHub.

analysis_options.yaml

@@ -9,19 +9,6 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
-analyzer:
-  exclude:
-    - build/**
-    - .dart_tool/**
-    - lib/**/*.g.dart
-    - lib/l10n/*.dart
-  language:
-    strict-casts: true
-    strict-inference: true
-    strict-raw-types: true
-  plugins:
-    - custom_lint
-
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`
@@ -36,13 +23,6 @@ linter:
   rules:
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-    avoid_dynamic_calls: true
-    cancel_subscriptions: true
-    close_sinks: true
-
-custom_lint:
-  rules:
-    - avoid_public_notifier_properties
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

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

@@ -104,7 +104,7 @@ class DownloadService : Service() {
                 updateNotification(progress, total)
             }
         }
-        return START_NOT_STICKY
+        return START_STICKY
     }
     
     override fun onBind(intent: Intent?): IBinder? = null
@@ -137,13 +137,14 @@ class DownloadService : Service() {
     
     private fun startForegroundService() {
         isRunning = true
-
+        
+        // Acquire wake lock to prevent CPU sleep
         val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
         wakeLock = powerManager.newWakeLock(
             PowerManager.PARTIAL_WAKE_LOCK,
             WAKELOCK_TAG
         ).apply {
-            acquire(60 * 60 * 1000L)
+            acquire(60 * 60 * 1000L) // 1 hour max
         }
         
         val notification = buildNotification(0, 0)

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

@@ -27,7 +27,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.json.JSONArray
 import org.json.JSONObject
-import org.json.JSONTokener
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
@@ -40,8 +39,7 @@ class MainActivity: FlutterFragmentActivity() {
         "com.zarz.spotiflac/download_progress_stream"
     private val LIBRARY_SCAN_PROGRESS_STREAM_CHANNEL =
         "com.zarz.spotiflac/library_scan_progress_stream"
-    private val DOWNLOAD_PROGRESS_STREAM_POLLING_INTERVAL_MS = 1200L
-    private val LIBRARY_SCAN_PROGRESS_STREAM_POLLING_INTERVAL_MS = 200L
+    private val STREAM_POLLING_INTERVAL_MS = 1200L
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
     private var pendingSafTreeResult: MethodChannel.Result? = null
     private val safScanLock = Any()
@@ -56,8 +54,6 @@ class MainActivity: FlutterFragmentActivity() {
     private var flutterBackCallback: OnBackPressedCallback? = null
     @Volatile private var safScanCancel = false
     @Volatile private var safScanActive = false
-    /** Tri-state: null = untested, true = works, false = fails (Samsung SELinux). */
-    @Volatile private var procSelfFdReadable: Boolean? = null
     private val safTreeLauncher = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
     ) { activityResult ->
@@ -133,42 +129,51 @@ class MainActivity: FlutterFragmentActivity() {
     )
 
     companion object {
+        // Minimum API level we consider "safe" for Impeller (Android 10+)
         private const val SAFE_API_FOR_IMPELLER = 29
-
+        
+        // Known problematic GPU patterns (lowercase)
         private val PROBLEMATIC_GPU_PATTERNS = listOf(
-            "adreno (tm) 3",
-            "adreno (tm) 4",
-            "mali-4",
-            "mali-t6",
-            "mali-t7",
-            "powervr sgx",
-            "powervr ge8320",
-            "gc1000",
-            "gc2000",
+            "adreno (tm) 3",   // Adreno 300 series (305, 320, 330, etc.) - old Qualcomm
+            "adreno (tm) 4",   // Adreno 400 series - some have issues
+            "mali-4",          // Mali-400 series - old ARM GPUs
+            "mali-t6",         // Mali-T600 series
+            "mali-t7",         // Mali-T700 series (some)
+            "powervr sgx",     // PowerVR SGX series - old Imagination GPUs
+            "powervr ge8320",  // PowerVR GE8320 - known issues
+            "gc1000",          // Vivante GC1000
+            "gc2000",          // Vivante GC2000
         )
-
+        
+        // Known problematic chipsets/hardware (lowercase)
         private val PROBLEMATIC_CHIPSETS = listOf(
-            "mt6762",
-            "mt6765",
-            "mt8768",
-            "mp0873",
-            "msm8974",
-            "msm8226",
-            "msm8926",
-            "apq8084",
+            "mt6762",   // MediaTek Helio P22 with PowerVR GE8320
+            "mt6765",   // MediaTek Helio P35 with PowerVR GE8320
+            "mt8768",   // MediaTek tablet chip
+            "mp0873",   // MediaTek variant
+            "msm8974",  // Snapdragon 800/801 with Adreno 330
+            "msm8226",  // Snapdragon 400 with Adreno 305
+            "msm8926",  // Snapdragon 400 with Adreno 305
+            "apq8084",  // Snapdragon 805 (some issues)
         )
-
+        
+        // Known problematic device models (lowercase)
         private val PROBLEMATIC_MODELS = listOf(
-            "sm-t220",
-            "sm-t225",
-            "hammerhead",
+            "sm-t220",      // Samsung Tab A7 Lite
+            "sm-t225",      // Samsung Tab A7 Lite LTE
+            "hammerhead",   // Nexus 5 (Adreno 330)
         )
+        /**
+         * Check if device should use Skia instead of Impeller.
+         * Returns true for devices with old/problematic GPUs or old Android versions.
+         */
         private fun shouldDisableImpeller(): Boolean {
             val hardware = Build.HARDWARE.lowercase(Locale.ROOT)
             val board = Build.BOARD.lowercase(Locale.ROOT)
             val model = Build.MODEL.lowercase(Locale.ROOT)
             val device = Build.DEVICE.lowercase(Locale.ROOT)
 
+            // 1. Check for explicitly problematic device models
             for (problematicModel in PROBLEMATIC_MODELS) {
                 if (model.contains(problematicModel) || device.contains(problematicModel)) {
                     android.util.Log.i("SpotiFLAC", "Matched problematic model: $problematicModel")
@@ -176,6 +181,7 @@ class MainActivity: FlutterFragmentActivity() {
                 }
             }
 
+            // 2. Check for problematic chipsets
             for (chipset in PROBLEMATIC_CHIPSETS) {
                 if (hardware.contains(chipset) || board.contains(chipset)) {
                     android.util.Log.i("SpotiFLAC", "Matched problematic chipset: $chipset")
@@ -183,9 +189,12 @@ class MainActivity: FlutterFragmentActivity() {
                 }
             }
 
+            // 3. For Android < 10 (API 29), be more aggressive about disabling Impeller
             if (Build.VERSION.SDK_INT < SAFE_API_FOR_IMPELLER) {
+                // For older Android, check GPU renderer if available
                 val gpuRenderer = getGpuRenderer().lowercase(Locale.ROOT)
 
+                // Check for known problematic GPUs
                 for (pattern in PROBLEMATIC_GPU_PATTERNS) {
                     if (gpuRenderer.contains(pattern)) {
                         android.util.Log.i("SpotiFLAC", "Matched problematic GPU on old Android: $pattern")
@@ -193,12 +202,14 @@ class MainActivity: FlutterFragmentActivity() {
                     }
                 }
 
+                // For very old Android (< 8.0), always use Skia as Vulkan support is spotty
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
                     android.util.Log.i("SpotiFLAC", "Android < 8.0, using Skia for safety")
                     return true
                 }
             }
 
+            // 4. For Android 10+, still check for known problematic GPUs
             val gpuRenderer = getGpuRenderer().lowercase(Locale.ROOT)
             for (pattern in PROBLEMATIC_GPU_PATTERNS) {
                 if (gpuRenderer.contains(pattern)) {
@@ -211,10 +222,13 @@ class MainActivity: FlutterFragmentActivity() {
         }
 
     /**
+     * Try to get GPU renderer string.
      * Note: This may return empty on some devices before OpenGL context is created.
      */
         private fun getGpuRenderer(): String {
             return try {
+                // This might not work before GL context is created,
+                // but worth trying for additional detection
                 android.opengl.GLES20.glGetString(android.opengl.GLES20.GL_RENDERER) ?: ""
             } catch (e: Exception) {
                 ""
@@ -302,7 +316,6 @@ class MainActivity: FlutterFragmentActivity() {
             ".mp3" -> "audio/mpeg"
             ".opus" -> "audio/ogg"
             ".flac" -> "audio/flac"
-            ".lrc" -> "application/octet-stream"
             else -> "application/octet-stream"
         }
     }
@@ -372,8 +385,6 @@ class MainActivity: FlutterFragmentActivity() {
         synchronized(safScanLock) {
             safScanProgress = SafScanProgress()
         }
-        // Allow re-probing /proc/self/fd readability on every new scan session.
-        procSelfFdReadable = null
     }
 
     private fun updateSafScanProgress(block: (SafScanProgress) -> Unit) {
@@ -402,38 +413,6 @@ class MainActivity: FlutterFragmentActivity() {
         }
     }
 
-    private fun parseJsonValue(value: Any?): Any? {
-        return when (value) {
-            null, JSONObject.NULL -> null
-            is JSONObject -> {
-                val map = LinkedHashMap<String, Any?>()
-                val keys = value.keys()
-                while (keys.hasNext()) {
-                    val key = keys.next()
-                    map[key] = parseJsonValue(value.opt(key))
-                }
-                map
-            }
-            is JSONArray -> {
-                val list = ArrayList<Any?>()
-                for (i in 0 until value.length()) {
-                    list.add(parseJsonValue(value.opt(i)))
-                }
-                list
-            }
-            is Number, is Boolean, is String -> value
-            else -> value.toString()
-        }
-    }
-
-    private fun parseJsonPayload(payload: String): Any {
-        return try {
-            parseJsonValue(JSONTokener(payload).nextValue()) ?: payload
-        } catch (_: Exception) {
-            payload
-        }
-    }
-
     private fun startDownloadProgressStream(sink: EventChannel.EventSink) {
         stopDownloadProgressStream()
         downloadProgressEventSink = sink
@@ -446,7 +425,7 @@ class MainActivity: FlutterFragmentActivity() {
                     }
                     if (payload != lastDownloadProgressPayload) {
                         lastDownloadProgressPayload = payload
-                        sink.success(parseJsonPayload(payload))
+                        sink.success(payload)
                     }
                 } catch (e: Exception) {
                     android.util.Log.w(
@@ -454,7 +433,7 @@ class MainActivity: FlutterFragmentActivity() {
                         "Download progress stream poll failed: ${e.message}",
                     )
                 }
-                delay(DOWNLOAD_PROGRESS_STREAM_POLLING_INTERVAL_MS)
+                delay(STREAM_POLLING_INTERVAL_MS)
             }
         }
     }
@@ -471,18 +450,6 @@ class MainActivity: FlutterFragmentActivity() {
         libraryScanProgressEventSink = sink
         lastLibraryScanProgressPayload = null
         libraryScanProgressStreamJob = scope.launch {
-            try {
-                val initialPayload = withContext(Dispatchers.IO) {
-                    readLibraryScanProgressJsonForStream()
-                }
-                lastLibraryScanProgressPayload = initialPayload
-                sink.success(parseJsonPayload(initialPayload))
-            } catch (e: Exception) {
-                android.util.Log.w(
-                    "SpotiFLAC",
-                    "Library scan progress initial poll failed: ${e.message}",
-                )
-            }
             while (isActive && libraryScanProgressEventSink === sink) {
                 try {
                     val payload = withContext(Dispatchers.IO) {
@@ -490,7 +457,7 @@ class MainActivity: FlutterFragmentActivity() {
                     }
                     if (payload != lastLibraryScanProgressPayload) {
                         lastLibraryScanProgressPayload = payload
-                        sink.success(parseJsonPayload(payload))
+                        sink.success(payload)
                     }
                 } catch (e: Exception) {
                     android.util.Log.w(
@@ -498,7 +465,7 @@ class MainActivity: FlutterFragmentActivity() {
                         "Library scan progress stream poll failed: ${e.message}",
                     )
                 }
-                delay(LIBRARY_SCAN_PROGRESS_STREAM_POLLING_INTERVAL_MS)
+                delay(STREAM_POLLING_INTERVAL_MS)
             }
         }
     }
@@ -632,6 +599,7 @@ class MainActivity: FlutterFragmentActivity() {
      * Resolve extension from a MediaStore URI by querying DISPLAY_NAME or MIME_TYPE.
      */
     private fun resolveMediaStoreExt(uri: Uri, fallbackExt: String?): String {
+        // Try DISPLAY_NAME first
         try {
             contentResolver.query(uri, arrayOf(android.provider.MediaStore.MediaColumns.DISPLAY_NAME), null, null, null)?.use { cursor ->
                 if (cursor.moveToFirst()) {
@@ -642,6 +610,7 @@ class MainActivity: FlutterFragmentActivity() {
             }
         } catch (_: Exception) {}
 
+        // Try MIME_TYPE
         try {
             val mime = contentResolver.getType(uri)
             val ext = extFromMimeType(mime)
@@ -789,59 +758,29 @@ class MainActivity: FlutterFragmentActivity() {
         return if (ext.isNullOrBlank()) "audio" else "audio$ext"
     }
 
-    private fun buildLibraryCoverCacheKey(stablePath: String, lastModified: Long): String {
-        val normalizedPath = stablePath.trim()
-        if (normalizedPath.isEmpty()) return ""
-        return if (lastModified > 0L) "$normalizedPath|$lastModified" else normalizedPath
-    }
-
     private fun readAudioMetadataFromUri(
         uri: Uri,
         displayNameHint: String? = null,
         fallbackExt: String? = null,
-        coverCacheKey: String = "",
     ): JSONObject? {
         val displayName = buildUriDisplayName(uri, displayNameHint, fallbackExt)
 
-        // Skip /proc/self/fd/ attempt when known to fail (e.g. Samsung SELinux).
-        if (procSelfFdReadable != false) {
-            try {
-                contentResolver.openFileDescriptor(uri, "r")?.use { pfd ->
-                    val directPath = "/proc/self/fd/${pfd.fd}"
-                    val metadataJson = Gobackend.readAudioMetadataWithHintAndCoverCacheKeyJSON(
-                        directPath,
-                        displayName,
-                        coverCacheKey,
-                    )
-                    if (metadataJson.isNotBlank()) {
-                        val obj = JSONObject(metadataJson)
-                        val filenameFallback = obj.optBoolean("metadataFromFilename", false)
-                        if (!obj.has("error") && !filenameFallback) {
-                            procSelfFdReadable = true
-                            return obj
-                        }
-                        // Go could not read real metadata from the fd path –
-                        // remember so we skip the attempt for remaining files.
-                        if (procSelfFdReadable == null) {
-                            procSelfFdReadable = false
-                            android.util.Log.d(
-                                "SpotiFLAC",
-                                "Direct /proc/self/fd read not usable on this device, " +
-                                    "using temp-file fallback for remaining files",
-                            )
-                        }
+        try {
+            contentResolver.openFileDescriptor(uri, "r")?.use { pfd ->
+                val directPath = "/proc/self/fd/${pfd.fd}"
+                val metadataJson = Gobackend.readAudioMetadataWithHintJSON(directPath, displayName)
+                if (metadataJson.isNotBlank()) {
+                    val obj = JSONObject(metadataJson)
+                    if (!obj.has("error")) {
+                        return obj
                     }
                 }
-            } catch (e: Exception) {
-                if (procSelfFdReadable == null) {
-                    procSelfFdReadable = false
-                    android.util.Log.d(
-                        "SpotiFLAC",
-                        "Direct /proc/self/fd read not usable on this device, " +
-                            "using temp-file fallback for remaining files",
-                    )
-                }
             }
+        } catch (e: Exception) {
+            android.util.Log.d(
+                "SpotiFLAC",
+                "Direct SAF metadata read fallback for $uri: ${e.message}",
+            )
         }
 
         val tempPath = try {
@@ -855,11 +794,7 @@ class MainActivity: FlutterFragmentActivity() {
         } ?: return null
 
         try {
-            val metadataJson = Gobackend.readAudioMetadataWithHintAndCoverCacheKeyJSON(
-                tempPath,
-                displayName,
-                coverCacheKey,
-            )
+            val metadataJson = Gobackend.readAudioMetadataWithHintJSON(tempPath, displayName)
             if (metadataJson.isBlank()) return null
             val obj = JSONObject(metadataJson)
             return if (obj.has("error")) null else obj
@@ -901,6 +836,8 @@ class MainActivity: FlutterFragmentActivity() {
         val mimeType = mimeTypeForExt(outputExt)
         val fileName = buildSafFileName(req, outputExt)
 
+        // Check for existing file WITHOUT creating the directory first.
+        // This prevents empty folders from being created for duplicate downloads.
         val existingDir = findDocumentDir(treeUri, relativeDir)
         if (existingDir != null) {
             val existing = existingDir.findFile(fileName)
@@ -915,6 +852,7 @@ class MainActivity: FlutterFragmentActivity() {
             }
         }
 
+        // Only create the directory now that we know we need to download
         val targetDir = ensureDocumentDir(treeUri, relativeDir)
             ?: return errorJson("Failed to access SAF directory")
 
@@ -937,6 +875,7 @@ class MainActivity: FlutterFragmentActivity() {
             val respObj = JSONObject(response)
             if (respObj.optBoolean("success", false)) {
                 // Extension providers write to a local temp path instead of the SAF FD.
+                // Copy the local file into the SAF document so it is not empty.
                 val goFilePath = respObj.optString("file_path", "")
                 if (goFilePath.isNotEmpty() &&
                     !goFilePath.startsWith("content://") &&
@@ -985,10 +924,15 @@ class MainActivity: FlutterFragmentActivity() {
         try {
             val docId = android.provider.DocumentsContract.getDocumentId(childUri)
             if (docId.isNullOrEmpty()) return null
+
+            // Document IDs typically look like "primary:Music/Album/file.cue"
+            // Parent would be "primary:Music/Album"
             val lastSlash = docId.lastIndexOf('/')
             if (lastSlash <= 0) return null
 
             val parentDocId = docId.substring(0, lastSlash)
+
+            // Build a tree document URI for the parent so it supports listing/findFile
             val treeDocId = android.provider.DocumentsContract.getTreeDocumentId(childUri)
             if (treeDocId.isNullOrEmpty()) return null
 
@@ -1013,17 +957,21 @@ class MainActivity: FlutterFragmentActivity() {
             val lines = File(cueTempPath).readLines()
             for (line in lines) {
                 val trimmed = line.trim().let { l ->
+                    // Strip BOM
                     if (l.startsWith("\uFEFF")) l.removePrefix("\uFEFF").trim() else l
                 }
                 if (trimmed.uppercase(Locale.ROOT).startsWith("FILE ")) {
                     val rest = trimmed.substring(5).trim()
+                    // Parse: "filename" TYPE  or  filename TYPE
                     val filename = if (rest.startsWith("\"")) {
                         val endQuote = rest.indexOf('"', 1)
                         if (endQuote > 0) rest.substring(1, endQuote) else rest
                     } else {
+                        // Last word is the type, everything else is the filename
                         val parts = rest.split("\\s+".toRegex())
                         if (parts.size >= 2) parts.dropLast(1).joinToString(" ") else rest
                     }
+                    // Return just the filename (strip any path separators)
                     return filename.substringAfterLast("/").substringAfterLast("\\")
                 }
             }
@@ -1108,6 +1056,7 @@ class MainActivity: FlutterFragmentActivity() {
 
         val supportedAudioExt = setOf(".flac", ".m4a", ".mp3", ".opus", ".ogg")
         val audioFiles = mutableListOf<Pair<DocumentFile, String>>()
+        // CUE files: (cueDoc, parentDir) — we need the parent to find sibling audio
         val cueFiles = mutableListOf<Pair<DocumentFile, DocumentFile>>()
         val visitedDirUris = mutableSetOf<String>()
         val safChildLookupCache = mutableMapOf<String, Map<String, DocumentFile>>()
@@ -1192,6 +1141,7 @@ class MainActivity: FlutterFragmentActivity() {
         var scanned = 0
         var errors = traversalErrors
 
+        // --- CUE first pass: parse CUE sheets, expand to tracks, track referenced audio ---
         val cueReferencedAudioUris = mutableSetOf<String>()
 
         for ((cueDoc, parentDir) in cueFiles) {
@@ -1230,17 +1180,14 @@ class MainActivity: FlutterFragmentActivity() {
                     continue
                 }
 
+                // Mark this audio file so we skip it in the regular audio pass
                 cueReferencedAudioUris.add(audioDoc.uri.toString())
 
+                // Copy audio to same temp dir so Go can resolve it
                 val tempDir = File(tempCuePath).parent ?: cacheDir.absolutePath
                 val audioName = try { audioDoc.name ?: "audio.flac" } catch (_: Exception) { "audio.flac" }
                 val audioExt = audioName.substringAfterLast('.', "").lowercase(Locale.ROOT)
                 val fallbackAudioExt = if (audioExt.isNotBlank()) ".$audioExt" else null
-                val audioLastModified = try { audioDoc.lastModified() } catch (_: Exception) { cueDoc.lastModified() }
-                val coverCacheKey = buildLibraryCoverCacheKey(
-                    audioDoc.uri.toString(),
-                    audioLastModified,
-                )
 
                 tempAudioPath = copyUriToTemp(audioDoc.uri, fallbackAudioExt)
                 if (tempAudioPath == null) {
@@ -1250,6 +1197,7 @@ class MainActivity: FlutterFragmentActivity() {
                     continue
                 }
 
+                // Rename temp audio to its original name so Go can find it by name
                 val renamedAudio = File(tempDir, audioName)
                 val tempAudioFile = File(tempAudioPath)
                 if (renamedAudio.absolutePath != tempAudioFile.absolutePath) {
@@ -1259,12 +1207,11 @@ class MainActivity: FlutterFragmentActivity() {
 
                 val cueLastModified = try { cueDoc.lastModified() } catch (_: Exception) { 0L }
 
-                val cueResultsJson = Gobackend.scanCueSheetForLibraryWithCoverCacheKey(
+                val cueResultsJson = Gobackend.scanCueSheetForLibrary(
                     tempCuePath,
                     tempDir,
                     cueDoc.uri.toString(),
-                    cueLastModified,
-                    coverCacheKey,
+                    cueLastModified
                 )
 
                 val cueArray = JSONArray(cueResultsJson)
@@ -1293,12 +1240,14 @@ class MainActivity: FlutterFragmentActivity() {
             }
         }
 
+        // --- Regular audio file pass: skip files referenced by CUE sheets ---
         for ((doc, _) in audioFiles) {
             if (safScanCancel) {
                 updateSafScanProgress { it.isComplete = true }
                 return "[]"
             }
 
+            // Skip audio files that are represented by CUE track entries
             if (cueReferencedAudioUris.contains(doc.uri.toString())) {
                 scanned++
                 val pct = scanned.toDouble() / totalItems.toDouble() * 100.0
@@ -1316,19 +1265,13 @@ class MainActivity: FlutterFragmentActivity() {
 
             val ext = name.substringAfterLast('.', "").lowercase(Locale.ROOT)
             val fallbackExt = if (ext.isNotBlank()) ".${ext}" else null
-            val lastModified = try { doc.lastModified() } catch (_: Exception) { 0L }
-            val stableUri = doc.uri.toString()
-            val coverCacheKey = buildLibraryCoverCacheKey(stableUri, lastModified)
-            val metadataObj = readAudioMetadataFromUri(
-                doc.uri,
-                name,
-                fallbackExt,
-                coverCacheKey,
-            )
+            val metadataObj = readAudioMetadataFromUri(doc.uri, name, fallbackExt)
             if (metadataObj == null) {
                 errors++
             } else {
                 try {
+                    val lastModified = try { doc.lastModified() } catch (_: Exception) { 0L }
+                    val stableUri = doc.uri.toString()
                     metadataObj.put("id", buildStableLibraryId(stableUri))
                     metadataObj.put("filePath", stableUri)
                     metadataObj.put("fileModTime", lastModified)
@@ -1383,6 +1326,7 @@ class MainActivity: FlutterFragmentActivity() {
             return result.toString()
         }
 
+        // Parse existing files map: URI -> lastModified
         val existingFiles = mutableMapOf<String, Long>()
         try {
             val obj = JSONObject(existingFilesJson)
@@ -1401,15 +1345,20 @@ class MainActivity: FlutterFragmentActivity() {
         }
 
         val supportedAudioExt = setOf(".flac", ".m4a", ".mp3", ".opus", ".ogg")
-        val audioFiles = mutableListOf<Triple<DocumentFile, String, Long>>()
+        val audioFiles = mutableListOf<Triple<DocumentFile, String, Long>>() // doc, path, lastModified
+        // CUE files to scan: (cueDoc, parentDir, lastModified)
         val cueFilesToScan = mutableListOf<Triple<DocumentFile, DocumentFile, Long>>()
+        // Unchanged CUE files: (cueDoc, parentDir) — need to discover audio siblings for skip set
         val unchangedCueFiles = mutableListOf<Pair<DocumentFile, DocumentFile>>()
         val currentUris = mutableSetOf<String>()
         val visitedDirUris = mutableSetOf<String>()
         val safChildLookupCache = mutableMapOf<String, Map<String, DocumentFile>>()
         var traversalErrors = 0
 
-        val existingCueVirtualPaths = mutableMapOf<String, MutableList<String>>()
+        // Build a map of CUE base URIs -> existing virtual track URIs from the database.
+        // Virtual paths look like "content://...album.cue#track01".
+        // We need this to preserve virtual paths for unchanged CUE files.
+        val existingCueVirtualPaths = mutableMapOf<String, MutableList<String>>() // cueUri -> [virtualPaths]
         for (key in existingFiles.keys) {
             val hashIdx = key.indexOf("#track")
             if (hashIdx > 0) {
@@ -1418,6 +1367,7 @@ class MainActivity: FlutterFragmentActivity() {
             }
         }
 
+        // Collect all files with lastModified
         val queue: ArrayDeque<Pair<DocumentFile, String>> = ArrayDeque()
         queue.add(root to "")
 
@@ -1473,6 +1423,8 @@ class MainActivity: FlutterFragmentActivity() {
                         }
                         queue.add(child to childPath)
                     } else if (child.isFile) {
+                        // Mark file as present first so it cannot be mis-classified as removed
+                        // when provider-specific metadata calls (e.g., lastModified) fail.
                         val uriStr = child.uri.toString()
                         currentUris.add(uriStr)
 
@@ -1484,15 +1436,18 @@ class MainActivity: FlutterFragmentActivity() {
                                 child.lastModified()
                             } catch (_: Exception) { 0L }
 
+                            // Check if any virtual track from this CUE exists with matching modTime
                             val virtualPaths = existingCueVirtualPaths[uriStr]
                             val existingModified = virtualPaths?.firstOrNull()?.let { existingFiles[it] }
 
                             if (existingModified != null && existingModified == lastModified) {
+                                // CUE is unchanged — mark virtual paths as current so they aren't removed
                                 unchangedCueFiles.add(child to dir)
                                 for (vp in virtualPaths) {
                                     currentUris.add(vp)
                                 }
                             } else {
+                                // CUE is new or modified — needs scanning
                                 cueFilesToScan.add(Triple(child, dir, lastModified))
                             }
                         } else if (ext.isNotBlank() && supportedAudioExt.contains(".$ext")) {
@@ -1503,6 +1458,7 @@ class MainActivity: FlutterFragmentActivity() {
                                 existingModified ?: 0L
                             }
 
+                            // Check if file is new or modified
                             if (existingModified == null || existingModified != lastModified) {
                                 audioFiles.add(Triple(child, path, lastModified))
                             }
@@ -1519,6 +1475,7 @@ class MainActivity: FlutterFragmentActivity() {
             }
         }
 
+        // Find removed files (in existing but not in current)
         val removedUris = existingFiles.keys.filter { !currentUris.contains(it) }
         val totalFiles = currentUris.size
         val filesToProcess = audioFiles.size + cueFilesToScan.size
@@ -1546,6 +1503,7 @@ class MainActivity: FlutterFragmentActivity() {
         var scanned = 0
         var errors = traversalErrors
 
+        // --- CUE first pass: parse new/modified CUE sheets ---
         val cueReferencedAudioUris = mutableSetOf<String>()
 
         for ((cueDoc, parentDir, cueLastModified) in cueFilesToScan) {
@@ -1566,6 +1524,7 @@ class MainActivity: FlutterFragmentActivity() {
             var tempCuePath: String? = null
             var tempAudioPath: String? = null
             try {
+                // Copy CUE to temp
                 tempCuePath = copyUriToTemp(cueDoc.uri, ".cue")
                 if (tempCuePath == null) {
                     errors++
@@ -1574,8 +1533,10 @@ class MainActivity: FlutterFragmentActivity() {
                     continue
                 }
 
+                // Extract the audio filename from the CUE sheet text
                 val audioFileName = extractCueAudioFileName(tempCuePath)
 
+                // Find the referenced audio file as a sibling in the same SAF directory
                 val audioDoc = resolveCueAudioSibling(
                     parentDir = parentDir,
                     cueName = cueName,
@@ -1590,17 +1551,14 @@ class MainActivity: FlutterFragmentActivity() {
                     continue
                 }
 
+                // Mark this audio file so we skip it in the regular audio pass
                 cueReferencedAudioUris.add(audioDoc.uri.toString())
 
+                // Copy audio to same temp dir so Go can resolve it
                 val tempDir = File(tempCuePath).parent ?: cacheDir.absolutePath
                 val audioName = try { audioDoc.name ?: "audio.flac" } catch (_: Exception) { "audio.flac" }
                 val audioExt = audioName.substringAfterLast('.', "").lowercase(Locale.ROOT)
                 val fallbackAudioExt = if (audioExt.isNotBlank()) ".$audioExt" else null
-                val audioLastModified = try { audioDoc.lastModified() } catch (_: Exception) { cueLastModified }
-                val coverCacheKey = buildLibraryCoverCacheKey(
-                    audioDoc.uri.toString(),
-                    audioLastModified,
-                )
 
                 tempAudioPath = copyUriToTemp(audioDoc.uri, fallbackAudioExt)
                 if (tempAudioPath == null) {
@@ -1610,6 +1568,7 @@ class MainActivity: FlutterFragmentActivity() {
                     continue
                 }
 
+                // Rename temp audio to its original name so Go can find it by name
                 val renamedAudio = File(tempDir, audioName)
                 val tempAudioFile = File(tempAudioPath)
                 if (renamedAudio.absolutePath != tempAudioFile.absolutePath) {
@@ -1617,18 +1576,19 @@ class MainActivity: FlutterFragmentActivity() {
                     tempAudioPath = renamedAudio.absolutePath
                 }
 
-                val cueResultsJson = Gobackend.scanCueSheetForLibraryWithCoverCacheKey(
+                // Call Go to produce library scan entries for each CUE track
+                val cueResultsJson = Gobackend.scanCueSheetForLibrary(
                     tempCuePath,
                     tempDir,
                     cueDoc.uri.toString(),
-                    cueLastModified,
-                    coverCacheKey,
+                    cueLastModified
                 )
 
                 val cueArray = JSONArray(cueResultsJson)
                 for (j in 0 until cueArray.length()) {
                     val trackObj = cueArray.getJSONObject(j)
                     results.put(trackObj)
+                    // Register each virtual path as current so deletion detection works
                     val virtualPath = trackObj.optString("filePath", "")
                     if (virtualPath.isNotBlank()) {
                         currentUris.add(virtualPath)
@@ -1661,6 +1621,9 @@ class MainActivity: FlutterFragmentActivity() {
             }
         }
 
+        // Discover audio siblings for unchanged CUE files so we skip them
+        // in the regular audio pass. Copy the .cue to temp (tiny file) to extract
+        // the audio filename, then find the sibling by name.
         for ((cueDoc, parentDir) in unchangedCueFiles) {
             var tempCue: String? = null
             try {
@@ -1685,6 +1648,7 @@ class MainActivity: FlutterFragmentActivity() {
             }
         }
 
+        // --- Regular audio file pass: skip files referenced by CUE sheets ---
         for ((doc, _, lastModified) in audioFiles) {
             if (safScanCancel) {
                 updateSafScanProgress { it.isComplete = true }
@@ -1697,6 +1661,7 @@ class MainActivity: FlutterFragmentActivity() {
                 return result.toString()
             }
 
+            // Skip audio files that are represented by CUE track entries
             if (cueReferencedAudioUris.contains(doc.uri.toString())) {
                 scanned++
                 val processed = skippedCount + scanned
@@ -1719,19 +1684,13 @@ class MainActivity: FlutterFragmentActivity() {
 
             val ext = name.substringAfterLast('.', "").lowercase(Locale.ROOT)
             val fallbackExt = if (ext.isNotBlank()) ".${ext}" else null
-            val safeLastModified = try { doc.lastModified() } catch (_: Exception) { lastModified }
-            val stableUri = doc.uri.toString()
-            val coverCacheKey = buildLibraryCoverCacheKey(stableUri, safeLastModified)
-            val metadataObj = readAudioMetadataFromUri(
-                doc.uri,
-                name,
-                fallbackExt,
-                coverCacheKey,
-            )
+            val metadataObj = readAudioMetadataFromUri(doc.uri, name, fallbackExt)
             if (metadataObj == null) {
                 errors++
             } else {
                 try {
+                    val safeLastModified = try { doc.lastModified() } catch (_: Exception) { lastModified }
+                    val stableUri = doc.uri.toString()
                     metadataObj.put("id", buildStableLibraryId(stableUri))
                     metadataObj.put("filePath", stableUri)
                     metadataObj.put("fileModTime", safeLastModified)
@@ -1756,6 +1715,7 @@ class MainActivity: FlutterFragmentActivity() {
             }
         }
 
+        // Recalculate removedUris now that CUE virtual paths have been registered
         val finalRemovedUris = existingFiles.keys.filter { !currentUris.contains(it) }
 
         updateSafScanProgress {
@@ -1933,6 +1893,7 @@ class MainActivity: FlutterFragmentActivity() {
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
+        // Update the intent so receive_sharing_intent can access the new data
         setIntent(intent)
     }
 
@@ -2011,6 +1972,13 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(null)
                         }
+                        "parseSpotifyUrl" -> {
+                            val url = call.argument<String>("url") ?: ""
+                            val response = withContext(Dispatchers.IO) {
+                                Gobackend.parseSpotifyURL(url)
+                            }
+                            result.success(response)
+                        }
                         "checkAvailability" -> {
                             val spotifyId = call.argument<String>("spotify_id") ?: ""
                             val isrc = call.argument<String>("isrc") ?: ""
@@ -2032,13 +2000,13 @@ class MainActivity: FlutterFragmentActivity() {
                             val response = withContext(Dispatchers.IO) {
                                 Gobackend.getDownloadProgress()
                             }
-                            result.success(parseJsonPayload(response))
+                            result.success(response)
                         }
                         "getAllDownloadProgress" -> {
                             val response = withContext(Dispatchers.IO) {
                                 Gobackend.getAllDownloadProgress()
                             }
-                            result.success(parseJsonPayload(response))
+                            result.success(response)
                         }
                         "initItemProgress" -> {
                             val itemId = call.argument<String>("item_id") ?: ""
@@ -2379,41 +2347,6 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
-                        "rewriteSplitArtistTags" -> {
-                            val filePath = call.argument<String>("file_path") ?: ""
-                            val artist = call.argument<String>("artist") ?: ""
-                            val albumArtist = call.argument<String>("album_artist") ?: ""
-                            val response = withContext(Dispatchers.IO) {
-                                if (filePath.startsWith("content://")) {
-                                    val uri = Uri.parse(filePath)
-                                    val tempPath = copyUriToTemp(uri, ".flac")
-                                        ?: return@withContext errorJson("Failed to copy SAF file to temp")
-                                    try {
-                                        val raw = Gobackend.rewriteSplitArtistTagsExport(tempPath, artist, albumArtist)
-                                        val obj = JSONObject(raw)
-                                        if (!obj.optBoolean("success", false)) {
-                                            return@withContext raw
-                                        }
-
-                                        if (!writeUriFromPath(uri, tempPath)) {
-                                            return@withContext errorJson("Failed to write rewritten tags back to SAF file")
-                                        }
-
-                                        obj.put("file_path", filePath)
-                                        obj.toString()
-                                    } catch (e: Exception) {
-                                        errorJson("Failed to rewrite split artist tags in SAF file: ${e.message}")
-                                    } finally {
-                                        try {
-                                            File(tempPath).delete()
-                                        } catch (_: Exception) {}
-                                    }
-                                } else {
-                                    Gobackend.rewriteSplitArtistTagsExport(filePath, artist, albumArtist)
-                                }
-                            }
-                            result.success(response)
-                        }
                         "cleanupConnections" -> {
                             withContext(Dispatchers.IO) {
                                 Gobackend.cleanupConnections()
@@ -2463,13 +2396,11 @@ class MainActivity: FlutterFragmentActivity() {
                                                 return@withContext obj.toString()
                                                 // Note: temp file NOT deleted here - Dart will clean up after FFmpeg + writeTempToSaf
                                             }
-                            // FLAC: Go wrote directly to temp, copy back now
-                            if (!writeUriFromPath(uri, tempPath)) {
-                                try { File(tempPath).delete() } catch (_: Exception) {}
-                                return@withContext """{"error":"Failed to write metadata back to SAF file"}"""
-                            }
-                            try { File(tempPath).delete() } catch (_: Exception) {}
-                            raw
+                                            // FLAC: Go wrote directly to temp, copy back now
+                                            if (!writeUriFromPath(uri, tempPath)) {
+                                                return@withContext """{"error":"Failed to write metadata back to SAF file"}"""
+                                            }
+                                            raw
                                         } catch (e: Exception) {
                                             try { File(tempPath).delete() } catch (_: Exception) {}
                                             throw e
@@ -2546,27 +2477,12 @@ class MainActivity: FlutterFragmentActivity() {
                             val spotifyId = call.argument<String>("spotify_id") ?: ""
                             val durationMs = call.argument<Number>("duration_ms")?.toLong() ?: 0L
                             val outputPath = call.argument<String>("output_path") ?: ""
-                            val rawAudioFilePath = call.argument<String>("audio_file_path") ?: ""
                             val response = withContext(Dispatchers.IO) {
-                                var safAudioTemp: String? = null
                                 try {
-                                    // Resolve SAF content:// URI to a temp file the Go backend can read
-                                    val audioFilePath = if (rawAudioFilePath.startsWith("content://")) {
-                                        val uri = Uri.parse(rawAudioFilePath)
-                                        val tempPath = copyUriToTemp(uri)
-                                        safAudioTemp = tempPath
-                                        tempPath ?: ""
-                                    } else {
-                                        rawAudioFilePath
-                                    }
-                                    Gobackend.fetchAndSaveLyrics(trackName, artistName, spotifyId, durationMs, outputPath, audioFilePath)
+                                    Gobackend.fetchAndSaveLyrics(trackName, artistName, spotifyId, durationMs, outputPath)
                                     """{"success":true}"""
                                 } catch (e: Exception) {
                                     """{"success":false,"error":"${e.message?.replace("\"", "'")}"}"""
-                                } finally {
-                                    if (safAudioTemp != null) {
-                                        try { File(safAudioTemp).delete() } catch (_: Exception) {}
-                                    }
                                 }
                             }
                             result.success(response)
@@ -2637,6 +2553,7 @@ class MainActivity: FlutterFragmentActivity() {
                                         val tempPath = copyUriToTemp(uri)
                                             ?: return@withContext """{"error":"Failed to copy SAF file to temp"}"""
                                         try {
+                                            // Replace file_path with temp path for Go
                                             reqObj.put("file_path", tempPath)
                                             val raw = Gobackend.reEnrichFile(reqObj.toString())
                                             val obj = JSONObject(raw)
@@ -2714,6 +2631,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(null)
                         }
+                        // Deezer API methods
                         "searchDeezerAll" -> {
                             val query = call.argument<String>("query") ?: ""
                             val trackLimit = call.argument<Int>("track_limit") ?: 15
@@ -2724,6 +2642,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        // Tidal search API
                         "searchTidalAll" -> {
                             val query = call.argument<String>("query") ?: ""
                             val trackLimit = call.argument<Int>("track_limit") ?: 15
@@ -2734,6 +2653,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        // Qobuz search API
                         "searchQobuzAll" -> {
                             val query = call.argument<String>("query") ?: ""
                             val trackLimit = call.argument<Int>("track_limit") ?: 15
@@ -2826,6 +2746,13 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        "getSpotifyMetadataWithFallback" -> {
+                            val url = call.argument<String>("url") ?: ""
+                            val response = withContext(Dispatchers.IO) {
+                                Gobackend.getSpotifyMetadataWithDeezerFallback(url)
+                            }
+                            result.success(response)
+                        }
                         "checkAvailabilityFromDeezerID" -> {
                             val deezerTrackId = call.argument<String>("deezer_track_id") ?: ""
                             val response = withContext(Dispatchers.IO) {
@@ -2856,6 +2783,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        // Log methods
                         "getLogs" -> {
                             val response = withContext(Dispatchers.IO) {
                                 Gobackend.getLogs()
@@ -2888,6 +2816,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(null)
                         }
+                        // Extension System methods
                         "initExtensionSystem" -> {
                             val extensionsDir = call.argument<String>("extensions_dir") ?: ""
                             val dataDir = call.argument<String>("data_dir") ?: ""
@@ -3032,6 +2961,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(null)
                         }
+                        // Extension Auth API methods
                         "getExtensionPendingAuth" -> {
                             val extensionId = call.argument<String>("extension_id") ?: ""
                             val response = withContext(Dispatchers.IO) {
@@ -3081,6 +3011,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        // Extension FFmpeg API
                         "getPendingFFmpegCommand" -> {
                             val commandId = call.argument<String>("command_id") ?: ""
                             val response = withContext(Dispatchers.IO) {
@@ -3108,6 +3039,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        // Extension Custom Search API
                         "customSearchWithExtension" -> {
                             val extensionId = call.argument<String>("extension_id") ?: ""
                             val query = call.argument<String>("query") ?: ""
@@ -3123,6 +3055,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        // Extension URL Handler API
                         "handleURLWithExtension" -> {
                             val url = call.argument<String>("url") ?: ""
                             val response = withContext(Dispatchers.IO) {
@@ -3167,6 +3100,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        // Extension Post-Processing API
                         "runPostProcessing" -> {
                             val filePath = call.argument<String>("file_path") ?: ""
                             val metadataJson = call.argument<String>("metadata") ?: ""
@@ -3210,6 +3144,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        // Extension Store
                         "initExtensionStore" -> {
                             val cacheDir = call.argument<String>("cache_dir") ?: ""
                             withContext(Dispatchers.IO) {
@@ -3271,6 +3206,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(null)
                         }
+                        // Extension Home Feed (Explore)
                         "getExtensionHomeFeed" -> {
                             val extensionId = call.argument<String>("extension_id") ?: ""
                             val response = withContext(Dispatchers.IO) {
@@ -3285,6 +3221,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        // Local Library Scanning
                         "setLibraryCoverCacheDir" -> {
                             val cacheDir = call.argument<String>("cache_dir") ?: ""
                             withContext(Dispatchers.IO) {
@@ -3361,7 +3298,7 @@ class MainActivity: FlutterFragmentActivity() {
                                     Gobackend.getLibraryScanProgressJSON()
                                 }
                             }
-                            result.success(parseJsonPayload(response))
+                            result.success(response)
                         }
                         "cancelLibraryScan" -> {
                             withContext(Dispatchers.IO) {
@@ -3389,6 +3326,7 @@ class MainActivity: FlutterFragmentActivity() {
                             }
                             result.success(response)
                         }
+                        // CUE Sheet Parsing
                         "parseCueSheet" -> {
                             val cuePath = call.argument<String>("cue_path") ?: ""
                             val audioDir = call.argument<String>("audio_dir") ?: ""
@@ -3400,14 +3338,17 @@ class MainActivity: FlutterFragmentActivity() {
                                             ?: return@withContext """{"error":"Failed to copy CUE file to temp"}"""
                                         var tempAudioPath: String? = null
                                         try {
+                                            // Extract audio filename from CUE text
                                             val audioFileName = extractCueAudioFileName(tempCuePath)
 
+                                            // Try to find the audio sibling in SAF
                                             var audioDoc: DocumentFile? = null
                                             val parentDir = safParentDir(uri)
                                             if (parentDir != null && !audioFileName.isNullOrBlank()) {
                                                 audioDoc = try { parentDir.findFile(audioFileName) } catch (_: Exception) { null }
                                             }
 
+                                            // Fallback: try common extensions with the CUE base name
                                             if (audioDoc == null && parentDir != null) {
                                                 val cueName = try {
                                                     DocumentFile.fromSingleUri(this@MainActivity, uri)?.name ?: ""
@@ -3426,6 +3367,7 @@ class MainActivity: FlutterFragmentActivity() {
 
                                             val tempDir = File(tempCuePath).parent ?: cacheDir.absolutePath
                                             if (audioDoc != null) {
+                                                // Copy audio to same temp dir with original name
                                                 val audioName = try { audioDoc.name ?: "audio.flac" } catch (_: Exception) { "audio.flac" }
                                                 val audioExt = audioName.substringAfterLast('.', "").lowercase(Locale.ROOT)
                                                 val fallbackExt = if (audioExt.isNotBlank()) ".$audioExt" else null
@@ -3440,11 +3382,15 @@ class MainActivity: FlutterFragmentActivity() {
                                                 }
                                             }
 
+                                            // Parse with audio in temp dir; Go will resolve there
                                             val resultJson = Gobackend.parseCueSheet(tempCuePath, tempDir)
 
+                                            // Replace the temp audio_path with the SAF content:// URI
+                                            // so Dart knows it's a SAF file and handles it accordingly
                                             if (audioDoc != null) {
                                                 val resultObj = JSONObject(resultJson)
                                                 resultObj.put("audio_path", audioDoc.uri.toString())
+                                                // Also pass the original CUE URI for reference
                                                 resultObj.put("cue_path", cuePath)
                                                 resultObj.toString()
                                             } else {

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip

android/settings.gradle.kts

@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
     id("com.android.application") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
 }
 
 include(":app")

go_backend/ape_tags.go

@@ -1,609 +0,0 @@
-package gobackend
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-	"os"
-	"strconv"
-	"strings"
-)
-
-// APEv2 tag format constants.
-const (
-	apeTagPreamble     = "APETAGEX"
-	apeTagHeaderSize   = 32
-	apeTagVersion2     = 2000
-	apeTagFlagHeader   = 1 << 29 // bit 29: this is the header, not the footer
-	apeTagFlagReadOnly = 1 << 0
-	// Item flags: bits 1-2 encode content type
-	apeItemFlagUTF8   = 0 << 1 // 00: UTF-8 text
-	apeItemFlagBinary = 1 << 1 // 01: binary data
-	apeItemFlagLink   = 2 << 1 // 10: external link
-)
-
-// APETagItem represents a single key-value item in an APEv2 tag.
-type APETagItem struct {
-	Key   string
-	Value string
-	Flags uint32
-}
-
-// APETag represents a complete APEv2 tag block.
-type APETag struct {
-	Version  uint32
-	Items    []APETagItem
-	ReadOnly bool
-}
-
-// ReadAPETags reads APEv2 tags from a file.
-// APEv2 tags are typically appended at the end of the file.
-// The layout is: [audio data] [APEv2 header (optional)] [items...] [APEv2 footer]
-// We locate the footer first (last 32 bytes), then read the tag block.
-func ReadAPETags(filePath string) (*APETag, error) {
-	f, err := os.Open(filePath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open file: %w", err)
-	}
-	defer f.Close()
-
-	fi, err := f.Stat()
-	if err != nil {
-		return nil, fmt.Errorf("failed to stat file: %w", err)
-	}
-	fileSize := fi.Size()
-
-	if fileSize < apeTagHeaderSize {
-		return nil, fmt.Errorf("file too small for APE tag")
-	}
-
-	// Try to find APE tag footer at the end of file.
-	// The footer is the last 32 bytes before any ID3v1 tag (128 bytes).
-	tag, err := readAPETagAtOffset(f, fileSize, fileSize-apeTagHeaderSize)
-	if err == nil {
-		return tag, nil
-	}
-
-	// Retry: skip ID3v1 tag (128 bytes) if present
-	if fileSize > apeTagHeaderSize+128 {
-		tag, err = readAPETagAtOffset(f, fileSize, fileSize-apeTagHeaderSize-128)
-		if err == nil {
-			return tag, nil
-		}
-	}
-
-	return nil, fmt.Errorf("no APEv2 tag found")
-}
-
-func readAPETagAtOffset(f *os.File, fileSize, footerOffset int64) (*APETag, error) {
-	if footerOffset < 0 || footerOffset+apeTagHeaderSize > fileSize {
-		return nil, fmt.Errorf("invalid footer offset")
-	}
-
-	footer := make([]byte, apeTagHeaderSize)
-	if _, err := f.ReadAt(footer, footerOffset); err != nil {
-		return nil, fmt.Errorf("failed to read APE footer: %w", err)
-	}
-
-	if string(footer[0:8]) != apeTagPreamble {
-		return nil, fmt.Errorf("APE preamble not found")
-	}
-
-	version := binary.LittleEndian.Uint32(footer[8:12])
-	tagSize := binary.LittleEndian.Uint32(footer[12:16]) // size of items + footer (32 bytes)
-	itemCount := binary.LittleEndian.Uint32(footer[16:20])
-	flags := binary.LittleEndian.Uint32(footer[20:24])
-
-	if version != apeTagVersion2 && version != 1000 {
-		return nil, fmt.Errorf("unsupported APE tag version: %d", version)
-	}
-	if tagSize < apeTagHeaderSize {
-		return nil, fmt.Errorf("APE tag size too small: %d", tagSize)
-	}
-	if itemCount > 1000 {
-		return nil, fmt.Errorf("APE tag item count too large: %d", itemCount)
-	}
-
-	// This should be the footer (bit 29 clear)
-	isHeader := (flags & apeTagFlagHeader) != 0
-	if isHeader {
-		return nil, fmt.Errorf("expected APE footer but found header")
-	}
-
-	// tagSize includes items + footer (32 bytes), but NOT the header.
-	itemsSize := int64(tagSize) - apeTagHeaderSize
-	if itemsSize < 0 {
-		return nil, fmt.Errorf("invalid APE tag: items size negative")
-	}
-
-	itemsOffset := footerOffset - itemsSize
-	if itemsOffset < 0 {
-		return nil, fmt.Errorf("APE tag items extend before file start")
-	}
-
-	itemsData := make([]byte, itemsSize)
-	if _, err := f.ReadAt(itemsData, itemsOffset); err != nil {
-		return nil, fmt.Errorf("failed to read APE items: %w", err)
-	}
-
-	items, err := parseAPEItems(itemsData, int(itemCount))
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse APE items: %w", err)
-	}
-
-	return &APETag{
-		Version:  version,
-		Items:    items,
-		ReadOnly: (flags & apeTagFlagReadOnly) != 0,
-	}, nil
-}
-
-func parseAPEItems(data []byte, count int) ([]APETagItem, error) {
-	items := make([]APETagItem, 0, count)
-	pos := 0
-
-	for i := 0; i < count && pos < len(data); i++ {
-		if pos+8 > len(data) {
-			break
-		}
-
-		valueSize := int(binary.LittleEndian.Uint32(data[pos : pos+4]))
-		itemFlags := binary.LittleEndian.Uint32(data[pos+4 : pos+8])
-		pos += 8
-
-		// Key is null-terminated ASCII (2-255 bytes, case-insensitive)
-		keyEnd := pos
-		for keyEnd < len(data) && data[keyEnd] != 0 {
-			keyEnd++
-		}
-		if keyEnd >= len(data) {
-			break
-		}
-
-		key := string(data[pos:keyEnd])
-		pos = keyEnd + 1
-
-		if pos+valueSize > len(data) {
-			break
-		}
-		value := string(data[pos : pos+valueSize])
-		pos += valueSize
-
-		items = append(items, APETagItem{
-			Key:   key,
-			Value: value,
-			Flags: itemFlags,
-		})
-	}
-
-	return items, nil
-}
-
-// WriteAPETags writes APEv2 tags to the end of a file.
-// If the file already has APEv2 tags, they are replaced.
-// The tag is written with both header and footer.
-func WriteAPETags(filePath string, tag *APETag) error {
-	existingSize, err := findExistingAPETagSize(filePath)
-	if err != nil {
-		return fmt.Errorf("failed to check existing APE tag: %w", err)
-	}
-
-	tagData, err := marshalAPETag(tag)
-	if err != nil {
-		return fmt.Errorf("failed to marshal APE tag: %w", err)
-	}
-
-	if existingSize > 0 {
-		fi, err := os.Stat(filePath)
-		if err != nil {
-			return fmt.Errorf("failed to stat file: %w", err)
-		}
-		newSize := fi.Size() - int64(existingSize)
-		if err := os.Truncate(filePath, newSize); err != nil {
-			return fmt.Errorf("failed to truncate existing APE tag: %w", err)
-		}
-	}
-
-	f, err := os.OpenFile(filePath, os.O_WRONLY|os.O_APPEND, 0644)
-	if err != nil {
-		return fmt.Errorf("failed to open file for writing: %w", err)
-	}
-	defer f.Close()
-
-	if _, err := f.Write(tagData); err != nil {
-		return fmt.Errorf("failed to write APE tag: %w", err)
-	}
-
-	return nil
-}
-
-// findExistingAPETagSize returns the total size of an existing APE tag
-// (header + items + footer) at the end of the file, or 0 if none exists.
-func findExistingAPETagSize(filePath string) (int64, error) {
-	f, err := os.Open(filePath)
-	if err != nil {
-		return 0, err
-	}
-	defer f.Close()
-
-	fi, err := f.Stat()
-	if err != nil {
-		return 0, err
-	}
-	fileSize := fi.Size()
-
-	offsets := []int64{fileSize - apeTagHeaderSize}
-	if fileSize > apeTagHeaderSize+128 {
-		offsets = append(offsets, fileSize-apeTagHeaderSize-128)
-	}
-
-	for _, offset := range offsets {
-		if offset < 0 {
-			continue
-		}
-		footer := make([]byte, apeTagHeaderSize)
-		if _, err := f.ReadAt(footer, offset); err != nil {
-			continue
-		}
-		if string(footer[0:8]) != apeTagPreamble {
-			continue
-		}
-
-		flags := binary.LittleEndian.Uint32(footer[20:24])
-		if (flags & apeTagFlagHeader) != 0 {
-			continue
-		}
-
-		tagSize := int64(binary.LittleEndian.Uint32(footer[12:16]))
-
-		// Check if there's also a header (tagSize only covers items + footer)
-		hasHeader := (flags & (1 << 31)) != 0 // bit 31 = tag contains header
-		totalSize := tagSize
-		if hasHeader {
-			totalSize += apeTagHeaderSize
-		}
-
-		// Include any trailing data after the footer (e.g. ID3v1 128-byte tag).
-		// When truncating, we must remove the APE tag AND everything after it.
-		trailingBytes := fileSize - (offset + apeTagHeaderSize)
-		totalSize += trailingBytes
-
-		return totalSize, nil
-	}
-
-	return 0, nil
-}
-
-// marshalAPETag serializes an APETag into bytes (header + items + footer).
-func marshalAPETag(tag *APETag) ([]byte, error) {
-	if tag == nil || len(tag.Items) == 0 {
-		return nil, fmt.Errorf("empty APE tag")
-	}
-
-	var itemsData []byte
-	for _, item := range tag.Items {
-		keyBytes := []byte(item.Key)
-		valueBytes := []byte(item.Value)
-
-		// 4 bytes: value size (LE)
-		sizeBuf := make([]byte, 4)
-		binary.LittleEndian.PutUint32(sizeBuf, uint32(len(valueBytes)))
-
-		// 4 bytes: item flags (LE)
-		flagsBuf := make([]byte, 4)
-		binary.LittleEndian.PutUint32(flagsBuf, item.Flags)
-
-		itemsData = append(itemsData, sizeBuf...)
-		itemsData = append(itemsData, flagsBuf...)
-		itemsData = append(itemsData, keyBytes...)
-		itemsData = append(itemsData, 0)
-		itemsData = append(itemsData, valueBytes...)
-	}
-
-	// tagSize = items data + footer (32 bytes)
-	tagSize := uint32(len(itemsData) + apeTagHeaderSize)
-	itemCount := uint32(len(tag.Items))
-
-	version := uint32(apeTagVersion2)
-	if tag.Version != 0 {
-		version = tag.Version
-	}
-
-	// flags: bit 29 = 1 (is header), bit 31 = 1 (contains header)
-	headerFlags := uint32(apeTagFlagHeader | (1 << 31))
-	header := buildAPEHeaderFooter(version, tagSize, itemCount, headerFlags)
-
-	// flags: bit 29 = 0 (is footer), bit 31 = 1 (contains header)
-	footerFlags := uint32(1 << 31)
-	footer := buildAPEHeaderFooter(version, tagSize, itemCount, footerFlags)
-
-	// Final layout: header + items + footer
-	result := make([]byte, 0, len(header)+len(itemsData)+len(footer))
-	result = append(result, header...)
-	result = append(result, itemsData...)
-	result = append(result, footer...)
-
-	return result, nil
-}
-
-func buildAPEHeaderFooter(version, tagSize, itemCount, flags uint32) []byte {
-	buf := make([]byte, apeTagHeaderSize)
-	copy(buf[0:8], apeTagPreamble)
-	binary.LittleEndian.PutUint32(buf[8:12], version)
-	binary.LittleEndian.PutUint32(buf[12:16], tagSize)
-	binary.LittleEndian.PutUint32(buf[16:20], itemCount)
-	binary.LittleEndian.PutUint32(buf[20:24], flags)
-	// bytes 24-31 are reserved (zeros)
-	return buf
-}
-
-// APETagToAudioMetadata converts an APETag to our unified AudioMetadata struct.
-func APETagToAudioMetadata(tag *APETag) *AudioMetadata {
-	if tag == nil {
-		return nil
-	}
-
-	metadata := &AudioMetadata{}
-	for _, item := range tag.Items {
-		key := strings.ToUpper(strings.TrimSpace(item.Key))
-		value := strings.TrimSpace(item.Value)
-		if value == "" {
-			continue
-		}
-
-		switch key {
-		case "TITLE":
-			metadata.Title = value
-		case "ARTIST":
-			metadata.Artist = value
-		case "ALBUM":
-			metadata.Album = value
-		case "ALBUMARTIST", "ALBUM ARTIST":
-			metadata.AlbumArtist = value
-		case "GENRE":
-			metadata.Genre = value
-		case "YEAR":
-			metadata.Year = value
-		case "DATE":
-			metadata.Date = value
-		case "TRACK", "TRACKNUMBER":
-			// APE track format can be "3" or "3/12"
-			trackNum, _ := strconv.Atoi(strings.Split(value, "/")[0])
-			metadata.TrackNumber = trackNum
-		case "DISC", "DISCNUMBER":
-			discNum, _ := strconv.Atoi(strings.Split(value, "/")[0])
-			metadata.DiscNumber = discNum
-		case "ISRC":
-			metadata.ISRC = value
-		case "LYRICS", "UNSYNCEDLYRICS":
-			if metadata.Lyrics == "" {
-				metadata.Lyrics = value
-			}
-		case "LABEL", "PUBLISHER":
-			metadata.Label = value
-		case "COPYRIGHT":
-			metadata.Copyright = value
-		case "COMPOSER":
-			metadata.Composer = value
-		case "COMMENT":
-			metadata.Comment = value
-		case "REPLAYGAIN_TRACK_GAIN":
-			metadata.ReplayGainTrackGain = value
-		case "REPLAYGAIN_TRACK_PEAK":
-			metadata.ReplayGainTrackPeak = value
-		case "REPLAYGAIN_ALBUM_GAIN":
-			metadata.ReplayGainAlbumGain = value
-		case "REPLAYGAIN_ALBUM_PEAK":
-			metadata.ReplayGainAlbumPeak = value
-		}
-	}
-
-	return metadata
-}
-
-// AudioMetadataToAPEItems converts metadata fields to APE tag items.
-func AudioMetadataToAPEItems(metadata *AudioMetadata) []APETagItem {
-	if metadata == nil {
-		return nil
-	}
-
-	var items []APETagItem
-	addItem := func(key, value string) {
-		if value != "" {
-			items = append(items, APETagItem{Key: key, Value: value})
-		}
-	}
-
-	addItem("Title", metadata.Title)
-	addItem("Artist", metadata.Artist)
-	addItem("Album", metadata.Album)
-	addItem("Album Artist", metadata.AlbumArtist)
-	addItem("Genre", metadata.Genre)
-	if metadata.Date != "" {
-		addItem("Year", metadata.Date)
-	} else if metadata.Year != "" {
-		addItem("Year", metadata.Year)
-	}
-	if metadata.TrackNumber > 0 {
-		addItem("Track", strconv.Itoa(metadata.TrackNumber))
-	}
-	if metadata.DiscNumber > 0 {
-		addItem("Disc", strconv.Itoa(metadata.DiscNumber))
-	}
-	addItem("ISRC", metadata.ISRC)
-	addItem("Lyrics", metadata.Lyrics)
-	addItem("Label", metadata.Label)
-	addItem("Copyright", metadata.Copyright)
-	addItem("Composer", metadata.Composer)
-	addItem("Comment", metadata.Comment)
-	addItem("REPLAYGAIN_TRACK_GAIN", metadata.ReplayGainTrackGain)
-	addItem("REPLAYGAIN_TRACK_PEAK", metadata.ReplayGainTrackPeak)
-	addItem("REPLAYGAIN_ALBUM_GAIN", metadata.ReplayGainAlbumGain)
-	addItem("REPLAYGAIN_ALBUM_PEAK", metadata.ReplayGainAlbumPeak)
-
-	return items
-}
-
-// apeKeysFromFields builds a set of upper-case APE tag keys corresponding to
-// the metadata fields map sent by the editor.  This is used during merge to
-// ensure that even empty (cleared) fields override old values.
-func apeKeysFromFields(fields map[string]string) map[string]struct{} {
-	mapping := map[string]string{
-		"title":                 "TITLE",
-		"artist":                "ARTIST",
-		"album":                 "ALBUM",
-		"album_artist":          "ALBUM ARTIST",
-		"date":                  "YEAR",
-		"genre":                 "GENRE",
-		"track_number":          "TRACK",
-		"disc_number":           "DISC",
-		"isrc":                  "ISRC",
-		"lyrics":                "LYRICS",
-		"label":                 "LABEL",
-		"copyright":             "COPYRIGHT",
-		"composer":              "COMPOSER",
-		"comment":               "COMMENT",
-		"replaygain_track_gain": "REPLAYGAIN_TRACK_GAIN",
-		"replaygain_track_peak": "REPLAYGAIN_TRACK_PEAK",
-		"replaygain_album_gain": "REPLAYGAIN_ALBUM_GAIN",
-		"replaygain_album_peak": "REPLAYGAIN_ALBUM_PEAK",
-	}
-	result := make(map[string]struct{})
-	for fk, apeKey := range mapping {
-		if _, present := fields[fk]; present {
-			result[strings.ToUpper(apeKey)] = struct{}{}
-		}
-	}
-	// Some fields have reader aliases that must also be cleared when the
-	// canonical key is updated (e.g. "Year" writer ↔ DATE/YEAR reader,
-	// DISC ↔ DISCNUMBER, TRACK ↔ TRACKNUMBER, "ALBUM ARTIST" ↔ ALBUMARTIST,
-	// LABEL ↔ PUBLISHER, LYRICS ↔ UNSYNCEDLYRICS).
-	if _, present := fields["date"]; present {
-		result["DATE"] = struct{}{}
-	}
-	if _, present := fields["disc_number"]; present {
-		result["DISCNUMBER"] = struct{}{}
-	}
-	if _, present := fields["track_number"]; present {
-		result["TRACKNUMBER"] = struct{}{}
-	}
-	if _, present := fields["album_artist"]; present {
-		result["ALBUMARTIST"] = struct{}{}
-	}
-	if _, present := fields["label"]; present {
-		result["PUBLISHER"] = struct{}{}
-	}
-	if _, present := fields["lyrics"]; present {
-		result["UNSYNCEDLYRICS"] = struct{}{}
-	}
-	return result
-}
-
-// MergeAPEItems overlays newItems on top of existing items.
-// For each new item, if a matching key exists (case-insensitive) in existing,
-// it is replaced. New keys are appended. Existing items whose keys are NOT
-// in newItems are preserved (cover art, ReplayGain, custom tags, etc.).
-//
-// overrideKeys is an optional set of upper-case keys that should be removed
-// from existing even if they do not appear in newItems.  This handles field
-// deletion: the caller sends an empty value which is not serialized into
-// newItems, but the old value must still be dropped.
-func MergeAPEItems(existing, newItems []APETagItem, overrideKeys map[string]struct{}) []APETagItem {
-	// Build a set of keys being updated (upper-case for case-insensitive match)
-	combined := make(map[string]struct{}, len(newItems)+len(overrideKeys))
-	for k := range overrideKeys {
-		combined[strings.ToUpper(k)] = struct{}{}
-	}
-	for _, item := range newItems {
-		combined[strings.ToUpper(item.Key)] = struct{}{}
-	}
-
-	var merged []APETagItem
-	for _, item := range existing {
-		if _, overwritten := combined[strings.ToUpper(item.Key)]; !overwritten {
-			merged = append(merged, item)
-		}
-	}
-
-	merged = append(merged, newItems...)
-
-	return merged
-}
-
-// ReadAPETagsFromReader reads APEv2 tags from an io.ReaderAt + size.
-// This is useful for reading APE tags from files opened via SAF or other abstractions.
-func ReadAPETagsFromReader(r io.ReaderAt, fileSize int64) (*APETag, error) {
-	if fileSize < apeTagHeaderSize {
-		return nil, fmt.Errorf("file too small for APE tag")
-	}
-
-	// Try footer at end of file
-	footer := make([]byte, apeTagHeaderSize)
-	if _, err := r.ReadAt(footer, fileSize-apeTagHeaderSize); err != nil {
-		return nil, fmt.Errorf("failed to read APE footer: %w", err)
-	}
-
-	if string(footer[0:8]) == apeTagPreamble {
-		tag, err := parseAPETagFromFooter(r, fileSize, fileSize-apeTagHeaderSize, footer)
-		if err == nil {
-			return tag, nil
-		}
-	}
-
-	// Retry: skip ID3v1 tag (128 bytes)
-	if fileSize > apeTagHeaderSize+128 {
-		offset := fileSize - apeTagHeaderSize - 128
-		if _, err := r.ReadAt(footer, offset); err == nil {
-			if string(footer[0:8]) == apeTagPreamble {
-				tag, err := parseAPETagFromFooter(r, fileSize, offset, footer)
-				if err == nil {
-					return tag, nil
-				}
-			}
-		}
-	}
-
-	return nil, fmt.Errorf("no APEv2 tag found")
-}
-
-func parseAPETagFromFooter(r io.ReaderAt, fileSize, footerOffset int64, footer []byte) (*APETag, error) {
-	version := binary.LittleEndian.Uint32(footer[8:12])
-	tagSize := binary.LittleEndian.Uint32(footer[12:16])
-	itemCount := binary.LittleEndian.Uint32(footer[16:20])
-	flags := binary.LittleEndian.Uint32(footer[20:24])
-
-	if version != apeTagVersion2 && version != 1000 {
-		return nil, fmt.Errorf("unsupported APE tag version: %d", version)
-	}
-	if tagSize < apeTagHeaderSize {
-		return nil, fmt.Errorf("APE tag size too small: %d", tagSize)
-	}
-	if itemCount > 1000 {
-		return nil, fmt.Errorf("APE tag item count too large: %d", itemCount)
-	}
-	if (flags & apeTagFlagHeader) != 0 {
-		return nil, fmt.Errorf("expected footer, found header")
-	}
-
-	itemsSize := int64(tagSize) - apeTagHeaderSize
-	itemsOffset := footerOffset - itemsSize
-	if itemsOffset < 0 {
-		return nil, fmt.Errorf("APE items extend before file start")
-	}
-
-	itemsData := make([]byte, itemsSize)
-	if _, err := r.ReadAt(itemsData, itemsOffset); err != nil {
-		return nil, fmt.Errorf("failed to read APE items: %w", err)
-	}
-
-	items, err := parseAPEItems(itemsData, int(itemCount))
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse APE items: %w", err)
-	}
-
-	return &APETag{
-		Version:  version,
-		Items:    items,
-		ReadOnly: (flags & apeTagFlagReadOnly) != 0,
-	}, nil
-}

go_backend/audio_metadata.go

@@ -28,11 +28,6 @@ type AudioMetadata struct {
 	Copyright   string
 	Composer    string
 	Comment     string
-	// ReplayGain fields (text values, e.g. "-6.50 dB", "0.988831")
-	ReplayGainTrackGain string
-	ReplayGainTrackPeak string
-	ReplayGainAlbumGain string
-	ReplayGainAlbumPeak string
 }
 
 type MP3Quality struct {
@@ -316,17 +311,6 @@ func parseID3v23Frames(data []byte, metadata *AudioMetadata, version byte, tagUn
 			if isLyricsDescription(desc) && userValue != "" && metadata.Lyrics == "" {
 				metadata.Lyrics = userValue
 			}
-			upperDesc := strings.ToUpper(desc)
-			switch upperDesc {
-			case "REPLAYGAIN_TRACK_GAIN":
-				metadata.ReplayGainTrackGain = userValue
-			case "REPLAYGAIN_TRACK_PEAK":
-				metadata.ReplayGainTrackPeak = userValue
-			case "REPLAYGAIN_ALBUM_GAIN":
-				metadata.ReplayGainAlbumGain = userValue
-			case "REPLAYGAIN_ALBUM_PEAK":
-				metadata.ReplayGainAlbumPeak = userValue
-			}
 		}
 
 		pos += 10 + frameSize
@@ -354,6 +338,7 @@ func readID3v1(file *os.File) (*AudioMetadata, error) {
 		Year:   strings.TrimRight(string(tag[93:97]), " \x00"),
 	}
 
+	// ID3v1.1 track number (if byte 125 is 0 and byte 126 is not)
 	if tag[125] == 0 && tag[126] != 0 {
 		metadata.TrackNumber = int(tag[126])
 	}
@@ -388,23 +373,27 @@ func extractTextFrame(data []byte) string {
 	}
 }
 
+// extractCommentFrame parses an ID3v2 COMM frame.
+// Format: encoding(1) + language(3) + description(null-terminated) + text
 func extractCommentFrame(data []byte) string {
 	if len(data) < 5 {
 		return ""
 	}
 	encoding := data[0]
+	// skip 3-byte language code
 	rest := data[4:]
 
+	// find null terminator separating description from text
 	var text []byte
 	switch encoding {
-	case 1, 2:
+	case 1, 2: // UTF-16 variants use double-null terminator
 		for i := 0; i+1 < len(rest); i += 2 {
 			if rest[i] == 0 && rest[i+1] == 0 {
 				text = rest[i+2:]
 				break
 			}
 		}
-	default:
+	default: // ISO-8859-1 or UTF-8
 		idx := bytes.IndexByte(rest, 0)
 		if idx >= 0 && idx+1 < len(rest) {
 			text = rest[idx+1:]
@@ -417,30 +406,33 @@ func extractCommentFrame(data []byte) string {
 		return ""
 	}
 
+	// re-prepend encoding byte so extractTextFrame can decode properly
 	framed := make([]byte, 1+len(text))
 	framed[0] = encoding
 	copy(framed[1:], text)
 	return extractTextFrame(framed)
 }
 
+// extractLyricsFrame parses ID3 unsynchronized lyrics frames (USLT/ULT).
+// Format: encoding(1) + language(3) + description(null-terminated) + lyrics text.
 func extractLyricsFrame(data []byte) string {
 	if len(data) < 5 {
 		return ""
 	}
 
 	encoding := data[0]
-	rest := data[4:]
+	rest := data[4:] // skip 3-byte language code
 
 	var text []byte
 	switch encoding {
-	case 1, 2:
+	case 1, 2: // UTF-16 variants use double-null terminator
 		for i := 0; i+1 < len(rest); i += 2 {
 			if rest[i] == 0 && rest[i+1] == 0 {
 				text = rest[i+2:]
 				break
 			}
 		}
-	default:
+	default: // ISO-8859-1 or UTF-8
 		idx := bytes.IndexByte(rest, 0)
 		if idx >= 0 && idx+1 < len(rest) {
 			text = rest[idx+1:]
@@ -459,6 +451,8 @@ func extractLyricsFrame(data []byte) string {
 	return extractTextFrame(framed)
 }
 
+// extractUserTextFrame parses ID3 TXXX/TXX user text frame:
+// encoding(1) + description + separator + value.
 func extractUserTextFrame(data []byte) (string, string) {
 	if len(data) < 2 {
 		return "", ""
@@ -469,7 +463,7 @@ func extractUserTextFrame(data []byte) (string, string) {
 
 	var descRaw, valueRaw []byte
 	switch encoding {
-	case 1, 2:
+	case 1, 2: // UTF-16 variants
 		for i := 0; i+1 < len(payload); i += 2 {
 			if payload[i] == 0 && payload[i+1] == 0 {
 				descRaw = payload[:i]
@@ -477,7 +471,7 @@ func extractUserTextFrame(data []byte) (string, string) {
 				break
 			}
 		}
-	default:
+	default: // ISO-8859-1 or UTF-8
 		idx := bytes.IndexByte(payload, 0)
 		if idx >= 0 {
 			descRaw = payload[:idx]
@@ -504,13 +498,7 @@ func extractUserTextFrame(data []byte) (string, string) {
 
 func isLyricsDescription(description string) bool {
 	switch strings.ToLower(strings.TrimSpace(description)) {
-	case
-		"lyrics",
-		"lyric",
-		"unsyncedlyrics",
-		"unsynced lyrics",
-		"uslt",
-		"lrc":
+	case "lyrics", "lyric", "unsyncedlyrics", "unsynced lyrics", "lrc":
 		return true
 	default:
 		return false
@@ -671,6 +659,7 @@ func GetMP3Quality(filePath string) (*MP3Quality, error) {
 
 	file.Seek(audioStart, io.SeekStart)
 
+	// Find first valid MP3 frame sync
 	frameHeader := make([]byte, 4)
 	var frameStart int64 = -1
 	for i := 0; i < 10000; i++ {
@@ -697,6 +686,8 @@ func GetMP3Quality(filePath string) (*MP3Quality, error) {
 	sampleRateIdx := (frameHeader[2] >> 2) & 0x03
 	channelMode := (frameHeader[3] >> 6) & 0x03
 
+	// Sample rate tables: [version][index]
+	// version: 0=MPEG2.5, 1=reserved, 2=MPEG2, 3=MPEG1
 	sampleRates := [][]int{
 		{11025, 12000, 8000},
 		{0, 0, 0},
@@ -707,12 +698,15 @@ func GetMP3Quality(filePath string) (*MP3Quality, error) {
 		quality.SampleRate = sampleRates[version][sampleRateIdx]
 	}
 
+	// Bitrate tables for all MPEG versions and layers
+	// MPEG1 Layer III
 	if version == 3 && layer == 1 {
 		bitrates := []int{0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 0}
 		if bitrateIdx < 16 {
 			quality.Bitrate = bitrates[bitrateIdx] * 1000
 		}
 	}
+	// MPEG2/2.5 Layer III
 	if (version == 0 || version == 2) && layer == 1 {
 		bitrates := []int{0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0}
 		if bitrateIdx < 16 {
@@ -720,11 +714,14 @@ func GetMP3Quality(filePath string) (*MP3Quality, error) {
 		}
 	}
 
+	// Determine samples per frame for duration calculation
 	samplesPerFrame := 1152 // MPEG1 Layer III
 	if version == 0 || version == 2 {
 		samplesPerFrame = 576 // MPEG2/2.5 Layer III
 	}
 
+	// Try to read Xing/VBRI header from the first frame for VBR info
+	// Xing header offset depends on MPEG version and channel mode
 	var xingOffset int
 	if version == 3 { // MPEG1
 		if channelMode == 3 { // Mono
@@ -740,6 +737,7 @@ func GetMP3Quality(filePath string) (*MP3Quality, error) {
 		}
 	}
 
+	// Read enough of the first frame to find Xing/VBRI header
 	xingBuf := make([]byte, 200)
 	file.Seek(frameStart+4, io.SeekStart)
 	n, _ := io.ReadFull(file, xingBuf)
@@ -749,6 +747,7 @@ func GetMP3Quality(filePath string) (*MP3Quality, error) {
 	vbrBytes := int64(0)
 	isVBR := false
 
+	// Check for Xing/Info header
 	if xingOffset+8 <= n {
 		tag := string(xingBuf[xingOffset : xingOffset+4])
 		if tag == "Xing" || tag == "Info" {
@@ -767,6 +766,7 @@ func GetMP3Quality(filePath string) (*MP3Quality, error) {
 		}
 	}
 
+	// Check for VBRI header (always at offset 32 from frame start + 4)
 	if !isVBR && 36+26 <= n {
 		if string(xingBuf[32:36]) == "VBRI" {
 			vbrBytes = int64(binary.BigEndian.Uint32(xingBuf[36+6 : 36+10]))
@@ -778,9 +778,11 @@ func GetMP3Quality(filePath string) (*MP3Quality, error) {
 	}
 
 	if isVBR && vbrFrames > 0 && quality.SampleRate > 0 {
+		// Accurate duration from total frames
 		totalSamples := int64(vbrFrames) * int64(samplesPerFrame)
 		quality.Duration = int(totalSamples / int64(quality.SampleRate))
 
+		// Accurate average bitrate
 		if vbrBytes > 0 && quality.Duration > 0 {
 			quality.Bitrate = int(vbrBytes * 8 / int64(quality.Duration))
 		} else if quality.Duration > 0 {
@@ -788,6 +790,7 @@ func GetMP3Quality(filePath string) (*MP3Quality, error) {
 			quality.Bitrate = int(audioSize * 8 / int64(quality.Duration))
 		}
 	} else if quality.Bitrate > 0 {
+		// CBR fallback: estimate duration from file size and frame bitrate
 		audioSize := fileSize - audioStart - 128 // subtract possible ID3v1 tag
 		if audioSize > 0 {
 			quality.Duration = int(audioSize * 8 / int64(quality.Bitrate))
@@ -971,9 +974,8 @@ func parseVorbisComments(data []byte, metadata *AudioMetadata) {
 	}
 
 	reader := bytes.NewReader(data)
-	artistValues := make([]string, 0, 1)
-	albumArtistValues := make([]string, 0, 1)
 
+	// Read vendor string length
 	var vendorLen uint32
 	if err := binary.Read(reader, binary.LittleEndian, &vendorLen); err != nil {
 		return
@@ -1002,6 +1004,8 @@ func parseVorbisComments(data []byte, metadata *AudioMetadata) {
 		if commentLen > remaining {
 			break
 		}
+		// Large comment entries are typically METADATA_BLOCK_PICTURE.
+		// Skip them so we can continue parsing normal text tags after/before.
 		if commentLen > 512*1024 {
 			reader.Seek(int64(commentLen), io.SeekCurrent)
 			continue
@@ -1024,9 +1028,9 @@ func parseVorbisComments(data []byte, metadata *AudioMetadata) {
 		case "TITLE":
 			metadata.Title = value
 		case "ARTIST":
-			artistValues = append(artistValues, value)
+			metadata.Artist = value
 		case "ALBUMARTIST", "ALBUM_ARTIST", "ALBUM ARTIST":
-			albumArtistValues = append(albumArtistValues, value)
+			metadata.AlbumArtist = value
 		case "ALBUM":
 			metadata.Album = value
 		case "DATE", "YEAR":
@@ -1054,23 +1058,8 @@ func parseVorbisComments(data []byte, metadata *AudioMetadata) {
 			metadata.Label = value
 		case "COPYRIGHT":
 			metadata.Copyright = value
-		case "REPLAYGAIN_TRACK_GAIN":
-			metadata.ReplayGainTrackGain = value
-		case "REPLAYGAIN_TRACK_PEAK":
-			metadata.ReplayGainTrackPeak = value
-		case "REPLAYGAIN_ALBUM_GAIN":
-			metadata.ReplayGainAlbumGain = value
-		case "REPLAYGAIN_ALBUM_PEAK":
-			metadata.ReplayGainAlbumPeak = value
 		}
 	}
-
-	if len(artistValues) > 0 {
-		metadata.Artist = joinVorbisCommentValues(artistValues)
-	}
-	if len(albumArtistValues) > 0 {
-		metadata.AlbumArtist = joinVorbisCommentValues(albumArtistValues)
-	}
 }
 
 func GetOggQuality(filePath string) (*OggQuality, error) {
@@ -1119,6 +1108,7 @@ func GetOggQuality(filePath string) (*OggQuality, error) {
 		}
 	}
 
+	// Read granule position from the last Ogg page for accurate duration
 	stat, err := file.Stat()
 	if err != nil {
 		return quality, nil
@@ -1128,6 +1118,7 @@ func GetOggQuality(filePath string) (*OggQuality, error) {
 	granule := readLastOggGranulePosition(file, fileSize)
 	if granule > 0 {
 		if isOpus {
+			// Opus always uses 48kHz granule position internally
 			totalSamples := granule - int64(preSkip)
 			if totalSamples > 0 {
 				durationSec := float64(totalSamples) / 48000.0
@@ -1145,9 +1136,11 @@ func GetOggQuality(filePath string) (*OggQuality, error) {
 		}
 	}
 
+	// Fallback bitrate estimate if duration exists but bitrate couldn't be derived.
 	if quality.Bitrate <= 0 && quality.Duration > 0 {
 		quality.Bitrate = int(fileSize * 8 / int64(quality.Duration))
 	}
+	// Guard against obviously invalid values from corrupted/unreliable granule reads.
 	if quality.Duration > 24*60*60 {
 		quality.Duration = 0
 		quality.Bitrate = 0
@@ -1159,7 +1152,10 @@ func GetOggQuality(filePath string) (*OggQuality, error) {
 	return quality, nil
 }
 
+// readLastOggGranulePosition seeks to the end of the file and scans backwards
+// to find the last Ogg page, then reads its granule position (bytes 6-13).
 func readLastOggGranulePosition(file *os.File, fileSize int64) int64 {
+	// Read the last chunk of the file to find the last OggS sync
 	searchSize := int64(65536)
 	if searchSize > fileSize {
 		searchSize = fileSize
@@ -1183,6 +1179,7 @@ func readLastOggGranulePosition(file *os.File, fileSize int64) int64 {
 		if i+27 > n {
 			continue
 		}
+		// Validate minimal header fields to avoid false positives inside payload bytes.
 		version := buf[i+4]
 		headerType := buf[i+5]
 		if version != 0 || headerType > 0x07 {
@@ -1200,6 +1197,7 @@ func readLastOggGranulePosition(file *os.File, fileSize int64) int64 {
 		if i+headerLen+payloadLen > n {
 			continue
 		}
+		// Granule position is at bytes 6-13 of the Ogg page header (little-endian int64).
 		return int64(binary.LittleEndian.Uint64(buf[i+6 : i+14]))
 	}
 	return 0
@@ -1259,6 +1257,7 @@ func extractMP3CoverArt(filePath string) ([]byte, string, error) {
 		return nil, "", err
 	}
 
+	// Parse frames looking for APIC (Attached Picture)
 	pos := 0
 	var frameIDLen, headerLen int
 	if majorVersion == 2 {
@@ -1289,6 +1288,7 @@ func extractMP3CoverArt(filePath string) ([]byte, string, error) {
 			break
 		}
 
+		// Check for APIC (ID3v2.3/2.4) or PIC (ID3v2.2)
 		if (frameIDLen == 4 && frameID == "APIC") || (frameIDLen == 3 && frameID == "PIC") {
 			frameData := tagData[pos+headerLen : pos+headerLen+frameSize]
 			imageData, mimeType := parseAPICFrame(frameData, majorVersion)
@@ -1614,28 +1614,14 @@ func extractAnyCoverArtWithHint(filePath, displayNameHint string) ([]byte, strin
 }
 
 func SaveCoverToCache(filePath, cacheDir string) (string, error) {
-	return SaveCoverToCacheWithHintAndKey(filePath, "", cacheDir, "")
+	return SaveCoverToCacheWithHint(filePath, "", cacheDir)
 }
 
 func SaveCoverToCacheWithHint(filePath, displayNameHint, cacheDir string) (string, error) {
-	return SaveCoverToCacheWithHintAndKey(filePath, displayNameHint, cacheDir, "")
-}
-
-func resolveLibraryCoverCacheKey(filePath, explicitKey string) string {
-	explicitKey = strings.TrimSpace(explicitKey)
-	if explicitKey != "" {
-		return explicitKey
-	}
-
 	cacheKey := filePath
 	if stat, err := os.Stat(filePath); err == nil {
 		cacheKey = fmt.Sprintf("%s|%d|%d", filePath, stat.Size(), stat.ModTime().UnixNano())
 	}
-	return cacheKey
-}
-
-func SaveCoverToCacheWithHintAndKey(filePath, displayNameHint, cacheDir, coverCacheKey string) (string, error) {
-	cacheKey := resolveLibraryCoverCacheKey(filePath, coverCacheKey)
 	hash := hashString(cacheKey)
 
 	jpgPath := filepath.Join(cacheDir, fmt.Sprintf("cover_%x.jpg", hash))

go_backend/audio_metadata_cache_test.go

@@ -1,34 +0,0 @@
-package gobackend
-
-import (
-	"os"
-	"strings"
-	"testing"
-)
-
-func TestResolveLibraryCoverCacheKeyUsesExplicitKey(t *testing.T) {
-	t.Parallel()
-
-	const explicitKey = "content://media/external/audio/media/42|123456"
-	got := resolveLibraryCoverCacheKey("/tmp/saf_random.flac", explicitKey)
-	if got != explicitKey {
-		t.Fatalf("expected explicit cache key %q, got %q", explicitKey, got)
-	}
-}
-
-func TestResolveLibraryCoverCacheKeyUsesFilePathAndStatWhenNoExplicitKey(t *testing.T) {
-	t.Parallel()
-
-	tempFile, err := os.CreateTemp("", "cover-cache-*.flac")
-	if err != nil {
-		t.Fatalf("CreateTemp failed: %v", err)
-	}
-	tempPath := tempFile.Name()
-	tempFile.Close()
-	defer os.Remove(tempPath)
-
-	got := resolveLibraryCoverCacheKey(tempPath, "")
-	if !strings.HasPrefix(got, tempPath+"|") {
-		t.Fatalf("expected stat-based cache key to start with %q, got %q", tempPath+"|", got)
-	}
-}

go_backend/audio_metadata_mp3_test.go

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

go_backend/cover.go

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

go_backend/cue_parser.go

@@ -11,7 +11,9 @@ import (
 	"strings"
 )
 
+// CueSheet represents a parsed .cue file
 type CueSheet struct {
+	// Album-level metadata
 	Performer string     `json:"performer"`
 	Title     string     `json:"title"`
 	FileName  string     `json:"file_name"`
@@ -23,16 +25,19 @@ type CueSheet struct {
 	Tracks    []CueTrack `json:"tracks"`
 }
 
+// CueTrack represents a single track in a cue sheet
 type CueTrack struct {
-	Number    int     `json:"number"`
-	Title     string  `json:"title"`
-	Performer string  `json:"performer"`
-	ISRC      string  `json:"isrc,omitempty"`
-	Composer  string  `json:"composer,omitempty"`
+	Number    int    `json:"number"`
+	Title     string `json:"title"`
+	Performer string `json:"performer"`
+	ISRC      string `json:"isrc,omitempty"`
+	Composer  string `json:"composer,omitempty"`
+	// Index positions in seconds (fractional)
 	StartTime float64 `json:"start_time"` // INDEX 01 in seconds
 	PreGap    float64 `json:"pre_gap"`    // INDEX 00 in seconds (or -1 if not present)
 }
 
+// CueSplitInfo represents the information needed to split a CUE+audio file
 type CueSplitInfo struct {
 	CuePath   string          `json:"cue_path"`
 	AudioPath string          `json:"audio_path"`
@@ -43,6 +48,7 @@ type CueSplitInfo struct {
 	Tracks    []CueSplitTrack `json:"tracks"`
 }
 
+// CueSplitTrack has the FFmpeg split parameters for a single track
 type CueSplitTrack struct {
 	Number   int     `json:"number"`
 	Title    string  `json:"title"`
@@ -58,6 +64,7 @@ var (
 	reQuoted     = regexp.MustCompile(`"([^"]*)"`)
 )
 
+// ParseCueFile parses a .cue file and returns a CueSheet
 func ParseCueFile(cuePath string) (*CueSheet, error) {
 	f, err := os.Open(cuePath)
 	if err != nil {
@@ -75,6 +82,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 			continue
 		}
 
+		// Handle BOM at start of file
 		if strings.HasPrefix(line, "\xef\xbb\xbf") {
 			line = strings.TrimPrefix(line, "\xef\xbb\xbf")
 			line = strings.TrimSpace(line)
@@ -82,6 +90,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 
 		upper := strings.ToUpper(line)
 
+		// REM commands (album-level metadata)
 		if strings.HasPrefix(upper, "REM ") {
 			matches := reRemCommand.FindStringSubmatch(line)
 			if len(matches) == 3 {
@@ -127,6 +136,9 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 
 		if strings.HasPrefix(upper, "FILE ") {
 			rest := line[len("FILE "):]
+			// Extract filename and type
+			// Format: FILE "filename.flac" WAVE
+			// or: FILE filename.flac WAVE
 			fname, ftype := parseCueFileLine(rest)
 			sheet.FileName = fname
 			sheet.FileType = ftype
@@ -134,6 +146,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 		}
 
 		if strings.HasPrefix(upper, "TRACK ") {
+			// Save previous track
 			if currentTrack != nil {
 				sheet.Tracks = append(sheet.Tracks, *currentTrack)
 			}
@@ -171,6 +184,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 			continue
 		}
 
+		// SONGWRITER (used as composer sometimes)
 		if strings.HasPrefix(upper, "SONGWRITER ") {
 			value := unquoteCue(line[len("SONGWRITER "):])
 			if currentTrack != nil {
@@ -182,6 +196,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 		}
 	}
 
+	// Don't forget the last track
 	if currentTrack != nil {
 		sheet.Tracks = append(sheet.Tracks, *currentTrack)
 	}
@@ -197,6 +212,7 @@ func ParseCueFile(cuePath string) (*CueSheet, error) {
 	return sheet, nil
 }
 
+// parseCueTimestamp converts MM:SS:FF (frames at 75fps) to seconds
 func parseCueTimestamp(ts string) float64 {
 	parts := strings.Split(ts, ":")
 	if len(parts) != 3 {
@@ -210,6 +226,7 @@ func parseCueTimestamp(ts string) float64 {
 	return float64(minutes)*60 + float64(seconds) + float64(frames)/75.0
 }
 
+// formatCueTimestamp converts seconds to HH:MM:SS.mmm format for FFmpeg
 func formatCueTimestamp(seconds float64) string {
 	if seconds < 0 {
 		return "0"
@@ -220,6 +237,7 @@ func formatCueTimestamp(seconds float64) string {
 	return fmt.Sprintf("%02d:%02d:%06.3f", hours, mins, secs)
 }
 
+// unquoteCue removes surrounding quotes from a CUE value
 func unquoteCue(s string) string {
 	s = strings.TrimSpace(s)
 	if matches := reQuoted.FindStringSubmatch(s); len(matches) == 2 {
@@ -228,12 +246,14 @@ func unquoteCue(s string) string {
 	return s
 }
 
+// parseCueFileLine parses the FILE command's filename and type
 func parseCueFileLine(rest string) (string, string) {
 	rest = strings.TrimSpace(rest)
 
 	var filename, ftype string
 
 	if strings.HasPrefix(rest, "\"") {
+		// Quoted filename
 		endQuote := strings.Index(rest[1:], "\"")
 		if endQuote >= 0 {
 			filename = rest[1 : endQuote+1]
@@ -243,6 +263,7 @@ func parseCueFileLine(rest string) (string, string) {
 			filename = rest
 		}
 	} else {
+		// Unquoted filename - last word is the type
 		parts := strings.Fields(rest)
 		if len(parts) >= 2 {
 			ftype = parts[len(parts)-1]
@@ -255,14 +276,18 @@ func parseCueFileLine(rest string) (string, string) {
 	return filename, strings.TrimSpace(ftype)
 }
 
+// ResolveCueAudioPath finds the actual audio file referenced by a .cue sheet.
+// It checks relative to the cue file's directory.
 func ResolveCueAudioPath(cuePath string, cueFileName string) string {
 	cueDir := filepath.Dir(cuePath)
 
+	// 1. Try the exact filename from the .cue
 	candidate := filepath.Join(cueDir, cueFileName)
 	if _, err := os.Stat(candidate); err == nil {
 		return candidate
 	}
 
+	// 2. Try common case variations
 	baseName := strings.TrimSuffix(cueFileName, filepath.Ext(cueFileName))
 	commonExts := []string{".flac", ".wav", ".ape", ".mp3", ".ogg", ".wv", ".m4a"}
 	for _, ext := range commonExts {
@@ -270,12 +295,14 @@ func ResolveCueAudioPath(cuePath string, cueFileName string) string {
 		if _, err := os.Stat(candidate); err == nil {
 			return candidate
 		}
+		// Try uppercase ext
 		candidate = filepath.Join(cueDir, baseName+strings.ToUpper(ext))
 		if _, err := os.Stat(candidate); err == nil {
 			return candidate
 		}
 	}
 
+	// 3. Try to find any audio file with the same base name as the .cue file
 	cueBase := strings.TrimSuffix(filepath.Base(cuePath), filepath.Ext(cuePath))
 	for _, ext := range commonExts {
 		candidate = filepath.Join(cueDir, cueBase+ext)
@@ -284,6 +311,7 @@ func ResolveCueAudioPath(cuePath string, cueFileName string) string {
 		}
 	}
 
+	// 4. If there's only one audio file in the directory, use that
 	entries, err := os.ReadDir(cueDir)
 	if err == nil {
 		audioExts := map[string]bool{
@@ -308,9 +336,13 @@ func ResolveCueAudioPath(cuePath string, cueFileName string) string {
 	return ""
 }
 
+// BuildCueSplitInfo creates the split information from a parsed CUE sheet.
+// This is returned to the Dart side so FFmpeg can perform the splitting.
+// audioDir, if non-empty, overrides the directory for audio file resolution.
 func BuildCueSplitInfo(cuePath string, sheet *CueSheet, audioDir string) (*CueSplitInfo, error) {
 	resolveDir := cuePath
 	if audioDir != "" {
+		// Create a virtual path in audioDir so ResolveCueAudioPath looks there
 		resolveDir = filepath.Join(audioDir, filepath.Base(cuePath))
 	}
 	audioPath := ResolveCueAudioPath(resolveDir, sheet.FileName)
@@ -338,9 +370,11 @@ func BuildCueSplitInfo(cuePath string, sheet *CueSheet, audioDir string) (*CueSp
 			composer = sheet.Composer
 		}
 
+		// End time is the start of the next track, or -1 for the last track
 		endSec := float64(-1)
 		if i+1 < len(sheet.Tracks) {
 			nextTrack := sheet.Tracks[i+1]
+			// Use pre-gap of next track if available, otherwise its start time
 			if nextTrack.PreGap >= 0 {
 				endSec = nextTrack.PreGap
 			} else {
@@ -362,6 +396,11 @@ func BuildCueSplitInfo(cuePath string, sheet *CueSheet, audioDir string) (*CueSp
 	return info, nil
 }
 
+// ParseCueFileJSON parses a .cue file and returns JSON with split info.
+// This is the main entry point called from Dart via the platform bridge.
+// audioDir, if non-empty, overrides the directory used for resolving the
+// referenced audio file (useful when the .cue was copied to a temp dir
+// but the audio still lives in the original location, e.g. SAF).
 func ParseCueFileJSON(cuePath string, audioDir string) (string, error) {
 	sheet, err := ParseCueFile(cuePath)
 	if err != nil {
@@ -381,6 +420,9 @@ func ParseCueFileJSON(cuePath string, audioDir string) (string, error) {
 	return string(jsonBytes), nil
 }
 
+// ScanCueFileForLibrary parses a .cue file and returns multiple LibraryScanResult
+// entries, one per track. This is used by the library scanner to populate the
+// library with individual track entries from a single CUE+FLAC album.
 func ScanCueFileForLibrary(cuePath string, scanTime string) ([]LibraryScanResult, error) {
 	sheet, err := ParseCueFile(cuePath)
 	if err != nil {
@@ -390,21 +432,17 @@ func ScanCueFileForLibrary(cuePath string, scanTime string) ([]LibraryScanResult
 	if err != nil {
 		return nil, err
 	}
-	return scanCueSheetForLibrary(cuePath, sheet, audioPath, "", 0, "", scanTime)
+	return scanCueSheetForLibrary(cuePath, sheet, audioPath, "", 0, scanTime)
 }
 
+// ScanCueFileForLibraryExt is like ScanCueFileForLibrary but with extra parameters
+// for SAF (Storage Access Framework) scenarios:
+//   - audioDir: if non-empty, overrides the directory used to find the audio file
+//   - virtualPathPrefix: if non-empty, used instead of cuePath as the base for
+//     virtual file paths (e.g. a content:// URI). IDs are also based on this.
+//   - fileModTime: if > 0, used as the FileModTime for all results instead of
+//     stat-ing the cuePath on disk (useful when the real file lives behind SAF)
 func ScanCueFileForLibraryExt(cuePath, audioDir, virtualPathPrefix string, fileModTime int64, scanTime string) ([]LibraryScanResult, error) {
-	return ScanCueFileForLibraryExtWithCoverCacheKey(
-		cuePath,
-		audioDir,
-		virtualPathPrefix,
-		fileModTime,
-		"",
-		scanTime,
-	)
-}
-
-func ScanCueFileForLibraryExtWithCoverCacheKey(cuePath, audioDir, virtualPathPrefix string, fileModTime int64, coverCacheKey, scanTime string) ([]LibraryScanResult, error) {
 	sheet, err := ParseCueFile(cuePath)
 	if err != nil {
 		return nil, err
@@ -413,15 +451,7 @@ func ScanCueFileForLibraryExtWithCoverCacheKey(cuePath, audioDir, virtualPathPre
 	if err != nil {
 		return nil, err
 	}
-	return scanCueSheetForLibrary(
-		cuePath,
-		sheet,
-		audioPath,
-		virtualPathPrefix,
-		fileModTime,
-		coverCacheKey,
-		scanTime,
-	)
+	return scanCueSheetForLibrary(cuePath, sheet, audioPath, virtualPathPrefix, fileModTime, scanTime)
 }
 
 func resolveCueAudioPathForLibrary(cuePath string, sheet *CueSheet, audioDir string) (string, error) {
@@ -439,11 +469,12 @@ func resolveCueAudioPathForLibrary(cuePath string, sheet *CueSheet, audioDir str
 	return audioPath, nil
 }
 
-func scanCueSheetForLibrary(cuePath string, sheet *CueSheet, audioPath, virtualPathPrefix string, fileModTime int64, coverCacheKey, scanTime string) ([]LibraryScanResult, error) {
+func scanCueSheetForLibrary(cuePath string, sheet *CueSheet, audioPath, virtualPathPrefix string, fileModTime int64, scanTime string) ([]LibraryScanResult, error) {
 	if sheet == nil {
 		return nil, fmt.Errorf("cue sheet is nil for %s", cuePath)
 	}
 
+	// Try to get quality info from the audio file
 	var bitDepth, sampleRate int
 	var totalDurationSec float64
 	audioExt := strings.ToLower(filepath.Ext(audioPath))
@@ -465,27 +496,25 @@ func scanCueSheetForLibrary(cuePath string, sheet *CueSheet, audioPath, virtualP
 		}
 	}
 
+	// Extract cover from audio file for all tracks
 	var coverPath string
 	libraryCoverCacheMu.RLock()
 	coverCacheDir := libraryCoverCacheDir
 	libraryCoverCacheMu.RUnlock()
 	if coverCacheDir != "" {
-		cp, err := SaveCoverToCacheWithHintAndKey(
-			audioPath,
-			"",
-			coverCacheDir,
-			coverCacheKey,
-		)
+		cp, err := SaveCoverToCache(audioPath, coverCacheDir)
 		if err == nil && cp != "" {
 			coverPath = cp
 		}
 	}
 
+	// Determine the base path for virtual paths and IDs
 	pathBase := cuePath
 	if virtualPathPrefix != "" {
 		pathBase = virtualPathPrefix
 	}
 
+	// Determine fileModTime
 	modTime := fileModTime
 	if modTime <= 0 {
 		if info, err := os.Stat(cuePath); err == nil {
@@ -513,6 +542,7 @@ func scanCueSheetForLibrary(cuePath string, sheet *CueSheet, audioPath, virtualP
 			album = "Unknown Album"
 		}
 
+		// Calculate duration for this track
 		var duration int
 		if i+1 < len(sheet.Tracks) {
 			nextStart := sheet.Tracks[i+1].StartTime
@@ -526,6 +556,9 @@ func scanCueSheetForLibrary(cuePath string, sheet *CueSheet, audioPath, virtualP
 
 		id := generateLibraryID(fmt.Sprintf("%s#track%d", pathBase, track.Number))
 
+		// Use a virtual file path that includes the track number to ensure
+		// uniqueness in the database (file_path has a UNIQUE constraint).
+		// Format: /path/to/album.cue#track01 or content://...album.cue#track01
 		virtualFilePath := fmt.Sprintf("%s#track%02d", pathBase, track.Number)
 
 		result := LibraryScanResult{

go_backend/deezer.go

@@ -196,22 +196,15 @@ type deezerAlbumSimple struct {
 	RecordType  string `json:"record_type"`
 }
 
-// deezerTrackArtistDisplay returns the display artist string for a track,
-// preferring the Contributors list (comma-joined) when available, falling
-// back to the primary Artist.Name.
-func deezerTrackArtistDisplay(track deezerTrack) string {
+func (c *DeezerClient) convertTrack(track deezerTrack) TrackMetadata {
+	artistName := track.Artist.Name
 	if len(track.Contributors) > 0 {
 		names := make([]string, len(track.Contributors))
 		for i, a := range track.Contributors {
 			names[i] = a.Name
 		}
-		return strings.Join(names, ", ")
+		artistName = strings.Join(names, ", ")
 	}
-	return track.Artist.Name
-}
-
-func (c *DeezerClient) convertTrack(track deezerTrack) TrackMetadata {
-	artistName := deezerTrackArtistDisplay(track)
 
 	albumImage := track.Album.CoverXL
 	if albumImage == "" {
@@ -648,7 +641,7 @@ func (c *DeezerClient) GetAlbum(ctx context.Context, albumID string) (*AlbumResp
 
 		tracks = append(tracks, AlbumTrackMetadata{
 			SpotifyID:   fmt.Sprintf("deezer:%d", track.ID),
-			Artists:     deezerTrackArtistDisplay(track),
+			Artists:     track.Artist.Name,
 			Name:        track.Title,
 			AlbumName:   album.Title,
 			AlbumArtist: artistName,
@@ -748,10 +741,6 @@ func (c *DeezerClient) GetArtist(ctx context.Context, artistID string) (*ArtistR
 				Artists:     artist.Name,
 			})
 		}
-
-		// The Deezer /artist/{id}/albums endpoint does not return nb_tracks.
-		// Fetch track counts in parallel from individual /album/{id} endpoints.
-		c.fetchAlbumTrackCounts(ctx, albums)
 	}
 
 	result := &ArtistResponsePayload{
@@ -771,63 +760,6 @@ func (c *DeezerClient) GetArtist(ctx context.Context, artistID string) (*ArtistR
 	return result, nil
 }
 
-// fetchAlbumTrackCounts fetches nb_tracks for each album in parallel using
-// individual /album/{id} calls, since the /artist/{id}/albums endpoint does
-// not include this field. Albums whose track count is already known (non-zero)
-// are skipped.
-func (c *DeezerClient) fetchAlbumTrackCounts(ctx context.Context, albums []ArtistAlbumMetadata) {
-	// Find albums that need track counts
-	type indexedID struct {
-		idx     int
-		albumID string
-	}
-	var toFetch []indexedID
-	for i, a := range albums {
-		if a.TotalTracks == 0 {
-			rawID := strings.TrimPrefix(a.ID, "deezer:")
-			if rawID != "" {
-				toFetch = append(toFetch, indexedID{idx: i, albumID: rawID})
-			}
-		}
-	}
-	if len(toFetch) == 0 {
-		return
-	}
-
-	const maxParallel = 10
-	sem := make(chan struct{}, maxParallel)
-	var mu sync.Mutex
-	var wg sync.WaitGroup
-
-	for _, item := range toFetch {
-		wg.Add(1)
-		go func(it indexedID) {
-			defer wg.Done()
-
-			select {
-			case sem <- struct{}{}:
-				defer func() { <-sem }()
-			case <-ctx.Done():
-				return
-			}
-
-			albumURL := fmt.Sprintf(deezerAlbumURL, it.albumID)
-			var resp struct {
-				NbTracks int `json:"nb_tracks"`
-			}
-			if err := c.getJSON(ctx, albumURL, &resp); err != nil {
-				return
-			}
-
-			mu.Lock()
-			albums[it.idx].TotalTracks = resp.NbTracks
-			mu.Unlock()
-		}(item)
-	}
-
-	wg.Wait()
-}
-
 func (c *DeezerClient) GetRelatedArtists(ctx context.Context, artistID string, limit int) ([]SearchArtistResult, error) {
 	normalizedArtistID := strings.TrimSpace(strings.TrimPrefix(artistID, "deezer:"))
 	if normalizedArtistID == "" {
@@ -960,7 +892,7 @@ func (c *DeezerClient) GetPlaylist(ctx context.Context, playlistID string) (*Pla
 
 		tracks = append(tracks, AlbumTrackMetadata{
 			SpotifyID:   fmt.Sprintf("deezer:%d", track.ID),
-			Artists:     deezerTrackArtistDisplay(track),
+			Artists:     track.Artist.Name,
 			Name:        track.Title,
 			AlbumName:   track.Album.Title,
 			AlbumArtist: track.Artist.Name,
@@ -1249,7 +1181,7 @@ func (c *DeezerClient) getJSON(ctx context.Context, endpoint string, dst interfa
 
 	for attempt := 0; attempt <= deezerMaxRetries; attempt++ {
 		if attempt > 0 {
-			delay := deezerRetryDelay * time.Duration(1<<(attempt-1))
+			delay := deezerRetryDelay * time.Duration(1<<(attempt-1)) // Exponential backoff
 			GoLog("[Deezer] Retry %d/%d after %v...\n", attempt, deezerMaxRetries, delay)
 			time.Sleep(delay)
 		}
@@ -1262,6 +1194,7 @@ func (c *DeezerClient) getJSON(ctx context.Context, endpoint string, dst interfa
 		lastErr = err
 		errStr := err.Error()
 
+		// Check if error is retryable
 		isRetryable := strings.Contains(errStr, "timeout") ||
 			strings.Contains(errStr, "connection reset") ||
 			strings.Contains(errStr, "connection refused") ||

go_backend/deezer_download.go

@@ -14,7 +14,14 @@ import (
 	"strings"
 )
 
-const deezerMusicDLURL = "https://api.zarz.moe/v1/dzr"
+const deezerYoinkifyURL = "https://yoinkify.lol/api/download"
+const deezerMusicDLURL = "https://www.musicdl.me/api/download"
+
+type YoinkifyRequest struct {
+	URL         string `json:"url"`
+	Format      string `json:"format"`
+	GenreSource string `json:"genreSource"`
+}
 
 type DeezerDownloadResult struct {
 	FilePath    string
@@ -30,6 +37,41 @@ type DeezerDownloadResult struct {
 	LyricsLRC   string
 }
 
+func resolveSpotifyURLForYoinkify(req DownloadRequest) (string, error) {
+	rawSpotify := strings.TrimSpace(req.SpotifyID)
+	if rawSpotify != "" {
+		if isLikelySpotifyTrackID(rawSpotify) {
+			return fmt.Sprintf("https://open.spotify.com/track/%s", rawSpotify), nil
+		}
+
+		if parsed, err := parseSpotifyURI(rawSpotify); err == nil && parsed.Type == "track" && parsed.ID != "" {
+			return fmt.Sprintf("https://open.spotify.com/track/%s", parsed.ID), nil
+		}
+	}
+
+	deezerID := strings.TrimSpace(req.DeezerID)
+	if deezerID == "" {
+		if prefixed, found := strings.CutPrefix(rawSpotify, "deezer:"); found {
+			deezerID = strings.TrimSpace(prefixed)
+		}
+	}
+
+	if deezerID != "" {
+		songlink := NewSongLinkClient()
+		spotifyID, err := songlink.GetSpotifyIDFromDeezer(deezerID)
+		if err != nil {
+			return "", fmt.Errorf("failed to map deezer:%s to Spotify ID: %w", deezerID, err)
+		}
+		spotifyID = strings.TrimSpace(spotifyID)
+		if spotifyID == "" {
+			return "", fmt.Errorf("SongLink returned empty Spotify ID for deezer:%s", deezerID)
+		}
+		return fmt.Sprintf("https://open.spotify.com/track/%s", spotifyID), nil
+	}
+
+	return "", fmt.Errorf("missing Spotify track ID for Deezer Yoinkify")
+}
+
 func isLikelySpotifyTrackID(value string) bool {
 	if len(value) != 22 {
 		return false
@@ -46,6 +88,113 @@ func isLikelySpotifyTrackID(value string) bool {
 	return true
 }
 
+func (c *DeezerClient) DownloadFromYoinkify(spotifyURL, outputPath string, outputFD int, itemID string) error {
+	payload := YoinkifyRequest{
+		URL:         spotifyURL,
+		Format:      "flac",
+		GenreSource: "spotify",
+	}
+
+	jsonData, err := json.Marshal(payload)
+	if err != nil {
+		return fmt.Errorf("failed to encode Yoinkify request: %w", err)
+	}
+
+	ctx := context.Background()
+	if itemID != "" {
+		StartItemProgress(itemID)
+		defer CompleteItemProgress(itemID)
+		ctx = initDownloadCancel(itemID)
+		defer clearDownloadCancel(itemID)
+	}
+
+	if isDownloadCancelled(itemID) {
+		return ErrDownloadCancelled
+	}
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, deezerYoinkifyURL, bytes.NewBuffer(jsonData))
+	if err != nil {
+		return fmt.Errorf("failed to create Yoinkify request: %w", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Accept", "*/*")
+	req.Header.Set("User-Agent", getRandomUserAgent())
+
+	resp, err := GetDownloadClient().Do(req)
+	if err != nil {
+		if isDownloadCancelled(itemID) {
+			return ErrDownloadCancelled
+		}
+		return fmt.Errorf("failed to call Yoinkify: %w", err)
+	}
+	defer resp.Body.Close()
+
+	contentType := strings.ToLower(strings.TrimSpace(resp.Header.Get("Content-Type")))
+	if resp.StatusCode != http.StatusOK {
+		bodyBytes, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
+		bodyText := strings.TrimSpace(string(bodyBytes))
+		if bodyText != "" {
+			return fmt.Errorf("Yoinkify returned status %d: %s", resp.StatusCode, bodyText)
+		}
+		return fmt.Errorf("Yoinkify returned status %d", resp.StatusCode)
+	}
+
+	if strings.Contains(contentType, "application/json") {
+		bodyBytes, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
+		bodyText := strings.TrimSpace(string(bodyBytes))
+		if bodyText == "" {
+			bodyText = "empty JSON payload"
+		}
+		return fmt.Errorf("Yoinkify returned JSON instead of audio: %s", bodyText)
+	}
+
+	expectedSize := resp.ContentLength
+	if expectedSize > 0 && itemID != "" {
+		SetItemBytesTotal(itemID, expectedSize)
+	}
+
+	out, err := openOutputForWrite(outputPath, outputFD)
+	if err != nil {
+		return err
+	}
+
+	bufWriter := bufio.NewWriterSize(out, 256*1024)
+	var written int64
+	if itemID != "" {
+		pw := NewItemProgressWriter(bufWriter, itemID)
+		written, err = io.Copy(pw, resp.Body)
+	} else {
+		written, err = io.Copy(bufWriter, resp.Body)
+	}
+
+	flushErr := bufWriter.Flush()
+	closeErr := out.Close()
+
+	if err != nil {
+		cleanupOutputOnError(outputPath, outputFD)
+		if isDownloadCancelled(itemID) {
+			return ErrDownloadCancelled
+		}
+		return fmt.Errorf("download interrupted: %w", err)
+	}
+	if flushErr != nil {
+		cleanupOutputOnError(outputPath, outputFD)
+		return fmt.Errorf("failed to flush output: %w", flushErr)
+	}
+	if closeErr != nil {
+		cleanupOutputOnError(outputPath, outputFD)
+		return fmt.Errorf("failed to close output: %w", closeErr)
+	}
+
+	if expectedSize > 0 && written != expectedSize {
+		cleanupOutputOnError(outputPath, outputFD)
+		return fmt.Errorf("incomplete download: expected %d bytes, got %d bytes", expectedSize, written)
+	}
+
+	GoLog("[Deezer] Downloaded via Yoinkify: %.2f MB\n", float64(written)/(1024*1024))
+	return nil
+}
+
 func resolveDeezerTrackURL(req DownloadRequest) (string, error) {
 	deezerID := strings.TrimSpace(req.DeezerID)
 	if deezerID == "" {
@@ -55,13 +204,14 @@ func resolveDeezerTrackURL(req DownloadRequest) (string, error) {
 	}
 	if deezerID != "" {
 		trackURL := fmt.Sprintf("https://www.deezer.com/track/%s", deezerID)
-		if err := verifyDeezerTrack(req, deezerID, false); err != nil {
+		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 SongLink
 	spotifyID := strings.TrimSpace(req.SpotifyID)
 	if spotifyID != "" && isLikelySpotifyTrackID(spotifyID) {
 		songlink := NewSongLinkClient()
@@ -69,7 +219,7 @@ func resolveDeezerTrackURL(req DownloadRequest) (string, error) {
 		if err == nil && availability.Deezer && availability.DeezerURL != "" {
 			resolvedID := extractDeezerIDFromURL(availability.DeezerURL)
 			if resolvedID != "" {
-				if verifyErr := verifyDeezerTrack(req, resolvedID, true); verifyErr != nil {
+				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 {
@@ -81,6 +231,7 @@ func resolveDeezerTrackURL(req DownloadRequest) (string, error) {
 		}
 	}
 
+	// Try ISRC
 	isrc := strings.TrimSpace(req.ISRC)
 	if isrc != "" {
 		ctx, cancel := context.WithTimeout(context.Background(), SongLinkTimeout)
@@ -89,7 +240,7 @@ func resolveDeezerTrackURL(req DownloadRequest) (string, error) {
 		if err == nil && track != nil {
 			resolvedID := songLinkExtractDeezerTrackID(track)
 			if resolvedID != "" {
-				if verifyErr := verifyDeezerTrack(req, resolvedID, false); verifyErr != nil {
+				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)
 				}
@@ -101,7 +252,7 @@ func resolveDeezerTrackURL(req DownloadRequest) (string, error) {
 	return "", fmt.Errorf("could not resolve Deezer track URL")
 }
 
-func verifyDeezerTrack(req DownloadRequest, deezerID string, skipNameVerification bool) error {
+func verifyDeezerTrack(req DownloadRequest, deezerID string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), SongLinkTimeout)
 	defer cancel()
 	trackResp, err := GetDeezerClient().GetTrack(ctx, deezerID)
@@ -109,11 +260,9 @@ func verifyDeezerTrack(req DownloadRequest, deezerID string, skipNameVerificatio
 		return nil // Can't verify — don't block the download.
 	}
 	resolved := resolvedTrackInfo{
-		Title:                trackResp.Track.Name,
-		ArtistName:           trackResp.Track.Artists,
-		ISRC:                 trackResp.Track.ISRC,
-		Duration:             trackResp.Track.DurationMS / 1000,
-		SkipNameVerification: skipNameVerification,
+		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'",
@@ -143,6 +292,7 @@ func (c *DeezerClient) GetMusicDLDownloadURL(deezerTrackURL string) (string, err
 		return "", fmt.Errorf("failed to create MusicDL request: %w", err)
 	}
 	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("X-Debug-Key", getQobuzDebugKey())
 	req.Header.Set("User-Agent", getRandomUserAgent())
 
 	resp, err := c.httpClient.Do(req)
@@ -169,6 +319,7 @@ func (c *DeezerClient) GetMusicDLDownloadURL(deezerTrackURL string) (string, err
 		return "", fmt.Errorf("MusicDL error: %s", errMsg)
 	}
 
+	// Try various response fields for download URL
 	for _, key := range []string{"download_url", "url", "link"} {
 		if urlVal, ok := raw[key].(string); ok && strings.TrimSpace(urlVal) != "" {
 			return strings.TrimSpace(urlVal), nil
@@ -327,29 +478,41 @@ func downloadFromDeezer(req DownloadRequest) (DeezerDownloadResult, error) {
 		)
 	}()
 
+	// Try MusicDL first (better quality), fallback to Yoinkify
+	var downloadErr error
 	deezerTrackURL, deezerURLErr := resolveDeezerTrackURL(req)
-	if deezerURLErr != nil {
-		return DeezerDownloadResult{}, fmt.Errorf(
-			"deezer download failed: could not resolve Deezer URL: %w",
-			deezerURLErr,
-		)
+	if deezerURLErr == nil {
+		GoLog("[Deezer] Trying MusicDL for: %s\n", deezerTrackURL)
+		downloadErr = deezerClient.DownloadFromMusicDL(deezerTrackURL, outputPath, req.OutputFD, req.ItemID)
+		if downloadErr != nil {
+			if errors.Is(downloadErr, ErrDownloadCancelled) {
+				return DeezerDownloadResult{}, ErrDownloadCancelled
+			}
+			GoLog("[Deezer] MusicDL failed: %v, falling back to Yoinkify\n", downloadErr)
+		}
+	} else {
+		GoLog("[Deezer] Could not resolve Deezer URL: %v, using Yoinkify directly\n", deezerURLErr)
 	}
 
-	GoLog("[Deezer] Trying MusicDL for: %s\n", deezerTrackURL)
-	downloadErr := deezerClient.DownloadFromMusicDL(
-		deezerTrackURL,
-		outputPath,
-		req.OutputFD,
-		req.ItemID,
-	)
-	if downloadErr != nil {
-		if errors.Is(downloadErr, ErrDownloadCancelled) {
-			return DeezerDownloadResult{}, ErrDownloadCancelled
+	if downloadErr != nil || deezerURLErr != nil {
+		spotifyURL, err := resolveSpotifyURLForYoinkify(req)
+		if err != nil {
+			if deezerURLErr != nil {
+				return DeezerDownloadResult{}, fmt.Errorf(
+					"deezer download failed: direct Deezer resolution error: %v; Yoinkify fallback error: %w",
+					deezerURLErr,
+					err,
+				)
+			}
+			return DeezerDownloadResult{}, err
+		}
+		downloadErr = deezerClient.DownloadFromYoinkify(spotifyURL, outputPath, req.OutputFD, req.ItemID)
+		if downloadErr != nil {
+			if errors.Is(downloadErr, ErrDownloadCancelled) {
+				return DeezerDownloadResult{}, ErrDownloadCancelled
+			}
+			return DeezerDownloadResult{}, fmt.Errorf("deezer download failed (MusicDL + Yoinkify): %w", downloadErr)
 		}
-		return DeezerDownloadResult{}, fmt.Errorf(
-			"deezer download failed via MusicDL: %w",
-			downloadErr,
-		)
 	}
 
 	<-parallelDone
@@ -360,19 +523,18 @@ func downloadFromDeezer(req DownloadRequest) (DeezerDownloadResult, error) {
 	}
 
 	metadata := Metadata{
-		Title:         req.TrackName,
-		Artist:        req.ArtistName,
-		Album:         req.AlbumName,
-		AlbumArtist:   req.AlbumArtist,
-		ArtistTagMode: req.ArtistTagMode,
-		Date:          req.ReleaseDate,
-		TrackNumber:   req.TrackNumber,
-		TotalTracks:   req.TotalTracks,
-		DiscNumber:    req.DiscNumber,
-		ISRC:          req.ISRC,
-		Genre:         req.Genre,
-		Label:         req.Label,
-		Copyright:     req.Copyright,
+		Title:       req.TrackName,
+		Artist:      req.ArtistName,
+		Album:       req.AlbumName,
+		AlbumArtist: req.AlbumArtist,
+		Date:        req.ReleaseDate,
+		TrackNumber: req.TrackNumber,
+		TotalTracks: req.TotalTracks,
+		DiscNumber:  req.DiscNumber,
+		ISRC:        req.ISRC,
+		Genre:       req.Genre,
+		Label:       req.Label,
+		Copyright:   req.Copyright,
 	}
 
 	var coverData []byte

go_backend/duplicate.go

@@ -25,6 +25,7 @@ var (
 )
 
 func GetISRCIndex(outputDir string) *ISRCIndex {
+	// Fast path: check cache first
 	isrcIndexCacheMu.RLock()
 	idx, exists := isrcIndexCache[outputDir]
 	isrcIndexCacheMu.RUnlock()
@@ -33,11 +34,13 @@ func GetISRCIndex(outputDir string) *ISRCIndex {
 		return idx
 	}
 
+	// Use per-directory mutex to prevent multiple goroutines from building simultaneously
 	buildLock, _ := isrcBuildingMu.LoadOrStore(outputDir, &sync.Mutex{})
 	mu := buildLock.(*sync.Mutex)
 	mu.Lock()
 	defer mu.Unlock()
 
+	// Double-check cache after acquiring lock (another goroutine may have built it)
 	isrcIndexCacheMu.RLock()
 	idx, exists = isrcIndexCache[outputDir]
 	isrcIndexCacheMu.RUnlock()

go_backend/exports_test.go

@@ -113,114 +113,3 @@ func TestBuildDownloadSuccessResponsePrefersProviderCoverURL(t *testing.T) {
 		t.Fatalf("cover url = %q, want %q", resp.CoverURL, result.CoverURL)
 	}
 }
-
-func TestApplyReEnrichTrackMetadataPreservesExistingReleaseDateWhenCandidateMissing(t *testing.T) {
-	req := reEnrichRequest{
-		SpotifyID:   "spotify-track-id",
-		AlbumName:   "Original Album",
-		ReleaseDate: "2024-01-01",
-		ISRC:        "REQ123",
-	}
-
-	applyReEnrichTrackMetadata(&req, ExtTrackMetadata{
-		AlbumName:   "Resolved Album",
-		ReleaseDate: "",
-		ISRC:        "",
-	})
-
-	if req.ReleaseDate != "2024-01-01" {
-		t.Fatalf("release date = %q, want existing value preserved", req.ReleaseDate)
-	}
-	if req.AlbumName != "Resolved Album" {
-		t.Fatalf("album = %q, want updated album", req.AlbumName)
-	}
-	if req.ISRC != "REQ123" {
-		t.Fatalf("isrc = %q, want existing value preserved", req.ISRC)
-	}
-}
-
-func TestSelectBestReEnrichTrackPrefersCandidateWithReleaseDate(t *testing.T) {
-	req := reEnrichRequest{
-		TrackName:   "Song Title",
-		ArtistName:  "Artist Name",
-		AlbumName:   "Album Name",
-		ReleaseDate: "",
-		DurationMs:  180000,
-	}
-
-	tracks := []ExtTrackMetadata{
-		{
-			ID:          "first",
-			Name:        "Song Title",
-			Artists:     "Artist Name",
-			AlbumName:   "Album Name",
-			DurationMS:  180000,
-			ReleaseDate: "",
-			ProviderID:  "spotify",
-		},
-		{
-			ID:          "second",
-			Name:        "Song Title",
-			Artists:     "Artist Name",
-			AlbumName:   "Album Name",
-			DurationMS:  180000,
-			ReleaseDate: "2024-03-09",
-			ProviderID:  "deezer",
-		},
-	}
-
-	best := selectBestReEnrichTrack(req, tracks)
-	if best == nil {
-		t.Fatal("expected a selected track")
-	}
-	if best.ID != "second" {
-		t.Fatalf("selected track = %q, want candidate with release date", best.ID)
-	}
-}
-
-func TestBuildReEnrichFFmpegMetadataOmitsEmptyFields(t *testing.T) {
-	req := reEnrichRequest{
-		TrackName:   "Song",
-		ArtistName:  "Artist",
-		AlbumName:   "Album",
-		AlbumArtist: "",
-		ReleaseDate: "",
-		TrackNumber: 0,
-		DiscNumber:  0,
-		ISRC:        "",
-		Genre:       "",
-		Label:       "",
-		Copyright:   "",
-	}
-
-	metadata := buildReEnrichFFmpegMetadata(&req, "")
-
-	// Title and Artist are never written by re-enrich (they are search keys
-	// preserved as-is from the file).
-	if _, exists := metadata["TITLE"]; exists {
-		t.Fatalf("TITLE should not be in metadata: %#v", metadata)
-	}
-	if _, exists := metadata["ARTIST"]; exists {
-		t.Fatalf("ARTIST should not be in metadata: %#v", metadata)
-	}
-	if metadata["ALBUM"] != "Album" {
-		t.Fatalf("album = %q", metadata["ALBUM"])
-	}
-
-	for _, key := range []string{
-		"ALBUMARTIST",
-		"DATE",
-		"TRACKNUMBER",
-		"DISCNUMBER",
-		"ISRC",
-		"GENRE",
-		"ORGANIZATION",
-		"COPYRIGHT",
-		"LYRICS",
-		"UNSYNCEDLYRICS",
-	} {
-		if _, exists := metadata[key]; exists {
-			t.Fatalf("did not expect key %s in metadata: %#v", key, metadata)
-		}
-	}
-}

go_backend/extension_manager.go

@@ -44,76 +44,16 @@ func compareVersions(v1, v2 string) int {
 }
 
 type LoadedExtension struct {
-	ID          string             `json:"id"`
-	Manifest    *ExtensionManifest `json:"manifest"`
-	VM          *goja.Runtime      `json:"-"`
-	VMMu        sync.Mutex         `json:"-"`
-	runtime     *ExtensionRuntime
-	initialized bool
-	Enabled     bool   `json:"enabled"`
-	Error       string `json:"error,omitempty"`
-	DataDir     string `json:"data_dir"`
-	SourceDir   string `json:"source_dir"`
-	IconPath    string `json:"icon_path"`
-}
-
-func getExtensionInitSettings(extensionID string) map[string]interface{} {
-	settings := GetExtensionSettingsStore().GetAll(extensionID)
-	if len(settings) == 0 {
-		return settings
-	}
-
-	filtered := make(map[string]interface{}, len(settings))
-	for key, value := range settings {
-		if strings.HasPrefix(key, "_") {
-			continue
-		}
-		filtered[key] = value
-	}
-	return filtered
-}
-
-func ensureRuntimeReadyLocked(ext *LoadedExtension, applyStoredSettings bool) error {
-	if ext.VM == nil || ext.runtime == nil {
-		if err := initializeVMLocked(ext); err != nil {
-			ext.Error = err.Error()
-			ext.Enabled = false
-			return err
-		}
-	}
-
-	if applyStoredSettings && !ext.initialized {
-		settings := getExtensionInitSettings(ext.ID)
-		if len(settings) > 0 {
-			if err := initializeExtensionWithSettingsLocked(ext, settings); err != nil {
-				teardownVMLocked(ext)
-				ext.Error = err.Error()
-				ext.Enabled = false
-				return err
-			}
-		} else {
-			ext.initialized = true
-		}
-	}
-
-	ext.Error = ""
-	return nil
-}
-
-func (ext *LoadedExtension) ensureRuntimeReady() error {
-	ext.VMMu.Lock()
-	defer ext.VMMu.Unlock()
-
-	return ensureRuntimeReadyLocked(ext, true)
-}
-
-func (ext *LoadedExtension) lockReadyVM() (*goja.Runtime, error) {
-	ext.VMMu.Lock()
-	if err := ensureRuntimeReadyLocked(ext, true); err != nil {
-		ext.VMMu.Unlock()
-		return nil, err
-	}
-	return ext.VM, nil
+	ID        string             `json:"id"`
+	Manifest  *ExtensionManifest `json:"manifest"`
+	VM        *goja.Runtime      `json:"-"`
+	VMMu      sync.Mutex         `json:"-"`
+	runtime   *ExtensionRuntime
+	Enabled   bool   `json:"enabled"`
+	Error     string `json:"error,omitempty"`
+	DataDir   string `json:"data_dir"`
+	SourceDir string `json:"source_dir"`
+	IconPath  string `json:"icon_path"`
 }
 
 type ExtensionManager struct {
@@ -280,10 +220,10 @@ func (m *ExtensionManager) LoadExtensionFromFile(filePath string) (*LoadedExtens
 		SourceDir: extDir,
 	}
 
-	if err := validateExtensionLoad(ext); err != nil {
+	if err := m.initializeVM(ext); err != nil {
 		ext.Error = err.Error()
 		ext.Enabled = false
-		GoLog("[Extension] Failed to validate extension %s: %v\n", manifest.Name, err)
+		GoLog("[Extension] Failed to initialize VM for %s: %v\n", manifest.Name, err)
 	}
 
 	m.extensions[manifest.Name] = ext
@@ -292,10 +232,7 @@ func (m *ExtensionManager) LoadExtensionFromFile(filePath string) (*LoadedExtens
 	return ext, nil
 }
 
-func initializeVMLocked(ext *LoadedExtension) error {
-	ext.VM = nil
-	ext.runtime = nil
-	ext.initialized = false
+func (m *ExtensionManager) initializeVM(ext *LoadedExtension) error {
 	vm := goja.New()
 	ext.VM = vm
 
@@ -342,136 +279,6 @@ func initializeVMLocked(ext *LoadedExtension) error {
 	return nil
 }
 
-func (m *ExtensionManager) initializeVM(ext *LoadedExtension) error {
-	ext.VMMu.Lock()
-	defer ext.VMMu.Unlock()
-	return initializeVMLocked(ext)
-}
-
-func initializeExtensionWithSettingsLocked(
-	ext *LoadedExtension,
-	settings map[string]interface{},
-) error {
-	if ext.VM == nil {
-		return fmt.Errorf("Extension failed to load. Please reinstall the extension")
-	}
-
-	settingsJSON, err := json.Marshal(settings)
-	if err != nil {
-		return fmt.Errorf("Failed to save settings")
-	}
-
-	script := fmt.Sprintf(`
-		(function() {
-			var settings = %s;
-			if (typeof extension !== 'undefined' && typeof extension.initialize === 'function') {
-				try {
-					extension.initialize(settings);
-					return { success: true };
-				} catch (e) {
-					return { success: false, error: e.toString() };
-				}
-			}
-			return { success: true, message: 'no initialize function' };
-		})()
-	`, string(settingsJSON))
-
-	result, err := ext.VM.RunString(script)
-	if err != nil {
-		ext.Error = fmt.Sprintf("initialize failed: %v", err)
-		ext.Enabled = false
-		GoLog("[Extension] Initialize error for %s: %v\n", ext.ID, err)
-		return err
-	}
-
-	if result != nil && !goja.IsUndefined(result) {
-		exported := result.Export()
-		if resultMap, ok := exported.(map[string]interface{}); ok {
-			if success, ok := resultMap["success"].(bool); ok && !success {
-				errMsg := "unknown error"
-				if e, ok := resultMap["error"].(string); ok {
-					errMsg = e
-				}
-				ext.Error = errMsg
-				ext.Enabled = false
-				GoLog("[Extension] Initialize failed for %s: %s\n", ext.ID, errMsg)
-				return fmt.Errorf("initialize failed: %s", errMsg)
-			}
-		}
-	}
-
-	ext.initialized = true
-	GoLog("[Extension] Initialized %s\n", ext.ID)
-	return nil
-}
-
-func runCleanupLocked(ext *LoadedExtension) error {
-	if ext.VM != nil {
-		script := `
-			(function() {
-				if (typeof extension !== 'undefined' && typeof extension.cleanup === 'function') {
-					try {
-						extension.cleanup();
-						return { success: true };
-					} catch (e) {
-						return { success: false, error: e.toString() };
-					}
-				}
-				return { success: true, message: 'no cleanup function' };
-			})()
-		`
-
-		result, err := ext.VM.RunString(script)
-		if err != nil {
-			return err
-		}
-
-		if result != nil && !goja.IsUndefined(result) {
-			exported := result.Export()
-			if resultMap, ok := exported.(map[string]interface{}); ok {
-				if success, ok := resultMap["success"].(bool); ok && !success {
-					errMsg := "unknown error"
-					if e, ok := resultMap["error"].(string); ok {
-						errMsg = e
-					}
-					return fmt.Errorf("cleanup failed: %s", errMsg)
-				}
-			}
-		}
-
-		if result != nil && !goja.IsUndefined(result) && !goja.IsNull(result) {
-			GoLog("[Extension] Cleanup called for %s\n", ext.ID)
-		}
-	}
-	return nil
-}
-
-func teardownVMLocked(ext *LoadedExtension) {
-	if err := runCleanupLocked(ext); err != nil {
-		GoLog("[Extension] Error calling cleanup for %s: %v\n", ext.ID, err)
-	}
-	if ext.runtime != nil {
-		if err := ext.runtime.flushStorageNow(); err != nil {
-			GoLog("[Extension] Failed to flush storage for %s: %v\n", ext.ID, err)
-		}
-		ext.runtime.closeStorageFlusher()
-	}
-	ext.runtime = nil
-	ext.VM = nil
-	ext.initialized = false
-}
-
-func validateExtensionLoad(ext *LoadedExtension) error {
-	ext.VMMu.Lock()
-	defer ext.VMMu.Unlock()
-
-	if err := initializeVMLocked(ext); err != nil {
-		return err
-	}
-	teardownVMLocked(ext)
-	return nil
-}
-
 func (m *ExtensionManager) UnloadExtension(extensionID string) error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
@@ -481,9 +288,21 @@ func (m *ExtensionManager) UnloadExtension(extensionID string) error {
 		return fmt.Errorf("Extension not found")
 	}
 
-	ext.VMMu.Lock()
-	teardownVMLocked(ext)
-	ext.VMMu.Unlock()
+	if ext.VM != nil {
+		cleanup, err := ext.VM.RunString("typeof extension !== 'undefined' && typeof extension.cleanup === 'function' ? extension.cleanup() : null")
+		if err != nil {
+			GoLog("[Extension] Error calling cleanup for %s: %v\n", extensionID, err)
+		} else if cleanup != nil && !goja.IsUndefined(cleanup) && !goja.IsNull(cleanup) {
+			GoLog("[Extension] Cleanup called for %s\n", extensionID)
+		}
+	}
+	if ext.runtime != nil {
+		if err := ext.runtime.flushStorageNow(); err != nil {
+			GoLog("[Extension] Failed to flush storage for %s: %v\n", extensionID, err)
+		}
+		ext.runtime.closeStorageFlusher()
+		ext.runtime = nil
+	}
 
 	delete(m.extensions, extensionID)
 	GoLog("[Extension] Unloaded extension: %s\n", extensionID)
@@ -522,21 +341,7 @@ func (m *ExtensionManager) SetExtensionEnabled(extensionID string, enabled bool)
 		return fmt.Errorf("Extension not found")
 	}
 
-	if enabled {
-		ext.Enabled = true
-		if err := ext.ensureRuntimeReady(); err != nil {
-			store := GetExtensionSettingsStore()
-			ext.Enabled = false
-			_ = store.Set(extensionID, "_enabled", false)
-			return err
-		}
-	} else {
-		ext.Enabled = false
-		ext.Error = ""
-		ext.VMMu.Lock()
-		teardownVMLocked(ext)
-		ext.VMMu.Unlock()
-	}
+	ext.Enabled = enabled
 	GoLog("[Extension] %s %s\n", extensionID, map[bool]string{true: "enabled", false: "disabled"}[enabled])
 
 	store := GetExtensionSettingsStore()
@@ -631,10 +436,10 @@ func (m *ExtensionManager) loadExtensionFromDirectory(dirPath string) (*LoadedEx
 		}
 	}
 
-	if err := validateExtensionLoad(ext); err != nil {
+	if err := m.initializeVM(ext); err != nil {
 		ext.Error = err.Error()
 		ext.Enabled = false
-		GoLog("[Extension] Failed to validate extension %s: %v\n", manifest.Name, err)
+		GoLog("[Extension] Failed to initialize VM for %s: %v\n", manifest.Name, err)
 	}
 
 	m.extensions[manifest.Name] = ext
@@ -785,14 +590,10 @@ func (m *ExtensionManager) UpgradeExtension(filePath string) (*LoadedExtension,
 		SourceDir: extDir,
 	}
 
-	if wasEnabled {
-		if err := ext.ensureRuntimeReady(); err != nil {
-			GoLog("[Extension] Failed to initialize upgraded extension %s: %v\n", newManifest.Name, err)
-		}
-	} else if err := validateExtensionLoad(ext); err != nil {
+	if err := m.initializeVM(ext); err != nil {
 		ext.Error = err.Error()
 		ext.Enabled = false
-		GoLog("[Extension] Failed to validate upgraded extension %s: %v\n", newManifest.Name, err)
+		GoLog("[Extension] Failed to initialize VM for %s: %v\n", newManifest.Name, err)
 	}
 
 	m.mu.Lock()
@@ -908,7 +709,6 @@ func (m *ExtensionManager) GetInstalledExtensionsJSON() (string, error) {
 		HasDownloadProvider    bool                   `json:"has_download_provider"`
 		HasLyricsProvider      bool                   `json:"has_lyrics_provider"`
 		SkipMetadataEnrichment bool                   `json:"skip_metadata_enrichment"`
-		SkipLyrics             bool                   `json:"skip_lyrics"`
 		SearchBehavior         *SearchBehaviorConfig  `json:"search_behavior,omitempty"`
 		TrackMatching          *TrackMatchingConfig   `json:"track_matching,omitempty"`
 		PostProcessing         *PostProcessingConfig  `json:"post_processing,omitempty"`
@@ -966,7 +766,6 @@ func (m *ExtensionManager) GetInstalledExtensionsJSON() (string, error) {
 			HasDownloadProvider:    ext.Manifest.IsDownloadProvider(),
 			HasLyricsProvider:      ext.Manifest.IsLyricsProvider(),
 			SkipMetadataEnrichment: ext.Manifest.SkipMetadataEnrichment,
-			SkipLyrics:             ext.Manifest.SkipLyrics,
 			SearchBehavior:         ext.Manifest.SearchBehavior,
 			TrackMatching:          ext.Manifest.TrackMatching,
 			PostProcessing:         ext.Manifest.PostProcessing,
@@ -991,13 +790,56 @@ func (m *ExtensionManager) InitializeExtension(extensionID string, settings map[
 		return fmt.Errorf("Extension not found")
 	}
 
-	ext.VMMu.Lock()
-	defer ext.VMMu.Unlock()
+	if ext.VM == nil {
+		return fmt.Errorf("Extension failed to load. Please reinstall the extension")
+	}
 
-	if err := ensureRuntimeReadyLocked(ext, false); err != nil {
+	settingsJSON, err := json.Marshal(settings)
+	if err != nil {
+		return fmt.Errorf("Failed to save settings")
+	}
+
+	script := fmt.Sprintf(`
+		(function() {
+			var settings = %s;
+			if (typeof extension !== 'undefined' && typeof extension.initialize === 'function') {
+				try {
+					extension.initialize(settings);
+					return { success: true };
+				} catch (e) {
+					return { success: false, error: e.toString() };
+				}
+			}
+			return { success: true, message: 'no initialize function' };
+		})()
+	`, string(settingsJSON))
+
+	result, err := ext.VM.RunString(script)
+	if err != nil {
+		ext.Error = fmt.Sprintf("initialize failed: %v", err)
+		ext.Enabled = false
+		GoLog("[Extension] Initialize error for %s: %v\n", extensionID, err)
 		return err
 	}
-	return initializeExtensionWithSettingsLocked(ext, settings)
+
+	if result != nil && !goja.IsUndefined(result) {
+		exported := result.Export()
+		if resultMap, ok := exported.(map[string]interface{}); ok {
+			if success, ok := resultMap["success"].(bool); ok && !success {
+				errMsg := "unknown error"
+				if e, ok := resultMap["error"].(string); ok {
+					errMsg = e
+				}
+				ext.Error = errMsg
+				ext.Enabled = false
+				GoLog("[Extension] Initialize failed for %s: %s\n", extensionID, errMsg)
+				return fmt.Errorf("initialize failed: %s", errMsg)
+			}
+		}
+	}
+
+	GoLog("[Extension] Initialized %s\n", extensionID)
+	return nil
 }
 
 func (m *ExtensionManager) CleanupExtension(extensionID string) error {
@@ -1012,12 +854,41 @@ func (m *ExtensionManager) CleanupExtension(extensionID string) error {
 	if ext.VM == nil {
 		return nil
 	}
-	ext.VMMu.Lock()
-	defer ext.VMMu.Unlock()
-	if err := runCleanupLocked(ext); err != nil {
+
+	script := `
+		(function() {
+			if (typeof extension !== 'undefined' && typeof extension.cleanup === 'function') {
+				try {
+					extension.cleanup();
+					return { success: true };
+				} catch (e) {
+					return { success: false, error: e.toString() };
+				}
+			}
+			return { success: true, message: 'no cleanup function' };
+		})()
+	`
+
+	result, err := ext.VM.RunString(script)
+	if err != nil {
 		GoLog("[Extension] Cleanup error for %s: %v\n", extensionID, err)
 		return err
 	}
+
+	if result != nil && !goja.IsUndefined(result) {
+		exported := result.Export()
+		if resultMap, ok := exported.(map[string]interface{}); ok {
+			if success, ok := resultMap["success"].(bool); ok && !success {
+				errMsg := "unknown error"
+				if e, ok := resultMap["error"].(string); ok {
+					errMsg = e
+				}
+				GoLog("[Extension] Cleanup failed for %s: %s\n", extensionID, errMsg)
+				return fmt.Errorf("cleanup failed: %s", errMsg)
+			}
+		}
+	}
+
 	GoLog("[Extension] Cleaned up %s\n", extensionID)
 	return nil
 }
@@ -1046,14 +917,13 @@ func (m *ExtensionManager) InvokeAction(extensionID string, actionName string) (
 		return nil, fmt.Errorf("extension not found: %s", extensionID)
 	}
 
+	if ext.VM == nil {
+		return nil, fmt.Errorf("extension VM not initialized")
+	}
+
 	if !ext.Enabled {
 		return nil, fmt.Errorf("extension is disabled")
 	}
-	vm, err := ext.lockReadyVM()
-	if err != nil {
-		return nil, err
-	}
-	defer ext.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
 		(function() {
@@ -1073,7 +943,7 @@ func (m *ExtensionManager) InvokeAction(extensionID string, actionName string) (
 		})()
 	`, actionName, actionName, actionName)
 
-	result, err := RunWithTimeoutAndRecover(vm, script, DefaultJSTimeout)
+	result, err := RunWithTimeoutAndRecover(ext.VM, script, DefaultJSTimeout)
 	if err != nil {
 		GoLog("[Extension] InvokeAction error for %s.%s: %v\n", extensionID, actionName, err)
 		return nil, fmt.Errorf("action failed: %v", err)

go_backend/extension_manifest.go

@@ -115,7 +115,6 @@ type ExtensionManifest struct {
 	QualityOptions         []QualityOption        `json:"qualityOptions,omitempty"`
 	MinAppVersion          string                 `json:"minAppVersion,omitempty"`
 	SkipMetadataEnrichment bool                   `json:"skipMetadataEnrichment,omitempty"`
-	SkipLyrics             bool                   `json:"skipLyrics,omitempty"`
 	SkipBuiltInFallback    bool                   `json:"skipBuiltInFallback,omitempty"`
 	SearchBehavior         *SearchBehaviorConfig  `json:"searchBehavior,omitempty"`
 	URLHandler             *URLHandlerConfig      `json:"urlHandler,omitempty"`

go_backend/extension_providers.go

@@ -125,15 +125,6 @@ func NewExtensionProviderWrapper(ext *LoadedExtension) *ExtensionProviderWrapper
 	}
 }
 
-func (p *ExtensionProviderWrapper) lockReadyVM() error {
-	vm, err := p.extension.lockReadyVM()
-	if err != nil {
-		return err
-	}
-	p.vm = vm
-	return nil
-}
-
 func (p *ExtensionProviderWrapper) SearchTracks(query string, limit int) (*ExtSearchResult, error) {
 	if !p.extension.Manifest.IsMetadataProvider() {
 		return nil, fmt.Errorf("extension '%s' is not a metadata provider", p.extension.ID)
@@ -142,9 +133,8 @@ func (p *ExtensionProviderWrapper) SearchTracks(query string, limit int) (*ExtSe
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -202,9 +192,8 @@ func (p *ExtensionProviderWrapper) GetTrack(trackID string) (*ExtTrackMetadata,
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -251,9 +240,8 @@ func (p *ExtensionProviderWrapper) GetAlbum(albumID string) (*ExtAlbumMetadata,
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -303,9 +291,8 @@ func (p *ExtensionProviderWrapper) GetArtist(artistID string) (*ExtArtistMetadat
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -358,10 +345,8 @@ func (p *ExtensionProviderWrapper) EnrichTrack(track *ExtTrackMetadata) (*ExtTra
 	if !p.extension.Enabled {
 		return track, nil
 	}
-	if err := p.lockReadyVM(); err != nil {
-		GoLog("[Extension] EnrichTrack init error for %s: %v\n", p.extension.ID, err)
-		return track, nil
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	trackJSON, err := json.Marshal(track)
@@ -420,9 +405,8 @@ func (p *ExtensionProviderWrapper) CheckAvailability(isrc, trackName, artistName
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -468,9 +452,8 @@ func (p *ExtensionProviderWrapper) GetDownloadURL(trackID, quality string) (*Ext
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -510,7 +493,7 @@ func (p *ExtensionProviderWrapper) GetDownloadURL(trackID, quality string) (*Ext
 
 const ExtDownloadTimeout = DownloadTimeout
 
-func (p *ExtensionProviderWrapper) Download(trackID, quality, outputPath, itemID string, onProgress func(percent int)) (*ExtDownloadResult, error) {
+func (p *ExtensionProviderWrapper) Download(trackID, quality, outputPath string, onProgress func(percent int)) (*ExtDownloadResult, error) {
 	if !p.extension.Manifest.IsDownloadProvider() {
 		return nil, fmt.Errorf("extension '%s' is not a download provider", p.extension.ID)
 	}
@@ -518,18 +501,9 @@ func (p *ExtensionProviderWrapper) Download(trackID, quality, outputPath, itemID
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return &ExtDownloadResult{
-			Success:      false,
-			ErrorMessage: err.Error(),
-			ErrorType:    "init_error",
-		}, nil
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
-	if p.extension.runtime != nil {
-		p.extension.runtime.setActiveDownloadItemID(itemID)
-		defer p.extension.runtime.clearActiveDownloadItemID()
-	}
 
 	p.vm.Set("__onProgress", func(call goja.FunctionCall) goja.Value {
 		if len(call.Arguments) > 0 {
@@ -1037,18 +1011,13 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 					GoLog("[DownloadWithExtensionFallback] ReleaseDate from enrichment: %s\n", enrichedTrack.ReleaseDate)
 					req.ReleaseDate = enrichedTrack.ReleaseDate
 				}
-				if enrichedTrack.TrackNumber > 0 && req.TrackNumber == 0 {
-					GoLog("[DownloadWithExtensionFallback] TrackNumber from enrichment: %d\n", enrichedTrack.TrackNumber)
-					req.TrackNumber = enrichedTrack.TrackNumber
-				}
-				if enrichedTrack.DiscNumber > 0 && req.DiscNumber == 0 {
-					GoLog("[DownloadWithExtensionFallback] DiscNumber from enrichment: %d\n", enrichedTrack.DiscNumber)
-					req.DiscNumber = enrichedTrack.DiscNumber
-				}
 			}
 		}
 	}
 
+	// If key metadata is still missing after extension enrichment, search
+	// configured metadata providers (Spotify/Deezer/Tidal/Qobuz) — same
+	// logic that ReEnrichFile uses.
 	if req.Source != "" && !isBuiltInProvider(strings.ToLower(req.Source)) &&
 		req.TrackName != "" && req.ArtistName != "" &&
 		(req.AlbumName == "" || req.ReleaseDate == "" || req.ISRC == "") {
@@ -1096,6 +1065,7 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 			GoLog("[DownloadWithExtensionFallback] Metadata provider search failed (non-fatal): %v\n", searchErr)
 		}
 
+		// Try Deezer extended metadata if we have ISRC
 		if req.ISRC != "" &&
 			(req.Genre == "" || req.Label == "" || req.Copyright == "") {
 			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
@@ -1136,7 +1106,7 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 				StartItemProgress(req.ItemID)
 			}
 
-			result, err := provider.Download(trackID, req.Quality, outputPath, req.ItemID, func(percent int) {
+			result, err := provider.Download(trackID, req.Quality, outputPath, func(percent int) {
 				if req.ItemID != "" {
 					normalized := float64(percent) / 100.0
 					if normalized < 0 {
@@ -1209,6 +1179,8 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 					}
 				}
 
+				// Always pass enriched metadata from req so Flutter can
+				// embed it — fills gaps from metadata provider search.
 				if req.AlbumName != "" && resp.Album == "" {
 					resp.Album = req.AlbumName
 				}
@@ -1362,7 +1334,7 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 				StartItemProgress(req.ItemID)
 			}
 
-			result, err := provider.Download(availability.TrackID, req.Quality, outputPath, req.ItemID, func(percent int) {
+			result, err := provider.Download(availability.TrackID, req.Quality, outputPath, func(percent int) {
 				if req.ItemID != "" {
 					normalized := float64(percent) / 100.0
 					if normalized < 0 {
@@ -1435,28 +1407,6 @@ func DownloadWithExtensionFallback(req DownloadRequest) (*DownloadResponse, erro
 					}
 				}
 
-				if req.AlbumName != "" && resp.Album == "" {
-					resp.Album = req.AlbumName
-				}
-				if req.AlbumArtist != "" && resp.AlbumArtist == "" {
-					resp.AlbumArtist = req.AlbumArtist
-				}
-				if req.ReleaseDate != "" && resp.ReleaseDate == "" {
-					resp.ReleaseDate = req.ReleaseDate
-				}
-				if req.ISRC != "" && resp.ISRC == "" {
-					resp.ISRC = req.ISRC
-				}
-				if req.TrackNumber > 0 && resp.TrackNumber == 0 {
-					resp.TrackNumber = req.TrackNumber
-				}
-				if req.DiscNumber > 0 && resp.DiscNumber == 0 {
-					resp.DiscNumber = req.DiscNumber
-				}
-				if req.CoverURL != "" && resp.CoverURL == "" {
-					resp.CoverURL = req.CoverURL
-				}
-
 				return resp, nil
 			}
 
@@ -1633,6 +1583,7 @@ func buildOutputPathForExtension(req DownloadRequest, ext *LoadedExtension) stri
 		return buildOutputPath(req)
 	}
 
+	// SAF mode: use extension's data dir as writable temp location
 	tempDir := filepath.Join(ext.DataDir, "downloads")
 	os.MkdirAll(tempDir, 0755)
 	AddAllowedDownloadDir(tempDir)
@@ -1675,9 +1626,8 @@ func (p *ExtensionProviderWrapper) CustomSearch(query string, options map[string
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	if options == nil {
@@ -1757,9 +1707,8 @@ func (p *ExtensionProviderWrapper) HandleURL(url string) (*ExtURLHandleResult, e
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	script := fmt.Sprintf(`
@@ -1843,9 +1792,8 @@ func (p *ExtensionProviderWrapper) MatchTrack(sourceTrack map[string]interface{}
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	sourceJSON, _ := json.Marshal(sourceTrack)
@@ -1914,9 +1862,8 @@ func (p *ExtensionProviderWrapper) PostProcess(filePath string, metadata map[str
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return &PostProcessResult{Success: false, Error: err.Error()}, nil
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	metadataJSON, _ := json.Marshal(metadata)
@@ -1977,9 +1924,8 @@ func (p *ExtensionProviderWrapper) PostProcessV2(input PostProcessInput, metadat
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return &PostProcessResult{Success: false, Error: err.Error()}, nil
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	metadataJSON, _ := json.Marshal(metadata)
@@ -2236,9 +2182,8 @@ func (p *ExtensionProviderWrapper) FetchLyrics(trackName, artistName, albumName
 	if !p.extension.Enabled {
 		return nil, fmt.Errorf("extension '%s' is disabled", p.extension.ID)
 	}
-	if err := p.lockReadyVM(); err != nil {
-		return nil, err
-	}
+
+	p.extension.VMMu.Lock()
 	defer p.extension.VMMu.Unlock()
 
 	// Use global variables to avoid JS injection issues with special characters in track/artist names
@@ -2290,6 +2235,7 @@ func (p *ExtensionProviderWrapper) FetchLyrics(trackName, artistName, albumName
 		return nil, fmt.Errorf("failed to parse lyrics result: %w", err)
 	}
 
+	// Convert ExtLyricsResult to LyricsResponse
 	response := &LyricsResponse{
 		SyncType:     extResult.SyncType,
 		Instrumental: extResult.Instrumental,
@@ -2310,6 +2256,7 @@ func (p *ExtensionProviderWrapper) FetchLyrics(trackName, artistName, albumName
 		})
 	}
 
+	// If the extension provided plainLyrics but no lines, parse them as unsynced
 	if len(response.Lines) == 0 && response.PlainLyrics != "" && !response.Instrumental {
 		response.SyncType = "UNSYNCED"
 		for _, line := range strings.Split(response.PlainLyrics, "\n") {
@@ -2337,6 +2284,7 @@ func (m *ExtensionManager) GetLyricsProviders() []*ExtensionProviderWrapper {
 		}
 	}
 
+	// Keep a deterministic order so provider selection is stable across runs.
 	sort.Slice(providers, func(i, j int) bool {
 		return providers[i].extension.ID < providers[j].extension.ID
 	})

go_backend/extension_runtime.go

@@ -90,9 +90,6 @@ type ExtensionRuntime struct {
 	dataDir        string
 	vm             *goja.Runtime
 
-	activeDownloadMu     sync.RWMutex
-	activeDownloadItemID string
-
 	storageMu      sync.RWMutex
 	storageCache   map[string]interface{}
 	storageLoaded  bool
@@ -142,24 +139,6 @@ func NewExtensionRuntime(ext *LoadedExtension) *ExtensionRuntime {
 	return runtime
 }
 
-func (r *ExtensionRuntime) setActiveDownloadItemID(itemID string) {
-	r.activeDownloadMu.Lock()
-	defer r.activeDownloadMu.Unlock()
-	r.activeDownloadItemID = strings.TrimSpace(itemID)
-}
-
-func (r *ExtensionRuntime) clearActiveDownloadItemID() {
-	r.activeDownloadMu.Lock()
-	defer r.activeDownloadMu.Unlock()
-	r.activeDownloadItemID = ""
-}
-
-func (r *ExtensionRuntime) getActiveDownloadItemID() string {
-	r.activeDownloadMu.RLock()
-	defer r.activeDownloadMu.RUnlock()
-	return r.activeDownloadItemID
-}
-
 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.

go_backend/extension_runtime_auth.go

@@ -201,6 +201,7 @@ func (r *ExtensionRuntime) authGetTokens(call goja.FunctionCall) goja.Value {
 	return r.vm.ToValue(result)
 }
 
+// Length should be between 43-128 characters (RFC 7636)
 func generatePKCEVerifier(length int) (string, error) {
 	if length < 43 {
 		length = 43
@@ -225,6 +226,7 @@ func generatePKCEVerifier(length int) (string, error) {
 
 func generatePKCEChallenge(verifier string) string {
 	hash := sha256.Sum256([]byte(verifier))
+	// Base64url encode without padding (RFC 7636)
 	return base64.RawURLEncoding.EncodeToString(hash[:])
 }
 
@@ -281,6 +283,7 @@ func (r *ExtensionRuntime) authGetPKCE(call goja.FunctionCall) goja.Value {
 	})
 }
 
+// config: { authUrl, clientId, redirectUri, scope, extraParams }
 func (r *ExtensionRuntime) authStartOAuthWithPKCE(call goja.FunctionCall) goja.Value {
 	if len(call.Arguments) < 1 {
 		return r.vm.ToValue(map[string]interface{}{
@@ -385,6 +388,7 @@ func (r *ExtensionRuntime) authStartOAuthWithPKCE(call goja.FunctionCall) goja.V
 	})
 }
 
+// config: { tokenUrl, clientId, redirectUri, code, extraParams }
 func (r *ExtensionRuntime) authExchangeCodeWithPKCE(call goja.FunctionCall) goja.Value {
 	if len(call.Arguments) < 1 {
 		return r.vm.ToValue(map[string]interface{}{

go_backend/extension_runtime_file.go

@@ -205,22 +205,13 @@ func (r *ExtensionRuntime) fileDownload(call goja.FunctionCall) goja.Value {
 	defer out.Close()
 
 	contentLength := resp.ContentLength
-	activeItemID := r.getActiveDownloadItemID()
-	if activeItemID != "" && contentLength > 0 {
-		SetItemBytesTotal(activeItemID, contentLength)
-	}
-
-	var progressWriter interface{ Write([]byte) (int, error) } = out
-	if activeItemID != "" {
-		progressWriter = NewItemProgressWriter(out, activeItemID)
-	}
 
 	var written int64
 	buf := make([]byte, 32*1024)
 	for {
 		nr, er := resp.Body.Read(buf)
 		if nr > 0 {
-			nw, ew := progressWriter.Write(buf[0:nr])
+			nw, ew := out.Write(buf[0:nr])
 			if nw < 0 || nr < nw {
 				nw = 0
 				if ew == nil {
@@ -229,12 +220,6 @@ func (r *ExtensionRuntime) fileDownload(call goja.FunctionCall) goja.Value {
 			}
 			written += int64(nw)
 			if ew != nil {
-				if ew == ErrDownloadCancelled {
-					return r.vm.ToValue(map[string]interface{}{
-						"success": false,
-						"error":   "download cancelled",
-					})
-				}
 				return r.vm.ToValue(map[string]interface{}{
 					"success": false,
 					"error":   fmt.Sprintf("failed to write file: %v", ew),

go_backend/extension_runtime_http.go

@@ -118,7 +118,6 @@ func (r *ExtensionRuntime) httpGet(call goja.FunctionCall) goja.Value {
 		"statusCode": resp.StatusCode,
 		"status":     resp.StatusCode,
 		"ok":         resp.StatusCode >= 200 && resp.StatusCode < 300,
-		"url":        resp.Request.URL.String(),
 		"body":       string(body),
 		"headers":    respHeaders,
 	})
@@ -215,7 +214,6 @@ func (r *ExtensionRuntime) httpPost(call goja.FunctionCall) goja.Value {
 		"statusCode": resp.StatusCode,
 		"status":     resp.StatusCode,
 		"ok":         resp.StatusCode >= 200 && resp.StatusCode < 300,
-		"url":        resp.Request.URL.String(),
 		"body":       string(body),
 		"headers":    respHeaders,
 	})
@@ -324,7 +322,6 @@ func (r *ExtensionRuntime) httpRequest(call goja.FunctionCall) goja.Value {
 		"statusCode": resp.StatusCode,
 		"status":     resp.StatusCode,
 		"ok":         resp.StatusCode >= 200 && resp.StatusCode < 300,
-		"url":        resp.Request.URL.String(),
 		"body":       string(body),
 		"headers":    respHeaders,
 	})
@@ -449,7 +446,6 @@ func (r *ExtensionRuntime) httpMethodShortcut(method string, call goja.FunctionC
 		"statusCode": resp.StatusCode,
 		"status":     resp.StatusCode,
 		"ok":         resp.StatusCode >= 200 && resp.StatusCode < 300,
-		"url":        resp.Request.URL.String(),
 		"body":       string(body),
 		"headers":    respHeaders,
 	})

go_backend/extension_runtime_polyfills.go

@@ -12,6 +12,10 @@ import (
 	"github.com/dop251/goja"
 )
 
+// These polyfills make porting browser/Node.js libraries easier
+// without compromising sandbox security.
+
+// Returns a Promise-like object with json(), text() methods.
 func (r *ExtensionRuntime) fetchPolyfill(call goja.FunctionCall) goja.Value {
 	if len(call.Arguments) < 1 {
 		return r.createFetchError("URL is required")
@@ -34,6 +38,7 @@ func (r *ExtensionRuntime) fetchPolyfill(call goja.FunctionCall) goja.Value {
 				method = strings.ToUpper(m)
 			}
 
+			// Body - support string, object (auto-stringify), or nil
 			if bodyArg, ok := opts["body"]; ok && bodyArg != nil {
 				switch v := bodyArg.(type) {
 				case string:
@@ -105,7 +110,7 @@ func (r *ExtensionRuntime) fetchPolyfill(call goja.FunctionCall) goja.Value {
 	responseObj.Set("status", resp.StatusCode)
 	responseObj.Set("statusText", http.StatusText(resp.StatusCode))
 	responseObj.Set("headers", respHeaders)
-	responseObj.Set("url", resp.Request.URL.String())
+	responseObj.Set("url", urlStr)
 
 	bodyString := string(body)
 
@@ -192,6 +197,7 @@ func (r *ExtensionRuntime) registerTextEncoderDecoder(vm *goja.Runtime) {
 		})
 
 		encoder.Set("encodeInto", func(call goja.FunctionCall) goja.Value {
+			// Simplified implementation
 			if len(call.Arguments) < 2 {
 				return vm.ToValue(map[string]interface{}{"read": 0, "written": 0})
 			}
@@ -416,6 +422,7 @@ func (r *ExtensionRuntime) registerURLClass(vm *goja.Runtime) {
 	})
 }
 
+// JSON is already built-in to Goja; this ensures a fallback exists.
 func (r *ExtensionRuntime) registerJSONGlobal(vm *goja.Runtime) {
 	jsonScript := `
 		if (typeof JSON === 'undefined') {

go_backend/extension_store.go

@@ -21,7 +21,7 @@ const (
 	CategoryIntegration = "integration"
 )
 
-type storeExtension struct {
+type StoreExtension struct {
 	ID               string   `json:"id"`
 	Name             string   `json:"name"`
 	DisplayName      string   `json:"display_name,omitempty"`
@@ -41,7 +41,7 @@ type storeExtension struct {
 	MinAppVersionAlt string   `json:"minAppVersion,omitempty"`
 }
 
-func (e *storeExtension) getDisplayName() string {
+func (e *StoreExtension) getDisplayName() string {
 	if e.DisplayName != "" {
 		return e.DisplayName
 	}
@@ -51,34 +51,34 @@ func (e *storeExtension) getDisplayName() string {
 	return e.Name
 }
 
-func (e *storeExtension) getDownloadURL() string {
+func (e *StoreExtension) getDownloadURL() string {
 	if e.DownloadURL != "" {
 		return e.DownloadURL
 	}
 	return e.DownloadURLAlt
 }
 
-func (e *storeExtension) getIconURL() string {
+func (e *StoreExtension) getIconURL() string {
 	if e.IconURL != "" {
 		return e.IconURL
 	}
 	return e.IconURLAlt
 }
 
-func (e *storeExtension) getMinAppVersion() string {
+func (e *StoreExtension) getMinAppVersion() string {
 	if e.MinAppVersion != "" {
 		return e.MinAppVersion
 	}
 	return e.MinAppVersionAlt
 }
 
-type storeRegistry struct {
+type StoreRegistry struct {
 	Version    int              `json:"version"`
 	UpdatedAt  string           `json:"updated_at"`
-	Extensions []storeExtension `json:"extensions"`
+	Extensions []StoreExtension `json:"extensions"`
 }
 
-type storeExtensionResponse struct {
+type StoreExtensionResponse struct {
 	ID               string   `json:"id"`
 	Name             string   `json:"name"`
 	DisplayName      string   `json:"display_name"`
@@ -97,8 +97,8 @@ type storeExtensionResponse struct {
 	HasUpdate        bool     `json:"has_update"`
 }
 
-func (e *storeExtension) toResponse() storeExtensionResponse {
-	resp := storeExtensionResponse{
+func (e *StoreExtension) ToResponse() StoreExtensionResponse {
+	return StoreExtensionResponse{
 		ID:            e.ID,
 		Name:          e.Name,
 		DisplayName:   e.getDisplayName(),
@@ -108,30 +108,25 @@ func (e *storeExtension) toResponse() storeExtensionResponse {
 		DownloadURL:   e.getDownloadURL(),
 		IconURL:       e.getIconURL(),
 		Category:      e.Category,
+		Tags:          e.Tags,
 		Downloads:     e.Downloads,
 		UpdatedAt:     e.UpdatedAt,
 		MinAppVersion: e.getMinAppVersion(),
 	}
-
-	if len(e.Tags) > 0 {
-		resp.Tags = append([]string(nil), e.Tags...)
-	}
-
-	return resp
 }
 
-type extensionStore struct {
+type ExtensionStore struct {
 	registryURL string
 	cacheDir    string
-	cache       *storeRegistry
+	cache       *StoreRegistry
 	cacheMu     sync.RWMutex
 	cacheTime   time.Time
 	cacheTTL    time.Duration
 }
 
 var (
-	globalExtensionStore *extensionStore
-	extensionStoreMu     sync.Mutex
+	extensionStore   *ExtensionStore
+	extensionStoreMu sync.Mutex
 )
 
 const (
@@ -139,22 +134,24 @@ const (
 	cacheFileName = "store_cache.json"
 )
 
-func initExtensionStore(cacheDir string) *extensionStore {
+func InitExtensionStore(cacheDir string) *ExtensionStore {
 	extensionStoreMu.Lock()
 	defer extensionStoreMu.Unlock()
 
-	if globalExtensionStore == nil {
-		globalExtensionStore = &extensionStore{
-			registryURL: "",
+	if extensionStore == nil {
+		extensionStore = &ExtensionStore{
+			registryURL: "", // No default - user must provide a registry URL
 			cacheDir:    cacheDir,
 			cacheTTL:    cacheTTL,
 		}
-		globalExtensionStore.loadDiskCache()
+		extensionStore.loadDiskCache()
 	}
-	return globalExtensionStore
+	return extensionStore
 }
 
-func (s *extensionStore) setRegistryURL(registryURL string) {
+// SetRegistryURL updates the registry URL and clears the in-memory cache
+// so the next fetch will use the new URL. Disk cache is also cleared.
+func (s *ExtensionStore) SetRegistryURL(registryURL string) {
 	s.cacheMu.Lock()
 	defer s.cacheMu.Unlock()
 
@@ -166,6 +163,7 @@ func (s *extensionStore) setRegistryURL(registryURL string) {
 	s.cache = nil
 	s.cacheTime = time.Time{}
 
+	// Clear disk cache since it's from a different registry
 	if s.cacheDir != "" {
 		cachePath := filepath.Join(s.cacheDir, cacheFileName)
 		os.Remove(cachePath)
@@ -174,19 +172,20 @@ func (s *extensionStore) setRegistryURL(registryURL string) {
 	LogInfo("ExtensionStore", "Registry URL updated to: %s", registryURL)
 }
 
-func (s *extensionStore) getRegistryURL() string {
+// GetRegistryURL returns the currently configured registry URL.
+func (s *ExtensionStore) GetRegistryURL() string {
 	s.cacheMu.RLock()
 	defer s.cacheMu.RUnlock()
 	return s.registryURL
 }
 
-func getExtensionStore() *extensionStore {
+func GetExtensionStore() *ExtensionStore {
 	extensionStoreMu.Lock()
 	defer extensionStoreMu.Unlock()
-	return globalExtensionStore
+	return extensionStore
 }
 
-func (s *extensionStore) loadDiskCache() {
+func (s *ExtensionStore) loadDiskCache() {
 	if s.cacheDir == "" {
 		return
 	}
@@ -198,7 +197,7 @@ func (s *extensionStore) loadDiskCache() {
 	}
 
 	var cacheData struct {
-		Registry  storeRegistry `json:"registry"`
+		Registry  StoreRegistry `json:"registry"`
 		CacheTime int64         `json:"cache_time"`
 	}
 
@@ -211,13 +210,13 @@ func (s *extensionStore) loadDiskCache() {
 	LogDebug("ExtensionStore", "Loaded %d extensions from disk cache", len(s.cache.Extensions))
 }
 
-func (s *extensionStore) saveDiskCache() {
+func (s *ExtensionStore) saveDiskCache() {
 	if s.cacheDir == "" || s.cache == nil {
 		return
 	}
 
 	cacheData := struct {
-		Registry  storeRegistry `json:"registry"`
+		Registry  StoreRegistry `json:"registry"`
 		CacheTime int64         `json:"cache_time"`
 	}{
 		Registry:  *s.cache,
@@ -233,10 +232,11 @@ func (s *extensionStore) saveDiskCache() {
 	os.WriteFile(cachePath, data, 0644)
 }
 
-func (s *extensionStore) fetchRegistry(forceRefresh bool) (*storeRegistry, error) {
+func (s *ExtensionStore) FetchRegistry(forceRefresh bool) (*StoreRegistry, error) {
 	s.cacheMu.Lock()
 	defer s.cacheMu.Unlock()
 
+	// Check if a registry URL has been configured
 	if s.registryURL == "" {
 		return nil, fmt.Errorf("no registry URL configured. Please add a repository URL first")
 	}
@@ -276,7 +276,7 @@ func (s *extensionStore) fetchRegistry(forceRefresh bool) (*storeRegistry, error
 		return nil, fmt.Errorf("failed to read registry: %w", err)
 	}
 
-	var registry storeRegistry
+	var registry StoreRegistry
 	if err := json.Unmarshal(body, &registry); err != nil {
 		return nil, fmt.Errorf("failed to parse registry: %w", err)
 	}
@@ -289,8 +289,8 @@ func (s *extensionStore) fetchRegistry(forceRefresh bool) (*storeRegistry, error
 	return &registry, nil
 }
 
-func (s *extensionStore) getExtensionsWithStatus(forceRefresh bool) ([]storeExtensionResponse, error) {
-	registry, err := s.fetchRegistry(forceRefresh)
+func (s *ExtensionStore) GetExtensionsWithStatus() ([]StoreExtensionResponse, error) {
+	registry, err := s.FetchRegistry(false)
 	if err != nil {
 		return nil, err
 	}
@@ -304,32 +304,29 @@ func (s *extensionStore) getExtensionsWithStatus(forceRefresh bool) ([]storeExte
 		}
 	}
 
-	LogDebug("ExtensionStore", "Building store response for %d registry extensions (%d installed)", len(registry.Extensions), len(installed))
+	result := make([]StoreExtensionResponse, len(registry.Extensions))
+	for i, ext := range registry.Extensions {
+		resp := ext.ToResponse()
 
-	result := make([]storeExtensionResponse, 0, len(registry.Extensions))
-	for i := range registry.Extensions {
-		ext := &registry.Extensions[i]
-		resp := ext.toResponse()
 		if installedVersion, ok := installed[ext.ID]; ok {
 			resp.IsInstalled = true
 			resp.InstalledVersion = installedVersion
 			resp.HasUpdate = compareVersions(ext.Version, installedVersion) > 0
 		}
 
-		result = append(result, resp)
+		result[i] = resp
 	}
 
-	LogDebug("ExtensionStore", "Built store response payload for %d extensions", len(result))
 	return result, nil
 }
 
-func (s *extensionStore) downloadExtension(extensionID string, destPath string) error {
-	registry, err := s.fetchRegistry(false)
+func (s *ExtensionStore) DownloadExtension(extensionID string, destPath string) error {
+	registry, err := s.FetchRegistry(false)
 	if err != nil {
 		return err
 	}
 
-	var ext *storeExtension
+	var ext *StoreExtension
 	for _, e := range registry.Extensions {
 		if e.ID == extensionID {
 			ext = &e
@@ -374,22 +371,33 @@ func (s *extensionStore) downloadExtension(extensionID string, destPath string)
 	return nil
 }
 
-func resolveRegistryURL(input string) (string, error) {
+// ResolveRegistryURL normalises a user-supplied URL into a direct registry.json URL.
+//
+// Accepted formats:
+//   - https://raw.githubusercontent.com/owner/repo/<branch>/registry.json  → returned as-is
+//   - https://github.com/owner/repo  (with optional trailing path / .git)  → resolved via
+//     the GitHub API to discover the default branch, then converted to the raw URL
+//   - Any other HTTPS URL  → returned as-is (assumed to be a direct link)
+func ResolveRegistryURL(input string) (string, error) {
 	input = strings.TrimSpace(input)
 	if input == "" {
 		return "", fmt.Errorf("registry URL is empty")
 	}
 
+	// Already a fully-qualified raw URL – keep it.
 	if strings.Contains(input, "raw.githubusercontent.com") {
 		return input, nil
 	}
 
+	// Try to match https://github.com/<owner>/<repo>[/...]
 	const ghPrefix = "https://github.com/"
 	if !strings.HasPrefix(input, ghPrefix) {
+		// Also accept http:// and upgrade silently.
 		const ghPrefixHTTP = "http://github.com/"
 		if strings.HasPrefix(input, ghPrefixHTTP) {
 			input = "https://github.com/" + input[len(ghPrefixHTTP):]
 		} else {
+			// Not a GitHub URL – return as-is.
 			return input, nil
 		}
 	}
@@ -409,6 +417,8 @@ func resolveRegistryURL(input string) (string, error) {
 	return resolved, nil
 }
 
+// resolveGitHubDefaultBranch calls the GitHub API to discover the repository's
+// default branch.  Falls back to "main" on any error.
 func resolveGitHubDefaultBranch(owner, repo string) string {
 	apiURL := fmt.Sprintf("https://api.github.com/repos/%s/%s", owner, repo)
 	client := NewHTTPClientWithTimeout(10 * time.Second)
@@ -450,7 +460,7 @@ func requireHTTPSURL(rawURL string, context string) error {
 	return nil
 }
 
-func (s *extensionStore) getCategories() []string {
+func (s *ExtensionStore) GetCategories() []string {
 	return []string{
 		CategoryMetadata,
 		CategoryDownload,
@@ -460,8 +470,8 @@ func (s *extensionStore) getCategories() []string {
 	}
 }
 
-func (s *extensionStore) searchExtensions(query string, category string) ([]storeExtensionResponse, error) {
-	extensions, err := s.getExtensionsWithStatus(false)
+func (s *ExtensionStore) SearchExtensions(query string, category string) ([]StoreExtensionResponse, error) {
+	extensions, err := s.GetExtensionsWithStatus()
 	if err != nil {
 		return nil, err
 	}
@@ -470,7 +480,7 @@ func (s *extensionStore) searchExtensions(query string, category string) ([]stor
 		return extensions, nil
 	}
 
-	result := make([]storeExtensionResponse, 0, len(extensions))
+	var result []StoreExtensionResponse
 	queryLower := toLower(query)
 
 	for _, ext := range extensions {
@@ -483,6 +493,7 @@ func (s *extensionStore) searchExtensions(query string, category string) ([]stor
 				!containsIgnoreCase(ext.DisplayName, queryLower) &&
 				!containsIgnoreCase(ext.Description, queryLower) &&
 				!containsIgnoreCase(ext.Author, queryLower) {
+				// Check tags
 				found := false
 				for _, tag := range ext.Tags {
 					if containsIgnoreCase(tag, queryLower) {
@@ -502,7 +513,7 @@ func (s *extensionStore) searchExtensions(query string, category string) ([]stor
 	return result, nil
 }
 
-func (s *extensionStore) clearCache() {
+func (s *ExtensionStore) ClearCache() {
 	s.cacheMu.Lock()
 	defer s.cacheMu.Unlock()
 

go_backend/extension_timeout.go

@@ -20,10 +20,6 @@ func (e *JSExecutionError) Error() string {
 }
 
 func RunWithTimeout(vm *goja.Runtime, script string, timeout time.Duration) (goja.Value, error) {
-	if vm == nil {
-		return nil, fmt.Errorf("extension runtime unavailable")
-	}
-
 	if timeout <= 0 {
 		timeout = DefaultJSTimeout
 	}
@@ -73,11 +69,6 @@ func RunWithTimeout(vm *goja.Runtime, script string, timeout time.Duration) (goj
 
 		vm.Interrupt("execution timeout")
 
-		// MUST wait for the goroutine to finish before returning.
-		// The Goja VM is NOT thread-safe — if we return while the goroutine
-		// is still executing JS (e.g. blocked on an HTTP call), the next
-		// caller will access the VM concurrently and crash with a nil
-		// pointer dereference.
 		select {
 		case res := <-resultCh:
 			if res.err != nil {
@@ -87,10 +78,7 @@ func RunWithTimeout(vm *goja.Runtime, script string, timeout time.Duration) (goj
 				Message:   "execution timeout exceeded",
 				IsTimeout: true,
 			}
-		case <-time.After(60 * time.Second):
-			// Goroutine is truly stuck (e.g. HTTP read with no timeout).
-			// Log a warning — the VM should NOT be reused after this.
-			GoLog("[ExtensionRuntime] WARNING: JS goroutine did not exit within 60s after interrupt, VM may be unsafe\n")
+		case <-time.After(1 * time.Second):
 			return nil, &JSExecutionError{
 				Message:   "execution timeout exceeded (force)",
 				IsTimeout: true,
@@ -104,9 +92,8 @@ func RunWithTimeout(vm *goja.Runtime, script string, timeout time.Duration) (goj
 func RunWithTimeoutAndRecover(vm *goja.Runtime, script string, timeout time.Duration) (goja.Value, error) {
 	result, err := RunWithTimeout(vm, script, timeout)
 
-	if vm != nil {
-		vm.ClearInterrupt()
-	}
+	// Clear any interrupt state so VM can be reused
+	vm.ClearInterrupt()
 
 	return result, err
 }

go_backend/go.mod

@@ -2,28 +2,28 @@ module github.com/zarz/spotiflac_android/go_backend
 
 go 1.25.0
 
-toolchain go1.25.8
+toolchain go1.25.7
 
 require (
-	github.com/dop251/goja v0.0.0-20260311135729-065cd970411c
+	github.com/dop251/goja v0.0.0-20260216154549-8b74ce4618c5
 	github.com/go-flac/flacpicture/v2 v2.0.2
 	github.com/go-flac/flacvorbis/v2 v2.0.2
 	github.com/go-flac/go-flac/v2 v2.0.4
 	github.com/refraction-networking/utls v1.8.2
-	golang.org/x/mobile v0.0.0-20260312152759-81488f6aeb60
-	golang.org/x/net v0.52.0
-	golang.org/x/text v0.35.0
+	golang.org/x/mobile v0.0.0-20260211191516-dcd2a3258864
+	golang.org/x/net v0.50.0
 )
 
 require (
-	github.com/andybalholm/brotli v1.2.0 // indirect
-	github.com/dlclark/regexp2 v1.11.5 // indirect
-	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
-	github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc // indirect
-	github.com/klauspost/compress v1.18.5 // indirect
-	golang.org/x/crypto v0.49.0 // indirect
-	golang.org/x/mod v0.34.0 // indirect
-	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/tools v0.43.0 // indirect
+	github.com/andybalholm/brotli v1.0.6 // indirect
+	github.com/dlclark/regexp2 v1.11.4 // indirect
+	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
+	github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
+	golang.org/x/crypto v0.48.0 // indirect
+	golang.org/x/mod v0.33.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/sys v0.41.0 // indirect
+	golang.org/x/text v0.34.0 // indirect
+	golang.org/x/tools v0.42.0 // indirect
 )

go_backend/go.sum

@@ -1,51 +1,67 @@
 github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
-github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
-github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
+github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
+github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
-github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dop251/goja v0.0.0-20260311135729-065cd970411c h1:OcLmPfx1T1RmZVHHFwWMPaZDdRf0DBMZOFMVWJa7Pdk=
-github.com/dop251/goja v0.0.0-20260311135729-065cd970411c/go.mod h1:MxLav0peU43GgvwVgNbLAj1s/bSGboKkhuULvq/7hx4=
+github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
+github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dop251/goja v0.0.0-20260106131823-651366fbe6e3 h1:bVp3yUzvSAJzu9GqID+Z96P+eu5TKnIMJSV4QaZMauM=
+github.com/dop251/goja v0.0.0-20260106131823-651366fbe6e3/go.mod h1:MxLav0peU43GgvwVgNbLAj1s/bSGboKkhuULvq/7hx4=
+github.com/dop251/goja v0.0.0-20260216154549-8b74ce4618c5 h1:QckvTXtu55YMopmVeDrPQ/r+T6xjw8KMCmE3UgUldkw=
+github.com/dop251/goja v0.0.0-20260216154549-8b74ce4618c5/go.mod h1:MxLav0peU43GgvwVgNbLAj1s/bSGboKkhuULvq/7hx4=
 github.com/go-flac/flacpicture/v2 v2.0.2 h1:HCaJIVZpxnpdWs6G3ECEVRelzqS5xOi1Ba1AGmtXbzE=
 github.com/go-flac/flacpicture/v2 v2.0.2/go.mod h1:DMZBPWPAmdLqNhqFSy5ZBs9wyBzOekXutGfP7/TFCuo=
 github.com/go-flac/flacvorbis/v2 v2.0.2 h1:xCL3OhxrxWkHrbWUBvGNe+6FQ03yLmBbz0v5z4V2PoQ=
 github.com/go-flac/flacvorbis/v2 v2.0.2/go.mod h1:SwTB5gs13VaM/N7rstwPoUsPibiMKklgwybYP9dYo2g=
 github.com/go-flac/go-flac/v2 v2.0.4 h1:atf/kFa8U9idtkA//NO22XGr+MzQLeXZecnmP9sYBf0=
 github.com/go-flac/go-flac/v2 v2.0.4/go.mod h1:sYOlTKxutMW0RDYF+KlD6Zn+VOCZlIFQG/r/usPveCs=
-github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q=
-github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc h1:VBbFa1lDYWEeV5FZKUiYKYT0VxCp9twUmmaq9eb8sXw=
-github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
-github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE=
-github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
+github.com/google/pprof v0.0.0-20230207041349-798e818bf904 h1:4/hN5RUoecvl+RmJRE2YxKWtnnQls6rQjjW5oV7qg2U=
+github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/refraction-networking/utls v1.8.2 h1:j4Q1gJj0xngdeH+Ox/qND11aEfhpgoEvV+S9iJ2IdQo=
 github.com/refraction-networking/utls v1.8.2/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
-github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
-golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
-golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
-golang.org/x/mobile v0.0.0-20260312152759-81488f6aeb60 h1:MOzyaj0wu2xneBkzkg9LHNYjDBB4W5vP043A2SYQRPA=
-golang.org/x/mobile v0.0.0-20260312152759-81488f6aeb60/go.mod h1:th6VJvzjMbrYF8SduQY5rpD0HG0GleGxjadkqSxFs3k=
-golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
-golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
-golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
-golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
+golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
+golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
+golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
+golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
+golang.org/x/mobile v0.0.0-20260204172633-1dceadbbeea3 h1:NiJtT7g4ncNFVjVZMAYNBrPSNhIjFYPj8UKA8MEw2A4=
+golang.org/x/mobile v0.0.0-20260204172633-1dceadbbeea3/go.mod h1:wReH3Q1agKmmLapipWFnd4NSs8KPz3fK6mSEZjXLkrg=
+golang.org/x/mobile v0.0.0-20260209203831-923679eb55af h1:VqXrZNyqFISxo0rNDFZQlRDRIp7RXSJDeh/LbrK+W1k=
+golang.org/x/mobile v0.0.0-20260209203831-923679eb55af/go.mod h1:tbwefIr7RlQD1OpZ0KEZ9nux/uiihAOGdafgZfJkmII=
+golang.org/x/mobile v0.0.0-20260211191516-dcd2a3258864 h1:cTVynMSsMYgbUrtia2HB1jrhdUwQNtQti91vUCyjMp4=
+golang.org/x/mobile v0.0.0-20260211191516-dcd2a3258864/go.mod h1:4OGHIUSBiIqyFAQDaX1tpY0BVnO20DvNDeATBu8aeFQ=
+golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
+golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
+golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
+golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
+golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
+golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
+golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
+golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
+golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
+golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
+golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
+golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
+golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
+golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
+golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

go_backend/httputil.go

@@ -66,6 +66,9 @@ var sharedTransport = &http.Transport{
 	DisableCompression:    true,
 }
 
+// metadataTransport is a separate transport for metadata API calls (Deezer, Spotify, SongLink).
+// Isolated from download traffic so that download failures cannot poison
+// the connection pool used by metadata enrichment.
 var metadataTransport = &http.Transport{
 	DialContext: (&net.Dialer{
 		Timeout:   30 * time.Second,
@@ -101,6 +104,8 @@ func NewHTTPClientWithTimeout(timeout time.Duration) *http.Client {
 	}
 }
 
+// NewMetadataHTTPClient creates an HTTP client using the isolated metadata transport.
+// Use this for API calls that should not be affected by download traffic.
 func NewMetadataHTTPClient(timeout time.Duration) *http.Client {
 	return &http.Client{
 		Transport: newCompatibilityTransport(metadataTransport),
@@ -224,6 +229,7 @@ func cloneRequestWithHTTPScheme(req *http.Request, scheme string) (*http.Request
 	return reqCopy, nil
 }
 
+// Also checks for ISP blocking on errors
 func DoRequestWithUserAgent(client *http.Client, req *http.Request) (*http.Response, error) {
 	req.Header.Set("User-Agent", getRandomUserAgent())
 	resp, err := client.Do(req)
@@ -233,6 +239,7 @@ func DoRequestWithUserAgent(client *http.Client, req *http.Request) (*http.Respo
 	return resp, err
 }
 
+// RetryConfig holds configuration for retry logic
 type RetryConfig struct {
 	MaxRetries    int
 	InitialDelay  time.Duration
@@ -293,11 +300,14 @@ func DoRequestWithRetry(client *http.Client, req *http.Request, config RetryConf
 			continue
 		}
 
+		// Check for ISP blocking via HTTP status codes
+		// Some ISPs return 403 or 451 when blocking content
 		if resp.StatusCode == 403 || resp.StatusCode == 451 {
 			body, _ := io.ReadAll(resp.Body)
 			resp.Body.Close()
 			bodyStr := strings.ToLower(string(body))
 
+			// Check if response looks like ISP blocking page
 			ispBlockingIndicators := []string{
 				"blocked", "forbidden", "access denied", "not available in your",
 				"restricted", "censored", "unavailable for legal", "blocked by",
@@ -508,6 +518,7 @@ func IsISPBlocking(err error, requestURL string) *ISPBlockingError {
 	return nil
 }
 
+// Returns true if ISP blocking was detected
 func CheckAndLogISPBlocking(err error, requestURL string, tag string) bool {
 	ispErr := IsISPBlocking(err, requestURL)
 	if ispErr != nil {
@@ -542,6 +553,7 @@ func extractDomain(rawURL string) string {
 	return "unknown"
 }
 
+// If ISP blocking is detected, returns a more descriptive error
 func WrapErrorWithISPCheck(err error, requestURL string, tag string) error {
 	if err == nil {
 		return nil

go_backend/httputil_ios.go

@@ -6,10 +6,17 @@ import (
 	"net/http"
 )
 
+// iOS version: uTLS is not supported on iOS due to cgo DNS resolver issues
+// Fall back to standard HTTP client
+
+// GetCloudflareBypassClient returns the standard HTTP client on iOS
+// uTLS is not available on iOS due to cgo DNS resolver compatibility issues
 func GetCloudflareBypassClient() *http.Client {
 	return sharedClient
 }
 
+// DoRequestWithCloudflareBypass on iOS just uses the standard client
+// uTLS Chrome fingerprint bypass is not available on iOS
 func DoRequestWithCloudflareBypass(req *http.Request) (*http.Response, error) {
 	req.Header.Set("User-Agent", getRandomUserAgent())
 	resp, err := sharedClient.Do(req)

go_backend/httputil_utls.go

@@ -16,6 +16,8 @@ import (
 	"golang.org/x/net/http2"
 )
 
+// uTLS transport that mimics Chrome's TLS fingerprint to bypass Cloudflare
+// Uses HTTP/2 for optimal performance as uTLS works best with HTTP/2
 type utlsTransport struct {
 	dialer       *net.Dialer
 	mu           sync.Mutex
@@ -96,15 +98,21 @@ var cloudflareBypassClient = &http.Client{
 	Timeout:   DefaultTimeout,
 }
 
+// GetCloudflareBypassClient returns an HTTP client that mimics Chrome's TLS fingerprint
+// Use this when requests are blocked by Cloudflare (common when using VPN)
 func GetCloudflareBypassClient() *http.Client {
 	return cloudflareBypassClient
 }
 
+// DoRequestWithCloudflareBypass attempts request with standard client first,
+// then retries with uTLS Chrome fingerprint if Cloudflare blocks it.
+// This is useful when using VPN as Cloudflare detects Go's default TLS fingerprint.
 func DoRequestWithCloudflareBypass(req *http.Request) (*http.Response, error) {
 	req.Header.Set("User-Agent", getRandomUserAgent())
 
 	resp, err := sharedClient.Do(req)
 	if err == nil {
+		// Check for Cloudflare challenge page (403 with specific markers)
 		if resp.StatusCode == 403 || resp.StatusCode == 503 {
 			body, readErr := io.ReadAll(resp.Body)
 			resp.Body.Close()
@@ -135,6 +143,7 @@ func DoRequestWithCloudflareBypass(req *http.Request) (*http.Response, error) {
 				}
 			}
 
+			// Not Cloudflare, return original response (recreate body)
 			return &http.Response{
 				Status:     resp.Status,
 				StatusCode: resp.StatusCode,
@@ -145,6 +154,7 @@ func DoRequestWithCloudflareBypass(req *http.Request) (*http.Response, error) {
 		return resp, nil
 	}
 
+	// Check if error might be TLS-related (Cloudflare blocking)
 	errStr := strings.ToLower(err.Error())
 	tlsRelated := strings.Contains(errStr, "tls") ||
 		strings.Contains(errStr, "handshake") ||

go_backend/idhs.go

@@ -10,6 +10,8 @@ import (
 	"time"
 )
 
+// IDHSClient is a client for I Don't Have Spotify API
+// Used as fallback when SongLink fails or is rate limited
 type IDHSClient struct {
 	client *http.Client
 }
@@ -53,6 +55,7 @@ func NewIDHSClient() *IDHSClient {
 	return globalIDHSClient
 }
 
+// Search converts a music link to links on other platforms
 func (c *IDHSClient) Search(link string, adapters []string) (*IDHSSearchResponse, error) {
 	idhsRateLimiter.WaitForSlot()
 
@@ -106,6 +109,7 @@ func (c *IDHSClient) Search(link string, adapters []string) (*IDHSSearchResponse
 	return &result, nil
 }
 
+// GetAvailabilityFromSpotify checks track availability using IDHS as fallback
 func (c *IDHSClient) GetAvailabilityFromSpotify(spotifyTrackID string) (*TrackAvailability, error) {
 	spotifyURL := fmt.Sprintf("https://open.spotify.com/track/%s", spotifyTrackID)
 

go_backend/library_scan.go

@@ -13,26 +13,25 @@ import (
 )
 
 type LibraryScanResult struct {
-	ID                   string `json:"id"`
-	TrackName            string `json:"trackName"`
-	ArtistName           string `json:"artistName"`
-	AlbumName            string `json:"albumName"`
-	AlbumArtist          string `json:"albumArtist,omitempty"`
-	FilePath             string `json:"filePath"`
-	CoverPath            string `json:"coverPath,omitempty"`
-	ScannedAt            string `json:"scannedAt"`
-	FileModTime          int64  `json:"fileModTime,omitempty"` // Unix timestamp in milliseconds
-	ISRC                 string `json:"isrc,omitempty"`
-	TrackNumber          int    `json:"trackNumber,omitempty"`
-	DiscNumber           int    `json:"discNumber,omitempty"`
-	Duration             int    `json:"duration,omitempty"`
-	ReleaseDate          string `json:"releaseDate,omitempty"`
-	BitDepth             int    `json:"bitDepth,omitempty"`
-	SampleRate           int    `json:"sampleRate,omitempty"`
-	Bitrate              int    `json:"bitrate,omitempty"` // kbps, for lossy formats (MP3, Opus, Vorbis)
-	Genre                string `json:"genre,omitempty"`
-	Format               string `json:"format,omitempty"`
-	MetadataFromFilename bool   `json:"metadataFromFilename,omitempty"`
+	ID          string `json:"id"`
+	TrackName   string `json:"trackName"`
+	ArtistName  string `json:"artistName"`
+	AlbumName   string `json:"albumName"`
+	AlbumArtist string `json:"albumArtist,omitempty"`
+	FilePath    string `json:"filePath"`
+	CoverPath   string `json:"coverPath,omitempty"`
+	ScannedAt   string `json:"scannedAt"`
+	FileModTime int64  `json:"fileModTime,omitempty"` // Unix timestamp in milliseconds
+	ISRC        string `json:"isrc,omitempty"`
+	TrackNumber int    `json:"trackNumber,omitempty"`
+	DiscNumber  int    `json:"discNumber,omitempty"`
+	Duration    int    `json:"duration,omitempty"`
+	ReleaseDate string `json:"releaseDate,omitempty"`
+	BitDepth    int    `json:"bitDepth,omitempty"`
+	SampleRate  int    `json:"sampleRate,omitempty"`
+	Bitrate     int    `json:"bitrate,omitempty"` // kbps, for lossy formats (MP3, Opus, Vorbis)
+	Genre       string `json:"genre,omitempty"`
+	Format      string `json:"format,omitempty"`
 }
 
 type LibraryScanProgress struct {
@@ -66,9 +65,6 @@ var supportedAudioFormats = map[string]bool{
 	".mp3":  true,
 	".opus": true,
 	".ogg":  true,
-	".ape":  true,
-	".wv":   true,
-	".mpc":  true,
 	".cue":  true,
 }
 
@@ -173,9 +169,11 @@ func ScanLibraryFolder(folderPath string) (string, error) {
 	scanTime := time.Now().UTC().Format(time.RFC3339)
 	errorCount := 0
 
+	// Track audio files referenced by .cue sheets to avoid duplicates
 	cueReferencedAudioFiles := make(map[string]bool)
 	parsedCueFiles := make(map[string]scannedCueFileInfo)
 
+	// First pass: scan .cue files to collect referenced audio paths
 	for _, fileInfo := range audioFileInfos {
 		filePath := fileInfo.path
 		ext := strings.ToLower(filepath.Ext(filePath))
@@ -210,6 +208,7 @@ func ScanLibraryFolder(folderPath string) (string, error) {
 
 		ext := strings.ToLower(filepath.Ext(filePath))
 
+		// Handle .cue files: produce multiple track results
 		if ext == ".cue" {
 			var cueResults []LibraryScanResult
 			cueInfo, ok := parsedCueFiles[filePath]
@@ -220,7 +219,6 @@ func ScanLibraryFolder(folderPath string) (string, error) {
 					cueInfo.audioPath,
 					"",
 					fileInfo.modTime,
-					"",
 					scanTime,
 				)
 			} else {
@@ -236,6 +234,8 @@ func ScanLibraryFolder(folderPath string) (string, error) {
 			continue
 		}
 
+		// Skip audio files that are referenced by a .cue sheet
+		// (they will be represented by the cue sheet's track entries instead)
 		if cueReferencedAudioFiles[filePath] {
 			GoLog("[LibraryScan] Skipping %s (referenced by .cue sheet)\n", filepath.Base(filePath))
 			continue
@@ -271,14 +271,10 @@ func scanAudioFile(filePath, scanTime string) (*LibraryScanResult, error) {
 }
 
 func scanAudioFileWithKnownModTime(filePath, scanTime string, knownModTime int64) (*LibraryScanResult, error) {
-	return scanAudioFileWithKnownModTimeAndDisplayNameAndCoverCacheKey(filePath, "", "", scanTime, knownModTime)
+	return scanAudioFileWithKnownModTimeAndDisplayName(filePath, "", scanTime, knownModTime)
 }
 
 func scanAudioFileWithKnownModTimeAndDisplayName(filePath, displayNameHint, scanTime string, knownModTime int64) (*LibraryScanResult, error) {
-	return scanAudioFileWithKnownModTimeAndDisplayNameAndCoverCacheKey(filePath, displayNameHint, "", scanTime, knownModTime)
-}
-
-func scanAudioFileWithKnownModTimeAndDisplayNameAndCoverCacheKey(filePath, displayNameHint, coverCacheKey, scanTime string, knownModTime int64) (*LibraryScanResult, error) {
 	ext := resolveLibraryAudioExt(filePath, displayNameHint)
 
 	result := &LibraryScanResult{
@@ -298,12 +294,7 @@ func scanAudioFileWithKnownModTimeAndDisplayNameAndCoverCacheKey(filePath, displ
 	coverCacheDir := libraryCoverCacheDir
 	libraryCoverCacheMu.RUnlock()
 	if coverCacheDir != "" {
-		coverPath, err := SaveCoverToCacheWithHintAndKey(
-			filePath,
-			displayNameHint,
-			coverCacheDir,
-			coverCacheKey,
-		)
+		coverPath, err := SaveCoverToCacheWithHint(filePath, displayNameHint, coverCacheDir)
 		if err == nil && coverPath != "" {
 			result.CoverPath = coverPath
 		}
@@ -311,15 +302,13 @@ func scanAudioFileWithKnownModTimeAndDisplayNameAndCoverCacheKey(filePath, displ
 
 	switch ext {
 	case ".flac":
-		return scanFLACFile(filePath, result, displayNameHint)
+		return scanFLACFile(filePath, result)
 	case ".m4a":
-		return scanM4AFile(filePath, result, displayNameHint)
+		return scanM4AFile(filePath, result)
 	case ".mp3":
-		return scanMP3File(filePath, result, displayNameHint)
+		return scanMP3File(filePath, result)
 	case ".opus", ".ogg":
 		return scanOggFile(filePath, result, displayNameHint)
-	case ".ape", ".wv", ".mpc":
-		return scanAPEFile(filePath, result, displayNameHint)
 	default:
 		return scanFromFilename(filePath, displayNameHint, result)
 	}
@@ -353,10 +342,10 @@ func applyDefaultLibraryMetadata(filePath, displayNameHint string, result *Libra
 	}
 }
 
-func scanFLACFile(filePath string, result *LibraryScanResult, displayNameHint string) (*LibraryScanResult, error) {
+func scanFLACFile(filePath string, result *LibraryScanResult) (*LibraryScanResult, error) {
 	metadata, err := ReadMetadata(filePath)
 	if err != nil {
-		return scanFromFilename(filePath, displayNameHint, result)
+		return scanFromFilename(filePath, "", result)
 	}
 
 	result.TrackName = metadata.Title
@@ -378,19 +367,14 @@ func scanFLACFile(filePath string, result *LibraryScanResult, displayNameHint st
 		}
 	}
 
-	applyDefaultLibraryMetadata(filePath, displayNameHint, result)
+	applyDefaultLibraryMetadata(filePath, "", result)
 
 	return result, nil
 }
 
-func scanM4AFile(filePath string, result *LibraryScanResult, displayNameHint string) (*LibraryScanResult, error) {
+func scanM4AFile(filePath string, result *LibraryScanResult) (*LibraryScanResult, error) {
 	metadata, err := ReadM4ATags(filePath)
-	if err != nil {
-		GoLog("[LibraryScan] M4A read error for %s: %v\n", filePath, err)
-		return scanFromFilename(filePath, displayNameHint, result)
-	}
-
-	if metadata != nil {
+	if err == nil && metadata != nil {
 		result.TrackName = metadata.Title
 		result.ArtistName = metadata.Artist
 		result.AlbumName = metadata.Album
@@ -411,15 +395,15 @@ func scanM4AFile(filePath string, result *LibraryScanResult, displayNameHint str
 		result.SampleRate = quality.SampleRate
 	}
 
-	applyDefaultLibraryMetadata(filePath, displayNameHint, result)
+	applyDefaultLibraryMetadata(filePath, "", result)
 	return result, nil
 }
 
-func scanMP3File(filePath string, result *LibraryScanResult, displayNameHint string) (*LibraryScanResult, error) {
+func scanMP3File(filePath string, result *LibraryScanResult) (*LibraryScanResult, error) {
 	metadata, err := ReadID3Tags(filePath)
 	if err != nil {
 		GoLog("[LibraryScan] ID3 read error for %s: %v\n", filePath, err)
-		return scanFromFilename(filePath, displayNameHint, result)
+		return scanFromFilename(filePath, "", result)
 	}
 
 	result.TrackName = metadata.Title
@@ -446,7 +430,7 @@ func scanMP3File(filePath string, result *LibraryScanResult, displayNameHint str
 		}
 	}
 
-	applyDefaultLibraryMetadata(filePath, displayNameHint, result)
+	applyDefaultLibraryMetadata(filePath, "", result)
 
 	return result, nil
 }
@@ -483,39 +467,7 @@ func scanOggFile(filePath string, result *LibraryScanResult, displayNameHint str
 	return result, nil
 }
 
-func scanAPEFile(filePath string, result *LibraryScanResult, displayNameHint string) (*LibraryScanResult, error) {
-	tag, err := ReadAPETags(filePath)
-	if err != nil {
-		GoLog("[LibraryScan] APE tag read error for %s: %v\n", filePath, err)
-		return scanFromFilename(filePath, displayNameHint, result)
-	}
-
-	metadata := APETagToAudioMetadata(tag)
-	if metadata == nil {
-		return scanFromFilename(filePath, displayNameHint, result)
-	}
-
-	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.Genre = metadata.Genre
-	if metadata.Date != "" {
-		result.ReleaseDate = metadata.Date
-	} else {
-		result.ReleaseDate = metadata.Year
-	}
-
-	applyDefaultLibraryMetadata(filePath, displayNameHint, result)
-
-	return result, nil
-}
-
 func scanFromFilename(filePath, displayNameHint string, result *LibraryScanResult) (*LibraryScanResult, error) {
-	result.MetadataFromFilename = true
 	nameSource := libraryDisplayNameOrPath(filePath, displayNameHint)
 	filename := strings.TrimSuffix(filepath.Base(nameSource), filepath.Ext(nameSource))
 
@@ -591,18 +543,8 @@ func ReadAudioMetadata(filePath string) (string, error) {
 }
 
 func ReadAudioMetadataWithDisplayName(filePath, displayNameHint string) (string, error) {
-	return ReadAudioMetadataWithDisplayNameAndCoverCacheKey(filePath, displayNameHint, "")
-}
-
-func ReadAudioMetadataWithDisplayNameAndCoverCacheKey(filePath, displayNameHint, coverCacheKey string) (string, error) {
 	scanTime := time.Now().UTC().Format(time.RFC3339)
-	result, err := scanAudioFileWithKnownModTimeAndDisplayNameAndCoverCacheKey(
-		filePath,
-		displayNameHint,
-		coverCacheKey,
-		scanTime,
-		0,
-	)
+	result, err := scanAudioFileWithKnownModTimeAndDisplayName(filePath, displayNameHint, scanTime, 0)
 	if err != nil {
 		return "", err
 	}
@@ -615,6 +557,9 @@ func ReadAudioMetadataWithDisplayNameAndCoverCacheKey(filePath, displayNameHint,
 	return string(jsonBytes), nil
 }
 
+// ScanLibraryFolderIncremental performs an incremental scan of the library folder
+// existingFilesJSON is a JSON object mapping filePath -> modTime (unix millis)
+// Only files that are new or have changed modification time will be scanned
 func loadExistingFilesSnapshot(snapshotPath string) (map[string]int64, error) {
 	existingFiles := make(map[string]int64)
 	if snapshotPath == "" {
@@ -692,6 +637,7 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 	libraryScanProgress.TotalFiles = totalFiles
 	libraryScanProgressMu.Unlock()
 
+	// Find files to scan (new or modified)
 	var filesToScan []libraryAudioFileInfo
 	skippedCount := 0
 	existingCueTrackModTimes := make(map[string]int64)
@@ -707,8 +653,10 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 	for _, f := range currentFiles {
 		existingModTime, exists := existingFiles[f.path]
 		if !exists {
+			// For .cue files, also check if any virtual path entries exist
 			if strings.ToLower(filepath.Ext(f.path)) == ".cue" {
 				if cueTrackModTime, hasCueTracks := existingCueTrackModTimes[f.path]; hasCueTracks {
+					// CUE file exists in DB via virtual paths; check if modTime changed
 					if f.modTime == cueTrackModTime {
 						skippedCount++
 					} else {
@@ -727,11 +675,14 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 
 	var deletedPaths []string
 	for existingPath := range existingFiles {
+		// For CUE virtual paths (e.g. "/path/album.cue#track01"),
+		// check if the base .cue file still exists on disk
 		if idx := strings.LastIndex(existingPath, "#track"); idx > 0 {
 			baseCuePath := existingPath[:idx]
 			if currentPathSet[baseCuePath] {
-				continue
+				continue // Base .cue file still exists, not deleted
 			}
+			// Base CUE file is gone, mark virtual path as deleted
 			deletedPaths = append(deletedPaths, existingPath)
 		} else if !currentPathSet[existingPath] {
 			deletedPaths = append(deletedPaths, existingPath)
@@ -762,6 +713,7 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 	scanTime := time.Now().UTC().Format(time.RFC3339)
 	errorCount := 0
 
+	// Track audio files referenced by .cue sheets to avoid duplicates (incremental)
 	cueReferencedAudioFilesInc := make(map[string]bool)
 	parsedCueFiles := make(map[string]scannedCueFileInfo)
 	for _, f := range filesToScan {
@@ -796,6 +748,7 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 
 		ext := strings.ToLower(filepath.Ext(f.path))
 
+		// Handle .cue files: produce multiple track results
 		if ext == ".cue" {
 			var cueResults []LibraryScanResult
 			cueInfo, ok := parsedCueFiles[f.path]
@@ -806,7 +759,6 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 					cueInfo.audioPath,
 					"",
 					f.modTime,
-					"",
 					scanTime,
 				)
 			} else {
@@ -821,6 +773,7 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 			continue
 		}
 
+		// Skip audio files referenced by .cue sheets
 		if cueReferencedAudioFilesInc[f.path] {
 			continue
 		}
@@ -860,6 +813,9 @@ func scanLibraryFolderIncrementalWithExistingFiles(folderPath string, existingFi
 	return string(jsonBytes), nil
 }
 
+// ScanLibraryFolderIncremental performs an incremental scan of the library folder
+// existingFilesJSON is a JSON object mapping filePath -> modTime (unix millis)
+// Only files that are new or have changed modification time will be scanned
 func ScanLibraryFolderIncremental(folderPath, existingFilesJSON string) (string, error) {
 	existingFiles := make(map[string]int64)
 	if existingFilesJSON != "" && existingFilesJSON != "{}" {

go_backend/library_scan_test.go

@@ -1,25 +0,0 @@
-package gobackend
-
-import "testing"
-
-func TestScanFromFilenameMarksMetadataFallback(t *testing.T) {
-	result := &LibraryScanResult{}
-
-	scanned, err := scanFromFilename(
-		"/proc/self/fd/209",
-		"189.mp3",
-		result,
-	)
-	if err != nil {
-		t.Fatalf("scanFromFilename returned error: %v", err)
-	}
-	if !scanned.MetadataFromFilename {
-		t.Fatal("expected filename fallback marker to be set")
-	}
-	if scanned.TrackName != "189" {
-		t.Fatalf("unexpected track name: %q", scanned.TrackName)
-	}
-	if scanned.ArtistName != "Unknown Artist" {
-		t.Fatalf("unexpected artist name: %q", scanned.ArtistName)
-	}
-}

go_backend/logbuffer.go

@@ -25,6 +25,7 @@ type LogBuffer struct {
 
 const (
 	defaultLogBufferSize = 500
+	maxLogMessageLength  = 500
 )
 
 var (
@@ -51,12 +52,20 @@ func GetLogBuffer() *LogBuffer {
 		globalLogBuffer = &LogBuffer{
 			entries:        make([]LogEntry, 0, defaultLogBufferSize),
 			maxSize:        defaultLogBufferSize,
-			loggingEnabled: false,
+			loggingEnabled: false, // Default: disabled for performance (user can enable in settings)
 		}
 	})
 	return globalLogBuffer
 }
 
+func truncateLogMessage(message string) string {
+	runes := []rune(message)
+	if len(runes) <= maxLogMessageLength {
+		return message
+	}
+	return string(runes[:maxLogMessageLength]) + "...[truncated]"
+}
+
 func (lb *LogBuffer) SetLoggingEnabled(enabled bool) {
 	lb.mu.Lock()
 	defer lb.mu.Unlock()
@@ -78,6 +87,7 @@ func (lb *LogBuffer) Add(level, tag, message string) {
 	}
 
 	message = sanitizeSensitiveLogText(message)
+	message = truncateLogMessage(message)
 
 	entry := LogEntry{
 		Timestamp: time.Now().Format("15:04:05.000"),
@@ -145,10 +155,13 @@ func LogError(tag, format string, args ...interface{}) {
 	GetLogBuffer().Add("ERROR", tag, fmt.Sprintf(format, args...))
 }
 
+// GoLog is a drop-in replacement for fmt.Printf that also logs to buffer
+// It parses the tag from the format string if it starts with [Tag]
 func GoLog(format string, args ...interface{}) {
 	message := fmt.Sprintf(format, args...)
 	message = strings.TrimSuffix(message, "\n")
 
+	// Extract tag from message if present (e.g., "[Tidal] message")
 	tag := "Go"
 	level := "INFO"
 
@@ -160,6 +173,7 @@ func GoLog(format string, args ...interface{}) {
 		}
 	}
 
+	// Determine level from message content
 	msgLower := strings.ToLower(message)
 	if strings.Contains(msgLower, "error") || strings.Contains(msgLower, "failed") {
 		level = "ERROR"

go_backend/lyrics.go

@@ -3,6 +3,7 @@ package gobackend
 import (
 	"encoding/json"
 	"fmt"
+	"io"
 	"math"
 	"net/http"
 	"net/url"
@@ -20,7 +21,9 @@ const (
 	durationToleranceSec = 10.0
 )
 
+// Lyrics provider names (used in settings and cascade ordering)
 const (
+	LyricsProviderSpotifyAPI = "spotify_api"
 	LyricsProviderLRCLIB     = "lrclib"
 	LyricsProviderNetease    = "netease"
 	LyricsProviderMusixmatch = "musixmatch"
@@ -28,8 +31,11 @@ const (
 	LyricsProviderQQMusic    = "qqmusic"
 )
 
+// DefaultLyricsProviders is the default cascade order for lyrics fetching.
+// LRCLIB first (no proxy dependency), then the others.
 var DefaultLyricsProviders = []string{
 	LyricsProviderLRCLIB,
+	LyricsProviderSpotifyAPI,
 	LyricsProviderMusixmatch,
 	LyricsProviderNetease,
 	LyricsProviderAppleMusic,
@@ -41,6 +47,12 @@ var (
 	lyricsProviders   []string // ordered list of enabled providers
 )
 
+var (
+	spotifyLyricsRateLimitMu    sync.RWMutex
+	spotifyLyricsRateLimitedTil time.Time
+)
+
+// LyricsFetchOptions controls optional provider-specific enhancements.
 type LyricsFetchOptions struct {
 	IncludeTranslationNetease  bool   `json:"include_translation_netease"`
 	IncludeRomanizationNetease bool   `json:"include_romanization_netease"`
@@ -60,6 +72,8 @@ var (
 	lyricsFetchOptions   = defaultLyricsFetchOptions
 )
 
+// SetLyricsProviderOrder sets the ordered list of lyrics providers to try.
+// Providers not in the list are disabled. An empty list resets to defaults.
 func SetLyricsProviderOrder(providers []string) {
 	lyricsProvidersMu.Lock()
 	defer lyricsProvidersMu.Unlock()
@@ -69,7 +83,9 @@ func SetLyricsProviderOrder(providers []string) {
 		return
 	}
 
+	// Validate provider names
 	validNames := map[string]bool{
+		LyricsProviderSpotifyAPI: true,
 		LyricsProviderLRCLIB:     true,
 		LyricsProviderNetease:    true,
 		LyricsProviderMusixmatch: true,
@@ -89,6 +105,7 @@ func SetLyricsProviderOrder(providers []string) {
 	GoLog("[Lyrics] Provider order set to: %v\n", valid)
 }
 
+// GetLyricsProviderOrder returns the current lyrics provider order.
 func GetLyricsProviderOrder() []string {
 	lyricsProvidersMu.RLock()
 	defer lyricsProvidersMu.RUnlock()
@@ -102,8 +119,10 @@ func GetLyricsProviderOrder() []string {
 	return result
 }
 
+// GetAvailableLyricsProviders returns metadata about all available providers.
 func GetAvailableLyricsProviders() []map[string]interface{} {
 	return []map[string]interface{}{
+		{"id": LyricsProviderSpotifyAPI, "name": "Spotify Lyrics API", "has_proxy_dependency": true, "description": "Spotify-sourced lyrics via Paxsenix"},
 		{"id": LyricsProviderLRCLIB, "name": "LRCLIB", "has_proxy_dependency": false, "description": "Open-source synced lyrics database"},
 		{"id": LyricsProviderNetease, "name": "Netease", "has_proxy_dependency": true, "description": "NetEase Cloud Music lyrics via Paxsenix"},
 		{"id": LyricsProviderMusixmatch, "name": "Musixmatch", "has_proxy_dependency": true, "description": "Musixmatch lyrics via Paxsenix"},
@@ -121,6 +140,7 @@ func normalizeLyricsFetchOptions(opts LyricsFetchOptions) LyricsFetchOptions {
 	return opts
 }
 
+// SetLyricsFetchOptions sets provider-specific lyric fetch behavior.
 func SetLyricsFetchOptions(opts LyricsFetchOptions) {
 	normalized := normalizeLyricsFetchOptions(opts)
 
@@ -136,6 +156,7 @@ func SetLyricsFetchOptions(opts LyricsFetchOptions) {
 	)
 }
 
+// GetLyricsFetchOptions returns current provider-specific lyric fetch behavior.
 func GetLyricsFetchOptions() LyricsFetchOptions {
 	lyricsFetchOptionsMu.RLock()
 	defer lyricsFetchOptionsMu.RUnlock()
@@ -233,6 +254,18 @@ type LRCLibResponse struct {
 	SyncedLyrics string  `json:"syncedLyrics"`
 }
 
+type SpotifyLyricsLine struct {
+	TimeTag string `json:"timeTag"`
+	Words   string `json:"words"`
+}
+
+type SpotifyLyricsAPIResponse struct {
+	Error    bool                `json:"error"`
+	Message  string              `json:"message"`
+	SyncType string              `json:"syncType"`
+	Lines    []SpotifyLyricsLine `json:"lines"`
+}
+
 type LyricsLine struct {
 	StartTimeMs int64  `json:"startTimeMs"`
 	Words       string `json:"words"`
@@ -340,6 +373,214 @@ func (c *LyricsClient) FetchLyricsFromLRCLibSearch(query string, durationSec flo
 	return c.parseLRCLibResponse(&results[0]), nil
 }
 
+func parseSpotifyLyricsTimeTagToMs(tag string) int64 {
+	raw := strings.TrimSpace(tag)
+	raw = strings.TrimPrefix(raw, "[")
+	raw = strings.TrimSuffix(raw, "]")
+	if raw == "" {
+		return 0
+	}
+
+	if ms, err := strconv.ParseInt(raw, 10, 64); err == nil {
+		return ms
+	}
+
+	re := regexp.MustCompile(`^(\d{1,2}):(\d{2})\.(\d{1,3})$`)
+	matches := re.FindStringSubmatch(raw)
+	if len(matches) != 4 {
+		return 0
+	}
+
+	minutes, _ := strconv.ParseInt(matches[1], 10, 64)
+	seconds, _ := strconv.ParseInt(matches[2], 10, 64)
+	fraction := matches[3]
+	fractionInt, _ := strconv.ParseInt(fraction, 10, 64)
+	if len(fraction) == 2 {
+		fractionInt *= 10
+	} else if len(fraction) == 1 {
+		fractionInt *= 100
+	}
+	return minutes*60*1000 + seconds*1000 + fractionInt
+}
+
+func getSpotifyLyricsRateLimitUntil() time.Time {
+	spotifyLyricsRateLimitMu.RLock()
+	defer spotifyLyricsRateLimitMu.RUnlock()
+	return spotifyLyricsRateLimitedTil
+}
+
+func setSpotifyLyricsRateLimitUntil(until time.Time) {
+	spotifyLyricsRateLimitMu.Lock()
+	spotifyLyricsRateLimitedTil = until
+	spotifyLyricsRateLimitMu.Unlock()
+}
+
+func parseSpotifyRetryAfter(retryAfter string, now time.Time) time.Time {
+	raw := strings.TrimSpace(retryAfter)
+	if raw == "" {
+		return now.Add(10 * time.Minute)
+	}
+
+	if sec, err := strconv.Atoi(raw); err == nil && sec > 0 {
+		return now.Add(time.Duration(sec) * time.Second)
+	}
+
+	if when, err := http.ParseTime(raw); err == nil && when.After(now) {
+		return when
+	}
+
+	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) {
+		waitFor := int(math.Ceil(limitedUntil.Sub(now).Seconds()))
+		return nil, fmt.Errorf(
+			"Spotify Lyrics API cooldown active (%ds remaining after previous 429)",
+			waitFor,
+		)
+	}
+
+	spotifyID = strings.TrimSpace(spotifyID)
+	if spotifyID == "" {
+		return nil, fmt.Errorf("spotify ID is empty")
+	}
+	if parsed, err := parseSpotifyURI(spotifyID); err == nil && parsed.Type == "track" && parsed.ID != "" {
+		spotifyID = parsed.ID
+	}
+
+	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)
+	}
+	req.Header.Set("User-Agent", getRandomUserAgent())
+
+	resp, err := c.httpClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch from Spotify Lyrics API: %w", err)
+	}
+	defer resp.Body.Close()
+
+	bodyBytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read Spotify Lyrics API response: %w", err)
+	}
+
+	if resp.StatusCode != 200 {
+		if resp.StatusCode == http.StatusTooManyRequests {
+			retryUntil := parseSpotifyRetryAfter(resp.Header.Get("Retry-After"), now)
+			setSpotifyLyricsRateLimitUntil(retryUntil)
+		}
+		var payload map[string]interface{}
+		if err := json.Unmarshal(bodyBytes, &payload); err == nil {
+			if 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))
+			}
+			if msg, ok := payload["error"].(string); ok && strings.TrimSpace(msg) != "" {
+				return nil, fmt.Errorf("Spotify Lyrics API returned status %d: %s", resp.StatusCode, strings.TrimSpace(msg))
+			}
+		}
+		return nil, fmt.Errorf("Spotify Lyrics API returned status %d", resp.StatusCode)
+	}
+
+	return parseSpotifyLyricsResponseBody(bodyBytes)
+}
+
 func (c *LyricsClient) findBestMatch(results []LRCLibResponse, targetDurationSec float64) *LRCLibResponse {
 	var bestSynced *LRCLibResponse
 	var bestPlain *LRCLibResponse
@@ -364,18 +605,6 @@ func (c *LyricsClient) findBestMatch(results []LRCLibResponse, targetDurationSec
 	return bestPlain
 }
 
-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 (c *LyricsClient) durationMatches(lrcDuration, targetDuration float64) bool {
 	diff := math.Abs(lrcDuration - targetDuration)
 	return diff <= durationToleranceSec
@@ -438,6 +667,7 @@ func (c *LyricsClient) FetchLyricsAllSources(spotifyID, trackName, artistName st
 
 	GoLog("[Lyrics] Searching for: %s - %s (providers: %v)\n", artistName, trackName, providerOrder)
 
+	// Cascade through all configured built-in providers
 	for _, providerName := range providerOrder {
 		GoLog("[Lyrics] Trying provider: %s\n", providerName)
 
@@ -445,6 +675,9 @@ func (c *LyricsClient) FetchLyricsAllSources(spotifyID, trackName, artistName st
 		var err error
 
 		switch providerName {
+		case LyricsProviderSpotifyAPI:
+			lyrics, err = c.FetchLyricsFromSpotifyAPI(spotifyID)
+
 		case LyricsProviderLRCLIB:
 			lyrics, err = c.tryLRCLIB(primaryArtist, artistName, trackName, simplifiedTrack, durationSec)
 
@@ -526,16 +759,19 @@ func (c *LyricsClient) FetchLyricsAllSources(spotifyID, trackName, artistName st
 	return nil, fmt.Errorf("lyrics not found from any source")
 }
 
+// tryLRCLIB attempts all LRCLIB search strategies (exact match, simplified, search).
 func (c *LyricsClient) tryLRCLIB(primaryArtist, artistName, trackName, simplifiedTrack string, durationSec float64) (*LyricsResponse, error) {
 	var lyrics *LyricsResponse
 	var err error
 
+	// 1. Exact match with primary artist
 	lyrics, err = c.FetchLyricsWithMetadata(primaryArtist, trackName)
 	if err == nil && lyrics != nil && (len(lyrics.Lines) > 0 || lyrics.Instrumental) {
 		lyrics.Source = "LRCLIB"
 		return lyrics, nil
 	}
 
+	// 2. Exact match with full artist name
 	if primaryArtist != artistName {
 		lyrics, err = c.FetchLyricsWithMetadata(artistName, trackName)
 		if err == nil && lyrics != nil && (len(lyrics.Lines) > 0 || lyrics.Instrumental) {
@@ -544,6 +780,7 @@ func (c *LyricsClient) tryLRCLIB(primaryArtist, artistName, trackName, simplifie
 		}
 	}
 
+	// 3. Simplified track name
 	if simplifiedTrack != trackName {
 		lyrics, err = c.FetchLyricsWithMetadata(primaryArtist, simplifiedTrack)
 		if err == nil && lyrics != nil && (len(lyrics.Lines) > 0 || lyrics.Instrumental) {
@@ -552,6 +789,7 @@ func (c *LyricsClient) tryLRCLIB(primaryArtist, artistName, trackName, simplifie
 		}
 	}
 
+	// 4. Search by query
 	query := primaryArtist + " " + trackName
 	lyrics, err = c.FetchLyricsFromLRCLibSearch(query, durationSec)
 	if err == nil && lyrics != nil && (len(lyrics.Lines) > 0 || lyrics.Instrumental) {
@@ -559,6 +797,7 @@ func (c *LyricsClient) tryLRCLIB(primaryArtist, artistName, trackName, simplifie
 		return lyrics, nil
 	}
 
+	// 5. Search with simplified track name
 	if simplifiedTrack != trackName {
 		query = primaryArtist + " " + simplifiedTrack
 		lyrics, err = c.FetchLyricsFromLRCLibSearch(query, durationSec)
@@ -676,6 +915,8 @@ func lyricsHasUsableText(lyrics *LyricsResponse) bool {
 	return false
 }
 
+// detectLyricsErrorPayload extracts human-readable error messages from
+// JSON payloads returned by lyrics proxies when no lyric is available.
 func detectLyricsErrorPayload(raw string) (string, bool) {
 	trimmed := strings.TrimSpace(raw)
 	if trimmed == "" || !strings.HasPrefix(trimmed, "{") {
@@ -747,7 +988,7 @@ func convertToLRCWithMetadata(lyrics *LyricsResponse, trackName, artistName stri
 
 	builder.WriteString(fmt.Sprintf("[ti:%s]\n", trackName))
 	builder.WriteString(fmt.Sprintf("[ar:%s]\n", artistName))
-	builder.WriteString("[by:Implemented by SpotiFLAC-Mobile using Paxsenix API]\n")
+	builder.WriteString("[by:SpotiFLAC-Mobile]\n")
 	builder.WriteString("\n")
 
 	if lyrics.SyncType == "LINE_SYNCED" {
@@ -800,6 +1041,8 @@ func simplifyTrackName(name string) string {
 		return result
 	}
 
+	// Add a loose fallback form for provider queries where punctuation
+	// and separators differ (e.g. "/" vs "_" vs spaces).
 	if loose := normalizeLooseTitle(result); loose != "" {
 		return loose
 	}

go_backend/lyrics_apple.go

@@ -11,6 +11,8 @@ import (
 	"time"
 )
 
+// AppleMusicClient fetches lyrics from Apple Music.
+// Uses Paxsenix endpoints for search and lyrics.
 type AppleMusicClient struct {
 	httpClient *http.Client
 }
@@ -23,6 +25,7 @@ type appleMusicSearchResult struct {
 	Duration   int    `json:"duration"`
 }
 
+// PaxResponse represents the lyrics proxy response for word-by-word / line lyrics
 type paxResponse struct {
 	Type    string      `json:"type"`    // "Syllable" or "Line"
 	Content []paxLyrics `json:"content"` // List of lyric lines
@@ -100,6 +103,7 @@ func selectBestAppleMusicSearchResult(results []appleMusicSearchResult, trackNam
 	return &results[bestIndex]
 }
 
+// SearchSong searches for a song on Apple Music and returns its ID.
 func (c *AppleMusicClient) SearchSong(trackName, artistName string, durationSec float64) (string, error) {
 	query := trackName + " " + artistName
 	if strings.TrimSpace(query) == "" {
@@ -140,6 +144,7 @@ func (c *AppleMusicClient) SearchSong(trackName, artistName string, durationSec
 	return strings.TrimSpace(best.ID), nil
 }
 
+// FetchLyricsByID fetches lyrics from the paxsenix proxy using Apple Music song ID.
 func (c *AppleMusicClient) FetchLyricsByID(songID string) (string, error) {
 	lyricsURL := fmt.Sprintf("https://lyrics.paxsenix.org/apple-music/lyrics?id=%s", songID)
 
@@ -247,6 +252,7 @@ func formatPaxContent(lyricsType string, content []paxLyrics, multiPersonWordByW
 	return strings.TrimSpace(sb.String())
 }
 
+// FetchLyrics searches Apple Music and returns parsed LyricsResponse.
 func (c *AppleMusicClient) FetchLyrics(
 	trackName,
 	artistName string,
@@ -266,8 +272,10 @@ func (c *AppleMusicClient) FetchLyrics(
 		return nil, fmt.Errorf("apple music proxy returned non-lyric payload: %s", errMsg)
 	}
 
+	// Try to parse as pax format (word-by-word or line)
 	lrcText, err := formatPaxLyricsToLRC(rawLyrics, multiPersonWordByWord)
 	if err != nil {
+		// If pax parsing fails, try to parse as direct LRC text
 		lrcText = rawLyrics
 	}
 
@@ -281,6 +289,7 @@ func (c *AppleMusicClient) FetchLyrics(
 		}, nil
 	}
 
+	// Fall back to plain text if no timestamps found
 	resultLines := plainTextLyricsLines(lrcText)
 
 	if len(resultLines) > 0 {

go_backend/lyrics_musixmatch.go

@@ -11,6 +11,8 @@ import (
 	"time"
 )
 
+// MusixmatchClient fetches lyrics from Musixmatch via a proxy server.
+// The proxy handles Musixmatch authentication internally.
 type MusixmatchClient struct {
 	httpClient *http.Client
 	baseURL    string
@@ -112,6 +114,7 @@ func (c *MusixmatchClient) fetchLyricsPayload(trackName, artistName string, dura
 	return "", fmt.Errorf("failed to decode musixmatch response")
 }
 
+// FetchLyricsInLanguage retrieves lyrics from Musixmatch for a specific language code.
 func (c *MusixmatchClient) FetchLyricsInLanguage(trackName, artistName string, durationSec float64, language string) (*LyricsResponse, error) {
 	lang := strings.ToLower(strings.TrimSpace(language))
 	if lang == "" {
@@ -148,6 +151,7 @@ func (c *MusixmatchClient) FetchLyricsInLanguage(trackName, artistName string, d
 	return nil, fmt.Errorf("no lyrics found on musixmatch for language %s", lang)
 }
 
+// FetchLyrics searches Musixmatch and returns parsed LyricsResponse.
 func (c *MusixmatchClient) FetchLyrics(trackName, artistName string, durationSec float64, preferredLanguage string) (*LyricsResponse, error) {
 	if preferred := strings.ToLower(strings.TrimSpace(preferredLanguage)); preferred != "" {
 		localized, localizedErr := c.FetchLyricsInLanguage(trackName, artistName, durationSec, preferred)

go_backend/lyrics_netease.go

@@ -9,6 +9,7 @@ import (
 	"time"
 )
 
+// NeteaseClient fetches lyrics through Paxsenix's NetEase endpoints.
 type NeteaseClient struct {
 	httpClient *http.Client
 }
@@ -50,6 +51,7 @@ func NewNeteaseClient() *NeteaseClient {
 	}
 }
 
+// SearchSong searches for a song on Netease and returns the song ID.
 func (c *NeteaseClient) SearchSong(trackName, artistName string) (int64, error) {
 	query := trackName + " " + artistName
 	if strings.TrimSpace(query) == "" {
@@ -94,6 +96,7 @@ func (c *NeteaseClient) SearchSong(trackName, artistName string) (int64, error)
 	return searchResp.Result.Songs[0].ID, nil
 }
 
+// FetchLyricsByID fetches synced lyrics for a given Netease song ID.
 func (c *NeteaseClient) FetchLyricsByID(songID int64, includeTranslation, includeRomanization bool) (string, error) {
 	lyricsURL := "https://lyrics.paxsenix.org/netease/lyrics"
 	params := url.Values{}
@@ -143,6 +146,7 @@ func (c *NeteaseClient) FetchLyricsByID(songID int64, includeTranslation, includ
 	return lyric, nil
 }
 
+// FetchLyrics searches for a track and returns parsed LyricsResponse.
 func (c *NeteaseClient) FetchLyrics(
 	trackName,
 	artistName string,
@@ -162,6 +166,7 @@ func (c *NeteaseClient) FetchLyrics(
 
 	lines := parseSyncedLyrics(lrcText)
 	if len(lines) == 0 {
+		// May be plain text lyrics without timestamps
 		plainLines := strings.Split(lrcText, "\n")
 		for _, line := range plainLines {
 			trimmed := strings.TrimSpace(line)

go_backend/lyrics_qqmusic.go

@@ -10,6 +10,8 @@ import (
 	"time"
 )
 
+// QQMusicClient fetches lyrics from QQ Music.
+// Uses Paxsenix metadata lookup for lyrics.
 type QQMusicClient struct {
 	httpClient *http.Client
 }
@@ -32,6 +34,7 @@ func NewQQMusicClient() *QQMusicClient {
 	}
 }
 
+// fetchLyricsByMetadata asks Paxsenix to resolve and return QQ lyrics using track metadata.
 func (c *QQMusicClient) fetchLyricsByMetadata(trackName, artistName string, durationSec float64) (string, error) {
 	payload := qqLyricsMetadataRequest{
 		Artist: []string{artistName},
@@ -90,6 +93,7 @@ func formatQQLyricsMetadataToLRC(rawJSON string, multiPersonWordByWord bool) (st
 	return formatPaxContent("Syllable", response.Lyrics, multiPersonWordByWord), nil
 }
 
+// FetchLyrics searches QQ Music and returns parsed LyricsResponse.
 func (c *QQMusicClient) FetchLyrics(
 	trackName,
 	artistName string,

go_backend/metadata.go

@@ -11,7 +11,6 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strconv"
 	"strings"
 
@@ -20,10 +19,6 @@ import (
 	"github.com/go-flac/go-flac/v2"
 )
 
-const artistTagModeSplitVorbis = "split_vorbis"
-
-var artistTagSplitPattern = regexp.MustCompile(`\s*(?:,|&|\bx\b)\s*|\s+\b(?:feat(?:uring)?|ft|with)\.?\s*`)
-
 func detectCoverMIME(coverPath string, coverData []byte) string {
 	// Prefer magic-byte detection over file extension.
 	// Some providers return non-JPEG data behind .jpg URLs.
@@ -101,29 +96,22 @@ func buildPictureBlock(coverPath string, coverData []byte) (flac.MetaDataBlock,
 }
 
 type Metadata struct {
-	Title         string
-	Artist        string
-	Album         string
-	AlbumArtist   string
-	ArtistTagMode string
-	Date          string
-	TrackNumber   int
-	TotalTracks   int
-	DiscNumber    int
-	ISRC          string
-	Description   string
-	Lyrics        string
-	Genre         string
-	Label         string
-	Copyright     string
-	Composer      string
-	Comment       string
-
-	// ReplayGain fields (stored as Vorbis Comments in FLAC)
-	ReplayGainTrackGain string // e.g. "-6.50 dB"
-	ReplayGainTrackPeak string // e.g. "0.988831"
-	ReplayGainAlbumGain string // e.g. "-7.20 dB"
-	ReplayGainAlbumPeak string // e.g. "1.000000"
+	Title       string
+	Artist      string
+	Album       string
+	AlbumArtist string
+	Date        string
+	TrackNumber int
+	TotalTracks int
+	DiscNumber  int
+	ISRC        string
+	Description string
+	Lyrics      string
+	Genre       string
+	Label       string
+	Copyright   string
+	Composer    string
+	Comment     string
 }
 
 func EmbedMetadata(filePath string, metadata Metadata, coverPath string) error {
@@ -150,7 +138,56 @@ func EmbedMetadata(filePath string, metadata Metadata, coverPath string) error {
 		cmt = flacvorbis.New()
 	}
 
-	writeVorbisMetadata(cmt, metadata)
+	setComment(cmt, "TITLE", metadata.Title)
+	setComment(cmt, "ARTIST", metadata.Artist)
+	setComment(cmt, "ALBUM", metadata.Album)
+	setComment(cmt, "ALBUMARTIST", metadata.AlbumArtist)
+	setComment(cmt, "DATE", metadata.Date)
+
+	if metadata.TrackNumber > 0 {
+		if metadata.TotalTracks > 0 {
+			setComment(cmt, "TRACKNUMBER", fmt.Sprintf("%d/%d", metadata.TrackNumber, metadata.TotalTracks))
+		} else {
+			setComment(cmt, "TRACKNUMBER", strconv.Itoa(metadata.TrackNumber))
+		}
+	}
+
+	if metadata.DiscNumber > 0 {
+		setComment(cmt, "DISCNUMBER", strconv.Itoa(metadata.DiscNumber))
+	}
+
+	if metadata.ISRC != "" {
+		setComment(cmt, "ISRC", metadata.ISRC)
+	}
+
+	if metadata.Description != "" {
+		setComment(cmt, "DESCRIPTION", metadata.Description)
+	}
+
+	if metadata.Lyrics != "" {
+		setComment(cmt, "LYRICS", metadata.Lyrics)
+		setComment(cmt, "UNSYNCEDLYRICS", metadata.Lyrics)
+	}
+
+	if metadata.Genre != "" {
+		setComment(cmt, "GENRE", metadata.Genre)
+	}
+
+	if metadata.Label != "" {
+		setComment(cmt, "ORGANIZATION", metadata.Label)
+	}
+
+	if metadata.Copyright != "" {
+		setComment(cmt, "COPYRIGHT", metadata.Copyright)
+	}
+
+	if metadata.Composer != "" {
+		setComment(cmt, "COMPOSER", metadata.Composer)
+	}
+
+	if metadata.Comment != "" {
+		setComment(cmt, "COMMENT", metadata.Comment)
+	}
 
 	cmtBlock := cmt.Marshal()
 	if cmtIdx >= 0 {
@@ -210,271 +247,10 @@ func EmbedMetadataWithCoverData(filePath string, metadata Metadata, coverData []
 		cmt = flacvorbis.New()
 	}
 
-	writeVorbisMetadata(cmt, metadata)
-
-	cmtBlock := cmt.Marshal()
-	if cmtIdx >= 0 {
-		f.Meta[cmtIdx] = &cmtBlock
-	} else {
-		f.Meta = append(f.Meta, &cmtBlock)
-	}
-
-	if len(coverData) > 0 {
-		for i := len(f.Meta) - 1; i >= 0; i-- {
-			if f.Meta[i].Type == flac.Picture {
-				f.Meta = append(f.Meta[:i], f.Meta[i+1:]...)
-			}
-		}
-
-		picBlock, err := buildPictureBlock("", coverData)
-		if err != nil {
-			return fmt.Errorf("failed to create picture block: %w", err)
-		}
-		f.Meta = append(f.Meta, &picBlock)
-		fmt.Printf("[Metadata] Cover art embedded successfully (%d bytes)\n", len(coverData))
-	}
-
-	return f.Save(filePath)
-}
-
-func ReadMetadata(filePath string) (*Metadata, error) {
-	f, err := flac.ParseFile(filePath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse FLAC file: %w", err)
-	}
-
-	metadata := &Metadata{}
-
-	for _, meta := range f.Meta {
-		if meta.Type == flac.VorbisComment {
-			cmt, err := flacvorbis.ParseFromMetaDataBlock(*meta)
-			if err != nil {
-				continue
-			}
-
-			metadata.Title = getComment(cmt, "TITLE")
-			metadata.Artist = getJoinedComment(cmt, "ARTIST")
-			metadata.Album = getComment(cmt, "ALBUM")
-			metadata.AlbumArtist = getJoinedComment(cmt, "ALBUMARTIST")
-			if metadata.AlbumArtist == "" {
-				metadata.AlbumArtist = getJoinedComment(cmt, "ALBUM ARTIST")
-			}
-			if metadata.AlbumArtist == "" {
-				metadata.AlbumArtist = getJoinedComment(cmt, "ALBUM_ARTIST")
-			}
-			metadata.Date = getComment(cmt, "DATE")
-			metadata.ISRC = getComment(cmt, "ISRC")
-			metadata.Description = getComment(cmt, "DESCRIPTION")
-
-			metadata.Lyrics = getComment(cmt, "LYRICS")
-			if metadata.Lyrics == "" {
-				metadata.Lyrics = getComment(cmt, "UNSYNCEDLYRICS")
-			}
-
-			trackNum := getComment(cmt, "TRACKNUMBER")
-			if trackNum != "" {
-				fmt.Sscanf(trackNum, "%d", &metadata.TrackNumber)
-			}
-			if metadata.TrackNumber == 0 {
-				trackNum = getComment(cmt, "TRACK")
-				if trackNum != "" {
-					fmt.Sscanf(trackNum, "%d", &metadata.TrackNumber)
-				}
-			}
-
-			discNum := getComment(cmt, "DISCNUMBER")
-			if discNum != "" {
-				fmt.Sscanf(discNum, "%d", &metadata.DiscNumber)
-			}
-			if metadata.DiscNumber == 0 {
-				discNum = getComment(cmt, "DISC")
-				if discNum != "" {
-					fmt.Sscanf(discNum, "%d", &metadata.DiscNumber)
-				}
-			}
-
-			if metadata.Date == "" {
-				metadata.Date = getComment(cmt, "YEAR")
-			}
-
-			metadata.Genre = getComment(cmt, "GENRE")
-			metadata.Label = getComment(cmt, "ORGANIZATION")
-			if metadata.Label == "" {
-				metadata.Label = getComment(cmt, "LABEL")
-			}
-			if metadata.Label == "" {
-				metadata.Label = getComment(cmt, "PUBLISHER")
-			}
-			metadata.Copyright = getComment(cmt, "COPYRIGHT")
-			metadata.Composer = getComment(cmt, "COMPOSER")
-			metadata.Comment = getComment(cmt, "COMMENT")
-
-			metadata.ReplayGainTrackGain = getComment(cmt, "REPLAYGAIN_TRACK_GAIN")
-			metadata.ReplayGainTrackPeak = getComment(cmt, "REPLAYGAIN_TRACK_PEAK")
-			metadata.ReplayGainAlbumGain = getComment(cmt, "REPLAYGAIN_ALBUM_GAIN")
-			metadata.ReplayGainAlbumPeak = getComment(cmt, "REPLAYGAIN_ALBUM_PEAK")
-
-			break
-		}
-	}
-
-	return metadata, nil
-}
-
-// EditFlacFields opens a FLAC file and updates only the Vorbis Comment keys
-// that are explicitly present in the fields map.  Keys present with a non-empty
-// value are set; keys present with an empty value are removed (cleared).  Keys
-// absent from the map are left untouched.  This is the correct function for
-// partial edits (e.g. writing only ReplayGain tags) and full editor saves alike.
-func EditFlacFields(filePath string, fields map[string]string) error {
-	f, err := flac.ParseFile(filePath)
-	if err != nil {
-		return fmt.Errorf("failed to parse FLAC file: %w", err)
-	}
-
-	var cmtIdx int = -1
-	var cmt *flacvorbis.MetaDataBlockVorbisComment
-
-	for idx, meta := range f.Meta {
-		if meta.Type == flac.VorbisComment {
-			cmtIdx = idx
-			cmt, err = flacvorbis.ParseFromMetaDataBlock(*meta)
-			if err != nil {
-				return fmt.Errorf("failed to parse vorbis comment: %w", err)
-			}
-			break
-		}
-	}
-	if cmt == nil {
-		cmt = flacvorbis.New()
-	}
-
-	artistMode := fields["artist_tag_mode"]
-
-	// Mapping from fields-map key → one or more Vorbis Comment keys.
-	// Each entry is handled with set-or-clear semantics.
-	simpleKeys := map[string]string{
-		"title":                 "TITLE",
-		"album":                 "ALBUM",
-		"date":                  "DATE",
-		"isrc":                  "ISRC",
-		"genre":                 "GENRE",
-		"label":                 "ORGANIZATION",
-		"copyright":             "COPYRIGHT",
-		"composer":              "COMPOSER",
-		"comment":               "COMMENT",
-		"replaygain_track_gain": "REPLAYGAIN_TRACK_GAIN",
-		"replaygain_track_peak": "REPLAYGAIN_TRACK_PEAK",
-		"replaygain_album_gain": "REPLAYGAIN_ALBUM_GAIN",
-		"replaygain_album_peak": "REPLAYGAIN_ALBUM_PEAK",
-	}
-
-	for fieldKey, vorbisKey := range simpleKeys {
-		if v, ok := fields[fieldKey]; ok {
-			setOrClearComment(cmt, vorbisKey, v)
-		}
-	}
-
-	// Remove known aliases for fields that were just written/cleared, so that
-	// tags from other taggers (e.g. LABEL, PUBLISHER, ALBUM ARTIST) don't
-	// conflict with the canonical keys we use.
-	aliasCleanup := map[string][]string{
-		"label":     {"LABEL", "PUBLISHER"}, // canonical: ORGANIZATION
-		"date":      {"YEAR"},               // canonical: DATE
-		"genre":     {},                     // no common aliases
-		"copyright": {},
-	}
-	for fieldKey, aliases := range aliasCleanup {
-		if _, ok := fields[fieldKey]; ok {
-			for _, alias := range aliases {
-				removeCommentKey(cmt, alias)
-			}
-		}
-	}
-
-	// Artist fields: use split-artist logic when mode is set.
-	if v, ok := fields["artist"]; ok {
-		setOrClearArtistComments(cmt, "ARTIST", v, artistMode)
-	}
-	if v, ok := fields["album_artist"]; ok {
-		setOrClearArtistComments(cmt, "ALBUMARTIST", v, artistMode)
-		// Remove aliases from other taggers.
-		removeCommentKey(cmt, "ALBUM ARTIST")
-		removeCommentKey(cmt, "ALBUM_ARTIST")
-	}
-
-	// Track/disc numbers: present + empty → clear; present + "0" → clear.
-	if v, ok := fields["track_number"]; ok {
-		trackNum := 0
-		if v != "" {
-			fmt.Sscanf(v, "%d", &trackNum)
-		}
-		if trackNum > 0 {
-			setOrClearComment(cmt, "TRACKNUMBER", strconv.Itoa(trackNum))
-		} else {
-			removeCommentKey(cmt, "TRACKNUMBER")
-		}
-		removeCommentKey(cmt, "TRACK") // alias
-	}
-	if v, ok := fields["disc_number"]; ok {
-		discNum := 0
-		if v != "" {
-			fmt.Sscanf(v, "%d", &discNum)
-		}
-		if discNum > 0 {
-			setOrClearComment(cmt, "DISCNUMBER", strconv.Itoa(discNum))
-		} else {
-			removeCommentKey(cmt, "DISCNUMBER")
-		}
-		removeCommentKey(cmt, "DISC") // alias
-	}
-
-	// Lyrics: set both LYRICS + UNSYNCEDLYRICS, or clear both.
-	if v, ok := fields["lyrics"]; ok {
-		if v != "" {
-			setOrClearComment(cmt, "LYRICS", v)
-			setOrClearComment(cmt, "UNSYNCEDLYRICS", v)
-		} else {
-			removeCommentKey(cmt, "LYRICS")
-			removeCommentKey(cmt, "UNSYNCEDLYRICS")
-		}
-	}
-
-	cmtBlock := cmt.Marshal()
-	if cmtIdx >= 0 {
-		f.Meta[cmtIdx] = &cmtBlock
-	} else {
-		f.Meta = append(f.Meta, &cmtBlock)
-	}
-
-	coverPath := strings.TrimSpace(fields["cover_path"])
-	if coverPath != "" && fileExists(coverPath) {
-		coverData, err := os.ReadFile(coverPath)
-		if err == nil && len(coverData) > 0 {
-			for i := len(f.Meta) - 1; i >= 0; i-- {
-				if f.Meta[i].Type == flac.Picture {
-					f.Meta = append(f.Meta[:i], f.Meta[i+1:]...)
-				}
-			}
-			picBlock, err := buildPictureBlock("", coverData)
-			if err == nil {
-				f.Meta = append(f.Meta, &picBlock)
-			}
-		}
-	}
-
-	return f.Save(filePath)
-}
-
-// writeVorbisMetadata writes all metadata fields to a Vorbis Comment block.
-// Empty/zero values are simply skipped (not written, not cleared).  This is
-// used by the download embedding path where absent fields should preserve any
-// existing values.  The editor path uses EditFlacFields() instead.
-func writeVorbisMetadata(cmt *flacvorbis.MetaDataBlockVorbisComment, metadata Metadata) {
 	setComment(cmt, "TITLE", metadata.Title)
-	setArtistComments(cmt, "ARTIST", metadata.Artist, metadata.ArtistTagMode)
+	setComment(cmt, "ARTIST", metadata.Artist)
 	setComment(cmt, "ALBUM", metadata.Album)
-	setArtistComments(cmt, "ALBUMARTIST", metadata.AlbumArtist, metadata.ArtistTagMode)
+	setComment(cmt, "ALBUMARTIST", metadata.AlbumArtist)
 	setComment(cmt, "DATE", metadata.Date)
 
 	if metadata.TrackNumber > 0 {
@@ -522,122 +298,102 @@ func writeVorbisMetadata(cmt *flacvorbis.MetaDataBlockVorbisComment, metadata Me
 		setComment(cmt, "COMMENT", metadata.Comment)
 	}
 
-	setComment(cmt, "REPLAYGAIN_TRACK_GAIN", metadata.ReplayGainTrackGain)
-	setComment(cmt, "REPLAYGAIN_TRACK_PEAK", metadata.ReplayGainTrackPeak)
-	setComment(cmt, "REPLAYGAIN_ALBUM_GAIN", metadata.ReplayGainAlbumGain)
-	setComment(cmt, "REPLAYGAIN_ALBUM_PEAK", metadata.ReplayGainAlbumPeak)
+	cmtBlock := cmt.Marshal()
+	if cmtIdx >= 0 {
+		f.Meta[cmtIdx] = &cmtBlock
+	} else {
+		f.Meta = append(f.Meta, &cmtBlock)
+	}
+
+	if len(coverData) > 0 {
+		for i := len(f.Meta) - 1; i >= 0; i-- {
+			if f.Meta[i].Type == flac.Picture {
+				f.Meta = append(f.Meta[:i], f.Meta[i+1:]...)
+			}
+		}
+
+		picBlock, err := buildPictureBlock("", coverData)
+		if err != nil {
+			return fmt.Errorf("failed to create picture block: %w", err)
+		}
+		f.Meta = append(f.Meta, &picBlock)
+		fmt.Printf("[Metadata] Cover art embedded successfully (%d bytes)\n", len(coverData))
+	}
+
+	return f.Save(filePath)
+}
+
+func ReadMetadata(filePath string) (*Metadata, error) {
+	f, err := flac.ParseFile(filePath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse FLAC file: %w", err)
+	}
+
+	metadata := &Metadata{}
+
+	for _, meta := range f.Meta {
+		if meta.Type == flac.VorbisComment {
+			cmt, err := flacvorbis.ParseFromMetaDataBlock(*meta)
+			if err != nil {
+				continue
+			}
+
+			metadata.Title = getComment(cmt, "TITLE")
+			metadata.Artist = getComment(cmt, "ARTIST")
+			metadata.Album = getComment(cmt, "ALBUM")
+			metadata.AlbumArtist = getComment(cmt, "ALBUMARTIST")
+			metadata.Date = getComment(cmt, "DATE")
+			metadata.ISRC = getComment(cmt, "ISRC")
+			metadata.Description = getComment(cmt, "DESCRIPTION")
+
+			metadata.Lyrics = getComment(cmt, "LYRICS")
+			if metadata.Lyrics == "" {
+				metadata.Lyrics = getComment(cmt, "UNSYNCEDLYRICS")
+			}
+
+			trackNum := getComment(cmt, "TRACKNUMBER")
+			if trackNum != "" {
+				fmt.Sscanf(trackNum, "%d", &metadata.TrackNumber)
+			}
+			if metadata.TrackNumber == 0 {
+				trackNum = getComment(cmt, "TRACK")
+				if trackNum != "" {
+					fmt.Sscanf(trackNum, "%d", &metadata.TrackNumber)
+				}
+			}
+
+			discNum := getComment(cmt, "DISCNUMBER")
+			if discNum != "" {
+				fmt.Sscanf(discNum, "%d", &metadata.DiscNumber)
+			}
+			if metadata.DiscNumber == 0 {
+				discNum = getComment(cmt, "DISC")
+				if discNum != "" {
+					fmt.Sscanf(discNum, "%d", &metadata.DiscNumber)
+				}
+			}
+
+			if metadata.Date == "" {
+				metadata.Date = getComment(cmt, "YEAR")
+			}
+
+			metadata.Genre = getComment(cmt, "GENRE")
+			metadata.Label = getComment(cmt, "ORGANIZATION")
+			metadata.Copyright = getComment(cmt, "COPYRIGHT")
+			metadata.Composer = getComment(cmt, "COMPOSER")
+			metadata.Comment = getComment(cmt, "COMMENT")
+
+			break
+		}
+	}
+
+	return metadata, nil
 }
 
 func setComment(cmt *flacvorbis.MetaDataBlockVorbisComment, key, value string) {
 	if value == "" {
 		return
 	}
-	removeCommentKey(cmt, key)
-	cmt.Comments = append(cmt.Comments, key+"="+value)
-}
-
-// setOrClearComment writes a Vorbis Comment, or removes the key if value is
-// empty.  Used by the metadata editor path where empty means "delete this tag".
-func setOrClearComment(cmt *flacvorbis.MetaDataBlockVorbisComment, key, value string) {
-	if value == "" {
-		removeCommentKey(cmt, key)
-		return
-	}
-	removeCommentKey(cmt, key)
-	cmt.Comments = append(cmt.Comments, key+"="+value)
-}
-
-func setArtistComments(cmt *flacvorbis.MetaDataBlockVorbisComment, key, value, mode string) {
-	if value == "" {
-		return
-	}
-	values := []string{value}
-	if shouldSplitVorbisArtistTags(mode) {
-		values = splitArtistTagValues(value)
-	}
-	if len(values) == 0 {
-		return
-	}
-	removeCommentKey(cmt, key)
-	for _, artist := range values {
-		if strings.TrimSpace(artist) == "" {
-			continue
-		}
-		cmt.Comments = append(cmt.Comments, key+"="+artist)
-	}
-}
-
-// setOrClearArtistComments writes artist Vorbis Comments, or removes the key
-// if value is empty.  Used by the metadata editor path.
-func setOrClearArtistComments(cmt *flacvorbis.MetaDataBlockVorbisComment, key, value, mode string) {
-	if value == "" {
-		removeCommentKey(cmt, key)
-		return
-	}
-	values := []string{value}
-	if shouldSplitVorbisArtistTags(mode) {
-		values = splitArtistTagValues(value)
-	}
-	if len(values) == 0 {
-		removeCommentKey(cmt, key)
-		return
-	}
-	removeCommentKey(cmt, key)
-	for _, artist := range values {
-		if strings.TrimSpace(artist) == "" {
-			continue
-		}
-		cmt.Comments = append(cmt.Comments, key+"="+artist)
-	}
-}
-
-// RewriteSplitArtistTags opens a FLAC file and rewrites the ARTIST and
-// ALBUMARTIST Vorbis comments as multiple separate entries (one per artist).
-// This is needed because FFmpeg's -metadata flag deduplicates keys, so only
-// the last value survives when multiple -metadata ARTIST=X flags are used.
-// The native go-flac writer correctly handles multiple Vorbis comments.
-func RewriteSplitArtistTags(filePath, artist, albumArtist string) error {
-	if !shouldSplitVorbisArtistTags(artistTagModeSplitVorbis) {
-		return nil
-	}
-
-	f, err := flac.ParseFile(filePath)
-	if err != nil {
-		return fmt.Errorf("failed to parse FLAC file: %w", err)
-	}
-
-	var cmtIdx int = -1
-	var cmt *flacvorbis.MetaDataBlockVorbisComment
-
-	for idx, meta := range f.Meta {
-		if meta.Type == flac.VorbisComment {
-			cmtIdx = idx
-			cmt, err = flacvorbis.ParseFromMetaDataBlock(*meta)
-			if err != nil {
-				return fmt.Errorf("failed to parse vorbis comment: %w", err)
-			}
-			break
-		}
-	}
-
-	if cmt == nil {
-		cmt = flacvorbis.New()
-	}
-
-	setArtistComments(cmt, "ARTIST", artist, artistTagModeSplitVorbis)
-	setArtistComments(cmt, "ALBUMARTIST", albumArtist, artistTagModeSplitVorbis)
-
-	cmtMeta := cmt.Marshal()
-	if cmtIdx >= 0 {
-		f.Meta[cmtIdx] = &cmtMeta
-	} else {
-		f.Meta = append(f.Meta, &cmtMeta)
-	}
-
-	return f.Save(filePath)
-}
-
-func removeCommentKey(cmt *flacvorbis.MetaDataBlockVorbisComment, key string) {
 	keyUpper := strings.ToUpper(key)
 	for i := len(cmt.Comments) - 1; i >= 0; i-- {
 		comment := cmt.Comments[i]
@@ -649,85 +405,20 @@ func removeCommentKey(cmt *flacvorbis.MetaDataBlockVorbisComment, key string) {
 			}
 		}
 	}
+	cmt.Comments = append(cmt.Comments, key+"="+value)
 }
 
 func getComment(cmt *flacvorbis.MetaDataBlockVorbisComment, key string) string {
-	values := getCommentValues(cmt, key)
-	if len(values) == 0 {
-		return ""
-	}
-	return values[0]
-}
-
-func getJoinedComment(cmt *flacvorbis.MetaDataBlockVorbisComment, key string) string {
-	return joinVorbisCommentValues(getCommentValues(cmt, key))
-}
-
-func getCommentValues(cmt *flacvorbis.MetaDataBlockVorbisComment, key string) []string {
 	keyUpper := strings.ToUpper(key) + "="
-	values := make([]string, 0, 1)
 	for _, comment := range cmt.Comments {
 		if len(comment) > len(key) {
 			commentUpper := strings.ToUpper(comment[:len(key)+1])
 			if commentUpper == keyUpper {
-				values = append(values, comment[len(key)+1:])
+				return comment[len(key)+1:]
 			}
 		}
 	}
-	return values
-}
-
-func shouldSplitVorbisArtistTags(mode string) bool {
-	return strings.EqualFold(strings.TrimSpace(mode), artistTagModeSplitVorbis)
-}
-
-func splitArtistTagValues(rawArtists string) []string {
-	trimmed := strings.TrimSpace(rawArtists)
-	if trimmed == "" {
-		return nil
-	}
-
-	parts := artistTagSplitPattern.Split(trimmed, -1)
-	values := make([]string, 0, len(parts))
-	seen := make(map[string]struct{}, len(parts))
-	for _, part := range parts {
-		artist := strings.TrimSpace(part)
-		if artist == "" {
-			continue
-		}
-		key := strings.ToLower(artist)
-		if _, ok := seen[key]; ok {
-			continue
-		}
-		seen[key] = struct{}{}
-		values = append(values, artist)
-	}
-	if len(values) > 0 {
-		return values
-	}
-	return []string{trimmed}
-}
-
-func joinVorbisCommentValues(values []string) string {
-	if len(values) == 0 {
-		return ""
-	}
-
-	joined := make([]string, 0, len(values))
-	seen := make(map[string]struct{}, len(values))
-	for _, value := range values {
-		trimmed := strings.TrimSpace(value)
-		if trimmed == "" {
-			continue
-		}
-		key := strings.ToLower(trimmed)
-		if _, ok := seen[key]; ok {
-			continue
-		}
-		seen[key] = struct{}{}
-		joined = append(joined, trimmed)
-	}
-	return strings.Join(joined, ", ")
+	return ""
 }
 
 func fileExists(path string) bool {
@@ -980,14 +671,6 @@ func ReadM4ATags(filePath string) (*AudioMetadata, error) {
 					if metadata.Lyrics == "" {
 						metadata.Lyrics = value
 					}
-				case "REPLAYGAIN_TRACK_GAIN":
-					metadata.ReplayGainTrackGain = value
-				case "REPLAYGAIN_TRACK_PEAK":
-					metadata.ReplayGainTrackPeak = value
-				case "REPLAYGAIN_ALBUM_GAIN":
-					metadata.ReplayGainAlbumGain = value
-				case "REPLAYGAIN_ALBUM_PEAK":
-					metadata.ReplayGainAlbumPeak = value
 				}
 			}
 		}

go_backend/metadata_artist_tags_test.go

@@ -1,67 +0,0 @@
-package gobackend
-
-import (
-	"bytes"
-	"encoding/binary"
-	"slices"
-	"testing"
-
-	"github.com/go-flac/flacvorbis/v2"
-)
-
-func TestSplitArtistTagValues(t *testing.T) {
-	got := splitArtistTagValues("Artist A, Artist B feat. Artist C & Artist B")
-	want := []string{"Artist A", "Artist B", "Artist C"}
-	if !slices.Equal(got, want) {
-		t.Fatalf("splitArtistTagValues() = %#v, want %#v", got, want)
-	}
-}
-
-func TestSetArtistCommentsSplitVorbis(t *testing.T) {
-	cmt := flacvorbis.New()
-	setArtistComments(cmt, "ARTIST", "Artist A, Artist B", artistTagModeSplitVorbis)
-
-	got := getCommentValues(cmt, "ARTIST")
-	want := []string{"Artist A", "Artist B"}
-	if !slices.Equal(got, want) {
-		t.Fatalf("getCommentValues(ARTIST) = %#v, want %#v", got, want)
-	}
-}
-
-func TestParseVorbisCommentsJoinsRepeatedArtists(t *testing.T) {
-	metadata := &AudioMetadata{}
-	parseVorbisComments(
-		buildVorbisCommentPayload(
-			[]string{
-				"TITLE=Song",
-				"ARTIST=Artist A",
-				"ARTIST=Artist B",
-				"ALBUMARTIST=Album Artist A",
-				"ALBUMARTIST=Album Artist B",
-			},
-		),
-		metadata,
-	)
-
-	if metadata.Title != "Song" {
-		t.Fatalf("title = %q", metadata.Title)
-	}
-	if metadata.Artist != "Artist A, Artist B" {
-		t.Fatalf("artist = %q", metadata.Artist)
-	}
-	if metadata.AlbumArtist != "Album Artist A, Album Artist B" {
-		t.Fatalf("album artist = %q", metadata.AlbumArtist)
-	}
-}
-
-func buildVorbisCommentPayload(comments []string) []byte {
-	var buf bytes.Buffer
-	_ = binary.Write(&buf, binary.LittleEndian, uint32(len("spotiflac")))
-	buf.WriteString("spotiflac")
-	_ = binary.Write(&buf, binary.LittleEndian, uint32(len(comments)))
-	for _, comment := range comments {
-		_ = binary.Write(&buf, binary.LittleEndian, uint32(len(comment)))
-		buf.WriteString(comment)
-	}
-	return buf.Bytes()
-}

go_backend/metadata_types.go

@@ -1,145 +0,0 @@
-package gobackend
-
-import "time"
-
-type cacheEntry struct {
-	data      interface{}
-	expiresAt time.Time
-}
-
-func (e *cacheEntry) isExpired() bool {
-	return time.Now().After(e.expiresAt)
-}
-
-type TrackMetadata struct {
-	SpotifyID   string `json:"spotify_id,omitempty"`
-	Artists     string `json:"artists"`
-	Name        string `json:"name"`
-	AlbumName   string `json:"album_name"`
-	AlbumArtist string `json:"album_artist,omitempty"`
-	DurationMS  int    `json:"duration_ms"`
-	Images      string `json:"images"`
-	ReleaseDate string `json:"release_date"`
-	TrackNumber int    `json:"track_number"`
-	TotalTracks int    `json:"total_tracks,omitempty"`
-	DiscNumber  int    `json:"disc_number,omitempty"`
-	ExternalURL string `json:"external_urls"`
-	ISRC        string `json:"isrc"`
-	AlbumID     string `json:"album_id,omitempty"`
-	ArtistID    string `json:"artist_id,omitempty"`
-	AlbumType   string `json:"album_type,omitempty"`
-}
-
-type AlbumTrackMetadata struct {
-	SpotifyID   string `json:"spotify_id,omitempty"`
-	Artists     string `json:"artists"`
-	Name        string `json:"name"`
-	AlbumName   string `json:"album_name"`
-	AlbumArtist string `json:"album_artist,omitempty"`
-	DurationMS  int    `json:"duration_ms"`
-	Images      string `json:"images"`
-	ReleaseDate string `json:"release_date"`
-	TrackNumber int    `json:"track_number"`
-	TotalTracks int    `json:"total_tracks,omitempty"`
-	DiscNumber  int    `json:"disc_number,omitempty"`
-	ExternalURL string `json:"external_urls"`
-	ISRC        string `json:"isrc"`
-	AlbumID     string `json:"album_id,omitempty"`
-	AlbumURL    string `json:"album_url,omitempty"`
-	AlbumType   string `json:"album_type,omitempty"`
-}
-
-type AlbumInfoMetadata struct {
-	TotalTracks int    `json:"total_tracks"`
-	Name        string `json:"name"`
-	ReleaseDate string `json:"release_date"`
-	Artists     string `json:"artists"`
-	ArtistId    string `json:"artist_id,omitempty"`
-	Images      string `json:"images"`
-	Genre       string `json:"genre,omitempty"`
-	Label       string `json:"label,omitempty"`
-	Copyright   string `json:"copyright,omitempty"`
-}
-
-type AlbumResponsePayload struct {
-	AlbumInfo AlbumInfoMetadata    `json:"album_info"`
-	TrackList []AlbumTrackMetadata `json:"track_list"`
-}
-
-type PlaylistInfoMetadata struct {
-	Name   string `json:"name,omitempty"`
-	Images string `json:"images,omitempty"`
-	Tracks struct {
-		Total int `json:"total"`
-	} `json:"tracks"`
-	Owner struct {
-		DisplayName string `json:"display_name"`
-		Name        string `json:"name"`
-		Images      string `json:"images"`
-	} `json:"owner"`
-}
-
-type PlaylistResponsePayload struct {
-	PlaylistInfo PlaylistInfoMetadata `json:"playlist_info"`
-	TrackList    []AlbumTrackMetadata `json:"track_list"`
-}
-
-type ArtistInfoMetadata struct {
-	ID         string `json:"id"`
-	Name       string `json:"name"`
-	Images     string `json:"images"`
-	Followers  int    `json:"followers"`
-	Popularity int    `json:"popularity"`
-}
-
-type ArtistAlbumMetadata struct {
-	ID          string `json:"id"`
-	Name        string `json:"name"`
-	ReleaseDate string `json:"release_date"`
-	TotalTracks int    `json:"total_tracks"`
-	Images      string `json:"images"`
-	AlbumType   string `json:"album_type"`
-	Artists     string `json:"artists"`
-}
-
-type ArtistResponsePayload struct {
-	ArtistInfo ArtistInfoMetadata    `json:"artist_info"`
-	Albums     []ArtistAlbumMetadata `json:"albums"`
-}
-
-type TrackResponse struct {
-	Track TrackMetadata `json:"track"`
-}
-
-type SearchArtistResult struct {
-	ID         string `json:"id"`
-	Name       string `json:"name"`
-	Images     string `json:"images"`
-	Followers  int    `json:"followers"`
-	Popularity int    `json:"popularity"`
-}
-
-type SearchAlbumResult struct {
-	ID          string `json:"id"`
-	Name        string `json:"name"`
-	Artists     string `json:"artists"`
-	Images      string `json:"images"`
-	ReleaseDate string `json:"release_date"`
-	TotalTracks int    `json:"total_tracks"`
-	AlbumType   string `json:"album_type"`
-}
-
-type SearchPlaylistResult struct {
-	ID          string `json:"id"`
-	Name        string `json:"name"`
-	Owner       string `json:"owner"`
-	Images      string `json:"images"`
-	TotalTracks int    `json:"total_tracks"`
-}
-
-type SearchAllResult struct {
-	Tracks    []TrackMetadata        `json:"tracks"`
-	Artists   []SearchArtistResult   `json:"artists"`
-	Albums    []SearchAlbumResult    `json:"albums"`
-	Playlists []SearchPlaylistResult `json:"playlists"`
-}

go_backend/qobuz.go

@@ -13,7 +13,6 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -44,12 +43,11 @@ var (
 )
 
 const (
-	qobuzAPIBaseURL         = "https://api.zarz.moe/v1/qbz/"
-	qobuzTrackGetBaseURL    = qobuzAPIBaseURL + "track/get?track_id="
-	qobuzTrackSearchBaseURL = qobuzAPIBaseURL + "track/search?query="
-	qobuzAlbumGetBaseURL    = qobuzAPIBaseURL + "album/get?album_id="
-	qobuzArtistGetBaseURL   = qobuzAPIBaseURL + "artist/get?artist_id="
-	qobuzPlaylistGetBaseURL = qobuzAPIBaseURL + "playlist/get?playlist_id="
+	qobuzTrackGetBaseURL    = "https://www.qobuz.com/api.json/0.2/track/get?track_id="
+	qobuzTrackSearchBaseURL = "https://www.qobuz.com/api.json/0.2/track/search?query="
+	qobuzAlbumGetBaseURL    = "https://www.qobuz.com/api.json/0.2/album/get?album_id="
+	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/"
@@ -59,19 +57,21 @@ const (
 	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="
-
-	qobuzFallbackAPIBaseURL         = "https://api.zarz.moe/v1/qbz2/"
-	qobuzFallbackTrackGetBaseURL    = qobuzFallbackAPIBaseURL + "track/get?track_id="
-	qobuzFallbackTrackSearchBaseURL = qobuzFallbackAPIBaseURL + "track/search?query="
-	qobuzFallbackAlbumGetBaseURL    = qobuzFallbackAPIBaseURL + "album/get?album_id="
-	qobuzFallbackArtistGetBaseURL   = qobuzFallbackAPIBaseURL + "artist/get?artist_id="
-	qobuzFallbackPlaylistGetBaseURL = qobuzFallbackAPIBaseURL + "playlist/get?playlist_id="
+	qobuzDebugKeyXORMask    = byte(0x5A)
 )
 
 var qobuzStoreTrackIDRegex = regexp.MustCompile(`/v4/ajax/popin-add-cart/track/([0-9]+)`)
 var qobuzArtistAlbumIDRegex = regexp.MustCompile(`data-itemtype="album"\s+data-itemId="([A-Za-z0-9]+)"`)
 var qobuzLocaleSegmentRegex = regexp.MustCompile(`^[a-z]{2}-[a-z]{2}$`)
 
+var qobuzDebugKeyObfuscated = []byte{
+	0x69, 0x3b, 0x38, 0x3e, 0x36, 0x37, 0x35, 0x2f, 0x36, 0x3b,
+	0x33, 0x29, 0x2e, 0x32, 0x3f, 0x3d, 0x35, 0x3b, 0x2e, 0x3b,
+	0x34, 0x3e, 0x34, 0x35, 0x35, 0x34, 0x3f, 0x39, 0x35, 0x37,
+	0x3f, 0x29, 0x3f, 0x2c, 0x3f, 0x34, 0x39, 0x36, 0x35, 0x29,
+	0x3f,
+}
+
 type QobuzTrack struct {
 	ID                  int64   `json:"id"`
 	Title               string  `json:"title"`
@@ -262,35 +262,26 @@ func qobuzTrackDisplayTitle(track *QobuzTrack) string {
 	return fmt.Sprintf("%s (%s)", title, version)
 }
 
-var qobuzImageSizeRe = regexp.MustCompile(`_\d+\.jpg$`)
-
-func qobuzUpscaleImageURL(url string) string {
-	if url == "" {
-		return ""
-	}
-	return qobuzImageSizeRe.ReplaceAllString(url, "_max.jpg")
-}
-
 func qobuzTrackAlbumImage(track *QobuzTrack) string {
 	if track == nil {
 		return ""
 	}
-	return qobuzUpscaleImageURL(qobuzFirstNonEmpty(
+	return qobuzFirstNonEmpty(
 		track.Album.Image.Large,
 		track.Album.Image.Small,
 		track.Album.Image.Thumbnail,
-	))
+	)
 }
 
 func qobuzAlbumImage(album *qobuzAlbumDetails) string {
 	if album == nil {
 		return ""
 	}
-	return qobuzUpscaleImageURL(qobuzFirstNonEmpty(
+	return qobuzFirstNonEmpty(
 		album.Image.Large,
 		album.Image.Small,
 		album.Image.Thumbnail,
-	))
+	)
 }
 
 func qobuzTrackArtistID(track *QobuzTrack) string {
@@ -785,21 +776,12 @@ func (q *QobuzDownloader) GetTrackByID(trackID int64) (*QobuzTrack, error) {
 
 	resp, err := DoRequestWithUserAgent(q.client, req)
 	if err != nil {
-		if isQobuzPrimaryUnavailable(err) {
-			GoLog("[Qobuz] Primary API unavailable for track %d, trying qbz2 fallback: %v\n", trackID, err)
-			return q.getTrackByIDViaMusicDL(trackID)
-		}
 		return nil, err
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != 200 {
-		primaryErr := fmt.Errorf("get track failed: HTTP %d", resp.StatusCode)
-		if isQobuzPrimaryUnavailable(primaryErr) {
-			GoLog("[Qobuz] Primary API unavailable for track %d, trying qbz2 fallback: %v\n", trackID, primaryErr)
-			return q.getTrackByIDViaMusicDL(trackID)
-		}
-		return nil, primaryErr
+		return nil, fmt.Errorf("get track failed: HTTP %d", resp.StatusCode)
 	}
 
 	var track QobuzTrack
@@ -810,16 +792,6 @@ func (q *QobuzDownloader) GetTrackByID(trackID int64) (*QobuzTrack, error) {
 	return &track, nil
 }
 
-func (q *QobuzDownloader) getTrackByIDViaMusicDL(trackID int64) (*QobuzTrack, error) {
-	requestURL := fmt.Sprintf("%s%d", qobuzFallbackTrackGetBaseURL, trackID)
-	var track QobuzTrack
-	if err := q.getQobuzJSON(requestURL, &track); err != nil {
-		return nil, fmt.Errorf("qbz2 fallback also failed for track %d: %w", trackID, err)
-	}
-	GoLog("[Qobuz] qbz2 fallback succeeded for track %d\n", trackID)
-	return &track, nil
-}
-
 func (q *QobuzDownloader) getQobuzJSON(requestURL string, target interface{}) error {
 	req, err := http.NewRequest("GET", requestURL, nil)
 	if err != nil {
@@ -860,25 +832,6 @@ func (q *QobuzDownloader) getQobuzBody(requestURL string) ([]byte, error) {
 	return io.ReadAll(resp.Body)
 }
 
-func isQobuzPrimaryUnavailable(err error) bool {
-	if err == nil {
-		return false
-	}
-	errStr := err.Error()
-	return strings.Contains(errStr, "HTTP 429") ||
-		strings.Contains(errStr, "HTTP 5") ||
-		strings.Contains(errStr, "rate limit") ||
-		strings.Contains(errStr, "connection refused") ||
-		strings.Contains(errStr, "no such host") ||
-		strings.Contains(errStr, "i/o timeout") ||
-		strings.Contains(errStr, "deadline exceeded") ||
-		strings.Contains(errStr, "EOF") ||
-		strings.Contains(errStr, "connection reset") ||
-		strings.Contains(errStr, "TLS handshake") ||
-		strings.Contains(errStr, "server misbehaving") ||
-		strings.Contains(errStr, "network is unreachable")
-}
-
 func extractQobuzAlbumIDsFromArtistHTML(body []byte) []string {
 	matches := qobuzArtistAlbumIDRegex.FindAllSubmatch(body, -1)
 	if len(matches) == 0 {
@@ -908,48 +861,20 @@ func (q *QobuzDownloader) getAlbumDetails(albumID string) (*qobuzAlbumDetails, e
 	requestURL := fmt.Sprintf("%s%s&app_id=%s", qobuzAlbumGetBaseURL, url.QueryEscape(strings.TrimSpace(albumID)), q.appID)
 	var album qobuzAlbumDetails
 	if err := q.getQobuzJSON(requestURL, &album); err != nil {
-		if isQobuzPrimaryUnavailable(err) {
-			GoLog("[Qobuz] Primary API unavailable for album %s, trying qbz2 fallback: %v\n", albumID, err)
-			return q.getAlbumDetailsViaMusicDL(albumID)
-		}
 		return nil, err
 	}
 	return &album, nil
 }
 
-func (q *QobuzDownloader) getAlbumDetailsViaMusicDL(albumID string) (*qobuzAlbumDetails, error) {
-	requestURL := fmt.Sprintf("%s%s", qobuzFallbackAlbumGetBaseURL, url.QueryEscape(strings.TrimSpace(albumID)))
-	var album qobuzAlbumDetails
-	if err := q.getQobuzJSON(requestURL, &album); err != nil {
-		return nil, fmt.Errorf("qbz2 fallback also failed for album %s: %w", albumID, err)
-	}
-	GoLog("[Qobuz] qbz2 fallback succeeded for album %s\n", albumID)
-	return &album, nil
-}
-
 func (q *QobuzDownloader) getArtistDetails(artistID string) (*qobuzArtistDetails, error) {
 	requestURL := fmt.Sprintf("%s%s&app_id=%s", qobuzArtistGetBaseURL, url.QueryEscape(strings.TrimSpace(artistID)), q.appID)
 	var artist qobuzArtistDetails
 	if err := q.getQobuzJSON(requestURL, &artist); err != nil {
-		if isQobuzPrimaryUnavailable(err) {
-			GoLog("[Qobuz] Primary API unavailable for artist %s, trying qbz2 fallback: %v\n", artistID, err)
-			return q.getArtistDetailsViaMusicDL(artistID)
-		}
 		return nil, err
 	}
 	return &artist, nil
 }
 
-func (q *QobuzDownloader) getArtistDetailsViaMusicDL(artistID string) (*qobuzArtistDetails, error) {
-	requestURL := fmt.Sprintf("%s%s", qobuzFallbackArtistGetBaseURL, url.QueryEscape(strings.TrimSpace(artistID)))
-	var artist qobuzArtistDetails
-	if err := q.getQobuzJSON(requestURL, &artist); err != nil {
-		return nil, fmt.Errorf("qbz2 fallback also failed for artist %s: %w", artistID, err)
-	}
-	GoLog("[Qobuz] qbz2 fallback succeeded for artist %s\n", artistID)
-	return &artist, nil
-}
-
 func (q *QobuzDownloader) getPlaylistDetailsPage(playlistID string, limit, offset int) (*qobuzPlaylistDetails, error) {
 	requestURL := fmt.Sprintf(
 		"%s%s&extra=tracks&limit=%d&offset=%d&app_id=%s",
@@ -961,31 +886,11 @@ func (q *QobuzDownloader) getPlaylistDetailsPage(playlistID string, limit, offse
 	)
 	var playlist qobuzPlaylistDetails
 	if err := q.getQobuzJSON(requestURL, &playlist); err != nil {
-		if isQobuzPrimaryUnavailable(err) {
-			GoLog("[Qobuz] Primary API unavailable for playlist %s, trying qbz2 fallback: %v\n", playlistID, err)
-			return q.getPlaylistDetailsPageViaMusicDL(playlistID, limit, offset)
-		}
 		return nil, err
 	}
 	return &playlist, nil
 }
 
-func (q *QobuzDownloader) getPlaylistDetailsPageViaMusicDL(playlistID string, limit, offset int) (*qobuzPlaylistDetails, error) {
-	requestURL := fmt.Sprintf(
-		"%s%s&limit=%d&offset=%d",
-		qobuzFallbackPlaylistGetBaseURL,
-		url.QueryEscape(strings.TrimSpace(playlistID)),
-		limit,
-		offset,
-	)
-	var playlist qobuzPlaylistDetails
-	if err := q.getQobuzJSON(requestURL, &playlist); err != nil {
-		return nil, fmt.Errorf("qbz2 fallback also failed for playlist %s: %w", playlistID, err)
-	}
-	GoLog("[Qobuz] qbz2 fallback succeeded for playlist %s (offset=%d)\n", playlistID, offset)
-	return &playlist, nil
-}
-
 func (q *QobuzDownloader) getArtistAlbumIDs(artistID string) ([]string, error) {
 	artist, err := q.getArtistDetails(artistID)
 	if err != nil {
@@ -1031,17 +936,7 @@ func (q *QobuzDownloader) GetAlbumMetadata(resourceID string) (*AlbumResponsePay
 
 	tracks := make([]AlbumTrackMetadata, 0, len(album.Tracks.Items))
 	for i := range album.Tracks.Items {
-		track := &album.Tracks.Items[i]
-		track.Album.ID = album.ID
-		track.Album.Title = album.Title
-		track.Album.ReleaseDate = album.ReleaseDateOriginal
-		track.Album.Image = qobuzImageSet{
-			Thumbnail: album.Image.Thumbnail,
-			Small:     album.Image.Small,
-			Large:     album.Image.Large,
-		}
-		track.Album.TracksCount = album.TracksCount
-		tracks = append(tracks, qobuzTrackToAlbumTrackMetadata(track))
+		tracks = append(tracks, qobuzTrackToAlbumTrackMetadata(&album.Tracks.Items[i]))
 	}
 
 	return &AlbumResponsePayload{
@@ -1148,7 +1043,9 @@ func (q *QobuzDownloader) GetAvailableProviders() []qobuzAPIProvider {
 	return []qobuzAPIProvider{
 		{Name: "musicdl", URL: qobuzDownloadAPIURL, Kind: qobuzAPIKindMusicDL},
 		{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 +1196,14 @@ func mapQobuzQualityCodeToAPI(qualityCode string) string {
 	}
 }
 
+func getQobuzDebugKey() string {
+	decoded := make([]byte, len(qobuzDebugKeyObfuscated))
+	for i, b := range qobuzDebugKeyObfuscated {
+		decoded[i] = b ^ qobuzDebugKeyXORMask
+	}
+	return string(decoded)
+}
+
 func (q *QobuzDownloader) SearchTrackByISRC(isrc string) (*QobuzTrack, error) {
 	candidates, err := q.searchQobuzTracksWithFallback(isrc, 50)
 	if err != nil {
@@ -1451,10 +1356,9 @@ func (q *QobuzDownloader) SearchAll(query string, trackLimit, artistLimit int, f
 	}
 
 	if artistLimit > 0 {
-		searchURL := fmt.Sprintf("%sartist/search?query=%s&limit=%d&app_id=%s",
-			qobuzAPIBaseURL, url.QueryEscape(cleanQuery), artistLimit, q.appID)
+		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)
-		artistSearchDone := false
 		if err == nil {
 			resp, reqErr := DoRequestWithUserAgent(q.client, req)
 			if reqErr == nil {
@@ -1479,30 +1383,20 @@ func (q *QobuzDownloader) SearchAll(query string, trackLimit, artistLimit int, f
 								Images: imageURL,
 							})
 						}
-						artistSearchDone = true
 					} else {
 						GoLog("[Qobuz] Artist search decode failed: %v\n", decErr)
 					}
-				} else if isQobuzPrimaryUnavailable(fmt.Errorf("HTTP %d", resp.StatusCode)) {
-					GoLog("[Qobuz] Artist search primary API returned HTTP %d, will try qbz2 fallback\n", resp.StatusCode)
 				}
 			} else {
 				GoLog("[Qobuz] Artist search request failed: %v\n", reqErr)
-				if isQobuzPrimaryUnavailable(reqErr) {
-					GoLog("[Qobuz] Primary API unavailable for artist search, will try qbz2 fallback\n")
-				}
 			}
 		}
-		if !artistSearchDone {
-			q.searchAllArtistsViaMusicDL(cleanQuery, artistLimit, result)
-		}
 	}
 
 	if albumLimit > 0 {
-		searchURL := fmt.Sprintf("%salbum/search?query=%s&limit=%d&app_id=%s",
-			qobuzAPIBaseURL, url.QueryEscape(cleanQuery), albumLimit, q.appID)
+		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)
-		albumSearchDone := false
 		if err == nil {
 			resp, reqErr := DoRequestWithUserAgent(q.client, req)
 			if reqErr == nil {
@@ -1527,81 +1421,20 @@ func (q *QobuzDownloader) SearchAll(query string, trackLimit, artistLimit int, f
 								AlbumType:   qobuzNormalizeAlbumType(album.ReleaseType, album.ProductType, album.TracksCount),
 							})
 						}
-						albumSearchDone = true
 					} else {
 						GoLog("[Qobuz] Album search decode failed: %v\n", decErr)
 					}
-				} else if isQobuzPrimaryUnavailable(fmt.Errorf("HTTP %d", resp.StatusCode)) {
-					GoLog("[Qobuz] Album search primary API returned HTTP %d, will try qbz2 fallback\n", resp.StatusCode)
 				}
 			} else {
 				GoLog("[Qobuz] Album search request failed: %v\n", reqErr)
-				if isQobuzPrimaryUnavailable(reqErr) {
-					GoLog("[Qobuz] Primary API unavailable for album search, will try qbz2 fallback\n")
-				}
 			}
 		}
-		if !albumSearchDone {
-			q.searchAllAlbumsViaMusicDL(cleanQuery, albumLimit, result)
-		}
 	}
 
 	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) searchAllArtistsViaMusicDL(query string, limit int, result *SearchAllResult) {
-	requestURL := fmt.Sprintf("%sartist/search?query=%s&limit=%d", qobuzFallbackAPIBaseURL, url.QueryEscape(query), limit)
-	var searchResp struct {
-		Artists struct {
-			Items []struct {
-				ID    int64         `json:"id"`
-				Name  string        `json:"name"`
-				Image qobuzImageSet `json:"image"`
-			} `json:"items"`
-		} `json:"artists"`
-	}
-	if err := q.getQobuzJSON(requestURL, &searchResp); err != nil {
-		GoLog("[Qobuz] qbz2 fallback artist search also failed: %v\n", err)
-		return
-	}
-	GoLog("[Qobuz] qbz2 fallback artist search succeeded: %d artists\n", len(searchResp.Artists.Items))
-	for _, artist := range searchResp.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,
-		})
-	}
-}
-
-func (q *QobuzDownloader) searchAllAlbumsViaMusicDL(query string, limit int, result *SearchAllResult) {
-	requestURL := fmt.Sprintf("%salbum/search?query=%s&limit=%d", qobuzFallbackAPIBaseURL, url.QueryEscape(query), limit)
-	var searchResp struct {
-		Albums struct {
-			Items []qobuzAlbumDetails `json:"items"`
-		} `json:"albums"`
-	}
-	if err := q.getQobuzJSON(requestURL, &searchResp); err != nil {
-		GoLog("[Qobuz] qbz2 fallback album search also failed: %v\n", err)
-		return
-	}
-	GoLog("[Qobuz] qbz2 fallback album search succeeded: %d albums\n", len(searchResp.Albums.Items))
-	for i := range searchResp.Albums.Items {
-		album := &searchResp.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),
-		})
-	}
-}
-
 func (q *QobuzDownloader) SearchTrackByMetadataWithDuration(trackName, artistName string, expectedDurationSec int) (*QobuzTrack, error) {
 	queries := []string{}
 
@@ -1745,27 +1578,21 @@ func (q *QobuzDownloader) SearchTrackByMetadataWithDuration(trackName, artistNam
 	return nil, fmt.Errorf("no matching track found for: %s - %s", artistName, trackName)
 }
 
-func qobuzTrackMatchesRequest(req DownloadRequest, track *QobuzTrack, logPrefix, source string, skipNameVerification bool) bool {
+func qobuzTrackMatchesRequest(req DownloadRequest, track *QobuzTrack, logPrefix, source string) bool {
 	if track == nil {
 		return false
 	}
 
-	exactISRCMatch := req.ISRC != "" &&
-		track.ISRC != "" &&
-		strings.EqualFold(strings.TrimSpace(req.ISRC), strings.TrimSpace(track.ISRC))
+	if req.ArtistName != "" && !qobuzArtistsMatch(req.ArtistName, track.Performer.Name) {
+		GoLog("[%s] Artist mismatch from %s: expected '%s', got '%s'. Rejecting.\n",
+			logPrefix, source, req.ArtistName, track.Performer.Name)
+		return false
+	}
 
-	if !exactISRCMatch && !skipNameVerification {
-		if req.ArtistName != "" && !qobuzArtistsMatch(req.ArtistName, track.Performer.Name) {
-			GoLog("[%s] Artist mismatch from %s: expected '%s', got '%s'. Rejecting.\n",
-				logPrefix, source, req.ArtistName, track.Performer.Name)
-			return false
-		}
-
-		if req.TrackName != "" && !qobuzTitlesMatch(req.TrackName, track.Title) {
-			GoLog("[%s] Title mismatch from %s: expected '%s', got '%s'. Rejecting.\n",
-				logPrefix, source, req.TrackName, track.Title)
-			return false
-		}
+	if req.TrackName != "" && !qobuzTitlesMatch(req.TrackName, track.Title) {
+		GoLog("[%s] Title mismatch from %s: expected '%s', got '%s'. Rejecting.\n",
+			logPrefix, source, req.TrackName, track.Title)
+		return false
 	}
 
 	expectedDurationSec := req.DurationMS / 1000
@@ -1793,22 +1620,12 @@ func (q *QobuzDownloader) searchQobuzTracksViaAPI(query string, limit int) ([]Qo
 
 	resp, err := DoRequestWithUserAgent(q.client, req)
 	if err != nil {
-		if isQobuzPrimaryUnavailable(err) {
-			GoLog("[Qobuz] Primary API unavailable for track search, trying qbz2 fallback: %v\n", err)
-			return q.searchQobuzTracksViaMusicDL(query, limit)
-		}
 		return nil, err
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != 200 {
-		body, _ := io.ReadAll(io.LimitReader(resp.Body, 512))
-		primaryErr := fmt.Errorf("search failed: HTTP %d (%s)", resp.StatusCode, strings.TrimSpace(string(body)))
-		if isQobuzPrimaryUnavailable(primaryErr) {
-			GoLog("[Qobuz] Primary API unavailable for track search, trying qbz2 fallback: %v\n", primaryErr)
-			return q.searchQobuzTracksViaMusicDL(query, limit)
-		}
-		return nil, primaryErr
+		return nil, fmt.Errorf("search failed: HTTP %d", resp.StatusCode)
 	}
 
 	var result struct {
@@ -1822,277 +1639,6 @@ func (q *QobuzDownloader) searchQobuzTracksViaAPI(query string, limit int) ([]Qo
 	return result.Tracks.Items, nil
 }
 
-func (q *QobuzDownloader) searchQobuzTracksViaMusicDL(query string, limit int) ([]QobuzTrack, error) {
-	requestURL := fmt.Sprintf("%s%s&limit=%d", qobuzFallbackTrackSearchBaseURL, url.QueryEscape(query), limit)
-	var result struct {
-		Tracks struct {
-			Items []QobuzTrack `json:"items"`
-		} `json:"tracks"`
-	}
-	if err := q.getQobuzJSON(requestURL, &result); err != nil {
-		return nil, fmt.Errorf("qbz2 fallback search also failed: %w", err)
-	}
-	GoLog("[Qobuz] qbz2 fallback search succeeded: %d tracks for '%s'\n", len(result.Tracks.Items), query)
-	return result.Tracks.Items, nil
-}
-
-type qobuzTrackSearchCandidate struct {
-	score int
-	track QobuzTrack
-}
-
-func qobuzNormalizedSearchText(value string) string {
-	return normalizeLooseArtistName(value)
-}
-
-func qobuzSearchTokens(value string) []string {
-	normalized := qobuzNormalizedSearchText(value)
-	if normalized == "" {
-		return nil
-	}
-
-	parts := strings.Fields(normalized)
-	tokens := make([]string, 0, len(parts))
-	seen := make(map[string]struct{}, len(parts))
-	for _, part := range parts {
-		if len(part) < 2 {
-			continue
-		}
-		if _, ok := seen[part]; ok {
-			continue
-		}
-		seen[part] = struct{}{}
-		tokens = append(tokens, part)
-	}
-	return tokens
-}
-
-func qobuzScoreTrackSearchCandidate(query string, track *QobuzTrack) int {
-	if track == nil {
-		return 0
-	}
-
-	queryNorm := qobuzNormalizedSearchText(query)
-	if queryNorm == "" {
-		return 0
-	}
-
-	titleNorm := qobuzNormalizedSearchText(track.Title)
-	displayNorm := qobuzNormalizedSearchText(qobuzTrackDisplayTitle(track))
-	artistNorm := qobuzNormalizedSearchText(qobuzTrackArtistName(track))
-	albumNorm := qobuzNormalizedSearchText(strings.TrimSpace(track.Album.Title))
-
-	score := 0
-
-	if qobuzTitlesMatch(query, track.Title) || qobuzTitlesMatch(query, qobuzTrackDisplayTitle(track)) {
-		score += 900
-	}
-
-	switch {
-	case queryNorm == titleNorm, queryNorm == displayNorm:
-		score += 1200
-	case (titleNorm != "" && strings.Contains(titleNorm, queryNorm)) ||
-		(displayNorm != "" && strings.Contains(displayNorm, queryNorm)):
-		score += 420
-	case (titleNorm != "" && strings.Contains(queryNorm, titleNorm)) ||
-		(displayNorm != "" && strings.Contains(queryNorm, displayNorm)):
-		score += 260
-	}
-
-	if artistNorm != "" && strings.Contains(queryNorm, artistNorm) {
-		score += 180
-	}
-	if albumNorm != "" && strings.Contains(queryNorm, albumNorm) {
-		score += 100
-	}
-
-	for _, token := range qobuzSearchTokens(query) {
-		switch {
-		case strings.Contains(titleNorm, token), strings.Contains(displayNorm, token):
-			score += 180
-		case strings.Contains(artistNorm, token):
-			score += 70
-		case strings.Contains(albumNorm, token):
-			score += 35
-		}
-	}
-
-	if track.ISRC != "" {
-		score += 15
-	}
-	if track.MaximumBitDepth >= 24 {
-		score += 10
-	}
-	if track.MaximumSamplingRate >= 88.2 {
-		score += 10
-	}
-
-	return score
-}
-
-func selectQobuzTracksFromAlbumSearchResults(
-	query string,
-	limit int,
-	albumSummaries []qobuzAlbumDetails,
-	loadAlbum func(string) (*qobuzAlbumDetails, error),
-) ([]QobuzTrack, error) {
-	if strings.TrimSpace(query) == "" {
-		return nil, fmt.Errorf("empty qobuz album-search fallback query")
-	}
-	if len(albumSummaries) == 0 {
-		return nil, fmt.Errorf("album search returned no albums")
-	}
-
-	candidates := make([]qobuzTrackSearchCandidate, 0, limit)
-	seenTrackIDs := make(map[int64]struct{})
-
-	for _, summary := range albumSummaries {
-		albumID := strings.TrimSpace(summary.ID)
-		if albumID == "" {
-			continue
-		}
-
-		album, err := loadAlbum(albumID)
-		if err != nil || album == nil {
-			continue
-		}
-
-		for i := range album.Tracks.Items {
-			track := album.Tracks.Items[i]
-			track.Album.ID = album.ID
-			track.Album.QobuzID = album.QobuzID
-			track.Album.Title = album.Title
-			track.Album.ReleaseDate = album.ReleaseDateOriginal
-			track.Album.TracksCount = album.TracksCount
-			track.Album.ProductType = album.ProductType
-			track.Album.ReleaseType = album.ReleaseType
-			track.Album.Artist.ID = album.Artist.ID
-			track.Album.Artist.Name = album.Artist.Name
-			track.Album.Artists = album.Artists
-			track.Album.Image = album.Image
-
-			if track.ID > 0 {
-				if _, ok := seenTrackIDs[track.ID]; ok {
-					continue
-				}
-				seenTrackIDs[track.ID] = struct{}{}
-			}
-
-			score := qobuzScoreTrackSearchCandidate(query, &track)
-			if score <= 0 {
-				continue
-			}
-
-			candidates = append(candidates, qobuzTrackSearchCandidate{
-				score: score,
-				track: track,
-			})
-		}
-	}
-
-	if len(candidates) == 0 {
-		return nil, fmt.Errorf("album-search fallback returned no scored track candidates")
-	}
-
-	sort.SliceStable(candidates, func(i, j int) bool {
-		if candidates[i].score != candidates[j].score {
-			return candidates[i].score > candidates[j].score
-		}
-		if candidates[i].track.MaximumBitDepth != candidates[j].track.MaximumBitDepth {
-			return candidates[i].track.MaximumBitDepth > candidates[j].track.MaximumBitDepth
-		}
-		return candidates[i].track.ID < candidates[j].track.ID
-	})
-
-	if limit > 0 && len(candidates) > limit {
-		candidates = candidates[:limit]
-	}
-
-	tracks := make([]QobuzTrack, 0, len(candidates))
-	for _, candidate := range candidates {
-		tracks = append(tracks, candidate.track)
-	}
-	return tracks, nil
-}
-
-func (q *QobuzDownloader) searchQobuzTracksViaAlbumSearch(query string, limit int) ([]QobuzTrack, error) {
-	albumLimit := limit
-	if albumLimit < 3 {
-		albumLimit = 3
-	}
-	if albumLimit > 8 {
-		albumLimit = 8
-	}
-
-	searchURL := fmt.Sprintf(
-		"%salbum/search?query=%s&limit=%d&app_id=%s",
-		qobuzAPIBaseURL,
-		url.QueryEscape(strings.TrimSpace(query)),
-		albumLimit,
-		q.appID,
-	)
-
-	req, err := http.NewRequest("GET", searchURL, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	resp, err := DoRequestWithUserAgent(q.client, req)
-	if err != nil {
-		if isQobuzPrimaryUnavailable(err) {
-			GoLog("[Qobuz] Primary API unavailable for album search fallback, trying qbz2: %v\n", err)
-			return q.searchQobuzTracksViaAlbumSearchMusicDL(query, limit, albumLimit)
-		}
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != 200 {
-		body, _ := io.ReadAll(io.LimitReader(resp.Body, 512))
-		primaryErr := fmt.Errorf("album search failed: HTTP %d (%s)", resp.StatusCode, strings.TrimSpace(string(body)))
-		if isQobuzPrimaryUnavailable(primaryErr) {
-			GoLog("[Qobuz] Primary API unavailable for album search fallback, trying qbz2: %v\n", primaryErr)
-			return q.searchQobuzTracksViaAlbumSearchMusicDL(query, limit, albumLimit)
-		}
-		return nil, primaryErr
-	}
-
-	var albumResp struct {
-		Albums struct {
-			Items []qobuzAlbumDetails `json:"items"`
-		} `json:"albums"`
-	}
-	if err := json.NewDecoder(resp.Body).Decode(&albumResp); err != nil {
-		return nil, err
-	}
-
-	return selectQobuzTracksFromAlbumSearchResults(
-		query,
-		limit,
-		albumResp.Albums.Items,
-		q.getAlbumDetails,
-	)
-}
-
-func (q *QobuzDownloader) searchQobuzTracksViaAlbumSearchMusicDL(query string, limit, albumLimit int) ([]QobuzTrack, error) {
-	requestURL := fmt.Sprintf("%salbum/search?query=%s&limit=%d", qobuzFallbackAPIBaseURL, url.QueryEscape(strings.TrimSpace(query)), albumLimit)
-	var searchResp struct {
-		Albums struct {
-			Items []qobuzAlbumDetails `json:"items"`
-		} `json:"albums"`
-	}
-	if err := q.getQobuzJSON(requestURL, &searchResp); err != nil {
-		return nil, fmt.Errorf("qbz2 fallback album search also failed: %w", err)
-	}
-	GoLog("[Qobuz] qbz2 fallback album search returned %d albums\n", len(searchResp.Albums.Items))
-	return selectQobuzTracksFromAlbumSearchResults(
-		query,
-		limit,
-		searchResp.Albums.Items,
-		q.getAlbumDetails,
-	)
-}
-
 func extractQobuzTrackIDsFromStoreSearchHTML(body []byte) []int64 {
 	matches := qobuzStoreTrackIDRegex.FindAllSubmatch(body, -1)
 	if len(matches) == 0 {
@@ -2170,18 +1716,9 @@ func (q *QobuzDownloader) searchQobuzTracksWithFallback(query string, limit int)
 		if len(apiTracks) > 0 {
 			return apiTracks, nil
 		}
-		GoLog("[Qobuz] API search returned 0 results for '%s', trying album-search fallback\n", query)
+		GoLog("[Qobuz] API search returned 0 results for '%s', trying store fallback\n", query)
 	} else {
-		GoLog("[Qobuz] API search failed for '%s': %v. Trying album-search fallback.\n", query, apiErr)
-	}
-
-	albumTracks, albumErr := q.searchQobuzTracksViaAlbumSearch(query, limit)
-	if albumErr == nil && len(albumTracks) > 0 {
-		GoLog("[Qobuz] Album-search fallback returned %d candidate tracks for '%s'\n", len(albumTracks), query)
-		return albumTracks, nil
-	}
-	if albumErr != nil {
-		GoLog("[Qobuz] Album-search fallback failed for '%s': %v. Trying store fallback.\n", query, albumErr)
+		GoLog("[Qobuz] API search failed for '%s': %v. Trying store fallback.\n", query, apiErr)
 	}
 
 	storeTracks, storeErr := q.searchQobuzTracksViaStore(query, limit)
@@ -2190,21 +1727,10 @@ func (q *QobuzDownloader) searchQobuzTracksWithFallback(query string, limit int)
 		return storeTracks, nil
 	}
 
-	if apiErr != nil && albumErr != nil && storeErr != nil {
-		return nil, fmt.Errorf(
-			"api search failed (%v); album-search fallback failed (%v); store fallback failed (%v)",
-			apiErr,
-			albumErr,
-			storeErr,
-		)
-	}
-	if albumErr == nil && len(albumTracks) == 0 && storeErr != nil {
-		return nil, storeErr
+	if apiErr != nil && storeErr != nil {
+		return nil, fmt.Errorf("api search failed (%v); store fallback failed (%v)", apiErr, storeErr)
 	}
 	if storeErr != nil {
-		if albumErr != nil {
-			return nil, albumErr
-		}
 		return nil, storeErr
 	}
 	return nil, fmt.Errorf("no tracks found for query: %s", query)
@@ -2580,7 +2106,7 @@ func resolveQobuzTrackForRequest(req DownloadRequest, downloader *QobuzDownloade
 				GoLog("[%s] Failed to get track by request Qobuz ID %d: %v\n", logPrefix, trackID, err)
 				track = nil
 			} else if track != nil {
-				if qobuzTrackMatchesRequest(req, track, logPrefix, "request Qobuz ID", false) {
+				if qobuzTrackMatchesRequest(req, track, logPrefix, "request Qobuz ID") {
 					GoLog("[%s] Successfully found track via request Qobuz ID: '%s' by '%s'\n", logPrefix, track.Title, track.Performer.Name)
 				} else {
 					track = nil
@@ -2597,7 +2123,7 @@ func resolveQobuzTrackForRequest(req DownloadRequest, downloader *QobuzDownloade
 			if err != nil {
 				GoLog("[%s] Cache hit but GetTrackByID failed: %v\n", logPrefix, err)
 				track = nil
-			} else if track != nil && !qobuzTrackMatchesRequest(req, track, logPrefix, "cached Qobuz ID", false) {
+			} else if track != nil && !qobuzTrackMatchesRequest(req, track, logPrefix, "cached Qobuz ID") {
 				track = nil
 			}
 		}
@@ -2617,7 +2143,7 @@ func resolveQobuzTrackForRequest(req DownloadRequest, downloader *QobuzDownloade
 					GoLog("[%s] Failed to get track by SongLink ID %d: %v\n", logPrefix, trackID, err)
 					track = nil
 				} else if track != nil {
-					if qobuzTrackMatchesRequest(req, track, logPrefix, "SongLink Qobuz ID", true) {
+					if qobuzTrackMatchesRequest(req, track, logPrefix, "SongLink Qobuz ID") {
 						GoLog("[%s] Successfully found track via SongLink ID: '%s' by '%s'\n", logPrefix, track.Title, track.Performer.Name)
 						if req.ISRC != "" {
 							GetTrackIDCache().SetQobuz(req.ISRC, track.ID)
@@ -2634,7 +2160,7 @@ func resolveQobuzTrackForRequest(req DownloadRequest, downloader *QobuzDownloade
 	if track == nil && req.ISRC != "" {
 		GoLog("[%s] Trying ISRC search: %s\n", logPrefix, req.ISRC)
 		track, err = qobuzSearchTrackByISRCWithDurationFunc(downloader, req.ISRC, expectedDurationSec)
-		if track != nil && !qobuzTrackMatchesRequest(req, track, logPrefix, "ISRC search", false) {
+		if track != nil && !qobuzTrackMatchesRequest(req, track, logPrefix, "ISRC search") {
 			track = nil
 		}
 	}
@@ -2643,7 +2169,7 @@ func resolveQobuzTrackForRequest(req DownloadRequest, downloader *QobuzDownloade
 	if track == nil {
 		GoLog("[%s] Trying metadata search: '%s' by '%s'\n", logPrefix, req.TrackName, req.ArtistName)
 		track, err = qobuzSearchTrackByMetadataWithDurationFunc(downloader, req.TrackName, req.ArtistName, expectedDurationSec)
-		if track != nil && !qobuzTrackMatchesRequest(req, track, logPrefix, "metadata search", false) {
+		if track != nil && !qobuzTrackMatchesRequest(req, track, logPrefix, "metadata search") {
 			track = nil
 		}
 	}
@@ -2708,7 +2234,7 @@ func downloadFromQobuz(req DownloadRequest) (QobuzDownloadResult, error) {
 		qobuzQuality = "6"
 	case "HI_RES":
 		qobuzQuality = "7"
-	case "HI_RES_LOSSLESS", "", "DEFAULT":
+	case "HI_RES_LOSSLESS":
 		qobuzQuality = "27"
 	}
 	GoLog("[Qobuz] Using quality: %s (mapped from %s)\n", qobuzQuality, req.Quality)
@@ -2784,19 +2310,18 @@ func downloadFromQobuz(req DownloadRequest) (QobuzDownloadResult, error) {
 	}
 
 	metadata := Metadata{
-		Title:         track.Title,
-		Artist:        req.ArtistName,
-		Album:         albumName,
-		AlbumArtist:   req.AlbumArtist,
-		ArtistTagMode: req.ArtistTagMode,
-		Date:          releaseDate,
-		TrackNumber:   actualTrackNumber,
-		TotalTracks:   req.TotalTracks,
-		DiscNumber:    req.DiscNumber,
-		ISRC:          track.ISRC,
-		Genre:         req.Genre,
-		Label:         req.Label,
-		Copyright:     req.Copyright,
+		Title:       track.Title,
+		Artist:      track.Performer.Name,
+		Album:       albumName,
+		AlbumArtist: req.AlbumArtist,
+		Date:        releaseDate,
+		TrackNumber: actualTrackNumber,
+		TotalTracks: req.TotalTracks,
+		DiscNumber:  req.DiscNumber,
+		ISRC:        track.ISRC,
+		Genre:       req.Genre,
+		Label:       req.Label,
+		Copyright:   req.Copyright,
 	}
 
 	var coverData []byte
@@ -2861,15 +2386,6 @@ func downloadFromQobuz(req DownloadRequest) (QobuzDownloadResult, error) {
 		req.DiscNumber,
 	)
 
-	// Prefer the cover URL the frontend sent (user-selected album) over the
-	// track's default album cover returned by the Qobuz track/get API, which
-	// may belong to a different album when the same track appears on multiple
-	// releases.
-	resultCoverURL := strings.TrimSpace(req.CoverURL)
-	if resultCoverURL == "" {
-		resultCoverURL = strings.TrimSpace(qobuzTrackAlbumImage(track))
-	}
-
 	return QobuzDownloadResult{
 		FilePath:    outputPath,
 		BitDepth:    actualBitDepth,
@@ -2881,7 +2397,7 @@ func downloadFromQobuz(req DownloadRequest) (QobuzDownloadResult, error) {
 		TrackNumber: resultTrackNumber,
 		DiscNumber:  resultDiscNumber,
 		ISRC:        track.ISRC,
-		CoverURL:    resultCoverURL,
+		CoverURL:    strings.TrimSpace(qobuzTrackAlbumImage(track)),
 		LyricsLRC:   lyricsLRC,
 	}, nil
 }

go_backend/qobuz_test.go

@@ -5,21 +5,6 @@ import (
 	"testing"
 )
 
-func buildTestQobuzAlbum(id, title, artist string, tracks ...QobuzTrack) *qobuzAlbumDetails {
-	album := &qobuzAlbumDetails{
-		ID:                  id,
-		Title:               title,
-		ReleaseDateOriginal: "2013-05-20",
-		TracksCount:         len(tracks),
-		ProductType:         "album",
-		ReleaseType:         "album",
-	}
-	album.Artist = qobuzArtistRef{ID: 1, Name: artist}
-	album.Artists = []qobuzArtistRef{{ID: 1, Name: artist}}
-	album.Tracks.Items = tracks
-	return album
-}
-
 func TestParseQobuzURL(t *testing.T) {
 	tests := []struct {
 		name      string
@@ -201,6 +186,18 @@ func TestNormalizeQobuzQualityCode(t *testing.T) {
 	}
 }
 
+func TestGetQobuzDebugKey(t *testing.T) {
+	got := getQobuzDebugKey()
+	if len(got) != len(qobuzDebugKeyObfuscated) {
+		t.Fatalf("unexpected debug key length: %d", len(got))
+	}
+	for i := range got {
+		if got[i]^qobuzDebugKeyXORMask != qobuzDebugKeyObfuscated[i] {
+			t.Fatalf("unexpected debug key reconstruction at index %d", i)
+		}
+	}
+}
+
 func TestBuildQobuzMusicDLPayloadUsesOpenTrackURL(t *testing.T) {
 	payloadBytes, err := buildQobuzMusicDLPayload(374610875, "7")
 	if err != nil {
@@ -279,68 +276,6 @@ func testQobuzTrack(id int64, title, artist string, duration int) *QobuzTrack {
 	return track
 }
 
-func TestSelectQobuzTracksFromAlbumSearchResultsPrefersMatchingTrack(t *testing.T) {
-	summaries := []qobuzAlbumDetails{
-		{ID: "album-a"},
-		{ID: "album-b"},
-	}
-
-	match := *testQobuzTrack(1, "Get Lucky", "Daft Punk", 369)
-	other := *testQobuzTrack(2, "Fragments of Time", "Daft Punk", 280)
-	fallback := *testQobuzTrack(3, "Da Funk", "Daft Punk", 330)
-
-	albums := map[string]*qobuzAlbumDetails{
-		"album-a": buildTestQobuzAlbum("album-a", "Random Access Memories", "Daft Punk", match, other),
-		"album-b": buildTestQobuzAlbum("album-b", "Homework", "Daft Punk", fallback),
-	}
-
-	tracks, err := selectQobuzTracksFromAlbumSearchResults(
-		"daft punk get lucky",
-		3,
-		summaries,
-		func(id string) (*qobuzAlbumDetails, error) { return albums[id], nil },
-	)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if len(tracks) == 0 {
-		t.Fatal("expected tracks, got none")
-	}
-	if tracks[0].ID != 1 {
-		t.Fatalf("expected Get Lucky to rank first, got track id %d", tracks[0].ID)
-	}
-}
-
-func TestSelectQobuzTracksFromAlbumSearchResultsDedupesTracks(t *testing.T) {
-	summaries := []qobuzAlbumDetails{
-		{ID: "album-a"},
-		{ID: "album-b"},
-	}
-
-	shared := *testQobuzTrack(42, "Get Lucky", "Daft Punk", 369)
-
-	albums := map[string]*qobuzAlbumDetails{
-		"album-a": buildTestQobuzAlbum("album-a", "Random Access Memories", "Daft Punk", shared),
-		"album-b": buildTestQobuzAlbum("album-b", "Random Access Memories Deluxe", "Daft Punk", shared),
-	}
-
-	tracks, err := selectQobuzTracksFromAlbumSearchResults(
-		"daft punk get lucky",
-		5,
-		summaries,
-		func(id string) (*qobuzAlbumDetails, error) { return albums[id], nil },
-	)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if len(tracks) != 1 {
-		t.Fatalf("expected 1 deduped track, got %d", len(tracks))
-	}
-	if tracks[0].ID != 42 {
-		t.Fatalf("unexpected deduped track id: %d", tracks[0].ID)
-	}
-}
-
 func TestResolveQobuzTrackForRequestRejectsSongLinkMismatch(t *testing.T) {
 	origGetTrackByID := qobuzGetTrackByIDFunc
 	origSearchISRC := qobuzSearchTrackByISRCWithDurationFunc
@@ -501,20 +436,3 @@ func TestResolveQobuzTrackForRequestUsesPrefixedQobuzIDWithoutSongLink(t *testin
 		t.Fatalf("unexpected resolved track: %+v", track)
 	}
 }
-
-func TestQobuzTrackMatchesRequest_SongLinkBypassesArtistAndTitle(t *testing.T) {
-	req := DownloadRequest{
-		TrackName:  "Ringišpil",
-		ArtistName: "Djordje Balasevic",
-	}
-
-	track := &QobuzTrack{
-		Title:    "Different Title",
-		Duration: 0,
-	}
-	track.Performer.Name = "Different Artist"
-
-	if !qobuzTrackMatchesRequest(req, track, "Qobuz", "SongLink Qobuz ID", true) {
-		t.Fatal("expected SongLink Qobuz source to bypass artist/title verification")
-	}
-}

go_backend/romaji.go

@@ -16,13 +16,16 @@ var hiraganaToRomaji = map[rune]string{
 	'や': "ya", 'ゆ': "yu", 'よ': "yo",
 	'ら': "ra", 'り': "ri", 'る': "ru", 'れ': "re", 'ろ': "ro",
 	'わ': "wa", 'を': "wo", 'ん': "n",
+	// Dakuten (voiced)
 	'が': "ga", 'ぎ': "gi", 'ぐ': "gu", 'げ': "ge", 'ご': "go",
 	'ざ': "za", 'じ': "ji", 'ず': "zu", 'ぜ': "ze", 'ぞ': "zo",
 	'だ': "da", 'ぢ': "ji", 'づ': "zu", 'で': "de", 'ど': "do",
 	'ば': "ba", 'び': "bi", 'ぶ': "bu", 'べ': "be", 'ぼ': "bo",
+	// Handakuten (semi-voiced)
 	'ぱ': "pa", 'ぴ': "pi", 'ぷ': "pu", 'ぺ': "pe", 'ぽ': "po",
+	// Small characters
 	'ゃ': "ya", 'ゅ': "yu", 'ょ': "yo",
-	'っ': "",
+	'っ': "", // Double consonant marker
 	'ぁ': "a", 'ぃ': "i", 'ぅ': "u", 'ぇ': "e", 'ぉ': "o",
 }
 
@@ -37,15 +40,19 @@ var katakanaToRomaji = map[rune]string{
 	'ヤ': "ya", 'ユ': "yu", 'ヨ': "yo",
 	'ラ': "ra", 'リ': "ri", 'ル': "ru", 'レ': "re", 'ロ': "ro",
 	'ワ': "wa", 'ヲ': "wo", 'ン': "n",
+	// Dakuten (voiced)
 	'ガ': "ga", 'ギ': "gi", 'グ': "gu", 'ゲ': "ge", 'ゴ': "go",
 	'ザ': "za", 'ジ': "ji", 'ズ': "zu", 'ゼ': "ze", 'ゾ': "zo",
 	'ダ': "da", 'ヂ': "ji", 'ヅ': "zu", 'デ': "de", 'ド': "do",
 	'バ': "ba", 'ビ': "bi", 'ブ': "bu", 'ベ': "be", 'ボ': "bo",
+	// Handakuten (semi-voiced)
 	'パ': "pa", 'ピ': "pi", 'プ': "pu", 'ペ': "pe", 'ポ': "po",
+	// Small characters
 	'ャ': "ya", 'ュ': "yu", 'ョ': "yo",
-	'ッ': "",
+	'ッ': "", // Double consonant marker
 	'ァ': "a", 'ィ': "i", 'ゥ': "u", 'ェ': "e", 'ォ': "o",
-	'ー': "",
+	// Extended katakana
+	'ー': "", // Long vowel mark
 	'ヴ': "vu",
 }
 
@@ -75,6 +82,7 @@ var combinationKatakana = map[string]string{
 	"ジャ": "ja", "ジュ": "ju", "ジョ": "jo",
 	"ビャ": "bya", "ビュ": "byu", "ビョ": "byo",
 	"ピャ": "pya", "ピュ": "pyu", "ピョ": "pyo",
+	// Extended combinations
 	"ティ": "ti", "ディ": "di", "トゥ": "tu", "ドゥ": "du",
 	"ファ": "fa", "フィ": "fi", "フェ": "fe", "フォ": "fo",
 	"ウィ": "wi", "ウェ": "we", "ウォ": "wo",
@@ -112,6 +120,7 @@ func JapaneseToRomaji(text string) string {
 	i := 0
 
 	for i < len(runes) {
+		// Check for っ/ッ (double consonant)
 		if i < len(runes)-1 && (runes[i] == 'っ' || runes[i] == 'ッ') {
 			nextRomaji := ""
 			if romaji, ok := hiraganaToRomaji[runes[i+1]]; ok {
@@ -120,12 +129,13 @@ func JapaneseToRomaji(text string) string {
 				nextRomaji = romaji
 			}
 			if len(nextRomaji) > 0 {
-				result.WriteByte(nextRomaji[0])
+				result.WriteByte(nextRomaji[0]) // Double the first consonant
 			}
 			i++
 			continue
 		}
 
+		// Check for two-character combinations
 		if i < len(runes)-1 {
 			combo := string(runes[i : i+2])
 			if romaji, ok := combinationHiragana[combo]; ok {
@@ -140,14 +150,17 @@ func JapaneseToRomaji(text string) string {
 			}
 		}
 
+		// Single character conversion
 		r := runes[i]
 		if romaji, ok := hiraganaToRomaji[r]; ok {
 			result.WriteString(romaji)
 		} else if romaji, ok := katakanaToRomaji[r]; ok {
 			result.WriteString(romaji)
 		} else if isKanji(r) {
+			// Keep kanji as-is (would need dictionary for proper conversion)
 			result.WriteRune(r)
 		} else {
+			// Keep other characters (punctuation, spaces, etc.)
 			result.WriteRune(r)
 		}
 		i++

go_backend/songlink.go

@@ -87,210 +87,38 @@ func GetSongLinkRegion() string {
 	return region
 }
 
-const resolveAPIURL = "https://api.zarz.moe/v1/resolve"
-
 func songLinkBaseURL() string {
+	opts := GetNetworkCompatibilityOptions()
+	if opts.AllowHTTP {
+		return "http://api.song.link/v1-alpha.1/links"
+	}
 	return "https://api.song.link/v1-alpha.1/links"
 }
 
-// resolveTrackPlatforms resolves a music URL to all platforms.
-// Spotify URLs use the resolve API; if that fails, falls back to SongLink.
-// All other URLs go directly to SongLink.
-func (s *SongLinkClient) resolveTrackPlatforms(inputURL string) (map[string]songLinkPlatformLink, error) {
-	if isSpotifyURL(inputURL) {
-		payload, err := json.Marshal(map[string]string{"url": inputURL})
-		if err != nil {
-			return nil, fmt.Errorf("failed to encode resolve request: %w", err)
-		}
-		links, err := s.doResolveRequest(payload)
-		if err == nil {
-			return links, nil
-		}
-		GoLog("[SongLink] Resolve proxy failed for %s: %v, falling back to SongLink", inputURL, err)
-		return s.songLinkByTargetURL(inputURL)
+func buildSongLinkURLFromTarget(targetURL string, userCountry string) string {
+	if userCountry == "" {
+		userCountry = GetSongLinkRegion()
 	}
-	return s.songLinkByTargetURL(inputURL)
+	apiURL := fmt.Sprintf("%s?url=%s", songLinkBaseURL(), url.QueryEscape(targetURL))
+	if userCountry != "" {
+		apiURL = fmt.Sprintf("%s&userCountry=%s", apiURL, url.QueryEscape(userCountry))
+	}
+	return apiURL
 }
 
-// resolveTrackPlatformsByPlatform resolves using platform + type + id.
-// Spotify uses the resolve API with SongLink fallback; all other platforms use SongLink directly.
-func (s *SongLinkClient) resolveTrackPlatformsByPlatform(platform, entityType, entityID string) (map[string]songLinkPlatformLink, error) {
-	if strings.EqualFold(platform, "spotify") {
-		payload, err := json.Marshal(map[string]string{
-			"platform": platform,
-			"type":     entityType,
-			"id":       entityID,
-		})
-		if err != nil {
-			return nil, fmt.Errorf("failed to encode resolve request: %w", err)
-		}
-		links, err := s.doResolveRequest(payload)
-		if err == nil {
-			return links, nil
-		}
-		GoLog("[SongLink] Resolve proxy failed for %s/%s/%s: %v, falling back to SongLink", platform, entityType, entityID, err)
-		return s.songLinkByPlatform(platform, entityType, entityID)
+func buildSongLinkURLByPlatform(platform, entityType, entityID, userCountry string) string {
+	if userCountry == "" {
+		userCountry = GetSongLinkRegion()
 	}
-	return s.songLinkByPlatform(platform, entityType, entityID)
-}
-
-func isSpotifyURL(u string) bool {
-	lower := strings.ToLower(u)
-	return strings.Contains(lower, "spotify.com/") || strings.Contains(lower, "spotify:")
-}
-
-// doResolveRequest sends a JSON payload to the resolve API (api.zarz.moe)
-// and parses the response into a platform link map.
-func (s *SongLinkClient) doResolveRequest(payload []byte) (map[string]songLinkPlatformLink, error) {
-	req, err := http.NewRequest("POST", resolveAPIURL, bytes.NewReader(payload))
-	if err != nil {
-		return nil, fmt.Errorf("failed to create resolve request: %w", err)
-	}
-	req.Header.Set("Content-Type", "application/json")
-
-	resp, err := s.client.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("resolve API request failed: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("resolve API returned status %d", resp.StatusCode)
-	}
-
-	body, err := ReadResponseBody(resp)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read resolve response: %w", err)
-	}
-
-	var resolveResp struct {
-		Success  bool                           `json:"success"`
-		ISRC     string                         `json:"isrc"`
-		SongUrls map[string]json.RawMessage     `json:"songUrls"`
-	}
-	if err := json.Unmarshal(body, &resolveResp); err != nil {
-		return nil, fmt.Errorf("failed to decode resolve response: %w", err)
-	}
-	if !resolveResp.Success {
-		return nil, fmt.Errorf("resolve API returned success=false")
-	}
-
-	keyMap := map[string]string{
-		"Spotify":      "spotify",
-		"Deezer":       "deezer",
-		"Tidal":        "tidal",
-		"YouTubeMusic": "youtubeMusic",
-		"YouTube":      "youtube",
-		"AmazonMusic":  "amazonMusic",
-		"Qobuz":        "qobuz",
-		"AppleMusic":   "appleMusic",
-	}
-
-	links := make(map[string]songLinkPlatformLink)
-	for resolveKey, platformKey := range keyMap {
-		rawValue, ok := resolveResp.SongUrls[resolveKey]
-		if !ok {
-			continue
-		}
-		if u := extractResolveURLValue(rawValue); u != "" {
-			links[platformKey] = songLinkPlatformLink{URL: u}
-		}
-	}
-
-	if len(links) == 0 {
-		return nil, fmt.Errorf("resolve API returned no platform links")
-	}
-
-	return links, nil
-}
-
-func extractResolveURLValue(raw json.RawMessage) string {
-	trimmed := bytes.TrimSpace(raw)
-	if len(trimmed) == 0 || bytes.Equal(trimmed, []byte("null")) {
-		return ""
-	}
-
-	var direct string
-	if err := json.Unmarshal(trimmed, &direct); err == nil {
-		return strings.TrimSpace(direct)
-	}
-
-	var list []string
-	if err := json.Unmarshal(trimmed, &list); err == nil {
-		for _, candidate := range list {
-			if cleaned := strings.TrimSpace(candidate); cleaned != "" {
-				return cleaned
-			}
-		}
-	}
-
-	return ""
-}
-
-// songLinkByTargetURL calls the SongLink API with a target URL (for non-Spotify URLs).
-func (s *SongLinkClient) songLinkByTargetURL(targetURL string) (map[string]songLinkPlatformLink, error) {
-	songLinkRateLimiter.WaitForSlot()
-
-	apiURL := fmt.Sprintf("%s?url=%s&userCountry=%s",
-		songLinkBaseURL(),
-		url.QueryEscape(targetURL),
-		url.QueryEscape(GetSongLinkRegion()))
-
-	return s.doSongLinkRequest(apiURL)
-}
-
-// songLinkByPlatform calls the SongLink API with platform + type + id (for non-Spotify platforms).
-func (s *SongLinkClient) songLinkByPlatform(platform, entityType, entityID string) (map[string]songLinkPlatformLink, error) {
-	songLinkRateLimiter.WaitForSlot()
-
-	apiURL := fmt.Sprintf("%s?platform=%s&type=%s&id=%s&userCountry=%s",
+	apiURL := fmt.Sprintf("%s?platform=%s&type=%s&id=%s",
 		songLinkBaseURL(),
 		url.QueryEscape(platform),
 		url.QueryEscape(entityType),
-		url.QueryEscape(entityID),
-		url.QueryEscape(GetSongLinkRegion()))
-
-	return s.doSongLinkRequest(apiURL)
-}
-
-// doSongLinkRequest calls the SongLink API and parses the response.
-func (s *SongLinkClient) doSongLinkRequest(apiURL string) (map[string]songLinkPlatformLink, error) {
-	req, err := http.NewRequest("GET", apiURL, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create SongLink request: %w", err)
+		url.QueryEscape(entityID))
+	if userCountry != "" {
+		apiURL = fmt.Sprintf("%s&userCountry=%s", apiURL, url.QueryEscape(userCountry))
 	}
-
-	retryConfig := songLinkRetryConfig()
-	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
-	if err != nil {
-		return nil, fmt.Errorf("SongLink request failed: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode == 429 {
-		return nil, fmt.Errorf("SongLink rate limit exceeded")
-	}
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("SongLink returned status %d", resp.StatusCode)
-	}
-
-	body, err := ReadResponseBody(resp)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read SongLink response: %w", err)
-	}
-
-	var songLinkResp struct {
-		LinksByPlatform map[string]songLinkPlatformLink `json:"linksByPlatform"`
-	}
-	if err := json.Unmarshal(body, &songLinkResp); err != nil {
-		return nil, fmt.Errorf("failed to decode SongLink response: %w", err)
-	}
-
-	if len(songLinkResp.LinksByPlatform) == 0 {
-		return nil, fmt.Errorf("SongLink returned no platform links")
-	}
-
-	return songLinkResp.LinksByPlatform, nil
+	return apiURL
 }
 
 func (s *SongLinkClient) CheckTrackAvailability(spotifyTrackID string, isrc string) (*TrackAvailability, error) {
@@ -308,12 +136,145 @@ func (s *SongLinkClient) CheckTrackAvailability(spotifyTrackID string, isrc stri
 }
 
 func (s *SongLinkClient) checkTrackAvailabilityFromSpotify(spotifyTrackID string) (*TrackAvailability, error) {
-	spotifyURL := fmt.Sprintf("https://open.spotify.com/track/%s", spotifyTrackID)
-	links, err := s.resolveTrackPlatforms(spotifyURL)
-	if err != nil {
-		return nil, fmt.Errorf("resolve proxy failed for Spotify %s: %w", spotifyTrackID, err)
+	availability, pageErr := s.checkTrackAvailabilityFromSpotifyPage(spotifyTrackID)
+	if pageErr == nil {
+		return availability, nil
 	}
-	return buildTrackAvailabilityFromSongLinkLinks(spotifyTrackID, links), 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, "")
+
+	req, err := http.NewRequest("GET", apiURL, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+
+	retryConfig := songLinkRetryConfig()
+	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
+	if err != nil {
+		return nil, fmt.Errorf("song.link page lookup failed: %w; SongLink API lookup failed: %w", pageErr, err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 400 {
+		return nil, fmt.Errorf("track not found on SongLink (invalid Spotify ID or track unavailable)")
+	}
+	if resp.StatusCode == 404 {
+		return nil, fmt.Errorf("track not found on any streaming platform")
+	}
+	if resp.StatusCode == 429 {
+		return nil, fmt.Errorf("song.link page lookup failed: %w; SongLink API rate limit exceeded", pageErr)
+	}
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("song.link page lookup failed: %w; SongLink API returned status %d", pageErr, resp.StatusCode)
+	}
+
+	body, err := ReadResponseBody(resp)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read response: %w", err)
+	}
+
+	var songLinkResp struct {
+		LinksByPlatform map[string]songLinkPlatformLink `json:"linksByPlatform"`
+	}
+
+	if err := json.Unmarshal(body, &songLinkResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	LogWarn("SongLink", "Spotify %s resolved via SongLink API after song.link page failure: %v", spotifyTrackID, pageErr)
+	return buildTrackAvailabilityFromSongLinkLinks(spotifyTrackID, songLinkResp.LinksByPlatform), nil
+}
+
+func (s *SongLinkClient) checkTrackAvailabilityFromSpotifyPage(spotifyTrackID string) (*TrackAvailability, error) {
+	pageURL := fmt.Sprintf("https://song.link/s/%s", spotifyTrackID)
+	req, err := http.NewRequest("GET", pageURL, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create song.link page request: %w", err)
+	}
+
+	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)
+	}
+
+	body, err := ReadResponseBody(resp)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read song.link page: %w", err)
+	}
+
+	nextDataJSON, err := extractSongLinkNextDataJSON(body)
+	if err != nil {
+		return nil, err
+	}
+
+	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)
+	}
+
+	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}
+		}
+	}
+
+	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) {
@@ -508,6 +469,8 @@ func extractYouTubeIDFromURL(youtubeURL string) string {
 	return ""
 }
 
+// isNumeric is defined in library_scan.go
+
 func (s *SongLinkClient) GetDeezerIDFromSpotify(spotifyTrackID string) (string, error) {
 	availability, err := s.CheckTrackAvailability(spotifyTrackID, "")
 	if err != nil {
@@ -542,17 +505,47 @@ type AlbumAvailability struct {
 }
 
 func (s *SongLinkClient) CheckAlbumAvailability(spotifyAlbumID string) (*AlbumAvailability, error) {
+	songLinkRateLimiter.WaitForSlot()
+
 	spotifyURL := fmt.Sprintf("https://open.spotify.com/album/%s", spotifyAlbumID)
-	links, err := s.resolveTrackPlatforms(spotifyURL)
+	apiURL := buildSongLinkURLFromTarget(spotifyURL, "")
+
+	req, err := http.NewRequest("GET", apiURL, nil)
 	if err != nil {
-		return nil, fmt.Errorf("resolve proxy failed for album %s: %w", spotifyAlbumID, err)
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+
+	retryConfig := songLinkRetryConfig()
+	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to check album availability: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("API returned status %d", resp.StatusCode)
+	}
+
+	body, err := ReadResponseBody(resp)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read response: %w", err)
+	}
+
+	var songLinkResp struct {
+		LinksByPlatform map[string]struct {
+			URL string `json:"url"`
+		} `json:"linksByPlatform"`
+	}
+
+	if err := json.Unmarshal(body, &songLinkResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
 	}
 
 	availability := &AlbumAvailability{
 		SpotifyID: spotifyAlbumID,
 	}
 
-	if deezerLink, ok := links["deezer"]; ok && deezerLink.URL != "" {
+	if deezerLink, ok := songLinkResp.LinksByPlatform["deezer"]; ok && deezerLink.URL != "" {
 		availability.Deezer = true
 		availability.DeezerURL = deezerLink.URL
 		availability.DeezerID = extractDeezerIDFromURL(deezerLink.URL)
@@ -595,19 +588,101 @@ func (s *SongLinkClient) CheckAvailabilityFromDeezer(deezerTrackID string) (*Tra
 }
 
 func (s *SongLinkClient) checkAvailabilityFromDeezerSongLink(deezerTrackID string) (*TrackAvailability, error) {
+	songLinkRateLimiter.WaitForSlot()
+
 	deezerURL := fmt.Sprintf("https://www.deezer.com/track/%s", deezerTrackID)
-	links, err := s.resolveTrackPlatforms(deezerURL)
+	apiURL := buildSongLinkURLFromTarget(deezerURL, "")
+
+	req, err := http.NewRequest("GET", apiURL, nil)
 	if err != nil {
-		return nil, fmt.Errorf("resolve failed for Deezer %s: %w", deezerTrackID, err)
+		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	availability := buildTrackAvailabilityFromSongLinkLinks("", links)
-	// Ensure Deezer is always marked available since we started from a Deezer URL
-	availability.Deezer = true
-	availability.DeezerID = deezerTrackID
-	if availability.DeezerURL == "" {
-		availability.DeezerURL = deezerURL
+	retryConfig := songLinkRetryConfig()
+	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to check availability: %w", err)
 	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 400 {
+		return nil, fmt.Errorf("track not found on SongLink (invalid Deezer ID)")
+	}
+	if resp.StatusCode == 404 {
+		return nil, fmt.Errorf("track not found on any streaming platform")
+	}
+	if resp.StatusCode == 429 {
+		return nil, fmt.Errorf("SongLink rate limit exceeded")
+	}
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("SongLink API returned status %d", resp.StatusCode)
+	}
+
+	body, err := ReadResponseBody(resp)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read response: %w", err)
+	}
+
+	var songLinkResp struct {
+		LinksByPlatform map[string]struct {
+			URL string `json:"url"`
+		} `json:"linksByPlatform"`
+		EntitiesByUniqueId map[string]struct {
+			ID         string `json:"id"`
+			Type       string `json:"type"`
+			Title      string `json:"title"`
+			ArtistName string `json:"artistName"`
+		} `json:"entitiesByUniqueId"`
+	}
+
+	if err := json.Unmarshal(body, &songLinkResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	availability := &TrackAvailability{
+		Deezer:   true,
+		DeezerID: deezerTrackID,
+	}
+
+	if spotifyLink, ok := songLinkResp.LinksByPlatform["spotify"]; ok && spotifyLink.URL != "" {
+		availability.SpotifyID = extractSpotifyIDFromURL(spotifyLink.URL)
+	}
+
+	if tidalLink, ok := songLinkResp.LinksByPlatform["tidal"]; ok && tidalLink.URL != "" {
+		availability.Tidal = true
+		availability.TidalURL = tidalLink.URL
+		availability.TidalID = extractTidalIDFromURL(tidalLink.URL)
+	}
+
+	if amazonLink, ok := songLinkResp.LinksByPlatform["amazonMusic"]; ok && amazonLink.URL != "" {
+		availability.Amazon = true
+		availability.AmazonURL = amazonLink.URL
+	}
+
+	if qobuzLink, ok := songLinkResp.LinksByPlatform["qobuz"]; ok && qobuzLink.URL != "" {
+		availability.Qobuz = true
+		availability.QobuzURL = qobuzLink.URL
+		availability.QobuzID = extractQobuzIDFromURL(qobuzLink.URL)
+	}
+
+	if deezerLink, ok := songLinkResp.LinksByPlatform["deezer"]; ok && deezerLink.URL != "" {
+		availability.DeezerURL = deezerLink.URL
+	}
+
+	// Prefer youtubeMusic URLs — they are usually closer to music catalog matches.
+	if ytMusicLink, ok := songLinkResp.LinksByPlatform["youtubeMusic"]; ok && ytMusicLink.URL != "" {
+		availability.YouTube = true
+		availability.YouTubeURL = ytMusicLink.URL
+		availability.YouTubeID = extractYouTubeIDFromURL(ytMusicLink.URL)
+	}
+	if !availability.YouTube {
+		if youtubeLink, ok := songLinkResp.LinksByPlatform["youtube"]; ok && youtubeLink.URL != "" {
+			availability.YouTube = true
+			availability.YouTubeURL = youtubeLink.URL
+			availability.YouTubeID = extractYouTubeIDFromURL(youtubeLink.URL)
+		}
+	}
+
 	return availability, nil
 }
 
@@ -619,12 +694,94 @@ func (s *SongLinkClient) CheckAvailabilityByPlatform(platform, entityType, entit
 		return nil, fmt.Errorf("%s ID is empty", platform)
 	}
 
-	links, err := s.resolveTrackPlatformsByPlatform(platform, entityType, entityID)
+	songLinkRateLimiter.WaitForSlot()
+
+	apiURL := buildSongLinkURLByPlatform(platform, entityType, entityID, "")
+
+	req, err := http.NewRequest("GET", apiURL, nil)
 	if err != nil {
-		return nil, fmt.Errorf("resolve failed for %s %s: %w", platform, entityID, err)
+		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	return buildTrackAvailabilityFromSongLinkLinks("", links), nil
+	retryConfig := songLinkRetryConfig()
+	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to check availability: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 400 {
+		return nil, fmt.Errorf("track not found on SongLink (invalid %s ID)", platform)
+	}
+	if resp.StatusCode == 404 {
+		return nil, fmt.Errorf("track not found on any streaming platform")
+	}
+	if resp.StatusCode == 429 {
+		return nil, fmt.Errorf("SongLink rate limit exceeded")
+	}
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("SongLink API returned status %d", resp.StatusCode)
+	}
+
+	body, err := ReadResponseBody(resp)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read response: %w", err)
+	}
+
+	var songLinkResp struct {
+		LinksByPlatform map[string]struct {
+			URL string `json:"url"`
+		} `json:"linksByPlatform"`
+	}
+
+	if err := json.Unmarshal(body, &songLinkResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	availability := &TrackAvailability{}
+
+	if spotifyLink, ok := songLinkResp.LinksByPlatform["spotify"]; ok && spotifyLink.URL != "" {
+		availability.SpotifyID = extractSpotifyIDFromURL(spotifyLink.URL)
+	}
+
+	if tidalLink, ok := songLinkResp.LinksByPlatform["tidal"]; ok && tidalLink.URL != "" {
+		availability.Tidal = true
+		availability.TidalURL = tidalLink.URL
+		availability.TidalID = extractTidalIDFromURL(tidalLink.URL)
+	}
+
+	if amazonLink, ok := songLinkResp.LinksByPlatform["amazonMusic"]; ok && amazonLink.URL != "" {
+		availability.Amazon = true
+		availability.AmazonURL = amazonLink.URL
+	}
+
+	if qobuzLink, ok := songLinkResp.LinksByPlatform["qobuz"]; ok && qobuzLink.URL != "" {
+		availability.Qobuz = true
+		availability.QobuzURL = qobuzLink.URL
+		availability.QobuzID = extractQobuzIDFromURL(qobuzLink.URL)
+	}
+
+	if deezerLink, ok := songLinkResp.LinksByPlatform["deezer"]; ok && deezerLink.URL != "" {
+		availability.Deezer = true
+		availability.DeezerURL = deezerLink.URL
+		availability.DeezerID = extractDeezerIDFromURL(deezerLink.URL)
+	}
+
+	// Prefer youtubeMusic URLs — they are usually closer to music catalog matches.
+	if ytMusicLink, ok := songLinkResp.LinksByPlatform["youtubeMusic"]; ok && ytMusicLink.URL != "" {
+		availability.YouTube = true
+		availability.YouTubeURL = ytMusicLink.URL
+		availability.YouTubeID = extractYouTubeIDFromURL(ytMusicLink.URL)
+	}
+	if !availability.YouTube {
+		if youtubeLink, ok := songLinkResp.LinksByPlatform["youtube"]; ok && youtubeLink.URL != "" {
+			availability.YouTube = true
+			availability.YouTubeURL = youtubeLink.URL
+			availability.YouTubeID = extractYouTubeIDFromURL(youtubeLink.URL)
+		}
+	}
+
+	return availability, nil
 }
 
 func buildTrackAvailabilityFromSongLinkLinks(spotifyTrackID string, links map[string]songLinkPlatformLink) *TrackAvailability {
@@ -737,10 +894,85 @@ func (s *SongLinkClient) GetYouTubeURLFromDeezer(deezerTrackID string) (string,
 }
 
 func (s *SongLinkClient) CheckAvailabilityFromURL(inputURL string) (*TrackAvailability, error) {
-	links, err := s.resolveTrackPlatforms(inputURL)
+	songLinkRateLimiter.WaitForSlot()
+
+	apiURL := buildSongLinkURLFromTarget(inputURL, "")
+
+	req, err := http.NewRequest("GET", apiURL, nil)
 	if err != nil {
-		return nil, fmt.Errorf("resolve failed for URL %s: %w", inputURL, err)
+		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	return buildTrackAvailabilityFromSongLinkLinks("", links), nil
+	retryConfig := songLinkRetryConfig()
+	resp, err := DoRequestWithRetry(s.client, req, retryConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to check availability: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 400 || resp.StatusCode == 404 {
+		return nil, fmt.Errorf("track not found on SongLink")
+	}
+	if resp.StatusCode == 429 {
+		return nil, fmt.Errorf("SongLink rate limit exceeded")
+	}
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("SongLink API returned status %d", resp.StatusCode)
+	}
+
+	body, err := ReadResponseBody(resp)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read response: %w", err)
+	}
+
+	var songLinkResp struct {
+		LinksByPlatform map[string]struct {
+			URL      string `json:"url"`
+			EntityID string `json:"entityUniqueId"`
+		} `json:"linksByPlatform"`
+	}
+
+	if err := json.Unmarshal(body, &songLinkResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	availability := &TrackAvailability{}
+
+	if spotifyLink, ok := songLinkResp.LinksByPlatform["spotify"]; ok && spotifyLink.URL != "" {
+		availability.SpotifyID = extractSpotifyIDFromURL(spotifyLink.URL)
+	}
+	if tidalLink, ok := songLinkResp.LinksByPlatform["tidal"]; ok && tidalLink.URL != "" {
+		availability.Tidal = true
+		availability.TidalURL = tidalLink.URL
+		availability.TidalID = extractTidalIDFromURL(tidalLink.URL)
+	}
+	if amazonLink, ok := songLinkResp.LinksByPlatform["amazonMusic"]; ok && amazonLink.URL != "" {
+		availability.Amazon = true
+		availability.AmazonURL = amazonLink.URL
+	}
+	if qobuzLink, ok := songLinkResp.LinksByPlatform["qobuz"]; ok && qobuzLink.URL != "" {
+		availability.Qobuz = true
+		availability.QobuzURL = qobuzLink.URL
+		availability.QobuzID = extractQobuzIDFromURL(qobuzLink.URL)
+	}
+	if deezerLink, ok := songLinkResp.LinksByPlatform["deezer"]; ok && deezerLink.URL != "" {
+		availability.Deezer = true
+		availability.DeezerURL = deezerLink.URL
+		availability.DeezerID = extractDeezerIDFromURL(deezerLink.URL)
+	}
+	// Prefer youtubeMusic URLs — they are usually closer to music catalog matches.
+	if ytMusicLink, ok := songLinkResp.LinksByPlatform["youtubeMusic"]; ok && ytMusicLink.URL != "" {
+		availability.YouTube = true
+		availability.YouTubeURL = ytMusicLink.URL
+		availability.YouTubeID = extractYouTubeIDFromURL(ytMusicLink.URL)
+	}
+	if !availability.YouTube {
+		if youtubeLink, ok := songLinkResp.LinksByPlatform["youtube"]; ok && youtubeLink.URL != "" {
+			availability.YouTube = true
+			availability.YouTubeURL = youtubeLink.URL
+			availability.YouTubeID = extractYouTubeIDFromURL(youtubeLink.URL)
+		}
+	}
+
+	return availability, nil
 }

go_backend/songlink_test.go

@@ -23,24 +23,26 @@ func TestGetRetryAfterDurationMissingHeaderReturnsZero(t *testing.T) {
 	}
 }
 
-func TestCheckTrackAvailabilityFromSpotifyViaResolveAPI(t *testing.T) {
-	origRetryConfig := songLinkRetryConfig
-	defer func() { songLinkRetryConfig = origRetryConfig }()
-
+func TestCheckTrackAvailabilityFromSpotifyPrefersSongLinkPage(t *testing.T) {
 	client := &SongLinkClient{
 		client: &http.Client{
 			Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
-				if req.URL.Host == "api.zarz.moe" && req.URL.Path == "/v1/resolve" && req.Method == "POST" {
-					body := `{"success":true,"isrc":"USRC12345678","songUrls":{"Spotify":"https://open.spotify.com/track/testspotifyid","Deezer":"https://www.deezer.com/track/908604612","AmazonMusic":"https://music.amazon.com/albums/B086Q2QNLH?trackAsin=B086Q41M9C","Tidal":"https://listen.tidal.com/track/134858527","Qobuz":"https://open.qobuz.com/track/195125822","YouTubeMusic":"https://music.youtube.com/watch?v=testvideoid1"}}`
+				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
 				}
-				t.Fatalf("unexpected request: %s %s", req.Method, req.URL.String())
-				return nil, nil
 			}),
 		},
 	}
@@ -64,136 +66,62 @@ func TestCheckTrackAvailabilityFromSpotifyViaResolveAPI(t *testing.T) {
 	}
 }
 
-func TestCheckTrackAvailabilityFromSpotifyResolveAPIFailure(t *testing.T) {
+func TestCheckTrackAvailabilityFromSpotifyFallsBackToAPIWhenPageFails(t *testing.T) {
 	origRetryConfig := songLinkRetryConfig
 	songLinkRetryConfig = func() RetryConfig {
-		return RetryConfig{MaxRetries: 0, InitialDelay: 0, MaxDelay: 0, BackoffFactor: 1}
+		return RetryConfig{
+			MaxRetries:    0,
+			InitialDelay:  0,
+			MaxDelay:      0,
+			BackoffFactor: 1,
+		}
 	}
-	defer func() { songLinkRetryConfig = origRetryConfig }()
-
-	var hitSongLink bool
+	defer func() {
+		songLinkRetryConfig = origRetryConfig
+	}()
 
 	client := &SongLinkClient{
 		client: &http.Client{
 			Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
-				// Resolve proxy returns 500
-				if req.URL.Host == "api.zarz.moe" && req.URL.Path == "/v1/resolve" {
+				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("internal error")),
+						Body:       io.NopCloser(strings.NewReader("page failure")),
 						Request:    req,
 					}, nil
-				}
-				// SongLink fallback should be called
-				if req.URL.Host == "api.song.link" {
-					hitSongLink = true
-					body := `{"linksByPlatform":{"spotify":{"url":"https://open.spotify.com/track/testspotifyid"},"deezer":{"url":"https://www.deezer.com/track/908604612"},"tidal":{"url":"https://listen.tidal.com/track/134858527"}}}`
+				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
 				}
-				t.Fatalf("unexpected request: %s %s", req.Method, req.URL.String())
-				return nil, nil
 			}),
 		},
 	}
 
 	availability, err := client.CheckTrackAvailability("testspotifyid", "")
-	if err != nil {
-		t.Fatalf("expected SongLink fallback to succeed, got error: %v", err)
-	}
-	if !hitSongLink {
-		t.Fatal("expected fallback request to SongLink API, but it was never called")
-	}
-	if !availability.Deezer || availability.DeezerID != "908604612" {
-		t.Fatalf("Deezer availability via fallback = %+v, want DeezerID 908604612", availability)
-	}
-}
-
-func TestCheckTrackAvailabilityFromSpotifyViaResolveAPIMixedSongURLShapes(t *testing.T) {
-	origRetryConfig := songLinkRetryConfig
-	defer func() { songLinkRetryConfig = origRetryConfig }()
-
-	client := &SongLinkClient{
-		client: &http.Client{
-			Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {
-				if req.URL.Host == "api.zarz.moe" && req.URL.Path == "/v1/resolve" && req.Method == "POST" {
-					body := `{"success":true,"isrc":"TCAHA2367688","songUrls":{"Spotify":"https://open.spotify.com/track/5glgyj6zH0irbNGfukHacv","Deezer":"https://www.deezer.com/track/2248583177","Tidal":"https://tidal.com/browse/track/290565315","AppleMusic":"https://geo.music.apple.com/us/album/example?i=1","YouTubeMusic":null,"YouTube":"https://www.youtube.com/watch?v=wD_e59XUNdQ","AmazonMusic":"https://music.amazon.com/tracks/B0C35TG38Y/?ref=dm_ff_amazonmusic_3p","Beatport":null,"BeatSource":null,"SoundCloud":null,"Qobuz":null,"Other":[]}}`
-					return &http.Response{
-						StatusCode: 200,
-						Header:     make(http.Header),
-						Body:       io.NopCloser(strings.NewReader(body)),
-						Request:    req,
-					}, nil
-				}
-				t.Fatalf("unexpected request: %s %s", req.Method, req.URL.String())
-				return nil, nil
-			}),
-		},
-	}
-
-	availability, err := client.CheckTrackAvailability("5glgyj6zH0irbNGfukHacv", "")
 	if err != nil {
 		t.Fatalf("CheckTrackAvailability() error = %v", err)
 	}
 
-	if availability.SpotifyID != "5glgyj6zH0irbNGfukHacv" {
-		t.Fatalf("SpotifyID = %q, want %q", availability.SpotifyID, "5glgyj6zH0irbNGfukHacv")
+	if availability.SpotifyID != "testspotifyid" {
+		t.Fatalf("SpotifyID = %q, want %q", availability.SpotifyID, "testspotifyid")
 	}
-	if !availability.Deezer || availability.DeezerID != "2248583177" {
-		t.Fatalf("Deezer availability = %+v, want DeezerID 2248583177", availability)
-	}
-	if !availability.Tidal || availability.TidalID != "290565315" {
-		t.Fatalf("Tidal availability = %+v, want TidalID 290565315", availability)
-	}
-	if availability.Qobuz {
-		t.Fatalf("Qobuz should remain false when resolve response contains null, got %+v", availability)
-	}
-}
-
-func TestCheckAvailabilityFromDeezerUsesSongLink(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) {
-				// Non-Spotify should go to SongLink, not resolve API
-				if req.URL.Host == "api.zarz.moe" {
-					t.Fatalf("non-Spotify URL should not hit resolve API, got: %s", req.URL.String())
-					return nil, nil
-				}
-				if req.URL.Host == "api.song.link" {
-					body := `{"linksByPlatform":{"spotify":{"url":"https://open.spotify.com/track/testid"},"deezer":{"url":"https://www.deezer.com/track/908604612"},"tidal":{"url":"https://listen.tidal.com/track/134858527"},"qobuz":{"url":"https://open.qobuz.com/track/195125822"},"youtubeMusic":{"url":"https://music.youtube.com/watch?v=testvid"}}}`
-					return &http.Response{
-						StatusCode: 200,
-						Header:     make(http.Header),
-						Body:       io.NopCloser(strings.NewReader(body)),
-						Request:    req,
-					}, nil
-				}
-				t.Fatalf("unexpected request: %s %s", req.Method, req.URL.String())
-				return nil, nil
-			}),
-		},
-	}
-
-	availability, err := client.checkAvailabilityFromDeezerSongLink("908604612")
-	if err != nil {
-		t.Fatalf("checkAvailabilityFromDeezerSongLink() error = %v", err)
-	}
-
 	if !availability.Deezer || availability.DeezerID != "908604612" {
-		t.Fatalf("Deezer = %+v, want DeezerID 908604612", availability)
+		t.Fatalf("Deezer availability = %+v, want DeezerID 908604612", availability)
 	}
-	if availability.SpotifyID != "testid" {
-		t.Fatalf("SpotifyID = %q, want %q", availability.SpotifyID, "testid")
+	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

@@ -0,0 +1,80 @@
+package gobackend
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+	"time"
+)
+
+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.
+func GetSpotifyDataWithAPI(ctx context.Context, spotifyURL, apiBaseURL string) (interface{}, error) {
+	parsed, err := parseSpotifyURI(spotifyURL)
+	if err != nil {
+		return nil, fmt.Errorf("invalid Spotify URL: %w", err)
+	}
+
+	base := strings.TrimSpace(apiBaseURL)
+	if base == "" {
+		base = DefaultSpotFetchAPIBaseURL
+	}
+
+	endpoint := fmt.Sprintf("%s/%s/%s", strings.TrimSuffix(base, "/"), parsed.Type, parsed.ID)
+	req, err := http.NewRequestWithContext(ctx, "GET", endpoint, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create SpotFetch API request: %w", err)
+	}
+	req.Header.Set("User-Agent", getRandomUserAgent())
+	req.Header.Set("Accept", "application/json")
+
+	client := NewHTTPClientWithTimeout(30 * time.Second)
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("SpotFetch API request failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("SpotFetch API error: HTTP %d", resp.StatusCode)
+	}
+
+	bodyBytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read SpotFetch API response: %w", err)
+	}
+
+	switch parsed.Type {
+	case "track":
+		var trackResp TrackResponse
+		if err := json.Unmarshal(bodyBytes, &trackResp); err != nil {
+			return nil, fmt.Errorf("failed to decode track response: %w", err)
+		}
+		return trackResp, nil
+	case "album":
+		var albumResp AlbumResponsePayload
+		if err := json.Unmarshal(bodyBytes, &albumResp); err != nil {
+			return nil, fmt.Errorf("failed to decode album response: %w", err)
+		}
+		return &albumResp, nil
+	case "playlist":
+		var playlistResp PlaylistResponsePayload
+		if err := json.Unmarshal(bodyBytes, &playlistResp); err != nil {
+			return nil, fmt.Errorf("failed to decode playlist response: %w", err)
+		}
+		return playlistResp, nil
+	case "artist":
+		var artistResp ArtistResponsePayload
+		if err := json.Unmarshal(bodyBytes, &artistResp); err != nil {
+			return nil, fmt.Errorf("failed to decode artist response: %w", err)
+		}
+		return &artistResp, nil
+	default:
+		return nil, fmt.Errorf("unsupported Spotify type: %s", parsed.Type)
+	}
+}

go_backend/tidal.go

@@ -829,7 +829,6 @@ func (t *TidalDownloader) SearchTrackByMetadataWithISRC(trackName, artistName, a
 			resolved := resolvedTrackInfo{
 				Title:      strings.TrimSpace(track.Title),
 				ArtistName: tidalTrackArtistsDisplay(track),
-				ISRC:       strings.TrimSpace(track.ISRC),
 				Duration:   track.Duration,
 			}
 			if trackMatchesRequest(req, resolved, "Tidal search") {
@@ -875,6 +874,8 @@ 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)
 
@@ -1014,11 +1015,13 @@ func (t *TidalDownloader) GetAlbumMetadata(resourceID string) (*AlbumResponsePay
 	tracks := make([]AlbumTrackMetadata, 0, len(itemsModule.PagedList.Items))
 	for _, item := range itemsModule.PagedList.Items {
 		track := item.Item
-		track.Album.ID = headerModule.Album.ID
-		track.Album.Title = headerModule.Album.Title
-		track.Album.Cover = headerModule.Album.Cover
-		track.Album.ReleaseDate = headerModule.Album.ReleaseDate
-		track.Album.URL = headerModule.Album.URL
+		if track.Album.ID == 0 {
+			track.Album.ID = headerModule.Album.ID
+			track.Album.Title = headerModule.Album.Title
+			track.Album.Cover = headerModule.Album.Cover
+			track.Album.ReleaseDate = headerModule.Album.ReleaseDate
+			track.Album.URL = headerModule.Album.URL
+		}
 		tracks = append(tracks, tidalTrackToAlbumTrackMetadata(&track))
 	}
 
@@ -1163,6 +1166,7 @@ type tidalAPIResult struct {
 	duration time.Duration
 }
 
+// Mobile networks are more unstable, so we use longer timeouts
 const (
 	tidalAPITimeoutMobile = 25 * time.Second
 	tidalMaxRetries       = 2
@@ -1208,6 +1212,7 @@ func fetchTidalURLWithRetry(api string, trackID int64, quality string, timeout t
 			continue
 		}
 
+		// 429 rate limit - wait and retry
 		if resp.StatusCode == 429 {
 			io.Copy(io.Discard, resp.Body)
 			resp.Body.Close()
@@ -1229,6 +1234,7 @@ func fetchTidalURLWithRetry(api string, trackID int64, quality string, timeout t
 			continue
 		}
 
+		// Try V2 response format (with manifest)
 		var v2Response TidalAPIResponseV2
 		if err := json.Unmarshal(body, &v2Response); err == nil && v2Response.Data.Manifest != "" {
 			if v2Response.Data.AssetPresentation == "PREVIEW" {
@@ -1242,6 +1248,7 @@ func fetchTidalURLWithRetry(api string, trackID int64, quality string, timeout t
 			}, nil
 		}
 
+		// Try V1 response format
 		var v1Responses []struct {
 			OriginalTrackURL string `json:"OriginalTrackUrl"`
 		}
@@ -1596,6 +1603,10 @@ func (t *TidalDownloader) downloadFromManifest(ctx context.Context, manifestB64,
 		return nil
 	}
 
+	// For DASH format, determine correct M4A path
+	// If outputPath already ends with .m4a, use it directly.
+	// If outputPath ends with .flac, convert .flac to .m4a.
+	// Otherwise (e.g., SAF /proc/self/fd/*), use outputPath as-is.
 	var m4aPath string
 	if strings.HasSuffix(outputPath, ".m4a") {
 		m4aPath = outputPath
@@ -1869,6 +1880,8 @@ func titlesMatch(expectedTitle, foundTitle string) bool {
 		}
 	}
 
+	// Emoji/symbol-only titles must be matched strictly to avoid false positives
+	// like mapping "🪐" to "Higher Power".
 	if (!hasAlphaNumericRunes(expectedTitle) || !hasAlphaNumericRunes(foundTitle)) &&
 		strings.TrimSpace(expectedTitle) != "" &&
 		strings.TrimSpace(foundTitle) != "" {
@@ -2024,7 +2037,6 @@ func resolveTidalTrackForRequest(req DownloadRequest, downloader *TidalDownloade
 	expectedDurationSec := req.DurationMS / 1000
 	var trackID int64
 	var gotTidalID bool
-	var resolvedViaSongLink bool
 
 	if req.TidalID != "" {
 		GoLog("[%s] Using Tidal ID from request payload: %s\n", logPrefix, req.TidalID)
@@ -2084,7 +2096,6 @@ func resolveTidalTrackForRequest(req DownloadRequest, downloader *TidalDownloade
 					trackID = parsedTrackID
 					GoLog("[%s] Got Tidal ID %d directly from SongLink\n", logPrefix, trackID)
 					gotTidalID = true
-					resolvedViaSongLink = true
 					return
 				}
 			}
@@ -2094,11 +2105,11 @@ func resolveTidalTrackForRequest(req DownloadRequest, downloader *TidalDownloade
 				if idErr == nil && trackID > 0 {
 					GoLog("[%s] Got Tidal ID %d from URL parsing\n", logPrefix, trackID)
 					gotTidalID = true
-					resolvedViaSongLink = true
 				}
 			}
 		}
 
+		// Prefer Deezer-based SongLink lookup when DeezerID is available.
 		if req.DeezerID != "" {
 			GoLog("[%s] Using Deezer ID for SongLink lookup: %s\n", logPrefix, req.DeezerID)
 			songlink := NewSongLinkClient()
@@ -2137,22 +2148,23 @@ 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,
-			ISRC:                 strings.TrimSpace(actualTrack.ISRC),
-			Duration:             actualTrack.Duration,
-			SkipNameVerification: resolvedViaSongLink,
+			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)
 			}
@@ -2162,26 +2174,13 @@ func resolveTidalTrackForRequest(req DownloadRequest, downloader *TidalDownloade
 		GoLog("[%s] Track %d verified: '%s - %s' ✓\n", logPrefix, trackID, resolved.ArtistName, resolved.Title)
 	}
 
-	// Use track_number / disc_number from the actual Tidal API data when the
-	// request doesn't carry them (e.g. downloads from search results / popular).
-	resolvedTrackNumber := req.TrackNumber
-	resolvedDiscNumber := req.DiscNumber
-	if actualTrack != nil {
-		if resolvedTrackNumber == 0 && actualTrack.TrackNumber > 0 {
-			resolvedTrackNumber = actualTrack.TrackNumber
-		}
-		if resolvedDiscNumber == 0 && actualTrack.VolumeNumber > 0 {
-			resolvedDiscNumber = actualTrack.VolumeNumber
-		}
-	}
-
 	track := &TidalTrack{
 		ID:           trackID,
 		Title:        strings.TrimSpace(req.TrackName),
 		ISRC:         strings.TrimSpace(req.ISRC),
 		Duration:     expectedDurationSec,
-		TrackNumber:  resolvedTrackNumber,
-		VolumeNumber: resolvedDiscNumber,
+		TrackNumber:  req.TrackNumber,
+		VolumeNumber: req.DiscNumber,
 	}
 	track.Artist.Name = strings.TrimSpace(req.ArtistName)
 	track.Album.Title = strings.TrimSpace(req.AlbumName)
@@ -2209,7 +2208,7 @@ func downloadFromTidal(req DownloadRequest) (TidalDownloadResult, error) {
 	}
 
 	quality := req.Quality
-	if quality == "" || quality == "DEFAULT" {
+	if quality == "" {
 		quality = "LOSSLESS"
 	}
 
@@ -2351,19 +2350,18 @@ func downloadFromTidal(req DownloadRequest) (TidalDownloadResult, error) {
 	}
 
 	metadata := Metadata{
-		Title:         req.TrackName,
-		Artist:        req.ArtistName,
-		Album:         req.AlbumName,
-		AlbumArtist:   req.AlbumArtist,
-		ArtistTagMode: req.ArtistTagMode,
-		Date:          releaseDate,
-		TrackNumber:   actualTrackNumber,
-		TotalTracks:   req.TotalTracks,
-		DiscNumber:    actualDiscNumber,
-		ISRC:          track.ISRC,
-		Genre:         req.Genre,
-		Label:         req.Label,
-		Copyright:     req.Copyright,
+		Title:       req.TrackName,
+		Artist:      req.ArtistName,
+		Album:       req.AlbumName,
+		AlbumArtist: req.AlbumArtist,
+		Date:        releaseDate,
+		TrackNumber: actualTrackNumber,
+		TotalTracks: req.TotalTracks,
+		DiscNumber:  actualDiscNumber,
+		ISRC:        track.ISRC,
+		Genre:       req.Genre,
+		Label:       req.Label,
+		Copyright:   req.Copyright,
 	}
 
 	var coverData []byte
@@ -2494,6 +2492,7 @@ func parseTidalURL(input string) (string, string, error) {
 
 	parts := strings.Split(strings.Trim(parsed.Path, "/"), "/")
 
+	// Handle /browse/track/123 format
 	if len(parts) > 0 && parts[0] == "browse" {
 		parts = parts[1:]
 	}

go_backend/title_match_utils.go

@@ -7,21 +7,8 @@ import (
 	"golang.org/x/text/unicode/norm"
 )
 
-func writeNormalizedArtistRune(b *strings.Builder, r rune) {
-	switch r {
-	case 'đ':
-		b.WriteString("dj")
-	case 'ß':
-		b.WriteString("ss")
-	case 'æ':
-		b.WriteString("ae")
-	case 'œ':
-		b.WriteString("oe")
-	default:
-		b.WriteRune(r)
-	}
-}
-
+// normalizeLooseTitle collapses separators/punctuation so titles like
+// "Doctor / Cops" and "Doctor _ Cops" can still match.
 func normalizeLooseTitle(title string) string {
 	trimmed := strings.TrimSpace(strings.ToLower(title))
 	if trimmed == "" {
@@ -37,15 +24,19 @@ func normalizeLooseTitle(title string) string {
 			b.WriteRune(r)
 		case unicode.IsSpace(r):
 			b.WriteByte(' ')
+		// Treat common separators as spaces.
 		case r == '/', r == '\\', r == '_', r == '-', r == '|', r == '.', r == '&', r == '+':
 			b.WriteByte(' ')
 		default:
+			// Drop other punctuation/symbols (including emoji) for loose matching.
 		}
 	}
 
 	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 == "" {
@@ -62,12 +53,13 @@ func normalizeLooseArtistName(name string) string {
 		case unicode.Is(unicode.Mn, r), unicode.Is(unicode.Mc, r), unicode.Is(unicode.Me, r):
 			continue
 		case unicode.IsLetter(r), unicode.IsNumber(r):
-			writeNormalizedArtistRune(&b, 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.
 		}
 	}
 
@@ -83,6 +75,9 @@ func hasAlphaNumericRunes(value string) bool {
 	return false
 }
 
+// normalizeSymbolOnlyTitle keeps symbol/emoji runes while dropping letters,
+// digits, spaces and punctuation. This is useful for emoji-only titles such as
+// "🪐", "🌎" etc, so we can compare them strictly and avoid false matches.
 func normalizeSymbolOnlyTitle(title string) string {
 	trimmed := strings.TrimSpace(strings.ToLower(title))
 	if trimmed == "" {
@@ -107,33 +102,30 @@ 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
-	ISRC                 string
-	Duration             int
-	SkipNameVerification bool
+	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 {
-	exactISRCMatch := req.ISRC != "" &&
-		resolved.ISRC != "" &&
-		strings.EqualFold(strings.TrimSpace(req.ISRC), strings.TrimSpace(resolved.ISRC))
+	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 !exactISRCMatch && !resolved.SkipNameVerification {
-		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
-		}
+	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

go_backend/title_match_utils_test.go

@@ -21,40 +21,6 @@ func TestNormalizeLooseTitle_EmojiAndSymbols(t *testing.T) {
 	}
 }
 
-func TestTrackMatchesRequest_SongLinkBypassesArtistAndTitle(t *testing.T) {
-	req := DownloadRequest{
-		TrackName:  "Ringišpil",
-		ArtistName: "Djordje Balasevic",
-	}
-	resolved := resolvedTrackInfo{
-		Title:                "Completely Different Title",
-		ArtistName:           "Totally Different Artist",
-		SkipNameVerification: true,
-	}
-
-	if !trackMatchesRequest(req, resolved, "test") {
-		t.Fatal("expected SongLink-resolved track to bypass artist/title verification")
-	}
-}
-
-func TestTrackMatchesRequest_SongLinkStillChecksDuration(t *testing.T) {
-	req := DownloadRequest{
-		TrackName:  "Ringišpil",
-		ArtistName: "Djordje Balasevic",
-		DurationMS: 180000,
-	}
-	resolved := resolvedTrackInfo{
-		Title:                "Completely Different Title",
-		ArtistName:           "Totally Different Artist",
-		Duration:             240,
-		SkipNameVerification: true,
-	}
-
-	if trackMatchesRequest(req, resolved, "test") {
-		t.Fatal("expected SongLink-resolved track with large duration mismatch to be rejected")
-	}
-}
-
 func TestTitlesMatch_SeparatorVariants(t *testing.T) {
 	if !titlesMatch("Doctor / Cops", "Doctor _ Cops") {
 		t.Fatal("expected tidal titlesMatch to accept / vs _ variant")

go_backend/youtube.go

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

go_backend/youtube_quality_test.go

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

@@ -27,37 +27,6 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
 
 flutter_ios_podfile_setup
 
-def patch_device_info_plus_vision_selector
-  plugin_file = File.join(
-    __dir__,
-    '.symlinks',
-    'plugins',
-    'device_info_plus',
-    'ios',
-    'device_info_plus',
-    'Sources',
-    'device_info_plus',
-    'FPPDeviceInfoPlusPlugin.m'
-  )
-  return unless File.exist?(plugin_file)
-
-  source = File.read(plugin_file)
-  return if source.include?('FPPDeviceInfoPlusVisionCompat')
-
-  marker = "#import <sys/utsname.h>\n"
-  declaration = <<~OBJC
-
-    // Older Xcode SDKs do not declare this selector yet, but device_info_plus
-    // only calls it behind an availability check.
-    @interface NSProcessInfo (FPPDeviceInfoPlusVisionCompat)
-    - (BOOL)isiOSAppOnVision;
-    @end
-  OBJC
-
-  patched = source.sub(marker, "#{marker}#{declaration}\n")
-  File.write(plugin_file, patched) if patched != source
-end
-
 target 'Runner' do
   use_frameworks!
   use_modular_headers!
@@ -73,8 +42,6 @@ target 'RunnerTests' do
 end
 
 post_install do |installer|
-  patch_device_info_plus_vision_selector
-
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
     target.build_configurations.each do |config|

ios/Runner/AppDelegate.swift

@@ -89,7 +89,7 @@ import Gobackend  // Import Go framework
             }
             self.lastDownloadProgressPayload = payload
             DispatchQueue.main.async { [weak self] in
-                self?.downloadProgressEventSink?(self?.parseJsonPayload(payload))
+                self?.downloadProgressEventSink?(payload)
             }
         }
         downloadProgressTimer = timer
@@ -119,7 +119,7 @@ import Gobackend  // Import Go framework
             }
             self.lastLibraryScanProgressPayload = payload
             DispatchQueue.main.async { [weak self] in
-                self?.libraryScanProgressEventSink?(self?.parseJsonPayload(payload))
+                self?.libraryScanProgressEventSink?(payload)
             }
         }
         libraryScanProgressTimer = timer
@@ -133,17 +133,6 @@ import Gobackend  // Import Go framework
         libraryScanProgressEventSink = nil
         lastLibraryScanProgressPayload = nil
     }
-
-    private func parseJsonPayload(_ payload: String) -> Any {
-        guard let data = payload.data(using: .utf8) else {
-            return payload
-        }
-        do {
-            return try JSONSerialization.jsonObject(with: data, options: [.fragmentsAllowed])
-        } catch {
-            return payload
-        }
-    }
     
     private func handleMethodCall(call: FlutterMethodCall, result: @escaping FlutterResult) {
         DispatchQueue.global(qos: .userInitiated).async {
@@ -164,6 +153,13 @@ import Gobackend  // Import Go framework
         var error: NSError?
         
         switch call.method {
+        case "parseSpotifyUrl":
+            let args = call.arguments as! [String: Any]
+            let url = args["url"] as! String
+            let response = GobackendParseSpotifyURL(url, &error)
+            if let error = error { throw error }
+            return response
+            
         case "checkAvailability":
             let args = call.arguments as! [String: Any]
             let spotifyId = args["spotify_id"] as! String
@@ -180,11 +176,11 @@ import Gobackend  // Import Go framework
 
         case "getDownloadProgress":
             let response = GobackendGetDownloadProgress()
-            return parseJsonPayload(response as String? ?? "{}")
+            return response
             
         case "getAllDownloadProgress":
             let response = GobackendGetAllDownloadProgress()
-            return parseJsonPayload(response as String? ?? "{}")
+            return response
             
         case "initItemProgress":
             let args = call.arguments as! [String: Any]
@@ -307,15 +303,6 @@ import Gobackend  // Import Go framework
             if let error = error { throw error }
             return response
             
-        case "rewriteSplitArtistTags":
-            let args = call.arguments as! [String: Any]
-            let filePath = args["file_path"] as! String
-            let artist = args["artist"] as! String
-            let albumArtist = args["album_artist"] as! String
-            let response = GobackendRewriteSplitArtistTagsExport(filePath, artist, albumArtist, &error)
-            if let error = error { throw error }
-            return response
-            
         case "cleanupConnections":
             GobackendCleanupConnections()
             return nil
@@ -344,8 +331,7 @@ import Gobackend  // Import Go framework
             let spotifyId = args["spotify_id"] as! String
             let durationMs = args["duration_ms"] as? Int64 ?? 0
             let outputPath = args["output_path"] as! String
-            let audioFilePath = args["audio_file_path"] as? String ?? ""
-            GobackendFetchAndSaveLyrics(trackName, artistName, spotifyId, durationMs, outputPath, audioFilePath, &error)
+            GobackendFetchAndSaveLyrics(trackName, artistName, spotifyId, durationMs, outputPath, &error)
             if let error = error { throw error }
             return "{\"success\":true}"
 
@@ -483,6 +469,13 @@ import Gobackend  // Import Go framework
             if let error = error { throw error }
             return response
 
+        case "getSpotifyMetadataWithFallback":
+            let args = call.arguments as! [String: Any]
+            let url = args["url"] as! String
+            let response = GobackendGetSpotifyMetadataWithDeezerFallback(url, &error)
+            if let error = error { throw error }
+            return response
+            
         case "checkAvailabilityFromDeezerID":
             let args = call.arguments as! [String: Any]
             let deezerTrackId = args["deezer_track_id"] as! String
@@ -944,7 +937,7 @@ import Gobackend  // Import Go framework
             
         case "getLibraryScanProgress":
             let response = GobackendGetLibraryScanProgressJSON()
-            return parseJsonPayload(response as String? ?? "{}")
+            return response
             
         case "cancelLibraryScan":
             GobackendCancelLibraryScanJSON()

lib/constants/app_info.dart

@@ -3,14 +3,14 @@ import 'package:flutter/foundation.dart';
 /// App version and info constants
 /// Update version here only - all other files will reference this
 class AppInfo {
-  static const String version = '4.2.0';
-  static const String buildNumber = '121';
+  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 Mobile';
+  static const String appName = 'SpotiFLAC';
   static const String copyright = '© 2026 SpotiFLAC';
 
   static const String mobileAuthor = 'zarzet';

lib/l10n/app_localizations.dart

@@ -151,7 +151,7 @@ abstract class AppLocalizations {
   /// Bottom navigation - Extension store tab
   ///
   /// In en, this message translates to:
-  /// **'Repo'**
+  /// **'Store'**
   String get navStore;
 
   /// Home screen title
@@ -163,7 +163,7 @@ abstract class AppLocalizations {
   /// Subtitle shown below search box
   ///
   /// In en, this message translates to:
-  /// **'Paste a supported URL or search by name'**
+  /// **'Paste a Spotify link or search by name'**
   String get homeSubtitle;
 
   /// Info text about supported URL types
@@ -256,18 +256,6 @@ abstract class AppLocalizations {
   /// **'Filename Format'**
   String get downloadFilenameFormat;
 
-  /// Setting for output filename pattern for singles/EPs
-  ///
-  /// In en, this message translates to:
-  /// **'Single Filename Format'**
-  String get downloadSingleFilenameFormat;
-
-  /// Subtitle description for single filename format setting
-  ///
-  /// In en, this message translates to:
-  /// **'Filename pattern for singles and EPs. Uses the same tags as the album format.'**
-  String get downloadSingleFilenameFormatDescription;
-
   /// Title of the folder organization picker bottom sheet
   ///
   /// In en, this message translates to:
@@ -412,60 +400,6 @@ abstract class AppLocalizations {
   /// **'Download highest resolution cover art'**
   String get optionsMaxQualityCoverSubtitle;
 
-  /// Title for ReplayGain setting toggle
-  ///
-  /// In en, this message translates to:
-  /// **'ReplayGain'**
-  String get optionsReplayGain;
-
-  /// Subtitle when ReplayGain is enabled
-  ///
-  /// In en, this message translates to:
-  /// **'Scan loudness and embed ReplayGain tags (EBU R128)'**
-  String get optionsReplayGainSubtitleOn;
-
-  /// Subtitle when ReplayGain is disabled
-  ///
-  /// In en, this message translates to:
-  /// **'Disabled: no loudness normalization tags'**
-  String get optionsReplayGainSubtitleOff;
-
-  /// Setting title for how artist metadata is written into files
-  ///
-  /// In en, this message translates to:
-  /// **'Artist Tag Mode'**
-  String get optionsArtistTagMode;
-
-  /// Bottom-sheet description for artist tag mode setting
-  ///
-  /// In en, this message translates to:
-  /// **'Choose how multiple artists are written into embedded tags.'**
-  String get optionsArtistTagModeDescription;
-
-  /// Artist tag mode option that joins multiple artists into one value
-  ///
-  /// In en, this message translates to:
-  /// **'Single joined value'**
-  String get optionsArtistTagModeJoined;
-
-  /// Subtitle for joined artist tag mode
-  ///
-  /// In en, this message translates to:
-  /// **'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.'**
-  String get optionsArtistTagModeJoinedSubtitle;
-
-  /// Artist tag mode option that writes repeated ARTIST tags for Vorbis formats
-  ///
-  /// In en, this message translates to:
-  /// **'Split tags for FLAC/Opus'**
-  String get optionsArtistTagModeSplitVorbis;
-
-  /// Subtitle for split Vorbis artist tag mode
-  ///
-  /// In en, this message translates to:
-  /// **'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.'**
-  String get optionsArtistTagModeSplitVorbisSubtitle;
-
   /// Number of parallel downloads
   ///
   /// In en, this message translates to:
@@ -493,13 +427,13 @@ abstract class AppLocalizations {
   /// Show/hide store tab
   ///
   /// In en, this message translates to:
-  /// **'Extension Repo'**
+  /// **'Extension Store'**
   String get optionsExtensionStore;
 
   /// Subtitle for extension store toggle
   ///
   /// In en, this message translates to:
-  /// **'Show Repo tab in navigation'**
+  /// **'Show Store tab in navigation'**
   String get optionsExtensionStoreSubtitle;
 
   /// Auto update check toggle
@@ -631,7 +565,7 @@ abstract class AppLocalizations {
   /// Store screen title
   ///
   /// In en, this message translates to:
-  /// **'Extension Repo'**
+  /// **'Extension Store'**
   String get storeTitle;
 
   /// Store search placeholder
@@ -1498,66 +1432,6 @@ abstract class AppLocalizations {
   /// **'Playlists'**
   String get searchPlaylists;
 
-  /// Bottom sheet title for search sort options
-  ///
-  /// In en, this message translates to:
-  /// **'Sort Results'**
-  String get searchSortTitle;
-
-  /// Sort option - default API order
-  ///
-  /// In en, this message translates to:
-  /// **'Default'**
-  String get searchSortDefault;
-
-  /// Sort option - title ascending
-  ///
-  /// In en, this message translates to:
-  /// **'Title (A-Z)'**
-  String get searchSortTitleAZ;
-
-  /// Sort option - title descending
-  ///
-  /// In en, this message translates to:
-  /// **'Title (Z-A)'**
-  String get searchSortTitleZA;
-
-  /// Sort option - artist ascending
-  ///
-  /// In en, this message translates to:
-  /// **'Artist (A-Z)'**
-  String get searchSortArtistAZ;
-
-  /// Sort option - artist descending
-  ///
-  /// In en, this message translates to:
-  /// **'Artist (Z-A)'**
-  String get searchSortArtistZA;
-
-  /// Sort option - shortest duration first
-  ///
-  /// In en, this message translates to:
-  /// **'Duration (Shortest)'**
-  String get searchSortDurationShort;
-
-  /// Sort option - longest duration first
-  ///
-  /// In en, this message translates to:
-  /// **'Duration (Longest)'**
-  String get searchSortDurationLong;
-
-  /// Sort option - oldest release first
-  ///
-  /// In en, this message translates to:
-  /// **'Release Date (Oldest)'**
-  String get searchSortDateOldest;
-
-  /// Sort option - newest release first
-  ///
-  /// In en, this message translates to:
-  /// **'Release Date (Newest)'**
-  String get searchSortDateNewest;
-
   /// Tooltip - play button
   ///
   /// In en, this message translates to:
@@ -2248,18 +2122,6 @@ abstract class AppLocalizations {
   /// **'Lyrics not available for this track'**
   String get trackLyricsNotAvailable;
 
-  /// Message when no embedded lyrics in audio file
-  ///
-  /// In en, this message translates to:
-  /// **'No lyrics found in this file'**
-  String get trackLyricsNotInFile;
-
-  /// Action - fetch lyrics from online providers
-  ///
-  /// In en, this message translates to:
-  /// **'Fetch from Online'**
-  String get trackFetchOnlineLyrics;
-
   /// Message when lyrics request times out
   ///
   /// In en, this message translates to:
@@ -2443,7 +2305,7 @@ abstract class AppLocalizations {
   /// Error heading when the store cannot be loaded
   ///
   /// In en, this message translates to:
-  /// **'Failed to load repository'**
+  /// **'Failed to load store'**
   String get storeLoadError;
 
   /// Message when store has no extensions
@@ -2800,6 +2662,24 @@ abstract class AppLocalizations {
   /// **'Actual quality depends on track availability from the service'**
   String get qualityNote;
 
+  /// Note for YouTube service explaining lossy-only quality
+  ///
+  /// In en, this message translates to:
+  /// **'YouTube provides lossy audio only. Not part of lossless fallback.'**
+  String get youtubeQualityNote;
+
+  /// Title for YouTube Opus bitrate setting
+  ///
+  /// In en, this message translates to:
+  /// **'YouTube Opus Bitrate'**
+  String get youtubeOpusBitrateTitle;
+
+  /// Title for YouTube MP3 bitrate setting
+  ///
+  /// In en, this message translates to:
+  /// **'YouTube MP3 Bitrate'**
+  String get youtubeMp3BitrateTitle;
+
   /// Setting - show quality picker
   ///
   /// In en, this message translates to:
@@ -2980,18 +2860,6 @@ abstract class AppLocalizations {
   /// **'Artist/Album/ and Artist/Singles/'**
   String get albumFolderArtistAlbumSinglesSubtitle;
 
-  /// Album folder option with singles directly in artist folder
-  ///
-  /// In en, this message translates to:
-  /// **'Artist / Album (Singles flat)'**
-  String get albumFolderArtistAlbumFlat;
-
-  /// Folder structure example for flat singles
-  ///
-  /// In en, this message translates to:
-  /// **'Artist/Album/ and Artist/song.flac'**
-  String get albumFolderArtistAlbumFlatSubtitle;
-
   /// Button - delete selected tracks
   ///
   /// In en, this message translates to:
@@ -3412,12 +3280,6 @@ abstract class AppLocalizations {
   /// **'{count, plural, =1{track} other{tracks}}'**
   String libraryTracksUnit(int count);
 
-  /// Unit label for files count during library scanning
-  ///
-  /// In en, this message translates to:
-  /// **'{count, plural, =1{file} other{files}}'**
-  String libraryFilesUnit(int count);
-
   /// Last scan time display
   ///
   /// In en, this message translates to:
@@ -3436,12 +3298,6 @@ abstract class AppLocalizations {
   /// **'Scanning...'**
   String get libraryScanning;
 
-  /// Status shown after file scanning finishes but library persistence is still running
-  ///
-  /// In en, this message translates to:
-  /// **'Finalizing library...'**
-  String get libraryScanFinalizing;
-
   /// Scan progress display
   ///
   /// In en, this message translates to:
@@ -3568,42 +3424,6 @@ abstract class AppLocalizations {
   /// **'Format'**
   String get libraryFilterFormat;
 
-  /// Filter section - metadata completeness
-  ///
-  /// In en, this message translates to:
-  /// **'Metadata'**
-  String get libraryFilterMetadata;
-
-  /// Filter option - items with complete metadata
-  ///
-  /// In en, this message translates to:
-  /// **'Complete metadata'**
-  String get libraryFilterMetadataComplete;
-
-  /// Filter option - items missing any tracked metadata field
-  ///
-  /// In en, this message translates to:
-  /// **'Missing any metadata'**
-  String get libraryFilterMetadataMissingAny;
-
-  /// Filter option - items missing release year/date
-  ///
-  /// In en, this message translates to:
-  /// **'Missing year'**
-  String get libraryFilterMetadataMissingYear;
-
-  /// Filter option - items missing genre
-  ///
-  /// In en, this message translates to:
-  /// **'Missing genre'**
-  String get libraryFilterMetadataMissingGenre;
-
-  /// Filter option - items missing album artist
-  ///
-  /// In en, this message translates to:
-  /// **'Missing album artist'**
-  String get libraryFilterMetadataMissingAlbumArtist;
-
   /// Filter section - sort order
   ///
   /// In en, this message translates to:
@@ -3622,30 +3442,6 @@ abstract class AppLocalizations {
   /// **'Oldest'**
   String get libraryFilterSortOldest;
 
-  /// Sort option - album ascending
-  ///
-  /// In en, this message translates to:
-  /// **'Album (A-Z)'**
-  String get libraryFilterSortAlbumAsc;
-
-  /// Sort option - album descending
-  ///
-  /// In en, this message translates to:
-  /// **'Album (Z-A)'**
-  String get libraryFilterSortAlbumDesc;
-
-  /// Sort option - genre ascending
-  ///
-  /// In en, this message translates to:
-  /// **'Genre (A-Z)'**
-  String get libraryFilterSortGenreAsc;
-
-  /// Sort option - genre descending
-  ///
-  /// In en, this message translates to:
-  /// **'Genre (Z-A)'**
-  String get libraryFilterSortGenreDesc;
-
   /// Relative time - less than a minute ago
   ///
   /// In en, this message translates to:
@@ -3763,7 +3559,7 @@ abstract class AppLocalizations {
   /// Tutorial extensions tip 1
   ///
   /// In en, this message translates to:
-  /// **'Browse the Repo tab to discover useful extensions'**
+  /// **'Browse the Store tab to discover useful extensions'**
   String get tutorialExtensionsTip1;
 
   /// Tutorial extensions tip 2
@@ -4090,54 +3886,6 @@ abstract class AppLocalizations {
   /// **'Search metadata online and embed into file'**
   String get trackReEnrichOnlineSubtitle;
 
-  /// Section title for field selection in re-enrich dialog
-  ///
-  /// In en, this message translates to:
-  /// **'Fields to update'**
-  String get trackReEnrichFieldsTitle;
-
-  /// Checkbox label for cover art field in re-enrich
-  ///
-  /// In en, this message translates to:
-  /// **'Cover Art'**
-  String get trackReEnrichFieldCover;
-
-  /// Checkbox label for lyrics field in re-enrich
-  ///
-  /// In en, this message translates to:
-  /// **'Lyrics'**
-  String get trackReEnrichFieldLyrics;
-
-  /// Checkbox label for basic tags in re-enrich (title/artist are never overwritten)
-  ///
-  /// In en, this message translates to:
-  /// **'Album, Album Artist'**
-  String get trackReEnrichFieldBasicTags;
-
-  /// Checkbox label for track info in re-enrich
-  ///
-  /// In en, this message translates to:
-  /// **'Track & Disc Number'**
-  String get trackReEnrichFieldTrackInfo;
-
-  /// Checkbox label for release info in re-enrich
-  ///
-  /// In en, this message translates to:
-  /// **'Date & ISRC'**
-  String get trackReEnrichFieldReleaseInfo;
-
-  /// Checkbox label for extra metadata in re-enrich
-  ///
-  /// In en, this message translates to:
-  /// **'Genre, Label, Copyright'**
-  String get trackReEnrichFieldExtra;
-
-  /// Select all fields checkbox in re-enrich
-  ///
-  /// In en, this message translates to:
-  /// **'Select All'**
-  String get trackReEnrichSelectAll;
-
   /// Menu action - edit embedded metadata
   ///
   /// In en, this message translates to:
@@ -4737,6 +4485,12 @@ abstract class AppLocalizations {
   /// **'You have unsaved changes that will be lost.'**
   String get lyricsProvidersDiscardContent;
 
+  /// Description for Spotify Lyrics API provider
+  ///
+  /// In en, this message translates to:
+  /// **'Spotify-sourced synced lyrics via community API'**
+  String get lyricsProviderSpotifyApiDesc;
+
   /// Description for LRCLIB provider
   ///
   /// In en, this message translates to:
@@ -5330,460 +5084,6 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Empty only'**
   String get editMetadataSelectEmpty;
-
-  /// Header for active downloads section with count
-  ///
-  /// In en, this message translates to:
-  /// **'Downloading ({count})'**
-  String queueDownloadingCount(int count);
-
-  /// Header label for downloaded items section in library
-  ///
-  /// In en, this message translates to:
-  /// **'Downloaded'**
-  String get queueDownloadedHeader;
-
-  /// Shown while filter results are being computed
-  ///
-  /// In en, this message translates to:
-  /// **'Filtering...'**
-  String get queueFilteringIndicator;
-
-  /// Track count label with plural support
-  ///
-  /// In en, this message translates to:
-  /// **'{count, plural, =1{1 track} other{{count} tracks}}'**
-  String queueTrackCount(int count);
-
-  /// Album count label with plural support
-  ///
-  /// In en, this message translates to:
-  /// **'{count, plural, =1{1 album} other{{count} albums}}'**
-  String queueAlbumCount(int count);
-
-  /// Empty state title when no album downloads exist
-  ///
-  /// In en, this message translates to:
-  /// **'No album downloads'**
-  String get queueEmptyAlbums;
-
-  /// Empty state subtitle for album downloads
-  ///
-  /// In en, this message translates to:
-  /// **'Download multiple tracks from an album to see them here'**
-  String get queueEmptyAlbumsSubtitle;
-
-  /// Empty state title when no single track downloads exist
-  ///
-  /// In en, this message translates to:
-  /// **'No single downloads'**
-  String get queueEmptySingles;
-
-  /// Empty state subtitle for single track downloads
-  ///
-  /// In en, this message translates to:
-  /// **'Single track downloads will appear here'**
-  String get queueEmptySinglesSubtitle;
-
-  /// Empty state title when download history is empty
-  ///
-  /// In en, this message translates to:
-  /// **'No download history'**
-  String get queueEmptyHistory;
-
-  /// Empty state subtitle for download history
-  ///
-  /// In en, this message translates to:
-  /// **'Downloaded tracks will appear here'**
-  String get queueEmptyHistorySubtitle;
-
-  /// Shown when all playlists are selected in selection mode
-  ///
-  /// In en, this message translates to:
-  /// **'All playlists selected'**
-  String get selectionAllPlaylistsSelected;
-
-  /// Hint shown in playlist selection mode
-  ///
-  /// In en, this message translates to:
-  /// **'Tap playlists to select'**
-  String get selectionTapPlaylistsToSelect;
-
-  /// Hint shown when no playlists are selected for deletion
-  ///
-  /// In en, this message translates to:
-  /// **'Select playlists to delete'**
-  String get selectionSelectPlaylistsToDelete;
-
-  /// Title for audio analysis section
-  ///
-  /// In en, this message translates to:
-  /// **'Audio Quality Analysis'**
-  String get audioAnalysisTitle;
-
-  /// Description for audio analysis tap-to-analyze prompt
-  ///
-  /// In en, this message translates to:
-  /// **'Verify lossless quality with spectrum analysis'**
-  String get audioAnalysisDescription;
-
-  /// Loading text while analyzing audio
-  ///
-  /// In en, this message translates to:
-  /// **'Analyzing audio...'**
-  String get audioAnalysisAnalyzing;
-
-  /// Sample rate metric label
-  ///
-  /// In en, this message translates to:
-  /// **'Sample Rate'**
-  String get audioAnalysisSampleRate;
-
-  /// Bit depth metric label
-  ///
-  /// In en, this message translates to:
-  /// **'Bit Depth'**
-  String get audioAnalysisBitDepth;
-
-  /// Channels metric label
-  ///
-  /// In en, this message translates to:
-  /// **'Channels'**
-  String get audioAnalysisChannels;
-
-  /// Duration metric label
-  ///
-  /// In en, this message translates to:
-  /// **'Duration'**
-  String get audioAnalysisDuration;
-
-  /// Nyquist frequency metric label
-  ///
-  /// In en, this message translates to:
-  /// **'Nyquist'**
-  String get audioAnalysisNyquist;
-
-  /// File size metric label
-  ///
-  /// In en, this message translates to:
-  /// **'Size'**
-  String get audioAnalysisFileSize;
-
-  /// Dynamic range metric label
-  ///
-  /// In en, this message translates to:
-  /// **'Dynamic Range'**
-  String get audioAnalysisDynamicRange;
-
-  /// Peak amplitude metric label
-  ///
-  /// In en, this message translates to:
-  /// **'Peak'**
-  String get audioAnalysisPeak;
-
-  /// RMS level metric label
-  ///
-  /// In en, this message translates to:
-  /// **'RMS'**
-  String get audioAnalysisRms;
-
-  /// Total samples metric label
-  ///
-  /// In en, this message translates to:
-  /// **'Samples'**
-  String get audioAnalysisSamples;
-
-  /// Extensions page - subtitle for built-in search provider option
-  ///
-  /// In en, this message translates to:
-  /// **'Search with {providerName}'**
-  String extensionsSearchWith(String providerName);
-
-  /// Extensions page - label for home feed provider selector
-  ///
-  /// In en, this message translates to:
-  /// **'Home Feed Provider'**
-  String get extensionsHomeFeedProvider;
-
-  /// Extensions page - description for home feed provider picker
-  ///
-  /// In en, this message translates to:
-  /// **'Choose which extension provides the home feed on the main screen'**
-  String get extensionsHomeFeedDescription;
-
-  /// Extensions page - home feed provider option: auto
-  ///
-  /// In en, this message translates to:
-  /// **'Auto'**
-  String get extensionsHomeFeedAuto;
-
-  /// Extensions page - subtitle for auto home feed option
-  ///
-  /// In en, this message translates to:
-  /// **'Automatically select the best available'**
-  String get extensionsHomeFeedAutoSubtitle;
-
-  /// Extensions page - subtitle for a specific extension home feed option
-  ///
-  /// In en, this message translates to:
-  /// **'Use {extensionName} home feed'**
-  String extensionsHomeFeedUse(String extensionName);
-
-  /// Extensions page - shown when no installed extension has home feed
-  ///
-  /// In en, this message translates to:
-  /// **'No extensions with home feed'**
-  String get extensionsNoHomeFeedExtensions;
-
-  /// Sort option - alphabetical ascending
-  ///
-  /// In en, this message translates to:
-  /// **'A-Z'**
-  String get sortAlphaAsc;
-
-  /// Sort option - alphabetical descending
-  ///
-  /// In en, this message translates to:
-  /// **'Z-A'**
-  String get sortAlphaDesc;
-
-  /// Dialog title when confirming cancellation of an active download
-  ///
-  /// In en, this message translates to:
-  /// **'Cancel download?'**
-  String get cancelDownloadTitle;
-
-  /// Dialog body when confirming cancellation of an active download
-  ///
-  /// In en, this message translates to:
-  /// **'This will cancel the active download for \"{trackName}\".'**
-  String cancelDownloadContent(String trackName);
-
-  /// Dialog button - keep the active download (do not cancel)
-  ///
-  /// In en, this message translates to:
-  /// **'Keep'**
-  String get cancelDownloadKeep;
-
-  /// Snackbar error when FFmpeg fails to write metadata
-  ///
-  /// In en, this message translates to:
-  /// **'Failed to save metadata via FFmpeg'**
-  String get metadataSaveFailedFfmpeg;
-
-  /// Snackbar error when writing metadata file back to storage fails
-  ///
-  /// In en, this message translates to:
-  /// **'Failed to write metadata back to storage'**
-  String get metadataSaveFailedStorage;
-
-  /// Snackbar shown when folder picker fails to open
-  ///
-  /// In en, this message translates to:
-  /// **'Failed to open folder picker: {error}'**
-  String snackbarFolderPickerFailed(String error);
-
-  /// Error state shown when album fails to load
-  ///
-  /// In en, this message translates to:
-  /// **'Failed to load album'**
-  String get errorLoadAlbum;
-
-  /// Error state shown when playlist fails to load
-  ///
-  /// In en, this message translates to:
-  /// **'Failed to load playlist'**
-  String get errorLoadPlaylist;
-
-  /// Error state shown when artist fails to load
-  ///
-  /// In en, this message translates to:
-  /// **'Failed to load artist'**
-  String get errorLoadArtist;
-
-  /// Android notification channel name for download progress
-  ///
-  /// In en, this message translates to:
-  /// **'Download Progress'**
-  String get notifChannelDownloadName;
-
-  /// Android notification channel description for download progress
-  ///
-  /// In en, this message translates to:
-  /// **'Shows download progress for tracks'**
-  String get notifChannelDownloadDesc;
-
-  /// Android notification channel name for library scan
-  ///
-  /// In en, this message translates to:
-  /// **'Library Scan'**
-  String get notifChannelLibraryScanName;
-
-  /// Android notification channel description for library scan
-  ///
-  /// In en, this message translates to:
-  /// **'Shows local library scan progress'**
-  String get notifChannelLibraryScanDesc;
-
-  /// Notification title while downloading a track
-  ///
-  /// In en, this message translates to:
-  /// **'Downloading {trackName}'**
-  String notifDownloadingTrack(String trackName);
-
-  /// Notification title while finalizing (embedding metadata) a track
-  ///
-  /// In en, this message translates to:
-  /// **'Finalizing {trackName}'**
-  String notifFinalizingTrack(String trackName);
-
-  /// Notification body while embedding metadata into a downloaded track
-  ///
-  /// In en, this message translates to:
-  /// **'Embedding metadata...'**
-  String get notifEmbeddingMetadata;
-
-  /// Notification title when track is already in library, with count
-  ///
-  /// In en, this message translates to:
-  /// **'Already in Library ({completed}/{total})'**
-  String notifAlreadyInLibraryCount(int completed, int total);
-
-  /// Notification title when track is already in library
-  ///
-  /// In en, this message translates to:
-  /// **'Already in Library'**
-  String get notifAlreadyInLibrary;
-
-  /// Notification title when download is complete, with count
-  ///
-  /// In en, this message translates to:
-  /// **'Download Complete ({completed}/{total})'**
-  String notifDownloadCompleteCount(int completed, int total);
-
-  /// Notification title when a single download is complete
-  ///
-  /// In en, this message translates to:
-  /// **'Download Complete'**
-  String get notifDownloadComplete;
-
-  /// Notification title when queue finishes with some failures
-  ///
-  /// In en, this message translates to:
-  /// **'Downloads Finished ({completed} done, {failed} failed)'**
-  String notifDownloadsFinished(int completed, int failed);
-
-  /// Notification title when all downloads finish successfully
-  ///
-  /// In en, this message translates to:
-  /// **'All Downloads Complete'**
-  String get notifAllDownloadsComplete;
-
-  /// Notification body for queue complete - how many tracks were downloaded
-  ///
-  /// In en, this message translates to:
-  /// **'{count} tracks downloaded successfully'**
-  String notifTracksDownloadedSuccess(int count);
-
-  /// Notification title while scanning local library
-  ///
-  /// In en, this message translates to:
-  /// **'Scanning local library'**
-  String get notifScanningLibrary;
-
-  /// Notification body for library scan progress when total is known
-  ///
-  /// In en, this message translates to:
-  /// **'{scanned}/{total} files • {percentage}%'**
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  );
-
-  /// Notification body for library scan progress when total is unknown
-  ///
-  /// In en, this message translates to:
-  /// **'{scanned} files scanned • {percentage}%'**
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage);
-
-  /// Notification title when library scan finishes
-  ///
-  /// In en, this message translates to:
-  /// **'Library scan complete'**
-  String get notifLibraryScanComplete;
-
-  /// Notification body for library scan complete - number of indexed tracks
-  ///
-  /// In en, this message translates to:
-  /// **'{count} tracks indexed'**
-  String notifLibraryScanCompleteBody(int count);
-
-  /// Library scan complete suffix - excluded track count
-  ///
-  /// In en, this message translates to:
-  /// **'{count} excluded'**
-  String notifLibraryScanExcluded(int count);
-
-  /// Library scan complete suffix - error count
-  ///
-  /// In en, this message translates to:
-  /// **'{count} errors'**
-  String notifLibraryScanErrors(int count);
-
-  /// Notification title when library scan fails
-  ///
-  /// In en, this message translates to:
-  /// **'Library scan failed'**
-  String get notifLibraryScanFailed;
-
-  /// Notification title when library scan is cancelled by the user
-  ///
-  /// In en, this message translates to:
-  /// **'Library scan cancelled'**
-  String get notifLibraryScanCancelled;
-
-  /// Notification body when library scan is cancelled
-  ///
-  /// In en, this message translates to:
-  /// **'Scan stopped before completion.'**
-  String get notifLibraryScanStopped;
-
-  /// Notification title while downloading an app update
-  ///
-  /// In en, this message translates to:
-  /// **'Downloading SpotiFLAC v{version}'**
-  String notifDownloadingUpdate(String version);
-
-  /// Notification body showing update download progress
-  ///
-  /// In en, this message translates to:
-  /// **'{received} / {total} MB • {percentage}%'**
-  String notifUpdateProgress(String received, String total, int percentage);
-
-  /// Notification title when app update download is complete
-  ///
-  /// In en, this message translates to:
-  /// **'Update Ready'**
-  String get notifUpdateReady;
-
-  /// Notification body when app update is ready to install
-  ///
-  /// In en, this message translates to:
-  /// **'SpotiFLAC v{version} downloaded. Tap to install.'**
-  String notifUpdateReadyBody(String version);
-
-  /// Notification title when app update download fails
-  ///
-  /// In en, this message translates to:
-  /// **'Update Failed'**
-  String get notifUpdateFailed;
-
-  /// Notification body when app update download fails
-  ///
-  /// In en, this message translates to:
-  /// **'Could not download update. Try again later.'**
-  String get notifUpdateFailedBody;
 }
 
 class _AppLocalizationsDelegate

lib/l10n/app_localizations_de.dart

@@ -76,13 +76,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'Dateinamenformat';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'Ordnerstruktur';
 
@@ -165,38 +158,6 @@ class AppLocalizationsDe extends AppLocalizations {
   String get optionsMaxQualityCoverSubtitle =>
       'Cover in höchster Auflösung herunterladen';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => 'Parallele Downloads';
 
@@ -811,36 +772,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlisten';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Abspielen';
 
@@ -1219,12 +1150,6 @@ class AppLocalizationsDe extends AppLocalizations {
   String get trackLyricsNotAvailable =>
       'Lyrics sind für diesen Titel nicht verfügbar';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout =>
       'Anfrage Timeout. Versuche es später erneut.';
@@ -1326,7 +1251,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1524,6 +1449,16 @@ class AppLocalizationsDe extends AppLocalizations {
   String get qualityNote =>
       'Die eigentliche Qualität hängt von der Verfügbarkeit des Dienstes ab';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube bietet nur verlustbehaftete Audioqualität. Deswegen ist es kein Teil des verlustfreien Fallbacks.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Qualität vor Download fragen';
 
@@ -1623,13 +1558,6 @@ class AppLocalizationsDe extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Künstler/Album/ und Künstler/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Ausgewählte löschen';
 
@@ -1896,17 +1824,6 @@ class AppLocalizationsDe extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Zuletzt gescannt: $time';
@@ -1918,9 +1835,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get libraryScanning => 'Scannen...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% von $total Dateien';
@@ -1989,24 +1903,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Format';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sortieren';
 
@@ -2016,18 +1912,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Älteste';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Gerade eben';
 
@@ -2314,30 +2198,6 @@ class AppLocalizationsDe extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Metadaten online suchen und in Datei einbinden';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Metadaten bearbeiten';
 
@@ -2754,6 +2614,10 @@ class AppLocalizationsDe extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3131,294 +2995,4 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }

lib/l10n/app_localizations_en.dart

@@ -21,13 +21,13 @@ class AppLocalizationsEn extends AppLocalizations {
   String get navSettings => 'Settings';
 
   @override
-  String get navStore => 'Repo';
+  String get navStore => 'Store';
 
   @override
   String get homeTitle => 'Home';
 
   @override
-  String get homeSubtitle => 'Paste a supported URL or search by name';
+  String get homeSubtitle => 'Paste a Spotify link or search by name';
 
   @override
   String get homeSupports => 'Supports: Track, Album, Playlist, Artist URLs';
@@ -75,13 +75,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'Filename Format';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'Folder Organization';
 
@@ -161,38 +154,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get optionsMaxQualityCoverSubtitle =>
       'Download highest resolution cover art';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => 'Concurrent Downloads';
 
@@ -209,10 +170,10 @@ class AppLocalizationsEn extends AppLocalizations {
       'Parallel downloads may trigger rate limiting';
 
   @override
-  String get optionsExtensionStore => 'Extension Repo';
+  String get optionsExtensionStore => 'Extension Store';
 
   @override
-  String get optionsExtensionStoreSubtitle => 'Show Repo tab in navigation';
+  String get optionsExtensionStoreSubtitle => 'Show Store tab in navigation';
 
   @override
   String get optionsCheckUpdates => 'Check for Updates';
@@ -289,7 +250,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get extensionsUninstall => 'Uninstall';
 
   @override
-  String get storeTitle => 'Extension Repo';
+  String get storeTitle => 'Extension Store';
 
   @override
   String get storeSearch => 'Search extensions...';
@@ -798,36 +759,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlists';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Play';
 
@@ -1200,12 +1131,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get trackLyricsNotAvailable => 'Lyrics not available for this track';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout => 'Request timed out. Try again later.';
 
@@ -1306,7 +1231,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1500,6 +1425,16 @@ class AppLocalizationsEn extends AppLocalizations {
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1597,13 +1532,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1868,17 +1796,6 @@ class AppLocalizationsEn extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Last scanned: $time';
@@ -1890,9 +1807,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get libraryScanning => 'Scanning...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% of $total files';
@@ -1961,24 +1875,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Format';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sort';
 
@@ -1988,18 +1884,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Oldest';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Just now';
 
@@ -2086,7 +1970,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get tutorialExtensionsTip1 =>
-      'Browse the Repo tab to discover useful extensions';
+      'Browse the Store tab to discover useful extensions';
 
   @override
   String get tutorialExtensionsTip2 =>
@@ -2284,30 +2168,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Search metadata online and embed into file';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Edit Metadata';
 
@@ -2722,6 +2582,10 @@ class AppLocalizationsEn extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3099,294 +2963,4 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }

lib/l10n/app_localizations_es.dart

@@ -75,13 +75,6 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'Filename Format';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'Folder Organization';
 
@@ -161,38 +154,6 @@ class AppLocalizationsEs extends AppLocalizations {
   String get optionsMaxQualityCoverSubtitle =>
       'Download highest resolution cover art';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => 'Concurrent Downloads';
 
@@ -798,36 +759,6 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlists';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Play';
 
@@ -1200,12 +1131,6 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get trackLyricsNotAvailable => 'Lyrics not available for this track';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout => 'Request timed out. Try again later.';
 
@@ -1306,7 +1231,7 @@ class AppLocalizationsEs extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1500,6 +1425,16 @@ class AppLocalizationsEs extends AppLocalizations {
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1597,13 +1532,6 @@ class AppLocalizationsEs extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1868,17 +1796,6 @@ class AppLocalizationsEs extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Last scanned: $time';
@@ -1890,9 +1807,6 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get libraryScanning => 'Scanning...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% of $total files';
@@ -1961,24 +1875,6 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Format';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sort';
 
@@ -1988,18 +1884,6 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Oldest';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Just now';
 
@@ -2086,7 +1970,7 @@ class AppLocalizationsEs extends AppLocalizations {
 
   @override
   String get tutorialExtensionsTip1 =>
-      'Browse the Repo tab to discover useful extensions';
+      'Browse the Store tab to discover useful extensions';
 
   @override
   String get tutorialExtensionsTip2 =>
@@ -2284,30 +2168,6 @@ class AppLocalizationsEs extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Search metadata online and embed into file';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Edit Metadata';
 
@@ -2722,6 +2582,10 @@ class AppLocalizationsEs extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3099,296 +2963,6 @@ class AppLocalizationsEs extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }
 
 /// The translations for Spanish Castilian, as used in Spain (`es_ES`).
@@ -4760,6 +4334,16 @@ class AppLocalizationsEsEs extends AppLocalizationsEs {
   String get qualityNote =>
       'La calidad real depende de la disponibilidad de la pista del servicio';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Preguntar antes de descargar';
 

lib/l10n/app_localizations_fr.dart

@@ -75,13 +75,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'Nom du fichier';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'Organisation du dossier';
 
@@ -163,38 +156,6 @@ class AppLocalizationsFr extends AppLocalizations {
   String get optionsMaxQualityCoverSubtitle =>
       'Download highest resolution cover art';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => 'Concurrent Downloads';
 
@@ -800,36 +761,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlists';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Play';
 
@@ -1202,12 +1133,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get trackLyricsNotAvailable => 'Lyrics not available for this track';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout => 'Request timed out. Try again later.';
 
@@ -1308,7 +1233,7 @@ class AppLocalizationsFr extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1502,6 +1427,16 @@ class AppLocalizationsFr extends AppLocalizations {
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1599,13 +1534,6 @@ class AppLocalizationsFr extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1870,17 +1798,6 @@ class AppLocalizationsFr extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Last scanned: $time';
@@ -1892,9 +1809,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get libraryScanning => 'Scanning...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% of $total files';
@@ -1963,24 +1877,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Format';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sort';
 
@@ -1990,18 +1886,6 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Oldest';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Just now';
 
@@ -2286,30 +2170,6 @@ class AppLocalizationsFr extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Search metadata online and embed into file';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Edit Metadata';
 
@@ -2723,6 +2583,10 @@ class AppLocalizationsFr extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3100,294 +2964,4 @@ class AppLocalizationsFr extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }

lib/l10n/app_localizations_hi.dart

@@ -75,13 +75,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'Filename Format';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'Folder Organization';
 
@@ -161,38 +154,6 @@ class AppLocalizationsHi extends AppLocalizations {
   String get optionsMaxQualityCoverSubtitle =>
       'Download highest resolution cover art';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => 'Concurrent Downloads';
 
@@ -798,36 +759,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlists';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Play';
 
@@ -1200,12 +1131,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get trackLyricsNotAvailable => 'Lyrics not available for this track';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout => 'Request timed out. Try again later.';
 
@@ -1306,7 +1231,7 @@ class AppLocalizationsHi extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1500,6 +1425,16 @@ class AppLocalizationsHi extends AppLocalizations {
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1597,13 +1532,6 @@ class AppLocalizationsHi extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1868,17 +1796,6 @@ class AppLocalizationsHi extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Last scanned: $time';
@@ -1890,9 +1807,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get libraryScanning => 'Scanning...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% of $total files';
@@ -1961,24 +1875,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Format';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sort';
 
@@ -1988,18 +1884,6 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Oldest';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Just now';
 
@@ -2284,30 +2168,6 @@ class AppLocalizationsHi extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Search metadata online and embed into file';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Edit Metadata';
 
@@ -2721,6 +2581,10 @@ class AppLocalizationsHi extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3098,294 +2962,4 @@ class AppLocalizationsHi extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }

lib/l10n/app_localizations_id.dart

@@ -21,14 +21,13 @@ class AppLocalizationsId extends AppLocalizations {
   String get navSettings => 'Pengaturan';
 
   @override
-  String get navStore => 'Repo';
+  String get navStore => 'Toko';
 
   @override
   String get homeTitle => 'Beranda';
 
   @override
-  String get homeSubtitle =>
-      'Tempel URL yang didukung atau cari berdasarkan nama';
+  String get homeSubtitle => 'Tempel link Spotify atau cari berdasarkan nama';
 
   @override
   String get homeSupports => 'Mendukung: URL Track, Album, Playlist, Artis';
@@ -76,13 +75,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'Format Nama File';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'Organisasi Folder';
 
@@ -165,38 +157,6 @@ class AppLocalizationsId extends AppLocalizations {
   String get optionsMaxQualityCoverSubtitle =>
       'Unduh cover art resolusi tertinggi';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => 'Unduhan Bersamaan';
 
@@ -213,10 +173,10 @@ class AppLocalizationsId extends AppLocalizations {
       'Unduhan paralel dapat memicu pembatasan rate';
 
   @override
-  String get optionsExtensionStore => 'Repo Ekstensi';
+  String get optionsExtensionStore => 'Toko Ekstensi';
 
   @override
-  String get optionsExtensionStoreSubtitle => 'Tampilkan tab Repo di navigasi';
+  String get optionsExtensionStoreSubtitle => 'Tampilkan tab Toko di navigasi';
 
   @override
   String get optionsCheckUpdates => 'Periksa Pembaruan';
@@ -292,7 +252,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get extensionsUninstall => 'Copot';
 
   @override
-  String get storeTitle => 'Repo Ekstensi';
+  String get storeTitle => 'Toko Ekstensi';
 
   @override
   String get storeSearch => 'Cari ekstensi...';
@@ -802,36 +762,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlist';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Putar';
 
@@ -1207,12 +1137,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get trackLyricsNotAvailable => 'Lirik tidak tersedia untuk lagu ini';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout => 'Permintaan timeout. Coba lagi nanti.';
 
@@ -1313,7 +1237,7 @@ class AppLocalizationsId extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Gagal memuat repo';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1509,6 +1433,16 @@ class AppLocalizationsId extends AppLocalizations {
   String get qualityNote =>
       'Kualitas sebenarnya tergantung ketersediaan lagu dari layanan';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube hanya menyediakan audio terkompresi (lossy). Bukan bagian dari fallback lossless.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'Bitrate YouTube Opus';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'Kecepatan Bit MP3 YouTube';
+
   @override
   String get downloadAskBeforeDownload => 'Tanya Sebelum Unduh';
 
@@ -1607,13 +1541,6 @@ class AppLocalizationsId extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artis/Album/ dan Artis/Single/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Hapus yang Dipilih';
 
@@ -1878,17 +1805,6 @@ class AppLocalizationsId extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Last scanned: $time';
@@ -1900,9 +1816,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get libraryScanning => 'Scanning...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% of $total files';
@@ -1971,24 +1884,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Format';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sort';
 
@@ -1998,18 +1893,6 @@ class AppLocalizationsId extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Oldest';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Just now';
 
@@ -2096,7 +1979,7 @@ class AppLocalizationsId extends AppLocalizations {
 
   @override
   String get tutorialExtensionsTip1 =>
-      'Buka tab Repo untuk menemukan ekstensi yang berguna';
+      'Browse the Store tab to discover useful extensions';
 
   @override
   String get tutorialExtensionsTip2 =>
@@ -2294,30 +2177,6 @@ class AppLocalizationsId extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Search metadata online and embed into file';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Edit Metadata';
 
@@ -2732,6 +2591,10 @@ class AppLocalizationsId extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3109,294 +2972,4 @@ class AppLocalizationsId extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }

lib/l10n/app_localizations_ja.dart

@@ -75,13 +75,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'ファイル名の形式';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'フォルダ構成';
 
@@ -159,38 +152,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get optionsMaxQualityCoverSubtitle => '最高解像度のカバーアートをダウンロード';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => '同時ダウンロード';
 
@@ -793,36 +754,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get searchPlaylists => 'プレイリスト';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => '再生';
 
@@ -1194,12 +1125,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get trackLyricsNotAvailable => 'このトラックの歌詞は利用できません';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout => 'リクエストがタイムアウトしました。後ほどお試しください。';
 
@@ -1300,7 +1225,7 @@ class AppLocalizationsJa extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1489,6 +1414,16 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get qualityNote => '実際の品質はサービスからのトラックの可用性に依存します';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus のビットレート';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 のビットレート';
+
   @override
   String get downloadAskBeforeDownload => 'ダウンロード前に確認する';
 
@@ -1584,13 +1519,6 @@ class AppLocalizationsJa extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => '選択済みを削除';
 
@@ -1855,17 +1783,6 @@ class AppLocalizationsJa extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return '最終スキャン: $time';
@@ -1877,9 +1794,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get libraryScanning => 'スキャン中...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% of $total files';
@@ -1948,24 +1862,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get libraryFilterFormat => '形式';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sort';
 
@@ -1975,18 +1871,6 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Oldest';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Just now';
 
@@ -2271,30 +2155,6 @@ class AppLocalizationsJa extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Search metadata online and embed into file';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'メタデータを編集';
 
@@ -2708,6 +2568,10 @@ class AppLocalizationsJa extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3085,294 +2949,4 @@ class AppLocalizationsJa extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }

lib/l10n/app_localizations_ko.dart

@@ -74,13 +74,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get downloadFilenameFormat => '파일 이름 형식';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => '폴더 분류 형식';
 
@@ -155,38 +148,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get optionsMaxQualityCoverSubtitle => '최고 품질의 커버 이미지를 다운로드';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => '동시 다운로드';
 
@@ -780,36 +741,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get searchPlaylists => '재생목록들';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => '재생';
 
@@ -1180,12 +1111,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get trackLyricsNotAvailable => 'Lyrics not available for this track';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout => 'Request timed out. Try again later.';
 
@@ -1286,7 +1211,7 @@ class AppLocalizationsKo extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1480,6 +1405,16 @@ class AppLocalizationsKo extends AppLocalizations {
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1577,13 +1512,6 @@ class AppLocalizationsKo extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1848,17 +1776,6 @@ class AppLocalizationsKo extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Last scanned: $time';
@@ -1870,9 +1787,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get libraryScanning => 'Scanning...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% of $total files';
@@ -1941,24 +1855,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Format';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sort';
 
@@ -1968,18 +1864,6 @@ class AppLocalizationsKo extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Oldest';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Just now';
 
@@ -2264,30 +2148,6 @@ class AppLocalizationsKo extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Search metadata online and embed into file';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Edit Metadata';
 
@@ -2701,6 +2561,10 @@ class AppLocalizationsKo extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3078,294 +2942,4 @@ class AppLocalizationsKo extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }

lib/l10n/app_localizations_nl.dart

@@ -75,13 +75,6 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'Filename Format';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'Folder Organization';
 
@@ -161,38 +154,6 @@ class AppLocalizationsNl extends AppLocalizations {
   String get optionsMaxQualityCoverSubtitle =>
       'Download highest resolution cover art';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => 'Concurrent Downloads';
 
@@ -798,36 +759,6 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlists';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Play';
 
@@ -1200,12 +1131,6 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get trackLyricsNotAvailable => 'Lyrics not available for this track';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout => 'Request timed out. Try again later.';
 
@@ -1306,7 +1231,7 @@ class AppLocalizationsNl extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1500,6 +1425,16 @@ class AppLocalizationsNl extends AppLocalizations {
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1597,13 +1532,6 @@ class AppLocalizationsNl extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1868,17 +1796,6 @@ class AppLocalizationsNl extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Last scanned: $time';
@@ -1890,9 +1807,6 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get libraryScanning => 'Scanning...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% of $total files';
@@ -1961,24 +1875,6 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Format';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sort';
 
@@ -1988,18 +1884,6 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Oldest';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Just now';
 
@@ -2284,30 +2168,6 @@ class AppLocalizationsNl extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Search metadata online and embed into file';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Edit Metadata';
 
@@ -2721,6 +2581,10 @@ class AppLocalizationsNl extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3098,294 +2962,4 @@ class AppLocalizationsNl extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }

lib/l10n/app_localizations_pt.dart

@@ -75,13 +75,6 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'Filename Format';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'Folder Organization';
 
@@ -161,38 +154,6 @@ class AppLocalizationsPt extends AppLocalizations {
   String get optionsMaxQualityCoverSubtitle =>
       'Download highest resolution cover art';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => 'Concurrent Downloads';
 
@@ -798,36 +759,6 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlists';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Play';
 
@@ -1200,12 +1131,6 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get trackLyricsNotAvailable => 'Lyrics not available for this track';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout => 'Request timed out. Try again later.';
 
@@ -1306,7 +1231,7 @@ class AppLocalizationsPt extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1500,6 +1425,16 @@ class AppLocalizationsPt extends AppLocalizations {
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1597,13 +1532,6 @@ class AppLocalizationsPt extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1868,17 +1796,6 @@ class AppLocalizationsPt extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Last scanned: $time';
@@ -1890,9 +1807,6 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get libraryScanning => 'Scanning...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% of $total files';
@@ -1961,24 +1875,6 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Format';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sort';
 
@@ -1988,18 +1884,6 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Oldest';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Just now';
 
@@ -2086,7 +1970,7 @@ class AppLocalizationsPt extends AppLocalizations {
 
   @override
   String get tutorialExtensionsTip1 =>
-      'Browse the Repo tab to discover useful extensions';
+      'Browse the Store tab to discover useful extensions';
 
   @override
   String get tutorialExtensionsTip2 =>
@@ -2284,30 +2168,6 @@ class AppLocalizationsPt extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Search metadata online and embed into file';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Edit Metadata';
 
@@ -2722,6 +2582,10 @@ class AppLocalizationsPt extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3099,296 +2963,6 @@ class AppLocalizationsPt extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }
 
 /// The translations for Portuguese, as used in Portugal (`pt_PT`).
@@ -4757,6 +4331,16 @@ class AppLocalizationsPtPt extends AppLocalizationsPt {
   String get qualityNote =>
       'A qualidade real depende da faixa que estiver disponível no serviço';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Perguntar qualidade antes de baixar';
 

lib/l10n/app_localizations_ru.dart

@@ -76,13 +76,6 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'Формат имени файла';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'Организация папок';
 
@@ -166,38 +159,6 @@ class AppLocalizationsRu extends AppLocalizations {
   String get optionsMaxQualityCoverSubtitle =>
       'Скачивать обложку в макс. разрешении';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => 'Одновременные загрузки';
 
@@ -812,36 +773,6 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get searchPlaylists => 'Плейлисты';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Воспроизвести';
 
@@ -1220,12 +1151,6 @@ class AppLocalizationsRu extends AppLocalizations {
   String get trackLyricsNotAvailable =>
       'Текст песни недоступен для этого трека';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout =>
       'Время ожидания запроса истекло. Повторите попытку позже.';
@@ -1327,7 +1252,7 @@ class AppLocalizationsRu extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1525,6 +1450,16 @@ class AppLocalizationsRu extends AppLocalizations {
   String get qualityNote =>
       'Фактическое качество зависит от доступности треков в сервисе';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube обеспечивает только звук с потерями(Lossy).';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'Битрейт YouTube Opus';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'Битрейт YouTube MP3';
+
   @override
   String get downloadAskBeforeDownload => 'Спрашивать перед скачиванием';
 
@@ -1626,13 +1561,6 @@ class AppLocalizationsRu extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Исполнитель/Альбом и Исполнитель/Сингл/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Удалить выбранные';
 
@@ -1906,17 +1834,6 @@ class AppLocalizationsRu extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Последнее сканирование: $time';
@@ -1928,9 +1845,6 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get libraryScanning => 'Сканирование...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% из $total файлов';
@@ -2007,24 +1921,6 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Формат';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Сортировка';
 
@@ -2034,18 +1930,6 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Старые';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Только что';
 
@@ -2336,30 +2220,6 @@ class AppLocalizationsRu extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Поиск в сети метаданных и встраивание в файл';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Редактировать метаданные';
 
@@ -2781,6 +2641,10 @@ class AppLocalizationsRu extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3158,294 +3022,4 @@ class AppLocalizationsRu extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }

lib/l10n/app_localizations_tr.dart

@@ -76,13 +76,6 @@ class AppLocalizationsTr extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'Dosya adı formatı';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'Dosya Organizasyonu';
 
@@ -164,38 +157,6 @@ class AppLocalizationsTr extends AppLocalizations {
   String get optionsMaxQualityCoverSubtitle =>
       'En yüksek kalitedeki albüm kapaklarını indir';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => 'Eş Zamanlı İndirmeler';
 
@@ -803,36 +764,6 @@ class AppLocalizationsTr extends AppLocalizations {
   @override
   String get searchPlaylists => 'Çalma Listeleri';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Oynat';
 
@@ -1206,12 +1137,6 @@ class AppLocalizationsTr extends AppLocalizations {
   @override
   String get trackLyricsNotAvailable => 'Lyrics not available for this track';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout => 'Request timed out. Try again later.';
 
@@ -1312,7 +1237,7 @@ class AppLocalizationsTr extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1506,6 +1431,16 @@ class AppLocalizationsTr extends AppLocalizations {
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1603,13 +1538,6 @@ class AppLocalizationsTr extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1874,17 +1802,6 @@ class AppLocalizationsTr extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Last scanned: $time';
@@ -1896,9 +1813,6 @@ class AppLocalizationsTr extends AppLocalizations {
   @override
   String get libraryScanning => 'Scanning...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% of $total files';
@@ -1967,24 +1881,6 @@ class AppLocalizationsTr extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Format';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sort';
 
@@ -1994,18 +1890,6 @@ class AppLocalizationsTr extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Oldest';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Just now';
 
@@ -2290,30 +2174,6 @@ class AppLocalizationsTr extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Search metadata online and embed into file';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Edit Metadata';
 
@@ -2727,6 +2587,10 @@ class AppLocalizationsTr extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3104,294 +2968,4 @@ class AppLocalizationsTr extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }

lib/l10n/app_localizations_zh.dart

@@ -75,13 +75,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get downloadFilenameFormat => 'Filename Format';
 
-  @override
-  String get downloadSingleFilenameFormat => 'Single Filename Format';
-
-  @override
-  String get downloadSingleFilenameFormatDescription =>
-      'Filename pattern for singles and EPs. Uses the same tags as the album format.';
-
   @override
   String get downloadFolderOrganization => 'Folder Organization';
 
@@ -161,38 +154,6 @@ class AppLocalizationsZh extends AppLocalizations {
   String get optionsMaxQualityCoverSubtitle =>
       'Download highest resolution cover art';
 
-  @override
-  String get optionsReplayGain => 'ReplayGain';
-
-  @override
-  String get optionsReplayGainSubtitleOn =>
-      'Scan loudness and embed ReplayGain tags (EBU R128)';
-
-  @override
-  String get optionsReplayGainSubtitleOff =>
-      'Disabled: no loudness normalization tags';
-
-  @override
-  String get optionsArtistTagMode => 'Artist Tag Mode';
-
-  @override
-  String get optionsArtistTagModeDescription =>
-      'Choose how multiple artists are written into embedded tags.';
-
-  @override
-  String get optionsArtistTagModeJoined => 'Single joined value';
-
-  @override
-  String get optionsArtistTagModeJoinedSubtitle =>
-      'Write one ARTIST value like \"Artist A, Artist B\" for maximum player compatibility.';
-
-  @override
-  String get optionsArtistTagModeSplitVorbis => 'Split tags for FLAC/Opus';
-
-  @override
-  String get optionsArtistTagModeSplitVorbisSubtitle =>
-      'Write one artist tag per artist for FLAC and Opus; MP3 and M4A stay joined.';
-
   @override
   String get optionsConcurrentDownloads => 'Concurrent Downloads';
 
@@ -798,36 +759,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get searchPlaylists => 'Playlists';
 
-  @override
-  String get searchSortTitle => 'Sort Results';
-
-  @override
-  String get searchSortDefault => 'Default';
-
-  @override
-  String get searchSortTitleAZ => 'Title (A-Z)';
-
-  @override
-  String get searchSortTitleZA => 'Title (Z-A)';
-
-  @override
-  String get searchSortArtistAZ => 'Artist (A-Z)';
-
-  @override
-  String get searchSortArtistZA => 'Artist (Z-A)';
-
-  @override
-  String get searchSortDurationShort => 'Duration (Shortest)';
-
-  @override
-  String get searchSortDurationLong => 'Duration (Longest)';
-
-  @override
-  String get searchSortDateOldest => 'Release Date (Oldest)';
-
-  @override
-  String get searchSortDateNewest => 'Release Date (Newest)';
-
   @override
   String get tooltipPlay => 'Play';
 
@@ -1200,12 +1131,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get trackLyricsNotAvailable => 'Lyrics not available for this track';
 
-  @override
-  String get trackLyricsNotInFile => 'No lyrics found in this file';
-
-  @override
-  String get trackFetchOnlineLyrics => 'Fetch from Online';
-
   @override
   String get trackLyricsTimeout => 'Request timed out. Try again later.';
 
@@ -1306,7 +1231,7 @@ class AppLocalizationsZh extends AppLocalizations {
   String get storeNewRepoUrlLabel => 'New Repository URL';
 
   @override
-  String get storeLoadError => 'Failed to load repository';
+  String get storeLoadError => 'Failed to load store';
 
   @override
   String get storeEmptyNoExtensions => 'No extensions available';
@@ -1500,6 +1425,16 @@ class AppLocalizationsZh extends AppLocalizations {
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -1597,13 +1532,6 @@ class AppLocalizationsZh extends AppLocalizations {
   String get albumFolderArtistAlbumSinglesSubtitle =>
       'Artist/Album/ and Artist/Singles/';
 
-  @override
-  String get albumFolderArtistAlbumFlat => 'Artist / Album (Singles flat)';
-
-  @override
-  String get albumFolderArtistAlbumFlatSubtitle =>
-      'Artist/Album/ and Artist/song.flac';
-
   @override
   String get downloadedAlbumDeleteSelected => 'Delete Selected';
 
@@ -1868,17 +1796,6 @@ class AppLocalizationsZh extends AppLocalizations {
     return '$_temp0';
   }
 
-  @override
-  String libraryFilesUnit(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: 'files',
-      one: 'file',
-    );
-    return '$_temp0';
-  }
-
   @override
   String libraryLastScanned(String time) {
     return 'Last scanned: $time';
@@ -1890,9 +1807,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get libraryScanning => 'Scanning...';
 
-  @override
-  String get libraryScanFinalizing => 'Finalizing library...';
-
   @override
   String libraryScanProgress(String progress, int total) {
     return '$progress% of $total files';
@@ -1961,24 +1875,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get libraryFilterFormat => 'Format';
 
-  @override
-  String get libraryFilterMetadata => 'Metadata';
-
-  @override
-  String get libraryFilterMetadataComplete => 'Complete metadata';
-
-  @override
-  String get libraryFilterMetadataMissingAny => 'Missing any metadata';
-
-  @override
-  String get libraryFilterMetadataMissingYear => 'Missing year';
-
-  @override
-  String get libraryFilterMetadataMissingGenre => 'Missing genre';
-
-  @override
-  String get libraryFilterMetadataMissingAlbumArtist => 'Missing album artist';
-
   @override
   String get libraryFilterSort => 'Sort';
 
@@ -1988,18 +1884,6 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get libraryFilterSortOldest => 'Oldest';
 
-  @override
-  String get libraryFilterSortAlbumAsc => 'Album (A-Z)';
-
-  @override
-  String get libraryFilterSortAlbumDesc => 'Album (Z-A)';
-
-  @override
-  String get libraryFilterSortGenreAsc => 'Genre (A-Z)';
-
-  @override
-  String get libraryFilterSortGenreDesc => 'Genre (Z-A)';
-
   @override
   String get timeJustNow => 'Just now';
 
@@ -2086,7 +1970,7 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String get tutorialExtensionsTip1 =>
-      'Browse the Repo tab to discover useful extensions';
+      'Browse the Store tab to discover useful extensions';
 
   @override
   String get tutorialExtensionsTip2 =>
@@ -2284,30 +2168,6 @@ class AppLocalizationsZh extends AppLocalizations {
   String get trackReEnrichOnlineSubtitle =>
       'Search metadata online and embed into file';
 
-  @override
-  String get trackReEnrichFieldsTitle => 'Fields to update';
-
-  @override
-  String get trackReEnrichFieldCover => 'Cover Art';
-
-  @override
-  String get trackReEnrichFieldLyrics => 'Lyrics';
-
-  @override
-  String get trackReEnrichFieldBasicTags => 'Album, Album Artist';
-
-  @override
-  String get trackReEnrichFieldTrackInfo => 'Track & Disc Number';
-
-  @override
-  String get trackReEnrichFieldReleaseInfo => 'Date & ISRC';
-
-  @override
-  String get trackReEnrichFieldExtra => 'Genre, Label, Copyright';
-
-  @override
-  String get trackReEnrichSelectAll => 'Select All';
-
   @override
   String get trackEditMetadata => 'Edit Metadata';
 
@@ -2722,6 +2582,10 @@ class AppLocalizationsZh extends AppLocalizations {
   String get lyricsProvidersDiscardContent =>
       'You have unsaved changes that will be lost.';
 
+  @override
+  String get lyricsProviderSpotifyApiDesc =>
+      'Spotify-sourced synced lyrics via community API';
+
   @override
   String get lyricsProviderLrclibDesc => 'Open-source synced lyrics database';
 
@@ -3099,296 +2963,6 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String get editMetadataSelectEmpty => 'Empty only';
-
-  @override
-  String queueDownloadingCount(int count) {
-    return 'Downloading ($count)';
-  }
-
-  @override
-  String get queueDownloadedHeader => 'Downloaded';
-
-  @override
-  String get queueFilteringIndicator => 'Filtering...';
-
-  @override
-  String queueTrackCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count tracks',
-      one: '1 track',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String queueAlbumCount(int count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count albums',
-      one: '1 album',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get queueEmptyAlbums => 'No album downloads';
-
-  @override
-  String get queueEmptyAlbumsSubtitle =>
-      'Download multiple tracks from an album to see them here';
-
-  @override
-  String get queueEmptySingles => 'No single downloads';
-
-  @override
-  String get queueEmptySinglesSubtitle =>
-      'Single track downloads will appear here';
-
-  @override
-  String get queueEmptyHistory => 'No download history';
-
-  @override
-  String get queueEmptyHistorySubtitle => 'Downloaded tracks will appear here';
-
-  @override
-  String get selectionAllPlaylistsSelected => 'All playlists selected';
-
-  @override
-  String get selectionTapPlaylistsToSelect => 'Tap playlists to select';
-
-  @override
-  String get selectionSelectPlaylistsToDelete => 'Select playlists to delete';
-
-  @override
-  String get audioAnalysisTitle => 'Audio Quality Analysis';
-
-  @override
-  String get audioAnalysisDescription =>
-      'Verify lossless quality with spectrum analysis';
-
-  @override
-  String get audioAnalysisAnalyzing => 'Analyzing audio...';
-
-  @override
-  String get audioAnalysisSampleRate => 'Sample Rate';
-
-  @override
-  String get audioAnalysisBitDepth => 'Bit Depth';
-
-  @override
-  String get audioAnalysisChannels => 'Channels';
-
-  @override
-  String get audioAnalysisDuration => 'Duration';
-
-  @override
-  String get audioAnalysisNyquist => 'Nyquist';
-
-  @override
-  String get audioAnalysisFileSize => 'Size';
-
-  @override
-  String get audioAnalysisDynamicRange => 'Dynamic Range';
-
-  @override
-  String get audioAnalysisPeak => 'Peak';
-
-  @override
-  String get audioAnalysisRms => 'RMS';
-
-  @override
-  String get audioAnalysisSamples => 'Samples';
-
-  @override
-  String extensionsSearchWith(String providerName) {
-    return 'Search with $providerName';
-  }
-
-  @override
-  String get extensionsHomeFeedProvider => 'Home Feed Provider';
-
-  @override
-  String get extensionsHomeFeedDescription =>
-      'Choose which extension provides the home feed on the main screen';
-
-  @override
-  String get extensionsHomeFeedAuto => 'Auto';
-
-  @override
-  String get extensionsHomeFeedAutoSubtitle =>
-      'Automatically select the best available';
-
-  @override
-  String extensionsHomeFeedUse(String extensionName) {
-    return 'Use $extensionName home feed';
-  }
-
-  @override
-  String get extensionsNoHomeFeedExtensions => 'No extensions with home feed';
-
-  @override
-  String get sortAlphaAsc => 'A-Z';
-
-  @override
-  String get sortAlphaDesc => 'Z-A';
-
-  @override
-  String get cancelDownloadTitle => 'Cancel download?';
-
-  @override
-  String cancelDownloadContent(String trackName) {
-    return 'This will cancel the active download for \"$trackName\".';
-  }
-
-  @override
-  String get cancelDownloadKeep => 'Keep';
-
-  @override
-  String get metadataSaveFailedFfmpeg => 'Failed to save metadata via FFmpeg';
-
-  @override
-  String get metadataSaveFailedStorage =>
-      'Failed to write metadata back to storage';
-
-  @override
-  String snackbarFolderPickerFailed(String error) {
-    return 'Failed to open folder picker: $error';
-  }
-
-  @override
-  String get errorLoadAlbum => 'Failed to load album';
-
-  @override
-  String get errorLoadPlaylist => 'Failed to load playlist';
-
-  @override
-  String get errorLoadArtist => 'Failed to load artist';
-
-  @override
-  String get notifChannelDownloadName => 'Download Progress';
-
-  @override
-  String get notifChannelDownloadDesc => 'Shows download progress for tracks';
-
-  @override
-  String get notifChannelLibraryScanName => 'Library Scan';
-
-  @override
-  String get notifChannelLibraryScanDesc => 'Shows local library scan progress';
-
-  @override
-  String notifDownloadingTrack(String trackName) {
-    return 'Downloading $trackName';
-  }
-
-  @override
-  String notifFinalizingTrack(String trackName) {
-    return 'Finalizing $trackName';
-  }
-
-  @override
-  String get notifEmbeddingMetadata => 'Embedding metadata...';
-
-  @override
-  String notifAlreadyInLibraryCount(int completed, int total) {
-    return 'Already in Library ($completed/$total)';
-  }
-
-  @override
-  String get notifAlreadyInLibrary => 'Already in Library';
-
-  @override
-  String notifDownloadCompleteCount(int completed, int total) {
-    return 'Download Complete ($completed/$total)';
-  }
-
-  @override
-  String get notifDownloadComplete => 'Download Complete';
-
-  @override
-  String notifDownloadsFinished(int completed, int failed) {
-    return 'Downloads Finished ($completed done, $failed failed)';
-  }
-
-  @override
-  String get notifAllDownloadsComplete => 'All Downloads Complete';
-
-  @override
-  String notifTracksDownloadedSuccess(int count) {
-    return '$count tracks downloaded successfully';
-  }
-
-  @override
-  String get notifScanningLibrary => 'Scanning local library';
-
-  @override
-  String notifLibraryScanProgressWithTotal(
-    int scanned,
-    int total,
-    int percentage,
-  ) {
-    return '$scanned/$total files • $percentage%';
-  }
-
-  @override
-  String notifLibraryScanProgressNoTotal(int scanned, int percentage) {
-    return '$scanned files scanned • $percentage%';
-  }
-
-  @override
-  String get notifLibraryScanComplete => 'Library scan complete';
-
-  @override
-  String notifLibraryScanCompleteBody(int count) {
-    return '$count tracks indexed';
-  }
-
-  @override
-  String notifLibraryScanExcluded(int count) {
-    return '$count excluded';
-  }
-
-  @override
-  String notifLibraryScanErrors(int count) {
-    return '$count errors';
-  }
-
-  @override
-  String get notifLibraryScanFailed => 'Library scan failed';
-
-  @override
-  String get notifLibraryScanCancelled => 'Library scan cancelled';
-
-  @override
-  String get notifLibraryScanStopped => 'Scan stopped before completion.';
-
-  @override
-  String notifDownloadingUpdate(String version) {
-    return 'Downloading SpotiFLAC v$version';
-  }
-
-  @override
-  String notifUpdateProgress(String received, String total, int percentage) {
-    return '$received / $total MB • $percentage%';
-  }
-
-  @override
-  String get notifUpdateReady => 'Update Ready';
-
-  @override
-  String notifUpdateReadyBody(String version) {
-    return 'SpotiFLAC v$version downloaded. Tap to install.';
-  }
-
-  @override
-  String get notifUpdateFailed => 'Update Failed';
-
-  @override
-  String get notifUpdateFailedBody =>
-      'Could not download update. Try again later.';
 }
 
 /// The translations for Chinese, as used in China (`zh_CN`).
@@ -4723,6 +4297,16 @@ class AppLocalizationsZhCn extends AppLocalizationsZh {
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 
@@ -7119,6 +6703,16 @@ class AppLocalizationsZhTw extends AppLocalizationsZh {
   String get qualityNote =>
       'Actual quality depends on track availability from the service';
 
+  @override
+  String get youtubeQualityNote =>
+      'YouTube provides lossy audio only. Not part of lossless fallback.';
+
+  @override
+  String get youtubeOpusBitrateTitle => 'YouTube Opus Bitrate';
+
+  @override
+  String get youtubeMp3BitrateTitle => 'YouTube MP3 Bitrate';
+
   @override
   String get downloadAskBeforeDownload => 'Ask Before Download';
 

lib/l10n/arb/app_en.arb

@@ -158,6 +158,14 @@
       }
     }
   },
+  "optionsDefaultSearchTab": "Default Search Tab",
+  "@optionsDefaultSearchTab": {
+    "description": "Title for the preferred default search tab setting"
+  },
+  "optionsDefaultSearchTabSubtitle": "Choose which tab opens first for new search results.",
+  "@optionsDefaultSearchTabSubtitle": {
+    "description": "Subtitle for the preferred default search tab setting"
+  },
   "optionsSwitchBack": "Tap Deezer or Spotify to switch back from extension",
   "@optionsSwitchBack": {
     "description": "Hint to switch back to built-in providers"
@@ -422,6 +430,10 @@
   "@aboutPCSource": {
     "description": "Link to PC GitHub repo"
   },
+  "aboutKeepAndroidOpen": "Keep Android Open",
+  "@aboutKeepAndroidOpen": {
+    "description": "Link to Keep Android Open campaign website"
+  },
   "aboutReportIssue": "Report an issue",
   "@aboutReportIssue": {
     "description": "Link to report bugs"
@@ -1203,6 +1215,18 @@
   "@providerPriorityInfo": {
     "description": "Info tip about fallback behavior"
   },
+  "providerPriorityFallbackExtensionsTitle": "Extension Fallback",
+  "@providerPriorityFallbackExtensionsTitle": {
+    "description": "Section title for choosing which download extensions can be used as fallback providers"
+  },
+  "providerPriorityFallbackExtensionsDescription": "Choose which installed download extensions can be used during automatic fallback. Built-in providers still follow the priority order above.",
+  "@providerPriorityFallbackExtensionsDescription": {
+    "description": "Section description for extension fallback selection"
+  },
+  "providerPriorityFallbackExtensionsHint": "Only enabled extensions with download-provider capability are listed here.",
+  "@providerPriorityFallbackExtensionsHint": {
+    "description": "Hint below the extension fallback selection list"
+  },
   "providerBuiltIn": "Built-in",
   "@providerBuiltIn": {
     "description": "Label for built-in providers (Tidal/Qobuz)"
@@ -1857,6 +1881,14 @@
   "@extensionsDownloadPrioritySubtitle": {
     "description": "Subtitle for download priority"
   },
+  "extensionsFallbackTitle": "Fallback Extensions",
+  "@extensionsFallbackTitle": {
+    "description": "Setting and page title for choosing which download extensions can be used during fallback"
+  },
+  "extensionsFallbackSubtitle": "Choose which installed download extensions can be used as fallback",
+  "@extensionsFallbackSubtitle": {
+    "description": "Subtitle for download fallback extensions menu"
+  },
   "extensionsNoDownloadProvider": "No extensions with download provider",
   "@extensionsNoDownloadProvider": {
     "description": "Empty state - no download providers"

lib/l10n/arb/app_es_ES.arb

@@ -1773,6 +1773,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Preguntar antes de descargar",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"

lib/l10n/arb/app_pt_PT.arb

@@ -1773,6 +1773,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Perguntar qualidade antes de baixar",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"

lib/l10n/arb/app_tr.arb

@@ -1773,6 +1773,18 @@
   "@qualityNote": {
     "description": "Note about quality availability"
   },
+  "youtubeQualityNote": "YouTube provides lossy audio only. Not part of lossless fallback.",
+  "@youtubeQualityNote": {
+    "description": "Note for YouTube service explaining lossy-only quality"
+  },
+  "youtubeOpusBitrateTitle": "YouTube Opus Bitrate",
+  "@youtubeOpusBitrateTitle": {
+    "description": "Title for YouTube Opus bitrate setting"
+  },
+  "youtubeMp3BitrateTitle": "YouTube MP3 Bitrate",
+  "@youtubeMp3BitrateTitle": {
+    "description": "Title for YouTube MP3 bitrate setting"
+  },
   "downloadAskBeforeDownload": "Ask Before Download",
   "@downloadAskBeforeDownload": {
     "description": "Setting - show quality picker"

lib/main.dart

@@ -82,6 +82,7 @@ class _RuntimeProfile {
   });
 }
 
+/// Widget to eagerly initialize providers that need to load data on startup
 class _EagerInitialization extends ConsumerStatefulWidget {
   const _EagerInitialization({required this.child});
   final Widget child;
@@ -169,8 +170,10 @@ class _EagerInitializationState extends ConsumerState<_EagerInitialization>
       const Duration(milliseconds: 1600),
       () {
         ref.read(localLibraryProvider);
+        // Trigger auto-scan after initial warmup on first app launch.
         if (!_autoScanTriggeredOnLaunch) {
           _autoScanTriggeredOnLaunch = true;
+          // Give the provider a moment to load existing data before scanning.
           Future.delayed(const Duration(milliseconds: 500), () {
             if (mounted) _maybeAutoScanLocalLibrary();
           });
@@ -179,6 +182,8 @@ class _EagerInitializationState extends ConsumerState<_EagerInitialization>
     );
   }
 
+  /// 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;
 
@@ -187,9 +192,11 @@ class _EagerInitializationState extends ConsumerState<_EagerInitialization>
     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);
@@ -199,6 +206,7 @@ class _EagerInitializationState extends ConsumerState<_EagerInitialization>
 
       switch (settings.localLibraryAutoScan) {
         case 'on_open':
+          // Cooldown of 10 minutes to prevent rapid re-scans.
           if (elapsed.inMinutes < 10) return;
           break;
         case 'daily':
@@ -212,6 +220,7 @@ class _EagerInitializationState extends ConsumerState<_EagerInitialization>
       }
     }
 
+    // All checks passed -- start an incremental scan.
     final iosBookmark = settings.localLibraryBookmark;
     ref
         .read(localLibraryProvider.notifier)

lib/models/download_item.dart

@@ -12,7 +12,13 @@ enum DownloadStatus {
   skipped,
 }
 
-enum DownloadErrorType { unknown, notFound, rateLimit, network, permission }
+enum DownloadErrorType {
+  unknown,
+  notFound,
+  rateLimit,
+  network,
+  permission,
+}
 
 @JsonSerializable()
 class DownloadItem {
@@ -22,8 +28,7 @@ class DownloadItem {
   final DownloadStatus status;
   final double progress;
   final double speedMBps;
-  final int bytesReceived; // Bytes downloaded so far
-  final int bytesTotal; // Total bytes when the server provides content length
+  final int bytesReceived; // Bytes downloaded so far (for unknown size downloads)
   final String? filePath;
   final String? error;
   final DownloadErrorType? errorType;
@@ -39,7 +44,6 @@ class DownloadItem {
     this.progress = 0.0,
     this.speedMBps = 0.0,
     this.bytesReceived = 0,
-    this.bytesTotal = 0,
     this.filePath,
     this.error,
     this.errorType,
@@ -56,7 +60,6 @@ class DownloadItem {
     double? progress,
     double? speedMBps,
     int? bytesReceived,
-    int? bytesTotal,
     String? filePath,
     String? error,
     DownloadErrorType? errorType,
@@ -72,7 +75,6 @@ class DownloadItem {
       progress: progress ?? this.progress,
       speedMBps: speedMBps ?? this.speedMBps,
       bytesReceived: bytesReceived ?? this.bytesReceived,
-      bytesTotal: bytesTotal ?? this.bytesTotal,
       filePath: filePath ?? this.filePath,
       error: error ?? this.error,
       errorType: errorType ?? this.errorType,
@@ -84,7 +86,7 @@ class DownloadItem {
 
   String get errorMessage {
     if (error == null) return '';
-
+    
     switch (errorType) {
       case DownloadErrorType.notFound:
         return 'Song not found on any service';

lib/models/download_item.g.dart

@@ -16,7 +16,6 @@ DownloadItem _$DownloadItemFromJson(Map<String, dynamic> json) => DownloadItem(
   progress: (json['progress'] as num?)?.toDouble() ?? 0.0,
   speedMBps: (json['speedMBps'] as num?)?.toDouble() ?? 0.0,
   bytesReceived: (json['bytesReceived'] as num?)?.toInt() ?? 0,
-  bytesTotal: (json['bytesTotal'] as num?)?.toInt() ?? 0,
   filePath: json['filePath'] as String?,
   error: json['error'] as String?,
   errorType: $enumDecodeNullable(_$DownloadErrorTypeEnumMap, json['errorType']),
@@ -34,7 +33,6 @@ Map<String, dynamic> _$DownloadItemToJson(DownloadItem instance) =>
       'progress': instance.progress,
       'speedMBps': instance.speedMBps,
       'bytesReceived': instance.bytesReceived,
-      'bytesTotal': instance.bytesTotal,
       'filePath': instance.filePath,
       'error': instance.error,
       'errorType': _$DownloadErrorTypeEnumMap[instance.errorType],

lib/models/settings.dart

@@ -1,5 +1,4 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:spotiflac_android/utils/artist_utils.dart';
 
 part 'settings.g.dart';
 
@@ -13,10 +12,7 @@ class AppSettings {
   final String downloadTreeUri; // SAF persistable tree URI
   final bool autoFallback;
   final bool embedMetadata; // Master switch for metadata/cover/lyrics embedding
-  final String
-  artistTagMode; // 'joined' or 'split_vorbis' for Vorbis-based formats
   final bool embedLyrics;
-  final bool embedReplayGain; // Calculate and embed ReplayGain tags
   final bool maxQualityCover;
   final bool isFirstLaunch;
   final int concurrentDownloads;
@@ -31,18 +27,25 @@ class AppSettings {
   final String historyViewMode;
   final String historyFilterMode;
   final bool askQualityBeforeDownload;
+  final String spotifyClientId;
+  final String spotifyClientSecret;
+  final bool useCustomSpotifyCredentials;
+  final String metadataSource;
   final bool enableLogging;
   final bool useExtensionProviders;
   final String? searchProvider;
   final String? homeFeedProvider;
   final bool separateSingles;
-  final String singleFilenameFormat;
   final String albumFolderStructure;
   final bool showExtensionStore;
   final String locale;
   final String lyricsMode;
   final String
   tidalHighFormat; // Format for Tidal HIGH quality: 'mp3_320', 'opus_256', or 'opus_128'
+  final int
+  youtubeOpusBitrate; // YouTube Opus bitrate (supported: 128/256/320 kbps)
+  final int
+  youtubeMp3Bitrate; // YouTube MP3 bitrate (supported: 128/256/320 kbps)
   final bool
   useAllFilesAccess; // Android 13+ only: enable MANAGE_EXTERNAL_STORAGE
   final bool
@@ -89,9 +92,7 @@ class AppSettings {
     this.downloadTreeUri = '',
     this.autoFallback = true,
     this.embedMetadata = true,
-    this.artistTagMode = artistTagModeJoined,
     this.embedLyrics = true,
-    this.embedReplayGain = false,
     this.maxQualityCover = true,
     this.isFirstLaunch = true,
     this.concurrentDownloads = 1,
@@ -106,17 +107,22 @@ class AppSettings {
     this.historyViewMode = 'grid',
     this.historyFilterMode = 'all',
     this.askQualityBeforeDownload = true,
+    this.spotifyClientId = '',
+    this.spotifyClientSecret = '',
+    this.useCustomSpotifyCredentials = false,
+    this.metadataSource = 'deezer',
     this.enableLogging = false,
     this.useExtensionProviders = true,
     this.searchProvider,
     this.homeFeedProvider,
     this.separateSingles = false,
-    this.singleFilenameFormat = '{title} - {artist}',
     this.albumFolderStructure = 'artist_album',
     this.showExtensionStore = true,
     this.locale = 'system',
     this.lyricsMode = 'embed',
     this.tidalHighFormat = 'mp3_320',
+    this.youtubeOpusBitrate = 256,
+    this.youtubeMp3Bitrate = 320,
     this.useAllFilesAccess = false,
     this.autoExportFailedDownloads = false,
     this.downloadNetworkMode = 'any',
@@ -130,6 +136,7 @@ class AppSettings {
     this.hasCompletedTutorial = false,
     this.lyricsProviders = const [
       'lrclib',
+      'spotify_api',
       'musixmatch',
       'netease',
       'apple_music',
@@ -151,9 +158,7 @@ class AppSettings {
     String? downloadTreeUri,
     bool? autoFallback,
     bool? embedMetadata,
-    String? artistTagMode,
     bool? embedLyrics,
-    bool? embedReplayGain,
     bool? maxQualityCover,
     bool? isFirstLaunch,
     int? concurrentDownloads,
@@ -168,6 +173,10 @@ class AppSettings {
     String? historyViewMode,
     String? historyFilterMode,
     bool? askQualityBeforeDownload,
+    String? spotifyClientId,
+    String? spotifyClientSecret,
+    bool? useCustomSpotifyCredentials,
+    String? metadataSource,
     bool? enableLogging,
     bool? useExtensionProviders,
     String? searchProvider,
@@ -175,12 +184,13 @@ class AppSettings {
     String? homeFeedProvider,
     bool clearHomeFeedProvider = false,
     bool? separateSingles,
-    String? singleFilenameFormat,
     String? albumFolderStructure,
     bool? showExtensionStore,
     String? locale,
     String? lyricsMode,
     String? tidalHighFormat,
+    int? youtubeOpusBitrate,
+    int? youtubeMp3Bitrate,
     bool? useAllFilesAccess,
     bool? autoExportFailedDownloads,
     String? downloadNetworkMode,
@@ -208,9 +218,7 @@ class AppSettings {
       downloadTreeUri: downloadTreeUri ?? this.downloadTreeUri,
       autoFallback: autoFallback ?? this.autoFallback,
       embedMetadata: embedMetadata ?? this.embedMetadata,
-      artistTagMode: artistTagMode ?? this.artistTagMode,
       embedLyrics: embedLyrics ?? this.embedLyrics,
-      embedReplayGain: embedReplayGain ?? this.embedReplayGain,
       maxQualityCover: maxQualityCover ?? this.maxQualityCover,
       isFirstLaunch: isFirstLaunch ?? this.isFirstLaunch,
       concurrentDownloads: concurrentDownloads ?? this.concurrentDownloads,
@@ -229,6 +237,11 @@ class AppSettings {
       historyFilterMode: historyFilterMode ?? this.historyFilterMode,
       askQualityBeforeDownload:
           askQualityBeforeDownload ?? this.askQualityBeforeDownload,
+      spotifyClientId: spotifyClientId ?? this.spotifyClientId,
+      spotifyClientSecret: spotifyClientSecret ?? this.spotifyClientSecret,
+      useCustomSpotifyCredentials:
+          useCustomSpotifyCredentials ?? this.useCustomSpotifyCredentials,
+      metadataSource: metadataSource ?? this.metadataSource,
       enableLogging: enableLogging ?? this.enableLogging,
       useExtensionProviders:
           useExtensionProviders ?? this.useExtensionProviders,
@@ -239,12 +252,13 @@ class AppSettings {
           ? null
           : (homeFeedProvider ?? this.homeFeedProvider),
       separateSingles: separateSingles ?? this.separateSingles,
-      singleFilenameFormat: singleFilenameFormat ?? this.singleFilenameFormat,
       albumFolderStructure: albumFolderStructure ?? this.albumFolderStructure,
       showExtensionStore: showExtensionStore ?? this.showExtensionStore,
       locale: locale ?? this.locale,
       lyricsMode: lyricsMode ?? this.lyricsMode,
       tidalHighFormat: tidalHighFormat ?? this.tidalHighFormat,
+      youtubeOpusBitrate: youtubeOpusBitrate ?? this.youtubeOpusBitrate,
+      youtubeMp3Bitrate: youtubeMp3Bitrate ?? this.youtubeMp3Bitrate,
       useAllFilesAccess: useAllFilesAccess ?? this.useAllFilesAccess,
       autoExportFailedDownloads:
           autoExportFailedDownloads ?? this.autoExportFailedDownloads,

lib/models/settings.g.dart

@@ -15,9 +15,7 @@ AppSettings _$AppSettingsFromJson(Map<String, dynamic> json) => AppSettings(
   downloadTreeUri: json['downloadTreeUri'] as String? ?? '',
   autoFallback: json['autoFallback'] as bool? ?? true,
   embedMetadata: json['embedMetadata'] as bool? ?? true,
-  artistTagMode: json['artistTagMode'] as String? ?? artistTagModeJoined,
   embedLyrics: json['embedLyrics'] as bool? ?? true,
-  embedReplayGain: json['embedReplayGain'] as bool? ?? false,
   maxQualityCover: json['maxQualityCover'] as bool? ?? true,
   isFirstLaunch: json['isFirstLaunch'] as bool? ?? true,
   concurrentDownloads: (json['concurrentDownloads'] as num?)?.toInt() ?? 1,
@@ -33,19 +31,24 @@ AppSettings _$AppSettingsFromJson(Map<String, dynamic> json) => AppSettings(
   historyViewMode: json['historyViewMode'] as String? ?? 'grid',
   historyFilterMode: json['historyFilterMode'] as String? ?? 'all',
   askQualityBeforeDownload: json['askQualityBeforeDownload'] as bool? ?? true,
+  spotifyClientId: json['spotifyClientId'] as String? ?? '',
+  spotifyClientSecret: json['spotifyClientSecret'] as String? ?? '',
+  useCustomSpotifyCredentials:
+      json['useCustomSpotifyCredentials'] as bool? ?? false,
+  metadataSource: json['metadataSource'] as String? ?? 'deezer',
   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,
-  singleFilenameFormat:
-      json['singleFilenameFormat'] as String? ?? '{title} - {artist}',
   albumFolderStructure:
       json['albumFolderStructure'] as String? ?? 'artist_album',
   showExtensionStore: json['showExtensionStore'] as bool? ?? true,
   locale: json['locale'] as String? ?? 'system',
   lyricsMode: json['lyricsMode'] as String? ?? 'embed',
   tidalHighFormat: json['tidalHighFormat'] as String? ?? 'mp3_320',
+  youtubeOpusBitrate: (json['youtubeOpusBitrate'] as num?)?.toInt() ?? 256,
+  youtubeMp3Bitrate: (json['youtubeMp3Bitrate'] as num?)?.toInt() ?? 320,
   useAllFilesAccess: json['useAllFilesAccess'] as bool? ?? false,
   autoExportFailedDownloads:
       json['autoExportFailedDownloads'] as bool? ?? false,
@@ -63,7 +66,14 @@ AppSettings _$AppSettingsFromJson(Map<String, dynamic> json) => AppSettings(
       (json['lyricsProviders'] as List<dynamic>?)
           ?.map((e) => e as String)
           .toList() ??
-      const ['lrclib', 'musixmatch', 'netease', 'apple_music', 'qqmusic'],
+      const [
+        'lrclib',
+        'spotify_api',
+        'musixmatch',
+        'netease',
+        'apple_music',
+        'qqmusic',
+      ],
   lyricsIncludeTranslationNetease:
       json['lyricsIncludeTranslationNetease'] as bool? ?? false,
   lyricsIncludeRomanizationNetease:
@@ -85,9 +95,7 @@ Map<String, dynamic> _$AppSettingsToJson(
   'downloadTreeUri': instance.downloadTreeUri,
   'autoFallback': instance.autoFallback,
   'embedMetadata': instance.embedMetadata,
-  'artistTagMode': instance.artistTagMode,
   'embedLyrics': instance.embedLyrics,
-  'embedReplayGain': instance.embedReplayGain,
   'maxQualityCover': instance.maxQualityCover,
   'isFirstLaunch': instance.isFirstLaunch,
   'concurrentDownloads': instance.concurrentDownloads,
@@ -103,17 +111,22 @@ Map<String, dynamic> _$AppSettingsToJson(
   'historyViewMode': instance.historyViewMode,
   'historyFilterMode': instance.historyFilterMode,
   'askQualityBeforeDownload': instance.askQualityBeforeDownload,
+  'spotifyClientId': instance.spotifyClientId,
+  'spotifyClientSecret': instance.spotifyClientSecret,
+  'useCustomSpotifyCredentials': instance.useCustomSpotifyCredentials,
+  'metadataSource': instance.metadataSource,
   'enableLogging': instance.enableLogging,
   'useExtensionProviders': instance.useExtensionProviders,
   'searchProvider': instance.searchProvider,
   'homeFeedProvider': instance.homeFeedProvider,
   'separateSingles': instance.separateSingles,
-  'singleFilenameFormat': instance.singleFilenameFormat,
   'albumFolderStructure': instance.albumFolderStructure,
   'showExtensionStore': instance.showExtensionStore,
   'locale': instance.locale,
   'lyricsMode': instance.lyricsMode,
   'tidalHighFormat': instance.tidalHighFormat,
+  'youtubeOpusBitrate': instance.youtubeOpusBitrate,
+  'youtubeMp3Bitrate': instance.youtubeMp3Bitrate,
   'useAllFilesAccess': instance.useAllFilesAccess,
   'autoExportFailedDownloads': instance.autoExportFailedDownloads,
   'downloadNetworkMode': instance.downloadNetworkMode,