feat: save cover art, save lyrics, re-enrich metadata with full SAF support + YouTube Cobalt provider with SpotubeDL fallback + metadata summary logging

2026-08-15 23:50:38 +02:00 · 2026-02-09 23:07:18 +07:00
parent 7ec5d28caf
commit df39d61ed4
31 changed files with 3119 additions and 316 deletions
@@ -365,6 +365,7 @@ class FFmpegService {
    }

    cmdBuffer.write('-map 0:a ');
+    cmdBuffer.write('-map_metadata -1 ');

    if (coverPath != null) {
      cmdBuffer.write('-map 1:0 ');
@@ -441,6 +442,8 @@ class FFmpegService {
    final StringBuffer cmdBuffer = StringBuffer();
    cmdBuffer.write('-i "$opusPath" ');
    cmdBuffer.write('-map 0:a ');
+    cmdBuffer.write('-map_metadata -1 ');
+    cmdBuffer.write('-map_metadata:s:a -1 ');
    cmdBuffer.write('-c:a copy ');

    if (metadata != null) {
@@ -654,6 +657,12 @@ class FFmpegService {
        case 'UNSYNCEDLYRICS':
          id3Map['lyrics'] = value;
          break;
+        case 'COMPOSER':
+          id3Map['composer'] = value;
+          break;
+        case 'COMMENT':
+          id3Map['comment'] = value;
+          break;
        default:
          id3Map[key.toLowerCase()] = value;
      }
@@ -374,6 +374,55 @@ class PlatformBridge {
    await _channel.invokeMethod('cleanupConnections');
  }

+  static Future<Map<String, dynamic>> downloadCoverToFile(
+    String coverUrl,
+    String outputPath, {
+    bool maxQuality = true,
+  }) async {
+    final result = await _channel.invokeMethod('downloadCoverToFile', {
+      'cover_url': coverUrl,
+      'output_path': outputPath,
+      'max_quality': maxQuality,
+    });
+    return jsonDecode(result as String) as Map<String, dynamic>;
+  }
+
+  static Future<Map<String, dynamic>> extractCoverToFile(
+    String audioPath,
+    String outputPath,
+  ) async {
+    final result = await _channel.invokeMethod('extractCoverToFile', {
+      'audio_path': audioPath,
+      'output_path': outputPath,
+    });
+    return jsonDecode(result as String) as Map<String, dynamic>;
+  }
+
+  static Future<Map<String, dynamic>> fetchAndSaveLyrics({
+    required String trackName,
+    required String artistName,
+    required String spotifyId,
+    required int durationMs,
+    required String outputPath,
+  }) async {
+    final result = await _channel.invokeMethod('fetchAndSaveLyrics', {
+      'track_name': trackName,
+      'artist_name': artistName,
+      'spotify_id': spotifyId,
+      'duration_ms': durationMs,
+      'output_path': outputPath,
+    });
+    return jsonDecode(result as String) as Map<String, dynamic>;
+  }
+
+  static Future<Map<String, dynamic>> reEnrichFile(Map<String, dynamic> request) async {
+    final requestJSON = jsonEncode(request);
+    final result = await _channel.invokeMethod('reEnrichFile', {
+      'request_json': requestJSON,
+    });
+    return jsonDecode(result as String) as Map<String, dynamic>;
+  }
+
  static Future<Map<String, dynamic>> readFileMetadata(String filePath) async {
    final result = await _channel.invokeMethod('readFileMetadata', {
      'file_path': filePath,
@@ -381,6 +430,27 @@ class PlatformBridge {
    return jsonDecode(result as String) as Map<String, dynamic>;
  }

+  static Future<Map<String, dynamic>> editFileMetadata(
+    String filePath,
+    Map<String, String> metadata,
+  ) async {
+    final metadataJSON = jsonEncode(metadata);
+    final result = await _channel.invokeMethod('editFileMetadata', {
+      'file_path': filePath,
+      'metadata_json': metadataJSON,
+    });
+    return jsonDecode(result as String) as Map<String, dynamic>;
+  }
+
+  static Future<bool> writeTempToSaf(String tempPath, String safUri) async {
+    final result = await _channel.invokeMethod('writeTempToSaf', {
+      'temp_path': tempPath,
+      'saf_uri': safUri,
+    });
+    final map = jsonDecode(result as String) as Map<String, dynamic>;
+    return map['success'] == true;
+  }
+
  static Future<void> startDownloadService({
    String trackName = '',
    String artistName = '',
@@ -953,68 +1023,68 @@ static Future<Map<String, dynamic>> downloadWithExtensions({
    });
  }

-/// Scan a folder for audio files and read their metadata
-  /// Returns a list of track metadata
-  static Future<List<Map<String, dynamic>>> scanLibraryFolder(String folderPath) async {
-    _log.i('scanLibraryFolder: $folderPath');
-    final result = await _channel.invokeMethod('scanLibraryFolder', {
-      'folder_path': folderPath,
-    });
-    final list = jsonDecode(result as String) as List<dynamic>;
-    return list.map((e) => e as Map<String, dynamic>).toList();
-  }
-
-  /// Perform an incremental scan of the library folder
-  /// Only scans files that are new or have changed since last scan
-  /// [existingFiles] is a map of filePath -> modTime (unix millis)
-  /// Returns IncrementalScanResult with scanned items, deleted paths, and skip count
-  static Future<Map<String, dynamic>> scanLibraryFolderIncremental(
-    String folderPath,
-    Map<String, int> existingFiles,
-  ) async {
-    _log.i('scanLibraryFolderIncremental: $folderPath (${existingFiles.length} existing files)');
-    final result = await _channel.invokeMethod('scanLibraryFolderIncremental', {
-      'folder_path': folderPath,
-      'existing_files': jsonEncode(existingFiles),
-    });
-    return jsonDecode(result as String) as Map<String, dynamic>;
-  }
+/// Scan a folder for audio files and read their metadata
+  /// Returns a list of track metadata
+  static Future<List<Map<String, dynamic>>> scanLibraryFolder(String folderPath) async {
+    _log.i('scanLibraryFolder: $folderPath');
+    final result = await _channel.invokeMethod('scanLibraryFolder', {
+      'folder_path': folderPath,
+    });
+    final list = jsonDecode(result as String) as List<dynamic>;
+    return list.map((e) => e as Map<String, dynamic>).toList();
+  }

-  static Future<List<Map<String, dynamic>>> scanSafTree(String treeUri) async {
-    _log.i('scanSafTree: $treeUri');
-    final result = await _channel.invokeMethod('scanSafTree', {
-      'tree_uri': treeUri,
-    });
-    final list = jsonDecode(result as String) as List<dynamic>;
-    return list.map((e) => e as Map<String, dynamic>).toList();
-  }
-
-  /// Incremental SAF tree scan - only scans new or modified files
-  /// Returns a map with 'files' (new/changed) and 'removedUris' (deleted files)
-  static Future<Map<String, dynamic>> scanSafTreeIncremental(
-    String treeUri,
-    Map<String, int> existingFiles,
-  ) async {
-    _log.i('scanSafTreeIncremental: $treeUri (${existingFiles.length} existing files)');
-    final result = await _channel.invokeMethod('scanSafTreeIncremental', {
-      'tree_uri': treeUri,
-      'existing_files': jsonEncode(existingFiles),
-    });
-    return jsonDecode(result as String) as Map<String, dynamic>;
-  }
-
-  /// Get last-modified timestamps for a list of SAF file URIs.
-  /// Returns map uri -> modTime (unix millis), only for files that still exist.
-  static Future<Map<String, int>> getSafFileModTimes(List<String> uris) async {
-    final result = await _channel.invokeMethod('getSafFileModTimes', {
-      'uris': jsonEncode(uris),
-    });
-    final map = jsonDecode(result as String) as Map<String, dynamic>;
-    return map.map((key, value) => MapEntry(key, (value as num).toInt()));
-  }
-
-  /// Get current library scan progress
-  static Future<Map<String, dynamic>> getLibraryScanProgress() async {
+  /// Perform an incremental scan of the library folder
+  /// Only scans files that are new or have changed since last scan
+  /// [existingFiles] is a map of filePath -> modTime (unix millis)
+  /// Returns IncrementalScanResult with scanned items, deleted paths, and skip count
+  static Future<Map<String, dynamic>> scanLibraryFolderIncremental(
+    String folderPath,
+    Map<String, int> existingFiles,
+  ) async {
+    _log.i('scanLibraryFolderIncremental: $folderPath (${existingFiles.length} existing files)');
+    final result = await _channel.invokeMethod('scanLibraryFolderIncremental', {
+      'folder_path': folderPath,
+      'existing_files': jsonEncode(existingFiles),
+    });
+    return jsonDecode(result as String) as Map<String, dynamic>;
+  }
+
+  static Future<List<Map<String, dynamic>>> scanSafTree(String treeUri) async {
+    _log.i('scanSafTree: $treeUri');
+    final result = await _channel.invokeMethod('scanSafTree', {
+      'tree_uri': treeUri,
+    });
+    final list = jsonDecode(result as String) as List<dynamic>;
+    return list.map((e) => e as Map<String, dynamic>).toList();
+  }
+
+  /// Incremental SAF tree scan - only scans new or modified files
+  /// Returns a map with 'files' (new/changed) and 'removedUris' (deleted files)
+  static Future<Map<String, dynamic>> scanSafTreeIncremental(
+    String treeUri,
+    Map<String, int> existingFiles,
+  ) async {
+    _log.i('scanSafTreeIncremental: $treeUri (${existingFiles.length} existing files)');
+    final result = await _channel.invokeMethod('scanSafTreeIncremental', {
+      'tree_uri': treeUri,
+      'existing_files': jsonEncode(existingFiles),
+    });
+    return jsonDecode(result as String) as Map<String, dynamic>;
+  }
+
+  /// Get last-modified timestamps for a list of SAF file URIs.
+  /// Returns map uri -> modTime (unix millis), only for files that still exist.
+  static Future<Map<String, int>> getSafFileModTimes(List<String> uris) async {
+    final result = await _channel.invokeMethod('getSafFileModTimes', {
+      'uris': jsonEncode(uris),
+    });
+    final map = jsonDecode(result as String) as Map<String, dynamic>;
+    return map.map((key, value) => MapEntry(key, (value as num).toInt()));
+  }
+
+  /// Get current library scan progress
+  static Future<Map<String, dynamic>> getLibraryScanProgress() async {
    final result = await _channel.invokeMethod('getLibraryScanProgress');
    return jsonDecode(result as String) as Map<String, dynamic>;
  }
@@ -1113,71 +1183,71 @@ static Future<Map<String, dynamic>> downloadWithExtensions({
    return result as String;
  }

-  static Future<void> clearStoreCache() async {
-    _log.d('clearStoreCache');
-    await _channel.invokeMethod('clearStoreCache');
-  }
-
-  // ==================== YOUTUBE / COBALT ====================
-
-  /// Download a track from YouTube using the Cobalt API.
-  /// YouTube is a lossy-only provider (Opus 256kbps or MP3 320kbps).
-  /// It does NOT participate in the lossless fallback chain.
-  static Future<Map<String, dynamic>> downloadFromYouTube({
-    required String trackName,
-    required String artistName,
-    required String albumName,
-    String? albumArtist,
-    String? coverUrl,
-    required String outputDir,
-    required String filenameFormat,
-    String quality = 'opus_256',
-    int trackNumber = 1,
-    int discNumber = 1,
-    String? releaseDate,
-    String? itemId,
-    int durationMs = 0,
-    String? isrc,
-    String? spotifyId,
-    String? deezerId,
-    String storageMode = 'app',
-    String safTreeUri = '',
-    String safRelativeDir = '',
-    String safFileName = '',
-    String safOutputExt = '',
-  }) async {
-    _log.i('downloadFromYouTube: "$trackName" by $artistName (quality: $quality)');
-    final request = jsonEncode({
-      'track_name': trackName,
-      'artist_name': artistName,
-      'album_name': albumName,
-      'album_artist': albumArtist ?? artistName,
-      'cover_url': coverUrl,
-      'output_dir': outputDir,
-      'filename_format': filenameFormat,
-      'quality': quality,
-      'track_number': trackNumber,
-      'disc_number': discNumber,
-      'release_date': releaseDate ?? '',
-      'item_id': itemId ?? '',
-      'duration_ms': durationMs,
-      'isrc': isrc ?? '',
-      'spotify_id': spotifyId ?? '',
-      'deezer_id': deezerId ?? '',
-      'storage_mode': storageMode,
-      'saf_tree_uri': safTreeUri,
-      'saf_relative_dir': safRelativeDir,
-      'saf_file_name': safFileName,
-      'saf_output_ext': safOutputExt,
-    });
-
-    final result = await _channel.invokeMethod('downloadFromYouTube', request);
-    final response = jsonDecode(result as String) as Map<String, dynamic>;
-    if (response['success'] == true) {
-      _log.i('YouTube download success: ${response['file_path']}');
-    } else {
-      _log.w('YouTube download failed: ${response['error']}');
-    }
-    return response;
-  }
-}
+  static Future<void> clearStoreCache() async {
+    _log.d('clearStoreCache');
+    await _channel.invokeMethod('clearStoreCache');
+  }
+
+  // ==================== YOUTUBE / COBALT ====================
+
+  /// Download a track from YouTube using the Cobalt API.
+  /// YouTube is a lossy-only provider (Opus 256kbps or MP3 320kbps).
+  /// It does NOT participate in the lossless fallback chain.
+  static Future<Map<String, dynamic>> downloadFromYouTube({
+    required String trackName,
+    required String artistName,
+    required String albumName,
+    String? albumArtist,
+    String? coverUrl,
+    required String outputDir,
+    required String filenameFormat,
+    String quality = 'opus_256',
+    int trackNumber = 1,
+    int discNumber = 1,
+    String? releaseDate,
+    String? itemId,
+    int durationMs = 0,
+    String? isrc,
+    String? spotifyId,
+    String? deezerId,
+    String storageMode = 'app',
+    String safTreeUri = '',
+    String safRelativeDir = '',
+    String safFileName = '',
+    String safOutputExt = '',
+  }) async {
+    _log.i('downloadFromYouTube: "$trackName" by $artistName (quality: $quality)');
+    final request = jsonEncode({
+      'track_name': trackName,
+      'artist_name': artistName,
+      'album_name': albumName,
+      'album_artist': albumArtist ?? artistName,
+      'cover_url': coverUrl,
+      'output_dir': outputDir,
+      'filename_format': filenameFormat,
+      'quality': quality,
+      'track_number': trackNumber,
+      'disc_number': discNumber,
+      'release_date': releaseDate ?? '',
+      'item_id': itemId ?? '',
+      'duration_ms': durationMs,
+      'isrc': isrc ?? '',
+      'spotify_id': spotifyId ?? '',
+      'deezer_id': deezerId ?? '',
+      'storage_mode': storageMode,
+      'saf_tree_uri': safTreeUri,
+      'saf_relative_dir': safRelativeDir,
+      'saf_file_name': safFileName,
+      'saf_output_ext': safOutputExt,
+    });
+
+    final result = await _channel.invokeMethod('downloadFromYouTube', request);
+    final response = jsonDecode(result as String) as Map<String, dynamic>;
+    if (response['success'] == true) {
+      _log.i('YouTube download success: ${response['file_path']}');
+    } else {
+      _log.w('YouTube download failed: ${response['error']}');
+    }
+    return response;
+  }
+}