Przeglądaj źródła

Clean up generated code

Patrick Barron 5 lat temu
rodzic
commit
2b41f8ab63
52 zmienionych plików z 6093 dodań i 6456 usunięć
  1. 180 186
      Jellyfin.Data/Entities/Artwork.cs
  2. 50 59
      Jellyfin.Data/Entities/Book.cs
  3. 94 105
      Jellyfin.Data/Entities/BookMetadata.cs
  4. 224 229
      Jellyfin.Data/Entities/Chapter.cs
  5. 98 103
      Jellyfin.Data/Entities/Collection.cs
  6. 134 136
      Jellyfin.Data/Entities/CollectionItem.cs
  7. 127 132
      Jellyfin.Data/Entities/Company.cs
  8. 200 211
      Jellyfin.Data/Entities/CompanyMetadata.cs
  9. 49 60
      Jellyfin.Data/Entities/CustomItem.cs
  10. 51 62
      Jellyfin.Data/Entities/CustomItemMetadata.cs
  11. 99 110
      Jellyfin.Data/Entities/Episode.cs
  12. 165 176
      Jellyfin.Data/Entities/EpisodeMetadata.cs
  13. 138 143
      Jellyfin.Data/Entities/Genre.cs
  14. 101 102
      Jellyfin.Data/Entities/Group.cs
  15. 133 138
      Jellyfin.Data/Entities/Library.cs
  16. 157 161
      Jellyfin.Data/Entities/LibraryItem.cs
  17. 179 183
      Jellyfin.Data/Entities/LibraryRoot.cs
  18. 182 186
      Jellyfin.Data/Entities/MediaFile.cs
  19. 135 140
      Jellyfin.Data/Entities/MediaFileStream.cs
  20. 348 348
      Jellyfin.Data/Entities/Metadata.cs
  21. 133 138
      Jellyfin.Data/Entities/MetadataProvider.cs
  22. 168 172
      Jellyfin.Data/Entities/MetadataProviderId.cs
  23. 50 59
      Jellyfin.Data/Entities/Movie.cs
  24. 205 216
      Jellyfin.Data/Entities/MovieMetadata.cs
  25. 50 60
      Jellyfin.Data/Entities/MusicAlbum.cs
  26. 170 180
      Jellyfin.Data/Entities/MusicAlbumMetadata.cs
  27. 133 137
      Jellyfin.Data/Entities/Permission.cs
  28. 0 40
      Jellyfin.Data/Entities/PermissionKind.cs
  29. 257 262
      Jellyfin.Data/Entities/Person.cs
  30. 189 190
      Jellyfin.Data/Entities/PersonRole.cs
  31. 50 60
      Jellyfin.Data/Entities/Photo.cs
  32. 51 62
      Jellyfin.Data/Entities/PhotoMetadata.cs
  33. 100 104
      Jellyfin.Data/Entities/Preference.cs
  34. 0 27
      Jellyfin.Data/Entities/PreferenceKind.cs
  35. 116 120
      Jellyfin.Data/Entities/ProviderMapping.cs
  36. 174 178
      Jellyfin.Data/Entities/Rating.cs
  37. 216 221
      Jellyfin.Data/Entities/RatingSource.cs
  38. 176 180
      Jellyfin.Data/Entities/Release.cs
  39. 99 109
      Jellyfin.Data/Entities/Season.cs
  40. 95 106
      Jellyfin.Data/Entities/SeasonMetadata.cs
  41. 151 161
      Jellyfin.Data/Entities/Series.cs
  42. 205 216
      Jellyfin.Data/Entities/SeriesMetadata.cs
  43. 99 108
      Jellyfin.Data/Entities/Track.cs
  44. 51 62
      Jellyfin.Data/Entities/TrackMetadata.cs
  45. 227 229
      Jellyfin.Data/Entities/User.cs
  46. 8 20
      Jellyfin.Data/Enums/ArtKind.cs
  47. 8 20
      Jellyfin.Data/Enums/MediaFileKind.cs
  48. 28 0
      Jellyfin.Data/Enums/PermissionKind.cs
  49. 15 27
      Jellyfin.Data/Enums/PersonRoleType.cs
  50. 15 0
      Jellyfin.Data/Enums/PreferenceKind.cs
  51. 10 22
      Jellyfin.Data/Enums/Weekday.cs
  52. 0 0
      Jellyfin.Data/Structs/.gitkeep

