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

Merge pull request #175 from Shadowghost/fixes

Browse Source
This commit is contained in:
Cody Robibero 2022-10-20 08:18:42 -06:00 committed by GitHub
commit 9e63261630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 121 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Trakt/Api/DataContracts/Users/Playback/TraktEpisodePaused.cs
View File

@ -21,13 +21,13 @@ public class TraktEpisodePaused
public int Id { get; set; }
/// <summary>
/// Gets or sets the type.
/// Gets or sets the paused datetime.
/// </summary>
[JsonPropertyName("paused_at")]
public string PausedAt { get; set; }
/// <summary>
/// Gets or sets the movie year.
/// Gets or sets the progress.
/// </summary>
[JsonPropertyName("progress")]
public double Progress { get; set; }

4
Trakt/Api/DataContracts/Users/Playback/TraktMoviePaused.cs
View File

@ -21,13 +21,13 @@ public class TraktMoviePaused
public TraktMovie Movie { get; set; }
/// <summary>
/// Gets or sets the type.
/// Gets or sets the paused datetime.
/// </summary>
[JsonPropertyName("paused_at")]
public string PausedAt { get; set; }
/// <summary>
/// Gets or sets the movie year.
/// Gets or sets the progress.
/// </summary>
[JsonPropertyName("progress")]
public double Progress { get; set; }

12
Trakt/Api/TraktURIs.cs
View File

@ -13,7 +13,7 @@ public static class TraktUris
/// <summary>
/// The client id.
/// </summary>
public const string ClientId = "58f2251f1c9e7275e94fef723a8604e6848bbf86a0d97dda82382a6c3231608c";
public const string ClientId = "bfdd2e032c30c35b368f97ef4ec81587b899bcb028b91a1d4ba5589a4b6a7267";
/// <summary>
/// The client secret.
@ -119,14 +119,4 @@ public static class TraktUris
/// The shows recommendations URI.
/// </summary>
public const string RecommendationsShows = BaseUrl + "/recommendations/shows";
/// <summary>
/// The movies recommendations dismiss URI.
/// </summary>
public const string RecommendationsMoviesDismiss = BaseUrl + "/recommendations/movies/{0}";
/// <summary>
/// The shows recommendations dismiss URI.
/// </summary>
public const string RecommendationsShowsDismiss = BaseUrl + "/recommendations/shows/{0}";
}

6
Trakt/Model/PlaybackState.cs
View File

@ -1,8 +1,12 @@
using System;
namespace Trakt.Model;
internal class PlaybackState
{
public bool IsPaused { get; set; } = false;
public long PlaybackProgress { get; set; } = 0L;
public long PlaybackPositionTicks { get; set; } = 0L;
public DateTime PlaybackTime { get; set; } = DateTime.UtcNow;
}

253
Trakt/ServerMediator.cs
View File

