yorickr/plezy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: trust Plex stream selection for subtitle defaults

Browse Source
This commit is contained in:
edde746
2026-03-06 03:43:10 +01:00
parent 985ba5d2c7
commit f3d24866b7
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/services/track_selection_service.dart
+10 -4
View File
@@ -698,6 +698,7 @@ class TrackSelectionService {
} }
// Priority 2: Check Plex-selected track from media info // Priority 2: Check Plex-selected track from media info
// If a subtitle IS actively selected, the user manually chose it — respect that.
if (plexMediaInfo != null && availableTracks.isNotEmpty) { if (plexMediaInfo != null && availableTracks.isNotEmpty) {
final plexSelectedTrack = plexMediaInfo!.subtitleTracks.where((t) => t.selected).firstOrNull; final plexSelectedTrack = plexMediaInfo!.subtitleTracks.where((t) => t.selected).firstOrNull;
@@ -710,7 +711,7 @@ class TrackSelectionService {
} }
} }
// Priority 3: Try per-media language/subtitle mode preference // Priority 3: Try per-media language/subtitle mode preference (show/season/item-level)
final hasSubtitleMode = metadata.subtitleMode != null && metadata.subtitleMode != -1; final hasSubtitleMode = metadata.subtitleMode != null && metadata.subtitleMode != -1;
if (metadata.subtitleLanguage != null || hasSubtitleMode) { if (metadata.subtitleLanguage != null || hasSubtitleMode) {
if (metadata.subtitleLanguage == 'none' || (metadata.subtitleLanguage?.isEmpty ?? false)) { if (metadata.subtitleLanguage == 'none' || (metadata.subtitleLanguage?.isEmpty ?? false)) {
@@ -751,7 +752,12 @@ class TrackSelectionService {
} }
} }
// Priority 4: Apply user profile preferences // Priority 4: No subtitle selected by server — trust that decision
if (plexMediaInfo != null && plexMediaInfo!.subtitleTracks.isNotEmpty && availableTracks.isNotEmpty) {
return TrackSelectionResult(SubtitleTrack.off, TrackSelectionPriority.plexSelected);
}
// Priority 5: Apply user profile preferences
if (profileSettings != null && availableTracks.isNotEmpty) { if (profileSettings != null && availableTracks.isNotEmpty) {
subtitleToSelect = findSubtitleTrackByProfile( subtitleToSelect = findSubtitleTrackByProfile(
availableTracks, availableTracks,
@@ -763,7 +769,7 @@ class TrackSelectionService {
} }
} }
// Priority 5: Check for default subtitle // Priority 6: Check for default subtitle
if (availableTracks.isNotEmpty) { if (availableTracks.isNotEmpty) {
final defaultTrack = availableTracks.firstWhere((t) => t.isDefault, orElse: () => availableTracks.first); final defaultTrack = availableTracks.firstWhere((t) => t.isDefault, orElse: () => availableTracks.first);
if (defaultTrack.isDefault) { if (defaultTrack.isDefault) {
@@ -771,7 +777,7 @@ class TrackSelectionService {
} }
} }
// Priority 6: Turn off subtitles // Priority 7: Turn off subtitles
return TrackSelectionResult(SubtitleTrack.off, TrackSelectionPriority.off); return TrackSelectionResult(SubtitleTrack.off, TrackSelectionPriority.off);
} }