Merge pull request #4891 from Artiume/patch-1

(cherry picked from commit eb084f9021b912903239750e48a0119127e4fa38)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>

2 files changed, 31 insertions, 1 deletions

diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index f9e5e6bbc..d16275b19 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -14,6 +14,7 @@ using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using Book = MediaBrowser.Controller.Entities.Book;
+using AudioBook = MediaBrowser.Controller.Entities.AudioBook;
 
 namespace Emby.Server.Implementations.Library
 {
@@ -219,7 +220,7 @@ namespace Emby.Server.Implementations.Library
             var hasRuntime = runtimeTicks > 0;
 
             // If a position has been reported, and if we know the duration
-            if (positionTicks > 0 && hasRuntime)
+            if (positionTicks > 0 && hasRuntime && !(item is AudioBook))
             {
                 var pctIn = decimal.Divide(positionTicks, runtimeTicks) * 100;
 
@@ -245,6 +246,23 @@ namespace Emby.Server.Implementations.Library
                     }
                 }
             }
+            else if (positionTicks > 0 && hasRuntime && item is AudioBook)
+            {
+                var minIn = TimeSpan.FromTicks(positionTicks).TotalMinutes;
+                var minOut = TimeSpan.FromTicks(runtimeTicks - positionTicks).TotalMinutes;
+
+                if (minIn > _config.Configuration.MinAudiobookResume)
+                {
+                    // ignore progress during the beginning
+                    positionTicks = 0;
+                }
+                else if (minOut < _config.Configuration.MaxAudiobookResume || positionTicks >= runtimeTicks)
+                {
+                    // mark as completed close to the end
+                    positionTicks = 0;
+                    data.Played = playedToCompletion = true;
+                }
+            }
             else if (!hasRuntime)
             {
                 // If we don't know the runtime we'll just have to assume it was fully played
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 7013cb300..9fb978e9b 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -299,6 +299,18 @@ namespace MediaBrowser.Model.Configuration
         public int MinResumeDurationSeconds { get; set; } = 300;
 
         /// <summary>
+        /// Gets or sets the minimum minutes of a book that must be played in order for playstate to be updated.
+        /// </summary>
+        /// <value>The min resume in minutes.</value>
+        public int MinAudiobookResume { get; set; } = 5;
+
+        /// <summary>
+        /// Gets or sets the remaining minutes of a book that can be played while still saving playstate. If this percentage is crossed playstate will be reset to the beginning and the item will be marked watched.
+        /// </summary>
+        /// <value>The remaining time in minutes.</value>
+        public int MaxAudiobookResume { get; set; } = 5;
+
+        /// <summary>
         /// Gets or sets the delay in seconds that we will wait after a file system change to try and discover what has been added/removed
         /// Some delay is necessary with some items because their creation is not atomic.  It involves the creation of several
         /// different directories and files.