👾 Update to .NET 5 and add unit tests

database64128 · database64128 · commit 938272349c8d · 2020-12-09T18:31:34.000+08:00
diff --git a/YoutubeDl.Wpf.Tests/OutputParsingTests.cs b/YoutubeDl.Wpf.Tests/OutputParsingTests.cs
@@ -0,0 +1,9 @@
+using System;
+using Xunit;
+
+namespace YoutubeDl.Wpf.Tests
+{
+    public class OutputParsingTests
+    {
+    }
+}
diff --git a/YoutubeDl.Wpf.Tests/YoutubeDl.Wpf.Tests.csproj b/YoutubeDl.Wpf.Tests/YoutubeDl.Wpf.Tests.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/YoutubeDl.Wpf/FodyWeavers.xml b/YoutubeDl.Wpf/FodyWeavers.xml
@@ -0,0 +1,3 @@
+﻿<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ReactiveUI />
+</Weavers>
diff --git a/YoutubeDl.Wpf/FodyWeavers.xsd b/YoutubeDl.Wpf/FodyWeavers.xsd
@@ -0,0 +1,26 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ReactiveUI" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/YoutubeDl.Wpf/ViewModels/DelegateCommand.cs b/YoutubeDl.Wpf/ViewModels/DelegateCommand.cs
@@ -5,24 +5,24 @@ namespace YoutubeDl.Wpf.ViewModels
 {
     public class DelegateCommand : ICommand
     {
-        private readonly Action<object> _executeAction;
-        private readonly Func<object, bool> _canExecuteAction;
+        private readonly Action<object?> _executeAction;
+        private readonly Func<object?, bool> _canExecuteAction;
 
-        public DelegateCommand(Action<object> executeAction)
+        public DelegateCommand(Action<object?> executeAction)
         {
             _executeAction = executeAction;
             _canExecuteAction = x => true;
         }
 
-        public DelegateCommand(Action<object> executeAction, Func<object, bool> canExecuteAction)
+        public DelegateCommand(Action<object?> executeAction, Func<object?, bool> canExecuteAction)
         {
             _executeAction = executeAction;
             _canExecuteAction = canExecuteAction;
         }
 
-        public void Execute(object parameter) => _executeAction(parameter);
+        public void Execute(object? parameter) => _executeAction(parameter);
 
-        public bool CanExecute(object parameter) => _canExecuteAction?.Invoke(parameter) ?? true;
+        public bool CanExecute(object? parameter) => _canExecuteAction?.Invoke(parameter) ?? true;
 
         public event EventHandler? CanExecuteChanged;
 
diff --git a/YoutubeDl.Wpf/ViewModels/HomeViewModel.cs b/YoutubeDl.Wpf/ViewModels/HomeViewModel.cs
@@ -54,7 +54,7 @@ public HomeViewModel(ISnackbarMessageQueue snackbarMessageQueue)
             _openFolder = new DelegateCommand(OnOpenFolder, CanOpenFolder);
             _startDownload = new DelegateCommand(OnStartDownload, CanStartDownload);
             _listFormats = new DelegateCommand(OnListFormats, CanStartDownload);
-            _abortDl = new DelegateCommand(OnAbortDl, (object commandParameter) => _freezeButton);
+            _abortDl = new DelegateCommand(OnAbortDl, (object? commandParameter) => _freezeButton);
 
             ContainerList = new ObservableCollection<string>()
             {
@@ -232,8 +232,14 @@ private void DlProcess_Exited(object? sender, EventArgs e)
             Application.Current.Dispatcher.Invoke(UpdateButtons);
         }
 
-        private void OnBrowseFolder(object commandParameter)
+        private void OnBrowseFolder(object? commandParameter)
         {
+            if (commandParameter == null)
+                throw new ArgumentNullException(nameof(commandParameter));
+
+            if (commandParameter is not string parameter)
+                throw new ArgumentException("Command parameter is not a string.", nameof(commandParameter));
+
             Microsoft.Win32.OpenFileDialog folderDialog = new Microsoft.Win32.OpenFileDialog
             {
                 FileName = "Folder Selection.",
@@ -242,19 +248,19 @@ private void OnBrowseFolder(object commandParameter)
                 CheckPathExists = true
             };
 
-            if ((string)commandParameter == "DownloadPath")
+            if (parameter == "DownloadPath")
                 folderDialog.InitialDirectory = DownloadPath;
 
             bool? result = folderDialog.ShowDialog();
 
             if (result == true)
             {
-                if ((string)commandParameter == "DownloadPath")
+                if (parameter == "DownloadPath")
                     DownloadPath = Path.GetDirectoryName(folderDialog.FileName) ?? "";
             }
         }
 
-        private void OnOpenFolder(object commandParameter)
+        private void OnOpenFolder(object? commandParameter)
         {
             try
             {
@@ -266,7 +272,7 @@ private void OnOpenFolder(object commandParameter)
             }
         }
 
-        private void OnStartDownload(object commandParameter)
+        private void OnStartDownload(object? commandParameter)
         {
             FreezeButton = true;
             DownloadButtonProgressIndeterminate = true;
@@ -344,7 +350,7 @@ private void OnStartDownload(object commandParameter)
             }
         }
 
-        private void OnListFormats(object commandParameter)
+        private void OnListFormats(object? commandParameter)
         {
             FreezeButton = true;
             FormatsButtonProgressIndeterminate = true;
@@ -379,7 +385,7 @@ private void OnListFormats(object commandParameter)
             }
         }
 
