perf+security: polling guards, sensitive data redaction, SAF path sanitization

Go backend: - Add sensitive data redaction in log buffer (tokens, keys, passwords) - Validate extension auth URLs (HTTPS only, no private IPs, no embedded creds) - Block embedded credentials in extension HTTP requests - Tighten extension storage file permissions (0644 -> 0600) - Sanitize extension ID in store download path - Summarize auth URLs in logs to prevent token leakage Android (Kotlin): - Add sanitizeRelativeDir to prevent path traversal in SAF operations - Apply sanitizeFilename to all user-provided file names in SAF Flutter: - Add sensitive data redaction in Dart logger (mirrors Go patterns) - Mask device ID in log exports - Add in-flight guard to progress polling (download queue + local library) - Remove redundant _downloadedSpotifyIds Set, use _bySpotifyId map - Remove redundant _isrcSet, use _byIsrc map - Expand DownloadQueueLookup with byItemId and itemIds - Lazy search index building in queue tab - Bound embedded cover cache in queue tab (max 180) - Coalesce embedded cover refresh callbacks via postFrameCallback - Cache album track filtering in downloaded album screen - Cache thumbnail sizes by extension ID in home tab - Simplify recent access aggregation (single-pass) - Remove unused _isTyping state in home tab - Cap pre-warm track batch size to 80 - Skip setShowingRecentAccess if value unchanged - Use downloadQueueLookupProvider for granular queue selectors - Move grouped album filtering before content data computation
2026-07-07 13:17:57 +02:00 · 2026-02-11 02:02:03 +07:00
parent a9150b85b9
commit 84df64fcfe
14 changed files with 785 additions and 330 deletions
@@ -34,6 +34,12 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
  final Set<String> _selectedIds = {};
  bool _showTitleInAppBar = false;
  final ScrollController _scrollController = ScrollController();
+  bool _embeddedCoverRefreshScheduled = false;
+  List<DownloadHistoryItem>? _albumTracksSourceCache;
+  List<DownloadHistoryItem>? _albumTracksCache;
+
+  String get _albumLookupKey =>
+      '${widget.albumName.toLowerCase()}|${widget.artistName.toLowerCase()}';

  @override
  void initState() {
@@ -48,6 +54,16 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
    super.dispose();
  }

