fyr77/EnvyUpdate
Archived
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases 31 Packages Wiki Activity Actions

add support for system 7zip installations

Browse source
This commit is contained in:
Jakob 2023-08-29 15:30:11 +02:00
parent 3fb5799b00
commit 6233a5d88e
2 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
EnvyUpdate/DashboardPage.xaml.cs
View file

@ -383,6 +383,7 @@ namespace EnvyUpdate
progressbarDownload.Value = int.Parse(Math.Truncate(percentage).ToString()); progressbarDownload.Value = int.Parse(Math.Truncate(percentage).ToString());
})); }));
} }
void client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e) void client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
{ {
Application.Current.Dispatcher.Invoke(new Action(() => { Application.Current.Dispatcher.Invoke(new Action(() => {
@ -412,6 +413,7 @@ namespace EnvyUpdate
} }
private void buttonInstall_Click(object sender, RoutedEventArgs e) private void buttonInstall_Click(object sender, RoutedEventArgs e)
{ {
buttonInstall.IsEnabled = false;
string sevenZipPath = Util.GetSevenZip(); string sevenZipPath = Util.GetSevenZip();
ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Info, Wpf.Ui.Common.SymbolRegular.FolderZip24, Properties.Resources.info_extracting, Properties.Resources.info_extracting_title); ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Info, Wpf.Ui.Common.SymbolRegular.FolderZip24, Properties.Resources.info_extracting, Properties.Resources.info_extracting_title);
@ -470,6 +472,9 @@ namespace EnvyUpdate
{ {
Application.Current.Dispatcher.Invoke(new Action(() => { Application.Current.Dispatcher.Invoke(new Action(() => {
ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24, Properties.Resources.info_install_complete, Properties.Resources.info_install_complete_title); ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24, Properties.Resources.info_install_complete, Properties.Resources.info_install_complete_title);
buttonInstall.IsEnabled = true;
buttonInstall.Visibility = Visibility.Collapsed;
buttonDownload.Visibility = Visibility.Visible;
})); }));
Debug.LogToFile("INFO Driver setup complete. Cleaning up setup files."); Debug.LogToFile("INFO Driver setup complete. Cleaning up setup files.");

42
EnvyUpdate/Util.cs
View file

@ -576,17 +576,21 @@ namespace EnvyUpdate
public static string GetSevenZip() public static string GetSevenZip()
{ {
// Note: This download happens on the main thread. I believe spinning up a whole thread to string path;
// download a single 600kb file is less efficient than just doing it on the main thread. if (ExistsOnPath("7zg.exe"))
// At 1Mbit/s, this download takes 5 seconds, in most cases internet should be faster than that.
string path = Path.Combine(GlobalVars.exedirectory, "7zr.exe");
using (WebClient client = new WebClient())
{ {
client.Headers["User-Agent"] = GlobalVars.useragent; path = "7zg.exe";
client.DownloadFile(new Uri("https://www.7-zip.org/a/7zr.exe"), path); }
else
{
path = Path.Combine(GlobalVars.exedirectory, "7zr.exe");
using (WebClient client = new WebClient())
{
client.Headers["User-Agent"] = GlobalVars.useragent;
client.DownloadFile(new Uri("https://www.7-zip.org/a/7zr.exe"), path);
}
Debug.LogToFile("INFO Downloaded 7-zip.");
} }
Debug.LogToFile("INFO Downloaded 7-zip.");
return path; return path;
} }
@ -644,5 +648,25 @@ namespace EnvyUpdate
Debug.LogToFile("INFO Finished removing GFE content from installer config."); Debug.LogToFile("INFO Finished removing GFE content from installer config.");
} }
private static bool ExistsOnPath(string fileName)
{
return GetFullPath(fileName) != null;
}
private static string GetFullPath(string fileName)
{
if (System.IO.File.Exists(fileName))
return Path.GetFullPath(fileName);
var values = Environment.GetEnvironmentVariable("PATH");
foreach (var path in values.Split(Path.PathSeparator))
{
var fullPath = Path.Combine(path, fileName);
if (System.IO.File.Exists(fullPath))
return fullPath;
}
return null;
}
} }
} }