Merge pull request #155 from AdmiringWorm/renovate/spectre.console-0.x

AdmiringWorm · Nov 3, 2022 · 005d909 · 005d909
2 parents b18e7c8 + c20e2fe
commit 005d909
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 16 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -28,14 +28,23 @@
 				"DryIoc",
 				"Humanizer",
 				"Newtonsoft.Json",
-				"Spectre.Console",
 				"system.Linq.Async",
 				"Xabe.FFmpeg",
 				"Xabe.FFMpeg"
 			],
 			"semanticCommitType": "fix",
 			"addLabels": ["enhancement"]
 		},
+		{
+			"matchPackageNames":[
+				"Spectre.Console",
+				"Spectre.Console.Analyzers",
+				"Spectre.Console.Cli"
+			],
+			"groupName": "spectre console packages",
+			"semanticCommitType": "fix",
+			"addLabels": ["enhancement"]
+		},
 		{
 			"matchSourceUrlPrefixes": [
 				"https://github.com/nunit/"

diff --git a/src/VideoConverter.Core/VideoConverter.Core.csproj b/src/VideoConverter.Core/VideoConverter.Core.csproj
@@ -30,6 +30,10 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
+		<PackageReference Include="Spectre.Console.Analyzer" Version="0.45.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="Xabe.FFMpeg" Version="5.2.0" />
 	</ItemGroup>
 </Project>
diff --git a/src/VideoConverter.Core/packages.lock.json b/src/VideoConverter.Core/packages.lock.json
@@ -26,6 +26,12 @@
         "resolved": "4.1.2",
         "contentHash": "0TsiZQgeO7w5K1awpZvj4qw0ZUX6xOpCY37xtkgxoZ+7aIpT7H9EvW2BJrJiRoxxtfKkA+LEHmAgl9r4e6rUFg=="
       },
+      "Spectre.Console.Analyzer": {
+        "type": "Direct",
+        "requested": "[0.45.0, )",
+        "resolved": "0.45.0",
+        "contentHash": "0OiLWW4sSUB3p/eAufk8AV998LxKR1ztquxzGfPKq1EBO1dS44M40kIaQXdwux+vWiVqfHnfDYdo9Lt5OjPshg=="
+      },
       "Xabe.FFmpeg": {
         "type": "Direct",
         "requested": "[5.2.0, )",

diff --git a/src/VideoConverter.IntegrationTests/packages.lock.json b/src/VideoConverter.IntegrationTests/packages.lock.json
@@ -609,8 +609,19 @@
       },
       "Spectre.Console": {
         "type": "Transitive",
-        "resolved": "0.44.0",
-        "contentHash": "QMpKtn5QV1j2nklqDwuRE/XwbDn5jxww+Mt5J6Jn3EeQIzaLcuLyUhCLh/mS8giN6uXbqOV1ep5HlUGxrV1ujQ=="
+        "resolved": "0.45.0",
+        "contentHash": "e//13o8/BCrWmwN26eJ4zCzD2iq7iUlqQd+nDI9nJUdnJ/rYAanYiNFZZ7YHwlv48IKuKtRYYP6/wPt1DG67ww==",
+        "dependencies": {
+          "System.Memory": "4.5.5"
+        }
+      },
+      "Spectre.Console.Cli": {
+        "type": "Transitive",
+        "resolved": "0.45.0",
+        "contentHash": "SZcYjwEmmYgmTDqOluWFYtURI9bgRtmx3tSdslHsMU9lKWkev3UHEkzDbOtu4XwY+hCn9NOjBRSDWNafa4fyCQ==",
+        "dependencies": {
+          "Spectre.Console": "0.45.0"
+        }
       },
       "System.CodeDom": {
         "type": "Transitive",
@@ -655,6 +666,11 @@
           "System.CodeDom": "5.0.0"
         }
       },
+      "System.Memory": {
+        "type": "Transitive",
+        "resolved": "4.5.5",
+        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
+      },
       "System.Reflection": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -776,7 +792,8 @@
           "DryIoc": "[5.2.2, )",
           "Humanizer": "[2.14.1, )",
           "Newtonsoft.Json": "[13.0.1, )",
