From c87a9060f92e9c6edf9cea528370cdc9366594b5 Mon Sep 17 00:00:00 2001 From: edde746 <86283021+edde746@users.noreply.github.com> Date: Sun, 5 Jul 2026 14:23:19 +0200 Subject: [PATCH] chore: tidy formatting and local ignores --- .gitignore | 3 +- .../plezy/exoplayer/ResumeStallPolicy.kt | 2 +- .../plezy/exoplayer/ResumeStallPolicyTest.kt | 54 ++++++++++++------- lib/utils/media_image_helper.dart | 6 +-- lib/widgets/overlay_sheet.dart | 3 +- 5 files changed, 41 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 8fc4708e..64274250 100644 --- a/.gitignore +++ b/.gitignore @@ -70,4 +70,5 @@ duplication-report/ **/fastlane/report.xml maestro/**/*.png -server/deploy.sh \ No newline at end of file +server/deploy.sh +server/Caddyfile diff --git a/android/app/src/main/kotlin/com/edde746/plezy/exoplayer/ResumeStallPolicy.kt b/android/app/src/main/kotlin/com/edde746/plezy/exoplayer/ResumeStallPolicy.kt index 6b29006c..81ced6a2 100644 --- a/android/app/src/main/kotlin/com/edde746/plezy/exoplayer/ResumeStallPolicy.kt +++ b/android/app/src/main/kotlin/com/edde746/plezy/exoplayer/ResumeStallPolicy.kt @@ -47,7 +47,7 @@ internal object ResumeStallPolicy { baselinePositionMs: Long, currentPositionMs: Long, durationMs: Long, - windowMs: Long, + windowMs: Long ): Verdict = when { // Any counter movement counts as healthy, including a renderer re-enable // resetting DecoderCounters below the baseline. diff --git a/android/app/src/test/kotlin/com/edde746/plezy/exoplayer/ResumeStallPolicyTest.kt b/android/app/src/test/kotlin/com/edde746/plezy/exoplayer/ResumeStallPolicyTest.kt index 5f5393aa..fddb4f8b 100644 --- a/android/app/src/test/kotlin/com/edde746/plezy/exoplayer/ResumeStallPolicyTest.kt +++ b/android/app/src/test/kotlin/com/edde746/plezy/exoplayer/ResumeStallPolicyTest.kt @@ -46,9 +46,12 @@ class ResumeStallPolicyTest { assertEquals( Verdict.HEALTHY, ResumeStallPolicy.evaluate( - baselineFrames = 100, currentFrames = 124, - baselinePositionMs = 60_000, currentPositionMs = 61_000, - durationMs = 3_600_000, windowMs = 1000 + baselineFrames = 100, + currentFrames = 124, + baselinePositionMs = 60_000, + currentPositionMs = 61_000, + durationMs = 3_600_000, + windowMs = 1000 ) ) } @@ -59,9 +62,12 @@ class ResumeStallPolicyTest { assertEquals( Verdict.HEALTHY, ResumeStallPolicy.evaluate( - baselineFrames = 100, currentFrames = 3, - baselinePositionMs = 60_000, currentPositionMs = 61_000, - durationMs = 3_600_000, windowMs = 1000 + baselineFrames = 100, + currentFrames = 3, + baselinePositionMs = 60_000, + currentPositionMs = 61_000, + durationMs = 3_600_000, + windowMs = 1000 ) ) } @@ -73,9 +79,12 @@ class ResumeStallPolicyTest { assertEquals( Verdict.RECHECK, ResumeStallPolicy.evaluate( - baselineFrames = 100, currentFrames = 100, - baselinePositionMs = 60_000, currentPositionMs = 60_200, - durationMs = 3_600_000, windowMs = 1000 + baselineFrames = 100, + currentFrames = 100, + baselinePositionMs = 60_000, + currentPositionMs = 60_200, + durationMs = 3_600_000, + windowMs = 1000 ) ) } @@ -86,9 +95,12 @@ class ResumeStallPolicyTest { assertEquals( Verdict.SKIP_NEAR_EOF, ResumeStallPolicy.evaluate( - baselineFrames = 100, currentFrames = 100, - baselinePositionMs = 3_598_000, currentPositionMs = 3_599_000, - durationMs = 3_600_000, windowMs = 1000 + baselineFrames = 100, + currentFrames = 100, + baselinePositionMs = 3_598_000, + currentPositionMs = 3_599_000, + durationMs = 3_600_000, + windowMs = 1000 ) ) } @@ -98,9 +110,12 @@ class ResumeStallPolicyTest { assertEquals( Verdict.STALLED, ResumeStallPolicy.evaluate( - baselineFrames = 100, currentFrames = 100, - baselinePositionMs = 60_000, currentPositionMs = 61_000, - durationMs = 3_600_000, windowMs = 1000 + baselineFrames = 100, + currentFrames = 100, + baselinePositionMs = 60_000, + currentPositionMs = 61_000, + durationMs = 3_600_000, + windowMs = 1000 ) ) } @@ -111,9 +126,12 @@ class ResumeStallPolicyTest { assertEquals( Verdict.STALLED, ResumeStallPolicy.evaluate( - baselineFrames = 100, currentFrames = 100, - baselinePositionMs = 60_000, currentPositionMs = 61_000, - durationMs = C.TIME_UNSET, windowMs = 1000 + baselineFrames = 100, + currentFrames = 100, + baselinePositionMs = 60_000, + currentPositionMs = 61_000, + durationMs = C.TIME_UNSET, + windowMs = 1000 ) ) } diff --git a/lib/utils/media_image_helper.dart b/lib/utils/media_image_helper.dart index 82dbefc7..bc94aef3 100644 --- a/lib/utils/media_image_helper.dart +++ b/lib/utils/media_image_helper.dart @@ -249,11 +249,7 @@ class MediaImageHelper { /// bound is harmless — but an oversized original (failed server transcode, /// local artwork file, ultra-wide banner) can no longer decode past the /// display budget the way a single-axis bound allows. - static ImageProvider boundedDecode( - ImageProvider provider, { - required int memWidth, - required int memHeight, - }) { + static ImageProvider boundedDecode(ImageProvider provider, {required int memWidth, required int memHeight}) { final width = memWidth > 0 ? memWidth : null; final height = memHeight > 0 ? memHeight : null; if (width == null && height == null) return provider; diff --git a/lib/widgets/overlay_sheet.dart b/lib/widgets/overlay_sheet.dart index 8dbefbba..d8e7380b 100644 --- a/lib/widgets/overlay_sheet.dart +++ b/lib/widgets/overlay_sheet.dart @@ -563,8 +563,7 @@ class _OverlaySheetHostState extends State with SingleTickerPr final showHandle = _showDragHandle && !isTV && !isTop; final effectiveConstraints = - _constraints ?? - BoxConstraints(maxWidth: isDesktop ? 700 : double.infinity, maxHeight: size.height * 0.75); + _constraints ?? BoxConstraints(maxWidth: isDesktop ? 700 : double.infinity, maxHeight: size.height * 0.75); // Slide direction depends on alignment: bottom sheets slide up, top sheets slide down. // Use a pixel transform instead of FractionalTranslation so mouse-tracker