telans 5 年 前
コミット
afe09612e8
39 ファイル変更96 行追加96 行削除
  1. 1 1
      Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
  2. 2 2
      Emby.Server.Implementations/HttpServer/ResponseFilter.cs
  3. 1 1
      Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
  4. 2 2
      Emby.Server.Implementations/Security/AuthenticationRepository.cs
  5. 2 2
      Emby.Server.Implementations/Services/ServicePath.cs
  6. 3 3
      Jellyfin.Data/Entities/Artwork.cs
  7. 1 1
      Jellyfin.Data/Entities/BookMetadata.cs
  8. 5 5
      Jellyfin.Data/Entities/Chapter.cs
  9. 2 2
      Jellyfin.Data/Entities/Collection.cs
  10. 1 1
      Jellyfin.Data/Entities/CollectionItem.cs
  11. 1 1
      Jellyfin.Data/Entities/Company.cs
  12. 4 4
      Jellyfin.Data/Entities/CompanyMetadata.cs
  13. 1 1
      Jellyfin.Data/Entities/Episode.cs
  14. 3 3
      Jellyfin.Data/Entities/EpisodeMetadata.cs
  15. 2 2
      Jellyfin.Data/Entities/Genre.cs
  16. 2 2
      Jellyfin.Data/Entities/Library.cs
  17. 3 3
      Jellyfin.Data/Entities/LibraryItem.cs
  18. 3 3
      Jellyfin.Data/Entities/LibraryRoot.cs
  19. 3 3
      Jellyfin.Data/Entities/MediaFile.cs
  20. 2 2
      Jellyfin.Data/Entities/MediaFileStream.cs
  21. 8 8
      Jellyfin.Data/Entities/Metadata.cs
  22. 2 2
      Jellyfin.Data/Entities/MetadataProvider.cs
  23. 2 2
      Jellyfin.Data/Entities/MetadataProviderId.cs
  24. 4 4
      Jellyfin.Data/Entities/MovieMetadata.cs
  25. 3 3
      Jellyfin.Data/Entities/MusicAlbumMetadata.cs
  26. 6 6
      Jellyfin.Data/Entities/Person.cs
  27. 3 3
      Jellyfin.Data/Entities/PersonRole.cs
  28. 3 3
      Jellyfin.Data/Entities/Rating.cs
  29. 4 4
      Jellyfin.Data/Entities/RatingSource.cs
  30. 2 2
      Jellyfin.Data/Entities/Release.cs
  31. 1 1
      Jellyfin.Data/Entities/Season.cs
  32. 1 1
      Jellyfin.Data/Entities/SeasonMetadata.cs
  33. 3 3
      Jellyfin.Data/Entities/Series.cs
  34. 4 4
      Jellyfin.Data/Entities/SeriesMetadata.cs
  35. 1 1
      Jellyfin.Data/Entities/Track.cs
  36. 1 1
      MediaBrowser.Controller/Entities/CollectionFolder.cs
  37. 2 2
      MediaBrowser.Controller/Entities/Folder.cs
  38. 1 1
      MediaBrowser.Controller/Library/ItemResolveArgs.cs
  39. 1 1
      MediaBrowser.Providers/Manager/MetadataService.cs

+ 1 - 1
Emby.Server.Implementations/HttpServer/HttpResultFactory.cs

@@ -426,7 +426,7 @@ namespace Emby.Server.Implementations.HttpServer
         /// </summary>
         /// </summary>
         private object GetCachedResult(IRequest requestContext, IDictionary<string, string> responseHeaders, StaticResultOptions options)
         private object GetCachedResult(IRequest requestContext, IDictionary<string, string> responseHeaders, StaticResultOptions options)
         {
         {
-            bool noCache = (requestContext.Headers[HeaderNames.CacheControl].ToString()).IndexOf("no-cache", StringComparison.OrdinalIgnoreCase) != -1;
+            bool noCache = requestContext.Headers[HeaderNames.CacheControl].ToString().IndexOf("no-cache", StringComparison.OrdinalIgnoreCase) != -1;
             AddCachingHeaders(responseHeaders, options.CacheDuration, noCache, options.DateLastModified);
             AddCachingHeaders(responseHeaders, options.CacheDuration, noCache, options.DateLastModified);
 
 
             if (!noCache)
             if (!noCache)

+ 2 - 2
Emby.Server.Implementations/HttpServer/ResponseFilter.cs

@@ -41,11 +41,11 @@ namespace Emby.Server.Implementations.HttpServer
                 res.Headers.Add(key, value);
                 res.Headers.Add(key, value);
             }
             }
             // Try to prevent compatibility view
             // Try to prevent compatibility view