+  @override
+  void didUpdateWidget(covariant DownloadedAlbumScreen oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.albumName != widget.albumName ||
+        oldWidget.artistName != widget.artistName) {
+      _albumTracksSourceCache = null;
+      _albumTracksCache = null;
+    }
+  }
+
  void _onScroll() {
    final shouldShow = _scrollController.offset > 280;
    if (shouldShow != _showTitleInAppBar) {
@@ -59,28 +75,36 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
  List<DownloadHistoryItem> _getAlbumTracks(
    List<DownloadHistoryItem> allItems,
  ) {
-    return allItems.where((item) {
-      // Use albumArtist if available and not empty, otherwise artistName
-      final itemArtist =
-          (item.albumArtist != null && item.albumArtist!.isNotEmpty)
-          ? item.albumArtist!
-          : item.artistName;
-      // Use lowercase for case-insensitive matching
-      final itemKey =
-          '${item.albumName.toLowerCase()}|${itemArtist.toLowerCase()}';
-      final albumKey =
-          '${widget.albumName.toLowerCase()}|${widget.artistName.toLowerCase()}';
-      return itemKey == albumKey;
-    }).toList()..sort((a, b) {
-      // Sort by disc number first, then by track number
-      final aDisc = a.discNumber ?? 1;
-      final bDisc = b.discNumber ?? 1;
-      if (aDisc != bDisc) return aDisc.compareTo(bDisc);
-      final aNum = a.trackNumber ?? 999;
-      final bNum = b.trackNumber ?? 999;
-      if (aNum != bNum) return aNum.compareTo(bNum);
-      return a.trackName.compareTo(b.trackName);
-    });
+    final cached = _albumTracksCache;
+    if (cached != null && identical(allItems, _albumTracksSourceCache)) {
+      return cached;
+    }
+
+    final tracks =
+        allItems.where((item) {
+          // Use albumArtist if available and not empty, otherwise artistName
+          final itemArtist =
+              (item.albumArtist != null && item.albumArtist!.isNotEmpty)
+              ? item.albumArtist!
+              : item.artistName;
+          // Use lowercase for case-insensitive matching
+          final itemKey =
+              '${item.albumName.toLowerCase()}|${itemArtist.toLowerCase()}';
+          return itemKey == _albumLookupKey;
+        }).toList()..sort((a, b) {
+          // Sort by disc number first, then by track number
+          final aDisc = a.discNumber ?? 1;
+          final bDisc = b.discNumber ?? 1;
+          if (aDisc != bDisc) return aDisc.compareTo(bDisc);
+          final aNum = a.trackNumber ?? 999;
+          final bNum = b.trackNumber ?? 999;
+          if (aNum != bNum) return aNum.compareTo(bNum);
+          return a.trackName.compareTo(b.trackName);
+        });
+
+    _albumTracksSourceCache = allItems;
+    _albumTracksCache = tracks;
+    return tracks;
  }

  Map<int, List<DownloadHistoryItem>> _groupTracksByDisc(
@@ -194,8 +218,14 @@ class _DownloadedAlbumScreenState extends ConsumerState<DownloadedAlbumScreen> {
  }

  void _onEmbeddedCoverChanged() {
-    if (!mounted) return;
-    setState(() {});
+    if (!mounted || _embeddedCoverRefreshScheduled) return;
+    _embeddedCoverRefreshScheduled = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _embeddedCoverRefreshScheduled = false;
+      if (mounted) {
+        setState(() {});
+      }
+    });
  }

  Future<void> _navigateToMetadataScreen(DownloadHistoryItem item) async {
@@ -35,18 +35,25 @@ class HomeTab extends ConsumerStatefulWidget {

 class _RecentAccessView {
  final List<RecentAccessItem> uniqueItems;
-  final List<RecentAccessItem> downloadItems;
+  final List<String> downloadIds;
  final Map<String, String> downloadFilePathByRecentKey;
  final bool hasHiddenDownloads;

  const _RecentAccessView({
    required this.uniqueItems,
-    required this.downloadItems,
+    required this.downloadIds,
    required this.downloadFilePathByRecentKey,
    required this.hasHiddenDownloads,
  });
 }

+class _RecentAlbumAggregate {
+  int count;
+  DownloadHistoryItem mostRecent;
+
+  _RecentAlbumAggregate({required this.count, required this.mostRecent});
+}
+
 class _CsvImportOptions {
  final bool confirmed;
  final bool skipDownloaded;
@@ -60,7 +67,6 @@ class _CsvImportOptions {
 class _HomeTabState extends ConsumerState<HomeTab>
    with AutomaticKeepAliveClientMixin, SingleTickerProviderStateMixin {
  final _urlController = TextEditingController();
-  bool _isTyping = false;
  final FocusNode _searchFocusNode = FocusNode();
  String? _lastSearchQuery;
  late final ProviderSubscription<TrackState> _trackStateSub;
@@ -77,6 +83,9 @@ class _HomeTabState extends ConsumerState<HomeTab>
  List<RecentAccessItem>? _recentAccessItemsCache;
  Set<String>? _recentAccessHiddenIdsCache;
  _RecentAccessView? _recentAccessViewCache;
+  bool _embeddedCoverRefreshScheduled = false;
+  List<Extension>? _thumbnailSizesExtensionsCache;
+  Map<String, (double, double)>? _thumbnailSizesCache;

  double _responsiveScale({
    required BuildContext context,
@@ -200,6 +209,27 @@ class _HomeTabState extends ConsumerState<HomeTab>
    super.dispose();
  }

+  Map<String, (double, double)> _getThumbnailSizesByExtensionId(
+    List<Extension> extensions,
+  ) {
+    final cached = _thumbnailSizesCache;
+    if (cached != null &&
+        identical(extensions, _thumbnailSizesExtensionsCache)) {
+      return cached;
+    }
+
+    final map = <String, (double, double)>{
+      for (final extension in extensions)
+        if (extension.searchBehavior != null)
+          extension.id: extension.searchBehavior!.getThumbnailSize(
+            defaultSize: 56,
+          ),
+    };
+    _thumbnailSizesExtensionsCache = extensions;
+    _thumbnailSizesCache = map;
+    return map;
+  }
+
  void _onSearchFocusChanged() {
    if (mounted) {
      setState(() {});
@@ -217,7 +247,6 @@ class _HomeTabState extends ConsumerState<HomeTab>
        _urlController.text.isNotEmpty &&
        !_searchFocusNode.hasFocus) {
      _urlController.clear();
-      setState(() => _isTyping = false);
    }
  }

@@ -240,10 +269,7 @@ class _HomeTabState extends ConsumerState<HomeTab>

    ref.read(trackProvider.notifier).setSearchText(text.isNotEmpty);

-    if (text.isNotEmpty && !_isTyping) {
-      setState(() => _isTyping = true);
-    } else if (text.isEmpty && _isTyping) {
-      setState(() => _isTyping = false);
+    if (text.isEmpty) {
      _liveSearchDebounce?.cancel();
      return;
    }
@@ -350,7 +376,6 @@ class _HomeTabState extends ConsumerState<HomeTab>
    _urlController.clear();
    _searchFocusNode.unfocus();
    _lastSearchQuery = null;
-    setState(() => _isTyping = false);
    ref.read(trackProvider.notifier).clear();
  }

@@ -390,7 +415,6 @@ class _HomeTabState extends ConsumerState<HomeTab>
      );
      ref.read(trackProvider.notifier).clear();
      _urlController.clear();
-      setState(() => _isTyping = false);
      return;
    }

@@ -416,7 +440,6 @@ class _HomeTabState extends ConsumerState<HomeTab>
      );
      ref.read(trackProvider.notifier).clear();
      _urlController.clear();
-      setState(() => _isTyping = false);
      return;
    }

@@ -438,7 +461,6 @@ class _HomeTabState extends ConsumerState<HomeTab>
      );
      ref.read(trackProvider.notifier).clear();
      _urlController.clear();
-      setState(() => _isTyping = false);
      return;
    }
  }
