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

fix: ordinal tiebreaker for identical track matching

Browse Source
This commit is contained in:
edde746
2026-04-03 00:46:01 +02:00
parent 8a66cf6d92
commit ef96ccb623
2 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/services/track_manager.dart
+2 -2
View File
@@ -274,7 +274,7 @@ class TrackManager {
if (streamID != null) {
appLogger.d('Matched audio by lang/title: streamID $streamID');
} else {
final matchedPlex = findPlexTrackForMpvAudio(track, info.audioTracks);
final matchedPlex = findPlexTrackForMpvAudio(track, info.audioTracks, allMpvTracks: player.state.tracks.audio);
streamID = matchedPlex?.id;
if (streamID != null) {
appLogger.d('Matched audio by properties: streamID $streamID');
@@ -315,7 +315,7 @@ class TrackManager {
if (streamID != null) {
appLogger.d('Matched subtitle by lang/title: streamID $streamID');
} else {
final matchedPlex = findPlexTrackForMpvSubtitle(track, info.subtitleTracks);
final matchedPlex = findPlexTrackForMpvSubtitle(track, info.subtitleTracks, allMpvTracks: player.state.tracks.subtitle);
streamID = matchedPlex?.id;
if (streamID != null) {
appLogger.d('Matched subtitle by properties: streamID $streamID');
lib/services/track_selection_service.dart
+49 -6
View File
@@ -16,7 +16,7 @@ import '../utils/language_codes.dart';
// differently.
/// Find the MPV subtitle track that matches a Plex subtitle track
SubtitleTrack? findMpvTrackForPlexSubtitle(PlexSubtitleTrack plexTrack, List<SubtitleTrack> mpvTracks) {
SubtitleTrack? findMpvTrackForPlexSubtitle(PlexSubtitleTrack plexTrack, List<SubtitleTrack> mpvTracks, {List<PlexSubtitleTrack>? allPlexTracks}) {
if (mpvTracks.isEmpty) return null;
// For external subtitles, match by URI containing the Plex key
@@ -35,6 +35,10 @@ SubtitleTrack? findMpvTrackForPlexSubtitle(PlexSubtitleTrack plexTrack, List<Sub
SubtitleTrack? bestMatch;
int bestScore = 0;
// Ordinal tiebreaker: precompute position of plexTrack among internal tracks
final internalMpvTracks = allPlexTracks != null ? mpvTracks.where((t) => !t.isExternal).toList() : null;
final plexOrdinal = allPlexTracks != null ? allPlexTracks.where((t) => !t.isExternal).toList().indexOf(plexTrack) : -1;
for (final mpvTrack in mpvTracks) {
// Skip external tracks when matching internal Plex tracks
if (!plexTrack.isExternal && mpvTrack.isExternal) continue;
@@ -64,6 +68,15 @@ SubtitleTrack? findMpvTrackForPlexSubtitle(PlexSubtitleTrack plexTrack, List<Sub
score += 2;
}
// Ordinal position tiebreaker (+1): when all properties match identically,
// prefer the track at the same position in both lists.
if (internalMpvTracks != null && plexOrdinal >= 0) {
final mpvOrdinal = internalMpvTracks.indexOf(mpvTrack);
if (mpvOrdinal >= 0 && plexOrdinal == mpvOrdinal) {
score += 1;
}
}
if (score > bestScore) {
bestScore = score;
bestMatch = mpvTrack;
@@ -75,7 +88,7 @@ SubtitleTrack? findMpvTrackForPlexSubtitle(PlexSubtitleTrack plexTrack, List<Sub
}
/// Find the Plex subtitle track that matches an MPV subtitle track
PlexSubtitleTrack? findPlexTrackForMpvSubtitle(SubtitleTrack mpvTrack, List<PlexSubtitleTrack> plexTracks) {
PlexSubtitleTrack? findPlexTrackForMpvSubtitle(SubtitleTrack mpvTrack, List<PlexSubtitleTrack> plexTracks, {List<SubtitleTrack>? allMpvTracks}) {
if (plexTracks.isEmpty) return null;
// For external subtitles, match by URI containing the Plex key
@@ -93,6 +106,10 @@ PlexSubtitleTrack? findPlexTrackForMpvSubtitle(SubtitleTrack mpvTrack, List<Plex
PlexSubtitleTrack? bestMatch;
int bestScore = 0;
// Ordinal tiebreaker: precompute position of mpvTrack among internal tracks
final internalPlexTracks = allMpvTracks != null ? plexTracks.where((t) => !t.isExternal).toList() : null;
final mpvOrdinal = allMpvTracks != null ? allMpvTracks.where((t) => !t.isExternal).toList().indexOf(mpvTrack) : -1;
for (final plexTrack in plexTracks) {
// Skip external Plex tracks when matching internal MPV tracks
if (!mpvTrack.isExternal && plexTrack.isExternal) continue;
@@ -122,6 +139,14 @@ PlexSubtitleTrack? findPlexTrackForMpvSubtitle(SubtitleTrack mpvTrack, List<Plex
score += 2;
}
// Ordinal position tiebreaker (+1)
if (internalPlexTracks != null && mpvOrdinal >= 0) {
final plexOrdinal = internalPlexTracks.indexOf(plexTrack);
if (plexOrdinal >= 0 && mpvOrdinal == plexOrdinal) {
score += 1;
}
}
if (score > bestScore) {
bestScore = score;
bestMatch = plexTrack;
@@ -133,11 +158,12 @@ PlexSubtitleTrack? findPlexTrackForMpvSubtitle(SubtitleTrack mpvTrack, List<Plex
}
/// Find the MPV audio track that matches a Plex audio track
AudioTrack? findMpvTrackForPlexAudio(PlexAudioTrack plexTrack, List<AudioTrack> mpvTracks) {
AudioTrack? findMpvTrackForPlexAudio(PlexAudioTrack plexTrack, List<AudioTrack> mpvTracks, {List<PlexAudioTrack>? allPlexTracks}) {
if (mpvTracks.isEmpty) return null;
AudioTrack? bestMatch;
int bestScore = 0;
final plexOrdinal = allPlexTracks?.indexOf(plexTrack) ?? -1;
for (final mpvTrack in mpvTracks) {
int score = 0;
@@ -167,6 +193,14 @@ AudioTrack? findMpvTrackForPlexAudio(PlexAudioTrack plexTrack, List<AudioTrack>
score += 2;
}
// Ordinal position tiebreaker (+1)
if (plexOrdinal >= 0) {
final mpvOrdinal = mpvTracks.indexOf(mpvTrack);
if (mpvOrdinal >= 0 && plexOrdinal == mpvOrdinal) {
score += 1;
}
}
if (score > bestScore) {
bestScore = score;
bestMatch = mpvTrack;
@@ -178,11 +212,12 @@ AudioTrack? findMpvTrackForPlexAudio(PlexAudioTrack plexTrack, List<AudioTrack>
}
/// Find the Plex audio track that matches an MPV audio track
PlexAudioTrack? findPlexTrackForMpvAudio(AudioTrack mpvTrack, List<PlexAudioTrack> plexTracks) {
PlexAudioTrack? findPlexTrackForMpvAudio(AudioTrack mpvTrack, List<PlexAudioTrack> plexTracks, {List<AudioTrack>? allMpvTracks}) {
if (plexTracks.isEmpty) return null;
PlexAudioTrack? bestMatch;
int bestScore = 0;
final mpvOrdinal = allMpvTracks?.indexOf(mpvTrack) ?? -1;
for (final plexTrack in plexTracks) {
int score = 0;
@@ -212,6 +247,14 @@ PlexAudioTrack? findPlexTrackForMpvAudio(AudioTrack mpvTrack, List<PlexAudioTrac
score += 2;
}
// Ordinal position tiebreaker (+1)
if (mpvOrdinal >= 0) {
final plexOrdinal = plexTracks.indexOf(plexTrack);
if (plexOrdinal >= 0 && mpvOrdinal == plexOrdinal) {
score += 1;
}
}
if (score > bestScore) {
bestScore = score;
bestMatch = plexTrack;
@@ -541,7 +584,7 @@ class TrackSelectionService {
final plexSelectedTrack = plexMediaInfo!.audioTracks.where((t) => t.selected).firstOrNull;
if (plexSelectedTrack != null) {
final matchedMpvTrack = findMpvTrackForPlexAudio(plexSelectedTrack, availableTracks);
final matchedMpvTrack = findMpvTrackForPlexAudio(plexSelectedTrack, availableTracks, allPlexTracks: plexMediaInfo!.audioTracks);
if (matchedMpvTrack != null) {
return TrackSelectionResult(matchedMpvTrack, TrackSelectionPriority.plexSelected);
@@ -603,7 +646,7 @@ class TrackSelectionService {
final plexSelectedTrack = plexMediaInfo!.subtitleTracks.where((t) => t.selected).firstOrNull;
if (plexSelectedTrack != null) {
final matchedMpvTrack = findMpvTrackForPlexSubtitle(plexSelectedTrack, availableTracks);
final matchedMpvTrack = findMpvTrackForPlexSubtitle(plexSelectedTrack, availableTracks, allPlexTracks: plexMediaInfo!.subtitleTracks);
if (matchedMpvTrack != null) {
return TrackSelectionResult(matchedMpvTrack, TrackSelectionPriority.plexSelected);