-            res.Headers["Access-Control-Allow-Headers"] = ("Accept, Accept-Language, Authorization, Cache-Control, " +
+            res.Headers["Access-Control-Allow-Headers"] = "Accept, Accept-Language, Authorization, Cache-Control, " +
                 "Content-Disposition, Content-Encoding, Content-Language, Content-Length, Content-MD5, Content-Range, " +
                 "Content-Disposition, Content-Encoding, Content-Language, Content-Length, Content-MD5, Content-Range, " +
                 "Content-Type, Cookie, Date, Host, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, " +
                 "Content-Type, Cookie, Date, Host, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, " +
                 "Origin, OriginToken, Pragma, Range, Slug, Transfer-Encoding, Want-Digest, X-MediaBrowser-Token, " +
                 "Origin, OriginToken, Pragma, Range, Slug, Transfer-Encoding, Want-Digest, X-MediaBrowser-Token, " +
-                "X-Emby-Authorization");
+                "X-Emby-Authorization";
 
 
             if (dto is Exception exception)
             if (dto is Exception exception)
             {
             {

+ 1 - 1
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs

@@ -691,7 +691,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 {
                 {
                     var model = ModelNumber ?? string.Empty;
                     var model = ModelNumber ?? string.Empty;
 
 
-                    if ((model.IndexOf("hdtc", StringComparison.OrdinalIgnoreCase) != -1))
+                    if (model.IndexOf("hdtc", StringComparison.OrdinalIgnoreCase) != -1)
                     {
                     {
                         return true;
                         return true;
                     }
                     }

+ 2 - 2
Emby.Server.Implementations/Security/AuthenticationRepository.cs

@@ -98,7 +98,7 @@ namespace Emby.Server.Implementations.Security
                         statement.TryBind("@AppName", info.AppName);
                         statement.TryBind("@AppName", info.AppName);
                         statement.TryBind("@AppVersion", info.AppVersion);
                         statement.TryBind("@AppVersion", info.AppVersion);
                         statement.TryBind("@DeviceName", info.DeviceName);
                         statement.TryBind("@DeviceName", info.DeviceName);
-                        statement.TryBind("@UserId", (info.UserId.Equals(Guid.Empty) ? null : info.UserId.ToString("N", CultureInfo.InvariantCulture)));
+                        statement.TryBind("@UserId", info.UserId.Equals(Guid.Empty) ? null : info.UserId.ToString("N", CultureInfo.InvariantCulture));
                         statement.TryBind("@UserName", info.UserName);
                         statement.TryBind("@UserName", info.UserName);
                         statement.TryBind("@IsActive", true);
                         statement.TryBind("@IsActive", true);
                         statement.TryBind("@DateCreated", info.DateCreated.ToDateTimeParamValue());
                         statement.TryBind("@DateCreated", info.DateCreated.ToDateTimeParamValue());
@@ -131,7 +131,7 @@ namespace Emby.Server.Implementations.Security
                         statement.TryBind("@AppName", info.AppName);
                         statement.TryBind("@AppName", info.AppName);
                         statement.TryBind("@AppVersion", info.AppVersion);
                         statement.TryBind("@AppVersion", info.AppVersion);
                         statement.TryBind("@DeviceName", info.DeviceName);
                         statement.TryBind("@DeviceName", info.DeviceName);
-                        statement.TryBind("@UserId", (info.UserId.Equals(Guid.Empty) ? null : info.UserId.ToString("N", CultureInfo.InvariantCulture)));
+                        statement.TryBind("@UserId", info.UserId.Equals(Guid.Empty) ? null : info.UserId.ToString("N", CultureInfo.InvariantCulture));
                         statement.TryBind("@UserName", info.UserName);
                         statement.TryBind("@UserName", info.UserName);
                         statement.TryBind("@DateCreated", info.DateCreated.ToDateTimeParamValue());
                         statement.TryBind("@DateCreated", info.DateCreated.ToDateTimeParamValue());
                         statement.TryBind("@DateLastActivity", info.DateLastActivity.ToDateTimeParamValue());
                         statement.TryBind("@DateLastActivity", info.DateLastActivity.ToDateTimeParamValue());

+ 2 - 2
Emby.Server.Implementations/Services/ServicePath.cs

@@ -302,9 +302,9 @@ namespace Emby.Server.Implementations.Services
             }
             }
 
 
             // Routes with least wildcard matches get the highest score
             // Routes with least wildcard matches get the highest score
-            var score = Math.Max((100 - wildcardMatchCount), 1) * 1000
+            var score = Math.Max(100 - wildcardMatchCount, 1) * 1000
                         // Routes with less variable (and more literal) matches
                         // Routes with less variable (and more literal) matches
-                        + Math.Max((10 - VariableArgsCount), 1) * 100;
+                        + Math.Max(10 - VariableArgsCount, 1) * 100;
 
 
             // Exact verb match is better than ANY
             // Exact verb match is better than ANY
             if (Verbs.Length == 1 && string.Equals(httpMethod, Verbs[0], StringComparison.OrdinalIgnoreCase))
             if (Verbs.Length == 1 && string.Equals(httpMethod, Verbs[0], StringComparison.OrdinalIgnoreCase))

+ 3 - 3
Jellyfin.Data/Entities/Artwork.cs

@@ -87,7 +87,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -126,7 +126,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Path;
                 string value = _Path;
                 GetPath(ref value);
                 GetPath(ref value);
-                return (_Path = value);
+                return _Path = value;
             }
             }
 
 
             set
             set
