Pārlūkot izejas kodu

Simplify linq expressions (use All)

Stepan Goremykin 2 gadi atpakaļ
vecāks
revīzija
19e65269a2

+ 2 - 2
Emby.Server.Implementations/Library/MediaSourceManager.cs

@@ -154,8 +154,8 @@ namespace Emby.Server.Implementations.Library
             // If file is strm or main media stream is missing, force a metadata refresh with remote probing
             // If file is strm or main media stream is missing, force a metadata refresh with remote probing
             if (allowMediaProbe && mediaSources[0].Type != MediaSourceType.Placeholder
             if (allowMediaProbe && mediaSources[0].Type != MediaSourceType.Placeholder
                 && (item.Path.EndsWith(".strm", StringComparison.OrdinalIgnoreCase)
                 && (item.Path.EndsWith(".strm", StringComparison.OrdinalIgnoreCase)
-                    || (item.MediaType == MediaType.Video && !mediaSources[0].MediaStreams.Any(i => i.Type == MediaStreamType.Video))
-                    || (item.MediaType == MediaType.Audio && !mediaSources[0].MediaStreams.Any(i => i.Type == MediaStreamType.Audio))))
+                    || (item.MediaType == MediaType.Video && mediaSources[0].MediaStreams.All(i => i.Type != MediaStreamType.Video))
+                    || (item.MediaType == MediaType.Audio && mediaSources[0].MediaStreams.All(i => i.Type != MediaStreamType.Audio))))
             {
             {
                 await item.RefreshMetadata(
                 await item.RefreshMetadata(
                     new MetadataRefreshOptions(_directoryService)
                     new MetadataRefreshOptions(_directoryService)

+ 6 - 6
Emby.Server.Implementations/Localization/LocalizationManager.cs

@@ -198,25 +198,25 @@ namespace Emby.Server.Implementations.Localization
             }
             }
 
 
             // Minimum rating possible
             // Minimum rating possible
-            if (!ratings.Any(x => x.Value == 0))
+            if (ratings.All(x => x.Value != 0))
             {
             {
                 ratings.Add(new ParentalRating("Approved", 0));
                 ratings.Add(new ParentalRating("Approved", 0));
             }
             }
 
 
             // Matches PG (this has different age restrictions depending on country)
             // Matches PG (this has different age restrictions depending on country)
-            if (!ratings.Any(x => x.Value == 10))
+            if (ratings.All(x => x.Value != 10))
             {
             {
                 ratings.Add(new ParentalRating("10", 10));
                 ratings.Add(new ParentalRating("10", 10));
             }
             }
 
 
             // Matches PG-13
             // Matches PG-13
-            if (!ratings.Any(x => x.Value == 13))
+            if (ratings.All(x => x.Value != 13))
             {
             {
                 ratings.Add(new ParentalRating("13", 13));
                 ratings.Add(new ParentalRating("13", 13));
             }
             }
 
 
             // Matches TV-14
             // Matches TV-14
-            if (!ratings.Any(x => x.Value == 14))
+            if (ratings.All(x => x.Value != 14))
             {
             {
                 ratings.Add(new ParentalRating("14", 14));
                 ratings.Add(new ParentalRating("14", 14));
             }
             }
@@ -229,13 +229,13 @@ namespace Emby.Server.Implementations.Localization
             }
             }
 
 
             // A lot of countries don't excplicitly have a seperate rating for adult content
             // A lot of countries don't excplicitly have a seperate rating for adult content
-            if (!ratings.Any(x => x.Value == 1000))
+            if (ratings.All(x => x.Value != 1000))
             {
             {
                 ratings.Add(new ParentalRating("XXX", 1000));
                 ratings.Add(new ParentalRating("XXX", 1000));
             }
             }
 
 
             // A lot of countries don't excplicitly have a seperate rating for banned content
             // A lot of countries don't excplicitly have a seperate rating for banned content
-            if (!ratings.Any(x => x.Value == 1001))
+            if (ratings.All(x => x.Value != 1001))
             {
             {
                 ratings.Add(new ParentalRating("Banned", 1001));
                 ratings.Add(new ParentalRating("Banned", 1001));
             }
             }