From 99adbf04975dcb233b49ea9f3eead358dd4d39fa Mon Sep 17 00:00:00 2001 From: artiume Date: Wed, 30 Dec 2020 08:48:33 -0500 Subject: Split resume function for Audiobooks --- .../Library/UserDataManager.cs | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'Emby.Server.Implementations/Library/UserDataManager.cs') diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs index f9e5e6bbc..df8c6adfa 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,24 @@ namespace Emby.Server.Implementations.Library } } } + else if (positionTicks > 0 && hasRuntime && (item is AudioBook)) + { + var minIn = TimeSpan.FromTicks(positionTicks).TotalSeconds / 60; + // 10,000 ticks per millisecond * 60,000 milliseconds per minute = 600,000,000 ticks per minute + var minOut = (runtimeTicks - positionTicks) / 600000000; + + 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 -- cgit v1.2.3 From 77b478c726df8012e8eb27ee59f3bd937848a661 Mon Sep 17 00:00:00 2001 From: artiume Date: Wed, 30 Dec 2020 09:12:13 -0500 Subject: Update Emby.Server.Implementations/Library/UserDataManager.cs Co-authored-by: Bond-009 --- Emby.Server.Implementations/Library/UserDataManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Emby.Server.Implementations/Library/UserDataManager.cs') diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs index df8c6adfa..1b38f5e0e 100644 --- a/Emby.Server.Implementations/Library/UserDataManager.cs +++ b/Emby.Server.Implementations/Library/UserDataManager.cs @@ -248,7 +248,7 @@ namespace Emby.Server.Implementations.Library } else if (positionTicks > 0 && hasRuntime && (item is AudioBook)) { - var minIn = TimeSpan.FromTicks(positionTicks).TotalSeconds / 60; + var minIn = TimeSpan.FromTicks(positionTicks).TotalMinutes; // 10,000 ticks per millisecond * 60,000 milliseconds per minute = 600,000,000 ticks per minute var minOut = (runtimeTicks - positionTicks) / 600000000; -- cgit v1.2.3 From c7cb177260e80859d18e40615673dc2b7afeda9c Mon Sep 17 00:00:00 2001 From: artiume Date: Wed, 30 Dec 2020 09:12:36 -0500 Subject: Update Emby.Server.Implementations/Library/UserDataManager.cs Co-authored-by: Bond-009 --- Emby.Server.Implementations/Library/UserDataManager.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Emby.Server.Implementations/Library/UserDataManager.cs') diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs index 1b38f5e0e..415e20710 100644 --- a/Emby.Server.Implementations/Library/UserDataManager.cs +++ b/Emby.Server.Implementations/Library/UserDataManager.cs @@ -249,8 +249,7 @@ namespace Emby.Server.Implementations.Library else if (positionTicks > 0 && hasRuntime && (item is AudioBook)) { var minIn = TimeSpan.FromTicks(positionTicks).TotalMinutes; - // 10,000 ticks per millisecond * 60,000 milliseconds per minute = 600,000,000 ticks per minute - var minOut = (runtimeTicks - positionTicks) / 600000000; + var minOut = TimeSpan.FromTicks(runtimeTicks - positionTicks).TotalMinutes; if (minIn > _config.Configuration.MinAudiobookResume) { -- cgit v1.2.3 From f411353c8ca27eb17db4258d400a38721041c9a2 Mon Sep 17 00:00:00 2001 From: artiume Date: Wed, 30 Dec 2020 09:30:02 -0500 Subject: Update Emby.Server.Implementations/Library/UserDataManager.cs Co-authored-by: Bond-009 --- Emby.Server.Implementations/Library/UserDataManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Emby.Server.Implementations/Library/UserDataManager.cs') diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs index 415e20710..d16275b19 100644 --- a/Emby.Server.Implementations/Library/UserDataManager.cs +++ b/Emby.Server.Implementations/Library/UserDataManager.cs @@ -246,7 +246,7 @@ namespace Emby.Server.Implementations.Library } } } - else if (positionTicks > 0 && hasRuntime && (item is AudioBook)) + else if (positionTicks > 0 && hasRuntime && item is AudioBook) { var minIn = TimeSpan.FromTicks(positionTicks).TotalMinutes; var minOut = TimeSpan.FromTicks(runtimeTicks - positionTicks).TotalMinutes; -- cgit v1.2.3