@@ -163,7 +163,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 Enums.ArtKind value = _Kind;
                 Enums.ArtKind value = _Kind;
                 GetKind(ref value);
                 GetKind(ref value);
-                return (_Kind = value);
+                return _Kind = value;
             }
             }
 
 
             set
             set

+ 1 - 1
Jellyfin.Data/Entities/BookMetadata.cs

@@ -82,7 +82,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 long? value = _ISBN;
                 long? value = _ISBN;
                 GetISBN(ref value);
                 GetISBN(ref value);
-                return (_ISBN = value);
+                return _ISBN = value;
             }
             }
 
 
             set
             set

+ 5 - 5
Jellyfin.Data/Entities/Chapter.cs

@@ -84,7 +84,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -122,7 +122,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Name;
                 string value = _Name;
                 GetName(ref value);
                 GetName(ref value);
-                return (_Name = value);
+                return _Name = value;
             }
             }
 
 
             set
             set
@@ -163,7 +163,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Language;
                 string value = _Language;
                 GetLanguage(ref value);
                 GetLanguage(ref value);
-                return (_Language = value);
+                return _Language = value;
             }
             }
 
 
             set
             set
@@ -200,7 +200,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 long value = _TimeStart;
                 long value = _TimeStart;
                 GetTimeStart(ref value);
                 GetTimeStart(ref value);
-                return (_TimeStart = value);
+                return _TimeStart = value;
             }
             }
 
 
             set
             set
@@ -233,7 +233,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 long? value = _TimeEnd;
                 long? value = _TimeEnd;
                 GetTimeEnd(ref value);
                 GetTimeEnd(ref value);
-                return (_TimeEnd = value);
+                return _TimeEnd = value;
             }
             }
 
 
             set
             set

+ 2 - 2
Jellyfin.Data/Entities/Collection.cs

@@ -47,7 +47,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -85,7 +85,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Name;
                 string value = _Name;
                 GetName(ref value);
                 GetName(ref value);
