1.0 library + player settings: Jellyfin/Link/Files library with details panel, player gear, settings cards, host flag
Library: source switch, selectable cards with a details panel, one merged Continue row, Latest grouped per series without re-releases, Link page with previews and recent links, Files embedded. Player: gear popover in both designs, progress line while controls hide, live hwdec. Settings rebuilt as cards. State marks the host member (proto stays 9, unreleased); hosting shows LAN invite addresses; window buttons in fullscreen. fadeThrough keeps the outgoing view's state. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
foxyzandClaude Opus 5.5 committed
1 parent
99cda7ed04
commit
d092ea371a
54 files changed
+4963
-1825
No files matched your search
@@ -0,0 +1,392 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:sync_relay_core/core.dart';
|
||||
import 'package:watch_together/src/jellyfin/accounts.dart';
|
||||
import 'package:watch_together/src/jellyfin/browse_scope.dart';
|
||||
import 'package:watch_together/src/jellyfin/details_panel.dart';
|
||||
import 'package:watch_together/src/screens/home/media_picker.dart';
|
||||
import 'package:watch_together/src/shell/library_link.dart';
|
||||
import 'package:watch_together/src/shell/library_tab.dart';
|
||||
|
||||
import 'jellyfin_accounts_test.dart'
|
||||
show FakeJellyfin, arifuretaId, fixtureServerId, jellyfinFixture, linkedAccounts, season2Id;
|
||||
import 'jellyfin_browser_test.dart' show fixtureNow, settle;
|
||||
|
||||
const bsSeries = 'e9aec9c14a1fcab775111844112b4cf7';
|
||||
const bsEpisode = 'b18826be994070a79f9b52bc0f66f052';
|
||||
const bsSeason = 'fb0b77cfda15445f9319ed9d753dba23';
|
||||
const s2e2 = 'f5600f84e2c02c1f30442bf679dcbb1d';
|
||||
|
||||
JellyfinHttpResponse page(List<Object> items) =>
|
||||
JellyfinHttpResponse(200, jsonEncode({'Items': items, 'TotalRecordCount': items.length}));
|
||||
|
||||
/// The fake server, plus: Arifureta in "Latest" (2 new), Black Summoner's
|
||||
/// series, season and episode, and watched-state calls.
|
||||
FakeJellyfin libraryFake() {
|
||||
final fake = FakeJellyfin();
|
||||
final arifureta = jsonDecode(jellyfinFixture('series_detail')) as Map<String, dynamic>;
|
||||
// Added when it aired: not a re-release.
|
||||
fake.on('GET', '/Items/Latest', (_, _) => JellyfinHttpResponse(200, jsonEncode([
|
||||
{...arifureta, 'ChildCount': 2, 'DateCreated': arifureta['PremiereDate']},
|
||||
])));
|
||||
final episode = jsonDecode(jellyfinFixture('episode_detail')) as Map<String, dynamic>;
|
||||
fake.on('GET', '/Items/$bsSeries',
|
||||
(_, _) => JellyfinHttpResponse(200, jsonEncode({'Id': bsSeries, 'Name': 'Black Summoner', 'Type': 'Series'})));
|
||||
fake.on('GET', '/Shows/$bsSeries/Seasons', (_, _) => page([
|
||||
{'Id': bsSeason, 'Name': 'Season 1', 'Type': 'Season', 'IndexNumber': 1, 'SeriesId': bsSeries},
|
||||
]));
|
||||
fake.on('GET', '/Shows/$bsSeries/Episodes', (_, _) => page([episode]));
|
||||
// Arifureta's episodes load on their own too (a pick restored by id).
|
||||
for (final e in (jsonDecode(jellyfinFixture('episodes')) as Map)['Items'] as List) {
|
||||
fake.on('GET', '/Items/${e['Id']}', (_, _) => JellyfinHttpResponse(200, jsonEncode(e)));
|
||||
}
|
||||
const ud = '{"Played":true,"PlaybackPositionTicks":0,"PlayCount":1}';
|
||||
fake.on('POST', '/UserPlayedItems/$bsEpisode', (_, _) => const JellyfinHttpResponse(200, ud));
|
||||
return fake;
|
||||
}
|
||||
|
||||
class FilesStub extends StatelessWidget {
|
||||
final bool online, relayed;
|
||||
final Future<String?> Function(String path) onPlay;
|
||||
const FilesStub({super.key, required this.online, required this.relayed, required this.onPlay});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => Column(children: [
|
||||
Text('files online=$online relayed=$relayed'),
|
||||
TextButton(
|
||||
key: const ValueKey('stub-play'),
|
||||
onPressed: online ? () => onPlay('/v/a.mkv') : null,
|
||||
child: const Text('play'),
|
||||
),
|
||||
]);
|
||||
}
|
||||
|
||||
class Harness {
|
||||
final MediaPickerController controller;
|
||||
final JellyfinAccounts accounts;
|
||||
final FakeJellyfin fake;
|
||||
final put = <PickedMedia>[];
|
||||
final recents = RecentLinks(read: () async => null, write: (_) async {});
|
||||
Harness(this.controller, this.accounts, this.fake);
|
||||
}
|
||||
|
||||
Future<Harness> pumpLibrary(
|
||||
WidgetTester tester,
|
||||
Size size, {
|
||||
bool online = true,
|
||||
bool isHost = false,
|
||||
MediaKind source = MediaKind.jellyfin,
|
||||
Harness? reuse,
|
||||
BrowseStart? start,
|
||||
JellyfinMedia? pick,
|
||||
}) async {
|
||||
tester.view.physicalSize = size;
|
||||
tester.view.devicePixelRatio = 1;
|
||||
addTearDown(tester.view.reset);
|
||||
final Harness h;
|
||||
if (reuse != null) {
|
||||
h = reuse;
|
||||
} else {
|
||||
final (accounts, fake) = await linkedAccounts(http: libraryFake());
|
||||
final c = MediaPickerController(source: source, jellyfin: pick);
|
||||
if (pick != null) c.source = source;
|
||||
addTearDown(c.dispose);
|
||||
h = Harness(c, accounts, fake);
|
||||
}
|
||||
await tester.pumpWidget(MaterialApp(
|
||||
theme: ThemeData.dark(),
|
||||
home: Scaffold(
|
||||
body: LibraryTab(
|
||||
// A new tab each time, like the shell after "Change video".
|
||||
key: UniqueKey(),
|
||||
controller: h.controller,
|
||||
accounts: h.accounts,
|
||||
online: online,
|
||||
isHost: isHost,
|
||||
jellyfinStart: start,
|
||||
recentLinks: h.recents,
|
||||
now: () => fixtureNow,
|
||||
oembed: (uri) async => jsonEncode({
|
||||
'title': 'A video',
|
||||
'author_name': 'Chan',
|
||||
}),
|
||||
filesBuilder: (context, {required online, required relayed, required onPlay, nowPlayingPath}) =>
|
||||
FilesStub(online: online, relayed: relayed, onPlay: onPlay),
|
||||
onPutUp: (m) async {
|
||||
h.put.add(m);
|
||||
return null;
|
||||
},
|
||||
),
|
||||
),
|
||||
));
|
||||
await settle(tester, 10);
|
||||
return h;
|
||||
}
|
||||
|
||||
Finder arifuretaCard() => find.byKey(const ValueKey('card-$arifuretaId')).first;
|
||||
|
||||
Future<void> doubleTap(WidgetTester tester, Finder f) async {
|
||||
await tester.tap(f);
|
||||
await tester.pump(const Duration(milliseconds: 60));
|
||||
await tester.tap(f);
|
||||
await settle(tester, 10);
|
||||
}
|
||||
|
||||
void main() {
|
||||
testWidgets('source switch fades through; library chips sit in the header', (tester) async {
|
||||
final h = await pumpLibrary(tester, const Size(1600, 1000));
|
||||
expect(find.byKey(const ValueKey('library-a656b907eb3a73532e40e44b968d0225')), findsOneWidget);
|
||||
expect(find.text('Continue'), findsOneWidget);
|
||||
|
||||
await tester.tap(find.text('Link'));
|
||||
await tester.pump(const Duration(milliseconds: 60));
|
||||
// Fade through: the new view waits until the old one is gone.
|
||||
final incoming = tester.widget<FadeTransition>(
|
||||
find.ancestor(of: find.text('Watch from a link'), matching: find.byType(FadeTransition)).first);
|
||||
expect(incoming.opacity.value, 0);
|
||||
await settle(tester, 10);
|
||||
expect(find.text('Continue'), findsNothing);
|
||||
expect(find.text('Watch from a link'), findsOneWidget);
|
||||
expect(h.controller.source, MediaKind.link);
|
||||
|
||||
await tester.tap(find.text('Files'));
|
||||
await settle(tester, 10);
|
||||
expect(find.text('files online=true relayed=true'), findsOneWidget);
|
||||
await tester.tap(find.byKey(const ValueKey('stub-play')));
|
||||
await settle(tester);
|
||||
expect(h.put, [const FileMedia('/v/a.mkv')]);
|
||||
|
||||
await tester.tap(find.text('Jellyfin'));
|
||||
await settle(tester, 10);
|
||||
// A chip opens its library; again goes back home.
|
||||
await tester.tap(find.byKey(const ValueKey('library-a656b907eb3a73532e40e44b968d0225')));
|
||||
await settle(tester, 10);
|
||||
expect(find.text('218 items'), findsOneWidget);
|
||||
await tester.tap(find.byKey(const ValueKey('library-a656b907eb3a73532e40e44b968d0225')));
|
||||
await settle(tester, 10);
|
||||
expect(find.text('Continue'), findsOneWidget);
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
|
||||
testWidgets('select a card: the panel slides in; episodes pick what goes up', (tester) async {
|
||||
final h = await pumpLibrary(tester, const Size(1600, 1000));
|
||||
expect(find.byKey(const ValueKey('jf-details')), findsNothing);
|
||||
await tester.tap(arifuretaCard());
|
||||
await settle(tester, 10);
|
||||
final panel = find.byKey(const ValueKey('jf-details'));
|
||||
expect(panel, findsOneWidget);
|
||||
// Docked at the right, 400 px.
|
||||
expect(tester.getSize(panel).width, detailsPanelWidth);
|
||||
expect(tester.getTopLeft(panel).dx, 1600 - detailsPanelWidth);
|
||||
expect(h.controller.selected!.itemId, arifuretaId);
|
||||
// Next up is S2E4; the list is its season.
|
||||
expect(find.text('Put it up · S2E4'), findsOneWidget);
|
||||
expect(find.byKey(const ValueKey('details-episode-$s2e2')), findsOneWidget);
|
||||
await tester.ensureVisible(find.byKey(const ValueKey('details-episode-$s2e2')));
|
||||
await tester.pump();
|
||||
await tester.tap(find.byKey(const ValueKey('details-episode-$s2e2')));
|
||||
await settle(tester);
|
||||
expect(find.text('Put it up · S2E2'), findsOneWidget);
|
||||
await tester.drag(find.byKey(const ValueKey('details-list')), const Offset(0, 2000));
|
||||
await settle(tester);
|
||||
await tester.tap(find.byKey(const ValueKey('details-put-up')));
|
||||
await settle(tester);
|
||||
final m = h.put.single as JellyfinMedia;
|
||||
expect((m.serverId, m.itemId, m.title), (fixtureServerId, s2e2, 'Burning Light'));
|
||||
expect(m.subtitle, endsWith('S2E2'));
|
||||
|
||||
// Another card: the panel's content cross-fades.
|
||||
await tester.tap(find.byKey(const ValueKey('card-$bsEpisode')));
|
||||
await tester.pump(const Duration(milliseconds: 60));
|
||||
expect(find.text("Arifureta: From Commonplace to World's Strongest"), findsWidgets,
|
||||
reason: 'the old panel is still fading out');
|
||||
await settle(tester, 10);
|
||||
expect(find.text('Put it up · S2E2'), findsNothing);
|
||||
expect(find.text('Put it up · S1E6'), findsOneWidget);
|
||||
|
||||
// Close: the panel slides away and the selection is gone.
|
||||
await tester.tap(find.byKey(const ValueKey('details-close')));
|
||||
await settle(tester, 10);
|
||||
expect(h.controller.selected, isNull);
|
||||
expect(tester.getSize(find.byType(ClipRect).first).width, isNot(detailsPanelWidth));
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
|
||||
testWidgets('double-click a card puts it up (a series: its next episode)', (tester) async {
|
||||
final h = await pumpLibrary(tester, const Size(1600, 1000));
|
||||
await doubleTap(tester, arifuretaCard());
|
||||
final m = h.put.single as JellyfinMedia;
|
||||
expect(m.itemId, '56d6b3b65c83213fcbaeaf85c9239189'); // S2E4
|
||||
expect(h.controller.selected!.itemId, arifuretaId);
|
||||
await doubleTap(tester, find.byKey(const ValueKey('card-$bsEpisode')));
|
||||
expect((h.put.last as JellyfinMedia).itemId, bsEpisode);
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
|
||||
testWidgets('mark watched and remove from Continue reload the rows', (tester) async {
|
||||
final h = await pumpLibrary(tester, const Size(1600, 1000));
|
||||
final row = find.byKey(const ValueKey('row-continue'));
|
||||
expect(find.descendant(of: row, matching: find.text('Black Summoner')), findsOneWidget);
|
||||
await tester.tap(find.byKey(const ValueKey('card-$bsEpisode')));
|
||||
await settle(tester, 10);
|
||||
expect(find.text('Put it up · S1E6'), findsOneWidget);
|
||||
final resumes = h.fake.count('GET', '/UserItems/Resume');
|
||||
|
||||
await tester.tap(find.byKey(const ValueKey('details-watched')));
|
||||
await settle(tester, 10);
|
||||
expect(h.fake.count('POST', '/UserPlayedItems/$bsEpisode'), 1);
|
||||
expect(h.fake.count('GET', '/UserItems/Resume'), greaterThan(resumes), reason: 'rows reload');
|
||||
|
||||
expect(find.byKey(const ValueKey('details-remove-continue')), findsOneWidget);
|
||||
await tester.tap(find.byKey(const ValueKey('details-remove-continue')));
|
||||
await settle(tester, 10);
|
||||
expect(h.accounts.continueDismissed(fixtureServerId), contains(bsSeries));
|
||||
expect(find.descendant(of: row, matching: find.text('Black Summoner')), findsNothing);
|
||||
expect(find.descendant(of: row, matching: find.text("JoJo's Bizarre Adventure")), findsOneWidget);
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
|
||||
testWidgets('offline: everything browses, nothing goes up', (tester) async {
|
||||
final h = await pumpLibrary(tester, const Size(1600, 1000), online: false);
|
||||
await tester.tap(arifuretaCard());
|
||||
await settle(tester, 10);
|
||||
final go = find.byKey(const ValueKey('details-put-up'));
|
||||
expect(tester.widget<ButtonStyleButton>(go).onPressed, isNull);
|
||||
expect(find.descendant(of: go, matching: find.text('Play')), findsOneWidget);
|
||||
expect(find.text(offlinePutUpHint), findsOneWidget);
|
||||
await doubleTap(tester, arifuretaCard());
|
||||
expect(h.put, isEmpty);
|
||||
|
||||
await tester.tap(find.text('Link'));
|
||||
await settle(tester, 10);
|
||||
await tester.enterText(find.byKey(const ValueKey('link-field')), 'https://cdn.example/a.mkv');
|
||||
await settle(tester, 10);
|
||||
final linkGo = find.byKey(const ValueKey('link-put-up'));
|
||||
expect(tester.widget<ButtonStyleButton>(linkGo).onPressed, isNull);
|
||||
expect(find.descendant(of: find.byKey(const ValueKey('media-link')), matching: find.text(offlinePutUpHint)),
|
||||
findsOneWidget);
|
||||
expect(find.text('How the others get it'), findsNothing);
|
||||
expect(find.text('a.mkv'), findsOneWidget, reason: 'the preview still works');
|
||||
|
||||
await tester.tap(find.text('Files'));
|
||||
await settle(tester, 10);
|
||||
expect(find.text('files online=false relayed=true'), findsOneWidget);
|
||||
expect(h.put, isEmpty);
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
|
||||
testWidgets('link: preview, how the others get it, put up, recent links, Ctrl+V', (tester) async {
|
||||
final h = await pumpLibrary(tester, const Size(1400, 1000), source: MediaKind.link);
|
||||
expect(find.text('How the others get it'), findsOneWidget);
|
||||
const url = 'https://www.youtube.com/watch?v=abc';
|
||||
await tester.enterText(find.byKey(const ValueKey('link-field')), url);
|
||||
await settle(tester, 10);
|
||||
expect(find.descendant(of: find.byKey(const ValueKey('link-preview')), matching: find.text('A video')),
|
||||
findsOneWidget);
|
||||
expect(find.text('youtube.com · Chan'), findsOneWidget);
|
||||
await tester.tap(find.byKey(const ValueKey('link-mode-me')));
|
||||
await settle(tester);
|
||||
expect(h.controller.linkRelay, LinkRelay.me);
|
||||
expect(find.text(linkRelayHelp(LinkRelay.me)), findsOneWidget);
|
||||
await tester.tap(find.byKey(const ValueKey('link-put-up')));
|
||||
await settle(tester, 10);
|
||||
expect(h.put, [const LinkMedia(url, relay: LinkRelay.me)]);
|
||||
expect(h.recents.links.value.single.title, 'A video');
|
||||
expect(find.byKey(const ValueKey('recent-link-$url')), findsOneWidget);
|
||||
|
||||
// A recent link refills the field.
|
||||
await tester.enterText(find.byKey(const ValueKey('link-field')), '');
|
||||
await settle(tester, 10);
|
||||
await tester.tap(find.byKey(const ValueKey('recent-link-$url')));
|
||||
await settle(tester, 10);
|
||||
expect(h.controller.link.text, url);
|
||||
|
||||
// Ctrl+V outside a field, on another source: the link lands in Link.
|
||||
await tester.tap(find.text('Jellyfin'));
|
||||
await settle(tester, 10);
|
||||
tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, (call) async {
|
||||
if (call.method == 'Clipboard.getData') return {'text': 'https://cdn.example/b.mkv'};
|
||||
return null;
|
||||
});
|
||||
addTearDown(() => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(SystemChannels.platform, null));
|
||||
FocusManager.instance.primaryFocus?.unfocus();
|
||||
Focus.of(tester.element(find.byKey(const ValueKey('media-source')))).requestFocus();
|
||||
await tester.pump();
|
||||
await tester.sendKeyDownEvent(LogicalKeyboardKey.controlLeft);
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.keyV);
|
||||
await tester.sendKeyUpEvent(LogicalKeyboardKey.controlLeft);
|
||||
await settle(tester, 10);
|
||||
expect(h.controller.source, MediaKind.link);
|
||||
expect(h.controller.link.text, 'https://cdn.example/b.mkv');
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
|
||||
testWidgets('hosting: files stream from here; now-playing file passes through', (tester) async {
|
||||
await pumpLibrary(tester, const Size(1400, 900), source: MediaKind.file, isHost: true);
|
||||
expect(find.text('files online=true relayed=false'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('the last pick comes back selected; "Change video" opens on its series', (tester) async {
|
||||
final (accounts, _) = await linkedAccounts(http: libraryFake());
|
||||
const pick = JellyfinMedia(
|
||||
serverId: fixtureServerId,
|
||||
baseUrl: 'https://example.invalid',
|
||||
itemId: bsEpisode,
|
||||
title: 'Rice and Thieves and Heroes',
|
||||
subtitle: 'Black Summoner · S1E6');
|
||||
await accounts.rememberPick(pick);
|
||||
final c = MediaPickerController();
|
||||
addTearDown(c.dispose);
|
||||
await restoreLastPick(c, accounts, () => true);
|
||||
expect(c.selected!.itemId, bsEpisode);
|
||||
expect(c.source, MediaKind.jellyfin);
|
||||
final h = Harness(c, accounts, FakeJellyfin());
|
||||
await pumpLibrary(tester, const Size(1600, 1000), reuse: h, online: false);
|
||||
expect(find.byKey(const ValueKey('jf-details')), findsOneWidget);
|
||||
expect(find.text('Black Summoner'), findsWidgets);
|
||||
|
||||
// Change video: the series of the episode playing, its season chosen
|
||||
// and the episode highlighted.
|
||||
final eps = (jsonDecode(jellyfinFixture('episodes')) as Map)['Items'] as List;
|
||||
final ep = JellyfinItem.fromJson((eps.firstWhere((e) => e['SeasonId'] == season2Id) as Map)
|
||||
.cast<String, dynamic>());
|
||||
final h2 = await pumpLibrary(tester, const Size(1600, 1000),
|
||||
start: BrowseStart.seriesOf(fixtureServerId, ep),
|
||||
pick: JellyfinMedia(serverId: fixtureServerId, baseUrl: 'x', itemId: ep.id, title: ep.name));
|
||||
expect(tester.widget<ChoiceChip>(find.byKey(const ValueKey('season-$season2Id'))).selected, isTrue);
|
||||
final tile = tester.widget<Material>(find
|
||||
.ancestor(of: find.byKey(ValueKey('episode-${ep.id}')), matching: find.byType(Material))
|
||||
.first);
|
||||
expect((tile.shape as RoundedRectangleBorder).side.color, isNot(Colors.transparent));
|
||||
expect(find.text('Put it up · S2E1'), findsOneWidget);
|
||||
expect(h2.controller.selected!.itemId, ep.id);
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
|
||||
for (final size in const [Size(2560, 1080), Size(1100, 700), Size(900, 600)]) {
|
||||
testWidgets('no overflow at ${size.width.toInt()}x${size.height.toInt()}, panel open, every source',
|
||||
(tester) async {
|
||||
final h = await pumpLibrary(tester, size);
|
||||
expect(tester.takeException(), isNull);
|
||||
await tester.tap(arifuretaCard());
|
||||
await settle(tester, 10);
|
||||
expect(tester.takeException(), isNull);
|
||||
final panel = find.byKey(const ValueKey('jf-details'));
|
||||
expect(panel, findsOneWidget);
|
||||
// Under 1000 px the panel floats over the library at the right edge.
|
||||
expect(tester.getTopRight(panel).dx, size.width);
|
||||
h.controller.link.text = 'https://cdn.example/some/long/path/Movie.Name.2024.1080p.mkv';
|
||||
for (final s in [MediaKind.link, MediaKind.file, MediaKind.jellyfin]) {
|
||||
h.controller.source = s;
|
||||
await settle(tester, 10);
|
||||
expect(tester.takeException(), isNull, reason: '$s at $size');
|
||||
}
|
||||
h.controller.select(null);
|
||||
await settle(tester, 10);
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user