diff options
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ItemsService.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 23 | ||||
| -rw-r--r-- | MediaBrowser.Installer/Code/ShellLinkNative.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Model/DTO/ItemFilter.cs | 6 |
5 files changed, 4 insertions, 41 deletions
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 86c5169f2..951a63b4e 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -339,9 +339,6 @@ namespace MediaBrowser.Api.UserLibrary return userdata != null && userdata.PlayCount > 0; }); - case ItemFilter.IsRecentlyPlayed: - return items.Where(item => item.IsRecentlyPlayed(user)); - case ItemFilter.IsUnplayed: return items.Where(item => { diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index f90044d8b..cc3ec5c2a 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1005,29 +1005,6 @@ namespace MediaBrowser.Controller.Entities } /// <summary> - /// Determines if the item is considered recently played on user settings - /// </summary> - /// <param name="user">The user.</param> - /// <returns><c>true</c> if [is recently played] [the specified user]; otherwise, <c>false</c>.</returns> - /// <exception cref="System.ArgumentNullException"></exception> - public bool IsRecentlyPlayed(User user) - { - if (user == null) - { - throw new ArgumentNullException(); - } - - var data = GetUserData(user, false); - - if (data == null || data.LastPlayedDate == null || data.PlayCount == 0) - { - return false; - } - - return (DateTime.UtcNow - data.LastPlayedDate.Value).TotalDays < ConfigurationManager.Configuration.RecentlyPlayedDays; - } - - /// <summary> /// Adds people to the item /// </summary> /// <param name="people">The people.</param> diff --git a/MediaBrowser.Installer/Code/ShellLinkNative.cs b/MediaBrowser.Installer/Code/ShellLinkNative.cs index 20e0bc6c3..d603fe3a5 100644 --- a/MediaBrowser.Installer/Code/ShellLinkNative.cs +++ b/MediaBrowser.Installer/Code/ShellLinkNative.cs @@ -19,8 +19,9 @@ **************************************************************************/ using System; -using System.Text; using System.Runtime.InteropServices; +using System.Text; +using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME; namespace MediaBrowser.Installer.Code { @@ -47,7 +48,7 @@ namespace MediaBrowser.Installer.Code SLGP_RAWPATH = 0x4 } - [StructLayoutAttribute(LayoutKind.Sequential, CharSet=CharSet.Ansi)] + [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)] public struct WIN32_FIND_DATAA { public int dwFileAttributes; diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 0ddafe19a..8e0425447 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -225,13 +225,6 @@ namespace MediaBrowser.Model.Configuration public int RecentItemDays { get; set; } /// <summary> - /// Gets or sets the recently played days. - /// </summary> - /// <value>The recently played days.</value> - [ProtoMember(35)] - public int RecentlyPlayedDays { get; set; } - - /// <summary> /// Gets or sets the minimum percentage of an item that must be played in order for playstate to be updated. /// </summary> /// <value>The min resume PCT.</value> @@ -291,7 +284,6 @@ namespace MediaBrowser.Model.Configuration FileWatcherDelay = 8; RecentItemDays = 14; - RecentlyPlayedDays = 14; EnableInternetProviders = true; //initial installs will need these InternetProviderExcludeTypes = new string[] { }; diff --git a/MediaBrowser.Model/DTO/ItemFilter.cs b/MediaBrowser.Model/DTO/ItemFilter.cs index cdf390020..038acc587 100644 --- a/MediaBrowser.Model/DTO/ItemFilter.cs +++ b/MediaBrowser.Model/DTO/ItemFilter.cs @@ -33,10 +33,6 @@ namespace MediaBrowser.Model.Dto /// <summary> /// The item is resumable /// </summary> - IsResumable = 7, - /// <summary> - /// The item is recently played - /// </summary> - IsRecentlyPlayed = 8 + IsResumable = 7 } } |