-        private void OnAbortDl(object commandParameter)
+        private void OnAbortDl(object? commandParameter)
         {
             try
             {
@@ -401,12 +407,12 @@ private void OnAbortDl(object commandParameter)
             }
         }
 
-        private bool CanOpenFolder(object commandParameter)
+        private bool CanOpenFolder(object? commandParameter)
         {
             return !String.IsNullOrEmpty(_downloadPath) && Directory.Exists(_downloadPath);
         }
 
-        private bool CanStartDownload(object commandParameter)
+        private bool CanStartDownload(object? commandParameter)
         {
             return !String.IsNullOrEmpty(_link) && !String.IsNullOrEmpty(_container) && !String.IsNullOrEmpty(_format) && !String.IsNullOrEmpty(_settings.DlPath) && !_freezeButton;
         }
@@ -446,7 +452,7 @@ private void UpdateDl()
             }
         }
 
-        private void DlOutputHandler(object sendingProcess, DataReceivedEventArgs outLine)
+        private void DlOutputHandler(object? sendingProcess, DataReceivedEventArgs outLine)
         {
             if (!string.IsNullOrEmpty(outLine.Data))
             {
@@ -511,7 +517,7 @@ public string Container
                     EnableFormatSelection = true;
                 else
                 {
-                    this.RaiseAndSetIfChanged(ref _format, "Auto", "Format");
+                    this.RaiseAndSetIfChanged(ref _format, "Auto", nameof(Format));
                     _settings.Format = _format;
                     EnableFormatSelection = false;
                 }
diff --git a/YoutubeDl.Wpf/ViewModels/MainWindowViewModel.cs b/YoutubeDl.Wpf/ViewModels/MainWindowViewModel.cs
@@ -14,7 +14,7 @@ public MainWindowViewModel(ISnackbarMessageQueue snackbarMessageQueue)
         {
             _drawerItems = GenerateItems(snackbarMessageQueue);
             _selectedItem = _drawerItems.First();
-            _openAboutDialog = new DelegateCommand(OnOpenAboutDialog, (object commandParameter) => true);
+            _openAboutDialog = new DelegateCommand(OnOpenAboutDialog, (object? commandParameter) => true);
         }
 
         private ObservableCollection<DrawerItem> _drawerItems;
@@ -24,7 +24,7 @@ public MainWindowViewModel(ISnackbarMessageQueue snackbarMessageQueue)
 
         public ICommand OpenAboutDialog => _openAboutDialog;
 
-        private async void OnOpenAboutDialog(object commandParameter)
+        private async void OnOpenAboutDialog(object? commandParameter)
         {
             var aboutDialog = new AboutDialog
             {
@@ -45,7 +45,7 @@ public DrawerItem SelectedItem
             set => this.RaiseAndSetIfChanged(ref _selectedItem, value);
         }
 
-        private ObservableCollection<DrawerItem> GenerateItems(ISnackbarMessageQueue snackbarMessageQueue)
+        private static ObservableCollection<DrawerItem> GenerateItems(ISnackbarMessageQueue snackbarMessageQueue)
         {
             if (snackbarMessageQueue == null)
                 throw new ArgumentNullException(nameof(snackbarMessageQueue));
diff --git a/YoutubeDl.Wpf/ViewModels/SettingsViewModel.cs b/YoutubeDl.Wpf/ViewModels/SettingsViewModel.cs
@@ -58,7 +58,7 @@ public SettingsViewModel(ISnackbarMessageQueue snackbarMessageQueue)
         public ICommand ChangeColorMode => _changeColorMode;
         public ICommand BrowseExe => _browseExe;
 
-        private void OnChangeColorMode(object commandParameter)
+        private void OnChangeColorMode(object? commandParameter)
         {
             ITheme theme = _paletteHelper.GetTheme();
             switch (commandParameter)
@@ -93,27 +93,33 @@ private void OnChangeColorMode(object commandParameter)
             }
         }
 
-        private void OnBrowseExe(object commandParameter)
+        private void OnBrowseExe(object? commandParameter)
         {
+            if (commandParameter == null)
+                throw new ArgumentNullException(nameof(commandParameter));
+
+            if (commandParameter is not string parameter)
+                throw new ArgumentException("Command parameter is not a string.", nameof(commandParameter));
+
             Microsoft.Win32.OpenFileDialog openFileDialog = new Microsoft.Win32.OpenFileDialog
             {
-                FileName = (string)commandParameter,
+                FileName = parameter,
                 DefaultExt = ".exe",
                 Filter = "Executables (.exe)|*.exe"
             };
 
-            if ((string)commandParameter == "youtube-dl")
+            if (parameter == "youtube-dl")
                 openFileDialog.InitialDirectory = Path.GetDirectoryName(_dlPath);
-            else if ((string)commandParameter == "ffmpeg")
+            else if (parameter == "ffmpeg")
                 openFileDialog.InitialDirectory = Path.GetDirectoryName(_ffmpegPath);
             
             bool? result = openFileDialog.ShowDialog();
 
             if (result == true)
             {
-                if ((string)commandParameter == "youtube-dl")
+                if (parameter == "youtube-dl")
                     DlPath = openFileDialog.FileName;
-                else if ((string)commandParameter == "ffmpeg")
+                else if (parameter == "ffmpeg")
                     FfmpegPath = openFileDialog.FileName;
             }
         }
@@ -134,7 +140,7 @@ private async Task LoadSettingsAsync()
                 try
                 {
                     _settingsJson = new FileStream("Settings.json", FileMode.Open);
-                    _settings = await JsonSerializer.DeserializeAsync<SettingsJson>(_settingsJson);
+                    _settings = await JsonSerializer.DeserializeAsync<SettingsJson>(_settingsJson) ?? new();
                 }
                 catch
                 {
diff --git a/YoutubeDl.Wpf/YoutubeDl.Wpf.csproj b/YoutubeDl.Wpf/YoutubeDl.Wpf.csproj
@@ -1,8 +1,8 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
     <RootNamespace>YoutubeDl.Wpf</RootNamespace>
     <UseWPF>true</UseWPF>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -41,9 +41,11 @@
 
   <ItemGroup>
     <PackageReference Include="MaterialDesignThemes" Version="3.2.0" />
-    <PackageReference Include="PeanutButter.TinyEventAggregator" Version="1.2.378" />
-    <PackageReference Include="ReactiveUI.Events.WPF" Version="11.5.35" />
-    <PackageReference Include="ReactiveUI.WPF" Version="11.5.35" />
+    <PackageReference Include="PeanutButter.TinyEventAggregator" Version="1.2.380" />
+    <PackageReference Include="ReactiveUI.Events.WPF" Version="13.0.1" />
+    <PackageReference Include="ReactiveUI.Fody" Version="13.0.1" />
+    <PackageReference Include="ReactiveUI.Validation" Version="1.8.6" />
+    <PackageReference Include="ReactiveUI.WPF" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/youtube-dl-wpf.sln b/youtube-dl-wpf.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.29721.120
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YoutubeDl.Wpf", "YoutubeDl.Wpf\YoutubeDl.Wpf.csproj", "{D9BA13D1-3A0C-4A10-A785-EE49767BE872}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YoutubeDl.Wpf.Tests", "YoutubeDl.Wpf.Tests\YoutubeDl.Wpf.Tests.csproj", "{9C801388-1874-4317-B129-CF73024A02B3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{D9BA13D1-3A0C-4A10-A785-EE49767BE872}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9BA13D1-3A0C-4A10-A785-EE49767BE872}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9BA13D1-3A0C-4A10-A785-EE49767BE872}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C801388-1874-4317-B129-CF73024A02B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C801388-1874-4317-B129-CF73024A02B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C801388-1874-4317-B129-CF73024A02B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C801388-1874-4317-B129-CF73024A02B3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">`
	`2`	`+ <ReactiveUI />`
	`3`	`+</Weavers>`
Original file line number	Diff line number	Diff line change
`@@ -5,24 +5,24 @@ namespace YoutubeDl.Wpf.ViewModels`
`5`	`5`	`{`
`6`	`6`	`public class DelegateCommand : ICommand`
`7`	`7`	`{`
`8`		`- private readonly Action<object> _executeAction;`
`9`		`- private readonly Func<object, bool> _canExecuteAction;`
	`8`	`+ private readonly Action<object?> _executeAction;`
	`9`	`+ private readonly Func<object?, bool> _canExecuteAction;`
`10`	`10`
`11`		`- public DelegateCommand(Action<object> executeAction)`
	`11`	`+ public DelegateCommand(Action<object?> executeAction)`
`12`	`12`	`{`
`13`	`13`	`_executeAction = executeAction;`
`14`	`14`	`_canExecuteAction = x => true;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public DelegateCommand(Action<object> executeAction, Func<object, bool> canExecuteAction)`
	`17`	`+ public DelegateCommand(Action<object?> executeAction, Func<object?, bool> canExecuteAction)`
`18`	`18`	`{`
`19`	`19`	`_executeAction = executeAction;`
`20`	`20`	`_canExecuteAction = canExecuteAction;`
`21`	`21`	`}`
`22`	`22`
`23`		`- public void Execute(object parameter) => _executeAction(parameter);`
	`23`	`+ public void Execute(object? parameter) => _executeAction(parameter);`
`24`	`24`
`25`		`- public bool CanExecute(object parameter) => _canExecuteAction?.Invoke(parameter) ?? true;`
	`25`	`+ public bool CanExecute(object? parameter) => _canExecuteAction?.Invoke(parameter) ?? true;`
`26`	`26`
`27`	`27`	`public event EventHandler? CanExecuteChanged;`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public HomeViewModel(ISnackbarMessageQueue snackbarMessageQueue)`
`54`	`54`	`_openFolder = new DelegateCommand(OnOpenFolder, CanOpenFolder);`
`55`	`55`	`_startDownload = new DelegateCommand(OnStartDownload, CanStartDownload);`
`56`	`56`	`_listFormats = new DelegateCommand(OnListFormats, CanStartDownload);`
`57`		`- _abortDl = new DelegateCommand(OnAbortDl, (object commandParameter) => _freezeButton);`
	`57`	`+ _abortDl = new DelegateCommand(OnAbortDl, (object? commandParameter) => _freezeButton);`
`58`	`58`
`59`	`59`	`ContainerList = new ObservableCollection<string>()`
`60`	`60`	`{`
`@@ -232,8 +232,14 @@ private void DlProcess_Exited(object? sender, EventArgs e)`
`232`	`232`	`Application.Current.Dispatcher.Invoke(UpdateButtons);`
`233`	`233`	`}`
`234`	`234`
`235`		`- private void OnBrowseFolder(object commandParameter)`
	`235`	`+ private void OnBrowseFolder(object? commandParameter)`
`236`	`236`	`{`
	`237`	`+ if (commandParameter == null)`
	`238`	`+ throw new ArgumentNullException(nameof(commandParameter));`
	`239`	`+`
	`240`	`+ if (commandParameter is not string parameter)`
	`241`	`+ throw new ArgumentException("Command parameter is not a string.", nameof(commandParameter));`
	`242`	`+`
`237`	`243`	`Microsoft.Win32.OpenFileDialog folderDialog = new Microsoft.Win32.OpenFileDialog`
`238`	`244`	`{`
`239`	`245`	`FileName = "Folder Selection.",`
`@@ -242,19 +248,19 @@ private void OnBrowseFolder(object commandParameter)`
`242`	`248`	`CheckPathExists = true`
`243`	`249`	`};`
`244`	`250`
`245`		`- if ((string)commandParameter == "DownloadPath")`
	`251`	`+ if (parameter == "DownloadPath")`
`246`	`252`	`folderDialog.InitialDirectory = DownloadPath;`
`247`	`253`
`248`	`254`	`bool? result = folderDialog.ShowDialog();`
`249`	`255`
`250`	`256`	`if (result == true)`
`251`	`257`	`{`
`252`		`- if ((string)commandParameter == "DownloadPath")`
	`258`	`+ if (parameter == "DownloadPath")`
`253`	`259`	`DownloadPath = Path.GetDirectoryName(folderDialog.FileName) ?? "";`
`254`	`260`	`}`
`255`	`261`	`}`
`256`	`262`
`257`		`- private void OnOpenFolder(object commandParameter)`
	`263`	`+ private void OnOpenFolder(object? commandParameter)`
`258`	`264`	`{`
`259`	`265`	`try`
`260`	`266`	`{`
`@@ -266,7 +272,7 @@ private void OnOpenFolder(object commandParameter)`
`266`	`272`	`}`
`267`	`273`	`}`
`268`	`274`
`269`		`- private void OnStartDownload(object commandParameter)`
	`275`	`+ private void OnStartDownload(object? commandParameter)`
`270`	`276`	`{`
`271`	`277`	`FreezeButton = true;`
`272`	`278`	`DownloadButtonProgressIndeterminate = true;`
`@@ -344,7 +350,7 @@ private void OnStartDownload(object commandParameter)`
`344`	`350`	`}`
`345`	`351`	`}`
`346`	`352`
`347`		`- private void OnListFormats(object commandParameter)`
	`353`	`+ private void OnListFormats(object? commandParameter)`
`348`	`354`	`{`
`349`	`355`	`FreezeButton = true;`
`350`	`356`	`FormatsButtonProgressIndeterminate = true;`
`@@ -379,7 +385,7 @@ private void OnListFormats(object commandParameter)`
`379`	`385`	`}`
`380`	`386`	`}`
`381`	`387`
`382`		`- private void OnAbortDl(object commandParameter)`
	`388`	`+ private void OnAbortDl(object? commandParameter)`
`383`	`389`	`{`
`384`	`390`	`try`
`385`	`391`	`{`
`@@ -401,12 +407,12 @@ private void OnAbortDl(object commandParameter)`
`401`	`407`	`}`
`402`	`408`	`}`
`403`	`409`
`404`		`- private bool CanOpenFolder(object commandParameter)`
	`410`	`+ private bool CanOpenFolder(object? commandParameter)`
`405`	`411`	`{`
`406`	`412`	`return !String.IsNullOrEmpty(_downloadPath) && Directory.Exists(_downloadPath);`
`407`	`413`	`}`
`408`	`414`
`409`		`- private bool CanStartDownload(object commandParameter)`
	`415`	`+ private bool CanStartDownload(object? commandParameter)`
`410`	`416`	`{`
`411`	`417`	`return !String.IsNullOrEmpty(_link) && !String.IsNullOrEmpty(_container) && !String.IsNullOrEmpty(_format) && !String.IsNullOrEmpty(_settings.DlPath) && !_freezeButton;`
`412`	`418`	`}`
`@@ -446,7 +452,7 @@ private void UpdateDl()`
`446`	`452`	`}`
`447`	`453`	`}`
`448`	`454`
`449`		`- private void DlOutputHandler(object sendingProcess, DataReceivedEventArgs outLine)`
	`455`	`+ private void DlOutputHandler(object? sendingProcess, DataReceivedEventArgs outLine)`
`450`	`456`	`{`
`451`	`457`	`if (!string.IsNullOrEmpty(outLine.Data))`
`452`	`458`	`{`
`@@ -511,7 +517,7 @@ public string Container`
`511`	`517`	`EnableFormatSelection = true;`
`512`	`518`	`else`
`513`	`519`	`{`
`514`		`- this.RaiseAndSetIfChanged(ref _format, "Auto", "Format");`
	`520`	`+ this.RaiseAndSetIfChanged(ref _format, "Auto", nameof(Format));`
`515`	`521`	`_settings.Format = _format;`
`516`	`522`	`EnableFormatSelection = false;`
`517`	`523`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public MainWindowViewModel(ISnackbarMessageQueue snackbarMessageQueue)`
`14`	`14`	`{`
`15`	`15`	`_drawerItems = GenerateItems(snackbarMessageQueue);`
`16`	`16`	`_selectedItem = _drawerItems.First();`
`17`		`- _openAboutDialog = new DelegateCommand(OnOpenAboutDialog, (object commandParameter) => true);`
	`17`	`+ _openAboutDialog = new DelegateCommand(OnOpenAboutDialog, (object? commandParameter) => true);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`private ObservableCollection<DrawerItem> _drawerItems;`
`@@ -24,7 +24,7 @@ public MainWindowViewModel(ISnackbarMessageQueue snackbarMessageQueue)`
`24`	`24`
`25`	`25`	`public ICommand OpenAboutDialog => _openAboutDialog;`
`26`	`26`
`27`		`- private async void OnOpenAboutDialog(object commandParameter)`
	`27`	`+ private async void OnOpenAboutDialog(object? commandParameter)`
`28`	`28`	`{`
`29`	`29`	`var aboutDialog = new AboutDialog`
`30`	`30`	`{`
`@@ -45,7 +45,7 @@ public DrawerItem SelectedItem`
`45`	`45`	`set => this.RaiseAndSetIfChanged(ref _selectedItem, value);`
`46`	`46`	`}`
`47`	`47`
`48`		`- private ObservableCollection<DrawerItem> GenerateItems(ISnackbarMessageQueue snackbarMessageQueue)`
	`48`	`+ private static ObservableCollection<DrawerItem> GenerateItems(ISnackbarMessageQueue snackbarMessageQueue)`
`49`	`49`	`{`
`50`	`50`	`if (snackbarMessageQueue == null)`
`51`	`51`	`throw new ArgumentNullException(nameof(snackbarMessageQueue));`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public SettingsViewModel(ISnackbarMessageQueue snackbarMessageQueue)`
`58`	`58`	`public ICommand ChangeColorMode => _changeColorMode;`
`59`	`59`	`public ICommand BrowseExe => _browseExe;`
`60`	`60`
`61`		`- private void OnChangeColorMode(object commandParameter)`
	`61`	`+ private void OnChangeColorMode(object? commandParameter)`
`62`	`62`	`{`
`63`	`63`	`ITheme theme = _paletteHelper.GetTheme();`
`64`	`64`	`switch (commandParameter)`
`@@ -93,27 +93,33 @@ private void OnChangeColorMode(object commandParameter)`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- private void OnBrowseExe(object commandParameter)`
	`96`	`+ private void OnBrowseExe(object? commandParameter)`
`97`	`97`	`{`
	`98`	`+ if (commandParameter == null)`
	`99`	`+ throw new ArgumentNullException(nameof(commandParameter));`
	`100`	`+`
	`101`	`+ if (commandParameter is not string parameter)`
	`102`	`+ throw new ArgumentException("Command parameter is not a string.", nameof(commandParameter));`
	`103`	`+`
`98`	`104`	`Microsoft.Win32.OpenFileDialog openFileDialog = new Microsoft.Win32.OpenFileDialog`
`99`	`105`	`{`
`100`		`- FileName = (string)commandParameter,`
	`106`	`+ FileName = parameter,`
`101`	`107`	`DefaultExt = ".exe",`
`102`	`108`	`Filter = "Executables (.exe)\|*.exe"`
`103`	`109`	`};`
`104`	`110`
`105`		`- if ((string)commandParameter == "youtube-dl")`
	`111`	`+ if (parameter == "youtube-dl")`
`106`	`112`	`openFileDialog.InitialDirectory = Path.GetDirectoryName(_dlPath);`
`107`		`- else if ((string)commandParameter == "ffmpeg")`
	`113`	`+ else if (parameter == "ffmpeg")`
`108`	`114`	`openFileDialog.InitialDirectory = Path.GetDirectoryName(_ffmpegPath);`
`109`	`115`
`110`	`116`	`bool? result = openFileDialog.ShowDialog();`
`111`	`117`
`112`	`118`	`if (result == true)`
`113`	`119`	`{`
`114`		`- if ((string)commandParameter == "youtube-dl")`
	`120`	`+ if (parameter == "youtube-dl")`
`115`	`121`	`DlPath = openFileDialog.FileName;`
`116`		`- else if ((string)commandParameter == "ffmpeg")`
	`122`	`+ else if (parameter == "ffmpeg")`
`117`	`123`	`FfmpegPath = openFileDialog.FileName;`
`118`	`124`	`}`
`119`	`125`	`}`
`@@ -134,7 +140,7 @@ private async Task LoadSettingsAsync()`
`134`	`140`	`try`
`135`	`141`	`{`
`136`	`142`	`_settingsJson = new FileStream("Settings.json", FileMode.Open);`
`137`		`- _settings = await JsonSerializer.DeserializeAsync<SettingsJson>(_settingsJson);`
	`143`	`+ _settings = await JsonSerializer.DeserializeAsync<SettingsJson>(_settingsJson) ?? new();`
`138`	`144`	`}`
`139`	`145`	`catch`
`140`	`146`	`{`