Merge pull request #126 from fumiichan/net8

.NET 8 Upgrade (1.3.0.0 Release)
fumiichan · Jan 8, 2024 · 57608fa · 57608fa
2 parents 3cec67f + 33524d5
commit 57608fa
Show file tree

Hide file tree

Showing 79 changed files with 1,050 additions and 1,183 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@
  jobs:
     build:
         docker:
-            - image: mcr.microsoft.com/dotnet/sdk:7.0
+            - image: mcr.microsoft.com/dotnet/sdk:8.0
         steps:
             - checkout
             - run:

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/Api/Queries/SearchQuery.cs b/Api/Queries/SearchQuery.cs
@@ -5,11 +5,11 @@ namespace asuka.Api.Queries;
 public record SearchQuery
 {
     [AliasAs("query")]
-    public string Queries { get; init; }
+    public required string Queries { get; init; }
 
     [AliasAs("page")]
     public int PageNumber { get; init; }
 
     [AliasAs("sort")]
-    public string Sort { get; init; }
+    public required string Sort { get; init; }
 }
diff --git a/Api/Responses/GalleryImageObjectResponse.cs b/Api/Responses/GalleryImageObjectResponse.cs
@@ -3,8 +3,9 @@
 
 namespace asuka.Api.Responses;
 
+#nullable disable
 public record GalleryImageObjectResponse
 {
     [JsonPropertyName("pages")]
-    public IReadOnlyList<GalleryImageResponse> Images { get; set; }
+    public IReadOnlyList<GalleryImageResponse> Images { get; set; } 
 }
diff --git a/Api/Responses/GalleryImageResponse.cs b/Api/Responses/GalleryImageResponse.cs
@@ -2,6 +2,7 @@
 
 namespace asuka.Api.Responses;
 
