A Portuguese user reported "Skip Intro" rendering in English on Android TV.
The locale files were not the problem - all 22 were structurally complete.
skip_marker_button.dart simply never imported strings.g.dart and assigned
'Skip Intro' / 'Skip Credits' / 'Next Episode' as plain literals. An audit of
lib/ found ~120 more sites in the same state, in four shapes that need
different fixes:
A literal in a file that never imported the i18n layer is the easy one -
skip_marker_button, performance_stats, track_label_builder and codec_utils all
render text with no `t` in the file at all. TrackLabelBuilder._compose now takes
a fallbackLabel builder instead of an English fallbackPrefix, so the caller
supplies t.audioTracks.track / t.videoControls.subtitleTrack and every unnamed
audio and subtitle row in the track menus is localized.
English reaching the user through an exception message is the widest one, and
it needs care: MediaServerException.message feeds both toString() - logs and
Sentry grouping - and verbatim UI display. Localizing it in place would make
bug-report logs follow the user's locale and split one Sentry issue into 22.
The MediaServer and Seerr families instead gain a nullable `display` alongside
the English `message`, and the six screens that print these errors read
`display ?? message`. PlaybackException keeps the opposite rule, because it
already carries a PlaybackFailureReason for logic and classifyPlaybackFailure
already builds it from t.messages: its stragglers are localized at the throw
site. That also removes the literal "Exception: " prefix Live TV users saw on
a tune failure, since PlaybackException.toString() returns the bare message.
Localized parts hand-concatenated with bare English are the shape no search for
Text('...') can find: '${t.common.pause} auto-scroll' on the home carousel,
'${day} at ${time}' on the Live TV schedule row, and an actor-screen count that
hand-rolled its plural as `n == 1 ? 'title' : 'titles'` - wrong for ru and pl
regardless of translation, now a real Slang plural.
Finally a literal assigned to provider state that a widget renders later:
DownloadProgress.errorMessage, and the four background_downloader notification
bodies, which sit inside a plugin config call where no widget-shaped search
reaches them.
Two things surfaced while converting. track_chapter_controls compared a track
label against 'Audio Track N' to swap in a localized version; once the builder
localized its own fallback that branch became unreachable, so it and the
orphaned _joinTrackLabel are gone. And discovery_view's PeerError fallback arm
looks like a leak but is not - its producers already localize, and a test says
so - so it stays as it is.
All 21 non-base locales are translated, including the 21 keys left empty by
earlier commits that were falling back to English. No locale has an empty value.
scripts/check_hardcoded_strings.py guards the three shapes a structural check
can see, and runs in ci_checks.sh after translation hygiene. Its first draft
passed its own tests while missing this very bug, because 'Skip Intro' is bound
to a local rather than handed to Text(); the name-bound rule that closes that
gap is restricted to phrase-shaped literals, or it cannot tell copy from the
identifiers this codebase binds constantly ('cast_row', 'auto', 'liveTv'). It
cannot see English inside a throw or assigned to a provider field - neither is
distinguishable from a log message without dataflow analysis - and the docstring
says so. label: and actionLabel: are deliberately unscanned: here they name a
diagnostic operation, and a check that is chronically red is a check that gets
switched off.
One commit rather than one per area: the keys, the 22 locale files and the
generated output are a single unit, and any partial split fails the repo's own
unused-key scan on the way through.
close #1856
121 lines
4.7 KiB
Dart
121 lines
4.7 KiB
Dart
import 'dart:async';
|
|
import 'dart:io';
|
|
|
|
import 'package:http/http.dart';
|
|
|
|
/// Sealed base for backend-agnostic media-server exceptions. Both Plex and
|
|
/// Jellyfin auth/HTTP layers throw subtypes from this hierarchy so consumers
|
|
/// can catch with one filter and match exhaustively when they care which
|
|
/// failure mode it is.
|
|
///
|
|
/// [message] is English for stable logs and Sentry grouping. [display] is the
|
|
/// localized user-facing text when this failure is rendered in the UI.
|
|
sealed class MediaServerException implements Exception {
|
|
final String message;
|
|
final String? display;
|
|
const MediaServerException(this.message, {this.display});
|
|
|
|
@override
|
|
String toString() => '$runtimeType: $message';
|
|
}
|
|
|
|
/// The supplied base URL is unreachable, returns the wrong shape, or doesn't
|
|
/// look like the expected backend at all. Surfaces in onboarding probes
|
|
/// (Jellyfin `/System/Info/Public`, Plex resource discovery).
|
|
class MediaServerUrlException extends MediaServerException {
|
|
const MediaServerUrlException(super.message, {super.display});
|
|
}
|
|
|
|
/// Authentication failed — bad password, expired token, disabled user,
|
|
/// rate-limit. [statusCode] is the HTTP status when the failure was a 4xx
|
|
/// response; null for transport-layer auth signals (e.g. token rejected
|
|
/// during refresh).
|
|
class MediaServerAuthException extends MediaServerException {
|
|
final int? statusCode;
|
|
const MediaServerAuthException(super.message, {this.statusCode, super.display});
|
|
}
|
|
|
|
/// Auth polling reached a terminal server-side expiry/rejection state before
|
|
/// the user completed the external sign-in flow.
|
|
class MediaServerPinExpiredException extends MediaServerAuthException {
|
|
const MediaServerPinExpiredException({String? display}) : super('PIN expired before sign-in', display: display);
|
|
}
|
|
|
|
/// HTTP transport / non-2xx errors. Carries the status code (when known),
|
|
/// the parsed response body, and the originating URI so callers can log
|
|
/// useful diagnostics. Both Plex and Jellyfin route their HTTP failures
|
|
/// through this type — it's the canonical backend-agnostic transport
|
|
/// exception.
|
|
enum MediaServerHttpErrorType { connectionTimeout, receiveTimeout, connectionError, cancelled, unknown }
|
|
|
|
class MediaServerHttpException extends MediaServerException {
|
|
final MediaServerHttpErrorType type;
|
|
final int? statusCode;
|
|
final dynamic responseData;
|
|
final Uri? requestUri;
|
|
|
|
MediaServerHttpException({
|
|
required this.type,
|
|
String? message,
|
|
String? display,
|
|
this.statusCode,
|
|
this.responseData,
|
|
this.requestUri,
|
|
}) : super(message ?? '', display: display);
|
|
|
|
/// Map a caught exception to a [MediaServerHttpException].
|
|
factory MediaServerHttpException.from(Object error, {Uri? uri}) {
|
|
return switch (error) {
|
|
MediaServerHttpException() => error,
|
|
RequestAbortedException(:final message, uri: final errorUri) => MediaServerHttpException(
|
|
type: MediaServerHttpErrorType.cancelled,
|
|
message: message,
|
|
requestUri: errorUri ?? uri,
|
|
),
|
|
TimeoutException(:final message) => MediaServerHttpException(
|
|
type: MediaServerHttpErrorType.connectionTimeout,
|
|
message: message,
|
|
requestUri: uri,
|
|
),
|
|
SocketException(:final message) => MediaServerHttpException(
|
|
type: MediaServerHttpErrorType.connectionError,
|
|
message: message,
|
|
requestUri: uri,
|
|
),
|
|
HttpException(:final message) => MediaServerHttpException(
|
|
type: MediaServerHttpErrorType.connectionError,
|
|
message: message,
|
|
requestUri: uri,
|
|
),
|
|
ClientException(:final message, uri: final errorUri) => MediaServerHttpException(
|
|
type: MediaServerHttpErrorType.connectionError,
|
|
message: message,
|
|
requestUri: errorUri ?? uri,
|
|
),
|
|
_ => MediaServerHttpException(type: MediaServerHttpErrorType.unknown, message: error.toString(), requestUri: uri),
|
|
};
|
|
}
|
|
|
|
/// Whether the error looks transient (network/timeout) and worth retrying.
|
|
bool get isTransient =>
|
|
type == MediaServerHttpErrorType.connectionTimeout ||
|
|
type == MediaServerHttpErrorType.connectionError ||
|
|
type == MediaServerHttpErrorType.receiveTimeout;
|
|
|
|
/// Whether the request was aborted client-side (client teardown or an
|
|
/// explicit abort), as opposed to failing against the server. A cancelled
|
|
/// fetch says nothing about the server's actual content — callers must not
|
|
/// treat it as an empty result.
|
|
bool get isCancellation => type == MediaServerHttpErrorType.cancelled;
|
|
|
|
@override
|
|
String toString() {
|
|
final parts = <String>[type.name];
|
|
if (statusCode != null) parts.add('HTTP $statusCode');
|
|
if (message.isNotEmpty) parts.add(message);
|
|
final uri = requestUri;
|
|
if (uri != null) parts.add('${uri.host}${uri.path}');
|
|
return 'MediaServerHttpException(${parts.join(': ')})';
|
|
}
|
|
}
|