Merge pull request #10141 from Bond-009/nullable3

Emby.Server.Implementations/ApplicationHost.cs

@@ -1006,7 +1006,7 @@ namespace Emby.Server.Implementations
             if (ConfigurationManager.GetNetworkConfiguration().EnablePublishedServerUriByRequest)
             {
                 int? requestPort = request.Host.Port;
-                if (requestPort == null
+                if (requestPort is null
                     || (requestPort == 80 && string.Equals(request.Scheme, "http", StringComparison.OrdinalIgnoreCase))
                     || (requestPort == 443 && string.Equals(request.Scheme, "https", StringComparison.OrdinalIgnoreCase)))
                 {
@@ -1190,7 +1190,7 @@ namespace Emby.Server.Implementations
                 }
             }
 
-            if (_sessionManager != null)
+            if (_sessionManager is not null)
             {
                 // used for closing websockets
                 foreach (var session in _sessionManager.Sessions)

Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -1971,19 +1971,8 @@ namespace Emby.Server.Implementations.Data
             if (reader.TryGetString(2, out var imagePath))
             {
                 chapter.ImagePath = imagePath;
-
-                if (!string.IsNullOrEmpty(chapter.ImagePath))
-                {
-                    try
-                    {
                 chapter.ImageTag = _imageProcessor.GetImageCacheTag(item, chapter);
             }
-                    catch (Exception ex)
-                    {
-                        Logger.LogError(ex, "Failed to create image cache tag.");
-                    }
-                }
-            }
 
             if (reader.TryReadDateTime(3, out var imageDateModified))
             {

Jellyfin.Api/Helpers/DynamicHlsHelper.cs

@@ -693,7 +693,7 @@ public class DynamicHlsHelper
             // Currently we only transcode to 8 bits AV1
             int bitDepth = 8;
             if (EncodingHelper.IsCopyCodec(state.OutputVideoCodec)
-                && state.VideoStream != null
+                && state.VideoStream is not null
                 && state.VideoStream.BitDepth.HasValue)
             {
                 bitDepth = state.VideoStream.BitDepth.Value;

Jellyfin.Api/ModelBinders/CommaDelimitedArrayModelBinder.cs

@@ -77,7 +77,7 @@ public class CommaDelimitedArrayModelBinder : IModelBinder
         var typedValueIndex = 0;
         for (var i = 0; i < parsedValues.Length; i++)
         {
-            if (parsedValues[i] != null)
+            if (parsedValues[i] is not null)
             {
                 typedValues.SetValue(parsedValues[i], typedValueIndex);
                 typedValueIndex++;

Jellyfin.Api/ModelBinders/PipeDelimitedArrayModelBinder.cs

@@ -77,7 +77,7 @@ public class PipeDelimitedArrayModelBinder : IModelBinder
         var typedValueIndex = 0;
         for (var i = 0; i < parsedValues.Length; i++)
         {
-            if (parsedValues[i] != null)
+            if (parsedValues[i] is not null)
             {
                 typedValues.SetValue(parsedValues[i], typedValueIndex);
                 typedValueIndex++;

Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs

@@ -276,7 +276,7 @@ namespace Jellyfin.Server.Extensions
                 }
                 else if (NetworkExtensions.TryParseToSubnet(allowedProxies[i], out var subnet))
                 {
-                    if (subnet != null)
+                    if (subnet is not null)
                     {
                         AddIPAddress(config, options, subnet.Prefix, subnet.PrefixLength);
                     }

MediaBrowser.Controller/Drawing/IImageProcessor.cs

@@ -66,7 +66,7 @@ namespace MediaBrowser.Controller.Drawing
         /// <returns>Guid.</returns>
         string GetImageCacheTag(BaseItem item, ItemImageInfo image);
 
-        string GetImageCacheTag(BaseItem item, ChapterInfo chapter);
+        string? GetImageCacheTag(BaseItem item, ChapterInfo chapter);
 
         string? GetImageCacheTag(User user);
 

MediaBrowser.Controller/Entities/BaseItem.cs

@@ -1864,7 +1864,7 @@ namespace MediaBrowser.Controller.Entities
         /// <exception cref="ArgumentException">Backdrops should be accessed using Item.Backdrops.</exception>
         public bool HasImage(ImageType type, int imageIndex)
         {
-            return GetImageInfo(type, imageIndex) != null;
+            return GetImageInfo(type, imageIndex) is not null;
         }
 
         public void SetImage(ItemImageInfo image, int index)

MediaBrowser.Controller/Entities/ItemImageInfo.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 #pragma warning disable CS1591
 
 using System;
@@ -14,7 +12,7 @@ namespace MediaBrowser.Controller.Entities
         /// Gets or sets the path.
         /// </summary>
         /// <value>The path.</value>
-        public string Path { get; set; }
+        public required string Path { get; set; }
 
         /// <summary>
         /// Gets or sets the type.
@@ -36,9 +34,9 @@ namespace MediaBrowser.Controller.Entities
         /// Gets or sets the blurhash.
         /// </summary>
         /// <value>The blurhash.</value>
-        public string BlurHash { get; set; }
+        public string? BlurHash { get; set; }
 
         [JsonIgnore]
-        public bool IsLocalFile => Path is null || !Path.StartsWith("http", StringComparison.OrdinalIgnoreCase);
+        public bool IsLocalFile => !Path.StartsWith("http", StringComparison.OrdinalIgnoreCase);
     }
 }

MediaBrowser.Controller/Entities/TV/Episode.cs

@@ -99,7 +99,7 @@ namespace MediaBrowser.Controller.Entities.TV
         }
 
         [JsonIgnore]
-        public bool IsInSeasonFolder => FindParent<Season>() != null;
+        public bool IsInSeasonFolder => FindParent<Season>() is not null;
 
         [JsonIgnore]
         public string SeriesPresentationUniqueKey { get; set; }

MediaBrowser.Controller/Entities/Video.cs

@@ -333,7 +333,7 @@ namespace MediaBrowser.Controller.Entities
 
         protected override bool IsActiveRecording()
         {
-            return LiveTvManager.GetActiveRecordingInfo(Path) != null;
+            return LiveTvManager.GetActiveRecordingInfo(Path) is not null;
         }
 
         public override bool CanDelete()

MediaBrowser.Controller/Library/ItemResolveArgs.cs

@@ -217,7 +217,7 @@ namespace MediaBrowser.Controller.Library
         /// <returns><c>true</c> if [contains file system entry by name] [the specified name]; otherwise, <c>false</c>.</returns>
         public bool ContainsFileSystemEntryByName(string name)
         {
-            return GetFileSystemEntryByName(name) != null;
+            return GetFileSystemEntryByName(name) is not null;
         }
 
         public string GetCollectionType()

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -2692,7 +2692,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             string args = string.Empty;
 
             // http://ffmpeg.org/ffmpeg-all.html#toc-Complex-filtergraphs-1
-            if (state.VideoStream != null && videoProcessFilters.Contains("-filter_complex", StringComparison.Ordinal))
+            if (state.VideoStream is not null && videoProcessFilters.Contains("-filter_complex", StringComparison.Ordinal))
             {
                 int videoStreamIndex = FindIndex(state.MediaSource.MediaStreams, state.VideoStream);
 

MediaBrowser.Controller/Security/IAuthenticationManager.cs

@@ -1,6 +1,4 @@
-#nullable enable
+using System.Collections.Generic;
-
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Controller.Security

MediaBrowser.Model/Dlna/StreamBuilder.cs

@@ -135,7 +135,7 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            if (transcodingProfile != null)
+            if (transcodingProfile is not null)
             {
                 if (!item.SupportsTranscoding)
                 {
@@ -759,7 +759,7 @@ namespace MediaBrowser.Model.Dlna
             {
                 // prefer direct copy profile
                 float videoFramerate = videoStream?.AverageFrameRate ?? videoStream?.RealFrameRate ?? 0;
-                TransportStreamTimestamp? timestamp = videoStream == null ? TransportStreamTimestamp.None : item.Timestamp;
+                TransportStreamTimestamp? timestamp = videoStream is null ? TransportStreamTimestamp.None : item.Timestamp;
                 int? numAudioStreams = item.GetStreamCount(MediaStreamType.Audio);
                 int? numVideoStreams = item.GetStreamCount(MediaStreamType.Video);
 

MediaBrowser.Model/Entities/ChapterInfo.cs

@@ -1,4 +1,3 @@
-#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -20,16 +19,16 @@ namespace MediaBrowser.Model.Entities
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>
         /// Gets or sets the image path.
         /// </summary>
         /// <value>The image path.</value>
-        public string ImagePath { get; set; }
+        public string? ImagePath { get; set; }
 
         public DateTime ImageDateModified { get; set; }
 
-        public string ImageTag { get; set; }
+        public string? ImageTag { get; set; }
     }
 }

MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs

@@ -1,11 +1,8 @@
-#nullable disable
-
 #pragma warning disable CA1068, CS1591
 
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -83,9 +80,9 @@ namespace MediaBrowser.Providers.MediaInfo
             CancellationToken cancellationToken)
             where T : Video
         {
-            BlurayDiscInfo blurayDiscInfo = null;
+            BlurayDiscInfo? blurayDiscInfo = null;
 
-            Model.MediaInfo.MediaInfo mediaInfoResult = null;
+            Model.MediaInfo.MediaInfo? mediaInfoResult = null;
 
             if (!item.IsShortcut || options.EnableRemoteContentProbe)
             {
@@ -131,7 +128,7 @@ namespace MediaBrowser.Providers.MediaInfo
                     var m2ts = _mediaEncoder.GetPrimaryPlaylistM2tsFiles(item.Path);
 
                     // Return if no playable .m2ts files are found
-                    if (blurayDiscInfo.Files.Length == 0 || m2ts.Count == 0)
+                    if (blurayDiscInfo is null || blurayDiscInfo.Files.Length == 0 || m2ts.Count == 0)
                     {
                         _logger.LogError("No playable .m2ts files found in Blu-ray structure, skipping FFprobe.");
                         return ItemUpdateType.MetadataImport;
@@ -192,16 +189,14 @@ namespace MediaBrowser.Providers.MediaInfo
         protected async Task Fetch(
             Video video,
             CancellationToken cancellationToken,
-            Model.MediaInfo.MediaInfo mediaInfo,
+            Model.MediaInfo.MediaInfo? mediaInfo,
-            BlurayDiscInfo blurayInfo,
+            BlurayDiscInfo? blurayInfo,
             MetadataRefreshOptions options)
         {
-            List<MediaStream> mediaStreams;
+            List<MediaStream> mediaStreams = new List<MediaStream>();
             IReadOnlyList<MediaAttachment> mediaAttachments;
             ChapterInfo[] chapters;
 
-            mediaStreams = new List<MediaStream>();
-
             // Add external streams before adding the streams from the file to preserve stream IDs on remote videos
             await AddExternalSubtitlesAsync(video, mediaStreams, options, cancellationToken).ConfigureAwait(false);
 
@@ -221,18 +216,6 @@ namespace MediaBrowser.Providers.MediaInfo
                 video.TotalBitrate = mediaInfo.Bitrate;
                 video.RunTimeTicks = mediaInfo.RunTimeTicks;
                 video.Size = mediaInfo.Size;
-
-                if (video.VideoType == VideoType.VideoFile)
-                {
-                    var extension = (Path.GetExtension(video.Path) ?? string.Empty).TrimStart('.');
-
-                    video.Container = extension;
-                }
-                else
-                {
-                    video.Container = null;
-                }
-
                 video.Container = mediaInfo.Container;
 
                 chapters = mediaInfo.Chapters ?? Array.Empty<ChapterInfo>();
@@ -243,8 +226,7 @@ namespace MediaBrowser.Providers.MediaInfo
             }
             else
             {
-                var currentMediaStreams = video.GetMediaStreams();
+                foreach (var mediaStream in video.GetMediaStreams())
-                foreach (var mediaStream in currentMediaStreams)
                 {
                     if (!mediaStream.IsExternal)
                     {
@@ -295,8 +277,8 @@ namespace MediaBrowser.Providers.MediaInfo
                 _itemRepo.SaveMediaAttachments(video.Id, mediaAttachments, cancellationToken);
             }
 
-            if (options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh ||
+            if (options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh
-                options.MetadataRefreshMode == MetadataRefreshMode.Default)
+                || options.MetadataRefreshMode == MetadataRefreshMode.Default)
             {
                 if (_config.Configuration.DummyChapterDuration > 0 && chapters.Length == 0 && mediaStreams.Any(i => i.Type == MediaStreamType.Video))
                 {
@@ -321,11 +303,11 @@ namespace MediaBrowser.Providers.MediaInfo
         {
             for (int i = 0; i < chapters.Length; i++)
             {
-                string name = chapters[i].Name;
+                string? name = chapters[i].Name;
                 // Check if the name is empty and/or if the name is a time
                 // Some ripping programs do that.
-                if (string.IsNullOrWhiteSpace(name) ||
+                if (string.IsNullOrWhiteSpace(name)
-                    TimeSpan.TryParse(name, out _))
+                    || TimeSpan.TryParse(name, out _))
                 {
                     chapters[i].Name = string.Format(
                         CultureInfo.InvariantCulture,
@@ -384,23 +366,18 @@ namespace MediaBrowser.Providers.MediaInfo
             // Use the ffprobe values if these are empty
             if (videoStream is not null)
             {
-                videoStream.BitRate = IsEmpty(videoStream.BitRate) ? currentBitRate : videoStream.BitRate;
+                videoStream.BitRate = videoStream.BitRate.GetValueOrDefault() == 0 ? currentBitRate : videoStream.BitRate;
-                videoStream.Width = IsEmpty(videoStream.Width) ? currentWidth : videoStream.Width;
+                videoStream.Width = videoStream.Width.GetValueOrDefault() == 0 ? currentWidth : videoStream.Width;
-                videoStream.Height = IsEmpty(videoStream.Height) ? currentHeight : videoStream.Height;
+                videoStream.Height = videoStream.Height.GetValueOrDefault() == 0 ? currentHeight : videoStream.Height;
             }
         }
 
-        private bool IsEmpty(int? num)
-        {
-            return !num.HasValue || num.Value == 0;
-        }
-
         /// <summary>
         /// Gets information about the longest playlist on a bdrom.
         /// </summary>
         /// <param name="path">The path.</param>
         /// <returns>VideoStream.</returns>
-        private BlurayDiscInfo GetBDInfo(string path)
+        private BlurayDiscInfo? GetBDInfo(string path)
         {
             ArgumentException.ThrowIfNullOrEmpty(path);
 
@@ -527,11 +504,14 @@ namespace MediaBrowser.Providers.MediaInfo
 
         private void FetchPeople(Video video, Model.MediaInfo.MediaInfo data, MetadataRefreshOptions options)
         {
-            var replaceData = options.ReplaceAllMetadata;
+            if (video.IsLocked
-
+                || video.LockedFields.Contains(MetadataField.Cast)
-            if (!video.IsLocked && !video.LockedFields.Contains(MetadataField.Cast))
+                || data.People.Length == 0)
             {
-                if (replaceData || _libraryManager.GetPeople(video).Count == 0)
+                return;
+            }
+
+            if (options.ReplaceAllMetadata || _libraryManager.GetPeople(video).Count == 0)
             {
                 var people = new List<PersonInfo>();
 
@@ -548,12 +528,6 @@ namespace MediaBrowser.Providers.MediaInfo
                 _libraryManager.UpdatePeople(video, people);
             }
         }
-        }
-
-        private SubtitleOptions GetOptions()
-        {
-            return _config.GetConfiguration<SubtitleOptions>("subtitles");
-        }
 
         /// <summary>
         /// Adds the external subtitles.
@@ -575,7 +549,7 @@ namespace MediaBrowser.Providers.MediaInfo
             var enableSubtitleDownloading = options.MetadataRefreshMode == MetadataRefreshMode.Default ||
                                             options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh;
 
-            var subtitleOptions = GetOptions();
+            var subtitleOptions = _config.GetConfiguration<SubtitleOptions>("subtitles");
 
             var libraryOptions = _libraryManager.GetLibraryOptions(video);
 
@@ -659,9 +633,9 @@ namespace MediaBrowser.Providers.MediaInfo
         /// </summary>
         /// <param name="video">The video.</param>
         /// <returns>An array of dummy chapters.</returns>
-        private ChapterInfo[] CreateDummyChapters(Video video)
+        internal ChapterInfo[] CreateDummyChapters(Video video)
         {
-            var runtime = video.RunTimeTicks ?? 0;
+            var runtime = video.RunTimeTicks.GetValueOrDefault();
 
             // Only process files with a runtime higher than 0 and lower than 12h. The latter are likely corrupted.
             if (runtime < 0 || runtime > TimeSpan.FromHours(12).Ticks)
@@ -671,12 +645,15 @@ namespace MediaBrowser.Providers.MediaInfo
                         CultureInfo.InvariantCulture,
                         "{0} has an invalid runtime of {1} minutes",
                         video.Name,
-                        TimeSpan.FromTicks(runtime).Minutes));
+                        TimeSpan.FromTicks(runtime).TotalMinutes));
             }
 
             long dummyChapterDuration = TimeSpan.FromSeconds(_config.Configuration.DummyChapterDuration).Ticks;
-            if (runtime > dummyChapterDuration)
+            if (runtime <= dummyChapterDuration)
             {
+                return Array.Empty<ChapterInfo>();
+            }
+
             int chapterCount = (int)(runtime / dummyChapterDuration);
             var chapters = new ChapterInfo[chapterCount];
 
@@ -693,8 +670,5 @@ namespace MediaBrowser.Providers.MediaInfo
 
             return chapters;
         }
-
-            return Array.Empty<ChapterInfo>();
-        }
     }
 }

src/Jellyfin.Drawing/ImageProcessor.cs

@@ -13,7 +13,6 @@ using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -437,8 +436,13 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
         => (item.Path + image.DateModified.Ticks).GetMD5().ToString("N", CultureInfo.InvariantCulture);
 
     /// <inheritdoc />
-    public string GetImageCacheTag(BaseItem item, ChapterInfo chapter)
+    public string? GetImageCacheTag(BaseItem item, ChapterInfo chapter)
     {
+        if (chapter.ImagePath is null)
+        {
+            return null;
+        }
+
         return GetImageCacheTag(item, new ItemImageInfo
         {
             Path = chapter.ImagePath,

src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs

@@ -59,7 +59,7 @@ namespace Jellyfin.Extensions.Json.Converters
                 var typedValueIndex = 0;
                 for (var i = 0; i < stringEntries.Length; i++)
                 {
-                    if (parsedValues[i] != null)
+                    if (parsedValues[i] is not null)
                     {
                         typedValues.SetValue(parsedValues[i], typedValueIndex);
                         typedValueIndex++;

src/Jellyfin.Extensions/StreamExtensions.cs

@@ -40,7 +40,7 @@ namespace Jellyfin.Extensions
         public static IEnumerable<string> ReadAllLines(this TextReader reader)
         {
             string? line;
-            while ((line = reader.ReadLine()) != null)
+            while ((line = reader.ReadLine()) is not null)
             {
                 yield return line;
             }
@@ -54,7 +54,7 @@ namespace Jellyfin.Extensions
         public static async IAsyncEnumerable<string> ReadAllLinesAsync(this TextReader reader)
         {
             string? line;
-            while ((line = await reader.ReadLineAsync().ConfigureAwait(false)) != null)
+            while ((line = await reader.ReadLineAsync().ConfigureAwait(false)) is not null)
             {
                 yield return line;
             }

tests/Jellyfin.Providers.Tests/Jellyfin.Providers.Tests.csproj

@@ -7,6 +7,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="AutoFixture" />
+    <PackageReference Include="AutoFixture.AutoMoq" />
+    <PackageReference Include="AutoFixture.Xunit2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Moq" />
     <PackageReference Include="xunit" />

tests/Jellyfin.Providers.Tests/MediaInfo/FFProbeVideoInfoTests.cs

@@ -0,0 +1,61 @@
+using System;
+using AutoFixture;
+using AutoFixture.AutoMoq;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Providers.MediaInfo;
+using Moq;
+using Xunit;
+
+namespace Jellyfin.Providers.Tests.MediaInfo;
+
+public class FFProbeVideoInfoTests
+{
+    private readonly FFProbeVideoInfo _fFProbeVideoInfo;
+
+    public FFProbeVideoInfoTests()
+    {
+        var serverConfiguration = new ServerConfiguration()
+        {
+            DummyChapterDuration = (int)TimeSpan.FromMinutes(5).TotalSeconds
+        };
+        var serverConfig = new Mock<IServerConfigurationManager>();
+        serverConfig.Setup(c => c.Configuration)
+            .Returns(serverConfiguration);
+
+        IFixture fixture = new Fixture().Customize(new AutoMoqCustomization { ConfigureMembers = true });
+        fixture.Inject(serverConfig);
+        _fFProbeVideoInfo = fixture.Create<FFProbeVideoInfo>();
+    }
+
+    [Theory]
+    [InlineData(-1L)]
+    [InlineData(long.MinValue)]
+    [InlineData(long.MaxValue)]
+    public void CreateDummyChapters_InvalidRuntime_ThrowsArgumentException(long? runtime)
+    {
+        Assert.Throws<ArgumentException>(
+            () => _fFProbeVideoInfo.CreateDummyChapters(new Video()
+                {
+                    RunTimeTicks = runtime
+                }));
+    }
+
+    [Theory]
+    [InlineData(null, 0)]
+    [InlineData(0L, 0)]
+    [InlineData(1L, 0)]
+    [InlineData(TimeSpan.TicksPerMinute * 5, 0)]
+    [InlineData((TimeSpan.TicksPerMinute * 5) + 1, 1)]
+    [InlineData(TimeSpan.TicksPerMinute * 50, 10)]
+    public void CreateDummyChapters_ValidRuntime_CorrectChaptersCount(long? runtime, int chaptersCount)
+    {
+        var chapters = _fFProbeVideoInfo.CreateDummyChapters(new Video()
+                {
+                    RunTimeTicks = runtime
+                });
+
+        Assert.Equal(chaptersCount, chapters.Length);
+    }
+}