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
103 lines
3.7 KiB
Dart
103 lines
3.7 KiB
Dart
import '../../database/app_database.dart';
|
|
import '../../i18n/strings.g.dart';
|
|
import '../../media/media_item.dart';
|
|
import '../../media/media_server_client.dart';
|
|
import '../../media/media_source_info.dart';
|
|
import '../../models/transcode_quality_preset.dart';
|
|
import '../../utils/session_identifier.dart';
|
|
import '../multi_server_manager.dart';
|
|
import '../playback_initialization_service.dart';
|
|
import '../playback_source_resolver.dart';
|
|
import '../settings_service.dart';
|
|
|
|
/// Everything the music engine needs to open and report one track.
|
|
class MusicSource {
|
|
/// Playable stream URL (or `file://` path for downloaded tracks).
|
|
final String url;
|
|
|
|
/// HTTP headers to open [url] with (Plex identity headers; null for
|
|
/// local files and backends that self-authenticate via the query string).
|
|
final Map<String, String>? headers;
|
|
|
|
/// Server playback session id to echo in progress reports.
|
|
final String? playSessionId;
|
|
|
|
/// `DirectPlay` / `Transcode` for progress reports.
|
|
final String? playMethod;
|
|
|
|
/// True when [url] points at a downloaded/local copy.
|
|
final bool isOffline;
|
|
|
|
final MediaSourceInfo? mediaInfo;
|
|
|
|
/// Client that should receive progress reports for this track (null when
|
|
/// its server is unreachable — offline reports queue locally instead).
|
|
final MediaServerClient? reportingClient;
|
|
|
|
const MusicSource({
|
|
required this.url,
|
|
this.headers,
|
|
this.playSessionId,
|
|
this.playMethod,
|
|
this.isOffline = false,
|
|
this.mediaInfo,
|
|
this.reportingClient,
|
|
});
|
|
}
|
|
|
|
/// Seam between the music engine and playback initialization, so tests can
|
|
/// inject synthetic sources without any network or database.
|
|
abstract class MusicSourceResolver {
|
|
Future<MusicSource> resolve(MediaItem track);
|
|
}
|
|
|
|
/// Production resolver: delegates to the shared [PlaybackSourceResolver] /
|
|
/// [PlaybackInitializationService] pipeline, which routes
|
|
/// [MediaKind.track] items down the per-backend audio path (music transcode
|
|
/// preset) and substitutes downloaded copies before touching the network.
|
|
class ServerMusicSourceResolver implements MusicSourceResolver {
|
|
final MultiServerManager serverManager;
|
|
final AppDatabase database;
|
|
|
|
ServerMusicSourceResolver({required this.serverManager, required this.database});
|
|
|
|
@override
|
|
Future<MusicSource> resolve(MediaItem track) async {
|
|
final settings = await SettingsService.getInstance();
|
|
final context = await PlaybackSourceResolver(serverManager: serverManager, database: database).resolve(
|
|
PlaybackInitializationOptions(
|
|
metadata: track,
|
|
selectedMediaIndex: 0,
|
|
// Video-shaped preset is ignored for tracks; `original` also keeps the
|
|
// resolver's downloaded-copy preference on.
|
|
qualityPreset: TranscodeQualityPreset.original,
|
|
audioQualityPreset: settings.read(SettingsService.musicQualityPreset),
|
|
// Plex music transcode requires both session ids; fresh per track so
|
|
// concurrent gapless arming never reuses a live transcode session.
|
|
sessionIdentifier: generateSessionIdentifier(),
|
|
transcodeSessionId: generateSessionIdentifier(),
|
|
),
|
|
offlineLibraryMode: false,
|
|
);
|
|
|
|
final result = context.result;
|
|
final url = result.videoUrl;
|
|
if (url == null) {
|
|
throw PlaybackException(
|
|
t.music.noAudioUrl(track: track.title ?? track.id),
|
|
reason: PlaybackFailureReason.noPlayableSource,
|
|
);
|
|
}
|
|
|
|
return MusicSource(
|
|
url: url,
|
|
headers: context.streamHeaders,
|
|
playSessionId: result.playSessionId,
|
|
playMethod: result.playMethod ?? (result.isTranscoding ? 'Transcode' : 'DirectPlay'),
|
|
isOffline: result.isOffline,
|
|
mediaInfo: result.mediaInfo,
|
|
reportingClient: context.reportingClient,
|
|
);
|
|
}
|
|
}
|