-                return (_Name = value);
+                return _Name = value;
             }
             }
 
 
             set
             set

+ 1 - 1
Jellyfin.Data/Entities/CollectionItem.cs

@@ -91,7 +91,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set

+ 1 - 1
Jellyfin.Data/Entities/Company.cs

@@ -99,7 +99,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set

+ 4 - 4
Jellyfin.Data/Entities/CompanyMetadata.cs

@@ -83,7 +83,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Description;
                 string value = _Description;
                 GetDescription(ref value);
                 GetDescription(ref value);
-                return (_Description = value);
+                return _Description = value;
             }
             }
 
 
             set
             set
@@ -121,7 +121,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Headquarters;
                 string value = _Headquarters;
                 GetHeadquarters(ref value);
                 GetHeadquarters(ref value);
-                return (_Headquarters = value);
+                return _Headquarters = value;
             }
             }
 
 
             set
             set
@@ -159,7 +159,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Country;
                 string value = _Country;
                 GetCountry(ref value);
                 GetCountry(ref value);
-                return (_Country = value);
+                return _Country = value;
             }
             }
 
 
             set
             set
@@ -197,7 +197,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Homepage;
                 string value = _Homepage;
                 GetHomepage(ref value);
                 GetHomepage(ref value);
-                return (_Homepage = value);
+                return _Homepage = value;
             }
             }
 
 
             set
             set

+ 1 - 1
Jellyfin.Data/Entities/Episode.cs

@@ -84,7 +84,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int? value = _EpisodeNumber;
                 int? value = _EpisodeNumber;
                 GetEpisodeNumber(ref value);
                 GetEpisodeNumber(ref value);
-                return (_EpisodeNumber = value);
+                return _EpisodeNumber = value;
             }
             }
 
 
             set
             set

+ 3 - 3
Jellyfin.Data/Entities/EpisodeMetadata.cs

@@ -83,7 +83,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Outline;
                 string value = _Outline;
                 GetOutline(ref value);
                 GetOutline(ref value);
-                return (_Outline = value);
+                return _Outline = value;
             }
             }
 
 
             set
             set
@@ -121,7 +121,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Plot;
                 string value = _Plot;
                 GetPlot(ref value);
                 GetPlot(ref value);
-                return (_Plot = value);
+                return _Plot = value;
             }
             }
 
 
             set
             set
@@ -159,7 +159,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Tagline;
                 string value = _Tagline;
                 GetTagline(ref value);
                 GetTagline(ref value);
-                return (_Tagline = value);
+                return _Tagline = value;
             }
             }
 
 
             set
             set

+ 2 - 2
Jellyfin.Data/Entities/Genre.cs

@@ -80,7 +80,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -119,7 +119,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Name;
                 string value = _Name;
                 GetName(ref value);
                 GetName(ref value);
-                return (_Name = value);
+                return _Name = value;
             }
             }
 
 
             set
             set

+ 2 - 2
Jellyfin.Data/Entities/Library.cs

@@ -75,7 +75,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -114,7 +114,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Name;
                 string value = _Name;
                 GetName(ref value);
                 GetName(ref value);
-                return (_Name = value);
+                return _Name = value;
             }
             }
 
 
             set
             set

+ 3 - 3
Jellyfin.Data/Entities/LibraryItem.cs

@@ -57,7 +57,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -95,7 +95,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 Guid value = _UrlId;
                 Guid value = _UrlId;
                 GetUrlId(ref value);
                 GetUrlId(ref value);
-                return (_UrlId = value);
+                return _UrlId = value;
             }
             }
 
 
             set
             set
@@ -132,7 +132,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 DateTime value = _DateAdded;
                 DateTime value = _DateAdded;
                 GetDateAdded(ref value);
                 GetDateAdded(ref value);
-                return (_DateAdded = value);
+                return _DateAdded = value;
             }
             }
 
 
             internal set
             internal set

+ 3 - 3
Jellyfin.Data/Entities/LibraryRoot.cs

