Address null checks

fumiichan · Dec 22, 2023 · 33524d5 · 33524d5
1 parent 060ccd8
commit 33524d5
Show file tree

Hide file tree

Showing 27 changed files with 61 additions and 79 deletions.
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/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/Configuration/AppConfigManager.cs b/Configuration/AppConfigManager.cs
@@ -78,7 +78,7 @@ public void SetValue(string key, string value)
 
     public string GetValue(string key)
     {
-        return _config.TryGetValue(key, out var data) ? data : null;
+        return _config.GetValueOrDefault(key) ?? "";
     }
 
     public IReadOnlyList<(string, string)> GetAllValues()

diff --git a/Configuration/ApplicationSettingsModel.cs b/Configuration/ApplicationSettingsModel.cs
@@ -2,33 +2,33 @@ namespace asuka.Configuration;
 
 public record CookieMetadata
 {
-    public string Name { get; set; }
-    public string Value { get; set; }
-    public string Domain { get; set; }
+    public string Name { get; set; } = "";
+    public string Value { get; set; } = "";
+    public string Domain { get; set; } = "";
     public bool HttpOnly { get; set; }
     public bool Secure { get; set; }
 }
 
 public record CookieStore
 {
-    public CookieMetadata CloudflareClearance { get; set; }
-    public CookieMetadata CsrfToken { get; set; }
+    public CookieMetadata CloudflareClearance { get; set; } = new();
+    public CookieMetadata CsrfToken { get; set; } = new();
 }
 
 public record RequestOptions
 {
-    public CookieStore Cookies { get; set; }
-    public string UserAgent { get; set; }
+    public CookieStore Cookies { get; set; } = new();
+    public string UserAgent { get; set; } = "";
 }
 
 public record Addresses
 {
-    public string ApiBaseAddress { get; set; }
-    public string ImageBaseAddress { get; set; }
+    public string ApiBaseAddress { get; set; } = "";
+    public string ImageBaseAddress { get; set; } = "";
 }
 
 public record ApplicationSettingsModel
 {
-    public Addresses BaseAddresses { get; set; }
-    public RequestOptions RequestOptions { get; set; }
+    public Addresses BaseAddresses { get; set; } = new();
+    public RequestOptions RequestOptions { get; init; } = new();
 }
diff --git a/Configuration/CookieDump.cs b/Configuration/CookieDump.cs
@@ -4,8 +4,8 @@ namespace asuka.Configuration;
 
 public record CookieDump
 {
-    [JsonPropertyName("domain")]
-    public string Domain { get; set; }
+    [JsonPropertyName("domain")] 
+    public string Domain { get; set; } = "";
 
     [JsonPropertyName("httpOnly")]
     public bool HttpOnly { get; set; }
@@ -14,8 +14,8 @@ public record CookieDump
     public bool Secure { get; set; }
 
     [JsonPropertyName("name")]
-    public string Name { get; set; }
+    public string Name { get; set; } = "";
 
     [JsonPropertyName("value")]
-    public string Value { get; set; }
+    public string Value { get; set; } = "";
 }
diff --git a/Configuration/RequestConfigurator.cs b/Configuration/RequestConfigurator.cs
@@ -18,7 +18,9 @@ public RequestConfigurator()
     private async Task<ApplicationSettingsModel> ReadSettings()
     {
         var file = await File.ReadAllTextAsync(_appSettingsPath);
-        return JsonSerializer.Deserialize<ApplicationSettingsModel>(file);
+        var config = JsonSerializer.Deserialize<ApplicationSettingsModel>(file);
+
+        return config ?? new ApplicationSettingsModel();
     }
 
     private async Task WriteSettings(ApplicationSettingsModel settings)

diff --git a/Core/Mappings/ContractToGalleryResultModelMapping.cs b/Core/Mappings/ContractToGalleryResultModelMapping.cs
@@ -23,6 +23,8 @@ public static GalleryResult ToGalleryResult(this GalleryResponse response)
             Characters = response.Tags.GetTagByGroup("character"),
             Tags = response.Tags.GetTagByGroup("tag"),
             Categories = response.Tags.GetTagByGroup("category"),
+            // Not sure about this one.
+            Groups = response.Tags.GetTagByGroup("group"),
             Languages = response.Tags.GetTagByGroup("language"),
             TotalPages = response.TotalPages
         };

