tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed review comments

Browse Source
This commit is contained in:
Mbucari 2023-02-28 07:42:26 -07:00
parent 429aa603f5
commit 5c45802391
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/LibationAvalonia/Views/MainWindow.Upgrade.cs
View File

@ -24,7 +24,7 @@ namespace LibationAvalonia.Views
upgrader.DownloadBegin += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(true)); upgrader.DownloadBegin += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(true));
upgrader.DownloadCompleted += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(false)); upgrader.DownloadCompleted += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(false));
Opened += async (_, _) => await upgrader.CheForUpgradeAsync(upgradeAvailable); Opened += async (_, _) => await upgrader.CheckForUpgradeAsync(upgradeAvailable);
#endif #endif
} }

2
Source/LibationUiBase/Upgrader.cs
View File

@ -40,7 +40,7 @@ namespace LibationUiBase
public event EventHandler<DownloadProgress> DownloadProgress; public event EventHandler<DownloadProgress> DownloadProgress;
public event EventHandler<bool> DownloadCompleted; public event EventHandler<bool> DownloadCompleted;
public async Task CheForUpgradeAsync(Func<UpgradeEventArgs,Task> upgradeAvailableHandler) public async Task CheckForUpgradeAsync(Func<UpgradeEventArgs,Task> upgradeAvailableHandler)
{ {
try try
{ {

2
Source/LibationWinForms/Form1.Upgrade.cs
View File

@ -25,7 +25,7 @@ namespace LibationWinForms
upgrader.DownloadBegin += (_, _) => Invoke(() => setProgressVisible(true)); upgrader.DownloadBegin += (_, _) => Invoke(() => setProgressVisible(true));
upgrader.DownloadCompleted += (_, _) => Invoke(() => setProgressVisible(false)); upgrader.DownloadCompleted += (_, _) => Invoke(() => setProgressVisible(false));
Shown += async (_, _) => await upgrader.CheForUpgradeAsync(upgradeAvailable); Shown += async (_, _) => await upgrader.CheckForUpgradeAsync(upgradeAvailable);
#endif #endif
} }

6
Source/LoadByOS/WindowsConfigApp/WinInterop.cs
View File

@ -3,6 +3,7 @@ using System.Diagnostics;
using LibationFileManager; using LibationFileManager;
using System.IO; using System.IO;
using System; using System;
using Dinah.Core;
namespace WindowsConfigApp namespace WindowsConfigApp
{ {
@ -42,7 +43,10 @@ namespace WindowsConfigApp
File.Copy("ZipExtractor.exe", zipExtractor, overwrite: true); File.Copy("ZipExtractor.exe", zipExtractor, overwrite: true);
RunAsRoot(zipExtractor, $"--input \"{upgradeBundle}\" --output \"{thisDir}\" --executable \"{thisExe}\""); RunAsRoot(zipExtractor,
$"--input {upgradeBundle.SurroundWithQuotes()} " +
$"--output {thisDir.SurroundWithQuotes()} " +
$"--executable {thisExe.SurroundWithQuotes()}");
} }
public Process RunAsRoot(string exe, string args) public Process RunAsRoot(string exe, string args)