fix(playlists): load paginated items mutably

close #1100
This commit is contained in:
edde746
2026-05-22 05:28:03 +02:00
parent c354193187
commit fc231a9e72
5 changed files with 169 additions and 11 deletions
@@ -42,7 +42,7 @@ class _PlaylistDetailScreenState extends BaseMediaListDetailScreen<PlaylistDetai
StandardItemLoader<PlaylistDetailScreen>,
GridFocusNodeMixin<PlaylistDetailScreen>,
FocusableDetailScreenMixin<PlaylistDetailScreen> {
static const int _pageSize = 100;
static const int _pageSize = playlistItemsPageSize;
@override
Object get mediaItem => widget.playlist;
@@ -193,7 +193,7 @@ class _PlaylistDetailScreenState extends BaseMediaListDetailScreen<PlaylistDetai
if (!mounted || generation != _playlistLoadGeneration) return;
setState(() {
items = firstPage.items;
items = List.of(firstPage.items);
_playlistTotalSize = firstPage.totalCount;
isLoading = false;
_isLoadingFullPlaylist = firstPage.items.length < firstPage.totalCount;
@@ -233,7 +233,7 @@ class _PlaylistDetailScreenState extends BaseMediaListDetailScreen<PlaylistDetai
if (!mounted || generation != _playlistLoadGeneration) return;
if (page.items.isEmpty) break;
setState(() {
items.addAll(page.items);
items = List.of(items)..addAll(page.items);
total = page.totalCount;
_playlistTotalSize = page.totalCount;
});
+7 -1
View File
@@ -1,8 +1,14 @@
import '../media/media_item.dart';
import '../media/media_server_client.dart';
const int playlistItemsPageSize = 200;
/// Page through every item in a playlist via the backend-neutral client API.
Future<List<MediaItem>> fetchAllPlaylistItems(MediaServerClient client, String playlistId, {int pageSize = 100}) async {
Future<List<MediaItem>> fetchAllPlaylistItems(
MediaServerClient client,
String playlistId, {
int pageSize = playlistItemsPageSize,
}) async {
final all = <MediaItem>[];
var offset = 0;
while (true) {
+1 -3
View File
@@ -402,9 +402,7 @@ class SyncRuleExecutor {
return SyncRuleResult(globalKey: rule.globalKey, title: displayTitle, queuedCount: queued);
}
/// Page through every item in a playlist; the neutral
/// [MediaServerClient.fetchPlaylistItems] caps each page (Plex at 100,
/// Jellyfin honours `limit`).
/// Page through every item in a playlist using the shared playlist page size.
Future<List<MediaItem>> _fetchAllPlaylistItems(MediaServerClient client, String playlistId) async {
return fetchAllPlaylistItems(client, playlistId);
}
@@ -0,0 +1,153 @@
import 'package:drift/native.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:plezy/database/app_database.dart';
import 'package:plezy/i18n/strings.g.dart';
import 'package:plezy/media/library_query.dart';
import 'package:plezy/media/media_backend.dart';
import 'package:plezy/media/media_item.dart';
import 'package:plezy/media/media_kind.dart';
import 'package:plezy/media/media_playlist.dart';
import 'package:plezy/media/media_server_client.dart';
import 'package:plezy/media/server_capabilities.dart';
import 'package:plezy/providers/download_provider.dart';
import 'package:plezy/providers/multi_server_provider.dart';
import 'package:plezy/screens/playlist/playlist_detail_screen.dart';
import 'package:plezy/services/data_aggregation_service.dart';
import 'package:plezy/services/download_manager_service.dart';
import 'package:plezy/services/download_storage_service.dart';
import 'package:plezy/services/jellyfin_api_cache.dart';
import 'package:plezy/services/multi_server_manager.dart';
import 'package:plezy/services/playlist_items_loader.dart';
import 'package:plezy/services/plex_api_cache.dart';
import 'package:plezy/services/settings_service.dart';
import 'package:plezy/theme/mono_theme.dart';
import 'package:plezy/utils/media_server_http_client.dart';
import 'package:provider/provider.dart';
import '../test_helpers/prefs.dart';
void main() {
TestWidgetsFlutterBinding.ensureInitialized();
setUp(() {
resetSharedPreferencesForTest();
SettingsService.resetForTesting();
LocaleSettings.setLocaleSync(AppLocale.en);
});
testWidgets('loads playlist continuation pages from an unmodifiable first page', (tester) async {
await SettingsService.getInstance();
final db = AppDatabase.forTesting(NativeDatabase.memory());
PlexApiCache.initialize(db);
JellyfinApiCache.initialize(db);
final downloadManager = DownloadManagerService(database: db, storageService: DownloadStorageService.instance);
downloadManager.recoveryFuture = Future<void>.value();
final downloadProvider = DownloadProvider.forTesting(downloadManager: downloadManager, database: db);
await downloadProvider.ensureInitialized();
final items = List.generate(
playlistItemsPageSize + 5,
(index) => MediaItem(
id: 'item_$index',
backend: MediaBackend.plex,
kind: MediaKind.movie,
title: 'Item $index',
serverId: 'server_1',
serverName: 'Server',
),
);
final client = _PagedPlaylistClient(items);
final manager = MultiServerManager()..debugRegisterClientForTesting(client);
final multiServerProvider = MultiServerProvider(manager, DataAggregationService(manager));
addTearDown(() async {
downloadProvider.dispose();
downloadManager.dispose();
multiServerProvider.dispose();
await db.close();
});
await tester.pumpWidget(
TranslationProvider(
child: MultiProvider(
providers: [
ChangeNotifierProvider<MultiServerProvider>.value(value: multiServerProvider),
ChangeNotifierProvider<DownloadProvider>.value(value: downloadProvider),
],
child: MaterialApp(
theme: monoTheme(dark: true),
home: SizedBox(
width: 1280,
height: 720,
child: PlaylistDetailScreen(
playlist: const MediaPlaylist(
id: 'playlist_1',
backend: MediaBackend.plex,
title: 'Long Playlist',
playlistType: 'video',
serverId: 'server_1',
serverName: 'Server',
),
),
),
),
),
),
);
for (var i = 0; i < 10 && client.requestedStarts.length < 2; i++) {
await tester.pump(const Duration(milliseconds: 10));
}
await tester.pumpAndSettle();
expect(client.requestedStarts, [0, playlistItemsPageSize]);
expect(client.requestedSizes, [playlistItemsPageSize, playlistItemsPageSize]);
expect(tester.takeException(), isNull);
await tester.drag(find.byType(CustomScrollView), const Offset(0, -30000));
await tester.pumpAndSettle();
expect(find.text('Item ${playlistItemsPageSize + 4}'), findsOneWidget);
expect(find.textContaining('Unsupported operation'), findsNothing);
expect(find.text(t.common.retry), findsNothing);
});
}
class _PagedPlaylistClient implements MediaServerClient {
final List<MediaItem> items;
final List<int?> requestedStarts = [];
final List<int?> requestedSizes = [];
_PagedPlaylistClient(this.items);
@override
String get serverId => 'server_1';
@override
String? get serverName => 'Server';
@override
MediaBackend get backend => MediaBackend.plex;
@override
ServerCapabilities get capabilities => ServerCapabilities.plex;
@override
Future<LibraryPage<MediaItem>> fetchPlaylistPage(String id, {int? start, int? size, AbortController? abort}) async {
requestedStarts.add(start);
requestedSizes.add(size);
final offset = start ?? 0;
final limit = size ?? items.length;
return LibraryPage(items: items.skip(offset).take(limit).toList(), totalCount: items.length, offset: offset);
}
@override
void close() {}
@override
dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
}
@@ -9,6 +9,7 @@ import 'package:plezy/providers/playback_state_provider.dart';
import 'package:plezy/services/jellyfin_client.dart';
import 'package:plezy/services/jellyfin_sequential_launcher.dart';
import 'package:plezy/services/media_list_playback_launcher.dart';
import 'package:plezy/services/playlist_items_loader.dart';
import 'package:plezy/utils/media_server_http_client.dart';
/// Recording fake that satisfies [JellyfinClient] via `implements` +
@@ -205,9 +206,9 @@ void main() {
testWidgets('playlist path pages through every item', (tester) async {
final ctx = await pumpContext(tester);
// 150 items across 2 pages of 100 — the loop must keep paging until
// Enough items to span 2 default playlist pages — the loop must keep paging until
// the server returns a short page.
final fetched = List.generate(150, (i) => _ep('p$i'));
final fetched = List.generate(playlistItemsPageSize + 50, (i) => _ep('p$i'));
final fakeClient = _RecordingJellyfinClient(playlistItemsResponse: fetched);
final playback = PlaybackStateProvider();
@@ -233,10 +234,10 @@ void main() {
);
expect(result, isA<PlayQueueSuccess>());
expect(playback.loadedItems.length, 150);
expect(playback.loadedItems.length, playlistItemsPageSize + 50);
expect(fakeClient.fetchPlaylistItemsCalls, hasLength(2));
expect(fakeClient.fetchPlaylistItemsCalls.first.offset, 0);
expect(fakeClient.fetchPlaylistItemsCalls[1].offset, 100);
expect(fakeClient.fetchPlaylistItemsCalls[1].offset, playlistItemsPageSize);
});
testWidgets('collection containing a Series entry only seeds playable descendants', (tester) async {