@@ -75,7 +75,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -115,7 +115,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Path;
                 string value = _Path;
                 GetPath(ref value);
                 GetPath(ref value);
-                return (_Path = value);
+                return _Path = value;
             }
             }
 
 
             set
             set
@@ -154,7 +154,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _NetworkPath;
                 string value = _NetworkPath;
                 GetNetworkPath(ref value);
                 GetNetworkPath(ref value);
-                return (_NetworkPath = value);
+                return _NetworkPath = value;
             }
             }
 
 
             set
             set

+ 3 - 3
Jellyfin.Data/Entities/MediaFile.cs

@@ -88,7 +88,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -128,7 +128,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Path;
                 string value = _Path;
                 GetPath(ref value);
                 GetPath(ref value);
-                return (_Path = value);
+                return _Path = value;
             }
             }
 
 
             set
             set
@@ -165,7 +165,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 Enums.MediaFileKind value = _Kind;
                 Enums.MediaFileKind value = _Kind;
                 GetKind(ref value);
                 GetKind(ref value);
-                return (_Kind = value);
+                return _Kind = value;
             }
             }
 
 
             set
             set

+ 2 - 2
Jellyfin.Data/Entities/MediaFileStream.cs

@@ -79,7 +79,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -116,7 +116,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _StreamNumber;
                 int value = _StreamNumber;
                 GetStreamNumber(ref value);
                 GetStreamNumber(ref value);
-                return (_StreamNumber = value);
+                return _StreamNumber = value;
             }
             }
 
 
             set
             set

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

@@ -74,7 +74,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -114,7 +114,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Title;
                 string value = _Title;
                 GetTitle(ref value);
                 GetTitle(ref value);
-                return (_Title = value);
+                return _Title = value;
             }
             }
 
 
             set
             set
@@ -152,7 +152,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _OriginalTitle;
                 string value = _OriginalTitle;
                 GetOriginalTitle(ref value);
                 GetOriginalTitle(ref value);
-                return (_OriginalTitle = value);
+                return _OriginalTitle = value;
             }
             }
 
 
             set
             set
@@ -190,7 +190,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _SortTitle;
                 string value = _SortTitle;
                 GetSortTitle(ref value);
                 GetSortTitle(ref value);
-                return (_SortTitle = value);
+                return _SortTitle = value;
             }
             }
 
 
             set
             set
@@ -231,7 +231,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Language;
                 string value = _Language;
                 GetLanguage(ref value);
                 GetLanguage(ref value);
-                return (_Language = value);
+                return _Language = value;
             }
             }
 
 
             set
             set
@@ -264,7 +264,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 DateTimeOffset? value = _ReleaseDate;
                 DateTimeOffset? value = _ReleaseDate;
                 GetReleaseDate(ref value);
                 GetReleaseDate(ref value);
-                return (_ReleaseDate = value);
+                return _ReleaseDate = value;
             }
             }
 
 
             set
             set
@@ -301,7 +301,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 DateTime value = _DateAdded;
                 DateTime value = _DateAdded;
                 GetDateAdded(ref value);
                 GetDateAdded(ref value);
-                return (_DateAdded = value);
+                return _DateAdded = value;
             }
             }
 
 
             internal set
             internal set
@@ -338,7 +338,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 DateTime value = _DateModified;
                 DateTime value = _DateModified;
                 GetDateModified(ref value);
                 GetDateModified(ref value);
-                return (_DateModified = value);
+                return _DateModified = value;
             }
             }
 
 
             internal set
             internal set

+ 2 - 2
Jellyfin.Data/Entities/MetadataProvider.cs

@@ -75,7 +75,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -114,7 +114,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Name;
                 string value = _Name;
                 GetName(ref value);
                 GetName(ref value);
-                return (_Name = value);
+                return _Name = value;
             }
             }
 
 
             set
             set

+ 2 - 2
Jellyfin.Data/Entities/MetadataProviderId.cs

@@ -101,7 +101,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -140,7 +140,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _ProviderId;
                 string value = _ProviderId;
                 GetProviderId(ref value);
                 GetProviderId(ref value);