@ -224,38 +224,40 @@ public class ServerMediator : IServerEntryPoint, IDisposable
}
var video = playbackProgressEventArgs.Item as Video;
var progressPercent = video.RunTimeTicks.HasValue && video.RunTimeTicks != 0 ?
(float)(playbackProgressEventArgs.PlaybackPositionTicks ?? 0) / video.RunTimeTicks.Value * 100.0f : 0.0f;
var playbackPositionTicks = playbackProgressEventArgs.PlaybackPositionTicks ?? 0L;
var progressPercent = video.RunTimeTicks.HasValue && video.RunTimeTicks != 0
? (float)playbackPositionTicks / video.RunTimeTicks.Value * 100.0f
: 0.0f;
_logger.LogDebug("User {User} started watching item {Item}.", user.Username, playbackProgressEventArgs.Item.Path);
try
{
if (video is Movie movie)
_playbackState[traktUser.LinkedMbUserId] = new PlaybackState
{
_logger.LogDebug("Sending movie playback status update to trakt.tv for user {User}.", user.Username);
await _traktApi.SendMovieStatusUpdateAsync(
movie,
MediaStatus.Watching,
traktUser,
progressPercent).ConfigureAwait(false);
IsPaused = false,
PlaybackPositionTicks = playbackPositionTicks,
PlaybackTime = DateTime.UtcNow
};
_playbackState[traktUser.LinkedMbUserId] = new PlaybackState();
_playbackState[traktUser.LinkedMbUserId].PlaybackProgress = playbackProgressEventArgs.PlaybackPositionTicks ?? 0L;
_playbackState[traktUser.LinkedMbUserId].IsPaused = false;
}
else if (video is Episode episode)
_logger.LogDebug("Sending {VideoType} playback status (Watching) update to trakt.tv for user {User}.", video.GetType().Name, user.Username);
switch (video)
{
_logger.LogDebug("Sending episode playback status update to trakt.tv for user {User}.", user.Username);
await _traktApi.SendEpisodeStatusUpdateAsync(
episode,
MediaStatus.Watching,
traktUser,
progressPercent).ConfigureAwait(false);
_playbackState[traktUser.LinkedMbUserId] = new PlaybackState();
_playbackState[traktUser.LinkedMbUserId].PlaybackProgress = playbackProgressEventArgs.PlaybackPositionTicks ?? 0L;
_playbackState[traktUser.LinkedMbUserId].IsPaused = false;
case Movie movie:
await _traktApi.SendMovieStatusUpdateAsync(
movie,
MediaStatus.Watching,
traktUser,
progressPercent).ConfigureAwait(false);
break;
case Episode episode:
await _traktApi.SendEpisodeStatusUpdateAsync(
episode,
MediaStatus.Watching,
traktUser,
progressPercent).ConfigureAwait(false);
break;
}
}
catch (Exception ex)
@ -309,104 +311,70 @@ public class ServerMediator : IServerEntryPoint, IDisposable
continue;
}
var video = playbackProgressEventArgs.Item as Video;
var playbackPositionTicks = playbackProgressEventArgs.PlaybackPositionTicks;
var progressPercent = video.RunTimeTicks.HasValue && video.RunTimeTicks != 0 ?
(float)(playbackPositionTicks ?? 0) / video.RunTimeTicks.Value * 100.0f : 0.0f;
if (!_playbackState.TryGetValue(traktUser.LinkedMbUserId, out var state))
{
state = new PlaybackState();
}
_logger.LogDebug("User {User} progressed watching item {Item}.", user.Username, playbackProgressEventArgs.Item.Path);
var video = playbackProgressEventArgs.Item as Video;
var playbackPositionTicks = playbackProgressEventArgs.PlaybackPositionTicks ?? 0L;
var realTimeDifferenceInSeconds = Math.Round((DateTime.UtcNow - state.PlaybackTime).TotalSeconds);
var tickDifferenceInSeconds = Math.Round(TimeSpan.FromTicks(playbackPositionTicks - state.PlaybackPositionTicks).TotalSeconds);
var progressPercent = video.RunTimeTicks.HasValue && video.RunTimeTicks != 0
? (float)playbackPositionTicks / video.RunTimeTicks.Value * 100.0f
: 0.0f;
try
{
if (playbackProgressEventArgs.IsPaused)
if (!_playbackState.TryGetValue(traktUser.LinkedMbUserId, out state))
{
if (!_playbackState[traktUser.LinkedMbUserId].IsPaused)
_logger.LogWarning("Received playback progress from user {User} but initial state was never set - setting it now!", user.Username);
_playbackState[traktUser.LinkedMbUserId] = new PlaybackState
{
_logger.LogDebug("Playback paused");
if (video is Movie movie)
{
_logger.LogDebug("Sending movie playback status update to trakt.tv for user {User}.", user.Username);
await _traktApi.SendMovieStatusUpdateAsync(
movie,
MediaStatus.Paused,
traktUser,
progressPercent).ConfigureAwait(false);
_playbackState[traktUser.LinkedMbUserId].PlaybackProgress = playbackProgressEventArgs.PlaybackPositionTicks ?? 0L;
_playbackState[traktUser.LinkedMbUserId].IsPaused = true;
}
else if (video is Episode episode)
{
_logger.LogDebug("Sending episode playback status update to trakt.tv for user {User}.", user.Username);
await _traktApi.SendEpisodeStatusUpdateAsync(
episode,
MediaStatus.Paused,
traktUser,
progressPercent).ConfigureAwait(false);
_playbackState[traktUser.LinkedMbUserId].PlaybackProgress = playbackProgressEventArgs.PlaybackPositionTicks ?? 0L;
_playbackState[traktUser.LinkedMbUserId].IsPaused = true;
}
}
IsPaused = false,
PlaybackPositionTicks = playbackPositionTicks,
PlaybackTime = DateTime.UtcNow
};
continue;
}
else
state.PlaybackPositionTicks = playbackPositionTicks;
state.PlaybackTime = DateTime.UtcNow;
// Mark as skipped if tick difference is less than -10 seconds
// or tick difference is ahead of real time difference by more than 10 seconds.
var playbackSkipped = tickDifferenceInSeconds < -10 || tickDifferenceInSeconds > realTimeDifferenceInSeconds + 10;
if (playbackProgressEventArgs.IsPaused == state.IsPaused && !playbackSkipped)
{
if (_playbackState.TryGetValue(traktUser.LinkedMbUserId, out PlaybackState state))
{
if (state.IsPaused)
{
_logger.LogDebug("Playback resumed");
_logger.LogDebug("Playback state did not change.");
continue;
}
if (video is Movie movie)
{
_logger.LogDebug("Sending movie playback status update to trakt.tv for user {User}.", user.Username);
await _traktApi.SendMovieStatusUpdateAsync(
movie,
MediaStatus.Watching,
traktUser,
progressPercent).ConfigureAwait(false);
}
else if (video is Episode episode)
{
_logger.LogDebug("Sending episode playback status update to trakt.tv for user {User}.", user.Username);
await _traktApi.SendEpisodeStatusUpdateAsync(
episode,
MediaStatus.Watching,
traktUser,
progressPercent).ConfigureAwait(false);
}
if (playbackSkipped)
{
_logger.LogDebug("Playback skipped.");
}
_playbackState[traktUser.LinkedMbUserId].PlaybackProgress = playbackProgressEventArgs.PlaybackPositionTicks ?? 0L;
_playbackState[traktUser.LinkedMbUserId].IsPaused = false;
}
else if (Math.Abs((playbackProgressEventArgs.PlaybackPositionTicks ?? 0L) - state.PlaybackProgress) > TimeSpan.TicksPerSecond * 5)
{
_logger.LogDebug("Playback skipped");
state.IsPaused = playbackProgressEventArgs.IsPaused;
var status = state.IsPaused ? MediaStatus.Paused : MediaStatus.Watching;
_logger.LogDebug("Sending {VideoType} playback status ({PlaybackStatus}) update to trakt.tv for user {User}.", video.GetType().Name, status, user.Username);
if (video is Movie movie)
{
_logger.LogDebug("Sending movie playback status update to trakt.tv for user {User}.", user.Username);
await _traktApi.SendMovieStatusUpdateAsync(
movie,
MediaStatus.Watching,
traktUser,
progressPercent).ConfigureAwait(false);
}
else if (video is Episode episode)
{
_logger.LogDebug("Sending episode playback status update to trakt.tv for user {User}.", user.Username);
await _traktApi.SendEpisodeStatusUpdateAsync(
episode,
MediaStatus.Watching,
traktUser,
progressPercent).ConfigureAwait(false);
}
_playbackState[traktUser.LinkedMbUserId].PlaybackProgress = playbackProgressEventArgs.PlaybackPositionTicks ?? 0L;
_playbackState[traktUser.LinkedMbUserId].IsPaused = false;
}
}
switch (video)
{
case Movie movie:
await _traktApi.SendMovieStatusUpdateAsync(
movie,
status,
traktUser,
progressPercent).ConfigureAwait(false);
break;
case Episode episode:
await _traktApi.SendEpisodeStatusUpdateAsync(
episode,
status,
traktUser,
progressPercent).ConfigureAwait(false);
break;
}
}
catch (Exception ex)
@ -436,7 +404,7 @@ public class ServerMediator : IServerEntryPoint, IDisposable
return;
}
_logger.LogInformation("Playback stopped");
_logger.LogDebug("Playback stopped");
foreach (var user in playbackStoppedEventArgs.Users)
{
@ -467,24 +435,24 @@ public class ServerMediator : IServerEntryPoint, IDisposable
if (playbackStoppedEventArgs.PlayedToCompletion)
{
_logger.LogDebug("User {User} completed watching item {Item}. Scrobbling.", user.Username, playbackStoppedEventArgs.Item.Name);
_logger.LogDebug("Sending {VideoType} playback status (Stop) update to trakt.tv for user {User}.", video.GetType().Name, user.Username);
if (video is Movie movie)
switch (video)
{
_logger.LogDebug("Sending movie playback status update to trakt.tv for user {User}.", user.Username);
await _traktApi.SendMovieStatusUpdateAsync(
movie,
MediaStatus.Stop,
traktUser,
100).ConfigureAwait(false);
}
else if (video is Episode episode)
{
_logger.LogDebug("Sending episode playback status update to trakt.tv for user {User}.", user.Username);
await _traktApi.SendEpisodeStatusUpdateAsync(
episode,
MediaStatus.Stop,
traktUser,
100).ConfigureAwait(false);
case Movie movie:
await _traktApi.SendMovieStatusUpdateAsync(
movie,
MediaStatus.Stop,
traktUser,
100).ConfigureAwait(false);
break;
case Episode episode:
await _traktApi.SendEpisodeStatusUpdateAsync(
episode,
MediaStatus.Stop,
traktUser,
100).ConfigureAwait(false);
break;
}
}
else
@ -494,21 +462,22 @@ public class ServerMediator : IServerEntryPoint, IDisposable
_logger.LogDebug("User {User} didn't watch item {Item} until the end. Not scrobbling but pausing playback at current playback position.", user.Username, playbackStoppedEventArgs.Item.Name);
if (video is Movie movie)
switch (video)
{
await _traktApi.SendMovieStatusUpdateAsync(
movie,
MediaStatus.Paused,
traktUser,
progressPercent).ConfigureAwait(false);
}
else if (video is Episode episode)
{
await _traktApi.SendEpisodeStatusUpdateAsync(
episode,
MediaStatus.Paused,
traktUser,
progressPercent).ConfigureAwait(false);
case Movie movie:
await _traktApi.SendMovieStatusUpdateAsync(
movie,
MediaStatus.Paused,
traktUser,
progressPercent).ConfigureAwait(false);
break;
case Episode episode:
await _traktApi.SendEpisodeStatusUpdateAsync(
episode,
MediaStatus.Paused,
traktUser,
progressPercent).ConfigureAwait(false);
break;
}
}