@@ -781,13 +803,9 @@ class _HomeTabState extends ConsumerState<HomeTab>
    );
    final showLocalLibraryIndicator =
        localLibrarySettings.$1 && localLibrarySettings.$2;
-    final thumbnailSizesByExtensionId = <String, (double, double)>{
-      for (final extension in extensions)
-        if (extension.searchBehavior != null)
-          extension.id: extension.searchBehavior!.getThumbnailSize(
-            defaultSize: 56,
-          ),
-    };
+    final thumbnailSizesByExtensionId = _getThumbnailSizesByExtensionId(
+      extensions,
+    );
    Extension? currentSearchExtension;
    List<SearchFilter> searchFilters = [];

@@ -1028,8 +1046,14 @@ class _HomeTabState extends ConsumerState<HomeTab>
  }

  void _onEmbeddedCoverChanged() {
-    if (!mounted) return;
-    setState(() {});
+    if (!mounted || _embeddedCoverRefreshScheduled) return;
+    _embeddedCoverRefreshScheduled = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _embeddedCoverRefreshScheduled = false;
+      if (mounted) {
+        setState(() {});
+      }
+    });
  }

  Widget _buildRecentDownloads(
@@ -1148,66 +1172,58 @@ class _HomeTabState extends ConsumerState<HomeTab>
      return cached;
    }

-    final albumGroups = <String, List<DownloadHistoryItem>>{};
+    final albumGroups = <String, _RecentAlbumAggregate>{};
    for (final h in historyItems) {
      final artistForKey = (h.albumArtist != null && h.albumArtist!.isNotEmpty)
          ? h.albumArtist!
          : h.artistName;
      final albumKey = '${h.albumName}|$artistForKey';
-      albumGroups.putIfAbsent(albumKey, () => []).add(h);
+      final existing = albumGroups[albumKey];
+      if (existing == null) {
+        albumGroups[albumKey] = _RecentAlbumAggregate(count: 1, mostRecent: h);
+      } else {
+        existing.count++;
+        if (h.downloadedAt.isAfter(existing.mostRecent.downloadedAt)) {
+          existing.mostRecent = h;
+        }
+      }
    }

-    final downloadItems = <RecentAccessItem>[];
+    final downloadIds = <String>[];
+    final visibleDownloads = <RecentAccessItem>[];
    final downloadFilePathByRecentKey = <String, String>{};