diff --git a/Core/Mappings/ContractToUserSelectedModelMapping.cs b/Core/Mappings/ContractToUserSelectedModelMapping.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using asuka.Core.Extensions;
 using asuka.Core.Models;
 using Sharprompt;
 
@@ -11,13 +12,7 @@ public static IReadOnlyList<GalleryResult> FilterByUserSelected(
         this IReadOnlyList<GalleryResult> response)
     {
         var selection = Prompt.MultiSelect("Select to download", response, response.Count,
-            textSelector: (result) =>
-            {
-                var title = string.IsNullOrEmpty(result.Title.Japanese)
-                    ? (string.IsNullOrEmpty(result.Title.English) ? result.Title.Pretty : result.Title.English)
-                    : result.Title.Japanese;
-                return title;
-            });
+            textSelector: result => result.Title.GetTitle());
 
         return selection.ToList();
     }

diff --git a/Core/Models/GalleryImageResult.cs b/Core/Models/GalleryImageResult.cs
@@ -2,6 +2,6 @@ namespace asuka.Core.Models;
 
 public record GalleryImageResult
 {
-    public string ServerFilename { get; init; }
-    public string Filename { get; init; }
+    public required string ServerFilename { get; init; }
+    public required string Filename { get; init; }
 }
diff --git a/Core/Models/GalleryResult.cs b/Core/Models/GalleryResult.cs
@@ -6,14 +6,14 @@ public record GalleryResult
 {
     public int Id { get; init; }
     public int MediaId { get; init; }
-    public GalleryTitleResult Title { get; init; }
-    public IReadOnlyList<GalleryImageResult> Images { get; init; }
-    public IReadOnlyList<string> Artists { get; init; }
-    public IReadOnlyList<string> Parodies { get; init; }
-    public IReadOnlyList<string> Characters { get; init; }
-    public IReadOnlyList<string> Tags { get; init; }
-    public IReadOnlyList<string> Categories { get; init; }
-    public IReadOnlyList<string> Languages { get; init; }
-    public IReadOnlyList<string> Groups { get; init; }
+    public required GalleryTitleResult Title { get; init; }
+    public required IReadOnlyList<GalleryImageResult> Images { get; init; }
+    public required IReadOnlyList<string> Artists { get; init; }
+    public required IReadOnlyList<string> Parodies { get; init; }
+    public required IReadOnlyList<string> Characters { get; init; }
+    public required IReadOnlyList<string> Tags { get; init; }
+    public required IReadOnlyList<string> Categories { get; init; }
+    public required IReadOnlyList<string> Languages { get; init; }
+    public required IReadOnlyList<string> Groups { get; init; }
     public int TotalPages { get; init; }
 }
diff --git a/Core/Models/GallerySeriesChaptersModel.cs b/Core/Models/GallerySeriesChaptersModel.cs
diff --git a/Core/Models/GallerySeriesModel.cs b/Core/Models/GallerySeriesModel.cs
diff --git a/Core/Models/GalleryTitleResult.cs b/Core/Models/GalleryTitleResult.cs
@@ -2,7 +2,7 @@ namespace asuka.Core.Models;
 
 public record GalleryTitleResult
 {
-    public string Japanese { get; init; }
-    public string English { get; init; }
-    public string Pretty { get; init; }
+    public string? Japanese { get; init; }
+    public string? English { get; init; }
+    public string? Pretty { get; init; }
 }
diff --git a/Core/Models/TachiyomiDetails.cs b/Core/Models/TachiyomiDetails.cs
@@ -6,19 +6,19 @@ namespace asuka.Core.Models;
 public record TachiyomiDetails
 {
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; init; }
 
     [JsonPropertyName("author")]
-    public string Author { get; init; }
+    public required string Author { get; init; }
 
     [JsonPropertyName("artist")]
-    public string Artist { get; init; }
+    public required string Artist { get; init; }
 
     [JsonPropertyName("description")]
-    public string Description { get; init; }
+    public required string Description { get; init; }
 
     [JsonPropertyName("genre")]
-    public IReadOnlyList<string> Genres { get; init; }
+    public required IReadOnlyList<string> Genres { get; init; }
 
     [JsonPropertyName("status")]
     public string Status { get; init; } = "2";