+#nullable disable
 public record GalleryImageResponse
 {
     [JsonPropertyName("t")]

diff --git a/Api/Responses/GalleryListResponse.cs b/Api/Responses/GalleryListResponse.cs
@@ -3,6 +3,7 @@
 
 namespace asuka.Api.Responses;
 
+#nullable disable
 public record GalleryListResponse
 {
     [JsonPropertyName("result")]

diff --git a/Api/Responses/GalleryResponse.cs b/Api/Responses/GalleryResponse.cs
@@ -3,6 +3,7 @@
 
 namespace asuka.Api.Responses;
 
+#nullable disable
 public record GalleryResponse
 {
     [JsonPropertyName("id")]
@@ -14,10 +15,10 @@ public record GalleryResponse
     public int MediaId { get; set; }
 
     [JsonPropertyName("title")]
-    public GalleryTitleResponse Title { get; set; }
+    public required GalleryTitleResponse Title { get; set; }
 
     [JsonPropertyName("images")]
-    public GalleryImageObjectResponse Images { get; set; }
+    public required GalleryImageObjectResponse Images { get; set; }
 
     [JsonPropertyName("tags")]
     public IReadOnlyList<GalleryTagResponse> Tags { get; set; }

diff --git a/Api/Responses/GalleryTagResponse.cs b/Api/Responses/GalleryTagResponse.cs
@@ -2,6 +2,7 @@
 
 namespace asuka.Api.Responses;
 
+#nullable disable
 public record GalleryTagResponse
 {
     [JsonPropertyName("id")]

diff --git a/Api/Responses/GalleryTitleResponse.cs b/Api/Responses/GalleryTitleResponse.cs
@@ -2,6 +2,7 @@
 
 namespace asuka.Api.Responses;
 
+#nullable disable
 public record GalleryTitleResponse
 {
     [JsonPropertyName("japanese")]

diff --git a/AsukaApplication.cs b/AsukaApplication.cs
diff --git a/Commandline/CommandLineParserFactory.cs b/Commandline/CommandLineParserFactory.cs
diff --git a/Commandline/CommandLineParserTokens.cs b/Commandline/CommandLineParserTokens.cs
diff --git a/Commandline/ICommandLineParserFactory.cs b/Commandline/ICommandLineParserFactory.cs
diff --git a/Commandline/Options/ConfigureOptions.cs b/Commandline/Options/ConfigureOptions.cs
@@ -2,6 +2,7 @@
 
 namespace asuka.Commandline.Options;
 
+#nullable disable
 [Verb("config", HelpText = "Configure the client")]
 public record ConfigureOptions
 {

diff --git a/Commandline/Options/CookieConfigureOptions.cs b/Commandline/Options/CookieConfigureOptions.cs
@@ -2,6 +2,7 @@
 
 namespace asuka.Commandline.Options;
 
+#nullable disable
 [Verb("cookie", HelpText = "Configure cookies and User Agent")]
 public record CookieConfigureOptions
 {

diff --git a/Commandline/Options/FileCommandOptions.cs b/Commandline/Options/FileCommandOptions.cs
@@ -2,6 +2,7 @@
 
 namespace asuka.Commandline.Options;
 
+#nullable disable
 [Verb("file", HelpText = "Download galleries from text file")]
 public record FileCommandOptions : ICommonOptions
 {

diff --git a/Commandline/Options/GetOptions.cs b/Commandline/Options/GetOptions.cs
@@ -3,6 +3,7 @@
 
 namespace asuka.Commandline.Options;
 
+#nullable disable
 [Verb("get", HelpText = "Download a Single Gallery from URL.")]
 public record GetOptions : ICommonOptions
 {

diff --git a/Commandline/Options/RandomOptions.cs b/Commandline/Options/RandomOptions.cs
@@ -2,6 +2,7 @@
 
 namespace asuka.Commandline.Options;
 
+#nullable disable
 [Verb("random", HelpText = "Randomly pick a gallery.")]
 public record RandomOptions : ICommonOptions
 {

diff --git a/Commandline/Options/RecommendOptions.cs b/Commandline/Options/RecommendOptions.cs
@@ -2,6 +2,7 @@
 
 namespace asuka.Commandline.Options;
 
+#nullable disable
 [Verb("recommend", HelpText = "Download recommendation from the gallery URL.")]
 public record RecommendOptions : ICommonOptions
 {

diff --git a/Commandline/Options/SearchOptions.cs b/Commandline/Options/SearchOptions.cs
@@ -3,6 +3,7 @@
 
 namespace asuka.Commandline.Options;
 
+#nullable disable
 [Verb("search", HelpText = "Search something in the gallery")]
 public record SearchOptions : ICommonOptions
 {

diff --git a/Commandline/Options/SeriesCreatorCommandOptions.cs b/Commandline/Options/SeriesCreatorCommandOptions.cs
@@ -3,6 +3,7 @@
 
 namespace asuka.Commandline.Options;
 
+#nullable disable
 [Verb("series", HelpText = "Construct series")]
 public record SeriesCreatorCommandOptions: ICommonOptions
 {

diff --git a/Commandline/Parsers/ConfigureCommand.cs b/Commandline/Parsers/ConfigureCommand.cs
@@ -1,21 +1,20 @@
+using System;
 using System.Threading.Tasks;
 using asuka.Commandline.Options;
 using asuka.Configuration;
-using asuka.Output.Writer;
+using asuka.Output;
 using FluentValidation;
 
 namespace asuka.Commandline.Parsers;
 
 public class ConfigureCommand : ICommandLineParser
 {
-    private readonly IConfigurationManager _configurationManager;
-    private readonly IConsoleWriter _consoleWriter;
+    private readonly IAppConfigManager _appConfigManager;
     private readonly IValidator<ConfigureOptions> _validator;
 
-    public ConfigureCommand(IValidator<ConfigureOptions> validator, IConfigurationManager configurationManager, IConsoleWriter consoleWriter)
+    public ConfigureCommand(IValidator<ConfigureOptions> validator, IAppConfigManager appConfigManager)
     {
-        _configurationManager = configurationManager;
-        _consoleWriter = consoleWriter;
+        _appConfigManager = appConfigManager;
         _validator = validator;
     }
 
@@ -25,41 +24,41 @@ public async Task RunAsync(object options)
         var validation = await _validator.ValidateAsync(opts);
         if (!validation.IsValid)
         {
-            _consoleWriter.ValidationErrors(validation.Errors);
+            validation.Errors.PrintValidationExceptions();
             return;
         }
 
         if (opts.SetConfigMode)
         {
-            _configurationManager.SetValue(opts.Key, opts.Value);
-            await _configurationManager.Flush();
+            _appConfigManager.SetValue(opts.Key, opts.Value);
+            await _appConfigManager.Flush();
 
             return;
         }
 
         if (opts.ReadConfigMode)
         {
-            var configValue = _configurationManager.GetValue(opts.Key);
-            _consoleWriter.WriteLine($"{opts.Key} = {configValue}");
+            var configValue = _appConfigManager.GetValue(opts.Key);
+            Console.WriteLine($"{opts.Key} = {configValue}");
 
             return;
         }
 
         if (opts.ListConfigMode)
         {
-            var keyValuePairs = _configurationManager.GetAllValues();
+            var keyValuePairs = _appConfigManager.GetAllValues();
 
             foreach (var (key, value) in keyValuePairs)
             {
-                _consoleWriter.WriteLine($"{key} = {value}");
+                Console.WriteLine($"{key} = {value}");
             }
 
             return;
         }
 
         if (opts.ResetConfig)
         {
-            await _configurationManager.Reset();
+            await _appConfigManager.Reset();
         }
     }
 }