-                return (_ProviderId = value);
+                return _ProviderId = value;
             }
             }
 
 
             set
             set

+ 4 - 4
Jellyfin.Data/Entities/MovieMetadata.cs

@@ -88,7 +88,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Outline;
                 string value = _Outline;
                 GetOutline(ref value);
                 GetOutline(ref value);
-                return (_Outline = value);
+                return _Outline = value;
             }
             }
 
 
             set
             set
@@ -126,7 +126,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Plot;
                 string value = _Plot;
                 GetPlot(ref value);
                 GetPlot(ref value);
-                return (_Plot = value);
+                return _Plot = value;
             }
             }
 
 
             set
             set
@@ -164,7 +164,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Tagline;
                 string value = _Tagline;
                 GetTagline(ref value);
                 GetTagline(ref value);
-                return (_Tagline = value);
+                return _Tagline = value;
             }
             }
 
 
             set
             set
@@ -202,7 +202,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Country;
                 string value = _Country;
                 GetCountry(ref value);
                 GetCountry(ref value);
-                return (_Country = value);
+                return _Country = value;
             }
             }
 
 
             set
             set

+ 3 - 3
Jellyfin.Data/Entities/MusicAlbumMetadata.cs

@@ -88,7 +88,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Barcode;
                 string value = _Barcode;
                 GetBarcode(ref value);
                 GetBarcode(ref value);
-                return (_Barcode = value);
+                return _Barcode = value;
             }
             }
 
 
             set
             set
@@ -126,7 +126,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _LabelNumber;
                 string value = _LabelNumber;
                 GetLabelNumber(ref value);
                 GetLabelNumber(ref value);
-                return (_LabelNumber = value);
+                return _LabelNumber = value;
             }
             }
 
 
             set
             set
@@ -164,7 +164,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Country;
                 string value = _Country;
                 GetCountry(ref value);
                 GetCountry(ref value);
-                return (_Country = value);
+                return _Country = value;
             }
             }
 
 
             set
             set

+ 6 - 6
Jellyfin.Data/Entities/Person.cs

@@ -83,7 +83,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -120,7 +120,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 Guid value = _UrlId;
                 Guid value = _UrlId;
                 GetUrlId(ref value);
                 GetUrlId(ref value);
-                return (_UrlId = value);
+                return _UrlId = value;
             }
             }
 
 
             set
             set
@@ -159,7 +159,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Name;
                 string value = _Name;
                 GetName(ref value);
                 GetName(ref value);
-                return (_Name = value);
+                return _Name = value;
             }
             }
 
 
             set
             set
@@ -197,7 +197,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _SourceId;
                 string value = _SourceId;
                 GetSourceId(ref value);
                 GetSourceId(ref value);
-                return (_SourceId = value);
+                return _SourceId = value;
             }
             }
 
 
             set
             set
@@ -234,7 +234,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 DateTime value = _DateAdded;
                 DateTime value = _DateAdded;
                 GetDateAdded(ref value);
                 GetDateAdded(ref value);
-                return (_DateAdded = value);
+                return _DateAdded = value;
             }
             }
 
 
             internal set
             internal set
@@ -271,7 +271,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 DateTime value = _DateModified;
                 DateTime value = _DateModified;
                 GetDateModified(ref value);
                 GetDateModified(ref value);
-                return (_DateModified = value);
+                return _DateModified = value;
             }
             }
 
 
             internal set
             internal set

+ 3 - 3
Jellyfin.Data/Entities/PersonRole.cs

@@ -89,7 +89,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -127,7 +127,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Role;
                 string value = _Role;
                 GetRole(ref value);
                 GetRole(ref value);
-                return (_Role = value);
+                return _Role = value;
             }
             }
 
 
             set
             set
@@ -164,7 +164,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 Enums.PersonRoleType value = _Type;
                 Enums.PersonRoleType value = _Type;
                 GetType(ref value);
                 GetType(ref value);
-                return (_Type = value);
+                return _Type = value;
             }
             }
 
 
             set
             set

