Fix some nullable warnings

marticliment · Jul 20, 2024 · 66f14fb · 66f14fb
1 parent ffc28ba
commit 66f14fb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/UniGetUI.Core.Tools/Tools.cs b/src/UniGetUI.Core.Tools/Tools.cs
@@ -440,7 +440,7 @@ public static long HashStringAsLong(string inputString)
         /// <returns></returns>
         public static async Task CreateSymbolicLinkDir(string linkPath, string targetPath)
         {
-            var psi = new ProcessStartInfo
+            var startInfo = new ProcessStartInfo
             {
                 FileName = "cmd.exe",
                 Arguments = $"/c mklink /D \"{linkPath}\" \"{targetPath}\"",
@@ -450,14 +450,13 @@ public static async Task CreateSymbolicLinkDir(string linkPath, string targetPat
                 RedirectStandardError = true
             };
 
-            using (var process = Process.Start(psi))
+            Process p = Process.Start(startInfo);
+            if (p is not null)
+            {await p.WaitForExitAsync();}
+            if (p is null || p.ExitCode != 0)
             {
-                await process.WaitForExitAsync();
-                if (process.ExitCode != 0)
-                {
-                    throw new Exception(
-                        $"The operation did not complete successfully: \n{await process.StandardOutput.ReadToEndAsync()}\n{await process.StandardError.ReadToEndAsync()}\n");
-                }
+                throw new Exception(
+                    $"The operation did not complete successfully: \n{await p.StandardOutput.ReadToEndAsync()}\n{await p.StandardError.ReadToEndAsync()}\n");
             }
         }
 

diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/BundledWinGetLegacyMethods.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/BundledWinGetLegacyMethods.cs
@@ -36,7 +36,7 @@ public static async Task<Package[]> FindPackages_UnSafe(WinGet Manager, string q
             int VersionIndex = -1;
             int SourceIndex = -1;
             bool DashesPassed = false;
-            string line;
+            string? line;
             while ((line = await p.StandardOutput.ReadLineAsync()) != null)
             {
                 logger.AddToStdOut(line);
@@ -62,7 +62,7 @@ public static async Task<Package[]> FindPackages_UnSafe(WinGet Manager, string q
                     else
                     {
                         string sourceName = line[(SourceIndex - offset)..].Trim().Split(' ')[0];
-                        source = Manager.SourceProvider.SourceFactory.GetSourceOrDefault(sourceName);
+                        source = Manager.GetSourceOrDefault(sourceName);
                     }
                     Packages.Add(new Package(name, id, version, source, Manager));
                 }
@@ -105,7 +105,7 @@ public static async Task<Package[]> GetAvailableUpdates_UnSafe(WinGet Manager)
         int NewVersionIndex = -1;
         int SourceIndex = -1;
         bool DashesPassed = false;
-        string line;
+        string? line;
         while ((line = await p.StandardOutput.ReadLineAsync()) != null)
         {
             logger.AddToStdOut(line);
@@ -147,7 +147,7 @@ public static async Task<Package[]> GetAvailableUpdates_UnSafe(WinGet Manager)
                 else
                 {
                     string sourceName = line[(SourceIndex - offset)..].Trim().Split(' ')[0];
-                    source = Manager.SourceProvider.SourceFactory.GetSourceOrDefault(sourceName);
+                    source = Manager.GetSourceOrDefault(sourceName);
                 }
 
                 Packages.Add(new Package(name, id, version, newVersion, source, Manager));
@@ -189,7 +189,7 @@ public static async Task<Package[]> GetInstalledPackages_UnSafe(WinGet Manager)
             int SourceIndex = -1;
             int NewVersionIndex = -1;
             bool DashesPassed = false;
-            string line;
+            string? line;
             while ((line = await p.StandardOutput.ReadLineAsync()) != null)
             {
                 try
@@ -224,7 +224,7 @@ public static async Task<Package[]> GetInstalledPackages_UnSafe(WinGet Manager)
                         else
                         {
                             string sourceName = line[(SourceIndex - offset)..].Trim().Split(' ')[0].Trim();
-                            source = Manager.SourceProvider.SourceFactory.GetSourceOrDefault(sourceName);
+                            source = Manager.GetSourceOrDefault(sourceName);
                         }
                         Packages.Add(new Package(name, id, version, source, Manager));
                     }