-    for (final entry in albumGroups.entries) {
-      final tracks = entry.value;
-      final mostRecent = tracks.reduce(
-        (a, b) => a.downloadedAt.isAfter(b.downloadedAt) ? a : b,
-      );
+    for (final aggregate in albumGroups.values) {
+      final mostRecent = aggregate.mostRecent;
      final artistForKey =
          (mostRecent.albumArtist != null && mostRecent.albumArtist!.isNotEmpty)
          ? mostRecent.albumArtist!
          : mostRecent.artistName;

-      if (tracks.length == 1) {
-        final recent = RecentAccessItem(
-          id: mostRecent.spotifyId ?? mostRecent.id,
-          name: mostRecent.trackName,
-          subtitle: mostRecent.artistName,
-          imageUrl: mostRecent.coverUrl,
-          type: RecentAccessType.track,
-          accessedAt: mostRecent.downloadedAt,
-          providerId: 'download',
-        );
-        downloadItems.add(recent);
-        downloadFilePathByRecentKey['${recent.type.name}:${recent.id}'] =
-            mostRecent.filePath;
-      } else {
-        final recent = RecentAccessItem(
-          id: '${mostRecent.albumName}|$artistForKey',
-          name: mostRecent.albumName,
-          subtitle: artistForKey,
-          imageUrl: mostRecent.coverUrl,
-          type: RecentAccessType.album,
-          accessedAt: mostRecent.downloadedAt,
-          providerId: 'download',
-        );
-        downloadItems.add(recent);
-        downloadFilePathByRecentKey['${recent.type.name}:${recent.id}'] =
-            mostRecent.filePath;
+      final isSingleTrack = aggregate.count == 1;
+      final recentId = isSingleTrack
+          ? (mostRecent.spotifyId ?? mostRecent.id)
+          : '${mostRecent.albumName}|$artistForKey';
+      final recent = RecentAccessItem(
+        id: recentId,
+        name: isSingleTrack ? mostRecent.trackName : mostRecent.albumName,
+        subtitle: isSingleTrack ? mostRecent.artistName : artistForKey,
+        imageUrl: mostRecent.coverUrl,
+        type: isSingleTrack ? RecentAccessType.track : RecentAccessType.album,
+        accessedAt: mostRecent.downloadedAt,
+        providerId: 'download',
+      );
+
+      downloadIds.add(recentId);
+      downloadFilePathByRecentKey['${recent.type.name}:${recent.id}'] =
+          mostRecent.filePath;
+      if (!hiddenIds.contains(recentId)) {
+        visibleDownloads.add(recent);
      }
    }

-    downloadItems.sort((a, b) => b.accessedAt.compareTo(a.accessedAt));
-
-    final visibleDownloads = <RecentAccessItem>[];
-    for (final item in downloadItems) {
-      if (!hiddenIds.contains(item.id)) {
-        visibleDownloads.add(item);
-        if (visibleDownloads.length >= 10) {
-          break;
-        }
-      }
+    visibleDownloads.sort((a, b) => b.accessedAt.compareTo(a.accessedAt));
+    if (visibleDownloads.length > 10) {
+      visibleDownloads.removeRange(10, visibleDownloads.length);
    }

    final allItems = <RecentAccessItem>[...items, ...visibleDownloads];
@@ -1227,7 +1243,7 @@ class _HomeTabState extends ConsumerState<HomeTab>

    final view = _RecentAccessView(
      uniqueItems: uniqueItems,
-      downloadItems: downloadItems,
+      downloadIds: downloadIds,
      downloadFilePathByRecentKey: downloadFilePathByRecentKey,
      hasHiddenDownloads: hiddenIds.isNotEmpty,
    );
@@ -1641,7 +1657,7 @@ class _HomeTabState extends ConsumerState<HomeTab>

  Widget _buildRecentAccess(_RecentAccessView view, ColorScheme colorScheme) {
    final uniqueItems = view.uniqueItems;
-    final downloadItems = view.downloadItems;
+    final downloadIds = view.downloadIds;
    final hasHiddenDownloads = view.hasHiddenDownloads;

    return Padding(
@@ -1661,10 +1677,10 @@ class _HomeTabState extends ConsumerState<HomeTab>
              if (uniqueItems.isNotEmpty)
                TextButton(
                  onPressed: () {
-                    for (final item in downloadItems) {
+                    for (final id in downloadIds) {
                      ref
                          .read(recentAccessProvider.notifier)
-                          .hideDownloadFromRecents(item.id);
+                          .hideDownloadFromRecents(id);
                    }
                    ref.read(recentAccessProvider.notifier).clearHistory();
                  },
@@ -228,6 +228,7 @@ Map<String, List<String>> _filterHistoryInIsolate(Map<String, Object> payload) {
  final entries = (payload['entries'] as List).cast<List>();
  final albumCounts = (payload['albumCounts'] as Map).cast<String, int>();
  final query = (payload['query'] as String?) ?? '';
+  final hasQuery = query.isNotEmpty;

  final allIds = <String>[];
  final albumIds = <String>[];
@@ -236,10 +237,11 @@ Map<String, List<String>> _filterHistoryInIsolate(Map<String, Object> payload) {
  for (final entry in entries) {
    final id = entry[0] as String;
    final albumKey = entry[1] as String;
-    final searchKey = entry[2] as String;
-
-    if (query.isNotEmpty && !searchKey.contains(query)) {
-      continue;
+    if (hasQuery) {
+      final searchKey = entry[2] as String;
+      if (!searchKey.contains(query)) {
+        continue;
+      }
    }

    allIds.add(id);
@@ -276,6 +278,8 @@ class _QueueTabState extends ConsumerState<QueueTab> {
  final ValueNotifier<bool> _alwaysMissingFileNotifier = ValueNotifier(false);
  final Set<String> _pendingChecks = {};
  static const int _maxCacheSize = 500;
+  static const int _maxSearchIndexCacheSize = 4000;
+  static const int _maxDownloadedEmbeddedCoverCacheSize = 180;

  bool _isSelectionMode = false;
  final Set<String> _selectedIds = {};
@@ -311,8 +315,6 @@ class _QueueTabState extends ConsumerState<QueueTab> {
  final Set<String> _pendingDownloadedCoverExtract = {};
  final Set<String> _pendingDownloadedCoverRefresh = {};
  final Set<String> _failedDownloadedCoverExtract = {};
-  Map<String, DownloadHistoryItem> _historyItemsById = {};
-  List<List<String>> _historyFilterEntries = const [];
  Map<String, List<DownloadHistoryItem>> _filteredHistoryCache = const {};
  List<DownloadHistoryItem>? _filterItemsCache;
  String _filterQueryCache = '';
@@ -407,32 +409,16 @@ class _QueueTabState extends ConsumerState<QueueTab> {
    _historyItemsCache = items;
    _localLibraryItemsCache = localItems;
    _historyStatsCache = _buildHistoryStats(items, localItems);
-    _searchIndexCache
-      ..clear()
-      ..addEntries(
-        items.map((item) => MapEntry(item.id, _buildSearchKey(item))),
-      );
+    if (historyChanged) {
+      _searchIndexCache.clear();
+    }
    if (localChanged) {
-      _localSearchIndexCache
-        ..clear()
-        ..addEntries(
-          localItems.map(
-            (item) => MapEntry(item.id, _buildLocalSearchKey(item)),
-          ),
-        );
+      _localSearchIndexCache.clear();
      _localFilterItemsCache = null;
      _localFilterQueryCache = '';
      _filteredLocalItemsCache = const [];
    }
    _unifiedItemsCache.clear();
-    _historyItemsById = {for (final item in items) item.id: item};
-    _historyFilterEntries = List<List<String>>.generate(items.length, (index) {
-      final item = items[index];
-      final searchKey = _searchIndexCache[item.id] ?? _buildSearchKey(item);
-      final albumKey =
-          '${item.albumName.toLowerCase()}|${(item.albumArtist ?? item.artistName).toLowerCase()}';
-      return [item.id, albumKey, searchKey];
-    }, growable: false);

    if (historyChanged) {
      final validPaths = items
@@ -459,6 +445,30 @@ class _QueueTabState extends ConsumerState<QueueTab> {
        .toLowerCase();
  }

+  String _historySearchKeyForItem(DownloadHistoryItem item) {
+    final cached = _searchIndexCache[item.id];
+    if (cached != null) return cached;
+
+    final searchKey = _buildSearchKey(item);
+    _searchIndexCache[item.id] = searchKey;
+    while (_searchIndexCache.length > _maxSearchIndexCacheSize) {
+      _searchIndexCache.remove(_searchIndexCache.keys.first);
+    }
+    return searchKey;
+  }
+
+  String _localSearchKeyForItem(LocalLibraryItem item) {
+    final cached = _localSearchIndexCache[item.id];
+    if (cached != null) return cached;
+
+    final searchKey = _buildLocalSearchKey(item);
+    _localSearchIndexCache[item.id] = searchKey;
+    while (_localSearchIndexCache.length > _maxSearchIndexCacheSize) {
+      _localSearchIndexCache.remove(_localSearchIndexCache.keys.first);
+    }
+    return searchKey;
+  }
+
  List<LocalLibraryItem> _filterLocalItems(
    List<LocalLibraryItem> items,
    String query,
@@ -471,11 +481,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {

    final filtered = items
        .where((item) {
-          final searchKey =
-              _localSearchIndexCache[item.id] ?? _buildLocalSearchKey(item);
-          if (!_localSearchIndexCache.containsKey(item.id)) {
-            _localSearchIndexCache[item.id] = searchKey;
-          }
+          final searchKey = _localSearchKeyForItem(item);
          return searchKey.contains(query);
        })
        .toList(growable: false);
@@ -548,15 +554,26 @@ class _QueueTabState extends ConsumerState<QueueTab> {
    }

    final requestId = ++_filterRequestId;
+    final includeSearchKey = query.isNotEmpty;
+    final entries = List<List<String>>.generate(items.length, (index) {
+      final item = items[index];
+      final albumKey =
+          '${item.albumName.toLowerCase()}|${(item.albumArtist ?? item.artistName).toLowerCase()}';
+      if (!includeSearchKey) {
+        return [item.id, albumKey];
+      }
+      final searchKey = _historySearchKeyForItem(item);
+      return [item.id, albumKey, searchKey];
+    }, growable: false);
    final payload = <String, Object>{
-      'entries': _historyFilterEntries,
+      'entries': entries,
      'albumCounts': albumCounts,
      'query': query,
    };

    compute(_filterHistoryInIsolate, payload).then((result) {
      if (!mounted || requestId != _filterRequestId) return;
-      final itemsById = _historyItemsById;
+      final itemsById = {for (final item in items) item.id: item};
      final filtered = <String, List<DownloadHistoryItem>>{};
      for (final entry in result.entries) {
        filtered[entry.key] = entry.value
@@ -604,10 +621,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {
    final query = searchQuery;
    return items
        .where((item) {
-          final searchKey = _searchIndexCache[item.id] ?? _buildSearchKey(item);
-          if (!_searchIndexCache.containsKey(item.id)) {
-            _searchIndexCache[item.id] = searchKey;
-          }
+          final searchKey = _historySearchKeyForItem(item);
          return searchKey.contains(query);
        })
        .toList(growable: false);
@@ -812,6 +826,18 @@ class _QueueTabState extends ConsumerState<QueueTab> {
    _cleanupTempCoverPathSync(cachedPath);
  }

+  void _trimDownloadedEmbeddedCoverCache() {
+    while (_downloadedEmbeddedCoverCache.length >
+        _maxDownloadedEmbeddedCoverCacheSize) {
+      final oldestKey = _downloadedEmbeddedCoverCache.keys.first;
+      final removedPath = _downloadedEmbeddedCoverCache.remove(oldestKey);
+      _pendingDownloadedCoverExtract.remove(oldestKey);
+      _pendingDownloadedCoverRefresh.remove(oldestKey);
+      _failedDownloadedCoverExtract.remove(oldestKey);
+      _cleanupTempCoverPathSync(removedPath);
+    }
+  }
+
  Future<int?> _readFileModTimeMillis(String? filePath) async {
    final cleanPath = _cleanFilePath(filePath);
    if (cleanPath.isEmpty) return null;
@@ -918,6 +944,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {
        final previous = _downloadedEmbeddedCoverCache[cleanPath];
        _downloadedEmbeddedCoverCache[cleanPath] = outputPath;
        _failedDownloadedCoverExtract.remove(cleanPath);
+        _trimDownloadedEmbeddedCoverCache();
        if (previous != null && previous != outputPath) {
          _cleanupTempCoverPathSync(previous);
        }
@@ -1607,10 +1634,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {
    if (searchQuery.isNotEmpty) {
      final query = searchQuery;
      filteredItems = items.where((item) {
-        final searchKey = _searchIndexCache[item.id] ?? _buildSearchKey(item);
-        if (!_searchIndexCache.containsKey(item.id)) {
-          _searchIndexCache[item.id] = searchKey;
-        }
+        final searchKey = _historySearchKeyForItem(item);
        return searchKey.contains(query);
      }).toList();
    }
@@ -1797,7 +1821,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {
    _initializePageController();

    final hasQueueItems = ref.watch(
-      downloadQueueProvider.select((s) => s.items.isNotEmpty),
+      downloadQueueLookupProvider.select((lookup) => lookup.itemIds.isNotEmpty),
    );
    final allHistoryItems = ref.watch(
      downloadHistoryProvider.select((s) => s.items),
@@ -1825,6 +1849,14 @@ class _QueueTabState extends ConsumerState<QueueTab> {
        _buildHistoryStats(allHistoryItems, localLibraryItems);
    final groupedAlbums = historyStats.groupedAlbums;
    final groupedLocalAlbums = historyStats.groupedLocalAlbums;
+    final filteredGroupedAlbums = _filterGroupedAlbums(
+      groupedAlbums,
+      _searchQuery,
+    );
+    final filteredGroupedLocalAlbums = _filterGroupedLocalAlbums(
+      groupedLocalAlbums,
+      _searchQuery,
+    );
    final albumCount = historyStats.totalAlbumCount;
    final singleCount = historyStats.totalSingleTracks;
    final filterDataCache = <String, _FilterContentData>{};
@@ -1835,8 +1867,8 @@ class _QueueTabState extends ConsumerState<QueueTab> {
        () => _computeFilterContentData(
          filterMode: filterMode,
          allHistoryItems: allHistoryItems,
-          groupedAlbums: groupedAlbums,
-          groupedLocalAlbums: groupedLocalAlbums,
+          filteredGroupedAlbums: filteredGroupedAlbums,
+          filteredGroupedLocalAlbums: filteredGroupedLocalAlbums,
          albumCounts: historyStats.albumCounts,
          localAlbumCounts: historyStats.localAlbumCounts,
          localLibraryItems: localLibraryItems,
@@ -2227,8 +2259,8 @@ class _QueueTabState extends ConsumerState<QueueTab> {
  _FilterContentData _computeFilterContentData({
    required String filterMode,
    required List<DownloadHistoryItem> allHistoryItems,
-    required List<_GroupedAlbum> groupedAlbums,
-    required List<_GroupedLocalAlbum> groupedLocalAlbums,
+    required List<_GroupedAlbum> filteredGroupedAlbums,
+    required List<_GroupedLocalAlbum> filteredGroupedLocalAlbums,
    required Map<String, int> albumCounts,
    required Map<String, int> localAlbumCounts,
    required List<LocalLibraryItem> localLibraryItems,
@@ -2243,16 +2275,6 @@ class _QueueTabState extends ConsumerState<QueueTab> {
      filterMode: filterMode,
    );

-    final searchQuery = _searchQuery;
-    final filteredGroupedAlbums = _filterGroupedAlbums(
-      groupedAlbums,
-      searchQuery,
-    );
-    final filteredGroupedLocalAlbums = _filterGroupedLocalAlbums(
-      groupedLocalAlbums,
-      searchQuery,
-    );
-
    final unifiedItems = _getUnifiedItems(
      filterMode: filterMode,
      historyItems: historyItems,
@@ -2278,7 +2300,7 @@ class _QueueTabState extends ConsumerState<QueueTab> {
    return Consumer(
      builder: (context, ref, child) {
        final queueCount = ref.watch(
-          downloadQueueProvider.select((s) => s.items.length),
+          downloadQueueLookupProvider.select((lookup) => lookup.itemIds.length),
        );
        if (queueCount == 0) {
          return const SliverToBoxAdapter(child: SizedBox.shrink());
@@ -2310,10 +2332,8 @@ class _QueueTabState extends ConsumerState<QueueTab> {
    return Consumer(
      builder: (context, ref, child) {
        final queueIdsSnapshot = ref.watch(
-          downloadQueueProvider.select(
-            (s) => _QueueItemIdsSnapshot(
-              s.items.map((item) => item.id).toList(growable: false),
-            ),
+          downloadQueueLookupProvider.select(
+            (lookup) => _QueueItemIdsSnapshot(lookup.itemIds),
          ),
        );
        if (queueIdsSnapshot.ids.isEmpty) {
@@ -4011,14 +4031,7 @@ class _QueueItemSliverRow extends ConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final item = ref.watch(
-      downloadQueueProvider.select((state) {
-        for (final current in state.items) {
-          if (current.id == itemId) {
-            return current;
-          }
-        }
-        return null;
-      }),
+      downloadQueueLookupProvider.select((lookup) => lookup.byItemId[itemId]),
    );
    if (item == null) {
      return const SizedBox.shrink();