-          "Spectre.Console": "[0.44.0, )",
+          "Spectre.Console": "[0.45.0, )",
+          "Spectre.Console.Cli": "[0.45.0, )",
           "VideoConverter.Core": "[1.0.0, )",
           "VideoConverter.Storage": "[1.0.0, )",
           "Xabe.FFmpeg": "[5.2.0, )",

diff --git a/src/VideoConverter.Storage/VideoConverter.Storage.csproj b/src/VideoConverter.Storage/VideoConverter.Storage.csproj
@@ -31,6 +31,10 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
+		<PackageReference Include="Spectre.Console.Analyzer" Version="0.45.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/VideoConverter.Storage/packages.lock.json b/src/VideoConverter.Storage/packages.lock.json
@@ -41,6 +41,12 @@
         "resolved": "4.1.2",
         "contentHash": "0TsiZQgeO7w5K1awpZvj4qw0ZUX6xOpCY37xtkgxoZ+7aIpT7H9EvW2BJrJiRoxxtfKkA+LEHmAgl9r4e6rUFg=="
       },
+      "Spectre.Console.Analyzer": {
+        "type": "Direct",
+        "requested": "[0.45.0, )",
+        "resolved": "0.45.0",
+        "contentHash": "0OiLWW4sSUB3p/eAufk8AV998LxKR1ztquxzGfPKq1EBO1dS44M40kIaQXdwux+vWiVqfHnfDYdo9Lt5OjPshg=="
+      },
       "Microsoft.CSharp": {
         "type": "Transitive",
         "resolved": "4.0.1",

diff --git a/src/VideoConverter.Tests/packages.lock.json b/src/VideoConverter.Tests/packages.lock.json
@@ -609,8 +609,19 @@
       },
       "Spectre.Console": {
         "type": "Transitive",
-        "resolved": "0.44.0",
-        "contentHash": "QMpKtn5QV1j2nklqDwuRE/XwbDn5jxww+Mt5J6Jn3EeQIzaLcuLyUhCLh/mS8giN6uXbqOV1ep5HlUGxrV1ujQ=="
+        "resolved": "0.45.0",
+        "contentHash": "e//13o8/BCrWmwN26eJ4zCzD2iq7iUlqQd+nDI9nJUdnJ/rYAanYiNFZZ7YHwlv48IKuKtRYYP6/wPt1DG67ww==",
+        "dependencies": {
+          "System.Memory": "4.5.5"
+        }
+      },
+      "Spectre.Console.Cli": {
+        "type": "Transitive",
+        "resolved": "0.45.0",
+        "contentHash": "SZcYjwEmmYgmTDqOluWFYtURI9bgRtmx3tSdslHsMU9lKWkev3UHEkzDbOtu4XwY+hCn9NOjBRSDWNafa4fyCQ==",
+        "dependencies": {
+          "Spectre.Console": "0.45.0"
+        }
       },
       "System.CodeDom": {
         "type": "Transitive",
@@ -655,6 +666,11 @@
           "System.CodeDom": "5.0.0"
         }
       },
+      "System.Memory": {
+        "type": "Transitive",
+        "resolved": "4.5.5",
+        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
+      },
       "System.Reflection": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -776,7 +792,8 @@
           "DryIoc": "[5.2.2, )",
           "Humanizer": "[2.14.1, )",
           "Newtonsoft.Json": "[13.0.1, )",
-          "Spectre.Console": "[0.44.0, )",
+          "Spectre.Console": "[0.45.0, )",
+          "Spectre.Console.Cli": "[0.45.0, )",
           "VideoConverter.Core": "[1.0.0, )",
           "VideoConverter.Storage": "[1.0.0, )",
           "Xabe.FFmpeg": "[5.2.0, )",

