fix(library): offer re-enrichment for downloaded selections

lib/screens/downloaded_album_screen.dart

@@ -7,9 +7,7 @@ import 'package:spotiflac_android/theme/cover_palette.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:spotiflac_android/services/cover_cache_manager.dart';
-import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/services/batch_track_actions.dart';
-import 'package:spotiflac_android/services/library_database.dart';
 import 'package:spotiflac_android/services/local_track_batch_actions.dart';
 import 'package:spotiflac_android/models/unified_library_item.dart';
 import 'package:spotiflac_android/l10n/l10n.dart';
@@ -19,9 +17,6 @@ import 'package:spotiflac_android/utils/confirm_and_delete_tracks.dart';
 import 'package:spotiflac_android/utils/cover_art_utils.dart';
 import 'package:spotiflac_android/utils/file_access.dart';
 import 'package:spotiflac_android/utils/image_cache_utils.dart';
-import 'package:spotiflac_android/utils/int_utils.dart';
-import 'package:spotiflac_android/utils/lyrics_metadata_helper.dart';
-import 'package:spotiflac_android/utils/string_utils.dart';
 import 'package:spotiflac_android/providers/download_queue_provider.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/providers/playback_provider.dart';
@@ -662,68 +657,19 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen>
   }
 
   Future<void> _reEnrichSelected(List<DownloadHistoryItem> allTracks) async {
-    final selected = allTracks
-        .where((track) => selectedIds.contains(track.id))
-        .toList(growable: false);
-    final history = ref.read(downloadHistoryProvider.notifier);
-    await reEnrichLocalTracks(
+    await reEnrichLibraryTracks(
       context,
       ref,
-      [
-        for (final track in selected)
-          LocalLibraryItem.fromJson({
-            ...track.toJson(),
-            'scannedAt': track.downloadedAt.toIso8601String(),
-          }),
-      ],
+      _selectedUnifiedItems(allTracks),
       isActive: () => mounted,
       onSelectionHide: () async {
         setState(() => isSelectionMode = false);
         await Future<void>.delayed(const Duration(milliseconds: 300));
       },
       onSelectionRestore: () => setState(() => isSelectionMode = true),
-      onComplete: exitSelectionMode,
-      refreshLibrary: () async {
-        // Downloaded albums read history, not the local-scan index. Read back
-        // the saved tags so failed or unselected fields cannot change history.
-        for (final track in selected) {
-          try {
-            await DownloadedEmbeddedCoverResolver.invalidate(track.filePath);
-            final metadata = await PlatformBridge.readDisplayAudioMetadata(
-              track.filePath,
-            );
-            if (metadata['error'] != null) continue;
-            await history.updateMetadataForItem(
-              id: track.id,
-              trackName: metadata['title'] as String? ?? track.trackName,
-              artistName: metadata['artist'] as String? ?? track.artistName,
-              albumName: metadata['album'] as String? ?? track.albumName,
-              albumArtist: metadata['album_artist'] as String?,
-              isrc: metadata['isrc'] as String?,
-              trackNumber: readPositiveInt(metadata['track_number']),
-              totalTracks: readPositiveInt(metadata['total_tracks']),
-              discNumber: readPositiveInt(metadata['disc_number']),
-              totalDiscs: readPositiveInt(metadata['total_discs']),
-              releaseDate: metadata['date'] as String?,
-              genre: metadata['genre'] as String?,
-              composer: metadata['composer'] as String?,
-              label: metadata['label'] as String?,
-              copyright: metadata['copyright'] as String?,
-              explicit: parseExplicitFlag(metadata['explicit']),
-              hasLyrics:
-                  metadata.containsKey('hasLyrics') ||
-                      metadata.containsKey('lyrics')
-                  ? metadata['hasLyrics'] == true ||
-                        hasUsableLyricsContent(
-                          metadata['lyrics']?.toString() ?? '',
-                        )
-                  : null,
-            );
-          } catch (error) {
-            debugPrint('Could not refresh re-enriched download: $error');
-          }
-        }
+      onComplete: () {
         _onEmbeddedCoverChanged();
+        exitSelectionMode();
       },
     );
   }

lib/screens/queue_tab.dart

@@ -19,7 +19,6 @@ import 'package:spotiflac_android/widgets/library_search_results.dart';
 import 'package:spotiflac_android/widgets/mornye_chrome.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:share_plus/share_plus.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/l10n/l10n.dart';
 import 'package:spotiflac_android/utils/adaptive_layout.dart';

lib/screens/queue_tab_batch_actions.dart

@@ -21,64 +21,22 @@ extension _QueueTabBatchActions on _QueueTabState {
         onComplete: _exitSelectionMode,
       );
 
-  Future<void> _reEnrichSelectedLocalFromQueue(
-    List<UnifiedLibraryItem> allItems,
-  ) => reEnrichLocalTracks(
-    context,
-    ref,
-    _selectedItemsFromAll(allItems)
-        .map((item) => item.localItem)
-        .whereType<LocalLibraryItem>()
-        .toList(growable: false),
-    isActive: () => mounted,
-    onSelectionHide: () async {
-      _setState(() => _isSelectionMode = false);
-      _hideSelectionOverlay();
-    },
-    onSelectionRestore: () => _setState(() => _isSelectionMode = true),
-    onComplete: _exitSelectionMode,
-  );
-
-  /// Share selected tracks via system share sheet
-  Future<void> _shareSelected(List<UnifiedLibraryItem> allItems) async {
-    final itemsById = {for (final item in allItems) item.id: item};
-    final safUris = <String>[];
-    final filesToShare = <XFile>[];
-
-    for (final id in _selectedIds) {
-      final item = itemsById[id];
-      if (item == null) continue;
-      final path = item.filePath;
-      if (isContentUri(path)) {
-        if (await fileExists(path)) safUris.add(path);
-      } else if (await fileExists(path)) {
-        filesToShare.add(XFile(path));
-      }
-    }
-
-    if (safUris.isEmpty && filesToShare.isEmpty) {
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(context.l10n.selectionShareNoFiles)),
-        );
-      }
-      return;
-    }
-
-    if (safUris.isNotEmpty) {
-      try {
-        if (safUris.length == 1) {
-          await PlatformBridge.shareContentUri(safUris.first);
-        } else {
-          await PlatformBridge.shareMultipleContentUris(safUris);
-        }
-      } catch (_) {}
-    }
-
-    if (filesToShare.isNotEmpty) {
-      await SharePlus.instance.share(ShareParams(files: filesToShare));
-    }
-  }
+  Future<void> _reEnrichSelectedFromQueue(List<UnifiedLibraryItem> allItems) =>
+      reEnrichLibraryTracks(
+        context,
+        ref,
+        _selectedItemsFromAll(allItems),
+        isActive: () => mounted,
+        onSelectionHide: () async {
+          _setState(() => _isSelectionMode = false);
+          _hideSelectionOverlay();
+        },
+        onSelectionRestore: () => _setState(() => _isSelectionMode = true),
+        onComplete: () {
+          _onEmbeddedCoverChanged();
+          _exitSelectionMode();
+        },
+      );
 
   Future<void> _showBatchConvertSheet(
     BuildContext context,

lib/screens/queue_tab_item_widgets.dart

@@ -49,16 +49,10 @@ extension _QueueTabItemWidgets on _QueueTabState {
 
             actions.add(
               SelectionActionButton(
-                icon: localOnlySelection
-                    ? Icons.auto_fix_high_outlined
-                    : Icons.share_outlined,
-                label: localOnlySelection
-                    ? '${context.l10n.trackReEnrich} ($selectedCount)'
-                    : context.l10n.selectionShareCount(selectedCount),
+                icon: Icons.auto_fix_high_outlined,
+                label: '${context.l10n.trackReEnrich} ($selectedCount)',
                 onPressed: selectedCount > 0
-                    ? () => localOnlySelection
-                          ? _reEnrichSelectedLocalFromQueue(unifiedItems)
-                          : _shareSelected(unifiedItems)
+                    ? () => _reEnrichSelectedFromQueue(unifiedItems)
                     : null,
                 colorScheme: colorScheme,
               ),

lib/services/local_track_batch_actions.dart

@@ -5,16 +5,20 @@ import 'package:spotiflac_android/l10n/l10n.dart';
 import 'package:spotiflac_android/utils/re_enrich_result.dart';
 import 'package:spotiflac_android/models/settings.dart';
 import 'package:spotiflac_android/models/track.dart';
+import 'package:spotiflac_android/models/unified_library_item.dart';
 import 'package:spotiflac_android/providers/download_queue_provider.dart';
 import 'package:spotiflac_android/providers/extension_provider.dart';
 import 'package:spotiflac_android/providers/local_library_provider.dart';
 import 'package:spotiflac_android/providers/settings_provider.dart';
 import 'package:spotiflac_android/services/batch_metadata_re_enrich.dart';
+import 'package:spotiflac_android/services/downloaded_embedded_cover_resolver.dart';
 import 'package:spotiflac_android/services/library_database.dart';
 import 'package:spotiflac_android/services/local_track_redownload_service.dart';
 import 'package:spotiflac_android/services/platform_bridge.dart';
 import 'package:spotiflac_android/utils/ffmpeg_reenrich.dart';
+import 'package:spotiflac_android/utils/int_utils.dart';
 import 'package:spotiflac_android/utils/lyrics_metadata_helper.dart';
+import 'package:spotiflac_android/utils/string_utils.dart';
 import 'package:spotiflac_android/widgets/batch_progress_dialog.dart';
 import 'package:spotiflac_android/widgets/re_enrich_field_dialog.dart';
 import 'package:spotiflac_android/widgets/re_enrich_review_sheet.dart';
@@ -137,6 +141,100 @@ Future<void> queueLocalTracksAsFlac(
   onComplete();
 }
 
+Future<void> reEnrichLibraryTracks(
+  BuildContext context,
+  WidgetRef ref,
+  List<UnifiedLibraryItem> selected, {
+  required bool Function() isActive,
+  required Future<void> Function() onSelectionHide,
+  required VoidCallback onSelectionRestore,
+  required VoidCallback onComplete,
+}) async {
+  if (selected.isEmpty) return;
+  final downloads = selected
+      .map((item) => item.historyItem)
+      .whereType<DownloadHistoryItem>()
+      .toList(growable: false);
+  final history = downloads.isEmpty
+      ? null
+      : ref.read(downloadHistoryProvider.notifier);
+  await reEnrichLocalTracks(
+    context,
+    ref,
+    [
+      for (final item in selected)
+        if (item.localItem != null)
+          item.localItem!
+        else if (item.historyItem case final track?)
+          LocalLibraryItem.fromJson({
+            ...track.toJson(),
+            'scannedAt': track.downloadedAt.toIso8601String(),
+          }),
+    ],
+    isActive: isActive,
+    onSelectionHide: onSelectionHide,
+    onSelectionRestore: onSelectionRestore,
+    onComplete: onComplete,
+    refreshLibrary: () async {
+      // Downloaded tracks read history, not the local-scan index. Read back
+      // saved tags so failed or unselected fields cannot change history.
+      for (final track in downloads) {
+        try {
+          await DownloadedEmbeddedCoverResolver.invalidate(track.filePath);
+          final metadata = await PlatformBridge.readDisplayAudioMetadata(
+            track.filePath,
+          );
+          if (metadata['error'] != null) continue;
+          await history!.updateMetadataForItem(
+            id: track.id,
+            trackName: metadata['title'] as String? ?? track.trackName,
+            artistName: metadata['artist'] as String? ?? track.artistName,
+            albumName: metadata['album'] as String? ?? track.albumName,
+            albumArtist: metadata['album_artist'] as String?,
+            isrc: metadata['isrc'] as String?,
+            trackNumber: readPositiveInt(metadata['track_number']),
+            totalTracks: readPositiveInt(metadata['total_tracks']),
+            discNumber: readPositiveInt(metadata['disc_number']),
+            totalDiscs: readPositiveInt(metadata['total_discs']),
+            releaseDate: metadata['date'] as String?,
+            genre: metadata['genre'] as String?,
+            composer: metadata['composer'] as String?,
+            label: metadata['label'] as String?,
+            copyright: metadata['copyright'] as String?,
+            explicit: parseExplicitFlag(metadata['explicit']),
+            hasLyrics:
+                metadata.containsKey('hasLyrics') ||
+                    metadata.containsKey('lyrics')
+                ? metadata['hasLyrics'] == true ||
+                      hasUsableLyricsContent(
+                        metadata['lyrics']?.toString() ?? '',
+                      )
+                : null,
+          );
+        } catch (error) {
+          debugPrint('Could not refresh re-enriched download: $error');
+        }
+      }
+      if (isActive() && selected.any((item) => item.localItem != null)) {
+        await _refreshReEnrichedLocalLibrary(ref);
+      }
+    },
+  );
+}
+
+Future<void> _refreshReEnrichedLocalLibrary(WidgetRef ref) async {
+  final library = ref.read(localLibraryProvider.notifier);
+  try {
+    if (!ref.read(localLibraryProvider).isScanning) {
+      await library.scanAllSources();
+    } else {
+      await library.reloadFromStorage();
+    }
+  } catch (_) {
+    await library.reloadFromStorage();
+  }
+}
+
 Future<void> reEnrichLocalTracks(
   BuildContext context,
   WidgetRef ref,
@@ -247,15 +345,7 @@ Future<void> reEnrichLocalTracks(
   if (refreshLibrary != null) {
     await refreshLibrary();
   } else {
-    try {
-      if (!ref.read(localLibraryProvider).isScanning) {
-        await ref.read(localLibraryProvider.notifier).scanAllSources();
-      } else {
-        await ref.read(localLibraryProvider.notifier).reloadFromStorage();
-      }
-    } catch (_) {
-      await ref.read(localLibraryProvider.notifier).reloadFromStorage();
-    }
+    await _refreshReEnrichedLocalLibrary(ref);
   }
 
   if (!context.mounted || !isActive()) return;