Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-04 03:27:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2152 from dkanada/progress

Browse Source 
Track progress for any item that supports the feature
This commit is contained in:
Bond-009 2019-12-14 14:06:13 +01:00 committed by GitHub
commit 831d1daa68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Emby.Server.Implementations/Library/UserDataManager.cs
View File

@ -226,24 +226,21 @@ namespace Emby.Server.Implementations.Library
{ {
var pctIn = decimal.Divide(positionTicks, runtimeTicks) * 100; var pctIn = decimal.Divide(positionTicks, runtimeTicks) * 100;
// Don't track in very beginning
if (pctIn < _config.Configuration.MinResumePct) if (pctIn < _config.Configuration.MinResumePct)
{ {
// ignore progress during the beginning
positionTicks = 0; positionTicks = 0;
} }
// If we're at the end, assume completed
else if (pctIn > _config.Configuration.MaxResumePct || positionTicks >= runtimeTicks) else if (pctIn > _config.Configuration.MaxResumePct || positionTicks >= runtimeTicks)
{ {
// mark as completed close to the end
positionTicks = 0; positionTicks = 0;
data.Played = playedToCompletion = true; data.Played = playedToCompletion = true;
} }
else else
{ {
// Enforce MinResumeDuration // Enforce MinResumeDuration
var durationSeconds = TimeSpan.FromTicks(runtimeTicks).TotalSeconds; var durationSeconds = TimeSpan.FromTicks(runtimeTicks).TotalSeconds;
if (durationSeconds < _config.Configuration.MinResumeDurationSeconds) if (durationSeconds < _config.Configuration.MinResumeDurationSeconds)
{ {
positionTicks = 0; positionTicks = 0;
@ -263,6 +260,7 @@ namespace Emby.Server.Implementations.Library
positionTicks = 0; positionTicks = 0;
data.Played = false; data.Played = false;
} }
if (!item.SupportsPositionTicksResume) if (!item.SupportsPositionTicksResume)
{ {
positionTicks = 0; positionTicks = 0;

8
Emby.Server.Implementations/Session/SessionManager.cs
View File

@ -667,12 +667,9 @@ namespace Emby.Server.Implementations.Session
data.PlayCount++; data.PlayCount++;
data.LastPlayedDate = DateTime.UtcNow; data.LastPlayedDate = DateTime.UtcNow;
if (item.SupportsPlayedStatus) if (item.SupportsPlayedStatus && !item.SupportsPositionTicksResume)
{ {
if (!(item is Video)) data.Played = true;
{
data.Played = true;
}
} }
else else
{ {
@ -769,7 +766,6 @@ namespace Emby.Server.Implementations.Session
{ {
_userDataManager.SaveUserData(user, item, data, UserDataSaveReason.PlaybackProgress, CancellationToken.None); _userDataManager.SaveUserData(user, item, data, UserDataSaveReason.PlaybackProgress, CancellationToken.None);
} }
} }
private static bool UpdatePlaybackSettings(User user, PlaybackProgressInfo info, UserItemData data) private static bool UpdatePlaybackSettings(User user, PlaybackProgressInfo info, UserItemData data)