From 834895486b9c75e7b3a0c171cdf423b62f030c89 Mon Sep 17 00:00:00 2001 From: edde746 <86283021+edde746@users.noreply.github.com> Date: Thu, 30 Jul 2026 14:57:26 +0200 Subject: [PATCH] style: apply dart format to six drifted sources Formatting was clean through 53288116 and then drifted across three commits on 2026-07-30: 1bf7aac7 left one source unformatted, f13f5af6 a second, and daab4f1e four more. CI's Verify formatting job checks the whole tree, so it has had six files to report ever since. No pre-commit hook is installed in this checkout, so the aggregate check never ran locally to catch them. Formatted with the dart_style revision Dart 3.12.0 bundles, which is what the pinned Flutter 3.44.0 CI toolchain runs, rather than with a newer local SDK; the two disagree about some argument-list splits. The current stable formatter accepts this result as well, so both report the tree clean. --- lib/services/playback_subtitle_resolver.dart | 5 +++- .../catalog/plex_catalog_source_test.dart | 6 ++-- test/services/device_performance_test.dart | 12 ++------ .../playback_subtitle_resolver_test.dart | 20 ++++++++++--- test/services/subtitle_preference_test.dart | 13 ++++----- .../track_selection_service_test.dart | 29 +++++++++++++------ 6 files changed, 51 insertions(+), 34 deletions(-) diff --git a/lib/services/playback_subtitle_resolver.dart b/lib/services/playback_subtitle_resolver.dart index 4b519e93..82c5f0fc 100644 --- a/lib/services/playback_subtitle_resolver.dart +++ b/lib/services/playback_subtitle_resolver.dart @@ -93,7 +93,10 @@ class PlaybackSubtitleResolver { required bool preserveSourceIdentity, }) { SubtitlePreference resolveIntent(SubtitleIntentPreference preference) { - final row = findSourceTrackForIntent(preference.intent, mediaInfo?.subtitleTracks ?? const []); + final row = findSourceTrackForIntent( + preference.intent, + mediaInfo?.subtitleTracks ?? const [], + ); if (row != null) { for (final candidate in candidates) { if (candidate.sourceStreamId == row.id) return SubtitlePreference.track(candidate.track); diff --git a/test/services/catalog/plex_catalog_source_test.dart b/test/services/catalog/plex_catalog_source_test.dart index 53833832..c2d4243b 100644 --- a/test/services/catalog/plex_catalog_source_test.dart +++ b/test/services/catalog/plex_catalog_source_test.dart @@ -525,8 +525,10 @@ void main() { // the caller's offset math survives the cap drift. expect( requests.map( - (request) => - (request.url.queryParameters['X-Plex-Container-Start'], request.url.queryParameters['X-Plex-Container-Size']), + (request) => ( + request.url.queryParameters['X-Plex-Container-Start'], + request.url.queryParameters['X-Plex-Container-Size'], + ), ), [('100', '100'), ('100', '25'), ('125', '25'), ('150', '25'), ('175', '25')], ); diff --git a/test/services/device_performance_test.dart b/test/services/device_performance_test.dart index 5dbdf0f0..2b8b68de 100644 --- a/test/services/device_performance_test.dart +++ b/test/services/device_performance_test.dart @@ -74,21 +74,13 @@ void main() { }); test('mid-RAM hardware holds a 4K budget at 1.5x', () { - DevicePerformance.debugReset( - autoReduced: false, - override: VisualEffectsSetting.auto, - totalMemBytes: 2400 << 20, - ); + DevicePerformance.debugReset(autoReduced: false, override: VisualEffectsSetting.auto, totalMemBytes: 2400 << 20); detectAt(2160); expect(DevicePerformance.displayBudgetFactor(), 1.5); }); test('high-RAM hardware keeps the full 4K budget', () { - DevicePerformance.debugReset( - autoReduced: false, - override: VisualEffectsSetting.auto, - totalMemBytes: 2870 << 20, - ); + DevicePerformance.debugReset(autoReduced: false, override: VisualEffectsSetting.auto, totalMemBytes: 2870 << 20); detectAt(2160); expect(DevicePerformance.displayBudgetFactor(), 2.0); }); diff --git a/test/services/playback_subtitle_resolver_test.dart b/test/services/playback_subtitle_resolver_test.dart index 92f41d21..450f2c38 100644 --- a/test/services/playback_subtitle_resolver_test.dart +++ b/test/services/playback_subtitle_resolver_test.dart @@ -417,7 +417,10 @@ void main() { _sourceSubtitle(7, language: 'fra', usesExternalDelivery: true), _sourceSubtitle(8, language: 'fra', title: 'FR Forced', usesExternalDelivery: true), ]), - sidecars: [_sidecar(7, language: 'fra'), _sidecar(8, language: 'fra')], + sidecars: [ + _sidecar(7, language: 'fra'), + _sidecar(8, language: 'fra'), + ], preferredSubtitleTrack: forcedIntent, ); @@ -432,7 +435,10 @@ void main() { _sourceSubtitle(7, language: 'fra', usesExternalDelivery: true), _sourceSubtitle(8, language: 'fra', forced: true, usesExternalDelivery: true), ]), - sidecars: [_sidecar(7, language: 'fra'), _sidecar(8, language: 'fra')], + sidecars: [ + _sidecar(7, language: 'fra'), + _sidecar(8, language: 'fra'), + ], preferredSubtitleTrack: forcedIntent, ); @@ -446,7 +452,10 @@ void main() { _sourceSubtitle(7, language: 'fra', selected: true, usesExternalDelivery: true), _sourceSubtitle(9, language: 'eng', usesExternalDelivery: true), ]), - sidecars: [_sidecar(7, language: 'fra'), _sidecar(9)], + sidecars: [ + _sidecar(7, language: 'fra'), + _sidecar(9), + ], preferredSubtitleTrack: forcedIntent, ); @@ -471,7 +480,10 @@ void main() { _sourceSubtitle(8, language: 'fra', title: 'FR Forced', usesExternalDelivery: true), _sourceSubtitle(9, language: 'eng', selected: true, usesExternalDelivery: true), ]), - sidecars: [_sidecar(8, language: 'fra'), _sidecar(9)], + sidecars: [ + _sidecar(8, language: 'fra'), + _sidecar(9), + ], preferredSubtitleTrack: const SubtitlePreference.intent( SubtitleIntent(language: 'fra', forced: false, title: 'French', codec: 'srt', isExternal: true), ), diff --git a/test/services/subtitle_preference_test.dart b/test/services/subtitle_preference_test.dart index 236c8406..674fbd82 100644 --- a/test/services/subtitle_preference_test.dart +++ b/test/services/subtitle_preference_test.dart @@ -20,9 +20,7 @@ void main() { }); test('captures effective forced-ness from the flag', () { - final intent = SubtitleIntent.fromTrack( - const SubtitleTrack(id: '4', language: 'fre', isForced: true), - ); + final intent = SubtitleIntent.fromTrack(const SubtitleTrack(id: '4', language: 'fre', isForced: true)); expect(intent!.forced, isTrue); }); @@ -54,7 +52,9 @@ void main() { test('track references become intents with effective forced-ness', () { final demoted = SubtitlePreference.demoteToIntent( - const SubtitlePreference.track(SubtitleTrack(id: 'source:8', title: 'FR Forced', language: 'fre', codec: 'ass')), + const SubtitlePreference.track( + SubtitleTrack(id: 'source:8', title: 'FR Forced', language: 'fre', codec: 'ass'), + ), ); expect( demoted, @@ -75,10 +75,7 @@ void main() { }); test('metadata-less track references demote to null', () { - expect( - SubtitlePreference.demoteToIntent(const SubtitlePreference.track(SubtitleTrack(id: '2'))), - isNull, - ); + expect(SubtitlePreference.demoteToIntent(const SubtitlePreference.track(SubtitleTrack(id: '2'))), isNull); }); }); } diff --git a/test/services/track_selection_service_test.dart b/test/services/track_selection_service_test.dart index a8975b41..1d8e29d2 100644 --- a/test/services/track_selection_service_test.dart +++ b/test/services/track_selection_service_test.dart @@ -539,9 +539,11 @@ void main() { final plexTracks = [_plexSub(50, codec: 'ass', selected: true), _plexSub(51, codec: 'ass')]; final nativeTracks = [_sub('native-first', codec: 'ass'), _sub('native-default', codec: 'ass', isDefault: true)]; - final result = _svc( - info: _info(subs: plexTracks), - ).selectSubtitleTrack(nativeTracks, const SubtitlePreference.track(SubtitleTrack(id: 'source:50', codec: 'ass')), null)!; + final result = _svc(info: _info(subs: plexTracks)).selectSubtitleTrack( + nativeTracks, + const SubtitlePreference.track(SubtitleTrack(id: 'source:50', codec: 'ass')), + null, + )!; expect(result.priority, TrackSelectionPriority.defaultTrack); expect(result.track.id, 'native-default'); @@ -766,10 +768,15 @@ void main() { test('an unmatched source preference stops waiting once the catalog is complete', () { // Both source rows are present natively, so nothing more can arrive: // the unresolvable preference must fall through, not defer forever. - final result = _svc( - metadata: _meta(backend: MediaBackend.jellyfin), - info: directPlayInfo(), - ).selectSubtitleTrack(nativeTracks, SubtitlePreference.track(_sub('source:9', lang: 'kor', codec: 'srt')), null); + final result = + _svc( + metadata: _meta(backend: MediaBackend.jellyfin), + info: directPlayInfo(), + ).selectSubtitleTrack( + nativeTracks, + SubtitlePreference.track(_sub('source:9', lang: 'kor', codec: 'srt')), + null, + ); expect(result, isNotNull); expect(result!.track.id, '1'); @@ -1176,7 +1183,9 @@ void main() { test('a declined forced intent falls to the server-selected full track', () { final tracks = [_sub('1', lang: 'fre', codec: 'ass')]; - final info = _info(subs: [_plexSub(10, languageCode: 'fre', codec: 'ass', selected: true)]); + final info = _info( + subs: [_plexSub(10, languageCode: 'fre', codec: 'ass', selected: true)], + ); final result = _svc(info: info).selectSubtitleTrack(tracks, forcedIntent, null)!; expect(result.priority, TrackSelectionPriority.serverSelected); expect(result.track.id, '1'); @@ -1186,7 +1195,9 @@ void main() { // #1717 headline: the next episode has no forced track and no selected // stream — the server's own decision (off) wins over the full track. final tracks = [_sub('1', lang: 'fre', codec: 'ass')]; - final info = _info(subs: [_plexSub(10, languageCode: 'fre', codec: 'ass')]); + final info = _info( + subs: [_plexSub(10, languageCode: 'fre', codec: 'ass')], + ); final result = _svc(info: info).selectSubtitleTrack(tracks, forcedIntent, null)!; expect(result.priority, TrackSelectionPriority.serverSelected); expect(result.track.id, 'no');