mirror of
https://github.com/jellyfin/jellyfin-plugin-trakt.git
synced 2024-11-23 13:50:15 +00:00
Merge pull request #100 from SenorSmartyPants/Fix-episodes
This commit is contained in:
Cody Robibero
GitHub
commit
a4f689d7fb
@ -91,26 +91,20 @@ public class TraktApi
|
||||
|
||||
if (item is Movie movie)
|
||||
{
|
||||
return !string.IsNullOrEmpty(movie.GetProviderId(MetadataProvider.Imdb)) ||
|
||||
!string.IsNullOrEmpty(movie.GetProviderId(MetadataProvider.Tmdb));
|
||||
return movie.HasProviderId(MetadataProvider.Imdb) ||
|
||||
movie.HasProviderId(MetadataProvider.Tmdb);
|
||||
}
|
||||
|
||||
if (item is Episode episode
|
||||
&& episode.Series != null
|
||||
&& !episode.IsMissingEpisode
|
||||
&& (episode.IndexNumber.HasValue
|
||||
|| !string.IsNullOrEmpty(episode.GetProviderId(MetadataProvider.Imdb))
|
||||
|| !string.IsNullOrEmpty(episode.GetProviderId(MetadataProvider.Tmdb))
|
||||
|| !string.IsNullOrEmpty(episode.GetProviderId(MetadataProvider.Tvdb))
|
||||
|| !string.IsNullOrEmpty(episode.GetProviderId(MetadataProvider.TvRage))
|
||||
))
|
||||
|| HasAnyProviderTvIds(episode)
|
||||
))
|
||||
{
|
||||
var series = episode.Series;
|
||||
|
||||
return !string.IsNullOrEmpty(series.GetProviderId(MetadataProvider.Imdb))
|
||||
|| !string.IsNullOrEmpty(series.GetProviderId(MetadataProvider.Tmdb))
|
||||
|| !string.IsNullOrEmpty(series.GetProviderId(MetadataProvider.TvRage))
|
||||
|| !string.IsNullOrEmpty(series.GetProviderId(MetadataProvider.Tvdb));
|
||||
return HasAnyProviderTvIds(series);
|
||||
}
|
||||
|
||||
return false;
|
||||
@ -171,52 +165,45 @@ public class TraktApi
|
||||
{
|
||||
var episodeDatas = new List<TraktScrobbleEpisode>();
|
||||
|
||||
var indexNumber = 0;
|
||||
var finalNumber = 0;
|
||||
if (episode.IndexNumber.HasValue)
|
||||
if (HasAnyProviderTvIds(episode) && (!episode.IndexNumber.HasValue || !episode.IndexNumberEnd.HasValue || episode.IndexNumberEnd <= episode.IndexNumber))
|
||||
{
|
||||
indexNumber = episode.IndexNumber.Value;
|
||||
finalNumber = (episode.IndexNumberEnd ?? episode.IndexNumber).Value;
|
||||
}
|
||||
|
||||
var number = indexNumber;
|
||||
var firstPass = true;
|
||||
do
|
||||
{
|
||||
var scrobbleEpisode = new TraktScrobbleEpisode
|
||||
episodeDatas.Add(new TraktScrobbleEpisode
|
||||
{
|
||||
AppDate = DateTimeOffset.Now.Date.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture),
|
||||
AppVersion = _appHost.ApplicationVersionString,
|
||||
Progress = progressPercent,
|
||||
Episode = new TraktEpisode
|
||||
{
|
||||
Season = episode.GetSeasonNumber()
|
||||
},
|
||||
Show = new TraktShow
|
||||
{
|
||||
Title = episode.Series.Name,
|
||||
Year = episode.Series.ProductionYear,
|
||||
Ids = GetTraktTvIds<Series, TraktShowId>(episode.Series)
|
||||
Ids = GetTraktTvIds<Episode, TraktEpisodeId>(episode)
|
||||
}
|
||||
};
|
||||
if (episode.IndexNumber.HasValue)
|
||||
{
|
||||
scrobbleEpisode.Episode.Number = number;
|
||||
}
|
||||
|
||||
// provider IDs in multi-episode file will be for the first episode only
|
||||
if (firstPass)
|
||||
{
|
||||
// output provider IDs for first episode
|
||||
scrobbleEpisode.Episode.Ids = GetTraktTvIds<Episode, TraktEpisodeId>(episode);
|
||||
firstPass = false;
|
||||
}
|
||||
|
||||
episodeDatas.Add(scrobbleEpisode);
|
||||
|
||||
number++;
|
||||
});
|
||||
}
|
||||
else if (episode.IndexNumber.HasValue)
|
||||
{
|
||||
var indexNumber = episode.IndexNumber.Value;
|
||||
var finalNumber = (episode.IndexNumberEnd ?? episode.IndexNumber).Value;
|
||||
|
||||
for (var number = indexNumber; number <= finalNumber; number++)
|
||||
{
|
||||
episodeDatas.Add(new TraktScrobbleEpisode
|
||||
{
|
||||
AppDate = DateTimeOffset.Now.Date.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture),
|
||||
AppVersion = _appHost.ApplicationVersionString,
|
||||
Progress = progressPercent,
|
||||
Episode = new TraktEpisode
|
||||
{
|
||||
Season = episode.GetSeasonNumber(),
|
||||
Number = number
|
||||
},
|
||||
Show = new TraktShow
|
||||
{
|
||||
Title = episode.Series.Name,
|
||||
Year = episode.Series.ProductionYear,
|
||||
Ids = GetTraktTvIds<Series, TraktShowId>(episode.Series)
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
while (episode.IndexNumber.HasValue && number <= finalNumber);
|
||||
|
||||
string url;
|
||||
switch (status)
|
||||
@ -362,60 +349,15 @@ public class TraktApi
|
||||
{
|
||||
var audioStream = episode.GetMediaStreams().FirstOrDefault(x => x.Type == MediaStreamType.Audio);
|
||||
|
||||
var syncShow = FindShow(showPayload, episode.Series);
|
||||
if (syncShow == null)
|
||||
{
|
||||
syncShow = new TraktShowCollected
|
||||
{
|
||||
Ids = GetTraktTvIds<Series, TraktShowId>(episode.Series),
|
||||
Seasons = new List<TraktSeasonCollected>()
|
||||
};
|
||||
|
||||
showPayload.Add(syncShow);
|
||||
}
|
||||
|
||||
var syncSeason =
|
||||
syncShow.Seasons.FirstOrDefault(ss => ss.Number == episode.GetSeasonNumber());
|
||||
if (syncSeason == null)
|
||||
{
|
||||
syncSeason = new TraktSeasonCollected
|
||||
{
|
||||
Number = episode.GetSeasonNumber(),
|
||||
Episodes = new List<TraktEpisodeCollected>()
|
||||
};
|
||||
|
||||
syncShow.Seasons.Add(syncSeason);
|
||||
}
|
||||
|
||||
var indexNumber = 0;
|
||||
var finalNumber = 0;
|
||||
if (episode.IndexNumber.HasValue)
|
||||
{
|
||||
indexNumber = episode.IndexNumber.Value;
|
||||
finalNumber = (episode.IndexNumberEnd ?? episode.IndexNumber).Value;
|
||||
}
|
||||
|
||||
var number = indexNumber;
|
||||
var firstPass = true;
|
||||
do
|
||||
if (HasAnyProviderTvIds(episode) &&
|
||||
(!episode.IndexNumber.HasValue || !episode.IndexNumberEnd.HasValue ||
|
||||
episode.IndexNumberEnd <= episode.IndexNumber))
|
||||
{
|
||||
var traktEpisodeCollected = new TraktEpisodeCollected
|
||||
{
|
||||
CollectedAt = episode.DateCreated.ToISO8601()
|
||||
CollectedAt = episode.DateCreated.ToISO8601(),
|
||||
Ids = GetTraktTvIds<Episode, TraktEpisodeId>(episode)
|
||||
};
|
||||
|
||||
if (episode.IndexNumber.HasValue)
|
||||
{
|
||||
traktEpisodeCollected.Number = number;
|
||||
}
|
||||
|
||||
if (firstPass)
|
||||
{
|
||||
// Omit this from the rest because then we end up attaching the provider IDs of the first episode to the subsequent ones
|
||||
traktEpisodeCollected.Ids = GetTraktTvIds<Episode, TraktEpisodeId>(episode);
|
||||
firstPass = false;
|
||||
}
|
||||
|
||||
if (traktUser.ExportMediaInfo)
|
||||
{
|
||||
// traktEpisodeCollected.Is3D = episode.Is3D;
|
||||
@ -424,11 +366,64 @@ public class TraktApi
|
||||
traktEpisodeCollected.Resolution = episode.GetDefaultVideoStream().GetResolution();
|
||||
}
|
||||
|
||||
syncSeason.Episodes.Add(traktEpisodeCollected);
|
||||
|
||||
number++;
|
||||
episodesPayload.Add(traktEpisodeCollected);
|
||||
}
|
||||
else if (episode.IndexNumber.HasValue)
|
||||
{
|
||||
var indexNumber = episode.IndexNumber.Value;
|
||||
var finalNumber = (episode.IndexNumberEnd ?? episode.IndexNumber).Value;
|
||||
var syncShow = FindShow(showPayload, episode.Series);
|
||||
if (syncShow == null)
|
||||
{
|
||||
syncShow = new TraktShowCollected
|
||||
{
|
||||
Ids = GetTraktTvIds<Series, TraktShowId>(episode.Series),
|
||||
Seasons = new List<TraktSeasonCollected>()
|
||||
};
|
||||
|
||||
showPayload.Add(syncShow);
|
||||
}
|
||||
|
||||
var syncSeason =
|
||||
syncShow.Seasons.FirstOrDefault(ss => ss.Number == episode.GetSeasonNumber());
|
||||
if (syncSeason == null)
|
||||
{
|
||||
syncSeason = new TraktSeasonCollected
|
||||
{
|
||||
Number = episode.GetSeasonNumber(),
|
||||
Episodes = new List<TraktEpisodeCollected>()
|
||||
};
|
||||
|
||||
syncShow.Seasons.Add(syncSeason);
|
||||
}
|
||||
|
||||
for (var number = indexNumber; number <= finalNumber; number++)
|
||||
{
|
||||
var ids = new TraktEpisodeId();
|
||||
|
||||
if (number == indexNumber)
|
||||
{
|
||||
// Omit this from the rest because then we end up attaching the provider IDs of the first episode to the subsequent ones
|
||||
ids = GetTraktTvIds<Episode, TraktEpisodeId>(episode);
|
||||
}
|
||||
|
||||
var traktEpisodeCollected = new TraktEpisodeCollected
|
||||
{
|
||||
Number = number,
|
||||
CollectedAt = episode.DateCreated.ToISO8601(),
|
||||
Ids = ids
|
||||
};
|
||||
if (traktUser.ExportMediaInfo)
|
||||
{
|
||||
// traktEpisodeCollected.Is3D = episode.Is3D;
|
||||
traktEpisodeCollected.AudioChannels = audioStream.GetAudioChannels();
|
||||
traktEpisodeCollected.Audio = audioStream.GetCodecRepresetation();
|
||||
traktEpisodeCollected.Resolution = episode.GetDefaultVideoStream().GetResolution();
|
||||
}
|
||||
|
||||
syncSeason.Episodes.Add(traktEpisodeCollected);
|
||||
}
|
||||
}
|
||||
while (episode.IndexNumber.HasValue && number <= finalNumber);
|
||||
}
|
||||
|
||||
var data = new TraktSyncCollected
|
||||
@ -523,33 +518,52 @@ public class TraktApi
|
||||
}
|
||||
else if (item is Episode episode)
|
||||
{
|
||||
var show = new TraktShowRated
|
||||
if (!HasAnyProviderTvIds(episode))
|
||||
{
|
||||
Ids = GetTraktTvIds<Series, TraktShowId>(episode.Series),
|
||||
Seasons = new List<TraktSeasonRated>
|
||||
if (episode.IndexNumber.HasValue)
|
||||
{
|
||||
new TraktSeasonRated
|
||||
var show = new TraktShowRated
|
||||
{
|
||||
Number = episode.GetSeasonNumber(),
|
||||
Episodes = new List<TraktEpisodeRated>
|
||||
{
|
||||
new TraktEpisodeRated
|
||||
Ids = GetTraktTvIds<Series, TraktShowId>(episode.Series),
|
||||
Seasons = new List<TraktSeasonRated>
|
||||
{
|
||||
Number = episode.IndexNumber,
|
||||
Rating = rating,
|
||||
Ids = GetTraktTvIds<Episode, TraktEpisodeId>(episode)
|
||||
new TraktSeasonRated
|
||||
{
|
||||
Number = episode.GetSeasonNumber(),
|
||||
Episodes = new List<TraktEpisodeRated>
|
||||
{
|
||||
new TraktEpisodeRated
|
||||
{
|
||||
Number = episode.IndexNumber,
|
||||
Rating = rating
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
data = new
|
||||
{
|
||||
shows = new[]
|
||||
{
|
||||
show
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
data = new
|
||||
{
|
||||
episodes = new[]
|
||||
{
|
||||
new TraktEpisodeRated
|
||||
{
|
||||
Rating = rating,
|
||||
Ids = GetTraktTvIds<Episode, TraktEpisodeId>(episode)
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
data = new
|
||||
{
|
||||
shows = new[]
|
||||
{
|
||||
show
|
||||
}
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
else // It's a Series
|
||||
{
|
||||
@ -755,62 +769,50 @@ public class TraktApi
|
||||
.LastPlayedDate
|
||||
: null;
|
||||
|
||||
var syncShow = FindShow(data.Shows, episode.Series);
|
||||
if (syncShow == null)
|
||||
if (HasAnyProviderTvIds(episode) && (!episode.IndexNumber.HasValue || !episode.IndexNumberEnd.HasValue || episode.IndexNumberEnd <= episode.IndexNumber))
|
||||
{
|
||||
syncShow = new TraktShowWatched
|
||||
{
|
||||
Ids = GetTraktTvIds<Series, TraktShowId>(episode.Series),
|
||||
Seasons = new List<TraktSeasonWatched>()
|
||||
};
|
||||
data.Shows.Add(syncShow);
|
||||
}
|
||||
|
||||
var syncSeason = syncShow.Seasons.FirstOrDefault(ss => ss.Number == episode.GetSeasonNumber());
|
||||
if (syncSeason == null)
|
||||
{
|
||||
syncSeason = new TraktSeasonWatched
|
||||
{
|
||||
Number = episode.GetSeasonNumber(),
|
||||
Episodes = new List<TraktEpisodeWatched>()
|
||||
};
|
||||
syncShow.Seasons.Add(syncSeason);
|
||||
}
|
||||
|
||||
var indexNumber = 0;
|
||||
var finalNumber = 0;
|
||||
if (episode.IndexNumber.HasValue)
|
||||
{
|
||||
indexNumber = episode.IndexNumber.Value;
|
||||
finalNumber = (episode.IndexNumberEnd ?? episode.IndexNumber).Value;
|
||||
}
|
||||
|
||||
var number = indexNumber;
|
||||
var firstPass = true;
|
||||
do
|
||||
{
|
||||
var watchedEpisode = new TraktEpisodeWatched
|
||||
data.Episodes.Add(new TraktEpisodeWatched
|
||||
{
|
||||
Ids = GetTraktTvIds<Episode, TraktEpisodeId>(episode),
|
||||
WatchedAt = lastPlayedDate.HasValue ? lastPlayedDate.Value.ToISO8601() : null
|
||||
};
|
||||
if (episode.IndexNumber.HasValue)
|
||||
{
|
||||
watchedEpisode.Number = number;
|
||||
}
|
||||
|
||||
// provider IDs in multi-episode file will be for the first episode only
|
||||
if (firstPass)
|
||||
{
|
||||
// output provider IDs for first episode
|
||||
watchedEpisode.Ids = GetTraktTvIds<Episode, TraktEpisodeId>(episode);
|
||||
firstPass = false;
|
||||
}
|
||||
|
||||
syncSeason.Episodes.Add(watchedEpisode);
|
||||
|
||||
number++;
|
||||
});
|
||||
}
|
||||
else if (episode.IndexNumber != null)
|
||||
{
|
||||
var indexNumber = episode.IndexNumber.Value;
|
||||
var finalNumber = (episode.IndexNumberEnd ?? episode.IndexNumber).Value;
|
||||
|
||||
var syncShow = FindShow(data.Shows, episode.Series);
|
||||
if (syncShow == null)
|
||||
{
|
||||
syncShow = new TraktShowWatched
|
||||
{
|
||||
Ids = GetTraktTvIds<Series, TraktShowId>(episode.Series),
|
||||
Seasons = new List<TraktSeasonWatched>()
|
||||
};
|
||||
data.Shows.Add(syncShow);
|
||||
}
|
||||
|
||||
var syncSeason = syncShow.Seasons.FirstOrDefault(ss => ss.Number == episode.GetSeasonNumber());
|
||||
if (syncSeason == null)
|
||||
{
|
||||
syncSeason = new TraktSeasonWatched
|
||||
{
|
||||
Number = episode.GetSeasonNumber(),
|
||||
Episodes = new List<TraktEpisodeWatched>()
|
||||
};
|
||||
syncShow.Seasons.Add(syncSeason);
|
||||
}
|
||||
|
||||
for (var number = indexNumber; number <= finalNumber; number++)
|
||||
{
|
||||
syncSeason.Episodes.Add(new TraktEpisodeWatched
|
||||
{
|
||||
Number = number,
|
||||
WatchedAt = lastPlayedDate.HasValue ? lastPlayedDate.Value.ToISO8601() : null
|
||||
});
|
||||
}
|
||||
}
|
||||
while (episode.IndexNumber.HasValue && number <= finalNumber);
|
||||
}
|
||||
|
||||
var url = seen ? TraktUris.SyncWatchedHistoryAdd : TraktUris.SyncWatchedHistoryRemove;
|
||||
@ -1111,4 +1113,12 @@ public class TraktApi
|
||||
return shows.FirstOrDefault(
|
||||
sre => sre.Ids != null && sre.Ids.Imdb == series.GetProviderId(MetadataProvider.Imdb) && sre.Ids.Tmdb == series.GetProviderId(MetadataProvider.Tmdb).ConvertToInt() && sre.Ids.Tvdb == series.GetProviderId(MetadataProvider.Tvdb).ConvertToInt() && sre.Ids.Tvrage == series.GetProviderId(MetadataProvider.TvRage).ConvertToInt());
|
||||
}
|
||||
|
||||
private bool HasAnyProviderTvIds(BaseItem item)
|
||||
{
|
||||
return item.HasProviderId(MetadataProvider.Imdb)
|
||||
|| item.HasProviderId(MetadataProvider.Tmdb)
|
||||
|| item.HasProviderId(MetadataProvider.Tvdb)
|
||||
|| item.HasProviderId(MetadataProvider.TvRage);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user