Clean up User.cs

This commit is contained in:
Patrick Barron 2020-09-01 11:09:08 -04:00
parent e56e2632d1
commit 732ec7a462
1 changed files with 4 additions and 45 deletions

View File

@ -1,5 +1,3 @@
#pragma warning disable CS1591
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
@ -15,7 +13,7 @@ namespace Jellyfin.Data.Entities
/// <summary> /// <summary>
/// An entity representing a user. /// An entity representing a user.
/// </summary> /// </summary>
public partial class User : IHasPermissions, IHasConcurrencyToken public class User : IHasPermissions, IHasConcurrencyToken
{ {
/// <summary> /// <summary>
/// The values being delimited here are Guids, so commas work as they do not appear in Guids. /// The values being delimited here are Guids, so commas work as they do not appear in Guids.
@ -75,7 +73,6 @@ namespace Jellyfin.Data.Entities
AddDefaultPermissions(); AddDefaultPermissions();
AddDefaultPreferences(); AddDefaultPreferences();
Init();
} }
/// <summary> /// <summary>
@ -84,21 +81,14 @@ namespace Jellyfin.Data.Entities
/// </summary> /// </summary>
protected User() protected User()
{ {
Init();
} }
/*************************************************************************
* Properties
*************************************************************************/
/// <summary> /// <summary>
/// Gets or sets the Id of the user. /// Gets or sets the Id of the user.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Identity, Indexed, Required. /// Identity, Indexed, Required.
/// </remarks> /// </remarks>
[Key]
[Required]
[JsonIgnore] [JsonIgnore]
public Guid Id { get; set; } public Guid Id { get; set; }
@ -139,7 +129,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public bool MustUpdatePassword { get; set; } public bool MustUpdatePassword { get; set; }
/// <summary> /// <summary>
@ -180,7 +169,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public int InvalidLoginAttemptCount { get; set; } public int InvalidLoginAttemptCount { get; set; }
/// <summary> /// <summary>
@ -204,7 +192,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public SubtitlePlaybackMode SubtitleMode { get; set; } public SubtitlePlaybackMode SubtitleMode { get; set; }
/// <summary> /// <summary>
@ -213,7 +200,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public bool PlayDefaultAudioTrack { get; set; } public bool PlayDefaultAudioTrack { get; set; }
/// <summary> /// <summary>
@ -232,7 +218,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public bool DisplayMissingEpisodes { get; set; } public bool DisplayMissingEpisodes { get; set; }
/// <summary> /// <summary>
@ -241,7 +226,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public bool DisplayCollectionsView { get; set; } public bool DisplayCollectionsView { get; set; }
/// <summary> /// <summary>
@ -250,7 +234,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public bool EnableLocalPassword { get; set; } public bool EnableLocalPassword { get; set; }
/// <summary> /// <summary>
@ -259,7 +242,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public bool HidePlayedInLatest { get; set; } public bool HidePlayedInLatest { get; set; }
/// <summary> /// <summary>
@ -268,7 +250,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public bool RememberAudioSelections { get; set; } public bool RememberAudioSelections { get; set; }
/// <summary> /// <summary>
@ -277,7 +258,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public bool RememberSubtitleSelections { get; set; } public bool RememberSubtitleSelections { get; set; }
/// <summary> /// <summary>
@ -286,7 +266,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public bool EnableNextEpisodeAutoPlay { get; set; } public bool EnableNextEpisodeAutoPlay { get; set; }
/// <summary> /// <summary>
@ -295,7 +274,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public bool EnableAutoLogin { get; set; } public bool EnableAutoLogin { get; set; }
/// <summary> /// <summary>
@ -304,7 +282,6 @@ namespace Jellyfin.Data.Entities
/// <remarks> /// <remarks>
/// Required. /// Required.
/// </remarks> /// </remarks>
[Required]
public bool EnableUserPreferenceAccess { get; set; } public bool EnableUserPreferenceAccess { get; set; }
/// <summary> /// <summary>
@ -322,7 +299,6 @@ namespace Jellyfin.Data.Entities
/// This is a temporary stopgap for until the library db is migrated. /// This is a temporary stopgap for until the library db is migrated.
/// This corresponds to the value of the index of this user in the library db. /// This corresponds to the value of the index of this user in the library db.
/// </summary> /// </summary>
[Required]
public long InternalId { get; set; } public long InternalId { get; set; }
/// <summary> /// <summary>
@ -340,7 +316,9 @@ namespace Jellyfin.Data.Entities
[Required] [Required]
public virtual DisplayPreferences DisplayPreferences { get; set; } public virtual DisplayPreferences DisplayPreferences { get; set; }
[Required] /// <summary>
/// Gets or sets the level of sync play permissions this user has.
/// </summary>
public SyncPlayAccess SyncPlayAccess { get; set; } public SyncPlayAccess SyncPlayAccess { get; set; }
/// <summary> /// <summary>
@ -350,13 +328,8 @@ namespace Jellyfin.Data.Entities
/// Required, Concurrency Token. /// Required, Concurrency Token.
/// </remarks> /// </remarks>
[ConcurrencyCheck] [ConcurrencyCheck]
[Required]
public uint RowVersion { get; set; } public uint RowVersion { get; set; }
/*************************************************************************
* Navigation properties
*************************************************************************/
/// <summary> /// <summary>
/// Gets or sets the list of access schedules this user has. /// Gets or sets the list of access schedules this user has.
/// </summary> /// </summary>
@ -395,18 +368,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("Preference_Preferences_Guid")] [ForeignKey("Preference_Preferences_Guid")]
public virtual ICollection<Preference> Preferences { get; protected set; } public virtual ICollection<Preference> Preferences { get; protected set; }
/// <summary>
/// Static create function (for use in LINQ queries, etc.)
/// </summary>
/// <param name="username">The username for the created user.</param>
/// <param name="authenticationProviderId">The Id of the user's authentication provider.</param>
/// <param name="passwordResetProviderId">The Id of the user's password reset provider.</param>
/// <returns>The created instance.</returns>
public static User Create(string username, string authenticationProviderId, string passwordResetProviderId)
{
return new User(username, authenticationProviderId, passwordResetProviderId);
}
/// <inheritdoc/> /// <inheritdoc/>
public void OnSavingChanges() public void OnSavingChanges()
{ {
@ -519,7 +480,5 @@ namespace Jellyfin.Data.Entities
Preferences.Add(new Preference(val, string.Empty)); Preferences.Add(new Preference(val, string.Empty));
} }
} }
partial void Init();
} }
} }