enable nullable refs

AntonyCorbett · Jun 8, 2021 · e195172 · e195172
1 parent 7558484
commit e195172
Show file tree

Hide file tree

Showing 72 changed files with 499 additions and 310 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -290,3 +290,6 @@ dotnet_diagnostic.SA1201.severity = none
 
 # SA1601: Partial elements should be documented
 dotnet_diagnostic.SA1601.severity = none
+
+# SA1011: Closing square brackets should be spaced correctly
+dotnet_diagnostic.SA1011.severity = none
diff --git a/OnlyM.Core/Extensions/StringExtensions.cs b/OnlyM.Core/Extensions/StringExtensions.cs
@@ -4,7 +4,7 @@ namespace OnlyM.Core.Extensions
 {
     public static class StringExtensions
     {
-        public static string GetNumericPrefix(this string value)
+        public static string? GetNumericPrefix(this string? value)
         {
             if (string.IsNullOrEmpty(value))
             {

diff --git a/OnlyM.Core/Extensions/UriExtensions.cs b/OnlyM.Core/Extensions/UriExtensions.cs
@@ -9,13 +9,13 @@ public static string ToRelative(this Uri uri)
             return uri.IsAbsoluteUri ? uri.PathAndQuery : uri.OriginalString;
         }
 
-        public static string ToAbsolute(this Uri uri, string baseUrl)
+        public static string? ToAbsolute(this Uri uri, string baseUrl)
         {
             var baseUri = new Uri(baseUrl);
             return uri.ToAbsolute(baseUri);
         }
 
-        public static string ToAbsolute(this Uri uri, Uri baseUri)
+        public static string? ToAbsolute(this Uri uri, Uri baseUri)
         {
             var relative = uri.ToRelative();
 

diff --git a/OnlyM.Core/Models/DisplayDeviceData.cs b/OnlyM.Core/Models/DisplayDeviceData.cs
@@ -2,12 +2,12 @@
 {
     internal class DisplayDeviceData
     {
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
-        public string DeviceId { get; set; }
+        public string? DeviceId { get; set; }
 
-        public string DeviceString { get; set; }
+        public string? DeviceString { get; set; }
 
-        public string DeviceKey { get; set; }
+        public string? DeviceKey { get; set; }
     }
 }
diff --git a/OnlyM.Core/Models/MediaFile.cs b/OnlyM.Core/Models/MediaFile.cs
@@ -2,9 +2,9 @@
 {
     public class MediaFile
     {
-        public string FullPath { get; set; }
+        public string? FullPath { get; set; }
 
-        public SupportedMediaType MediaType { get; set; }
+        public SupportedMediaType? MediaType { get; set; }
 
         public long LastChanged { get; set; }
     }

diff --git a/OnlyM.Core/Models/MediaFolders.cs b/OnlyM.Core/Models/MediaFolders.cs
@@ -2,8 +2,8 @@
 {
     public class MediaFolders
     {
-        public string MediaFolder { get; set; }
+        public string? MediaFolder { get; set; }
 
-        public string DatedSubFolder { get; set; }
+        public string? DatedSubFolder { get; set; }
     }
 }
diff --git a/OnlyM.Core/Models/MediaMetaData.cs b/OnlyM.Core/Models/MediaMetaData.cs
@@ -4,7 +4,7 @@ namespace OnlyM.Core.Models
 {
     public class MediaMetaData
     {
-        public string Title { get; set; }
+        public string? Title { get; set; }
 
         public TimeSpan Duration { get; set; }
     }

diff --git a/OnlyM.Core/Models/SupportedMediaType.cs b/OnlyM.Core/Models/SupportedMediaType.cs
@@ -2,10 +2,10 @@
 {
     public class SupportedMediaType
     {
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         public MediaClassification Classification { get; set; }
 
-        public string FileExtension { get; set; }
+        public string? FileExtension { get; set; }
     }
 }
diff --git a/OnlyM.Core/Models/SystemMonitor.cs b/OnlyM.Core/Models/SystemMonitor.cs
@@ -4,12 +4,12 @@ namespace OnlyM.Core.Models
 {
     public class SystemMonitor
     {
-        public Screen Monitor { get; set; }
+        public Screen? Monitor { get; set; }
 
-        public string MonitorName { get; set; }
+        public string? MonitorName { get; set; }
 
-        public string MonitorId { get; set; }
+        public string? MonitorId { get; set; }
 
-        public string FriendlyName { get; set; }
+        public string? FriendlyName { get; set; }
     }
 }
diff --git a/OnlyM.Core/OnlyM.Core.csproj b/OnlyM.Core/OnlyM.Core.csproj
@@ -5,6 +5,7 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/OnlyM.Core/Services/CommandLine/CommandLineService.cs b/OnlyM.Core/Services/CommandLine/CommandLineService.cs
@@ -14,7 +14,7 @@ public CommandLineService()
             p.Setup<bool>("nogpu")
                 .Callback(s => NoGpu = s).SetDefault(false);
 
-            p.Setup<string>("id")
+            p.Setup<string?>("id")
                 .Callback(s => OptionsIdentifier = s).SetDefault(null);
 
             p.Setup<bool>("nosettings")
@@ -23,7 +23,7 @@ public CommandLineService()
             p.Setup<bool>("nofolder")
                 .Callback(s => NoFolder = s).SetDefault(false);
 
-            p.Setup<string>("source")
+            p.Setup<string?>("source")
                 .Callback(s => SourceFolder = GetFullSourcePath(s)).SetDefault(null);
 
             p.Setup<bool>("novidfix")
@@ -34,17 +34,17 @@ public CommandLineService()
 
         public bool NoGpu { get; set; }
 
-        public string OptionsIdentifier { get; set; }
+        public string? OptionsIdentifier { get; set; }
 
         public bool NoSettings { get; set; }
 
         public bool NoFolder { get; set; }
 
-        public string SourceFolder { get; set; }
+        public string? SourceFolder { get; set; }
 
         public bool DisableVideoRenderingFix { get; set; }
 
-        private static string GetFullSourcePath(string sourcePath)
+        private static string? GetFullSourcePath(string? sourcePath)
         {
             try
             {

diff --git a/OnlyM.Core/Services/CommandLine/ICommandLineService.cs b/OnlyM.Core/Services/CommandLine/ICommandLineService.cs
@@ -4,13 +4,13 @@ public interface ICommandLineService
     {
         bool NoGpu { get; set; }
 
-        string OptionsIdentifier { get; set; }
+        string? OptionsIdentifier { get; set; }
 
         bool NoSettings { get; set; }
 
         bool NoFolder { get; set; }
 
-        string SourceFolder { get; set; }
+        string? SourceFolder { get; set; }
 
         bool DisableVideoRenderingFix { get; set; }
     }

diff --git a/OnlyM.Core/Services/Database/BrowserData.cs b/OnlyM.Core/Services/Database/BrowserData.cs
@@ -7,7 +7,7 @@ public class BrowserData
 
         public int Id { get; set; }
 
-        public string Url { get; set; }
+        public string? Url { get; set; }
 
         public double ZoomLevel { get; set; }
 

diff --git a/OnlyM.Core/Services/Database/DatabaseService.cs b/OnlyM.Core/Services/Database/DatabaseService.cs
@@ -52,7 +52,7 @@ public void AddThumbnailToCache(string originalPath, long originalLastChanged, b
             }
         }
 
-        public byte[] GetThumbnailFromCache(string originalPath, long originalLastChanged)
+        public byte[]? GetThumbnailFromCache(string originalPath, long originalLastChanged)
         {
             using (var c = CreateConnection())
             using (var cmd = c.CreateCommand())
@@ -127,7 +127,7 @@ public void AddMediaStartOffsetData(string fileName, string startOffsets, int le
             }
         }
 
-        public MediaStartOffsetData GetMediaStartOffsetData(string fileName)
+        public MediaStartOffsetData? GetMediaStartOffsetData(string fileName)
         {
             using (var c = CreateConnection())
             using (var cmd = c.CreateCommand())
@@ -158,7 +158,7 @@ public MediaStartOffsetData GetMediaStartOffsetData(string fileName)
             return null;
         }
 
-        public BrowserData GetBrowserData(string url)
+        public BrowserData? GetBrowserData(string url)
         {
             using (var c = CreateConnection())
             using (var cmd = c.CreateCommand())

diff --git a/OnlyM.Core/Services/Database/IDatabaseService.cs b/OnlyM.Core/Services/Database/IDatabaseService.cs
@@ -7,16 +7,16 @@ public interface IDatabaseService
 
         void AddThumbnailToCache(string originalPath, long originalLastChanged, byte[] thumbnail);
 
-        byte[] GetThumbnailFromCache(string originalPath, long originalLastChanged);
+        byte[]? GetThumbnailFromCache(string originalPath, long originalLastChanged);
 
         // browser data...
         void AddBrowserData(string url, double zoomLevel);
 
-        BrowserData GetBrowserData(string url);
+        BrowserData? GetBrowserData(string url);
 
         // media file start offset data...
         void AddMediaStartOffsetData(string fileName, string startOffsets, int lengthSeconds);
 
-        MediaStartOffsetData GetMediaStartOffsetData(string fileName);
+        MediaStartOffsetData? GetMediaStartOffsetData(string fileName);
     }
 }
diff --git a/OnlyM.Core/Services/Database/MediaStartOffsetData.cs b/OnlyM.Core/Services/Database/MediaStartOffsetData.cs
@@ -6,11 +6,11 @@ public class MediaStartOffsetData
     {
         public int Id { get; set; }
 
-        public string FileName { get; set; }
+        public string? FileName { get; set; }
 
         public int LengthSeconds { get; set; }
 
-        public List<int> StartOffsets { get; set; }
+        public List<int>? StartOffsets { get; set; }
 
 #pragma warning disable CA1822 // Mark members as static
 #pragma warning disable U2U1002 // Mark members as static

diff --git a/OnlyM.Core/Services/Media/DatedSubFolders.cs b/OnlyM.Core/Services/Media/DatedSubFolders.cs
@@ -6,7 +6,7 @@ namespace OnlyM.Core.Services.Media
 {
     internal static class DatedSubFolders
     {
-        public static string GetDatedSubFolder(string rootFolder, DateTime theDate)
+        public static string? GetDatedSubFolder(string rootFolder, DateTime theDate)
         {
             if (Directory.Exists(rootFolder))
             {

diff --git a/OnlyM.Core/Services/Media/FolderWatcherService.cs b/OnlyM.Core/Services/Media/FolderWatcherService.cs
@@ -14,9 +14,9 @@ public sealed class FolderWatcherService : IFolderWatcherService, IDisposable
         private readonly IOptionsService _optionsService;
         private readonly IMediaProviderService _mediaProviderService;
         private readonly ManualResetEventSlim _signalFolderChange = new(false);
-        private FileSystemWatcher _watcher;
+        private FileSystemWatcher? _watcher;
         private int _changeVersion;
-        private MediaFolders _foldersToWatch;
+        private MediaFolders? _foldersToWatch;
 
         public FolderWatcherService(IOptionsService optionsService, IMediaProviderService mediaProviderService)
         {
@@ -31,7 +31,7 @@ public FolderWatcherService(IOptionsService optionsService, IMediaProviderServic
             InitWatcher();
         }
 
-        public event EventHandler ChangesFoundEvent;
+        public event EventHandler? ChangesFoundEvent;
 
         public bool IsEnabled
         {
@@ -52,7 +52,7 @@ public bool IsEnabled
 
         public void Dispose()
         {
-            _signalFolderChange?.Dispose();
+            _signalFolderChange.Dispose();
             _watcher?.Dispose();
         }
 
@@ -90,7 +90,7 @@ private void InitWatcher(MediaFolders mediaFolders)
                 _watcher.Renamed += HandleContentRenamed;
             }
 
-            if (Directory.Exists(mediaFolders.MediaFolder))
+            if (mediaFolders.MediaFolder != null && Directory.Exists(mediaFolders.MediaFolder))
             {
                 _watcher.Path = mediaFolders.MediaFolder;
                 _watcher.EnableRaisingEvents = true;
@@ -121,6 +121,11 @@ private void HandleContentRenamed(object sender, RenamedEventArgs e)
 
         private bool IsWatchingFilesFolder(string path)
         {
+            if (_foldersToWatch == null)
+            {
+                return false;
+            }
+
             var directory = Path.GetDirectoryName(path);
 
             if (directory == null)
@@ -157,13 +162,13 @@ private void HandleContentModified(object sender, FileSystemEventArgs e)
             _signalFolderChange.Set();
         }
 
-        private void HandleMediaFolderChangedEvent(object sender, EventArgs e)
+        private void HandleMediaFolderChangedEvent(object? sender, EventArgs e)
         {
             // Main Media Folder has changed.
             InitWatcher();
         }
 
-        private void HandleOperatingDateChangedEvent(object sender, EventArgs e)
+        private void HandleOperatingDateChangedEvent(object? sender, EventArgs e)
         {
             // Operating date has changed (so we may need to watch
             // a different Calendar folder).

diff --git a/OnlyM.Core/Services/Media/IMediaMetaDataService.cs b/OnlyM.Core/Services/Media/IMediaMetaDataService.cs
@@ -4,7 +4,7 @@ namespace OnlyM.Core.Services.Media
 {
     public interface IMediaMetaDataService
     {
-        MediaMetaData GetMetaData(
+        MediaMetaData? GetMetaData(
             string mediaItemFilePath, 
             SupportedMediaType mediaType,
             string ffmpegFolder);

diff --git a/OnlyM.Core/Services/Media/IMediaProviderService.cs b/OnlyM.Core/Services/Media/IMediaProviderService.cs
@@ -12,7 +12,7 @@ public interface IMediaProviderService
 
         IReadOnlyCollection<SupportedMediaType> GetSupportedMediaTypes();
 
-        SupportedMediaType GetSupportedMediaType(string fileName);
+        SupportedMediaType? GetSupportedMediaType(string fileName);
 
         MediaFolders GetMediaFolders(DateTime theDate);
     }

diff --git a/OnlyM.Core/Services/Media/IThumbnailService.cs b/OnlyM.Core/Services/Media/IThumbnailService.cs
@@ -7,7 +7,7 @@ public interface IThumbnailService
     {
         event EventHandler ThumbnailsPurgedEvent;
 
-        byte[] GetThumbnail(
+        byte[]? GetThumbnail(
             string originalPath, 
             string ffmpegFolder,
             MediaClassification mediaClassification, 

diff --git a/OnlyM.Core/Services/Media/MediaMetaDataService.cs b/OnlyM.Core/Services/Media/MediaMetaDataService.cs
@@ -10,7 +10,7 @@ namespace OnlyM.Core.Services.Media
     // ReSharper disable once ClassNeverInstantiated.Global
     public class MediaMetaDataService : IMediaMetaDataService
     {
-        public MediaMetaData GetMetaData(
+        public MediaMetaData? GetMetaData(
             string mediaItemFilePath, 
             SupportedMediaType mediaType,
             string ffmpegFolder)
@@ -49,7 +49,7 @@ public MediaMetaData GetMetaData(
             return null;
         }
 
-        private static string StripNewLines(string s)
+        private static string? StripNewLines(string? s)
         {
             if (string.IsNullOrEmpty(s))
             {
@@ -68,7 +68,7 @@ private static MediaMetaData GetVideoMetaData(string mediaItemFilePath, string f
             {
                 var info = Unosquare.FFME.Library.RetrieveMediaInfo(FFmpegUtils.FixUnicodeString(mediaItemFilePath));
 
-                string title = null;
+                string? title = null;
                 info.Metadata?.TryGetValue("title", out title);
 
                 if (string.IsNullOrEmpty(title))