jellyfin/jellyfin-plugin-trakt
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-plugin-trakt.git synced 2024-11-26 23:30:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix match by season and number (include show match as well)

Browse Source 
This also fixes the play count
This commit is contained in:
h3llrais3r 2023-03-03 17:11:42 +01:00
parent 7995ea6820
commit 371bd34caf
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Trakt/Extensions.cs
View File

@ -455,7 +455,7 @@ public static class Extensions
/// <returns>IEnumerable{TraktEpisodeWatchedHistory}.</returns> /// <returns>IEnumerable{TraktEpisodeWatchedHistory}.</returns>
public static IEnumerable<TraktEpisodeWatchedHistory> FindAllMatches(Episode item, IEnumerable<TraktEpisodeWatchedHistory> results) public static IEnumerable<TraktEpisodeWatchedHistory> FindAllMatches(Episode item, IEnumerable<TraktEpisodeWatchedHistory> results)
{ {
return results.Where(i => IsMatch(item, i.Episode)).AsEnumerable(); return results.Where(i => IsMatch(item, i)).AsEnumerable();
} }
/// <summary> /// <summary>
@ -548,7 +548,42 @@ public static class Extensions
return true; return true;
} }
if (item.GetSeasonNumber() == episode.Season && item.ContainsEpisodeNumber(episode.Number)) return false;
}
/// <summary>
/// Checks if a <see cref="Episode"/> matches a <see cref="TraktEpisodeWatchedHistory"/>.
/// </summary>
/// <param name="item">The <see cref="Episode"/>.</param>
/// <param name="episodeHistory">The <see cref="TraktEpisodeWatchedHistory"/>.</param>
/// <returns><see cref="bool"/> indicating if the <see cref="Episode"/> matches a <see cref="TraktEpisodeWatchedHistory"/>.</returns>
public static bool IsMatch(Episode item, TraktEpisodeWatchedHistory episodeHistory)
{
var tvdb = item.GetProviderId(MetadataProvider.Tvdb);
if (!string.IsNullOrEmpty(tvdb) && string.Equals(tvdb, episodeHistory.Episode.Ids.Tvdb, StringComparison.OrdinalIgnoreCase))
{
return true;
}
var tmdb = item.GetProviderId(MetadataProvider.Tmdb);
if (!string.IsNullOrEmpty(tmdb) && string.Equals(tmdb, episodeHistory.Episode.Ids.Tmdb.ToString(), StringComparison.OrdinalIgnoreCase))
{
return true;
}
var imdb = item.GetProviderId(MetadataProvider.Imdb);
if (!string.IsNullOrEmpty(imdb) && string.Equals(imdb, episodeHistory.Episode.Ids.Imdb, StringComparison.OrdinalIgnoreCase))
{
return true;
}
var tvrage = item.GetProviderId(MetadataProvider.TvRage);
if (!string.IsNullOrEmpty(tvrage) && string.Equals(tvrage, episodeHistory.Episode.Ids.Tvrage, StringComparison.OrdinalIgnoreCase))
{
return true;
}
if (IsMatch(item.Series, episodeHistory.Show) && item.GetSeasonNumber() == episodeHistory.Episode.Season && item.ContainsEpisodeNumber(episodeHistory.Episode.Number))
{ {
return true; return true;
} }

5
Trakt/ScheduledTasks/SyncFromTraktTask.cs
View File

@ -320,7 +320,6 @@ public class SyncFromTraktTask : IScheduledTask
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
var matchedWatchedShow = Extensions.FindMatch(episode.Series, traktWatchedShows); var matchedWatchedShow = Extensions.FindMatch(episode.Series, traktWatchedShows);
var matchedWatchedEpisodeHistory = Extensions.FindAllMatches(episode, traktWatchedEpisodesHistory);
var matchedPausedEpisode = Extensions.FindMatch(episode, traktPausedEpisodes); var matchedPausedEpisode = Extensions.FindMatch(episode, traktPausedEpisodes);
var userData = _userDataManager.GetUserData(user.Id, episode); var userData = _userDataManager.GetUserData(user.Id, episode);
bool changed = false; bool changed = false;
@ -335,7 +334,9 @@ public class SyncFromTraktTask : IScheduledTask
tLastReset = resetValue; tLastReset = resetValue;
} }
// Check if match is found in history, fallback to match by season and number if not var matchedWatchedEpisodeHistory = Extensions.FindAllMatches(episode, traktWatchedEpisodesHistory);
// Check if match is found in history
if (matchedWatchedEpisodeHistory != null && matchedWatchedEpisodeHistory.Any()) if (matchedWatchedEpisodeHistory != null && matchedWatchedEpisodeHistory.Any())
{ {
// History is ordered with last watched first, so take the first one // History is ordered with last watched first, so take the first one