diff options
Diffstat (limited to 'MediaBrowser.Controller/Library')
| -rw-r--r-- | MediaBrowser.Controller/Library/IDirectStreamProvider.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/IUserDataManager.cs | 39 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/IUserManager.cs | 3 |
3 files changed, 17 insertions, 27 deletions
diff --git a/MediaBrowser.Controller/Library/IDirectStreamProvider.cs b/MediaBrowser.Controller/Library/IDirectStreamProvider.cs index 96f8b7eba..2dad58f6e 100644 --- a/MediaBrowser.Controller/Library/IDirectStreamProvider.cs +++ b/MediaBrowser.Controller/Library/IDirectStreamProvider.cs @@ -1,4 +1,4 @@ -using System.IO; +using System.IO; namespace MediaBrowser.Controller.Library { diff --git a/MediaBrowser.Controller/Library/IUserDataManager.cs b/MediaBrowser.Controller/Library/IUserDataManager.cs index 43cccfc65..f36fd393f 100644 --- a/MediaBrowser.Controller/Library/IUserDataManager.cs +++ b/MediaBrowser.Controller/Library/IUserDataManager.cs @@ -1,7 +1,3 @@ -#nullable disable - -#pragma warning disable CA1002, CA1707, CS1591 - using System; using System.Collections.Generic; using System.Threading; @@ -21,18 +17,16 @@ namespace MediaBrowser.Controller.Library /// <summary> /// Occurs when [user data saved]. /// </summary> - event EventHandler<UserDataSaveEventArgs> UserDataSaved; + event EventHandler<UserDataSaveEventArgs>? UserDataSaved; /// <summary> /// Saves the user data. /// </summary> - /// <param name="userId">The user id.</param> + /// <param name="user">The user.</param> /// <param name="item">The item.</param> /// <param name="userData">The user data.</param> /// <param name="reason">The reason.</param> /// <param name="cancellationToken">The cancellation token.</param> - void SaveUserData(Guid userId, BaseItem item, UserItemData userData, UserDataSaveReason reason, CancellationToken cancellationToken); - void SaveUserData(User user, BaseItem item, UserItemData userData, UserDataSaveReason reason, CancellationToken cancellationToken); /// <summary> @@ -44,10 +38,14 @@ namespace MediaBrowser.Controller.Library /// <param name="reason">The reason.</param> void SaveUserData(User user, BaseItem item, UpdateUserItemDataDto userDataDto, UserDataSaveReason reason); + /// <summary> + /// Gets the user data. + /// </summary> + /// <param name="user">User to use.</param> + /// <param name="item">Item to use.</param> + /// <returns>User data.</returns> UserItemData GetUserData(User user, BaseItem item); - UserItemData GetUserData(Guid userId, BaseItem item); - /// <summary> /// Gets the user data dto. /// </summary> @@ -56,22 +54,15 @@ namespace MediaBrowser.Controller.Library /// <returns>User data dto.</returns> UserItemDataDto GetUserDataDto(BaseItem item, User user); - UserItemDataDto GetUserDataDto(BaseItem item, BaseItemDto itemDto, User user, DtoOptions options); - /// <summary> - /// Get all user data for the given user. - /// </summary> - /// <param name="userId">The user id.</param> - /// <returns>The user item data.</returns> - List<UserItemData> GetAllUserData(Guid userId); - - /// <summary> - /// Save the all provided user data for the given user. + /// Gets the user data dto. /// </summary> - /// <param name="userId">The user id.</param> - /// <param name="userData">The array of user data.</param> - /// <param name="cancellationToken">The cancellation token.</param> - void SaveAllUserData(Guid userId, UserItemData[] userData, CancellationToken cancellationToken); + /// <param name="item">Item to use.</param> + /// <param name="itemDto">Item dto to use.</param> + /// <param name="user">User to use.</param> + /// <param name="options">Dto options to use.</param> + /// <returns>User data dto.</returns> + UserItemDataDto GetUserDataDto(BaseItem item, BaseItemDto? itemDto, User user, DtoOptions options); /// <summary> /// Updates playstate for an item and returns true or false indicating if it was played to completion. diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs index 6d6a532db..1c115be85 100644 --- a/MediaBrowser.Controller/Library/IUserManager.cs +++ b/MediaBrowser.Controller/Library/IUserManager.cs @@ -117,11 +117,10 @@ namespace MediaBrowser.Controller.Library /// </summary> /// <param name="username">The user.</param> /// <param name="password">The password to use.</param> - /// <param name="passwordSha1">Hash of password.</param> /// <param name="remoteEndPoint">Remove endpoint to use.</param> /// <param name="isUserSession">Specifies if a user session.</param> /// <returns>User wrapped in awaitable task.</returns> - Task<User?> AuthenticateUser(string username, string password, string passwordSha1, string remoteEndPoint, bool isUserSession); + Task<User?> AuthenticateUser(string username, string password, string remoteEndPoint, bool isUserSession); /// <summary> /// Starts the forgot password process. |