+ 3 - 3
Jellyfin.Data/Entities/Rating.cs

@@ -79,7 +79,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -116,7 +116,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 double value = _Value;
                 double value = _Value;
                 GetValue(ref value);
                 GetValue(ref value);
-                return (_Value = value);
+                return _Value = value;
             }
             }
 
 
             set
             set
@@ -149,7 +149,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int? value = _Votes;
                 int? value = _Votes;
                 GetVotes(ref value);
                 GetVotes(ref value);
-                return (_Votes = value);
+                return _Votes = value;
             }
             }
 
 
             set
             set

+ 4 - 4
Jellyfin.Data/Entities/RatingSource.cs

@@ -86,7 +86,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -124,7 +124,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Name;
                 string value = _Name;
                 GetName(ref value);
                 GetName(ref value);
-                return (_Name = value);
+                return _Name = value;
             }
             }
 
 
             set
             set
@@ -161,7 +161,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 double value = _MaximumValue;
                 double value = _MaximumValue;
                 GetMaximumValue(ref value);
                 GetMaximumValue(ref value);
-                return (_MaximumValue = value);
+                return _MaximumValue = value;
             }
             }
 
 
             set
             set
@@ -198,7 +198,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 double value = _MinimumValue;
                 double value = _MinimumValue;
                 GetMinimumValue(ref value);
                 GetMinimumValue(ref value);
-                return (_MinimumValue = value);
+                return _MinimumValue = value;
             }
             }
 
 
             set
             set

+ 2 - 2
Jellyfin.Data/Entities/Release.cs

@@ -111,7 +111,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int value = _Id;
                 int value = _Id;
                 GetId(ref value);
                 GetId(ref value);
-                return (_Id = value);
+                return _Id = value;
             }
             }
 
 
             protected set
             protected set
@@ -150,7 +150,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Name;
                 string value = _Name;
                 GetName(ref value);
                 GetName(ref value);
-                return (_Name = value);
+                return _Name = value;
             }
             }
 
 
             set
             set

+ 1 - 1
Jellyfin.Data/Entities/Season.cs

@@ -84,7 +84,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int? value = _SeasonNumber;
                 int? value = _SeasonNumber;
                 GetSeasonNumber(ref value);
                 GetSeasonNumber(ref value);
-                return (_SeasonNumber = value);
+                return _SeasonNumber = value;
             }
             }
 
 
             set
             set

+ 1 - 1
Jellyfin.Data/Entities/SeasonMetadata.cs

@@ -84,7 +84,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Outline;
                 string value = _Outline;
                 GetOutline(ref value);
                 GetOutline(ref value);
-                return (_Outline = value);
+                return _Outline = value;
             }
             }
 
 
             set
             set

+ 3 - 3
Jellyfin.Data/Entities/Series.cs

@@ -65,7 +65,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 DayOfWeek? value = _AirsDayOfWeek;
                 DayOfWeek? value = _AirsDayOfWeek;
                 GetAirsDayOfWeek(ref value);
                 GetAirsDayOfWeek(ref value);
-                return (_AirsDayOfWeek = value);
+                return _AirsDayOfWeek = value;
             }
             }
 
 
             set
             set
@@ -101,7 +101,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 DateTimeOffset? value = _AirsTime;
                 DateTimeOffset? value = _AirsTime;
                 GetAirsTime(ref value);
                 GetAirsTime(ref value);
-                return (_AirsTime = value);
+                return _AirsTime = value;
             }
             }
 
 
             set
             set
@@ -134,7 +134,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 DateTimeOffset? value = _FirstAired;
                 DateTimeOffset? value = _FirstAired;
                 GetFirstAired(ref value);
                 GetFirstAired(ref value);
-                return (_FirstAired = value);
+                return _FirstAired = value;
             }
             }
 
 
             set
             set

+ 4 - 4
Jellyfin.Data/Entities/SeriesMetadata.cs

@@ -88,7 +88,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Outline;
                 string value = _Outline;
                 GetOutline(ref value);
                 GetOutline(ref value);