diff --git a/src/VideoConverter/Commands/AddCriteriaCommand.cs b/src/VideoConverter/Commands/AddCriteriaCommand.cs
@@ -77,10 +77,7 @@ private async Task AddOrUpdateCriteriaAsync(Core.Models.EpisodeData episodeData,
 			{
 				newCriteria.Episode = episodeData.EpisodeNumber;
 				newCriteria.NewEpisode = settings.EpisodeNumber.Value;
-				if (newCriteria.Season is null)
-				{
-					newCriteria.Season = episodeData.SeasonNumber;
-				}
+				newCriteria.Season ??= episodeData.SeasonNumber;
 			}
 
 			await repository.AddOrUpdateCriteriaAsync(newCriteria).ConfigureAwait(false);

diff --git a/src/VideoConverter/Commands/EncodeCommand.cs b/src/VideoConverter/Commands/EncodeCommand.cs
@@ -42,7 +42,7 @@ public EncodeCommand(QueueRepository queueRepo, ConverterConfiguration config, I
 
 			Console.CancelKeyPress += (sender, e) =>
 				{
-					Console.WriteLine("Cancelling!!!");
+					console.WriteLine("Cancelling!!!");
 
 					if (e.SpecialKey != ConsoleSpecialKey.ControlC)
 					{

diff --git a/src/VideoConverter/VideoConverter.csproj b/src/VideoConverter/VideoConverter.csproj
@@ -36,7 +36,12 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Spectre.Console" Version="0.44.0" />
+		<PackageReference Include="Spectre.Console" Version="0.45.0" />
+		<PackageReference Include="Spectre.Console.Analyzer" Version="0.45.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Spectre.Console.Cli" Version="0.45.0" />
 		<PackageReference Include="system.Linq.Async" Version="6.0.1" />
 		<PackageReference Include="Xabe.FFmpeg" Version="5.2.0" />
 	</ItemGroup>

diff --git a/src/VideoConverter/packages.lock.json b/src/VideoConverter/packages.lock.json
@@ -99,9 +99,27 @@
       },
       "Spectre.Console": {
         "type": "Direct",
-        "requested": "[0.44.0, )",
-        "resolved": "0.44.0",
-        "contentHash": "QMpKtn5QV1j2nklqDwuRE/XwbDn5jxww+Mt5J6Jn3EeQIzaLcuLyUhCLh/mS8giN6uXbqOV1ep5HlUGxrV1ujQ=="
+        "requested": "[0.45.0, )",
+        "resolved": "0.45.0",
+        "contentHash": "e//13o8/BCrWmwN26eJ4zCzD2iq7iUlqQd+nDI9nJUdnJ/rYAanYiNFZZ7YHwlv48IKuKtRYYP6/wPt1DG67ww==",
+        "dependencies": {
+          "System.Memory": "4.5.5"
+        }
+      },
+      "Spectre.Console.Analyzer": {
+        "type": "Direct",
+        "requested": "[0.45.0, )",
+        "resolved": "0.45.0",
+        "contentHash": "0OiLWW4sSUB3p/eAufk8AV998LxKR1ztquxzGfPKq1EBO1dS44M40kIaQXdwux+vWiVqfHnfDYdo9Lt5OjPshg=="
+      },
+      "Spectre.Console.Cli": {
+        "type": "Direct",
+        "requested": "[0.45.0, )",
+        "resolved": "0.45.0",
+        "contentHash": "SZcYjwEmmYgmTDqOluWFYtURI9bgRtmx3tSdslHsMU9lKWkev3UHEkzDbOtu4XwY+hCn9NOjBRSDWNafa4fyCQ==",
+        "dependencies": {
+          "Spectre.Console": "0.45.0"
+        }
       },
       "System.Linq.Async": {
         "type": "Direct",
@@ -550,6 +568,11 @@
           "System.Threading.Tasks": "4.3.0"
         }
       },
+      "System.Memory": {
+        "type": "Transitive",
+        "resolved": "4.5.5",
+        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
+      },
       "System.Reflection": {
         "type": "Transitive",
         "resolved": "4.3.0",