fix(settings): list external players only when they are installed
Detection now runs off the UI isolate and covers every platform where the answer can be trusted. Availability was a plain platform check, so Linux always listed VLC, mpv and Celluloid, macOS always listed VLC and IINA, and Windows always listed VLC and PotPlayer whether or not any of them existed. Each player now has a detector that asks exactly the question its launcher asks: `sh -c 'command -v'` for PATH launches so the kernel performs the executable check, NSWorkspace/Launch Services for `open -a`, `where.exe` plus the concrete install paths for Windows VLC, and the registered URL handler for PotPlayer and the iOS players. Detection is asynchronous and memoised behind KnownPlayers.probe rather than a Process.runSync in a static initialiser, which forked three shells on the UI isolate during ExternalPlayerScreen.build. It is prewarmed from startup, fails open when a probe throws, and keeps the selected player listed when a detector misses it so a false negative cannot leave the list with nothing selected. iOS and tvOS gained LSApplicationQueriesSchemes entries for vlc and infuse. Without them canOpenURL returns false for both schemes, so _launchUrlScheme was already refusing to hand off to either player. Android keeps the platform check: package visibility needs native declarations, and a wrong answer there hides a working player.
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:plezy/focus/focusable_button.dart';
|
||||
@@ -16,12 +18,15 @@ void main() {
|
||||
setUp(() async {
|
||||
resetSharedPreferencesForTest();
|
||||
SettingsService.resetForTesting();
|
||||
KnownPlayers.resetForTesting();
|
||||
KnownPlayers.probe = const _AllPlayersInstalled();
|
||||
settings = await SettingsService.getInstance();
|
||||
LocaleSettings.setLocaleSync(AppLocale.en);
|
||||
});
|
||||
|
||||
tearDown(() {
|
||||
SettingsService.resetForTesting();
|
||||
KnownPlayers.resetForTesting();
|
||||
});
|
||||
|
||||
testWidgets('only custom players expose a focusable delete action', (tester) async {
|
||||
@@ -43,7 +48,7 @@ void main() {
|
||||
await tester.pumpWidget(MaterialApp(theme: monoTheme(dark: true), home: const ExternalPlayerScreen()));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
for (final player in KnownPlayers.getForCurrentPlatform()) {
|
||||
for (final player in await KnownPlayers.getForCurrentPlatform()) {
|
||||
final title = player.id == KnownPlayers.systemDefault.id ? 'System Default' : player.name;
|
||||
final row = find.widgetWithText(FocusableListTile, title);
|
||||
expect(row, findsOneWidget);
|
||||
@@ -66,4 +71,63 @@ void main() {
|
||||
expect(settings.read(SettingsService.selectedExternalPlayer), KnownPlayers.systemDefault);
|
||||
expect(find.text(customPlayer.name), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('a selected known player stays listed when detection misses it', (tester) async {
|
||||
tester.view.devicePixelRatio = 1;
|
||||
tester.view.physicalSize = const Size(1000, 1400);
|
||||
addTearDown(tester.view.resetDevicePixelRatio);
|
||||
addTearDown(tester.view.resetPhysicalSize);
|
||||
|
||||
// VLC is supported on every platform Plezy ships, so with detection
|
||||
// reporting nothing installed it is always one of the filtered-out ids.
|
||||
KnownPlayers.resetForTesting();
|
||||
KnownPlayers.probe = const _NoPlayersInstalled();
|
||||
final selected = KnownPlayers.findById('vlc')!;
|
||||
expect(selected.isAvailable, isTrue);
|
||||
expect((await KnownPlayers.getForCurrentPlatform()).map((p) => p.id), isNot(contains('vlc')));
|
||||
|
||||
await settings.write(SettingsService.useExternalPlayer, true);
|
||||
await settings.write(SettingsService.selectedExternalPlayer, selected);
|
||||
|
||||
await tester.pumpWidget(MaterialApp(theme: monoTheme(dark: true), home: const ExternalPlayerScreen()));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.widgetWithText(FocusableListTile, selected.name), findsOneWidget);
|
||||
expect(find.widgetWithText(FocusableListTile, 'System Default'), findsOneWidget);
|
||||
});
|
||||
}
|
||||
|
||||
/// Reports every player as installed so the screen renders the full platform
|
||||
/// list regardless of what the host running the suite happens to have.
|
||||
class _AllPlayersInstalled extends PlayerInstallProbe {
|
||||
const _AllPlayersInstalled();
|
||||
|
||||
@override
|
||||
Future<ProcessResult> run(String executable, List<String> arguments) async => ProcessResult(0, 0, '', '');
|
||||
|
||||
@override
|
||||
Future<bool> applicationInstalled(String bundleId) async => true;
|
||||
|
||||
@override
|
||||
Future<bool> fileExists(String path) async => true;
|
||||
|
||||
@override
|
||||
Future<bool> schemeHasHandler(String scheme) async => true;
|
||||
}
|
||||
|
||||
/// Reports nothing as installed, so only players without a detector survive.
|
||||
class _NoPlayersInstalled extends PlayerInstallProbe {
|
||||
const _NoPlayersInstalled();
|
||||
|
||||
@override
|
||||
Future<ProcessResult> run(String executable, List<String> arguments) async => ProcessResult(0, 1, '', '');
|
||||
|
||||
@override
|
||||
Future<bool> applicationInstalled(String bundleId) async => false;
|
||||
|
||||
@override
|
||||
Future<bool> fileExists(String path) async => false;
|
||||
|
||||
@override
|
||||
Future<bool> schemeHasHandler(String scheme) async => false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user