-                return (_Outline = value);
+                return _Outline = value;
             }
             }
 
 
             set
             set
@@ -126,7 +126,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Plot;
                 string value = _Plot;
                 GetPlot(ref value);
                 GetPlot(ref value);
-                return (_Plot = value);
+                return _Plot = value;
             }
             }
 
 
             set
             set
@@ -164,7 +164,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Tagline;
                 string value = _Tagline;
                 GetTagline(ref value);
                 GetTagline(ref value);
-                return (_Tagline = value);
+                return _Tagline = value;
             }
             }
 
 
             set
             set
@@ -202,7 +202,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 string value = _Country;
                 string value = _Country;
                 GetCountry(ref value);
                 GetCountry(ref value);
-                return (_Country = value);
+                return _Country = value;
             }
             }
 
 
             set
             set

+ 1 - 1
Jellyfin.Data/Entities/Track.cs

@@ -84,7 +84,7 @@ namespace Jellyfin.Data.Entities
             {
             {
                 int? value = _TrackNumber;
                 int? value = _TrackNumber;
                 GetTrackNumber(ref value);
                 GetTrackNumber(ref value);
-                return (_TrackNumber = value);
+                return _TrackNumber = value;
             }
             }
 
 
             set
             set

+ 1 - 1
MediaBrowser.Controller/Entities/CollectionFolder.cs

@@ -225,7 +225,7 @@ namespace MediaBrowser.Controller.Entities
                 return null;
                 return null;
             }
             }
 
 
-            return (totalProgresses / foldersWithProgress);
+            return totalProgresses / foldersWithProgress;
         }
         }
 
 
         protected override bool RefreshLinkedChildren(IEnumerable<FileSystemMetadata> fileSystemChildren)
         protected override bool RefreshLinkedChildren(IEnumerable<FileSystemMetadata> fileSystemChildren)

+ 2 - 2
MediaBrowser.Controller/Entities/Folder.cs

@@ -480,7 +480,7 @@ namespace MediaBrowser.Controller.Entities
                 innerProgress.RegisterAction(p =>
                 innerProgress.RegisterAction(p =>
                 {
                 {
                     double innerPercent = currentInnerPercent;
                     double innerPercent = currentInnerPercent;
-                    innerPercent += p / (count);
+                    innerPercent += p / count;
                     progress.Report(innerPercent);
                     progress.Report(innerPercent);
                 });
                 });
 
 
@@ -556,7 +556,7 @@ namespace MediaBrowser.Controller.Entities
                 innerProgress.RegisterAction(p =>
                 innerProgress.RegisterAction(p =>
                 {
                 {
                     double innerPercent = currentInnerPercent;
                     double innerPercent = currentInnerPercent;
-                    innerPercent += p / (count);
+                    innerPercent += p / count;
                     progress.Report(innerPercent);
                     progress.Report(innerPercent);
                 });
                 });
 
 

+ 1 - 1
MediaBrowser.Controller/Library/ItemResolveArgs.cs

@@ -42,7 +42,7 @@ namespace MediaBrowser.Controller.Library
 
 
         public LibraryOptions GetLibraryOptions()
         public LibraryOptions GetLibraryOptions()
         {
         {
-            return LibraryOptions ?? (LibraryOptions = (Parent == null ? new LibraryOptions() : BaseItem.LibraryManager.GetLibraryOptions(Parent)));
+            return LibraryOptions ?? (LibraryOptions = Parent == null ? new LibraryOptions() : BaseItem.LibraryManager.GetLibraryOptions(Parent));
         }
         }
 
 
         /// <summary>
         /// <summary>

+ 1 - 1
MediaBrowser.Providers/Manager/MetadataService.cs

@@ -391,7 +391,7 @@ namespace MediaBrowser.Providers.Manager
                 {
                 {
                     if (!child.IsFolder)
                     if (!child.IsFolder)
                     {
                     {
-                        ticks += (child.RunTimeTicks ?? 0);
+                        ticks += child.RunTimeTicks ?? 0;
                     }
                     }
                 }
                 }