+ 180 - 186
Jellyfin.Data/Entities/Artwork.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,188 +9,194 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Artwork
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Artwork()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Artwork CreateArtworkUnsafe()
-      {
-         return new Artwork();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="path"></param>
-      /// <param name="kind"></param>
-      /// <param name="_metadata0"></param>
-      /// <param name="_personrole1"></param>
-      public Artwork(string path, global::Jellyfin.Data.Enums.ArtKind kind, global::Jellyfin.Data.Entities.Metadata _metadata0, global::Jellyfin.Data.Entities.PersonRole _personrole1)
-      {
-         if (string.IsNullOrEmpty(path)) throw new ArgumentNullException(nameof(path));
-         this.Path = path;
-
-         this.Kind = kind;
-
-         if (_metadata0 == null) throw new ArgumentNullException(nameof(_metadata0));
-         _metadata0.Artwork.Add(this);
-
-         if (_personrole1 == null) throw new ArgumentNullException(nameof(_personrole1));
-         _personrole1.Artwork = this;
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="path"></param>
-      /// <param name="kind"></param>
-      /// <param name="_metadata0"></param>
-      /// <param name="_personrole1"></param>
-      public static Artwork Create(string path, global::Jellyfin.Data.Enums.ArtKind kind, global::Jellyfin.Data.Entities.Metadata _metadata0, global::Jellyfin.Data.Entities.PersonRole _personrole1)
-      {
-         return new Artwork(path, kind, _metadata0, _personrole1);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Artwork")]
+    public partial class Artwork
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Artwork()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Artwork CreateArtworkUnsafe()
+        {
+            return new Artwork();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="kind"></param>
+        /// <param name="_metadata0"></param>
+        /// <param name="_personrole1"></param>
+        public Artwork(string path, Enums.ArtKind kind, Metadata _metadata0, PersonRole _personrole1)
+        {
+            if (string.IsNullOrEmpty(path)) throw new ArgumentNullException(nameof(path));
+            this.Path = path;
+
+            this.Kind = kind;
+
+            if (_metadata0 == null) throw new ArgumentNullException(nameof(_metadata0));
+            _metadata0.Artwork.Add(this);
+
+            if (_personrole1 == null) throw new ArgumentNullException(nameof(_personrole1));
+            _personrole1.Artwork = this;
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="kind"></param>
+        /// <param name="_metadata0"></param>
+        /// <param name="_personrole1"></param>
+        public static Artwork Create(string path, Enums.ArtKind kind, Metadata _metadata0, PersonRole _personrole1)
+        {
+            return new Artwork(path, kind, _metadata0, _personrole1);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
+            {
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for Path
+        /// </summary>
+        protected string _Path;
+        /// <summary>
+        /// When provided in a partial class, allows value of Path to be changed before setting.
+        /// </summary>
+        partial void SetPath(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Path to be changed before returning.
+        /// </summary>
+        partial void GetPath(ref string result);
+
+        /// <summary>
+        /// Required, Max length = 65535
+        /// </summary>
+        [Required]
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string Path
+        {
+            get
+            {
+                string value = _Path;
+                GetPath(ref value);
+                return (_Path = value);
+            }
+            set
             {
             {
-               _Id = value;
+                string oldValue = _Path;
+                SetPath(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Path = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Path
-      /// </summary>
-      protected string _Path;
-      /// <summary>
-      /// When provided in a partial class, allows value of Path to be changed before setting.
-      /// </summary>
-      partial void SetPath(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Path to be changed before returning.
-      /// </summary>
-      partial void GetPath(ref string result);
-
-      /// <summary>
-      /// Required, Max length = 65535
-      /// </summary>
-      [Required]
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string Path
-      {
-         get
-         {
-            string value = _Path;
-            GetPath(ref value);
-            return (_Path = value);
-         }
-         set
-         {
-            string oldValue = _Path;
-            SetPath(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Kind
+        /// </summary>
+        internal Enums.ArtKind _Kind;
+        /// <summary>
+        /// When provided in a partial class, allows value of Kind to be changed before setting.
+        /// </summary>
+        partial void SetKind(Enums.ArtKind oldValue, ref Enums.ArtKind newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Kind to be changed before returning.
+        /// </summary>
+        partial void GetKind(ref Enums.ArtKind result);
+
+        /// <summary>
+        /// Indexed, Required
+        /// </summary>
+        [Required]
+        public Enums.ArtKind Kind
+        {
+            get
             {
             {
-               _Path = value;
+                Enums.ArtKind value = _Kind;
+                GetKind(ref value);
+                return (_Kind = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Kind
-      /// </summary>
-      internal global::Jellyfin.Data.Enums.ArtKind _Kind;
-      /// <summary>
-      /// When provided in a partial class, allows value of Kind to be changed before setting.
-      /// </summary>
-      partial void SetKind(global::Jellyfin.Data.Enums.ArtKind oldValue, ref global::Jellyfin.Data.Enums.ArtKind newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Kind to be changed before returning.
-      /// </summary>
-      partial void GetKind(ref global::Jellyfin.Data.Enums.ArtKind result);
-
-      /// <summary>
-      /// Indexed, Required
-      /// </summary>
-      [Required]
-      public global::Jellyfin.Data.Enums.ArtKind Kind
-      {
-         get
-         {
-            global::Jellyfin.Data.Enums.ArtKind value = _Kind;
-            GetKind(ref value);
-            return (_Kind = value);
-         }
-         set
-         {
-            global::Jellyfin.Data.Enums.ArtKind oldValue = _Kind;
-            SetKind(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Kind = value;
+                Enums.ArtKind oldValue = _Kind;
+                SetKind(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Kind = value;
+                }
             }
             }
-         }
-      }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 50 - 59
Jellyfin.Data/Entities/Book.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,64 +9,67 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Book: global::Jellyfin.Data.Entities.LibraryItem
-   {
-      partial void Init();
+    [Table("Book")]
+    public partial class Book : LibraryItem
+    {
+        partial void Init();
 
 
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Book(): base()
-      {
-         BookMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.BookMetadata>();
-         Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Book() : base()
+        {
+            BookMetadata = new HashSet<BookMetadata>();
+            Releases = new HashSet<Release>();
 
 
-         Init();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Book CreateBookUnsafe()
-      {
-         return new Book();
-      }
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Book CreateBookUnsafe()
+        {
+            return new Book();
+        }
 
 
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public Book(Guid urlid, DateTime dateadded)
-      {
-         this.UrlId = urlid;
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public Book(Guid urlid, DateTime dateadded)
+        {
+            this.UrlId = urlid;
 
 
-         this.BookMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.BookMetadata>();
-         this.Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
+            this.BookMetadata = new HashSet<BookMetadata>();
+            this.Releases = new HashSet<Release>();
 
 
-         Init();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public static Book Create(Guid urlid, DateTime dateadded)
-      {
-         return new Book(urlid, dateadded);
-      }
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public static Book Create(Guid urlid, DateTime dateadded)
+        {
+            return new Book(urlid, dateadded);
+        }
 
 
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.BookMetadata> BookMetadata { get; protected set; }
+        [ForeignKey("BookMetadata_BookMetadata_Id")]
+        public virtual ICollection<BookMetadata> BookMetadata { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Release> Releases { get; protected set; }
+        [ForeignKey("Release_Releases_Id")]
+        public virtual ICollection<Release> Releases { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 94 - 105
Jellyfin.Data/Entities/BookMetadata.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,103 +9,104 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class BookMetadata: global::Jellyfin.Data.Entities.Metadata
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected BookMetadata(): base()
-      {
-         Publishers = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Company>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static BookMetadata CreateBookMetadataUnsafe()
-      {
-         return new BookMetadata();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_book0"></param>
-      public BookMetadata(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Book _book0)
-      {
-         if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
-         this.Title = title;
-
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
-
-         if (_book0 == null) throw new ArgumentNullException(nameof(_book0));
-         _book0.BookMetadata.Add(this);
-
-         this.Publishers = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Company>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_book0"></param>
-      public static BookMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Book _book0)
-      {
-         return new BookMetadata(title, language, dateadded, datemodified, _book0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for ISBN
-      /// </summary>
-      protected long? _ISBN;
-      /// <summary>
-      /// When provided in a partial class, allows value of ISBN to be changed before setting.
-      /// </summary>
-      partial void SetISBN(long? oldValue, ref long? newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of ISBN to be changed before returning.
-      /// </summary>
-      partial void GetISBN(ref long? result);
-
-      public long? ISBN
-      {
-         get
-         {
-            long? value = _ISBN;
-            GetISBN(ref value);
-            return (_ISBN = value);
-         }
-         set
-         {
-            long? oldValue = _ISBN;
-            SetISBN(oldValue, ref value);
-            if (oldValue != value)
+    public partial class BookMetadata : Metadata
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected BookMetadata() : base()
+        {
+            Publishers = new HashSet<Company>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static BookMetadata CreateBookMetadataUnsafe()
+        {
+            return new BookMetadata();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_book0"></param>
+        public BookMetadata(string title, string language, DateTime dateadded, DateTime datemodified, Book _book0)
+        {
+            if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
+            this.Title = title;
+
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
+
+            if (_book0 == null) throw new ArgumentNullException(nameof(_book0));
+            _book0.BookMetadata.Add(this);
+
+            this.Publishers = new HashSet<Company>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_book0"></param>
+        public static BookMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, Book _book0)
+        {
+            return new BookMetadata(title, language, dateadded, datemodified, _book0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for ISBN
+        /// </summary>
+        protected long? _ISBN;
+        /// <summary>
+        /// When provided in a partial class, allows value of ISBN to be changed before setting.
+        /// </summary>
+        partial void SetISBN(long? oldValue, ref long? newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of ISBN to be changed before returning.
+        /// </summary>
+        partial void GetISBN(ref long? result);
+
+        public long? ISBN
+        {
+            get
+            {
+                long? value = _ISBN;
+                GetISBN(ref value);
+                return (_ISBN = value);
+            }
+            set
             {
             {
-               _ISBN = value;
+                long? oldValue = _ISBN;
+                SetISBN(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _ISBN = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Company> Publishers { get; protected set; }
+        [ForeignKey("Company_Publishers_Id")]
+        public virtual ICollection<Company> Publishers { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 224 - 229
Jellyfin.Data/Entities/Chapter.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,254 +9,261 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Chapter
-   {
-      partial void Init();
+    [Table("Chapter")]
+    public partial class Chapter
+    {
+        partial void Init();
 
 
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Chapter()
-      {
-         Init();
-      }
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Chapter()
+        {
+            Init();
+        }
 
 
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Chapter CreateChapterUnsafe()
-      {
-         return new Chapter();
-      }
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Chapter CreateChapterUnsafe()
+        {
+            return new Chapter();
+        }
 
 
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="timestart"></param>
-      /// <param name="_release0"></param>
-      public Chapter(string language, long timestart, global::Jellyfin.Data.Entities.Release _release0)
-      {
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="timestart"></param>
+        /// <param name="_release0"></param>
+        public Chapter(string language, long timestart, Release _release0)
+        {
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
 
 
-         this.TimeStart = timestart;
+            this.TimeStart = timestart;
 
 
-         if (_release0 == null) throw new ArgumentNullException(nameof(_release0));
-         _release0.Chapters.Add(this);
+            if (_release0 == null) throw new ArgumentNullException(nameof(_release0));
+            _release0.Chapters.Add(this);
 
 
 
 
-         Init();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="timestart"></param>
-      /// <param name="_release0"></param>
-      public static Chapter Create(string language, long timestart, global::Jellyfin.Data.Entities.Release _release0)
-      {
-         return new Chapter(language, timestart, _release0);
-      }
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="timestart"></param>
+        /// <param name="_release0"></param>
+        public static Chapter Create(string language, long timestart, Release _release0)
+        {
+            return new Chapter(language, timestart, _release0);
+        }
 
 
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
 
 
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
 
 
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
             {
             {
-               _Id = value;
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /// <summary>
-      /// Backing field for Name
-      /// </summary>
-      protected string _Name;
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before setting.
-      /// </summary>
-      partial void SetName(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before returning.
-      /// </summary>
-      partial void GetName(ref string result);
+        /// <summary>
+        /// Backing field for Name
+        /// </summary>
+        protected string _Name;
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before setting.
+        /// </summary>
+        partial void SetName(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before returning.
+        /// </summary>
+        partial void GetName(ref string result);
 
 
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Name
-      {
-         get
-         {
-            string value = _Name;
-            GetName(ref value);
-            return (_Name = value);
-         }
-         set
-         {
-            string oldValue = _Name;
-            SetName(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Name
+        {
+            get
             {
             {
-               _Name = value;
+                string value = _Name;
+                GetName(ref value);
+                return (_Name = value);
             }
             }
-         }
-      }
+            set
+            {
+                string oldValue = _Name;
+                SetName(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Name = value;
+                }
+            }
+        }
 
 
-      /// <summary>
-      /// Backing field for Language
-      /// </summary>
-      protected string _Language;
-      /// <summary>
-      /// When provided in a partial class, allows value of Language to be changed before setting.
-      /// </summary>
-      partial void SetLanguage(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Language to be changed before returning.
-      /// </summary>
-      partial void GetLanguage(ref string result);
+        /// <summary>
+        /// Backing field for Language
+        /// </summary>
+        protected string _Language;
+        /// <summary>
+        /// When provided in a partial class, allows value of Language to be changed before setting.
+        /// </summary>
+        partial void SetLanguage(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Language to be changed before returning.
+        /// </summary>
+        partial void GetLanguage(ref string result);
 
 
-      /// <summary>
-      /// Required, Min length = 3, Max length = 3
-      /// ISO-639-3 3-character language codes
-      /// </summary>
-      [Required]
-      [MinLength(3)]
-      [MaxLength(3)]
-      [StringLength(3)]
-      public string Language
-      {
-         get
-         {
-            string value = _Language;
-            GetLanguage(ref value);
-            return (_Language = value);
-         }
-         set
-         {
-            string oldValue = _Language;
-            SetLanguage(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Required, Min length = 3, Max length = 3
+        /// ISO-639-3 3-character language codes
+        /// </summary>
+        [Required]
+        [MinLength(3)]
+        [MaxLength(3)]
+        [StringLength(3)]
+        public string Language
+        {
+            get
+            {
+                string value = _Language;
+                GetLanguage(ref value);
+                return (_Language = value);
+            }
+            set
             {
             {
-               _Language = value;
+                string oldValue = _Language;
+                SetLanguage(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Language = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /// <summary>
-      /// Backing field for TimeStart
-      /// </summary>
-      protected long _TimeStart;
-      /// <summary>
-      /// When provided in a partial class, allows value of TimeStart to be changed before setting.
-      /// </summary>
-      partial void SetTimeStart(long oldValue, ref long newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of TimeStart to be changed before returning.
-      /// </summary>
-      partial void GetTimeStart(ref long result);
+        /// <summary>
+        /// Backing field for TimeStart
+        /// </summary>
+        protected long _TimeStart;
+        /// <summary>
+        /// When provided in a partial class, allows value of TimeStart to be changed before setting.
+        /// </summary>
+        partial void SetTimeStart(long oldValue, ref long newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of TimeStart to be changed before returning.
+        /// </summary>
+        partial void GetTimeStart(ref long result);
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public long TimeStart
-      {
-         get
-         {
-            long value = _TimeStart;
-            GetTimeStart(ref value);
-            return (_TimeStart = value);
-         }
-         set
-         {
-            long oldValue = _TimeStart;
-            SetTimeStart(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public long TimeStart
+        {
+            get
+            {
+                long value = _TimeStart;
+                GetTimeStart(ref value);
+                return (_TimeStart = value);
+            }
+            set
             {
             {
-               _TimeStart = value;
+                long oldValue = _TimeStart;
+                SetTimeStart(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _TimeStart = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /// <summary>
-      /// Backing field for TimeEnd
-      /// </summary>
-      protected long? _TimeEnd;
-      /// <summary>
-      /// When provided in a partial class, allows value of TimeEnd to be changed before setting.
-      /// </summary>
-      partial void SetTimeEnd(long? oldValue, ref long? newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of TimeEnd to be changed before returning.
-      /// </summary>
-      partial void GetTimeEnd(ref long? result);
+        /// <summary>
+        /// Backing field for TimeEnd
+        /// </summary>
+        protected long? _TimeEnd;
+        /// <summary>
+        /// When provided in a partial class, allows value of TimeEnd to be changed before setting.
+        /// </summary>
+        partial void SetTimeEnd(long? oldValue, ref long? newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of TimeEnd to be changed before returning.
+        /// </summary>
+        partial void GetTimeEnd(ref long? result);
 
 
-      public long? TimeEnd
-      {
-         get
-         {
-            long? value = _TimeEnd;
-            GetTimeEnd(ref value);
-            return (_TimeEnd = value);
-         }
-         set
-         {
-            long? oldValue = _TimeEnd;
-            SetTimeEnd(oldValue, ref value);
-            if (oldValue != value)
+        public long? TimeEnd
+        {
+            get
             {
             {
-               _TimeEnd = value;
+                long? value = _TimeEnd;
+                GetTimeEnd(ref value);
+                return (_TimeEnd = value);
             }
             }
-         }
-      }
+            set
+            {
+                long? oldValue = _TimeEnd;
+                SetTimeEnd(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _TimeEnd = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 98 - 103
Jellyfin.Data/Entities/Collection.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,111 +9,118 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Collection
-   {
-      partial void Init();
+    [Table("Collection")]
+    public partial class Collection
+    {
+        partial void Init();
 
 
-      /// <summary>
-      /// Default constructor
-      /// </summary>
-      public Collection()
-      {
-         CollectionItem = new System.Collections.Generic.LinkedList<global::Jellyfin.Data.Entities.CollectionItem>();
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public Collection()
+        {
+            CollectionItem = new LinkedList<CollectionItem>();
 
 
-         Init();
-      }
+            Init();
+        }
 
 
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
 
 
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
 
 
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
             {
             {
-               _Id = value;
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /// <summary>
-      /// Backing field for Name
-      /// </summary>
-      protected string _Name;
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before setting.
-      /// </summary>
-      partial void SetName(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before returning.
-      /// </summary>
-      partial void GetName(ref string result);
+        /// <summary>
+        /// Backing field for Name
+        /// </summary>
+        protected string _Name;
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before setting.
+        /// </summary>
+        partial void SetName(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before returning.
+        /// </summary>
+        partial void GetName(ref string result);
 
 
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Name
-      {
-         get
-         {
-            string value = _Name;
-            GetName(ref value);
-            return (_Name = value);
-         }
-         set
-         {
-            string oldValue = _Name;
-            SetName(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Name
+        {
+            get
+            {
+                string value = _Name;
+                GetName(ref value);
+                return (_Name = value);
+            }
+            set
             {
             {
-               _Name = value;
+                string oldValue = _Name;
+                SetName(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Name = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.CollectionItem> CollectionItem { get; protected set; }
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("CollectionItem_CollectionItem_Id")]
+        public virtual ICollection<CollectionItem> CollectionItem { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 134 - 136
Jellyfin.Data/Entities/CollectionItem.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,131 +9,141 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class CollectionItem
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected CollectionItem()
-      {
-         // NOTE: This class has one-to-one associations with CollectionItem.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static CollectionItem CreateCollectionItemUnsafe()
-      {
-         return new CollectionItem();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="_collection0"></param>
-      /// <param name="_collectionitem1"></param>
-      /// <param name="_collectionitem2"></param>
-      public CollectionItem(global::Jellyfin.Data.Entities.Collection _collection0, global::Jellyfin.Data.Entities.CollectionItem _collectionitem1, global::Jellyfin.Data.Entities.CollectionItem _collectionitem2)
-      {
-         // NOTE: This class has one-to-one associations with CollectionItem.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         if (_collection0 == null) throw new ArgumentNullException(nameof(_collection0));
-         _collection0.CollectionItem.Add(this);
-
-         if (_collectionitem1 == null) throw new ArgumentNullException(nameof(_collectionitem1));
-         _collectionitem1.Next = this;
-
-         if (_collectionitem2 == null) throw new ArgumentNullException(nameof(_collectionitem2));
-         _collectionitem2.Previous = this;
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="_collection0"></param>
-      /// <param name="_collectionitem1"></param>
-      /// <param name="_collectionitem2"></param>
-      public static CollectionItem Create(global::Jellyfin.Data.Entities.Collection _collection0, global::Jellyfin.Data.Entities.CollectionItem _collectionitem1, global::Jellyfin.Data.Entities.CollectionItem _collectionitem2)
-      {
-         return new CollectionItem(_collection0, _collectionitem1, _collectionitem2);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("CollectionItem")]
+    public partial class CollectionItem
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected CollectionItem()
+        {
+            // NOTE: This class has one-to-one associations with CollectionItem.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static CollectionItem CreateCollectionItemUnsafe()
+        {
+            return new CollectionItem();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="_collection0"></param>
+        /// <param name="_collectionitem1"></param>
+        /// <param name="_collectionitem2"></param>
+        public CollectionItem(Collection _collection0, CollectionItem _collectionitem1, CollectionItem _collectionitem2)
+        {
+            // NOTE: This class has one-to-one associations with CollectionItem.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            if (_collection0 == null) throw new ArgumentNullException(nameof(_collection0));
+            _collection0.CollectionItem.Add(this);
+
+            if (_collectionitem1 == null) throw new ArgumentNullException(nameof(_collectionitem1));
+            _collectionitem1.Next = this;
+
+            if (_collectionitem2 == null) throw new ArgumentNullException(nameof(_collectionitem2));
+            _collectionitem2.Previous = this;
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="_collection0"></param>
+        /// <param name="_collectionitem1"></param>
+        /// <param name="_collectionitem2"></param>
+        public static CollectionItem Create(Collection _collection0, CollectionItem _collectionitem1, CollectionItem _collectionitem2)
+        {
+            return new CollectionItem(_collection0, _collectionitem1, _collectionitem2);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
             {
             {
-               _Id = value;
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      public virtual global::Jellyfin.Data.Entities.LibraryItem LibraryItem { get; set; }
-
-      /// <remarks>
-      /// TODO check if this properly updated dependant and has the proper principal relationship
-      /// </remarks>
-      public virtual global::Jellyfin.Data.Entities.CollectionItem Next { get; set; }
-
-      /// <remarks>
-      /// TODO check if this properly updated dependant and has the proper principal relationship
-      /// </remarks>
-      public virtual global::Jellyfin.Data.Entities.CollectionItem Previous { get; set; }
-
-   }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [ForeignKey("LibraryItem_Id")]
+        public virtual LibraryItem LibraryItem { get; set; }
+
+        /// <remarks>
+        /// TODO check if this properly updated dependant and has the proper principal relationship
+        /// </remarks>
+        [ForeignKey("CollectionItem_Next_Id")]
+        public virtual CollectionItem Next { get; set; }
+
+        /// <remarks>
+        /// TODO check if this properly updated dependant and has the proper principal relationship
+        /// </remarks>
+        [ForeignKey("CollectionItem_Previous_Id")]
+        public virtual CollectionItem Previous { get; set; }
+
+    }
 }
 }
 
 

+ 127 - 132
Jellyfin.Data/Entities/Company.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,127 +9,134 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Company
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Company()
-      {
-         CompanyMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.CompanyMetadata>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Company CreateCompanyUnsafe()
-      {
-         return new Company();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="_moviemetadata0"></param>
-      /// <param name="_seriesmetadata1"></param>
-      /// <param name="_musicalbummetadata2"></param>
-      /// <param name="_bookmetadata3"></param>
-      /// <param name="_company4"></param>
-      public Company(global::Jellyfin.Data.Entities.MovieMetadata _moviemetadata0, global::Jellyfin.Data.Entities.SeriesMetadata _seriesmetadata1, global::Jellyfin.Data.Entities.MusicAlbumMetadata _musicalbummetadata2, global::Jellyfin.Data.Entities.BookMetadata _bookmetadata3, global::Jellyfin.Data.Entities.Company _company4)
-      {
-         if (_moviemetadata0 == null) throw new ArgumentNullException(nameof(_moviemetadata0));
-         _moviemetadata0.Studios.Add(this);
-
-         if (_seriesmetadata1 == null) throw new ArgumentNullException(nameof(_seriesmetadata1));
-         _seriesmetadata1.Networks.Add(this);
-
-         if (_musicalbummetadata2 == null) throw new ArgumentNullException(nameof(_musicalbummetadata2));
-         _musicalbummetadata2.Labels.Add(this);
-
-         if (_bookmetadata3 == null) throw new ArgumentNullException(nameof(_bookmetadata3));
-         _bookmetadata3.Publishers.Add(this);
-
-         if (_company4 == null) throw new ArgumentNullException(nameof(_company4));
-         _company4.Parent = this;
-
-         this.CompanyMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.CompanyMetadata>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="_moviemetadata0"></param>
-      /// <param name="_seriesmetadata1"></param>
-      /// <param name="_musicalbummetadata2"></param>
-      /// <param name="_bookmetadata3"></param>
-      /// <param name="_company4"></param>
-      public static Company Create(global::Jellyfin.Data.Entities.MovieMetadata _moviemetadata0, global::Jellyfin.Data.Entities.SeriesMetadata _seriesmetadata1, global::Jellyfin.Data.Entities.MusicAlbumMetadata _musicalbummetadata2, global::Jellyfin.Data.Entities.BookMetadata _bookmetadata3, global::Jellyfin.Data.Entities.Company _company4)
-      {
-         return new Company(_moviemetadata0, _seriesmetadata1, _musicalbummetadata2, _bookmetadata3, _company4);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Company")]
+    public partial class Company
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Company()
+        {
+            CompanyMetadata = new HashSet<CompanyMetadata>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Company CreateCompanyUnsafe()
+        {
+            return new Company();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="_moviemetadata0"></param>
+        /// <param name="_seriesmetadata1"></param>
+        /// <param name="_musicalbummetadata2"></param>
+        /// <param name="_bookmetadata3"></param>
+        /// <param name="_company4"></param>
+        public Company(MovieMetadata _moviemetadata0, SeriesMetadata _seriesmetadata1, MusicAlbumMetadata _musicalbummetadata2, BookMetadata _bookmetadata3, Company _company4)
+        {
+            if (_moviemetadata0 == null) throw new ArgumentNullException(nameof(_moviemetadata0));
+            _moviemetadata0.Studios.Add(this);
+
+            if (_seriesmetadata1 == null) throw new ArgumentNullException(nameof(_seriesmetadata1));
+            _seriesmetadata1.Networks.Add(this);
+
+            if (_musicalbummetadata2 == null) throw new ArgumentNullException(nameof(_musicalbummetadata2));
+            _musicalbummetadata2.Labels.Add(this);
+
+            if (_bookmetadata3 == null) throw new ArgumentNullException(nameof(_bookmetadata3));
+            _bookmetadata3.Publishers.Add(this);
+
+            if (_company4 == null) throw new ArgumentNullException(nameof(_company4));
+            _company4.Parent = this;
+
+            this.CompanyMetadata = new HashSet<CompanyMetadata>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="_moviemetadata0"></param>
+        /// <param name="_seriesmetadata1"></param>
+        /// <param name="_musicalbummetadata2"></param>
+        /// <param name="_bookmetadata3"></param>
+        /// <param name="_company4"></param>
+        public static Company Create(MovieMetadata _moviemetadata0, SeriesMetadata _seriesmetadata1, MusicAlbumMetadata _musicalbummetadata2, BookMetadata _bookmetadata3, Company _company4)
+        {
+            return new Company(_moviemetadata0, _seriesmetadata1, _musicalbummetadata2, _bookmetadata3, _company4);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
             {
             {
-               _Id = value;
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      public virtual ICollection<global::Jellyfin.Data.Entities.CompanyMetadata> CompanyMetadata { get; protected set; }
-
-      public virtual global::Jellyfin.Data.Entities.Company Parent { get; set; }
-
-   }
+            protected set
+            {
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("CompanyMetadata_CompanyMetadata_Id")]
+        public virtual ICollection<CompanyMetadata> CompanyMetadata { get; protected set; }
+        [ForeignKey("Company_Parent_Id")]
+        public virtual Company Parent { get; set; }
+
+    }
 }
 }
 
 

+ 200 - 211
Jellyfin.Data/Entities/CompanyMetadata.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,214 +9,215 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class CompanyMetadata: global::Jellyfin.Data.Entities.Metadata
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected CompanyMetadata(): base()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static CompanyMetadata CreateCompanyMetadataUnsafe()
-      {
-         return new CompanyMetadata();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_company0"></param>
-      public CompanyMetadata(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Company _company0)
-      {
-         if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
-         this.Title = title;
-
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
-
-         if (_company0 == null) throw new ArgumentNullException(nameof(_company0));
-         _company0.CompanyMetadata.Add(this);
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_company0"></param>
-      public static CompanyMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Company _company0)
-      {
-         return new CompanyMetadata(title, language, dateadded, datemodified, _company0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Description
-      /// </summary>
-      protected string _Description;
-      /// <summary>
-      /// When provided in a partial class, allows value of Description to be changed before setting.
-      /// </summary>
-      partial void SetDescription(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Description to be changed before returning.
-      /// </summary>
-      partial void GetDescription(ref string result);
-
-      /// <summary>
-      /// Max length = 65535
-      /// </summary>
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string Description
-      {
-         get
-         {
-            string value = _Description;
-            GetDescription(ref value);
-            return (_Description = value);
-         }
-         set
-         {
-            string oldValue = _Description;
-            SetDescription(oldValue, ref value);
-            if (oldValue != value)
+    [Table("CompanyMetadata")]
+    public partial class CompanyMetadata : Metadata
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected CompanyMetadata() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static CompanyMetadata CreateCompanyMetadataUnsafe()
+        {
+            return new CompanyMetadata();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_company0"></param>
+        public CompanyMetadata(string title, string language, DateTime dateadded, DateTime datemodified, Company _company0)
+        {
+            if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
+            this.Title = title;
+
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
+
+            if (_company0 == null) throw new ArgumentNullException(nameof(_company0));
+            _company0.CompanyMetadata.Add(this);
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_company0"></param>
+        public static CompanyMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, Company _company0)
+        {
+            return new CompanyMetadata(title, language, dateadded, datemodified, _company0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Description
+        /// </summary>
+        protected string _Description;
+        /// <summary>
+        /// When provided in a partial class, allows value of Description to be changed before setting.
+        /// </summary>
+        partial void SetDescription(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Description to be changed before returning.
+        /// </summary>
+        partial void GetDescription(ref string result);
+
+        /// <summary>
+        /// Max length = 65535
+        /// </summary>
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string Description
+        {
+            get
+            {
+                string value = _Description;
+                GetDescription(ref value);
+                return (_Description = value);
+            }
+            set
+            {
+                string oldValue = _Description;
+                SetDescription(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Description = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for Headquarters
+        /// </summary>
+        protected string _Headquarters;
+        /// <summary>
+        /// When provided in a partial class, allows value of Headquarters to be changed before setting.
+        /// </summary>
+        partial void SetHeadquarters(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Headquarters to be changed before returning.
+        /// </summary>
+        partial void GetHeadquarters(ref string result);
+
+        /// <summary>
+        /// Max length = 255
+        /// </summary>
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string Headquarters
+        {
+            get
+            {
+                string value = _Headquarters;
+                GetHeadquarters(ref value);
+                return (_Headquarters = value);
+            }
+            set
+            {
+                string oldValue = _Headquarters;
+                SetHeadquarters(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Headquarters = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for Country
+        /// </summary>
+        protected string _Country;
+        /// <summary>
+        /// When provided in a partial class, allows value of Country to be changed before setting.
+        /// </summary>
+        partial void SetCountry(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Country to be changed before returning.
+        /// </summary>
+        partial void GetCountry(ref string result);
+
+        /// <summary>
+        /// Max length = 2
+        /// </summary>
+        [MaxLength(2)]
+        [StringLength(2)]
+        public string Country
+        {
+            get
             {
             {
-               _Description = value;
+                string value = _Country;
+                GetCountry(ref value);
+                return (_Country = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Headquarters
-      /// </summary>
-      protected string _Headquarters;
-      /// <summary>
-      /// When provided in a partial class, allows value of Headquarters to be changed before setting.
-      /// </summary>
-      partial void SetHeadquarters(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Headquarters to be changed before returning.
-      /// </summary>
-      partial void GetHeadquarters(ref string result);
-
-      /// <summary>
-      /// Max length = 255
-      /// </summary>
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string Headquarters
-      {
-         get
-         {
-            string value = _Headquarters;
-            GetHeadquarters(ref value);
-            return (_Headquarters = value);
-         }
-         set
-         {
-            string oldValue = _Headquarters;
-            SetHeadquarters(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Headquarters = value;
+                string oldValue = _Country;
+                SetCountry(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Country = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Country
-      /// </summary>
-      protected string _Country;
-      /// <summary>
-      /// When provided in a partial class, allows value of Country to be changed before setting.
-      /// </summary>
-      partial void SetCountry(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Country to be changed before returning.
-      /// </summary>
-      partial void GetCountry(ref string result);
-
-      /// <summary>
-      /// Max length = 2
-      /// </summary>
-      [MaxLength(2)]
-      [StringLength(2)]
-      public string Country
-      {
-         get
-         {
-            string value = _Country;
-            GetCountry(ref value);
-            return (_Country = value);
-         }
-         set
-         {
-            string oldValue = _Country;
-            SetCountry(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Homepage
+        /// </summary>
+        protected string _Homepage;
+        /// <summary>
+        /// When provided in a partial class, allows value of Homepage to be changed before setting.
+        /// </summary>
+        partial void SetHomepage(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Homepage to be changed before returning.
+        /// </summary>
+        partial void GetHomepage(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Homepage
+        {
+            get
             {
             {
-               _Country = value;
+                string value = _Homepage;
+                GetHomepage(ref value);
+                return (_Homepage = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Homepage
-      /// </summary>
-      protected string _Homepage;
-      /// <summary>
-      /// When provided in a partial class, allows value of Homepage to be changed before setting.
-      /// </summary>
-      partial void SetHomepage(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Homepage to be changed before returning.
-      /// </summary>
-      partial void GetHomepage(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Homepage
-      {
-         get
-         {
-            string value = _Homepage;
-            GetHomepage(ref value);
-            return (_Homepage = value);
-         }
-         set
-         {
-            string oldValue = _Homepage;
-            SetHomepage(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Homepage = value;
+                string oldValue = _Homepage;
+                SetHomepage(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Homepage = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 49 - 60
Jellyfin.Data/Entities/CustomItem.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,64 +9,65 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class CustomItem: global::Jellyfin.Data.Entities.LibraryItem
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected CustomItem(): base()
-      {
-         CustomItemMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.CustomItemMetadata>();
-         Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
+    public partial class CustomItem : LibraryItem
+    {
+        partial void Init();
 
 
-         Init();
-      }
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected CustomItem() : base()
+        {
+            CustomItemMetadata = new HashSet<CustomItemMetadata>();
+            Releases = new HashSet<Release>();
 
 
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static CustomItem CreateCustomItemUnsafe()
-      {
-         return new CustomItem();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public CustomItem(Guid urlid, DateTime dateadded)
-      {
-         this.UrlId = urlid;
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static CustomItem CreateCustomItemUnsafe()
+        {
+            return new CustomItem();
+        }
 
 
-         this.CustomItemMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.CustomItemMetadata>();
-         this.Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public CustomItem(Guid urlid, DateTime dateadded)
+        {
+            this.UrlId = urlid;
 
 
-         Init();
-      }
+            this.CustomItemMetadata = new HashSet<CustomItemMetadata>();
+            this.Releases = new HashSet<Release>();
 
 
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public static CustomItem Create(Guid urlid, DateTime dateadded)
-      {
-         return new CustomItem(urlid, dateadded);
-      }
+            Init();
+        }
 
 
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public static CustomItem Create(Guid urlid, DateTime dateadded)
+        {
+            return new CustomItem(urlid, dateadded);
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.CustomItemMetadata> CustomItemMetadata { get; protected set; }
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("CustomItemMetadata_CustomItemMetadata_Id")]
+        public virtual ICollection<CustomItemMetadata> CustomItemMetadata { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Release> Releases { get; protected set; }
+        [ForeignKey("Release_Releases_Id")]
+        public virtual ICollection<Release> Releases { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 51 - 62
Jellyfin.Data/Entities/CustomItemMetadata.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,66 +9,67 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class CustomItemMetadata: global::Jellyfin.Data.Entities.Metadata
-   {
-      partial void Init();
+    [Table("CustomItemMetadata")]
+    public partial class CustomItemMetadata : Metadata
+    {
+        partial void Init();
 
 
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected CustomItemMetadata(): base()
-      {
-         Init();
-      }
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected CustomItemMetadata() : base()
+        {
+            Init();
+        }
 
 
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static CustomItemMetadata CreateCustomItemMetadataUnsafe()
-      {
-         return new CustomItemMetadata();
-      }
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static CustomItemMetadata CreateCustomItemMetadataUnsafe()
+        {
+            return new CustomItemMetadata();
+        }
 
 
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_customitem0"></param>
-      public CustomItemMetadata(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.CustomItem _customitem0)
-      {
-         if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
-         this.Title = title;
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_customitem0"></param>
+        public CustomItemMetadata(string title, string language, DateTime dateadded, DateTime datemodified, CustomItem _customitem0)
+        {
+            if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
+            this.Title = title;
 
 
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
 
 
-         if (_customitem0 == null) throw new ArgumentNullException(nameof(_customitem0));
-         _customitem0.CustomItemMetadata.Add(this);
+            if (_customitem0 == null) throw new ArgumentNullException(nameof(_customitem0));
+            _customitem0.CustomItemMetadata.Add(this);
 
 
 
 
-         Init();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_customitem0"></param>
-      public static CustomItemMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.CustomItem _customitem0)
-      {
-         return new CustomItemMetadata(title, language, dateadded, datemodified, _customitem0);
-      }
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_customitem0"></param>
+        public static CustomItemMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, CustomItem _customitem0)
+        {
+            return new CustomItemMetadata(title, language, dateadded, datemodified, _customitem0);
+        }
 
 
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 99 - 110
Jellyfin.Data/Entities/Episode.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,107 +9,108 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Episode: global::Jellyfin.Data.Entities.LibraryItem
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Episode(): base()
-      {
-         // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
-         EpisodeMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.EpisodeMetadata>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Episode CreateEpisodeUnsafe()
-      {
-         return new Episode();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      /// <param name="_season0"></param>
-      public Episode(Guid urlid, DateTime dateadded, global::Jellyfin.Data.Entities.Season _season0)
-      {
-         // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         this.UrlId = urlid;
-
-         if (_season0 == null) throw new ArgumentNullException(nameof(_season0));
-         _season0.Episodes.Add(this);
-
-         this.Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
-         this.EpisodeMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.EpisodeMetadata>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      /// <param name="_season0"></param>
-      public static Episode Create(Guid urlid, DateTime dateadded, global::Jellyfin.Data.Entities.Season _season0)
-      {
-         return new Episode(urlid, dateadded, _season0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for EpisodeNumber
-      /// </summary>
-      protected int? _EpisodeNumber;
-      /// <summary>
-      /// When provided in a partial class, allows value of EpisodeNumber to be changed before setting.
-      /// </summary>
-      partial void SetEpisodeNumber(int? oldValue, ref int? newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of EpisodeNumber to be changed before returning.
-      /// </summary>
-      partial void GetEpisodeNumber(ref int? result);
-
-      public int? EpisodeNumber
-      {
-         get
-         {
-            int? value = _EpisodeNumber;
-            GetEpisodeNumber(ref value);
-            return (_EpisodeNumber = value);
-         }
-         set
-         {
-            int? oldValue = _EpisodeNumber;
-            SetEpisodeNumber(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Episode")]
+    public partial class Episode : LibraryItem
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Episode() : base()
+        {
+            // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            Releases = new HashSet<Release>();
+            EpisodeMetadata = new HashSet<EpisodeMetadata>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Episode CreateEpisodeUnsafe()
+        {
+            return new Episode();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        /// <param name="_season0"></param>
+        public Episode(Guid urlid, DateTime dateadded, Season _season0)
+        {
+            // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            this.UrlId = urlid;
+
+            if (_season0 == null) throw new ArgumentNullException(nameof(_season0));
+            _season0.Episodes.Add(this);
+
+            this.Releases = new HashSet<Release>();
+            this.EpisodeMetadata = new HashSet<EpisodeMetadata>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        /// <param name="_season0"></param>
+        public static Episode Create(Guid urlid, DateTime dateadded, Season _season0)
+        {
+            return new Episode(urlid, dateadded, _season0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for EpisodeNumber
+        /// </summary>
+        protected int? _EpisodeNumber;
+        /// <summary>
+        /// When provided in a partial class, allows value of EpisodeNumber to be changed before setting.
+        /// </summary>
+        partial void SetEpisodeNumber(int? oldValue, ref int? newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of EpisodeNumber to be changed before returning.
+        /// </summary>
+        partial void GetEpisodeNumber(ref int? result);
+
+        public int? EpisodeNumber
+        {
+            get
             {
             {
-               _EpisodeNumber = value;
+                int? value = _EpisodeNumber;
+                GetEpisodeNumber(ref value);
+                return (_EpisodeNumber = value);
             }
             }
-         }
-      }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      public virtual ICollection<global::Jellyfin.Data.Entities.Release> Releases { get; protected set; }
+            set
+            {
+                int? oldValue = _EpisodeNumber;
+                SetEpisodeNumber(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _EpisodeNumber = value;
+                }
+            }
+        }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.EpisodeMetadata> EpisodeMetadata { get; protected set; }
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("Release_Releases_Id")]
+        public virtual ICollection<Release> Releases { get; protected set; }
+        [ForeignKey("EpisodeMetadata_EpisodeMetadata_Id")]
+        public virtual ICollection<EpisodeMetadata> EpisodeMetadata { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 165 - 176
Jellyfin.Data/Entities/EpisodeMetadata.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,177 +9,178 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class EpisodeMetadata: global::Jellyfin.Data.Entities.Metadata
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected EpisodeMetadata(): base()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static EpisodeMetadata CreateEpisodeMetadataUnsafe()
-      {
-         return new EpisodeMetadata();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_episode0"></param>
-      public EpisodeMetadata(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Episode _episode0)
-      {
-         if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
-         this.Title = title;
-
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
-
-         if (_episode0 == null) throw new ArgumentNullException(nameof(_episode0));
-         _episode0.EpisodeMetadata.Add(this);
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_episode0"></param>
-      public static EpisodeMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Episode _episode0)
-      {
-         return new EpisodeMetadata(title, language, dateadded, datemodified, _episode0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Outline
-      /// </summary>
-      protected string _Outline;
-      /// <summary>
-      /// When provided in a partial class, allows value of Outline to be changed before setting.
-      /// </summary>
-      partial void SetOutline(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Outline to be changed before returning.
-      /// </summary>
-      partial void GetOutline(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Outline
-      {
-         get
-         {
-            string value = _Outline;
-            GetOutline(ref value);
-            return (_Outline = value);
-         }
-         set
-         {
-            string oldValue = _Outline;
-            SetOutline(oldValue, ref value);
-            if (oldValue != value)
+    [Table("EpisodeMetadata")]
+    public partial class EpisodeMetadata : Metadata
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected EpisodeMetadata() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static EpisodeMetadata CreateEpisodeMetadataUnsafe()
+        {
+            return new EpisodeMetadata();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_episode0"></param>
+        public EpisodeMetadata(string title, string language, DateTime dateadded, DateTime datemodified, Episode _episode0)
+        {
+            if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
+            this.Title = title;
+
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
+
+            if (_episode0 == null) throw new ArgumentNullException(nameof(_episode0));
+            _episode0.EpisodeMetadata.Add(this);
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_episode0"></param>
+        public static EpisodeMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, Episode _episode0)
+        {
+            return new EpisodeMetadata(title, language, dateadded, datemodified, _episode0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Outline
+        /// </summary>
+        protected string _Outline;
+        /// <summary>
+        /// When provided in a partial class, allows value of Outline to be changed before setting.
+        /// </summary>
+        partial void SetOutline(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Outline to be changed before returning.
+        /// </summary>
+        partial void GetOutline(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Outline
+        {
+            get
+            {
+                string value = _Outline;
+                GetOutline(ref value);
+                return (_Outline = value);
+            }
+            set
+            {
+                string oldValue = _Outline;
+                SetOutline(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Outline = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for Plot
+        /// </summary>
+        protected string _Plot;
+        /// <summary>
+        /// When provided in a partial class, allows value of Plot to be changed before setting.
+        /// </summary>
+        partial void SetPlot(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Plot to be changed before returning.
+        /// </summary>
+        partial void GetPlot(ref string result);
+
+        /// <summary>
+        /// Max length = 65535
+        /// </summary>
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string Plot
+        {
+            get
+            {
+                string value = _Plot;
+                GetPlot(ref value);
+                return (_Plot = value);
+            }
+            set
             {
             {
-               _Outline = value;
+                string oldValue = _Plot;
+                SetPlot(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Plot = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Plot
-      /// </summary>
-      protected string _Plot;
-      /// <summary>
-      /// When provided in a partial class, allows value of Plot to be changed before setting.
-      /// </summary>
-      partial void SetPlot(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Plot to be changed before returning.
-      /// </summary>
-      partial void GetPlot(ref string result);
-
-      /// <summary>
-      /// Max length = 65535
-      /// </summary>
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string Plot
-      {
-         get
-         {
-            string value = _Plot;
-            GetPlot(ref value);
-            return (_Plot = value);
-         }
-         set
-         {
-            string oldValue = _Plot;
-            SetPlot(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Tagline
+        /// </summary>
+        protected string _Tagline;
+        /// <summary>
+        /// When provided in a partial class, allows value of Tagline to be changed before setting.
+        /// </summary>
+        partial void SetTagline(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Tagline to be changed before returning.
+        /// </summary>
+        partial void GetTagline(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Tagline
+        {
+            get
             {
             {
-               _Plot = value;
+                string value = _Tagline;
+                GetTagline(ref value);
+                return (_Tagline = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Tagline
-      /// </summary>
-      protected string _Tagline;
-      /// <summary>
-      /// When provided in a partial class, allows value of Tagline to be changed before setting.
-      /// </summary>
-      partial void SetTagline(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Tagline to be changed before returning.
-      /// </summary>
-      partial void GetTagline(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Tagline
-      {
-         get
-         {
-            string value = _Tagline;
-            GetTagline(ref value);
-            return (_Tagline = value);
-         }
-         set
-         {
-            string oldValue = _Tagline;
-            SetTagline(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Tagline = value;
+                string oldValue = _Tagline;
+                SetTagline(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Tagline = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 138 - 143
Jellyfin.Data/Entities/Genre.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,143 +9,150 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Genre
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Genre()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Genre CreateGenreUnsafe()
-      {
-         return new Genre();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="name"></param>
-      /// <param name="_metadata0"></param>
-      public Genre(string name, global::Jellyfin.Data.Entities.Metadata _metadata0)
-      {
-         if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
-         this.Name = name;
-
-         if (_metadata0 == null) throw new ArgumentNullException(nameof(_metadata0));
-         _metadata0.Genres.Add(this);
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="name"></param>
-      /// <param name="_metadata0"></param>
-      public static Genre Create(string name, global::Jellyfin.Data.Entities.Metadata _metadata0)
-      {
-         return new Genre(name, _metadata0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Genre")]
+    public partial class Genre
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Genre()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Genre CreateGenreUnsafe()
+        {
+            return new Genre();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="_metadata0"></param>
+        public Genre(string name, Metadata _metadata0)
+        {
+            if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
+            this.Name = name;
+
+            if (_metadata0 == null) throw new ArgumentNullException(nameof(_metadata0));
+            _metadata0.Genres.Add(this);
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="_metadata0"></param>
+        public static Genre Create(string name, Metadata _metadata0)
+        {
+            return new Genre(name, _metadata0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
             {
             {
-               _Id = value;
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Name
-      /// </summary>
-      internal string _Name;
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before setting.
-      /// </summary>
-      partial void SetName(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before returning.
-      /// </summary>
-      partial void GetName(ref string result);
-
-      /// <summary>
-      /// Indexed, Required, Max length = 255
-      /// </summary>
-      [Required]
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string Name
-      {
-         get
-         {
-            string value = _Name;
-            GetName(ref value);
-            return (_Name = value);
-         }
-         set
-         {
-            string oldValue = _Name;
-            SetName(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Name
+        /// </summary>
+        internal string _Name;
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before setting.
+        /// </summary>
+        partial void SetName(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before returning.
+        /// </summary>
+        partial void GetName(ref string result);
+
+        /// <summary>
+        /// Indexed, Required, Max length = 255
+        /// </summary>
+        [Required]
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string Name
+        {
+            get
             {
             {
-               _Name = value;
+                string value = _Name;
+                GetName(ref value);
+                return (_Name = value);
             }
             }
-         }
-      }
+            set
+            {
+                string oldValue = _Name;
+                SetName(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Name = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 101 - 102
Jellyfin.Data/Entities/Group.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,95 +9,106 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Group
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Group()
-      {
-         GroupPermissions = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Permission>();
-         ProviderMappings = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.ProviderMapping>();
-         Preferences = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Preference>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Group CreateGroupUnsafe()
-      {
-         return new Group();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="name"></param>
-      /// <param name="_user0"></param>
-      public Group(string name, global::Jellyfin.Data.Entities.User _user0)
-      {
-         if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
-         this.Name = name;
-
-         if (_user0 == null) throw new ArgumentNullException(nameof(_user0));
-         _user0.Groups.Add(this);
-
-         this.GroupPermissions = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Permission>();
-         this.ProviderMappings = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.ProviderMapping>();
-         this.Preferences = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Preference>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="name"></param>
-      /// <param name="_user0"></param>
-      public static Group Create(string name, global::Jellyfin.Data.Entities.User _user0)
-      {
-         return new Group(name, _user0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id { get; protected set; }
-
-      /// <summary>
-      /// Required, Max length = 255
-      /// </summary>
-      [Required]
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string Name { get; set; }
-
-      /// <summary>
-      /// Concurrency token
-      /// </summary>
-      [Timestamp]
-      public Byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      public virtual ICollection<global::Jellyfin.Data.Entities.Permission> GroupPermissions { get; protected set; }
-
-      public virtual ICollection<global::Jellyfin.Data.Entities.ProviderMapping> ProviderMappings { get; protected set; }
-
-      public virtual ICollection<global::Jellyfin.Data.Entities.Preference> Preferences { get; protected set; }
-
-   }
+    [Table("Group")]
+    public partial class Group
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Group()
+        {
+            GroupPermissions = new HashSet<Permission>();
+            ProviderMappings = new HashSet<ProviderMapping>();
+            Preferences = new HashSet<Preference>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Group CreateGroupUnsafe()
+        {
+            return new Group();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="_user0"></param>
+        public Group(string name, User _user0)
+        {
+            if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
+            this.Name = name;
+
+            if (_user0 == null) throw new ArgumentNullException(nameof(_user0));
+            _user0.Groups.Add(this);
+
+            this.GroupPermissions = new HashSet<Permission>();
+            this.ProviderMappings = new HashSet<ProviderMapping>();
+            this.Preferences = new HashSet<Preference>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="_user0"></param>
+        public static Group Create(string name, User _user0)
+        {
+            return new Group(name, _user0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; protected set; }
+
+        /// <summary>
+        /// Required, Max length = 255
+        /// </summary>
+        [Required]
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+
+        [ForeignKey("Permission_GroupPermissions_Id")]
+        public virtual ICollection<Permission> GroupPermissions { get; protected set; }
+
+        [ForeignKey("ProviderMapping_ProviderMappings_Id")]
+        public virtual ICollection<ProviderMapping> ProviderMappings { get; protected set; }
+
+        [ForeignKey("Preference_Preferences_Id")]
+        public virtual ICollection<Preference> Preferences { get; protected set; }
+
+    }
 }
 }
 
 

+ 133 - 138
Jellyfin.Data/Entities/Library.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,138 +9,145 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Library
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Library()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Library CreateLibraryUnsafe()
-      {
-         return new Library();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="name"></param>
-      public Library(string name)
-      {
-         if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
-         this.Name = name;
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="name"></param>
-      public static Library Create(string name)
-      {
-         return new Library(name);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Library")]
+    public partial class Library
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Library()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Library CreateLibraryUnsafe()
+        {
+            return new Library();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="name"></param>
+        public Library(string name)
+        {
+            if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
+            this.Name = name;
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="name"></param>
+        public static Library Create(string name)
+        {
+            return new Library(name);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
             {
             {
-               _Id = value;
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Name
-      /// </summary>
-      protected string _Name;
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before setting.
-      /// </summary>
-      partial void SetName(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before returning.
-      /// </summary>
-      partial void GetName(ref string result);
-
-      /// <summary>
-      /// Required, Max length = 1024
-      /// </summary>
-      [Required]
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Name
-      {
-         get
-         {
-            string value = _Name;
-            GetName(ref value);
-            return (_Name = value);
-         }
-         set
-         {
-            string oldValue = _Name;
-            SetName(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Name
+        /// </summary>
+        protected string _Name;
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before setting.
+        /// </summary>
+        partial void SetName(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before returning.
+        /// </summary>
+        partial void GetName(ref string result);
+
+        /// <summary>
+        /// Required, Max length = 1024
+        /// </summary>
+        [Required]
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Name
+        {
+            get
             {
             {
-               _Name = value;
+                string value = _Name;
+                GetName(ref value);
+                return (_Name = value);
             }
             }
-         }
-      }
+            set
+            {
+                string oldValue = _Name;
+                SetName(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Name = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 157 - 161
Jellyfin.Data/Entities/LibraryItem.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,160 +9,168 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public abstract partial class LibraryItem
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to being abstract.
-      /// </summary>
-      protected LibraryItem()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      protected LibraryItem(Guid urlid, DateTime dateadded)
-      {
-         this.UrlId = urlid;
-
-
-         Init();
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("LibraryItem")]
+    public abstract partial class LibraryItem
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to being abstract.
+        /// </summary>
+        protected LibraryItem()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        protected LibraryItem(Guid urlid, DateTime dateadded)
+        {
+            this.UrlId = urlid;
+
+
+            Init();
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
+            {
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for UrlId
+        /// </summary>
+        internal Guid _UrlId;
+        /// <summary>
+        /// When provided in a partial class, allows value of UrlId to be changed before setting.
+        /// </summary>
+        partial void SetUrlId(Guid oldValue, ref Guid newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of UrlId to be changed before returning.
+        /// </summary>
+        partial void GetUrlId(ref Guid result);
+
+        /// <summary>
+        /// Indexed, Required
+        /// This is whats gets displayed in the Urls and API requests. This could also be a string.
+        /// </summary>
+        [Required]
+        public Guid UrlId
+        {
+            get
+            {
+                Guid value = _UrlId;
+                GetUrlId(ref value);
+                return (_UrlId = value);
+            }
+            set
             {
             {
-               _Id = value;
+                Guid oldValue = _UrlId;
+                SetUrlId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _UrlId = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for UrlId
-      /// </summary>
-      internal Guid _UrlId;
-      /// <summary>
-      /// When provided in a partial class, allows value of UrlId to be changed before setting.
-      /// </summary>
-      partial void SetUrlId(Guid oldValue, ref Guid newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of UrlId to be changed before returning.
-      /// </summary>
-      partial void GetUrlId(ref Guid result);
-
-      /// <summary>
-      /// Indexed, Required
-      /// This is whats gets displayed in the Urls and API requests. This could also be a string.
-      /// </summary>
-      [Required]
-      public Guid UrlId
-      {
-         get
-         {
-            Guid value = _UrlId;
-            GetUrlId(ref value);
-            return (_UrlId = value);
-         }
-         set
-         {
-            Guid oldValue = _UrlId;
-            SetUrlId(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for DateAdded
+        /// </summary>
+        protected DateTime _DateAdded;
+        /// <summary>
+        /// When provided in a partial class, allows value of DateAdded to be changed before setting.
+        /// </summary>
+        partial void SetDateAdded(DateTime oldValue, ref DateTime newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of DateAdded to be changed before returning.
+        /// </summary>
+        partial void GetDateAdded(ref DateTime result);
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public DateTime DateAdded
+        {
+            get
             {
             {
-               _UrlId = value;
+                DateTime value = _DateAdded;
+                GetDateAdded(ref value);
+                return (_DateAdded = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for DateAdded
-      /// </summary>
-      protected DateTime _DateAdded;
-      /// <summary>
-      /// When provided in a partial class, allows value of DateAdded to be changed before setting.
-      /// </summary>
-      partial void SetDateAdded(DateTime oldValue, ref DateTime newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of DateAdded to be changed before returning.
-      /// </summary>
-      partial void GetDateAdded(ref DateTime result);
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public DateTime DateAdded
-      {
-         get
-         {
-            DateTime value = _DateAdded;
-            GetDateAdded(ref value);
-            return (_DateAdded = value);
-         }
-         internal set
-         {
-            DateTime oldValue = _DateAdded;
-            SetDateAdded(oldValue, ref value);
-            if (oldValue != value)
+            internal set
             {
             {
-               _DateAdded = value;
+                DateTime oldValue = _DateAdded;
+                SetDateAdded(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _DateAdded = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      public virtual global::Jellyfin.Data.Entities.LibraryRoot LibraryRoot { get; set; }
-
-   }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [ForeignKey("LibraryRoot_Id")]
+        public virtual LibraryRoot LibraryRoot { get; set; }
+
+    }
 }
 }
 
 

+ 179 - 183
Jellyfin.Data/Entities/LibraryRoot.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,182 +9,190 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class LibraryRoot
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected LibraryRoot()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static LibraryRoot CreateLibraryRootUnsafe()
-      {
-         return new LibraryRoot();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="path">Absolute Path</param>
-      public LibraryRoot(string path)
-      {
-         if (string.IsNullOrEmpty(path)) throw new ArgumentNullException(nameof(path));
-         this.Path = path;
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="path">Absolute Path</param>
-      public static LibraryRoot Create(string path)
-      {
-         return new LibraryRoot(path);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("LibraryRoot")]
+    public partial class LibraryRoot
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected LibraryRoot()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static LibraryRoot CreateLibraryRootUnsafe()
+        {
+            return new LibraryRoot();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="path">Absolute Path</param>
+        public LibraryRoot(string path)
+        {
+            if (string.IsNullOrEmpty(path)) throw new ArgumentNullException(nameof(path));
+            this.Path = path;
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="path">Absolute Path</param>
+        public static LibraryRoot Create(string path)
+        {
+            return new LibraryRoot(path);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
+            {
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for Path
+        /// </summary>
+        protected string _Path;
+        /// <summary>
+        /// When provided in a partial class, allows value of Path to be changed before setting.
+        /// </summary>
+        partial void SetPath(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Path to be changed before returning.
+        /// </summary>
+        partial void GetPath(ref string result);
+
+        /// <summary>
+        /// Required, Max length = 65535
+        /// Absolute Path
+        /// </summary>
+        [Required]
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string Path
+        {
+            get
+            {
+                string value = _Path;
+                GetPath(ref value);
+                return (_Path = value);
+            }
+            set
             {
             {
-               _Id = value;
+                string oldValue = _Path;
+                SetPath(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Path = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Path
-      /// </summary>
-      protected string _Path;
-      /// <summary>
-      /// When provided in a partial class, allows value of Path to be changed before setting.
-      /// </summary>
-      partial void SetPath(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Path to be changed before returning.
-      /// </summary>
-      partial void GetPath(ref string result);
-
-      /// <summary>
-      /// Required, Max length = 65535
-      /// Absolute Path
-      /// </summary>
-      [Required]
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string Path
-      {
-         get
-         {
-            string value = _Path;
-            GetPath(ref value);
-            return (_Path = value);
-         }
-         set
-         {
-            string oldValue = _Path;
-            SetPath(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for NetworkPath
+        /// </summary>
+        protected string _NetworkPath;
+        /// <summary>
+        /// When provided in a partial class, allows value of NetworkPath to be changed before setting.
+        /// </summary>
+        partial void SetNetworkPath(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of NetworkPath to be changed before returning.
+        /// </summary>
+        partial void GetNetworkPath(ref string result);
+
+        /// <summary>
+        /// Max length = 65535
+        /// Absolute network path, for example for transcoding sattelites.
+        /// </summary>
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string NetworkPath
+        {
+            get
             {
             {
-               _Path = value;
+                string value = _NetworkPath;
+                GetNetworkPath(ref value);
+                return (_NetworkPath = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for NetworkPath
-      /// </summary>
-      protected string _NetworkPath;
-      /// <summary>
-      /// When provided in a partial class, allows value of NetworkPath to be changed before setting.
-      /// </summary>
-      partial void SetNetworkPath(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of NetworkPath to be changed before returning.
-      /// </summary>
-      partial void GetNetworkPath(ref string result);
-
-      /// <summary>
-      /// Max length = 65535
-      /// Absolute network path, for example for transcoding sattelites.
-      /// </summary>
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string NetworkPath
-      {
-         get
-         {
-            string value = _NetworkPath;
-            GetNetworkPath(ref value);
-            return (_NetworkPath = value);
-         }
-         set
-         {
-            string oldValue = _NetworkPath;
-            SetNetworkPath(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _NetworkPath = value;
+                string oldValue = _NetworkPath;
+                SetNetworkPath(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _NetworkPath = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      public virtual global::Jellyfin.Data.Entities.Library Library { get; set; }
-
-   }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [ForeignKey("Library_Id")]
+        public virtual Library Library { get; set; }
+
+    }
 }
 }
 
 

+ 182 - 186
Jellyfin.Data/Entities/MediaFile.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,189 +9,197 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class MediaFile
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected MediaFile()
-      {
-         MediaFileStreams = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MediaFileStream>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static MediaFile CreateMediaFileUnsafe()
-      {
-         return new MediaFile();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="path">Relative to the LibraryRoot</param>
-      /// <param name="kind"></param>
-      /// <param name="_release0"></param>
-      public MediaFile(string path, global::Jellyfin.Data.Enums.MediaFileKind kind, global::Jellyfin.Data.Entities.Release _release0)
-      {
-         if (string.IsNullOrEmpty(path)) throw new ArgumentNullException(nameof(path));
-         this.Path = path;
-
-         this.Kind = kind;
-
-         if (_release0 == null) throw new ArgumentNullException(nameof(_release0));
-         _release0.MediaFiles.Add(this);
-
-         this.MediaFileStreams = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MediaFileStream>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="path">Relative to the LibraryRoot</param>
-      /// <param name="kind"></param>
-      /// <param name="_release0"></param>
-      public static MediaFile Create(string path, global::Jellyfin.Data.Enums.MediaFileKind kind, global::Jellyfin.Data.Entities.Release _release0)
-      {
-         return new MediaFile(path, kind, _release0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("MediaFile")]
+    public partial class MediaFile
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected MediaFile()
+        {
+            MediaFileStreams = new HashSet<MediaFileStream>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static MediaFile CreateMediaFileUnsafe()
+        {
+            return new MediaFile();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="path">Relative to the LibraryRoot</param>
+        /// <param name="kind"></param>
+        /// <param name="_release0"></param>
+        public MediaFile(string path, Enums.MediaFileKind kind, Release _release0)
+        {
+            if (string.IsNullOrEmpty(path)) throw new ArgumentNullException(nameof(path));
+            this.Path = path;
+
+            this.Kind = kind;
+
+            if (_release0 == null) throw new ArgumentNullException(nameof(_release0));
+            _release0.MediaFiles.Add(this);
+
+            this.MediaFileStreams = new HashSet<MediaFileStream>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="path">Relative to the LibraryRoot</param>
+        /// <param name="kind"></param>
+        /// <param name="_release0"></param>
+        public static MediaFile Create(string path, Enums.MediaFileKind kind, Release _release0)
+        {
+            return new MediaFile(path, kind, _release0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
+            {
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for Path
+        /// </summary>
+        protected string _Path;
+        /// <summary>
+        /// When provided in a partial class, allows value of Path to be changed before setting.
+        /// </summary>
+        partial void SetPath(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Path to be changed before returning.
+        /// </summary>
+        partial void GetPath(ref string result);
+
+        /// <summary>
+        /// Required, Max length = 65535
+        /// Relative to the LibraryRoot
+        /// </summary>
+        [Required]
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string Path
+        {
+            get
+            {
+                string value = _Path;
+                GetPath(ref value);
+                return (_Path = value);
+            }
+            set
             {
             {
-               _Id = value;
+                string oldValue = _Path;
+                SetPath(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Path = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Path
-      /// </summary>
-      protected string _Path;
-      /// <summary>
-      /// When provided in a partial class, allows value of Path to be changed before setting.
-      /// </summary>
-      partial void SetPath(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Path to be changed before returning.
-      /// </summary>
-      partial void GetPath(ref string result);
-
-      /// <summary>
-      /// Required, Max length = 65535
-      /// Relative to the LibraryRoot
-      /// </summary>
-      [Required]
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string Path
-      {
-         get
-         {
-            string value = _Path;
-            GetPath(ref value);
-            return (_Path = value);
-         }
-         set
-         {
-            string oldValue = _Path;
-            SetPath(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Kind
+        /// </summary>
+        protected Enums.MediaFileKind _Kind;
+        /// <summary>
+        /// When provided in a partial class, allows value of Kind to be changed before setting.
+        /// </summary>
+        partial void SetKind(Enums.MediaFileKind oldValue, ref Enums.MediaFileKind newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Kind to be changed before returning.
+        /// </summary>
+        partial void GetKind(ref Enums.MediaFileKind result);
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public Enums.MediaFileKind Kind
+        {
+            get
             {
             {
-               _Path = value;
+                Enums.MediaFileKind value = _Kind;
+                GetKind(ref value);
+                return (_Kind = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Kind
-      /// </summary>
-      protected global::Jellyfin.Data.Enums.MediaFileKind _Kind;
-      /// <summary>
-      /// When provided in a partial class, allows value of Kind to be changed before setting.
-      /// </summary>
-      partial void SetKind(global::Jellyfin.Data.Enums.MediaFileKind oldValue, ref global::Jellyfin.Data.Enums.MediaFileKind newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Kind to be changed before returning.
-      /// </summary>
-      partial void GetKind(ref global::Jellyfin.Data.Enums.MediaFileKind result);
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public global::Jellyfin.Data.Enums.MediaFileKind Kind
-      {
-         get
-         {
-            global::Jellyfin.Data.Enums.MediaFileKind value = _Kind;
-            GetKind(ref value);
-            return (_Kind = value);
-         }
-         set
-         {
-            global::Jellyfin.Data.Enums.MediaFileKind oldValue = _Kind;
-            SetKind(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Kind = value;
+                Enums.MediaFileKind oldValue = _Kind;
+                SetKind(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Kind = value;
+                }
             }
             }
-         }
-      }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.MediaFileStream> MediaFileStreams { get; protected set; }
+        [ForeignKey("MediaFileStream_MediaFileStreams_Id")]
+        public virtual ICollection<MediaFileStream> MediaFileStreams { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 135 - 140
Jellyfin.Data/Entities/MediaFileStream.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,140 +9,147 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class MediaFileStream
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected MediaFileStream()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static MediaFileStream CreateMediaFileStreamUnsafe()
-      {
-         return new MediaFileStream();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="streamnumber"></param>
-      /// <param name="_mediafile0"></param>
-      public MediaFileStream(int streamnumber, global::Jellyfin.Data.Entities.MediaFile _mediafile0)
-      {
-         this.StreamNumber = streamnumber;
-
-         if (_mediafile0 == null) throw new ArgumentNullException(nameof(_mediafile0));
-         _mediafile0.MediaFileStreams.Add(this);
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="streamnumber"></param>
-      /// <param name="_mediafile0"></param>
-      public static MediaFileStream Create(int streamnumber, global::Jellyfin.Data.Entities.MediaFile _mediafile0)
-      {
-         return new MediaFileStream(streamnumber, _mediafile0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("MediaFileStream")]
+    public partial class MediaFileStream
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected MediaFileStream()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static MediaFileStream CreateMediaFileStreamUnsafe()
+        {
+            return new MediaFileStream();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="streamnumber"></param>
+        /// <param name="_mediafile0"></param>
+        public MediaFileStream(int streamnumber, MediaFile _mediafile0)
+        {
+            this.StreamNumber = streamnumber;
+
+            if (_mediafile0 == null) throw new ArgumentNullException(nameof(_mediafile0));
+            _mediafile0.MediaFileStreams.Add(this);
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="streamnumber"></param>
+        /// <param name="_mediafile0"></param>
+        public static MediaFileStream Create(int streamnumber, MediaFile _mediafile0)
+        {
+            return new MediaFileStream(streamnumber, _mediafile0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
             {
             {
-               _Id = value;
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for StreamNumber
-      /// </summary>
-      protected int _StreamNumber;
-      /// <summary>
-      /// When provided in a partial class, allows value of StreamNumber to be changed before setting.
-      /// </summary>
-      partial void SetStreamNumber(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of StreamNumber to be changed before returning.
-      /// </summary>
-      partial void GetStreamNumber(ref int result);
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public int StreamNumber
-      {
-         get
-         {
-            int value = _StreamNumber;
-            GetStreamNumber(ref value);
-            return (_StreamNumber = value);
-         }
-         set
-         {
-            int oldValue = _StreamNumber;
-            SetStreamNumber(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for StreamNumber
+        /// </summary>
+        protected int _StreamNumber;
+        /// <summary>
+        /// When provided in a partial class, allows value of StreamNumber to be changed before setting.
+        /// </summary>
+        partial void SetStreamNumber(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of StreamNumber to be changed before returning.
+        /// </summary>
+        partial void GetStreamNumber(ref int result);
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public int StreamNumber
+        {
+            get
             {
             {
-               _StreamNumber = value;
+                int value = _StreamNumber;
+                GetStreamNumber(ref value);
+                return (_StreamNumber = value);
             }
             }
-         }
-      }
+            set
+            {
+                int oldValue = _StreamNumber;
+                SetStreamNumber(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _StreamNumber = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 348 - 348
Jellyfin.Data/Entities/Metadata.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,365 +9,377 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public abstract partial class Metadata
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to being abstract.
-      /// </summary>
-      protected Metadata()
-      {
-         PersonRoles = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.PersonRole>();
-         Genres = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Genre>();
-         Artwork = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Artwork>();
-         Ratings = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Rating>();
-         Sources = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MetadataProviderId>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      protected Metadata(string title, string language, DateTime dateadded, DateTime datemodified)
-      {
-         if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
-         this.Title = title;
-
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
-
-         this.PersonRoles = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.PersonRole>();
-         this.Genres = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Genre>();
-         this.Artwork = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Artwork>();
-         this.Ratings = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Rating>();
-         this.Sources = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MetadataProviderId>();
-
-         Init();
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Metadata")]
+    public abstract partial class Metadata
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to being abstract.
+        /// </summary>
+        protected Metadata()
+        {
+            PersonRoles = new HashSet<PersonRole>();
+            Genres = new HashSet<Genre>();
+            Artwork = new HashSet<Artwork>();
+            Ratings = new HashSet<Rating>();
+            Sources = new HashSet<MetadataProviderId>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        protected Metadata(string title, string language, DateTime dateadded, DateTime datemodified)
+        {
+            if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
+            this.Title = title;
+
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
+
+            this.PersonRoles = new HashSet<PersonRole>();
+            this.Genres = new HashSet<Genre>();
+            this.Artwork = new HashSet<Artwork>();
+            this.Ratings = new HashSet<Rating>();
+            this.Sources = new HashSet<MetadataProviderId>();
+
+            Init();
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
+            {
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for Title
+        /// </summary>
+        protected string _Title;
+        /// <summary>
+        /// When provided in a partial class, allows value of Title to be changed before setting.
+        /// </summary>
+        partial void SetTitle(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Title to be changed before returning.
+        /// </summary>
+        partial void GetTitle(ref string result);
+
+        /// <summary>
+        /// Required, Max length = 1024
+        /// The title or name of the object
+        /// </summary>
+        [Required]
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Title
+        {
+            get
+            {
+                string value = _Title;
+                GetTitle(ref value);
+                return (_Title = value);
+            }
+            set
+            {
+                string oldValue = _Title;
+                SetTitle(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Title = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for OriginalTitle
+        /// </summary>
+        protected string _OriginalTitle;
+        /// <summary>
+        /// When provided in a partial class, allows value of OriginalTitle to be changed before setting.
+        /// </summary>
+        partial void SetOriginalTitle(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of OriginalTitle to be changed before returning.
+        /// </summary>
+        partial void GetOriginalTitle(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string OriginalTitle
+        {
+            get
             {
             {
-               _Id = value;
+                string value = _OriginalTitle;
+                GetOriginalTitle(ref value);
+                return (_OriginalTitle = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Title
-      /// </summary>
-      protected string _Title;
-      /// <summary>
-      /// When provided in a partial class, allows value of Title to be changed before setting.
-      /// </summary>
-      partial void SetTitle(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Title to be changed before returning.
-      /// </summary>
-      partial void GetTitle(ref string result);
-
-      /// <summary>
-      /// Required, Max length = 1024
-      /// The title or name of the object
-      /// </summary>
-      [Required]
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Title
-      {
-         get
-         {
-            string value = _Title;
-            GetTitle(ref value);
-            return (_Title = value);
-         }
-         set
-         {
-            string oldValue = _Title;
-            SetTitle(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Title = value;
+                string oldValue = _OriginalTitle;
+                SetOriginalTitle(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _OriginalTitle = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for OriginalTitle
-      /// </summary>
-      protected string _OriginalTitle;
-      /// <summary>
-      /// When provided in a partial class, allows value of OriginalTitle to be changed before setting.
-      /// </summary>
-      partial void SetOriginalTitle(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of OriginalTitle to be changed before returning.
-      /// </summary>
-      partial void GetOriginalTitle(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string OriginalTitle
-      {
-         get
-         {
-            string value = _OriginalTitle;
-            GetOriginalTitle(ref value);
-            return (_OriginalTitle = value);
-         }
-         set
-         {
-            string oldValue = _OriginalTitle;
-            SetOriginalTitle(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for SortTitle
+        /// </summary>
+        protected string _SortTitle;
+        /// <summary>
+        /// When provided in a partial class, allows value of SortTitle to be changed before setting.
+        /// </summary>
+        partial void SetSortTitle(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of SortTitle to be changed before returning.
+        /// </summary>
+        partial void GetSortTitle(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string SortTitle
+        {
+            get
             {
             {
-               _OriginalTitle = value;
+                string value = _SortTitle;
+                GetSortTitle(ref value);
+                return (_SortTitle = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for SortTitle
-      /// </summary>
-      protected string _SortTitle;
-      /// <summary>
-      /// When provided in a partial class, allows value of SortTitle to be changed before setting.
-      /// </summary>
-      partial void SetSortTitle(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of SortTitle to be changed before returning.
-      /// </summary>
-      partial void GetSortTitle(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string SortTitle
-      {
-         get
-         {
-            string value = _SortTitle;
-            GetSortTitle(ref value);
-            return (_SortTitle = value);
-         }
-         set
-         {
-            string oldValue = _SortTitle;
-            SetSortTitle(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _SortTitle = value;
+                string oldValue = _SortTitle;
+                SetSortTitle(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _SortTitle = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Language
-      /// </summary>
-      protected string _Language;
-      /// <summary>
-      /// When provided in a partial class, allows value of Language to be changed before setting.
-      /// </summary>
-      partial void SetLanguage(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Language to be changed before returning.
-      /// </summary>
-      partial void GetLanguage(ref string result);
-
-      /// <summary>
-      /// Required, Min length = 3, Max length = 3
-      /// ISO-639-3 3-character language codes
-      /// </summary>
-      [Required]
-      [MinLength(3)]
-      [MaxLength(3)]
-      [StringLength(3)]
-      public string Language
-      {
-         get
-         {
-            string value = _Language;
-            GetLanguage(ref value);
-            return (_Language = value);
-         }
-         set
-         {
-            string oldValue = _Language;
-            SetLanguage(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Language
+        /// </summary>
+        protected string _Language;
+        /// <summary>
+        /// When provided in a partial class, allows value of Language to be changed before setting.
+        /// </summary>
+        partial void SetLanguage(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Language to be changed before returning.
+        /// </summary>
+        partial void GetLanguage(ref string result);
+
+        /// <summary>
+        /// Required, Min length = 3, Max length = 3
+        /// ISO-639-3 3-character language codes
+        /// </summary>
+        [Required]
+        [MinLength(3)]
+        [MaxLength(3)]
+        [StringLength(3)]
+        public string Language
+        {
+            get
             {
             {
-               _Language = value;
+                string value = _Language;
+                GetLanguage(ref value);
+                return (_Language = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for ReleaseDate
-      /// </summary>
-      protected DateTimeOffset? _ReleaseDate;
-      /// <summary>
-      /// When provided in a partial class, allows value of ReleaseDate to be changed before setting.
-      /// </summary>
-      partial void SetReleaseDate(DateTimeOffset? oldValue, ref DateTimeOffset? newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of ReleaseDate to be changed before returning.
-      /// </summary>
-      partial void GetReleaseDate(ref DateTimeOffset? result);
-
-      public DateTimeOffset? ReleaseDate
-      {
-         get
-         {
-            DateTimeOffset? value = _ReleaseDate;
-            GetReleaseDate(ref value);
-            return (_ReleaseDate = value);
-         }
-         set
-         {
-            DateTimeOffset? oldValue = _ReleaseDate;
-            SetReleaseDate(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _ReleaseDate = value;
+                string oldValue = _Language;
+                SetLanguage(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Language = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for DateAdded
-      /// </summary>
-      protected DateTime _DateAdded;
-      /// <summary>
-      /// When provided in a partial class, allows value of DateAdded to be changed before setting.
-      /// </summary>
-      partial void SetDateAdded(DateTime oldValue, ref DateTime newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of DateAdded to be changed before returning.
-      /// </summary>
-      partial void GetDateAdded(ref DateTime result);
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public DateTime DateAdded
-      {
-         get
-         {
-            DateTime value = _DateAdded;
-            GetDateAdded(ref value);
-            return (_DateAdded = value);
-         }
-         internal set
-         {
-            DateTime oldValue = _DateAdded;
-            SetDateAdded(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for ReleaseDate
+        /// </summary>
+        protected DateTimeOffset? _ReleaseDate;
+        /// <summary>
+        /// When provided in a partial class, allows value of ReleaseDate to be changed before setting.
+        /// </summary>
+        partial void SetReleaseDate(DateTimeOffset? oldValue, ref DateTimeOffset? newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of ReleaseDate to be changed before returning.
+        /// </summary>
+        partial void GetReleaseDate(ref DateTimeOffset? result);
+
+        public DateTimeOffset? ReleaseDate
+        {
+            get
             {
             {
-               _DateAdded = value;
+                DateTimeOffset? value = _ReleaseDate;
+                GetReleaseDate(ref value);
+                return (_ReleaseDate = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for DateModified
-      /// </summary>
-      protected DateTime _DateModified;
-      /// <summary>
-      /// When provided in a partial class, allows value of DateModified to be changed before setting.
-      /// </summary>
-      partial void SetDateModified(DateTime oldValue, ref DateTime newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of DateModified to be changed before returning.
-      /// </summary>
-      partial void GetDateModified(ref DateTime result);
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public DateTime DateModified
-      {
-         get
-         {
-            DateTime value = _DateModified;
-            GetDateModified(ref value);
-            return (_DateModified = value);
-         }
-         internal set
-         {
-            DateTime oldValue = _DateModified;
-            SetDateModified(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _DateModified = value;
+                DateTimeOffset? oldValue = _ReleaseDate;
+                SetReleaseDate(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _ReleaseDate = value;
+                }
             }
             }
-         }
-      }
+        }
+
+        /// <summary>
+        /// Backing field for DateAdded
+        /// </summary>
+        protected DateTime _DateAdded;
+        /// <summary>
+        /// When provided in a partial class, allows value of DateAdded to be changed before setting.
+        /// </summary>
+        partial void SetDateAdded(DateTime oldValue, ref DateTime newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of DateAdded to be changed before returning.
+        /// </summary>
+        partial void GetDateAdded(ref DateTime result);
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public DateTime DateAdded
+        {
+            get
+            {
+                DateTime value = _DateAdded;
+                GetDateAdded(ref value);
+                return (_DateAdded = value);
+            }
+            internal set
+            {
+                DateTime oldValue = _DateAdded;
+                SetDateAdded(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _DateAdded = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for DateModified
+        /// </summary>
+        protected DateTime _DateModified;
+        /// <summary>
+        /// When provided in a partial class, allows value of DateModified to be changed before setting.
+        /// </summary>
+        partial void SetDateModified(DateTime oldValue, ref DateTime newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of DateModified to be changed before returning.
+        /// </summary>
+        partial void GetDateModified(ref DateTime result);
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public DateTime DateModified
+        {
+            get
+            {
+                DateTime value = _DateModified;
+                GetDateModified(ref value);
+                return (_DateModified = value);
+            }
+            internal set
+            {
+                DateTime oldValue = _DateModified;
+                SetDateModified(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _DateModified = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.PersonRole> PersonRoles { get; protected set; }
+        [ForeignKey("PersonRole_PersonRoles_Id")]
+        public virtual ICollection<PersonRole> PersonRoles { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Genre> Genres { get; protected set; }
+        [ForeignKey("PersonRole_PersonRoles_Id")]
+        public virtual ICollection<Genre> Genres { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Artwork> Artwork { get; protected set; }
+        [ForeignKey("PersonRole_PersonRoles_Id")]
+        public virtual ICollection<Artwork> Artwork { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Rating> Ratings { get; protected set; }
+        [ForeignKey("PersonRole_PersonRoles_Id")]
+        public virtual ICollection<Rating> Ratings { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.MetadataProviderId> Sources { get; protected set; }
+        [ForeignKey("PersonRole_PersonRoles_Id")]
+        public virtual ICollection<MetadataProviderId> Sources { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 133 - 138
Jellyfin.Data/Entities/MetadataProvider.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,138 +9,145 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class MetadataProvider
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected MetadataProvider()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static MetadataProvider CreateMetadataProviderUnsafe()
-      {
-         return new MetadataProvider();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="name"></param>
-      public MetadataProvider(string name)
-      {
-         if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
-         this.Name = name;
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="name"></param>
-      public static MetadataProvider Create(string name)
-      {
-         return new MetadataProvider(name);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("MetadataProvider")]
+    public partial class MetadataProvider
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected MetadataProvider()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static MetadataProvider CreateMetadataProviderUnsafe()
+        {
+            return new MetadataProvider();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="name"></param>
+        public MetadataProvider(string name)
+        {
+            if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
+            this.Name = name;
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="name"></param>
+        public static MetadataProvider Create(string name)
+        {
+            return new MetadataProvider(name);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
             {
             {
-               _Id = value;
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Name
-      /// </summary>
-      protected string _Name;
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before setting.
-      /// </summary>
-      partial void SetName(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before returning.
-      /// </summary>
-      partial void GetName(ref string result);
-
-      /// <summary>
-      /// Required, Max length = 1024
-      /// </summary>
-      [Required]
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Name
-      {
-         get
-         {
-            string value = _Name;
-            GetName(ref value);
-            return (_Name = value);
-         }
-         set
-         {
-            string oldValue = _Name;
-            SetName(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Name
+        /// </summary>
+        protected string _Name;
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before setting.
+        /// </summary>
+        partial void SetName(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before returning.
+        /// </summary>
+        partial void GetName(ref string result);
+
+        /// <summary>
+        /// Required, Max length = 1024
+        /// </summary>
+        [Required]
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Name
+        {
+            get
             {
             {
-               _Name = value;
+                string value = _Name;
+                GetName(ref value);
+                return (_Name = value);
             }
             }
-         }
-      }
+            set
+            {
+                string oldValue = _Name;
+                SetName(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Name = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 168 - 172
Jellyfin.Data/Entities/MetadataProviderId.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,169 +9,177 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class MetadataProviderId
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected MetadataProviderId()
-      {
-         // NOTE: This class has one-to-one associations with MetadataProviderId.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static MetadataProviderId CreateMetadataProviderIdUnsafe()
-      {
-         return new MetadataProviderId();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="providerid"></param>
-      /// <param name="_metadata0"></param>
-      /// <param name="_person1"></param>
-      /// <param name="_personrole2"></param>
-      /// <param name="_ratingsource3"></param>
-      public MetadataProviderId(string providerid, global::Jellyfin.Data.Entities.Metadata _metadata0, global::Jellyfin.Data.Entities.Person _person1, global::Jellyfin.Data.Entities.PersonRole _personrole2, global::Jellyfin.Data.Entities.RatingSource _ratingsource3)
-      {
-         // NOTE: This class has one-to-one associations with MetadataProviderId.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         if (string.IsNullOrEmpty(providerid)) throw new ArgumentNullException(nameof(providerid));
-         this.ProviderId = providerid;
-
-         if (_metadata0 == null) throw new ArgumentNullException(nameof(_metadata0));
-         _metadata0.Sources.Add(this);
-
-         if (_person1 == null) throw new ArgumentNullException(nameof(_person1));
-         _person1.Sources.Add(this);
-
-         if (_personrole2 == null) throw new ArgumentNullException(nameof(_personrole2));
-         _personrole2.Sources.Add(this);
-
-         if (_ratingsource3 == null) throw new ArgumentNullException(nameof(_ratingsource3));
-         _ratingsource3.Source = this;
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="providerid"></param>
-      /// <param name="_metadata0"></param>
-      /// <param name="_person1"></param>
-      /// <param name="_personrole2"></param>
-      /// <param name="_ratingsource3"></param>
-      public static MetadataProviderId Create(string providerid, global::Jellyfin.Data.Entities.Metadata _metadata0, global::Jellyfin.Data.Entities.Person _person1, global::Jellyfin.Data.Entities.PersonRole _personrole2, global::Jellyfin.Data.Entities.RatingSource _ratingsource3)
-      {
-         return new MetadataProviderId(providerid, _metadata0, _person1, _personrole2, _ratingsource3);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("MetadataProviderId")]
+    public partial class MetadataProviderId
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected MetadataProviderId()
+        {
+            // NOTE: This class has one-to-one associations with MetadataProviderId.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static MetadataProviderId CreateMetadataProviderIdUnsafe()
+        {
+            return new MetadataProviderId();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="providerid"></param>
+        /// <param name="_metadata0"></param>
+        /// <param name="_person1"></param>
+        /// <param name="_personrole2"></param>
+        /// <param name="_ratingsource3"></param>
+        public MetadataProviderId(string providerid, Metadata _metadata0, Person _person1, PersonRole _personrole2, RatingSource _ratingsource3)
+        {
+            // NOTE: This class has one-to-one associations with MetadataProviderId.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            if (string.IsNullOrEmpty(providerid)) throw new ArgumentNullException(nameof(providerid));
+            this.ProviderId = providerid;
+
+            if (_metadata0 == null) throw new ArgumentNullException(nameof(_metadata0));
+            _metadata0.Sources.Add(this);
+
+            if (_person1 == null) throw new ArgumentNullException(nameof(_person1));
+            _person1.Sources.Add(this);
+
+            if (_personrole2 == null) throw new ArgumentNullException(nameof(_personrole2));
+            _personrole2.Sources.Add(this);
+
+            if (_ratingsource3 == null) throw new ArgumentNullException(nameof(_ratingsource3));
+            _ratingsource3.Source = this;
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="providerid"></param>
+        /// <param name="_metadata0"></param>
+        /// <param name="_person1"></param>
+        /// <param name="_personrole2"></param>
+        /// <param name="_ratingsource3"></param>
+        public static MetadataProviderId Create(string providerid, Metadata _metadata0, Person _person1, PersonRole _personrole2, RatingSource _ratingsource3)
+        {
+            return new MetadataProviderId(providerid, _metadata0, _person1, _personrole2, _ratingsource3);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
+            {
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for ProviderId
+        /// </summary>
+        protected string _ProviderId;
+        /// <summary>
+        /// When provided in a partial class, allows value of ProviderId to be changed before setting.
+        /// </summary>
+        partial void SetProviderId(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of ProviderId to be changed before returning.
+        /// </summary>
+        partial void GetProviderId(ref string result);
+
+        /// <summary>
+        /// Required, Max length = 255
+        /// </summary>
+        [Required]
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string ProviderId
+        {
+            get
             {
             {
-               _Id = value;
+                string value = _ProviderId;
+                GetProviderId(ref value);
+                return (_ProviderId = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for ProviderId
-      /// </summary>
-      protected string _ProviderId;
-      /// <summary>
-      /// When provided in a partial class, allows value of ProviderId to be changed before setting.
-      /// </summary>
-      partial void SetProviderId(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of ProviderId to be changed before returning.
-      /// </summary>
-      partial void GetProviderId(ref string result);
-
-      /// <summary>
-      /// Required, Max length = 255
-      /// </summary>
-      [Required]
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string ProviderId
-      {
-         get
-         {
-            string value = _ProviderId;
-            GetProviderId(ref value);
-            return (_ProviderId = value);
-         }
-         set
-         {
-            string oldValue = _ProviderId;
-            SetProviderId(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _ProviderId = value;
+                string oldValue = _ProviderId;
+                SetProviderId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _ProviderId = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      public virtual global::Jellyfin.Data.Entities.MetadataProvider MetadataProvider { get; set; }
-
-   }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [ForeignKey("MetadataProvider_Id")]
+        public virtual MetadataProvider MetadataProvider { get; set; }
+
+    }
 }
 }
 
 

+ 50 - 59
Jellyfin.Data/Entities/Movie.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,64 +9,67 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Movie: global::Jellyfin.Data.Entities.LibraryItem
-   {
-      partial void Init();
+    [Table("Movie")]
+    public partial class Movie : LibraryItem
+    {
+        partial void Init();
 
 
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Movie(): base()
-      {
-         Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
-         MovieMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MovieMetadata>();
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Movie() : base()
+        {
+            Releases = new HashSet<Release>();
+            MovieMetadata = new HashSet<MovieMetadata>();
 
 
-         Init();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Movie CreateMovieUnsafe()
-      {
-         return new Movie();
-      }
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Movie CreateMovieUnsafe()
+        {
+            return new Movie();
+        }
 
 
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public Movie(Guid urlid, DateTime dateadded)
-      {
-         this.UrlId = urlid;
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public Movie(Guid urlid, DateTime dateadded)
+        {
+            this.UrlId = urlid;
 
 
-         this.Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
-         this.MovieMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MovieMetadata>();
+            this.Releases = new HashSet<Release>();
+            this.MovieMetadata = new HashSet<MovieMetadata>();
 
 
-         Init();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public static Movie Create(Guid urlid, DateTime dateadded)
-      {
-         return new Movie(urlid, dateadded);
-      }
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public static Movie Create(Guid urlid, DateTime dateadded)
+        {
+            return new Movie(urlid, dateadded);
+        }
 
 
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Release> Releases { get; protected set; }
+        [ForeignKey("Release_Releases_Id")]
+        public virtual ICollection<Release> Releases { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.MovieMetadata> MovieMetadata { get; protected set; }
+        [ForeignKey("MovieMetadata_MovieMetadata_Id")]
+        public virtual ICollection<MovieMetadata> MovieMetadata { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 205 - 216
Jellyfin.Data/Entities/MovieMetadata.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,219 +9,220 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class MovieMetadata: global::Jellyfin.Data.Entities.Metadata
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected MovieMetadata(): base()
-      {
-         Studios = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Company>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static MovieMetadata CreateMovieMetadataUnsafe()
-      {
-         return new MovieMetadata();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_movie0"></param>
-      public MovieMetadata(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Movie _movie0)
-      {
-         if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
-         this.Title = title;
-
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
-
-         if (_movie0 == null) throw new ArgumentNullException(nameof(_movie0));
-         _movie0.MovieMetadata.Add(this);
-
-         this.Studios = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Company>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_movie0"></param>
-      public static MovieMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Movie _movie0)
-      {
-         return new MovieMetadata(title, language, dateadded, datemodified, _movie0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Outline
-      /// </summary>
-      protected string _Outline;
-      /// <summary>
-      /// When provided in a partial class, allows value of Outline to be changed before setting.
-      /// </summary>
-      partial void SetOutline(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Outline to be changed before returning.
-      /// </summary>
-      partial void GetOutline(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Outline
-      {
-         get
-         {
-            string value = _Outline;
-            GetOutline(ref value);
-            return (_Outline = value);
-         }
-         set
-         {
-            string oldValue = _Outline;
-            SetOutline(oldValue, ref value);
-            if (oldValue != value)
+    [Table("MovieMetadata")]
+    public partial class MovieMetadata : Metadata
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected MovieMetadata() : base()
+        {
+            Studios = new HashSet<Company>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static MovieMetadata CreateMovieMetadataUnsafe()
+        {
+            return new MovieMetadata();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_movie0"></param>
+        public MovieMetadata(string title, string language, DateTime dateadded, DateTime datemodified, Movie _movie0)
+        {
+            if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
+            this.Title = title;
+
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
+
+            if (_movie0 == null) throw new ArgumentNullException(nameof(_movie0));
+            _movie0.MovieMetadata.Add(this);
+
+            this.Studios = new HashSet<Company>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_movie0"></param>
+        public static MovieMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, Movie _movie0)
+        {
+            return new MovieMetadata(title, language, dateadded, datemodified, _movie0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Outline
+        /// </summary>
+        protected string _Outline;
+        /// <summary>
+        /// When provided in a partial class, allows value of Outline to be changed before setting.
+        /// </summary>
+        partial void SetOutline(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Outline to be changed before returning.
+        /// </summary>
+        partial void GetOutline(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Outline
+        {
+            get
             {
             {
-               _Outline = value;
+                string value = _Outline;
+                GetOutline(ref value);
+                return (_Outline = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Plot
-      /// </summary>
-      protected string _Plot;
-      /// <summary>
-      /// When provided in a partial class, allows value of Plot to be changed before setting.
-      /// </summary>
-      partial void SetPlot(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Plot to be changed before returning.
-      /// </summary>
-      partial void GetPlot(ref string result);
-
-      /// <summary>
-      /// Max length = 65535
-      /// </summary>
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string Plot
-      {
-         get
-         {
-            string value = _Plot;
-            GetPlot(ref value);
-            return (_Plot = value);
-         }
-         set
-         {
-            string oldValue = _Plot;
-            SetPlot(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Plot = value;
+                string oldValue = _Outline;
+                SetOutline(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Outline = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Tagline
-      /// </summary>
-      protected string _Tagline;
-      /// <summary>
-      /// When provided in a partial class, allows value of Tagline to be changed before setting.
-      /// </summary>
-      partial void SetTagline(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Tagline to be changed before returning.
-      /// </summary>
-      partial void GetTagline(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Tagline
-      {
-         get
-         {
-            string value = _Tagline;
-            GetTagline(ref value);
-            return (_Tagline = value);
-         }
-         set
-         {
-            string oldValue = _Tagline;
-            SetTagline(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Plot
+        /// </summary>
+        protected string _Plot;
+        /// <summary>
+        /// When provided in a partial class, allows value of Plot to be changed before setting.
+        /// </summary>
+        partial void SetPlot(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Plot to be changed before returning.
+        /// </summary>
+        partial void GetPlot(ref string result);
+
+        /// <summary>
+        /// Max length = 65535
+        /// </summary>
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string Plot
+        {
+            get
             {
             {
-               _Tagline = value;
+                string value = _Plot;
+                GetPlot(ref value);
+                return (_Plot = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Country
-      /// </summary>
-      protected string _Country;
-      /// <summary>
-      /// When provided in a partial class, allows value of Country to be changed before setting.
-      /// </summary>
-      partial void SetCountry(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Country to be changed before returning.
-      /// </summary>
-      partial void GetCountry(ref string result);
-
-      /// <summary>
-      /// Max length = 2
-      /// </summary>
-      [MaxLength(2)]
-      [StringLength(2)]
-      public string Country
-      {
-         get
-         {
-            string value = _Country;
-            GetCountry(ref value);
-            return (_Country = value);
-         }
-         set
-         {
-            string oldValue = _Country;
-            SetCountry(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Country = value;
+                string oldValue = _Plot;
+                SetPlot(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Plot = value;
+                }
             }
             }
-         }
-      }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        }
+
+        /// <summary>
+        /// Backing field for Tagline
+        /// </summary>
+        protected string _Tagline;
+        /// <summary>
+        /// When provided in a partial class, allows value of Tagline to be changed before setting.
+        /// </summary>
+        partial void SetTagline(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Tagline to be changed before returning.
+        /// </summary>
+        partial void GetTagline(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Tagline
+        {
+            get
+            {
+                string value = _Tagline;
+                GetTagline(ref value);
+                return (_Tagline = value);
+            }
+            set
+            {
+                string oldValue = _Tagline;
+                SetTagline(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Tagline = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for Country
+        /// </summary>
+        protected string _Country;
+        /// <summary>
+        /// When provided in a partial class, allows value of Country to be changed before setting.
+        /// </summary>
+        partial void SetCountry(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Country to be changed before returning.
+        /// </summary>
+        partial void GetCountry(ref string result);
+
+        /// <summary>
+        /// Max length = 2
+        /// </summary>
+        [MaxLength(2)]
+        [StringLength(2)]
+        public string Country
+        {
+            get
+            {
+                string value = _Country;
+                GetCountry(ref value);
+                return (_Country = value);
+            }
+            set
+            {
+                string oldValue = _Country;
+                SetCountry(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Country = value;
+                }
+            }
+        }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Company> Studios { get; protected set; }
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("Company_Studios_Id")]
+        public virtual ICollection<Company> Studios { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 50 - 60
Jellyfin.Data/Entities/MusicAlbum.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,64 +9,66 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class MusicAlbum: global::Jellyfin.Data.Entities.LibraryItem
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected MusicAlbum(): base()
-      {
-         MusicAlbumMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MusicAlbumMetadata>();
-         Tracks = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Track>();
+    [Table("MusicAlbum")]
+    public partial class MusicAlbum : LibraryItem
+    {
+        partial void Init();
 
 
-         Init();
-      }
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected MusicAlbum() : base()
+        {
+            MusicAlbumMetadata = new HashSet<MusicAlbumMetadata>();
+            Tracks = new HashSet<Track>();
 
 
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static MusicAlbum CreateMusicAlbumUnsafe()
-      {
-         return new MusicAlbum();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public MusicAlbum(Guid urlid, DateTime dateadded)
-      {
-         this.UrlId = urlid;
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static MusicAlbum CreateMusicAlbumUnsafe()
+        {
+            return new MusicAlbum();
+        }
 
 
-         this.MusicAlbumMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MusicAlbumMetadata>();
-         this.Tracks = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Track>();
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public MusicAlbum(Guid urlid, DateTime dateadded)
+        {
+            this.UrlId = urlid;
 
 
-         Init();
-      }
+            this.MusicAlbumMetadata = new HashSet<MusicAlbumMetadata>();
+            this.Tracks = new HashSet<Track>();
 
 
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public static MusicAlbum Create(Guid urlid, DateTime dateadded)
-      {
-         return new MusicAlbum(urlid, dateadded);
-      }
+            Init();
+        }
 
 
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public static MusicAlbum Create(Guid urlid, DateTime dateadded)
+        {
+            return new MusicAlbum(urlid, dateadded);
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.MusicAlbumMetadata> MusicAlbumMetadata { get; protected set; }
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("MusicAlbumMetadata_MusicAlbumMetadata_Id")]
+        public virtual ICollection<MusicAlbumMetadata> MusicAlbumMetadata { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Track> Tracks { get; protected set; }
+        [ForeignKey("Track_Tracks_Id")]
+        public virtual ICollection<Track> Tracks { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 170 - 180
Jellyfin.Data/Entities/MusicAlbumMetadata.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,182 +9,184 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class MusicAlbumMetadata: global::Jellyfin.Data.Entities.Metadata
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected MusicAlbumMetadata(): base()
-      {
-         Labels = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Company>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static MusicAlbumMetadata CreateMusicAlbumMetadataUnsafe()
-      {
-         return new MusicAlbumMetadata();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_musicalbum0"></param>
-      public MusicAlbumMetadata(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.MusicAlbum _musicalbum0)
-      {
-         if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
-         this.Title = title;
-
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
-
-         if (_musicalbum0 == null) throw new ArgumentNullException(nameof(_musicalbum0));
-         _musicalbum0.MusicAlbumMetadata.Add(this);
-
-         this.Labels = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Company>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_musicalbum0"></param>
-      public static MusicAlbumMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.MusicAlbum _musicalbum0)
-      {
-         return new MusicAlbumMetadata(title, language, dateadded, datemodified, _musicalbum0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Barcode
-      /// </summary>
-      protected string _Barcode;
-      /// <summary>
-      /// When provided in a partial class, allows value of Barcode to be changed before setting.
-      /// </summary>
-      partial void SetBarcode(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Barcode to be changed before returning.
-      /// </summary>
-      partial void GetBarcode(ref string result);
-
-      /// <summary>
-      /// Max length = 255
-      /// </summary>
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string Barcode
-      {
-         get
-         {
-            string value = _Barcode;
-            GetBarcode(ref value);
-            return (_Barcode = value);
-         }
-         set
-         {
-            string oldValue = _Barcode;
-            SetBarcode(oldValue, ref value);
-            if (oldValue != value)
+    [Table("MusicAlbumMetadata")]
+    public partial class MusicAlbumMetadata : Metadata
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected MusicAlbumMetadata() : base()
+        {
+            Labels = new HashSet<Company>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static MusicAlbumMetadata CreateMusicAlbumMetadataUnsafe()
+        {
+            return new MusicAlbumMetadata();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_musicalbum0"></param>
+        public MusicAlbumMetadata(string title, string language, DateTime dateadded, DateTime datemodified, MusicAlbum _musicalbum0)
+        {
+            if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
+            this.Title = title;
+
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
+
+            if (_musicalbum0 == null) throw new ArgumentNullException(nameof(_musicalbum0));
+            _musicalbum0.MusicAlbumMetadata.Add(this);
+
+            this.Labels = new HashSet<Company>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_musicalbum0"></param>
+        public static MusicAlbumMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, MusicAlbum _musicalbum0)
+        {
+            return new MusicAlbumMetadata(title, language, dateadded, datemodified, _musicalbum0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Barcode
+        /// </summary>
+        protected string _Barcode;
+        /// <summary>
+        /// When provided in a partial class, allows value of Barcode to be changed before setting.
+        /// </summary>
+        partial void SetBarcode(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Barcode to be changed before returning.
+        /// </summary>
+        partial void GetBarcode(ref string result);
+
+        /// <summary>
+        /// Max length = 255
+        /// </summary>
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string Barcode
+        {
+            get
+            {
+                string value = _Barcode;
+                GetBarcode(ref value);
+                return (_Barcode = value);
+            }
+            set
+            {
+                string oldValue = _Barcode;
+                SetBarcode(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Barcode = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for LabelNumber
+        /// </summary>
+        protected string _LabelNumber;
+        /// <summary>
+        /// When provided in a partial class, allows value of LabelNumber to be changed before setting.
+        /// </summary>
+        partial void SetLabelNumber(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of LabelNumber to be changed before returning.
+        /// </summary>
+        partial void GetLabelNumber(ref string result);
+
+        /// <summary>
+        /// Max length = 255
+        /// </summary>
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string LabelNumber
+        {
+            get
+            {
+                string value = _LabelNumber;
+                GetLabelNumber(ref value);
+                return (_LabelNumber = value);
+            }
+            set
             {
             {
-               _Barcode = value;
+                string oldValue = _LabelNumber;
+                SetLabelNumber(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _LabelNumber = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for LabelNumber
-      /// </summary>
-      protected string _LabelNumber;
-      /// <summary>
-      /// When provided in a partial class, allows value of LabelNumber to be changed before setting.
-      /// </summary>
-      partial void SetLabelNumber(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of LabelNumber to be changed before returning.
-      /// </summary>
-      partial void GetLabelNumber(ref string result);
-
-      /// <summary>
-      /// Max length = 255
-      /// </summary>
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string LabelNumber
-      {
-         get
-         {
-            string value = _LabelNumber;
-            GetLabelNumber(ref value);
-            return (_LabelNumber = value);
-         }
-         set
-         {
-            string oldValue = _LabelNumber;
-            SetLabelNumber(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Country
+        /// </summary>
+        protected string _Country;
+        /// <summary>
+        /// When provided in a partial class, allows value of Country to be changed before setting.
+        /// </summary>
+        partial void SetCountry(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Country to be changed before returning.
+        /// </summary>
+        partial void GetCountry(ref string result);
+
+        /// <summary>
+        /// Max length = 2
+        /// </summary>
+        [MaxLength(2)]
+        [StringLength(2)]
+        public string Country
+        {
+            get
             {
             {
-               _LabelNumber = value;
+                string value = _Country;
+                GetCountry(ref value);
+                return (_Country = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Country
-      /// </summary>
-      protected string _Country;
-      /// <summary>
-      /// When provided in a partial class, allows value of Country to be changed before setting.
-      /// </summary>
-      partial void SetCountry(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Country to be changed before returning.
-      /// </summary>
-      partial void GetCountry(ref string result);
-
-      /// <summary>
-      /// Max length = 2
-      /// </summary>
-      [MaxLength(2)]
-      [StringLength(2)]
-      public string Country
-      {
-         get
-         {
-            string value = _Country;
-            GetCountry(ref value);
-            return (_Country = value);
-         }
-         set
-         {
-            string oldValue = _Country;
-            SetCountry(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Country = value;
+                string oldValue = _Country;
+                SetCountry(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Country = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Company> Labels { get; protected set; }
+        [ForeignKey("Company_Labels_Id")]
+        public virtual ICollection<Company> Labels { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 133 - 137
Jellyfin.Data/Entities/Permission.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,132 +9,140 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Permission
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Permission()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Permission CreatePermissionUnsafe()
-      {
-         return new Permission();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="kind"></param>
-      /// <param name="value"></param>
-      /// <param name="_user0"></param>
-      /// <param name="_group1"></param>
-      public Permission(global::Jellyfin.Data.Enums.PermissionKind kind, bool value, global::Jellyfin.Data.Entities.User _user0, global::Jellyfin.Data.Entities.Group _group1)
-      {
-         this.Kind = kind;
-
-         this.Value = value;
-
-         if (_user0 == null) throw new ArgumentNullException(nameof(_user0));
-         _user0.Permissions.Add(this);
-
-         if (_group1 == null) throw new ArgumentNullException(nameof(_group1));
-         _group1.GroupPermissions.Add(this);
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="kind"></param>
-      /// <param name="value"></param>
-      /// <param name="_user0"></param>
-      /// <param name="_group1"></param>
-      public static Permission Create(global::Jellyfin.Data.Enums.PermissionKind kind, bool value, global::Jellyfin.Data.Entities.User _user0, global::Jellyfin.Data.Entities.Group _group1)
-      {
-         return new Permission(kind, value, _user0, _group1);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id { get; protected set; }
-
-      /// <summary>
-      /// Backing field for Kind
-      /// </summary>
-      protected global::Jellyfin.Data.Enums.PermissionKind _Kind;
-      /// <summary>
-      /// When provided in a partial class, allows value of Kind to be changed before setting.
-      /// </summary>
-      partial void SetKind(global::Jellyfin.Data.Enums.PermissionKind oldValue, ref global::Jellyfin.Data.Enums.PermissionKind newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Kind to be changed before returning.
-      /// </summary>
-      partial void GetKind(ref global::Jellyfin.Data.Enums.PermissionKind result);
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public global::Jellyfin.Data.Enums.PermissionKind Kind
-      {
-         get
-         {
-            global::Jellyfin.Data.Enums.PermissionKind value = _Kind;
-            GetKind(ref value);
-            return (_Kind = value);
-         }
-         set
-         {
-            global::Jellyfin.Data.Enums.PermissionKind oldValue = _Kind;
-            SetKind(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Permission")]
+    public partial class Permission
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Permission()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Permission CreatePermissionUnsafe()
+        {
+            return new Permission();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="kind"></param>
+        /// <param name="value"></param>
+        /// <param name="_user0"></param>
+        /// <param name="_group1"></param>
+        public Permission(Enums.PermissionKind kind, bool value, User _user0, Group _group1)
+        {
+            this.Kind = kind;
+
+            this.Value = value;
+
+            if (_user0 == null) throw new ArgumentNullException(nameof(_user0));
+            _user0.Permissions.Add(this);
+
+            if (_group1 == null) throw new ArgumentNullException(nameof(_group1));
+            _group1.GroupPermissions.Add(this);
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="kind"></param>
+        /// <param name="value"></param>
+        /// <param name="_user0"></param>
+        /// <param name="_group1"></param>
+        public static Permission Create(Enums.PermissionKind kind, bool value, User _user0, Group _group1)
+        {
+            return new Permission(kind, value, _user0, _group1);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; protected set; }
+
+        /// <summary>
+        /// Backing field for Kind
+        /// </summary>
+        protected Enums.PermissionKind _Kind;
+        /// <summary>
+        /// When provided in a partial class, allows value of Kind to be changed before setting.
+        /// </summary>
+        partial void SetKind(Enums.PermissionKind oldValue, ref Enums.PermissionKind newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Kind to be changed before returning.
+        /// </summary>
+        partial void GetKind(ref Enums.PermissionKind result);
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public Enums.PermissionKind Kind
+        {
+            get
             {
             {
-               _Kind = value;
-               OnPropertyChanged();
+                Enums.PermissionKind value = _Kind;
+                GetKind(ref value);
+                return (_Kind = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public bool Value { get; set; }
-
-      /// <summary>
-      /// Concurrency token
-      /// </summary>
-      [Timestamp]
-      public Byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      public virtual event PropertyChangedEventHandler PropertyChanged;
-
-      protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
-      {
-         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-      }
-
-   }
+            set
+            {
+                Enums.PermissionKind oldValue = _Kind;
+                SetKind(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Kind = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public bool Value { get; set; }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+
+        public virtual event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+    }
 }
 }
 
 

+ 0 - 40
Jellyfin.Data/Entities/PermissionKind.cs

@@ -1,40 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-
-namespace Jellyfin.Data.Enums
-{
-   public enum PermissionKind : Int32
-   {
-      IsAdministrator,
-      IsHidden,
-      IsDisabled,
-      BlockUnrateditems,
-      EnbleSharedDeviceControl,
-      EnableRemoteAccess,
-      EnableLiveTvManagement,
-      EnableLiveTvAccess,
-      EnableMediaPlayback,
-      EnableAudioPlaybackTranscoding,
-      EnableVideoPlaybackTranscoding,
-      EnableContentDeletion,
-      EnableContentDownloading,
-      EnableSyncTranscoding,
-      EnableMediaConversion,
-      EnableAllDevices,
-      EnableAllChannels,
-      EnableAllFolders,
-      EnablePublicSharing,
-      AccessSchedules
-   }
-}

+ 257 - 262
Jellyfin.Data/Entities/Person.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,292 +9,299 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Person
-   {
-      partial void Init();
+    [Table("Person")]
+    public partial class Person
+    {
+        partial void Init();
 
 
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Person()
-      {
-         Sources = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MetadataProviderId>();
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Person()
+        {
+            Sources = new HashSet<MetadataProviderId>();
 
 
-         Init();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Person CreatePersonUnsafe()
-      {
-         return new Person();
-      }
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Person CreatePersonUnsafe()
+        {
+            return new Person();
+        }
 
 
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="urlid"></param>
-      /// <param name="name"></param>
-      public Person(Guid urlid, string name, DateTime dateadded, DateTime datemodified)
-      {
-         this.UrlId = urlid;
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="urlid"></param>
+        /// <param name="name"></param>
+        public Person(Guid urlid, string name, DateTime dateadded, DateTime datemodified)
+        {
+            this.UrlId = urlid;
 
 
-         if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
-         this.Name = name;
+            if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
+            this.Name = name;
 
 
-         this.Sources = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MetadataProviderId>();
+            this.Sources = new HashSet<MetadataProviderId>();
 
 
-         Init();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="urlid"></param>
-      /// <param name="name"></param>
-      public static Person Create(Guid urlid, string name, DateTime dateadded, DateTime datemodified)
-      {
-         return new Person(urlid, name, dateadded, datemodified);
-      }
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="urlid"></param>
+        /// <param name="name"></param>
+        public static Person Create(Guid urlid, string name, DateTime dateadded, DateTime datemodified)
+        {
+            return new Person(urlid, name, dateadded, datemodified);
+        }
 
 
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
 
 
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
 
 
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
             {
             {
-               _Id = value;
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /// <summary>
-      /// Backing field for UrlId
-      /// </summary>
-      protected Guid _UrlId;
-      /// <summary>
-      /// When provided in a partial class, allows value of UrlId to be changed before setting.
-      /// </summary>
-      partial void SetUrlId(Guid oldValue, ref Guid newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of UrlId to be changed before returning.
-      /// </summary>
-      partial void GetUrlId(ref Guid result);
+        /// <summary>
+        /// Backing field for UrlId
+        /// </summary>
+        protected Guid _UrlId;
+        /// <summary>
+        /// When provided in a partial class, allows value of UrlId to be changed before setting.
+        /// </summary>
+        partial void SetUrlId(Guid oldValue, ref Guid newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of UrlId to be changed before returning.
+        /// </summary>
+        partial void GetUrlId(ref Guid result);
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public Guid UrlId
-      {
-         get
-         {
-            Guid value = _UrlId;
-            GetUrlId(ref value);
-            return (_UrlId = value);
-         }
-         set
-         {
-            Guid oldValue = _UrlId;
-            SetUrlId(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public Guid UrlId
+        {
+            get
             {
             {
-               _UrlId = value;
+                Guid value = _UrlId;
+                GetUrlId(ref value);
+                return (_UrlId = value);
             }
             }
-         }
-      }
+            set
+            {
+                Guid oldValue = _UrlId;
+                SetUrlId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _UrlId = value;
+                }
+            }
+        }
 
 
-      /// <summary>
-      /// Backing field for Name
-      /// </summary>
-      protected string _Name;
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before setting.
-      /// </summary>
-      partial void SetName(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before returning.
-      /// </summary>
-      partial void GetName(ref string result);
+        /// <summary>
+        /// Backing field for Name
+        /// </summary>
+        protected string _Name;
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before setting.
+        /// </summary>
+        partial void SetName(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before returning.
+        /// </summary>
+        partial void GetName(ref string result);
 
 
-      /// <summary>
-      /// Required, Max length = 1024
-      /// </summary>
-      [Required]
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Name
-      {
-         get
-         {
-            string value = _Name;
-            GetName(ref value);
-            return (_Name = value);
-         }
-         set
-         {
-            string oldValue = _Name;
-            SetName(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Required, Max length = 1024
+        /// </summary>
+        [Required]
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Name
+        {
+            get
+            {
+                string value = _Name;
+                GetName(ref value);
+                return (_Name = value);
+            }
+            set
             {
             {
-               _Name = value;
+                string oldValue = _Name;
+                SetName(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Name = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /// <summary>
-      /// Backing field for SourceId
-      /// </summary>
-      protected string _SourceId;
-      /// <summary>
-      /// When provided in a partial class, allows value of SourceId to be changed before setting.
-      /// </summary>
-      partial void SetSourceId(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of SourceId to be changed before returning.
-      /// </summary>
-      partial void GetSourceId(ref string result);
+        /// <summary>
+        /// Backing field for SourceId
+        /// </summary>
+        protected string _SourceId;
+        /// <summary>
+        /// When provided in a partial class, allows value of SourceId to be changed before setting.
+        /// </summary>
+        partial void SetSourceId(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of SourceId to be changed before returning.
+        /// </summary>
+        partial void GetSourceId(ref string result);
 
 
-      /// <summary>
-      /// Max length = 255
-      /// </summary>
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string SourceId
-      {
-         get
-         {
-            string value = _SourceId;
-            GetSourceId(ref value);
-            return (_SourceId = value);
-         }
-         set
-         {
-            string oldValue = _SourceId;
-            SetSourceId(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Max length = 255
+        /// </summary>
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string SourceId
+        {
+            get
             {
             {
-               _SourceId = value;
+                string value = _SourceId;
+                GetSourceId(ref value);
+                return (_SourceId = value);
             }
             }
-         }
-      }
+            set
+            {
+                string oldValue = _SourceId;
+                SetSourceId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _SourceId = value;
+                }
+            }
+        }
 
 
-      /// <summary>
-      /// Backing field for DateAdded
-      /// </summary>
-      protected DateTime _DateAdded;
-      /// <summary>
-      /// When provided in a partial class, allows value of DateAdded to be changed before setting.
-      /// </summary>
-      partial void SetDateAdded(DateTime oldValue, ref DateTime newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of DateAdded to be changed before returning.
-      /// </summary>
-      partial void GetDateAdded(ref DateTime result);
+        /// <summary>
+        /// Backing field for DateAdded
+        /// </summary>
+        protected DateTime _DateAdded;
+        /// <summary>
+        /// When provided in a partial class, allows value of DateAdded to be changed before setting.
+        /// </summary>
+        partial void SetDateAdded(DateTime oldValue, ref DateTime newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of DateAdded to be changed before returning.
+        /// </summary>
+        partial void GetDateAdded(ref DateTime result);
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public DateTime DateAdded
-      {
-         get
-         {
-            DateTime value = _DateAdded;
-            GetDateAdded(ref value);
-            return (_DateAdded = value);
-         }
-         internal set
-         {
-            DateTime oldValue = _DateAdded;
-            SetDateAdded(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public DateTime DateAdded
+        {
+            get
+            {
+                DateTime value = _DateAdded;
+                GetDateAdded(ref value);
+                return (_DateAdded = value);
+            }
+            internal set
             {
             {
-               _DateAdded = value;
+                DateTime oldValue = _DateAdded;
+                SetDateAdded(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _DateAdded = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /// <summary>
-      /// Backing field for DateModified
-      /// </summary>
-      protected DateTime _DateModified;
-      /// <summary>
-      /// When provided in a partial class, allows value of DateModified to be changed before setting.
-      /// </summary>
-      partial void SetDateModified(DateTime oldValue, ref DateTime newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of DateModified to be changed before returning.
-      /// </summary>
-      partial void GetDateModified(ref DateTime result);
+        /// <summary>
+        /// Backing field for DateModified
+        /// </summary>
+        protected DateTime _DateModified;
+        /// <summary>
+        /// When provided in a partial class, allows value of DateModified to be changed before setting.
+        /// </summary>
+        partial void SetDateModified(DateTime oldValue, ref DateTime newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of DateModified to be changed before returning.
+        /// </summary>
+        partial void GetDateModified(ref DateTime result);
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public DateTime DateModified
-      {
-         get
-         {
-            DateTime value = _DateModified;
-            GetDateModified(ref value);
-            return (_DateModified = value);
-         }
-         internal set
-         {
-            DateTime oldValue = _DateModified;
-            SetDateModified(oldValue, ref value);
-            if (oldValue != value)
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public DateTime DateModified
+        {
+            get
+            {
+                DateTime value = _DateModified;
+                GetDateModified(ref value);
+                return (_DateModified = value);
+            }
+            internal set
             {
             {
-               _DateModified = value;
+                DateTime oldValue = _DateModified;
+                SetDateModified(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _DateModified = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.MetadataProviderId> Sources { get; protected set; }
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("MetadataProviderId_Sources_Id")]
+        public virtual ICollection<MetadataProviderId> Sources { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 189 - 190
Jellyfin.Data/Entities/PersonRole.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,195 +9,206 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class PersonRole
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected PersonRole()
-      {
-         // NOTE: This class has one-to-one associations with PersonRole.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         Sources = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MetadataProviderId>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static PersonRole CreatePersonRoleUnsafe()
-      {
-         return new PersonRole();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="type"></param>
-      /// <param name="_metadata0"></param>
-      public PersonRole(global::Jellyfin.Data.Enums.PersonRoleType type, global::Jellyfin.Data.Entities.Metadata _metadata0)
-      {
-         // NOTE: This class has one-to-one associations with PersonRole.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         this.Type = type;
-
-         if (_metadata0 == null) throw new ArgumentNullException(nameof(_metadata0));
-         _metadata0.PersonRoles.Add(this);
-
-         this.Sources = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MetadataProviderId>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="type"></param>
-      /// <param name="_metadata0"></param>
-      public static PersonRole Create(global::Jellyfin.Data.Enums.PersonRoleType type, global::Jellyfin.Data.Entities.Metadata _metadata0)
-      {
-         return new PersonRole(type, _metadata0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("PersonRole")]
+    public partial class PersonRole
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected PersonRole()
+        {
+            // NOTE: This class has one-to-one associations with PersonRole.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            Sources = new HashSet<MetadataProviderId>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static PersonRole CreatePersonRoleUnsafe()
+        {
+            return new PersonRole();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="_metadata0"></param>
+        public PersonRole(Enums.PersonRoleType type, Metadata _metadata0)
+        {
+            // NOTE: This class has one-to-one associations with PersonRole.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            this.Type = type;
+
+            if (_metadata0 == null) throw new ArgumentNullException(nameof(_metadata0));
+            _metadata0.PersonRoles.Add(this);
+
+            this.Sources = new HashSet<MetadataProviderId>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="_metadata0"></param>
+        public static PersonRole Create(Enums.PersonRoleType type, Metadata _metadata0)
+        {
+            return new PersonRole(type, _metadata0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
+            {
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for Role
+        /// </summary>
+        protected string _Role;
+        /// <summary>
+        /// When provided in a partial class, allows value of Role to be changed before setting.
+        /// </summary>
+        partial void SetRole(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Role to be changed before returning.
+        /// </summary>
+        partial void GetRole(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Role
+        {
+            get
             {
             {
-               _Id = value;
+                string value = _Role;
+                GetRole(ref value);
+                return (_Role = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Role
-      /// </summary>
-      protected string _Role;
-      /// <summary>
-      /// When provided in a partial class, allows value of Role to be changed before setting.
-      /// </summary>
-      partial void SetRole(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Role to be changed before returning.
-      /// </summary>
-      partial void GetRole(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Role
-      {
-         get
-         {
-            string value = _Role;
-            GetRole(ref value);
-            return (_Role = value);
-         }
-         set
-         {
-            string oldValue = _Role;
-            SetRole(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Role = value;
+                string oldValue = _Role;
+                SetRole(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Role = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Type
-      /// </summary>
-      protected global::Jellyfin.Data.Enums.PersonRoleType _Type;
-      /// <summary>
-      /// When provided in a partial class, allows value of Type to be changed before setting.
-      /// </summary>
-      partial void SetType(global::Jellyfin.Data.Enums.PersonRoleType oldValue, ref global::Jellyfin.Data.Enums.PersonRoleType newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Type to be changed before returning.
-      /// </summary>
-      partial void GetType(ref global::Jellyfin.Data.Enums.PersonRoleType result);
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public global::Jellyfin.Data.Enums.PersonRoleType Type
-      {
-         get
-         {
-            global::Jellyfin.Data.Enums.PersonRoleType value = _Type;
-            GetType(ref value);
-            return (_Type = value);
-         }
-         set
-         {
-            global::Jellyfin.Data.Enums.PersonRoleType oldValue = _Type;
-            SetType(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Type
+        /// </summary>
+        protected Enums.PersonRoleType _Type;
+        /// <summary>
+        /// When provided in a partial class, allows value of Type to be changed before setting.
+        /// </summary>
+        partial void SetType(Enums.PersonRoleType oldValue, ref Enums.PersonRoleType newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Type to be changed before returning.
+        /// </summary>
+        partial void GetType(ref Enums.PersonRoleType result);
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public Enums.PersonRoleType Type
+        {
+            get
             {
             {
-               _Type = value;
+                Enums.PersonRoleType value = _Type;
+                GetType(ref value);
+                return (_Type = value);
             }
             }
-         }
-      }
+            set
+            {
+                Enums.PersonRoleType oldValue = _Type;
+                SetType(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Type = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /// <summary>
+        /// Required
+        /// </summary>
+        [ForeignKey("Person_Id")]
 
 
-      /// <summary>
-      /// Required
-      /// </summary>
-      public virtual global::Jellyfin.Data.Entities.Person Person { get; set; }
+        public virtual Person Person { get; set; }
 
 
-      public virtual global::Jellyfin.Data.Entities.Artwork Artwork { get; set; }
+        [ForeignKey("Artwork_Artwork_Id")]
+        public virtual Artwork Artwork { get; set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.MetadataProviderId> Sources { get; protected set; }
+        [ForeignKey("MetadataProviderId_Sources_Id")]
+        public virtual ICollection<MetadataProviderId> Sources { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 50 - 60
Jellyfin.Data/Entities/Photo.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,64 +9,66 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Photo: global::Jellyfin.Data.Entities.LibraryItem
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Photo(): base()
-      {
-         PhotoMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.PhotoMetadata>();
-         Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
+    [Table("Photo")]
+    public partial class Photo : LibraryItem
+    {
+        partial void Init();
 
 
-         Init();
-      }
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Photo() : base()
+        {
+            PhotoMetadata = new HashSet<PhotoMetadata>();
+            Releases = new HashSet<Release>();
 
 
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Photo CreatePhotoUnsafe()
-      {
-         return new Photo();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public Photo(Guid urlid, DateTime dateadded)
-      {
-         this.UrlId = urlid;
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Photo CreatePhotoUnsafe()
+        {
+            return new Photo();
+        }
 
 
-         this.PhotoMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.PhotoMetadata>();
-         this.Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public Photo(Guid urlid, DateTime dateadded)
+        {
+            this.UrlId = urlid;
 
 
-         Init();
-      }
+            this.PhotoMetadata = new HashSet<PhotoMetadata>();
+            this.Releases = new HashSet<Release>();
 
 
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public static Photo Create(Guid urlid, DateTime dateadded)
-      {
-         return new Photo(urlid, dateadded);
-      }
+            Init();
+        }
 
 
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public static Photo Create(Guid urlid, DateTime dateadded)
+        {
+            return new Photo(urlid, dateadded);
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.PhotoMetadata> PhotoMetadata { get; protected set; }
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("PhotoMetadata_PhotoMetadata_Id")]
+        public virtual ICollection<PhotoMetadata> PhotoMetadata { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Release> Releases { get; protected set; }
+        [ForeignKey("Release_Releases_Id")]
+        public virtual ICollection<Release> Releases { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 51 - 62
Jellyfin.Data/Entities/PhotoMetadata.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,66 +9,67 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class PhotoMetadata: global::Jellyfin.Data.Entities.Metadata
-   {
-      partial void Init();
+    [Table("PhotoMetadata")]
+    public partial class PhotoMetadata : Metadata
+    {
+        partial void Init();
 
 
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected PhotoMetadata(): base()
-      {
-         Init();
-      }
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected PhotoMetadata() : base()
+        {
+            Init();
+        }
 
 
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static PhotoMetadata CreatePhotoMetadataUnsafe()
-      {
-         return new PhotoMetadata();
-      }
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static PhotoMetadata CreatePhotoMetadataUnsafe()
+        {
+            return new PhotoMetadata();
+        }
 
 
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_photo0"></param>
-      public PhotoMetadata(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Photo _photo0)
-      {
-         if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
-         this.Title = title;
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_photo0"></param>
+        public PhotoMetadata(string title, string language, DateTime dateadded, DateTime datemodified, Photo _photo0)
+        {
+            if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
+            this.Title = title;
 
 
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
 
 
-         if (_photo0 == null) throw new ArgumentNullException(nameof(_photo0));
-         _photo0.PhotoMetadata.Add(this);
+            if (_photo0 == null) throw new ArgumentNullException(nameof(_photo0));
+            _photo0.PhotoMetadata.Add(this);
 
 
 
 
-         Init();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_photo0"></param>
-      public static PhotoMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Photo _photo0)
-      {
-         return new PhotoMetadata(title, language, dateadded, datemodified, _photo0);
-      }
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_photo0"></param>
+        public static PhotoMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, Photo _photo0)
+        {
+            return new PhotoMetadata(title, language, dateadded, datemodified, _photo0);
+        }
 
 
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 100 - 104
Jellyfin.Data/Entities/Preference.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,97 +9,105 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Preference
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Preference()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Preference CreatePreferenceUnsafe()
-      {
-         return new Preference();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="kind"></param>
-      /// <param name="value"></param>
-      /// <param name="_user0"></param>
-      /// <param name="_group1"></param>
-      public Preference(global::Jellyfin.Data.Enums.PreferenceKind kind, string value, global::Jellyfin.Data.Entities.User _user0, global::Jellyfin.Data.Entities.Group _group1)
-      {
-         this.Kind = kind;
-
-         if (string.IsNullOrEmpty(value)) throw new ArgumentNullException(nameof(value));
-         this.Value = value;
-
-         if (_user0 == null) throw new ArgumentNullException(nameof(_user0));
-         _user0.Preferences.Add(this);
-
-         if (_group1 == null) throw new ArgumentNullException(nameof(_group1));
-         _group1.Preferences.Add(this);
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="kind"></param>
-      /// <param name="value"></param>
-      /// <param name="_user0"></param>
-      /// <param name="_group1"></param>
-      public static Preference Create(global::Jellyfin.Data.Enums.PreferenceKind kind, string value, global::Jellyfin.Data.Entities.User _user0, global::Jellyfin.Data.Entities.Group _group1)
-      {
-         return new Preference(kind, value, _user0, _group1);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id { get; protected set; }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public global::Jellyfin.Data.Enums.PreferenceKind Kind { get; set; }
-
-      /// <summary>
-      /// Required, Max length = 65535
-      /// </summary>
-      [Required]
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string Value { get; set; }
-
-      /// <summary>
-      /// Concurrency token
-      /// </summary>
-      [Timestamp]
-      public Byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-   }
+    [Table("Preference")]
+    public partial class Preference
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Preference()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Preference CreatePreferenceUnsafe()
+        {
+            return new Preference();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="kind"></param>
+        /// <param name="value"></param>
+        /// <param name="_user0"></param>
+        /// <param name="_group1"></param>
+        public Preference(Enums.PreferenceKind kind, string value, User _user0, Group _group1)
+        {
+            this.Kind = kind;
+
+            if (string.IsNullOrEmpty(value)) throw new ArgumentNullException(nameof(value));
+            this.Value = value;
+
+            if (_user0 == null) throw new ArgumentNullException(nameof(_user0));
+            _user0.Preferences.Add(this);
+
+            if (_group1 == null) throw new ArgumentNullException(nameof(_group1));
+            _group1.Preferences.Add(this);
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="kind"></param>
+        /// <param name="value"></param>
+        /// <param name="_user0"></param>
+        /// <param name="_group1"></param>
+        public static Preference Create(Enums.PreferenceKind kind, string value, User _user0, Group _group1)
+        {
+            return new Preference(kind, value, _user0, _group1);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; protected set; }
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public Enums.PreferenceKind Kind { get; set; }
+
+        /// <summary>
+        /// Required, Max length = 65535
+        /// </summary>
+        [Required]
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string Value { get; set; }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+
+    }
 }
 }
 
 

+ 0 - 27
Jellyfin.Data/Entities/PreferenceKind.cs

@@ -1,27 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-
-namespace Jellyfin.Data.Enums
-{
-   public enum PreferenceKind : Int32
-   {
-      MaxParentalRating,
-      BlockedTags,
-      RemoteClientBitrateLimit,
-      EnabledDevices,
-      EnabledChannels,
-      EnabledFolders,
-      EnableContentDeletionFromFolders
-   }
-}

+ 116 - 120
Jellyfin.Data/Entities/ProviderMapping.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,113 +9,121 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class ProviderMapping
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected ProviderMapping()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static ProviderMapping CreateProviderMappingUnsafe()
-      {
-         return new ProviderMapping();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="providername"></param>
-      /// <param name="providersecrets"></param>
-      /// <param name="providerdata"></param>
-      /// <param name="_user0"></param>
-      /// <param name="_group1"></param>
-      public ProviderMapping(string providername, string providersecrets, string providerdata, global::Jellyfin.Data.Entities.User _user0, global::Jellyfin.Data.Entities.Group _group1)
-      {
-         if (string.IsNullOrEmpty(providername)) throw new ArgumentNullException(nameof(providername));
-         this.ProviderName = providername;
-
-         if (string.IsNullOrEmpty(providersecrets)) throw new ArgumentNullException(nameof(providersecrets));
-         this.ProviderSecrets = providersecrets;
-
-         if (string.IsNullOrEmpty(providerdata)) throw new ArgumentNullException(nameof(providerdata));
-         this.ProviderData = providerdata;
-
-         if (_user0 == null) throw new ArgumentNullException(nameof(_user0));
-         _user0.ProviderMappings.Add(this);
-
-         if (_group1 == null) throw new ArgumentNullException(nameof(_group1));
-         _group1.ProviderMappings.Add(this);
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="providername"></param>
-      /// <param name="providersecrets"></param>
-      /// <param name="providerdata"></param>
-      /// <param name="_user0"></param>
-      /// <param name="_group1"></param>
-      public static ProviderMapping Create(string providername, string providersecrets, string providerdata, global::Jellyfin.Data.Entities.User _user0, global::Jellyfin.Data.Entities.Group _group1)
-      {
-         return new ProviderMapping(providername, providersecrets, providerdata, _user0, _group1);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id { get; protected set; }
-
-      /// <summary>
-      /// Required, Max length = 255
-      /// </summary>
-      [Required]
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string ProviderName { get; set; }
-
-      /// <summary>
-      /// Required, Max length = 65535
-      /// </summary>
-      [Required]
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string ProviderSecrets { get; set; }
-
-      /// <summary>
-      /// Required, Max length = 65535
-      /// </summary>
-      [Required]
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string ProviderData { get; set; }
-
-      /// <summary>
-      /// Concurrency token
-      /// </summary>
-      [Timestamp]
-      public Byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-   }
+    [Table("ProviderMapping")]
+    public partial class ProviderMapping
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected ProviderMapping()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static ProviderMapping CreateProviderMappingUnsafe()
+        {
+            return new ProviderMapping();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="providername"></param>
+        /// <param name="providersecrets"></param>
+        /// <param name="providerdata"></param>
+        /// <param name="_user0"></param>
+        /// <param name="_group1"></param>
+        public ProviderMapping(string providername, string providersecrets, string providerdata, User _user0, Group _group1)
+        {
+            if (string.IsNullOrEmpty(providername)) throw new ArgumentNullException(nameof(providername));
+            this.ProviderName = providername;
+
+            if (string.IsNullOrEmpty(providersecrets)) throw new ArgumentNullException(nameof(providersecrets));
+            this.ProviderSecrets = providersecrets;
+
+            if (string.IsNullOrEmpty(providerdata)) throw new ArgumentNullException(nameof(providerdata));
+            this.ProviderData = providerdata;
+
+            if (_user0 == null) throw new ArgumentNullException(nameof(_user0));
+            _user0.ProviderMappings.Add(this);
+
+            if (_group1 == null) throw new ArgumentNullException(nameof(_group1));
+            _group1.ProviderMappings.Add(this);
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="providername"></param>
+        /// <param name="providersecrets"></param>
+        /// <param name="providerdata"></param>
+        /// <param name="_user0"></param>
+        /// <param name="_group1"></param>
+        public static ProviderMapping Create(string providername, string providersecrets, string providerdata, User _user0, Group _group1)
+        {
+            return new ProviderMapping(providername, providersecrets, providerdata, _user0, _group1);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; protected set; }
+
+        /// <summary>
+        /// Required, Max length = 255
+        /// </summary>
+        [Required]
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string ProviderName { get; set; }
+
+        /// <summary>
+        /// Required, Max length = 65535
+        /// </summary>
+        [Required]
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string ProviderSecrets { get; set; }
+
+        /// <summary>
+        /// Required, Max length = 65535
+        /// </summary>
+        [Required]
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string ProviderData { get; set; }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+
+    }
 }
 }
 
 

+ 174 - 178
Jellyfin.Data/Entities/Rating.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,177 +9,185 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Rating
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Rating()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Rating CreateRatingUnsafe()
-      {
-         return new Rating();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="value"></param>
-      /// <param name="_metadata0"></param>
-      public Rating(double value, global::Jellyfin.Data.Entities.Metadata _metadata0)
-      {
-         this.Value = value;
-
-         if (_metadata0 == null) throw new ArgumentNullException(nameof(_metadata0));
-         _metadata0.Ratings.Add(this);
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="value"></param>
-      /// <param name="_metadata0"></param>
-      public static Rating Create(double value, global::Jellyfin.Data.Entities.Metadata _metadata0)
-      {
-         return new Rating(value, _metadata0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Rating")]
+    public partial class Rating
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Rating()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Rating CreateRatingUnsafe()
+        {
+            return new Rating();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="_metadata0"></param>
+        public Rating(double value, Metadata _metadata0)
+        {
+            this.Value = value;
+
+            if (_metadata0 == null) throw new ArgumentNullException(nameof(_metadata0));
+            _metadata0.Ratings.Add(this);
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="_metadata0"></param>
+        public static Rating Create(double value, Metadata _metadata0)
+        {
+            return new Rating(value, _metadata0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
+            {
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
+            }
+            protected set
+            {
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for Value
+        /// </summary>
+        protected double _Value;
+        /// <summary>
+        /// When provided in a partial class, allows value of Value to be changed before setting.
+        /// </summary>
+        partial void SetValue(double oldValue, ref double newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Value to be changed before returning.
+        /// </summary>
+        partial void GetValue(ref double result);
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public double Value
+        {
+            get
+            {
+                double value = _Value;
+                GetValue(ref value);
+                return (_Value = value);
+            }
+            set
             {
             {
-               _Id = value;
+                double oldValue = _Value;
+                SetValue(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Value = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Value
-      /// </summary>
-      protected double _Value;
-      /// <summary>
-      /// When provided in a partial class, allows value of Value to be changed before setting.
-      /// </summary>
-      partial void SetValue(double oldValue, ref double newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Value to be changed before returning.
-      /// </summary>
-      partial void GetValue(ref double result);
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public double Value
-      {
-         get
-         {
-            double value = _Value;
-            GetValue(ref value);
-            return (_Value = value);
-         }
-         set
-         {
-            double oldValue = _Value;
-            SetValue(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Votes
+        /// </summary>
+        protected int? _Votes;
+        /// <summary>
+        /// When provided in a partial class, allows value of Votes to be changed before setting.
+        /// </summary>
+        partial void SetVotes(int? oldValue, ref int? newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Votes to be changed before returning.
+        /// </summary>
+        partial void GetVotes(ref int? result);
+
+        public int? Votes
+        {
+            get
             {
             {
-               _Value = value;
+                int? value = _Votes;
+                GetVotes(ref value);
+                return (_Votes = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Votes
-      /// </summary>
-      protected int? _Votes;
-      /// <summary>
-      /// When provided in a partial class, allows value of Votes to be changed before setting.
-      /// </summary>
-      partial void SetVotes(int? oldValue, ref int? newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Votes to be changed before returning.
-      /// </summary>
-      partial void GetVotes(ref int? result);
-
-      public int? Votes
-      {
-         get
-         {
-            int? value = _Votes;
-            GetVotes(ref value);
-            return (_Votes = value);
-         }
-         set
-         {
-            int? oldValue = _Votes;
-            SetVotes(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Votes = value;
+                int? oldValue = _Votes;
+                SetVotes(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Votes = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      /// <summary>
-      /// If this is NULL it&apos;s the internal user rating.
-      /// </summary>
-      public virtual global::Jellyfin.Data.Entities.RatingSource RatingType { get; set; }
-
-   }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+
+        /// <summary>
+        /// If this is NULL it&apos;s the internal user rating.
+        /// </summary>
+        [ForeignKey("RatingSource_RatingType_Id")]
+        public virtual RatingSource RatingType { get; set; }
+
+    }
 }
 }
 
 

+ 216 - 221
Jellyfin.Data/Entities/RatingSource.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,222 +9,229 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   /// <summary>
-   /// This is the entity to store review ratings, not age ratings
-   /// </summary>
-   public partial class RatingSource
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected RatingSource()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static RatingSource CreateRatingSourceUnsafe()
-      {
-         return new RatingSource();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="maximumvalue"></param>
-      /// <param name="minimumvalue"></param>
-      /// <param name="_rating0"></param>
-      public RatingSource(double maximumvalue, double minimumvalue, global::Jellyfin.Data.Entities.Rating _rating0)
-      {
-         this.MaximumValue = maximumvalue;
-
-         this.MinimumValue = minimumvalue;
-
-         if (_rating0 == null) throw new ArgumentNullException(nameof(_rating0));
-         _rating0.RatingType = this;
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="maximumvalue"></param>
-      /// <param name="minimumvalue"></param>
-      /// <param name="_rating0"></param>
-      public static RatingSource Create(double maximumvalue, double minimumvalue, global::Jellyfin.Data.Entities.Rating _rating0)
-      {
-         return new RatingSource(maximumvalue, minimumvalue, _rating0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    /// <summary>
+    /// This is the entity to store review ratings, not age ratings
+    /// </summary>
+    [Table("RatingSource")]
+    public partial class RatingSource
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected RatingSource()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static RatingSource CreateRatingSourceUnsafe()
+        {
+            return new RatingSource();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="maximumvalue"></param>
+        /// <param name="minimumvalue"></param>
+        /// <param name="_rating0"></param>
+        public RatingSource(double maximumvalue, double minimumvalue, Rating _rating0)
+        {
+            this.MaximumValue = maximumvalue;
+
+            this.MinimumValue = minimumvalue;
+
+            if (_rating0 == null) throw new ArgumentNullException(nameof(_rating0));
+            _rating0.RatingType = this;
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="maximumvalue"></param>
+        /// <param name="minimumvalue"></param>
+        /// <param name="_rating0"></param>
+        public static RatingSource Create(double maximumvalue, double minimumvalue, Rating _rating0)
+        {
+            return new RatingSource(maximumvalue, minimumvalue, _rating0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
             {
             {
-               _Id = value;
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Name
-      /// </summary>
-      protected string _Name;
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before setting.
-      /// </summary>
-      partial void SetName(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before returning.
-      /// </summary>
-      partial void GetName(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Name
-      {
-         get
-         {
-            string value = _Name;
-            GetName(ref value);
-            return (_Name = value);
-         }
-         set
-         {
-            string oldValue = _Name;
-            SetName(oldValue, ref value);
-            if (oldValue != value)
+            protected set
             {
             {
-               _Name = value;
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for MaximumValue
-      /// </summary>
-      protected double _MaximumValue;
-      /// <summary>
-      /// When provided in a partial class, allows value of MaximumValue to be changed before setting.
-      /// </summary>
-      partial void SetMaximumValue(double oldValue, ref double newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of MaximumValue to be changed before returning.
-      /// </summary>
-      partial void GetMaximumValue(ref double result);
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public double MaximumValue
-      {
-         get
-         {
-            double value = _MaximumValue;
-            GetMaximumValue(ref value);
-            return (_MaximumValue = value);
-         }
-         set
-         {
-            double oldValue = _MaximumValue;
-            SetMaximumValue(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Name
+        /// </summary>
+        protected string _Name;
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before setting.
+        /// </summary>
+        partial void SetName(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before returning.
+        /// </summary>
+        partial void GetName(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Name
+        {
+            get
             {
             {
-               _MaximumValue = value;
+                string value = _Name;
+                GetName(ref value);
+                return (_Name = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for MinimumValue
-      /// </summary>
-      protected double _MinimumValue;
-      /// <summary>
-      /// When provided in a partial class, allows value of MinimumValue to be changed before setting.
-      /// </summary>
-      partial void SetMinimumValue(double oldValue, ref double newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of MinimumValue to be changed before returning.
-      /// </summary>
-      partial void GetMinimumValue(ref double result);
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public double MinimumValue
-      {
-         get
-         {
-            double value = _MinimumValue;
-            GetMinimumValue(ref value);
-            return (_MinimumValue = value);
-         }
-         set
-         {
-            double oldValue = _MinimumValue;
-            SetMinimumValue(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _MinimumValue = value;
+                string oldValue = _Name;
+                SetName(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Name = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      public virtual global::Jellyfin.Data.Entities.MetadataProviderId Source { get; set; }
-
-   }
+        }
+
+        /// <summary>
+        /// Backing field for MaximumValue
+        /// </summary>
+        protected double _MaximumValue;
+        /// <summary>
+        /// When provided in a partial class, allows value of MaximumValue to be changed before setting.
+        /// </summary>
+        partial void SetMaximumValue(double oldValue, ref double newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of MaximumValue to be changed before returning.
+        /// </summary>
+        partial void GetMaximumValue(ref double result);
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public double MaximumValue
+        {
+            get
+            {
+                double value = _MaximumValue;
+                GetMaximumValue(ref value);
+                return (_MaximumValue = value);
+            }
+            set
+            {
+                double oldValue = _MaximumValue;
+                SetMaximumValue(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _MaximumValue = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for MinimumValue
+        /// </summary>
+        protected double _MinimumValue;
+        /// <summary>
+        /// When provided in a partial class, allows value of MinimumValue to be changed before setting.
+        /// </summary>
+        partial void SetMinimumValue(double oldValue, ref double newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of MinimumValue to be changed before returning.
+        /// </summary>
+        partial void GetMinimumValue(ref double result);
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public double MinimumValue
+        {
+            get
+            {
+                double value = _MinimumValue;
+                GetMinimumValue(ref value);
+                return (_MinimumValue = value);
+            }
+            set
+            {
+                double oldValue = _MinimumValue;
+                SetMinimumValue(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _MinimumValue = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("MetadataProviderId_Source_Id")]
+        public virtual MetadataProviderId Source { get; set; }
+
+    }
 }
 }
 
 

+ 176 - 180
Jellyfin.Data/Entities/Release.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,177 +9,185 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Release
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Release()
-      {
-         MediaFiles = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MediaFile>();
-         Chapters = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Chapter>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Release CreateReleaseUnsafe()
-      {
-         return new Release();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="name"></param>
-      /// <param name="_movie0"></param>
-      /// <param name="_episode1"></param>
-      /// <param name="_track2"></param>
-      /// <param name="_customitem3"></param>
-      /// <param name="_book4"></param>
-      /// <param name="_photo5"></param>
-      public Release(string name, global::Jellyfin.Data.Entities.Movie _movie0, global::Jellyfin.Data.Entities.Episode _episode1, global::Jellyfin.Data.Entities.Track _track2, global::Jellyfin.Data.Entities.CustomItem _customitem3, global::Jellyfin.Data.Entities.Book _book4, global::Jellyfin.Data.Entities.Photo _photo5)
-      {
-         if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
-         this.Name = name;
-
-         if (_movie0 == null) throw new ArgumentNullException(nameof(_movie0));
-         _movie0.Releases.Add(this);
-
-         if (_episode1 == null) throw new ArgumentNullException(nameof(_episode1));
-         _episode1.Releases.Add(this);
-
-         if (_track2 == null) throw new ArgumentNullException(nameof(_track2));
-         _track2.Releases.Add(this);
-
-         if (_customitem3 == null) throw new ArgumentNullException(nameof(_customitem3));
-         _customitem3.Releases.Add(this);
-
-         if (_book4 == null) throw new ArgumentNullException(nameof(_book4));
-         _book4.Releases.Add(this);
-
-         if (_photo5 == null) throw new ArgumentNullException(nameof(_photo5));
-         _photo5.Releases.Add(this);
-
-         this.MediaFiles = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.MediaFile>();
-         this.Chapters = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Chapter>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="name"></param>
-      /// <param name="_movie0"></param>
-      /// <param name="_episode1"></param>
-      /// <param name="_track2"></param>
-      /// <param name="_customitem3"></param>
-      /// <param name="_book4"></param>
-      /// <param name="_photo5"></param>
-      public static Release Create(string name, global::Jellyfin.Data.Entities.Movie _movie0, global::Jellyfin.Data.Entities.Episode _episode1, global::Jellyfin.Data.Entities.Track _track2, global::Jellyfin.Data.Entities.CustomItem _customitem3, global::Jellyfin.Data.Entities.Book _book4, global::Jellyfin.Data.Entities.Photo _photo5)
-      {
-         return new Release(name, _movie0, _episode1, _track2, _customitem3, _book4, _photo5);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Id
-      /// </summary>
-      internal int _Id;
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before setting.
-      /// </summary>
-      partial void SetId(int oldValue, ref int newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Id to be changed before returning.
-      /// </summary>
-      partial void GetId(ref int result);
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public int Id
-      {
-         get
-         {
-            int value = _Id;
-            GetId(ref value);
-            return (_Id = value);
-         }
-         protected set
-         {
-            int oldValue = _Id;
-            SetId(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Release")]
+    public partial class Release
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Release()
+        {
+            MediaFiles = new HashSet<MediaFile>();
+            Chapters = new HashSet<Chapter>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Release CreateReleaseUnsafe()
+        {
+            return new Release();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="_movie0"></param>
+        /// <param name="_episode1"></param>
+        /// <param name="_track2"></param>
+        /// <param name="_customitem3"></param>
+        /// <param name="_book4"></param>
+        /// <param name="_photo5"></param>
+        public Release(string name, Movie _movie0, Episode _episode1, Track _track2, CustomItem _customitem3, Book _book4, Photo _photo5)
+        {
+            if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name));
+            this.Name = name;
+
+            if (_movie0 == null) throw new ArgumentNullException(nameof(_movie0));
+            _movie0.Releases.Add(this);
+
+            if (_episode1 == null) throw new ArgumentNullException(nameof(_episode1));
+            _episode1.Releases.Add(this);
+
+            if (_track2 == null) throw new ArgumentNullException(nameof(_track2));
+            _track2.Releases.Add(this);
+
+            if (_customitem3 == null) throw new ArgumentNullException(nameof(_customitem3));
+            _customitem3.Releases.Add(this);
+
+            if (_book4 == null) throw new ArgumentNullException(nameof(_book4));
+            _book4.Releases.Add(this);
+
+            if (_photo5 == null) throw new ArgumentNullException(nameof(_photo5));
+            _photo5.Releases.Add(this);
+
+            this.MediaFiles = new HashSet<MediaFile>();
+            this.Chapters = new HashSet<Chapter>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="_movie0"></param>
+        /// <param name="_episode1"></param>
+        /// <param name="_track2"></param>
+        /// <param name="_customitem3"></param>
+        /// <param name="_book4"></param>
+        /// <param name="_photo5"></param>
+        public static Release Create(string name, Movie _movie0, Episode _episode1, Track _track2, CustomItem _customitem3, Book _book4, Photo _photo5)
+        {
+            return new Release(name, _movie0, _episode1, _track2, _customitem3, _book4, _photo5);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Id
+        /// </summary>
+        internal int _Id;
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before setting.
+        /// </summary>
+        partial void SetId(int oldValue, ref int newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Id to be changed before returning.
+        /// </summary>
+        partial void GetId(ref int result);
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id
+        {
+            get
             {
             {
-               _Id = value;
+                int value = _Id;
+                GetId(ref value);
+                return (_Id = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Name
-      /// </summary>
-      protected string _Name;
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before setting.
-      /// </summary>
-      partial void SetName(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Name to be changed before returning.
-      /// </summary>
-      partial void GetName(ref string result);
-
-      /// <summary>
-      /// Required, Max length = 1024
-      /// </summary>
-      [Required]
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Name
-      {
-         get
-         {
-            string value = _Name;
-            GetName(ref value);
-            return (_Name = value);
-         }
-         set
-         {
-            string oldValue = _Name;
-            SetName(oldValue, ref value);
-            if (oldValue != value)
+            protected set
             {
             {
-               _Name = value;
+                int oldValue = _Id;
+                SetId(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Id = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] Timestamp { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      public virtual ICollection<global::Jellyfin.Data.Entities.MediaFile> MediaFiles { get; protected set; }
-
-      public virtual ICollection<global::Jellyfin.Data.Entities.Chapter> Chapters { get; protected set; }
-
-   }
+        }
+
+        /// <summary>
+        /// Backing field for Name
+        /// </summary>
+        protected string _Name;
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before setting.
+        /// </summary>
+        partial void SetName(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Name to be changed before returning.
+        /// </summary>
+        partial void GetName(ref string result);
+
+        /// <summary>
+        /// Required, Max length = 1024
+        /// </summary>
+        [Required]
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Name
+        {
+            get
+            {
+                string value = _Name;
+                GetName(ref value);
+                return (_Name = value);
+            }
+            set
+            {
+                string oldValue = _Name;
+                SetName(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Name = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("MediaFile_MediaFiles_Id")]
+        public virtual ICollection<MediaFile> MediaFiles { get; protected set; }
+
+        [ForeignKey("Chapter_Chapters_Id")]
+        public virtual ICollection<Chapter> Chapters { get; protected set; }
+
+    }
 }
 }
 
 

+ 99 - 109
Jellyfin.Data/Entities/Season.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,107 +9,109 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Season: global::Jellyfin.Data.Entities.LibraryItem
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Season(): base()
-      {
-         // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         SeasonMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.SeasonMetadata>();
-         Episodes = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Episode>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Season CreateSeasonUnsafe()
-      {
-         return new Season();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      /// <param name="_series0"></param>
-      public Season(Guid urlid, DateTime dateadded, global::Jellyfin.Data.Entities.Series _series0)
-      {
-         // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         this.UrlId = urlid;
-
-         if (_series0 == null) throw new ArgumentNullException(nameof(_series0));
-         _series0.Seasons.Add(this);
-
-         this.SeasonMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.SeasonMetadata>();
-         this.Episodes = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Episode>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      /// <param name="_series0"></param>
-      public static Season Create(Guid urlid, DateTime dateadded, global::Jellyfin.Data.Entities.Series _series0)
-      {
-         return new Season(urlid, dateadded, _series0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for SeasonNumber
-      /// </summary>
-      protected int? _SeasonNumber;
-      /// <summary>
-      /// When provided in a partial class, allows value of SeasonNumber to be changed before setting.
-      /// </summary>
-      partial void SetSeasonNumber(int? oldValue, ref int? newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of SeasonNumber to be changed before returning.
-      /// </summary>
-      partial void GetSeasonNumber(ref int? result);
-
-      public int? SeasonNumber
-      {
-         get
-         {
-            int? value = _SeasonNumber;
-            GetSeasonNumber(ref value);
-            return (_SeasonNumber = value);
-         }
-         set
-         {
-            int? oldValue = _SeasonNumber;
-            SetSeasonNumber(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Season")]
+    public partial class Season : LibraryItem
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Season() : base()
+        {
+            // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            SeasonMetadata = new HashSet<SeasonMetadata>();
+            Episodes = new HashSet<Episode>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Season CreateSeasonUnsafe()
+        {
+            return new Season();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        /// <param name="_series0"></param>
+        public Season(Guid urlid, DateTime dateadded, Series _series0)
+        {
+            // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            this.UrlId = urlid;
+
+            if (_series0 == null) throw new ArgumentNullException(nameof(_series0));
+            _series0.Seasons.Add(this);
+
+            this.SeasonMetadata = new HashSet<SeasonMetadata>();
+            this.Episodes = new HashSet<Episode>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        /// <param name="_series0"></param>
+        public static Season Create(Guid urlid, DateTime dateadded, Series _series0)
+        {
+            return new Season(urlid, dateadded, _series0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for SeasonNumber
+        /// </summary>
+        protected int? _SeasonNumber;
+        /// <summary>
+        /// When provided in a partial class, allows value of SeasonNumber to be changed before setting.
+        /// </summary>
+        partial void SetSeasonNumber(int? oldValue, ref int? newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of SeasonNumber to be changed before returning.
+        /// </summary>
+        partial void GetSeasonNumber(ref int? result);
+
+        public int? SeasonNumber
+        {
+            get
             {
             {
-               _SeasonNumber = value;
+                int? value = _SeasonNumber;
+                GetSeasonNumber(ref value);
+                return (_SeasonNumber = value);
             }
             }
-         }
-      }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+            set
+            {
+                int? oldValue = _SeasonNumber;
+                SetSeasonNumber(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _SeasonNumber = value;
+                }
+            }
+        }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.SeasonMetadata> SeasonMetadata { get; protected set; }
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("SeasonMetadata_SeasonMetadata_Id")]
+        public virtual ICollection<SeasonMetadata> SeasonMetadata { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Episode> Episodes { get; protected set; }
+        [ForeignKey("Episode_Episodes_Id")]
+        public virtual ICollection<Episode> Episodes { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 95 - 106
Jellyfin.Data/Entities/SeasonMetadata.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,103 +9,104 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class SeasonMetadata: global::Jellyfin.Data.Entities.Metadata
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected SeasonMetadata(): base()
-      {
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static SeasonMetadata CreateSeasonMetadataUnsafe()
-      {
-         return new SeasonMetadata();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_season0"></param>
-      public SeasonMetadata(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Season _season0)
-      {
-         if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
-         this.Title = title;
-
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
-
-         if (_season0 == null) throw new ArgumentNullException(nameof(_season0));
-         _season0.SeasonMetadata.Add(this);
-
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_season0"></param>
-      public static SeasonMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Season _season0)
-      {
-         return new SeasonMetadata(title, language, dateadded, datemodified, _season0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Outline
-      /// </summary>
-      protected string _Outline;
-      /// <summary>
-      /// When provided in a partial class, allows value of Outline to be changed before setting.
-      /// </summary>
-      partial void SetOutline(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Outline to be changed before returning.
-      /// </summary>
-      partial void GetOutline(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Outline
-      {
-         get
-         {
-            string value = _Outline;
-            GetOutline(ref value);
-            return (_Outline = value);
-         }
-         set
-         {
-            string oldValue = _Outline;
-            SetOutline(oldValue, ref value);
-            if (oldValue != value)
+    [Table("SeasonMetadata")]
+    public partial class SeasonMetadata : Metadata
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected SeasonMetadata() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static SeasonMetadata CreateSeasonMetadataUnsafe()
+        {
+            return new SeasonMetadata();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_season0"></param>
+        public SeasonMetadata(string title, string language, DateTime dateadded, DateTime datemodified, Season _season0)
+        {
+            if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
+            this.Title = title;
+
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
+
+            if (_season0 == null) throw new ArgumentNullException(nameof(_season0));
+            _season0.SeasonMetadata.Add(this);
+
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_season0"></param>
+        public static SeasonMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, Season _season0)
+        {
+            return new SeasonMetadata(title, language, dateadded, datemodified, _season0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Outline
+        /// </summary>
+        protected string _Outline;
+        /// <summary>
+        /// When provided in a partial class, allows value of Outline to be changed before setting.
+        /// </summary>
+        partial void SetOutline(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Outline to be changed before returning.
+        /// </summary>
+        partial void GetOutline(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Outline
+        {
+            get
+            {
+                string value = _Outline;
+                GetOutline(ref value);
+                return (_Outline = value);
+            }
+            set
             {
             {
-               _Outline = value;
+                string oldValue = _Outline;
+                SetOutline(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Outline = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 151 - 161
Jellyfin.Data/Entities/Series.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,163 +9,165 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Series: global::Jellyfin.Data.Entities.LibraryItem
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Series(): base()
-      {
-         SeriesMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.SeriesMetadata>();
-         Seasons = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Season>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Series CreateSeriesUnsafe()
-      {
-         return new Series();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public Series(Guid urlid, DateTime dateadded)
-      {
-         this.UrlId = urlid;
-
-         this.SeriesMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.SeriesMetadata>();
-         this.Seasons = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Season>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      public static Series Create(Guid urlid, DateTime dateadded)
-      {
-         return new Series(urlid, dateadded);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for AirsDayOfWeek
-      /// </summary>
-      protected global::Jellyfin.Data.Enums.Weekday? _AirsDayOfWeek;
-      /// <summary>
-      /// When provided in a partial class, allows value of AirsDayOfWeek to be changed before setting.
-      /// </summary>
-      partial void SetAirsDayOfWeek(global::Jellyfin.Data.Enums.Weekday? oldValue, ref global::Jellyfin.Data.Enums.Weekday? newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of AirsDayOfWeek to be changed before returning.
-      /// </summary>
-      partial void GetAirsDayOfWeek(ref global::Jellyfin.Data.Enums.Weekday? result);
-
-      public global::Jellyfin.Data.Enums.Weekday? AirsDayOfWeek
-      {
-         get
-         {
-            global::Jellyfin.Data.Enums.Weekday? value = _AirsDayOfWeek;
-            GetAirsDayOfWeek(ref value);
-            return (_AirsDayOfWeek = value);
-         }
-         set
-         {
-            global::Jellyfin.Data.Enums.Weekday? oldValue = _AirsDayOfWeek;
-            SetAirsDayOfWeek(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Series")]
+    public partial class Series : LibraryItem
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Series() : base()
+        {
+            SeriesMetadata = new HashSet<SeriesMetadata>();
+            Seasons = new HashSet<Season>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Series CreateSeriesUnsafe()
+        {
+            return new Series();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public Series(Guid urlid, DateTime dateadded)
+        {
+            this.UrlId = urlid;
+
+            this.SeriesMetadata = new HashSet<SeriesMetadata>();
+            this.Seasons = new HashSet<Season>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        public static Series Create(Guid urlid, DateTime dateadded)
+        {
+            return new Series(urlid, dateadded);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for AirsDayOfWeek
+        /// </summary>
+        protected Enums.Weekday? _AirsDayOfWeek;
+        /// <summary>
+        /// When provided in a partial class, allows value of AirsDayOfWeek to be changed before setting.
+        /// </summary>
+        partial void SetAirsDayOfWeek(Enums.Weekday? oldValue, ref Enums.Weekday? newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of AirsDayOfWeek to be changed before returning.
+        /// </summary>
+        partial void GetAirsDayOfWeek(ref Enums.Weekday? result);
+
+        public Enums.Weekday? AirsDayOfWeek
+        {
+            get
             {
             {
-               _AirsDayOfWeek = value;
+                Enums.Weekday? value = _AirsDayOfWeek;
+                GetAirsDayOfWeek(ref value);
+                return (_AirsDayOfWeek = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for AirsTime
-      /// </summary>
-      protected DateTimeOffset? _AirsTime;
-      /// <summary>
-      /// When provided in a partial class, allows value of AirsTime to be changed before setting.
-      /// </summary>
-      partial void SetAirsTime(DateTimeOffset? oldValue, ref DateTimeOffset? newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of AirsTime to be changed before returning.
-      /// </summary>
-      partial void GetAirsTime(ref DateTimeOffset? result);
-
-      /// <summary>
-      /// The time the show airs, ignore the date portion
-      /// </summary>
-      public DateTimeOffset? AirsTime
-      {
-         get
-         {
-            DateTimeOffset? value = _AirsTime;
-            GetAirsTime(ref value);
-            return (_AirsTime = value);
-         }
-         set
-         {
-            DateTimeOffset? oldValue = _AirsTime;
-            SetAirsTime(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _AirsTime = value;
+                Enums.Weekday? oldValue = _AirsDayOfWeek;
+                SetAirsDayOfWeek(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _AirsDayOfWeek = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for FirstAired
-      /// </summary>
-      protected DateTimeOffset? _FirstAired;
-      /// <summary>
-      /// When provided in a partial class, allows value of FirstAired to be changed before setting.
-      /// </summary>
-      partial void SetFirstAired(DateTimeOffset? oldValue, ref DateTimeOffset? newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of FirstAired to be changed before returning.
-      /// </summary>
-      partial void GetFirstAired(ref DateTimeOffset? result);
-
-      public DateTimeOffset? FirstAired
-      {
-         get
-         {
-            DateTimeOffset? value = _FirstAired;
-            GetFirstAired(ref value);
-            return (_FirstAired = value);
-         }
-         set
-         {
-            DateTimeOffset? oldValue = _FirstAired;
-            SetFirstAired(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for AirsTime
+        /// </summary>
+        protected DateTimeOffset? _AirsTime;
+        /// <summary>
+        /// When provided in a partial class, allows value of AirsTime to be changed before setting.
+        /// </summary>
+        partial void SetAirsTime(DateTimeOffset? oldValue, ref DateTimeOffset? newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of AirsTime to be changed before returning.
+        /// </summary>
+        partial void GetAirsTime(ref DateTimeOffset? result);
+
+        /// <summary>
+        /// The time the show airs, ignore the date portion
+        /// </summary>
+        public DateTimeOffset? AirsTime
+        {
+            get
             {
             {
-               _FirstAired = value;
+                DateTimeOffset? value = _AirsTime;
+                GetAirsTime(ref value);
+                return (_AirsTime = value);
             }
             }
-         }
-      }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+            set
+            {
+                DateTimeOffset? oldValue = _AirsTime;
+                SetAirsTime(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _AirsTime = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for FirstAired
+        /// </summary>
+        protected DateTimeOffset? _FirstAired;
+        /// <summary>
+        /// When provided in a partial class, allows value of FirstAired to be changed before setting.
+        /// </summary>
+        partial void SetFirstAired(DateTimeOffset? oldValue, ref DateTimeOffset? newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of FirstAired to be changed before returning.
+        /// </summary>
+        partial void GetFirstAired(ref DateTimeOffset? result);
+
+        public DateTimeOffset? FirstAired
+        {
+            get
+            {
+                DateTimeOffset? value = _FirstAired;
+                GetFirstAired(ref value);
+                return (_FirstAired = value);
+            }
+            set
+            {
+                DateTimeOffset? oldValue = _FirstAired;
+                SetFirstAired(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _FirstAired = value;
+                }
+            }
+        }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.SeriesMetadata> SeriesMetadata { get; protected set; }
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("SeriesMetadata_SeriesMetadata_Id")]
+        public virtual ICollection<SeriesMetadata> SeriesMetadata { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Season> Seasons { get; protected set; }
+        [ForeignKey("Season_Seasons_Id")]
+        public virtual ICollection<Season> Seasons { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 205 - 216
Jellyfin.Data/Entities/SeriesMetadata.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,219 +9,220 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class SeriesMetadata: global::Jellyfin.Data.Entities.Metadata
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected SeriesMetadata(): base()
-      {
-         Networks = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Company>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static SeriesMetadata CreateSeriesMetadataUnsafe()
-      {
-         return new SeriesMetadata();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_series0"></param>
-      public SeriesMetadata(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Series _series0)
-      {
-         if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
-         this.Title = title;
-
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
-
-         if (_series0 == null) throw new ArgumentNullException(nameof(_series0));
-         _series0.SeriesMetadata.Add(this);
-
-         this.Networks = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Company>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_series0"></param>
-      public static SeriesMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Series _series0)
-      {
-         return new SeriesMetadata(title, language, dateadded, datemodified, _series0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for Outline
-      /// </summary>
-      protected string _Outline;
-      /// <summary>
-      /// When provided in a partial class, allows value of Outline to be changed before setting.
-      /// </summary>
-      partial void SetOutline(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Outline to be changed before returning.
-      /// </summary>
-      partial void GetOutline(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Outline
-      {
-         get
-         {
-            string value = _Outline;
-            GetOutline(ref value);
-            return (_Outline = value);
-         }
-         set
-         {
-            string oldValue = _Outline;
-            SetOutline(oldValue, ref value);
-            if (oldValue != value)
+    [Table("SeriesMetadata")]
+    public partial class SeriesMetadata : Metadata
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected SeriesMetadata() : base()
+        {
+            Networks = new HashSet<Company>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static SeriesMetadata CreateSeriesMetadataUnsafe()
+        {
+            return new SeriesMetadata();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_series0"></param>
+        public SeriesMetadata(string title, string language, DateTime dateadded, DateTime datemodified, Series _series0)
+        {
+            if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
+            this.Title = title;
+
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
+
+            if (_series0 == null) throw new ArgumentNullException(nameof(_series0));
+            _series0.SeriesMetadata.Add(this);
+
+            this.Networks = new HashSet<Company>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_series0"></param>
+        public static SeriesMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, Series _series0)
+        {
+            return new SeriesMetadata(title, language, dateadded, datemodified, _series0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for Outline
+        /// </summary>
+        protected string _Outline;
+        /// <summary>
+        /// When provided in a partial class, allows value of Outline to be changed before setting.
+        /// </summary>
+        partial void SetOutline(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Outline to be changed before returning.
+        /// </summary>
+        partial void GetOutline(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Outline
+        {
+            get
             {
             {
-               _Outline = value;
+                string value = _Outline;
+                GetOutline(ref value);
+                return (_Outline = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Plot
-      /// </summary>
-      protected string _Plot;
-      /// <summary>
-      /// When provided in a partial class, allows value of Plot to be changed before setting.
-      /// </summary>
-      partial void SetPlot(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Plot to be changed before returning.
-      /// </summary>
-      partial void GetPlot(ref string result);
-
-      /// <summary>
-      /// Max length = 65535
-      /// </summary>
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string Plot
-      {
-         get
-         {
-            string value = _Plot;
-            GetPlot(ref value);
-            return (_Plot = value);
-         }
-         set
-         {
-            string oldValue = _Plot;
-            SetPlot(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Plot = value;
+                string oldValue = _Outline;
+                SetOutline(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Outline = value;
+                }
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Tagline
-      /// </summary>
-      protected string _Tagline;
-      /// <summary>
-      /// When provided in a partial class, allows value of Tagline to be changed before setting.
-      /// </summary>
-      partial void SetTagline(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Tagline to be changed before returning.
-      /// </summary>
-      partial void GetTagline(ref string result);
-
-      /// <summary>
-      /// Max length = 1024
-      /// </summary>
-      [MaxLength(1024)]
-      [StringLength(1024)]
-      public string Tagline
-      {
-         get
-         {
-            string value = _Tagline;
-            GetTagline(ref value);
-            return (_Tagline = value);
-         }
-         set
-         {
-            string oldValue = _Tagline;
-            SetTagline(oldValue, ref value);
-            if (oldValue != value)
+        }
+
+        /// <summary>
+        /// Backing field for Plot
+        /// </summary>
+        protected string _Plot;
+        /// <summary>
+        /// When provided in a partial class, allows value of Plot to be changed before setting.
+        /// </summary>
+        partial void SetPlot(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Plot to be changed before returning.
+        /// </summary>
+        partial void GetPlot(ref string result);
+
+        /// <summary>
+        /// Max length = 65535
+        /// </summary>
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string Plot
+        {
+            get
             {
             {
-               _Tagline = value;
+                string value = _Plot;
+                GetPlot(ref value);
+                return (_Plot = value);
             }
             }
-         }
-      }
-
-      /// <summary>
-      /// Backing field for Country
-      /// </summary>
-      protected string _Country;
-      /// <summary>
-      /// When provided in a partial class, allows value of Country to be changed before setting.
-      /// </summary>
-      partial void SetCountry(string oldValue, ref string newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of Country to be changed before returning.
-      /// </summary>
-      partial void GetCountry(ref string result);
-
-      /// <summary>
-      /// Max length = 2
-      /// </summary>
-      [MaxLength(2)]
-      [StringLength(2)]
-      public string Country
-      {
-         get
-         {
-            string value = _Country;
-            GetCountry(ref value);
-            return (_Country = value);
-         }
-         set
-         {
-            string oldValue = _Country;
-            SetCountry(oldValue, ref value);
-            if (oldValue != value)
+            set
             {
             {
-               _Country = value;
+                string oldValue = _Plot;
+                SetPlot(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Plot = value;
+                }
             }
             }
-         }
-      }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        }
+
+        /// <summary>
+        /// Backing field for Tagline
+        /// </summary>
+        protected string _Tagline;
+        /// <summary>
+        /// When provided in a partial class, allows value of Tagline to be changed before setting.
+        /// </summary>
+        partial void SetTagline(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Tagline to be changed before returning.
+        /// </summary>
+        partial void GetTagline(ref string result);
+
+        /// <summary>
+        /// Max length = 1024
+        /// </summary>
+        [MaxLength(1024)]
+        [StringLength(1024)]
+        public string Tagline
+        {
+            get
+            {
+                string value = _Tagline;
+                GetTagline(ref value);
+                return (_Tagline = value);
+            }
+            set
+            {
+                string oldValue = _Tagline;
+                SetTagline(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Tagline = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Backing field for Country
+        /// </summary>
+        protected string _Country;
+        /// <summary>
+        /// When provided in a partial class, allows value of Country to be changed before setting.
+        /// </summary>
+        partial void SetCountry(string oldValue, ref string newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of Country to be changed before returning.
+        /// </summary>
+        partial void GetCountry(ref string result);
+
+        /// <summary>
+        /// Max length = 2
+        /// </summary>
+        [MaxLength(2)]
+        [StringLength(2)]
+        public string Country
+        {
+            get
+            {
+                string value = _Country;
+                GetCountry(ref value);
+                return (_Country = value);
+            }
+            set
+            {
+                string oldValue = _Country;
+                SetCountry(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _Country = value;
+                }
+            }
+        }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Company> Networks { get; protected set; }
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("Company_Networks_Id")]
+        public virtual ICollection<Company> Networks { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 99 - 108
Jellyfin.Data/Entities/Track.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,107 +9,110 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class Track: global::Jellyfin.Data.Entities.LibraryItem
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected Track(): base()
-      {
-         // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
-         TrackMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.TrackMetadata>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static Track CreateTrackUnsafe()
-      {
-         return new Track();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      /// <param name="_musicalbum0"></param>
-      public Track(Guid urlid, DateTime dateadded, global::Jellyfin.Data.Entities.MusicAlbum _musicalbum0)
-      {
-         // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
-         // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
-
-         this.UrlId = urlid;
-
-         if (_musicalbum0 == null) throw new ArgumentNullException(nameof(_musicalbum0));
-         _musicalbum0.Tracks.Add(this);
-
-         this.Releases = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Release>();
-         this.TrackMetadata = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.TrackMetadata>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
-      /// <param name="_musicalbum0"></param>
-      public static Track Create(Guid urlid, DateTime dateadded, global::Jellyfin.Data.Entities.MusicAlbum _musicalbum0)
-      {
-         return new Track(urlid, dateadded, _musicalbum0);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Backing field for TrackNumber
-      /// </summary>
-      protected int? _TrackNumber;
-      /// <summary>
-      /// When provided in a partial class, allows value of TrackNumber to be changed before setting.
-      /// </summary>
-      partial void SetTrackNumber(int? oldValue, ref int? newValue);
-      /// <summary>
-      /// When provided in a partial class, allows value of TrackNumber to be changed before returning.
-      /// </summary>
-      partial void GetTrackNumber(ref int? result);
-
-      public int? TrackNumber
-      {
-         get
-         {
-            int? value = _TrackNumber;
-            GetTrackNumber(ref value);
-            return (_TrackNumber = value);
-         }
-         set
-         {
-            int? oldValue = _TrackNumber;
-            SetTrackNumber(oldValue, ref value);
-            if (oldValue != value)
+    [Table("Track")]
+    public partial class Track : LibraryItem
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected Track() : base()
+        {
+            // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            Releases = new HashSet<Release>();
+            TrackMetadata = new HashSet<TrackMetadata>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static Track CreateTrackUnsafe()
+        {
+            return new Track();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        /// <param name="_musicalbum0"></param>
+        public Track(Guid urlid, DateTime dateadded, MusicAlbum _musicalbum0)
+        {
+            // NOTE: This class has one-to-one associations with LibraryRoot, LibraryItem and CollectionItem.
+            // One-to-one associations are not validated in constructors since this causes a scenario where each one must be constructed before the other.
+
+            this.UrlId = urlid;
+
+            if (_musicalbum0 == null) throw new ArgumentNullException(nameof(_musicalbum0));
+            _musicalbum0.Tracks.Add(this);
+
+            this.Releases = new HashSet<Release>();
+            this.TrackMetadata = new HashSet<TrackMetadata>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="urlid">This is whats gets displayed in the Urls and API requests. This could also be a string.</param>
+        /// <param name="_musicalbum0"></param>
+        public static Track Create(Guid urlid, DateTime dateadded, MusicAlbum _musicalbum0)
+        {
+            return new Track(urlid, dateadded, _musicalbum0);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Backing field for TrackNumber
+        /// </summary>
+        protected int? _TrackNumber;
+        /// <summary>
+        /// When provided in a partial class, allows value of TrackNumber to be changed before setting.
+        /// </summary>
+        partial void SetTrackNumber(int? oldValue, ref int? newValue);
+        /// <summary>
+        /// When provided in a partial class, allows value of TrackNumber to be changed before returning.
+        /// </summary>
+        partial void GetTrackNumber(ref int? result);
+
+        public int? TrackNumber
+        {
+            get
+            {
+                int? value = _TrackNumber;
+                GetTrackNumber(ref value);
+                return (_TrackNumber = value);
+            }
+            set
             {
             {
-               _TrackNumber = value;
+                int? oldValue = _TrackNumber;
+                SetTrackNumber(oldValue, ref value);
+                if (oldValue != value)
+                {
+                    _TrackNumber = value;
+                }
             }
             }
-         }
-      }
+        }
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.Release> Releases { get; protected set; }
+        [ForeignKey("Release_Releases_Id")]
+        public virtual ICollection<Release> Releases { get; protected set; }
 
 
-      public virtual ICollection<global::Jellyfin.Data.Entities.TrackMetadata> TrackMetadata { get; protected set; }
+        [ForeignKey("TrackMetadata_TrackMetadata_Id")]
+        public virtual ICollection<TrackMetadata> TrackMetadata { get; protected set; }
 
 
-   }
+    }
 }
 }
 
 

+ 51 - 62
Jellyfin.Data/Entities/TrackMetadata.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,66 +9,67 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class TrackMetadata: global::Jellyfin.Data.Entities.Metadata
-   {
-      partial void Init();
+    [Table("TrackMetadata")]
+    public partial class TrackMetadata : Metadata
+    {
+        partial void Init();
 
 
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected TrackMetadata(): base()
-      {
-         Init();
-      }
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected TrackMetadata() : base()
+        {
+            Init();
+        }
 
 
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static TrackMetadata CreateTrackMetadataUnsafe()
-      {
-         return new TrackMetadata();
-      }
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static TrackMetadata CreateTrackMetadataUnsafe()
+        {
+            return new TrackMetadata();
+        }
 
 
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_track0"></param>
-      public TrackMetadata(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Track _track0)
-      {
-         if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
-         this.Title = title;
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_track0"></param>
+        public TrackMetadata(string title, string language, DateTime dateadded, DateTime datemodified, Track _track0)
+        {
+            if (string.IsNullOrEmpty(title)) throw new ArgumentNullException(nameof(title));
+            this.Title = title;
 
 
-         if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
-         this.Language = language;
+            if (string.IsNullOrEmpty(language)) throw new ArgumentNullException(nameof(language));
+            this.Language = language;
 
 
-         if (_track0 == null) throw new ArgumentNullException(nameof(_track0));
-         _track0.TrackMetadata.Add(this);
+            if (_track0 == null) throw new ArgumentNullException(nameof(_track0));
+            _track0.TrackMetadata.Add(this);
 
 
 
 
-         Init();
-      }
+            Init();
+        }
 
 
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="title">The title or name of the object</param>
-      /// <param name="language">ISO-639-3 3-character language codes</param>
-      /// <param name="_track0"></param>
-      public static TrackMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, global::Jellyfin.Data.Entities.Track _track0)
-      {
-         return new TrackMetadata(title, language, dateadded, datemodified, _track0);
-      }
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="title">The title or name of the object</param>
+        /// <param name="language">ISO-639-3 3-character language codes</param>
+        /// <param name="_track0"></param>
+        public static TrackMetadata Create(string title, string language, DateTime dateadded, DateTime datemodified, Track _track0)
+        {
+            return new TrackMetadata(title, language, dateadded, datemodified, _track0);
+        }
 
 
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
 
 
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
 
 
-   }
+    }
 }
 }
 
 

+ 227 - 229
Jellyfin.Data/Entities/User.cs

@@ -1,15 +1,3 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
@@ -21,222 +9,232 @@ using System.Runtime.CompilerServices;
 
 
 namespace Jellyfin.Data.Entities
 namespace Jellyfin.Data.Entities
 {
 {
-   public partial class User
-   {
-      partial void Init();
-
-      /// <summary>
-      /// Default constructor. Protected due to required properties, but present because EF needs it.
-      /// </summary>
-      protected User()
-      {
-         Groups = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Group>();
-         Permissions = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Permission>();
-         ProviderMappings = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.ProviderMapping>();
-         Preferences = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Preference>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
-      /// </summary>
-      public static User CreateUserUnsafe()
-      {
-         return new User();
-      }
-
-      /// <summary>
-      /// Public constructor with required data
-      /// </summary>
-      /// <param name="username"></param>
-      /// <param name="mustupdatepassword"></param>
-      /// <param name="audiolanguagepreference"></param>
-      /// <param name="authenticationproviderid"></param>
-      /// <param name="invalidloginattemptcount"></param>
-      /// <param name="subtitlemode"></param>
-      /// <param name="playdefaultaudiotrack"></param>
-      public User(string username, bool mustupdatepassword, string audiolanguagepreference, string authenticationproviderid, int invalidloginattemptcount, string subtitlemode, bool playdefaultaudiotrack)
-      {
-         if (string.IsNullOrEmpty(username)) throw new ArgumentNullException(nameof(username));
-         this.Username = username;
-
-         this.MustUpdatePassword = mustupdatepassword;
-
-         if (string.IsNullOrEmpty(audiolanguagepreference)) throw new ArgumentNullException(nameof(audiolanguagepreference));
-         this.AudioLanguagePreference = audiolanguagepreference;
-
-         if (string.IsNullOrEmpty(authenticationproviderid)) throw new ArgumentNullException(nameof(authenticationproviderid));
-         this.AuthenticationProviderId = authenticationproviderid;
-
-         this.InvalidLoginAttemptCount = invalidloginattemptcount;
-
-         if (string.IsNullOrEmpty(subtitlemode)) throw new ArgumentNullException(nameof(subtitlemode));
-         this.SubtitleMode = subtitlemode;
-
-         this.PlayDefaultAudioTrack = playdefaultaudiotrack;
-
-         this.Groups = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Group>();
-         this.Permissions = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Permission>();
-         this.ProviderMappings = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.ProviderMapping>();
-         this.Preferences = new System.Collections.Generic.HashSet<global::Jellyfin.Data.Entities.Preference>();
-
-         Init();
-      }
-
-      /// <summary>
-      /// Static create function (for use in LINQ queries, etc.)
-      /// </summary>
-      /// <param name="username"></param>
-      /// <param name="mustupdatepassword"></param>
-      /// <param name="audiolanguagepreference"></param>
-      /// <param name="authenticationproviderid"></param>
-      /// <param name="invalidloginattemptcount"></param>
-      /// <param name="subtitlemode"></param>
-      /// <param name="playdefaultaudiotrack"></param>
-      public static User Create(string username, bool mustupdatepassword, string audiolanguagepreference, string authenticationproviderid, int invalidloginattemptcount, string subtitlemode, bool playdefaultaudiotrack)
-      {
-         return new User(username, mustupdatepassword, audiolanguagepreference, authenticationproviderid, invalidloginattemptcount, subtitlemode, playdefaultaudiotrack);
-      }
-
-      /*************************************************************************
-       * Properties
-       *************************************************************************/
-
-      /// <summary>
-      /// Identity, Indexed, Required
-      /// </summary>
-      [Key]
-      [Required]
-      public Guid Id { get; protected set; }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [ConcurrencyCheck]
-      [Required]
-      public byte[] LastLoginTimestamp { get; set; }
-
-      /// <summary>
-      /// Required, Max length = 255
-      /// </summary>
-      [Required]
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string Username { get; set; }
-
-      /// <summary>
-      /// Max length = 65535
-      /// </summary>
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string Password { get; set; }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public bool MustUpdatePassword { get; set; }
-
-      /// <summary>
-      /// Required, Max length = 255
-      /// </summary>
-      [Required]
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string AudioLanguagePreference { get; set; }
-
-      /// <summary>
-      /// Required, Max length = 255
-      /// </summary>
-      [Required]
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string AuthenticationProviderId { get; set; }
-
-      /// <summary>
-      /// Max length = 65535
-      /// </summary>
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string GroupedFolders { get; set; }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public int InvalidLoginAttemptCount { get; set; }
-
-      /// <summary>
-      /// Max length = 65535
-      /// </summary>
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string LatestItemExcludes { get; set; }
-
-      public int? LoginAttemptsBeforeLockout { get; set; }
-
-      /// <summary>
-      /// Max length = 65535
-      /// </summary>
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string MyMediaExcludes { get; set; }
-
-      /// <summary>
-      /// Max length = 65535
-      /// </summary>
-      [MaxLength(65535)]
-      [StringLength(65535)]
-      public string OrderedViews { get; set; }
-
-      /// <summary>
-      /// Required, Max length = 255
-      /// </summary>
-      [Required]
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string SubtitleMode { get; set; }
-
-      /// <summary>
-      /// Required
-      /// </summary>
-      [Required]
-      public bool PlayDefaultAudioTrack { get; set; }
-
-      /// <summary>
-      /// Max length = 255
-      /// </summary>
-      [MaxLength(255)]
-      [StringLength(255)]
-      public string SubtitleLanguagePrefernce { get; set; }
-
-      public bool? DisplayMissingEpisodes { get; set; }
-
-      public bool? DisplayCollectionsView { get; set; }
-
-      public bool? HidePlayedInLatest { get; set; }
-
-      public bool? RememberAudioSelections { get; set; }
-
-      public bool? RememberSubtitleSelections { get; set; }
-
-      public bool? EnableNextEpisodeAutoPlay { get; set; }
-
-      public bool? EnableUserPreferenceAccess { get; set; }
-
-      /*************************************************************************
-       * Navigation properties
-       *************************************************************************/
-
-      public virtual ICollection<global::Jellyfin.Data.Entities.Group> Groups { get; protected set; }
-
-      public virtual ICollection<global::Jellyfin.Data.Entities.Permission> Permissions { get; protected set; }
-
-      public virtual ICollection<global::Jellyfin.Data.Entities.ProviderMapping> ProviderMappings { get; protected set; }
-
-      public virtual ICollection<global::Jellyfin.Data.Entities.Preference> Preferences { get; protected set; }
-
-   }
+    [Table("User")]
+    public partial class User
+    {
+        partial void Init();
+
+        /// <summary>
+        /// Default constructor. Protected due to required properties, but present because EF needs it.
+        /// </summary>
+        protected User()
+        {
+            Groups = new HashSet<Group>();
+            Permissions = new HashSet<Permission>();
+            ProviderMappings = new HashSet<ProviderMapping>();
+            Preferences = new HashSet<Preference>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Replaces default constructor, since it's protected. Caller assumes responsibility for setting all required values before saving.
+        /// </summary>
+        public static User CreateUserUnsafe()
+        {
+            return new User();
+        }
+
+        /// <summary>
+        /// Public constructor with required data
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="mustupdatepassword"></param>
+        /// <param name="audiolanguagepreference"></param>
+        /// <param name="authenticationproviderid"></param>
+        /// <param name="invalidloginattemptcount"></param>
+        /// <param name="subtitlemode"></param>
+        /// <param name="playdefaultaudiotrack"></param>
+        public User(string username, bool mustupdatepassword, string audiolanguagepreference, string authenticationproviderid, int invalidloginattemptcount, string subtitlemode, bool playdefaultaudiotrack)
+        {
+            if (string.IsNullOrEmpty(username)) throw new ArgumentNullException(nameof(username));
+            this.Username = username;
+
+            this.MustUpdatePassword = mustupdatepassword;
+
+            if (string.IsNullOrEmpty(audiolanguagepreference)) throw new ArgumentNullException(nameof(audiolanguagepreference));
+            this.AudioLanguagePreference = audiolanguagepreference;
+
+            if (string.IsNullOrEmpty(authenticationproviderid)) throw new ArgumentNullException(nameof(authenticationproviderid));
+            this.AuthenticationProviderId = authenticationproviderid;
+
+            this.InvalidLoginAttemptCount = invalidloginattemptcount;
+
+            if (string.IsNullOrEmpty(subtitlemode)) throw new ArgumentNullException(nameof(subtitlemode));
+            this.SubtitleMode = subtitlemode;
+
+            this.PlayDefaultAudioTrack = playdefaultaudiotrack;
+
+            this.Groups = new HashSet<Group>();
+            this.Permissions = new HashSet<Permission>();
+            this.ProviderMappings = new HashSet<ProviderMapping>();
+            this.Preferences = new HashSet<Preference>();
+
+            Init();
+        }
+
+        /// <summary>
+        /// Static create function (for use in LINQ queries, etc.)
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="mustupdatepassword"></param>
+        /// <param name="audiolanguagepreference"></param>
+        /// <param name="authenticationproviderid"></param>
+        /// <param name="invalidloginattemptcount"></param>
+        /// <param name="subtitlemode"></param>
+        /// <param name="playdefaultaudiotrack"></param>
+        public static User Create(string username, bool mustupdatepassword, string audiolanguagepreference, string authenticationproviderid, int invalidloginattemptcount, string subtitlemode, bool playdefaultaudiotrack)
+        {
+            return new User(username, mustupdatepassword, audiolanguagepreference, authenticationproviderid, invalidloginattemptcount, subtitlemode, playdefaultaudiotrack);
+        }
+
+        /*************************************************************************
+         * Properties
+         *************************************************************************/
+
+        /// <summary>
+        /// Identity, Indexed, Required
+        /// </summary>
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int Id { get; protected set; }
+
+        /// <summary>
+        /// Required, Max length = 255
+        /// </summary>
+        [Required]
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string Username { get; set; }
+
+        /// <summary>
+        /// Max length = 65535
+        /// </summary>
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string Password { get; set; }
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public bool MustUpdatePassword { get; set; }
+
+        /// <summary>
+        /// Required, Max length = 255
+        /// </summary>
+        [Required]
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string AudioLanguagePreference { get; set; }
+
+        /// <summary>
+        /// Required, Max length = 255
+        /// </summary>
+        [Required]
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string AuthenticationProviderId { get; set; }
+
+        /// <summary>
+        /// Max length = 65535
+        /// </summary>
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string GroupedFolders { get; set; }
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public int InvalidLoginAttemptCount { get; set; }
+
+        /// <summary>
+        /// Max length = 65535
+        /// </summary>
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string LatestItemExcludes { get; set; }
+
+        public int? LoginAttemptsBeforeLockout { get; set; }
+
+        /// <summary>
+        /// Max length = 65535
+        /// </summary>
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string MyMediaExcludes { get; set; }
+
+        /// <summary>
+        /// Max length = 65535
+        /// </summary>
+        [MaxLength(65535)]
+        [StringLength(65535)]
+        public string OrderedViews { get; set; }
+
+        /// <summary>
+        /// Required, Max length = 255
+        /// </summary>
+        [Required]
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string SubtitleMode { get; set; }
+
+        /// <summary>
+        /// Required
+        /// </summary>
+        [Required]
+        public bool PlayDefaultAudioTrack { get; set; }
+
+        /// <summary>
+        /// Max length = 255
+        /// </summary>
+        [MaxLength(255)]
+        [StringLength(255)]
+        public string SubtitleLanguagePrefernce { get; set; }
+
+        public bool? DisplayMissingEpisodes { get; set; }
+
+        public bool? DisplayCollectionsView { get; set; }
+
+        public bool? HidePlayedInLatest { get; set; }
+
+        public bool? RememberAudioSelections { get; set; }
+
+        public bool? RememberSubtitleSelections { get; set; }
+
+        public bool? EnableNextEpisodeAutoPlay { get; set; }
+
+        public bool? EnableUserPreferenceAccess { get; set; }
+
+        /// <summary>
+        /// Required, ConcurrenyToken
+        /// </summary>
+        [ConcurrencyCheck]
+        [Required]
+        public uint RowVersion { get; set; }
+
+        public void OnSavingChanges()
+        {
+            RowVersion++;
+        }
+
+        /*************************************************************************
+         * Navigation properties
+         *************************************************************************/
+        [ForeignKey("Group_Groups_Id")]
+        public virtual ICollection<Group> Groups { get; protected set; }
+
+        [ForeignKey("Permission_Permissions_Id")]
+        public virtual ICollection<Permission> Permissions { get; protected set; }
+
+        [ForeignKey("ProviderMapping_ProviderMappings_Id")]
+        public virtual ICollection<ProviderMapping> ProviderMappings { get; protected set; }
+
+        [ForeignKey("Preference_Preferences_Id")]
+        public virtual ICollection<Preference> Preferences { get; protected set; }
+
+    }
 }
 }
 
 

+ 8 - 20
Jellyfin.Data/Enums/ArtKind.cs

@@ -1,25 +1,13 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 
 
 namespace Jellyfin.Data.Enums
 namespace Jellyfin.Data.Enums
 {
 {
-   public enum ArtKind : Int32
-   {
-      Other,
-      Poster,
-      Banner,
-      Thumbnail,
-      Logo
-   }
+    public enum ArtKind : Int32
+    {
+        Other,
+        Poster,
+        Banner,
+        Thumbnail,
+        Logo
+    }
 }
 }

+ 8 - 20
Jellyfin.Data/Enums/MediaFileKind.cs

@@ -1,25 +1,13 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 
 
 namespace Jellyfin.Data.Enums
 namespace Jellyfin.Data.Enums
 {
 {
-   public enum MediaFileKind : Int32
-   {
-      Main,
-      Sidecar,
-      AdditionalPart,
-      AlternativeFormat,
-      AdditionalStream
-   }
+    public enum MediaFileKind : Int32
+    {
+        Main,
+        Sidecar,
+        AdditionalPart,
+        AlternativeFormat,
+        AdditionalStream
+    }
 }
 }

+ 28 - 0
Jellyfin.Data/Enums/PermissionKind.cs

@@ -0,0 +1,28 @@
+using System;
+
+namespace Jellyfin.Data.Enums
+{
+    public enum PermissionKind : Int32
+    {
+        IsAdministrator,
+        IsHidden,
+        IsDisabled,
+        BlockUnrateditems,
+        EnbleSharedDeviceControl,
+        EnableRemoteAccess,
+        EnableLiveTvManagement,
+        EnableLiveTvAccess,
+        EnableMediaPlayback,
+        EnableAudioPlaybackTranscoding,
+        EnableVideoPlaybackTranscoding,
+        EnableContentDeletion,
+        EnableContentDownloading,
+        EnableSyncTranscoding,
+        EnableMediaConversion,
+        EnableAllDevices,
+        EnableAllChannels,
+        EnableAllFolders,
+        EnablePublicSharing,
+        AccessSchedules
+    }
+}

+ 15 - 27
Jellyfin.Data/Enums/PersonRoleType.cs

@@ -1,32 +1,20 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 
 
 namespace Jellyfin.Data.Enums
 namespace Jellyfin.Data.Enums
 {
 {
-   public enum PersonRoleType : Int32
-   {
-      Other,
-      Director,
-      Artist,
-      OriginalArtist,
-      Actor,
-      VoiceActor,
-      Producer,
-      Remixer,
-      Conductor,
-      Composer,
-      Author,
-      Editor
-   }
+    public enum PersonRoleType : Int32
+    {
+        Other,
+        Director,
+        Artist,
+        OriginalArtist,
+        Actor,
+        VoiceActor,
+        Producer,
+        Remixer,
+        Conductor,
+        Composer,
+        Author,
+        Editor
+    }
 }
 }

+ 15 - 0
Jellyfin.Data/Enums/PreferenceKind.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace Jellyfin.Data.Enums
+{
+    public enum PreferenceKind : Int32
+    {
+        MaxParentalRating,
+        BlockedTags,
+        RemoteClientBitrateLimit,
+        EnabledDevices,
+        EnabledChannels,
+        EnabledFolders,
+        EnableContentDeletionFromFolders
+    }
+}

+ 10 - 22
Jellyfin.Data/Enums/Weekday.cs

@@ -1,27 +1,15 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated from a template.
-//
-//     Manual changes to this file may cause unexpected behavior in your application.
-//     Manual changes to this file will be overwritten if the code is regenerated.
-//
-//     Produced by Entity Framework Visual Editor
-//     https://github.com/msawczyn/EFDesigner
-// </auto-generated>
-//------------------------------------------------------------------------------
-
 using System;
 using System;
 
 
 namespace Jellyfin.Data.Enums
 namespace Jellyfin.Data.Enums
 {
 {
-   public enum Weekday : Int32
-   {
-      Sunday,
-      Monday,
-      Tuesday,
-      Wednesday,
-      Thursday,
-      Friday,
-      Saturday
-   }
+    public enum Weekday : Int32
+    {
+        Sunday,
+        Monday,
+        Tuesday,
+        Wednesday,
+        Thursday,
+        Friday,
+        Saturday
+    }
 }
 }

+ 0 - 0
Jellyfin.Data/Structs/.gitkeep