refactor: C# 12

Pip-Manager · Nov 18, 2023 · a05ae04 · a05ae04
1 parent cc40238
commit a05ae04
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 37 deletions.
diff --git a/src/PipManager/Helpers/ActionExceptionAnalyzer.cs b/src/PipManager/Helpers/ActionExceptionAnalyzer.cs
@@ -5,7 +5,7 @@ namespace PipManager.Helpers;
 
 public static class ActionExceptionAnalyzer
 {
-    public static string Analyze(this ActionListItem action)
+    public static string Analyze(this ActionListItem? action)
     {
         if (!action.DetectIssue) return "";
         var speculations = "";

diff --git a/src/PipManager/Models/Action/ActionListItem.cs b/src/PipManager/Models/Action/ActionListItem.cs
@@ -51,14 +51,14 @@ public ActionListItem(ActionType operationType, string operationCommand, string
     public bool ProgressIntermediate { get; set; }
     public int TotalSubTaskNumber { get; set; }
 
-    private int completedSubTaskNumber;
+    private int _completedSubTaskNumber;
 
     public int CompletedSubTaskNumber
     {
-        get => completedSubTaskNumber;
+        get => _completedSubTaskNumber;
         set
         {
-            completedSubTaskNumber = value;
+            _completedSubTaskNumber = value;
             ProgressBarValue = (double)value / TotalSubTaskNumber * 100.0;
         }
     }

diff --git a/src/PipManager/Models/Package/PackageItem.cs b/src/PipManager/Models/Package/PackageItem.cs
@@ -4,16 +4,16 @@ namespace PipManager.Models.Package;
 
 public class PackageItem
 {
-    public string Name { get; set; }
-    public string Version { get; set; }
-    public PackageVersion DetailedVersion { get; set; }
-    public string Path { get; set; }
-    public string DistInfoPath { get; set; }
-    public string Summary { get; set; }
-    public List<string> Author { get; set; }
-    public string AuthorEmail { get; set; }
-    public List<LibraryDetailProjectUrlModel> ProjectUrl { get; set; }
-    public Dictionary<string, List<string>> Classifier { get; set; }
-    public Dictionary<string, List<string>> Metadata { get; set; }
-    public List<string> Record { get; set; }
+    public string? Name { get; set; }
+    public string? Version { get; set; }
+    public PackageVersion? DetailedVersion { get; set; }
+    public string? Path { get; set; }
+    public string? DistInfoPath { get; set; }
+    public string? Summary { get; set; }
+    public List<string>? Author { get; set; }
+    public string? AuthorEmail { get; set; }
+    public List<LibraryDetailProjectUrlModel>? ProjectUrl { get; set; }
+    public Dictionary<string, List<string>>? Classifier { get; set; }
+    public Dictionary<string, List<string>>? Metadata { get; set; }
+    public List<string>? Record { get; set; }
 }
diff --git a/src/PipManager/Models/Pages/LibraryDetailProjectUrlModel.cs b/src/PipManager/Models/Pages/LibraryDetailProjectUrlModel.cs
@@ -4,7 +4,7 @@ namespace PipManager.Models.Pages;
 
 public class LibraryDetailProjectUrlModel
 {
-    public SymbolIcon Icon { get; set; }
-    public string UrlType { get; set; }
-    public string Url { get; set; }
+    public SymbolIcon? Icon { get; set; }
+    public string? UrlType { get; set; }
+    public string? Url { get; set; }
 }
diff --git a/src/PipManager/Models/Pypi/PypiPackageInfo.cs b/src/PipManager/Models/Pypi/PypiPackageInfo.cs
@@ -5,29 +5,29 @@ namespace PipManager.Models.Pypi;
 public class PypiPackageInfo
 {
     [JsonProperty("releases")]
-    public Dictionary<string, List<PypiPackageRelease>> Releases;
+    public required Dictionary<string, List<PypiPackageRelease>> Releases;
 }
 
 public class PypiPackageRelease
 {
     [JsonProperty("filename")]
-    public string Filename;
+    public required string Filename;
 
     [JsonProperty("upload_time")]
-    public string UploadTime;
+    public required string UploadTime;
 
     [JsonProperty("digests")]
-    public PypiPackageDigest Digests;
+    public required PypiPackageDigest Digests;
 }
 
 public class PypiPackageDigest
 {
     [JsonProperty("blake2b_256")]
-    public string Blake2B256;
+    public required string Blake2B256;
 
     [JsonProperty("md5")]
-    public string Md5;
+    public required string Md5;
 
     [JsonProperty("sha256")]
-    public string Sha256;
+    public required string Sha256;
 }
diff --git a/src/PipManager/ViewModels/Pages/About/AboutViewModel.cs b/src/PipManager/ViewModels/Pages/About/AboutViewModel.cs
@@ -6,20 +6,14 @@
 
 namespace PipManager.ViewModels.Pages.About;
 
-public partial class AboutViewModel : ObservableObject, INavigationAware
+public partial class AboutViewModel(IConfigurationService configurationService) : ObservableObject, INavigationAware
 {
     private bool _isInitialized;
-    private readonly IConfigurationService _configurationService;
 
     [ObservableProperty] private string _appVersion = "Development";
     [ObservableProperty] private bool _debugMode;
     [ObservableProperty] private bool _experimentMode;
 
-    public AboutViewModel(IConfigurationService configurationService)
-    {
-        _configurationService = configurationService;
-    }
-
     public void OnNavigatedTo()
     {
         if (!_isInitialized)
@@ -32,8 +26,8 @@ public void OnNavigatedFrom()
 
     private void InitializeViewModel()
     {
-        DebugMode = _configurationService.DebugMode;
-        ExperimentMode = _configurationService.ExperimentMode;
+        DebugMode = configurationService.DebugMode;
+        ExperimentMode = configurationService.ExperimentMode;
         AppVersion = AppInfo.AppVersion;
         _isInitialized = true;
         Log.Information("[About] Initialized");

diff --git a/src/PipManager/ViewModels/Pages/Action/ActionExceptionViewModel.cs b/src/PipManager/ViewModels/Pages/Action/ActionExceptionViewModel.cs
@@ -45,7 +45,7 @@ public void UpdateActionExceptionList()
     }
 
     [RelayCommand]
-    private void ShowException(object parameter)
+    private static void ShowException(object parameter)
     {
         var actionExceptionWindow = App.GetService<ActionExceptionWindow>();
         actionExceptionWindow.Initialize(parameter as ActionListItem);

diff --git a/src/PipManager/Views/Windows/Action/ActionExceptionWindow.xaml.cs b/src/PipManager/Views/Windows/Action/ActionExceptionWindow.xaml.cs
@@ -14,7 +14,7 @@ public ActionExceptionWindow()
         InitializeComponent();
     }
 
-    public void Initialize(ActionListItem action)
+    public void Initialize(ActionListItem? action)
     {
         SpeculationTextBox.Text = action.Analyze();
         OriginalExceptionTextBox.Text = Lang.ActionExceptionWindow_OriginalException + "\n" + action.ConsoleError;