Implement Restart method, improve cancel detection on ProcessOperations

marticliment · Dec 26, 2024 · f7fa0a6 · f7fa0a6
1 parent 70289bb
commit f7fa0a6
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 42 deletions.
diff --git a/src/UniGetUI.PackageEngine.Operations/AbstractOperation.cs b/src/UniGetUI.PackageEngine.Operations/AbstractOperation.cs
@@ -99,10 +99,12 @@ public void Cancel()
             case OperationStatus.Failed:
                 break;
             case OperationStatus.Running:
+                Status = OperationStatus.Canceled;
                 CancelRequested?.Invoke(this, EventArgs.Empty);
                 Status = OperationStatus.Canceled;
                 break;
             case OperationStatus.InQueue:
+                Status = OperationStatus.Canceled;
                 OperationQueue.Remove(this);
                 Status = OperationStatus.Canceled;
                 break;
@@ -195,7 +197,8 @@ public async Task MainThread()
         {
             Status = OperationStatus.Failed;
             OperationFailed?.Invoke(this, EventArgs.Empty);
-            Line(Metadata.FailureMessage + " - " + CoreTools.Translate("Click here for more details"), LineType.StdERR);
+            Line(Metadata.FailureMessage, LineType.StdERR);
+            Line(Metadata.FailureMessage + " - " + CoreTools.Translate("Click here for more details"), LineType.Progress);
         }
         else if (result == OperationVeredict.Canceled)
         {
@@ -214,7 +217,8 @@ public void SkipQueue()
 
     public void Retry()
     {
-        throw new NotImplementedException();
+        if (Status is OperationStatus.Running or OperationStatus.InQueue) return;
+        _ = MainThread();
     }
 
     protected abstract Task<OperationVeredict> PerformOperation();

diff --git a/src/UniGetUI.PackageEngine.Operations/PackageOperations.cs b/src/UniGetUI.PackageEngine.Operations/PackageOperations.cs
@@ -61,7 +61,7 @@ public PackageOperation(
             bool IgnoreParallelInstalls = false)
             : this(package, InstallationOptions.FromPackage(package), role, IgnoreParallelInstalls) { }
 
-        protected sealed override async Task PrepareProcessStartInfo()
+        protected sealed override void PrepareProcessStartInfo()
         {
             Package.SetTag(PackageTag.OnQueue);
             string operation_args = string.Join(" ", Package.Manager.OperationHelper.GetParameters(Package, Options, Role));
@@ -74,7 +74,7 @@ protected sealed override async Task PrepareProcessStartInfo()
             {
                 if (Settings.Get("DoCacheAdminRights") || Settings.Get("DoCacheAdminRightsForBatches"))
                 {
-                    await CoreTools.CacheUACForCurrentProcess();
+                    CoreTools.CacheUACForCurrentProcess().GetAwaiter().GetResult();
                 }
 
                 process.StartInfo.FileName = CoreData.GSudoPath;

diff --git a/src/UniGetUI.PackageEngine.Operations/ProcessOperation.cs b/src/UniGetUI.PackageEngine.Operations/ProcessOperation.cs
@@ -6,11 +6,16 @@ namespace UniGetUI.PackageOperations;
 public abstract class AbstractProcessOperation : AbstractOperation
 {
     protected Process process { get; private set; }
+    private bool ProcessKilled;
     protected AbstractProcessOperation(bool queue_enabled) : base(queue_enabled)
     {
         process = new();
-        CancelRequested += (_, _) => process.Kill();
-        OperationStarting += async (_, _) =>
+        CancelRequested += (_, _) =>
+        {
+            ProcessKilled = true;
+            process.Kill();
+        };
+        OperationStarting += (_, _) =>
         {
             process = new();
             process.StartInfo.UseShellExecute = false;
@@ -50,7 +55,7 @@ protected AbstractProcessOperation(bool queue_enabled) : base(queue_enabled)
 
                 Line(line, lineType);
             };
-            await PrepareProcessStartInfo();
+            PrepareProcessStartInfo();
         };
     }
 
@@ -76,9 +81,12 @@ protected override async Task<OperationVeredict> PerformOperation()
         Line($"End Time: \"{DateTime.Now}\"", LineType.OperationInfo);
         Line($"Process return value: \"{process.ExitCode}\" (0x{process.ExitCode:X})", LineType.OperationInfo);
 
+        if (ProcessKilled)
+            return OperationVeredict.Canceled;
+
         return await GetProcessVeredict(process.ExitCode, []);
     }
 
     protected abstract Task<OperationVeredict> GetProcessVeredict(int ReturnCode, string[] Output);
-    protected abstract Task PrepareProcessStartInfo();
+    protected abstract void PrepareProcessStartInfo();
 }
diff --git a/src/UniGetUI.PackageEngine.Operations/SourceOperations.cs b/src/UniGetUI.PackageEngine.Operations/SourceOperations.cs
@@ -36,13 +36,13 @@ public class AddSourceOperation : SourceOperation
         public AddSourceOperation(IManagerSource source) : base(source)
         { }
 
-        protected override async Task PrepareProcessStartInfo()
+        protected override void PrepareProcessStartInfo()
         {
            if (Source.Manager.Capabilities.Sources.MustBeInstalledAsAdmin)
             {
                 if (Settings.Get("DoCacheAdminRights") || Settings.Get("DoCacheAdminRightsForBatches"))
                 {
-                    await CoreTools.CacheUACForCurrentProcess();
+                    CoreTools.CacheUACForCurrentProcess().GetAwaiter().GetResult();
                 }
                 process.StartInfo.FileName = CoreData.GSudoPath;
                 process.StartInfo.Arguments = $"\"{Source.Manager.Status.ExecutablePath}\" " + Source.Manager.Properties.ExecutableCallArgs + " " + string.Join(" ", Source.Manager.SourcesHelper.GetAddSourceParameters(Source));
@@ -80,13 +80,13 @@ public class RemoveSourceOperation : SourceOperation
         public RemoveSourceOperation(IManagerSource source) : base(source)
         { }
 
-        protected override async Task PrepareProcessStartInfo()
+        protected override void PrepareProcessStartInfo()
         {
             if (Source.Manager.Capabilities.Sources.MustBeInstalledAsAdmin)
             {
                 if (Settings.Get("DoCacheAdminRights") || Settings.Get("DoCacheAdminRightsForBatches"))
                 {
-                    await CoreTools.CacheUACForCurrentProcess();
+                    CoreTools.CacheUACForCurrentProcess().GetAwaiter().GetResult();
                 }
                 process.StartInfo.FileName = CoreData.GSudoPath;
                 process.StartInfo.Arguments = $"\"{Source.Manager.Status.ExecutablePath}\" " + Source.Manager.Properties.ExecutableCallArgs + " " + string.Join(" ", Source.Manager.SourcesHelper.GetRemoveSourceParameters(Source));

diff --git a/...UniGetUI.PackageEngine.PackageManagerClasses/Manager/Helpers/PackagePkgOperationHelper.cs b/...UniGetUI.PackageEngine.PackageManagerClasses/Manager/Helpers/PackagePkgOperationHelper.cs
@@ -30,21 +30,12 @@ public IEnumerable<string> GetParameters(
         IInstallationOptions options,
         OperationType operation)
     {
-        try
-        {
-            var parameters = _getOperationParameters(package, options, operation);
-            Logger.Info(
-                $"Loaded operation parameters for package id={package.Id} on manager {Manager.Name} and operation {operation}: " +
-                string.Join(' ', parameters));
-            return parameters;
-        }
-        catch (Exception ex)
-        {
-            Logger.Error(
-                $"A fatal error ocurred while loading operation parameters for package id={package.Id} on manager {Manager.Name} and operation {operation}");
-            Logger.Error(ex);
-            return [];
-        }
+        var parameters = _getOperationParameters(package, options, operation);
+        Logger.Info(
+            $"Loaded operation parameters for package id={package.Id} on manager {Manager.Name} and operation {operation}: " +
+            string.Join(' ', parameters));
+        return parameters;
+
     }
 
     public OperationVeredict GetResult(
@@ -53,22 +44,13 @@ public OperationVeredict GetResult(
         IEnumerable<string> processOutput,
         int returnCode)
     {
-        try
-        {
-            if (returnCode is 999 && processOutput.Last() == "Error: The operation was canceled by the user.")
-            {
-                Logger.Warn("Elevator [or GSudo] UAC prompt was canceled, not showing error message...");
-                return OperationVeredict.Canceled;
-            }
 
-            return _getOperationResult(package, operation, processOutput, returnCode);
-        }
-        catch (Exception ex)
+        if (returnCode is 999 && (!processOutput.Any() || processOutput.Last() == "Error: The operation was canceled by the user."))
         {
-            Logger.Error(
-                $"A fatal error ocurred while loading operation parameters for package id={package.Id} on manager {Manager.Name} and operation {operation}");
-            Logger.Error(ex);
-            return OperationVeredict.Failure;
+            Logger.Warn("Elevator [or GSudo] UAC prompt was canceled, not showing error message...");
+            return OperationVeredict.Canceled;
         }
+
+        return _getOperationResult(package, operation, processOutput, returnCode);
     }
 }
diff --git a/src/UniGetUI/Controls/OperationWidgets/OperationControl.cs b/src/UniGetUI/Controls/OperationWidgets/OperationControl.cs
@@ -24,7 +24,7 @@ namespace UniGetUI.Controls.OperationWidgets;
 public class OperationControl: INotifyPropertyChanged
 {
     public AbstractOperation Operation;
-    private bool ErrorTooltipShown = false;
+    private bool ErrorTooltipShown;
 
     public OperationControl(AbstractOperation operation)
     {