From 846cc6e86770f7dfcb136de8f172efb29dc2e8ef Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Fri, 2 Jun 2023 13:16:09 +0200
Subject: [PATCH] Autoupdate fix
---
app/Extra.cs | 2 +-
app/GHelper.csproj | 2 +-
app/Settings.cs | 38 ++++++++++++++++++++++++--------------
3 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/app/Extra.cs b/app/Extra.cs
index f19f047b..f7fc16f9 100644
--- a/app/Extra.cs
+++ b/app/Extra.cs
@@ -265,7 +265,7 @@ namespace GHelper
private void TrackBrightness_Scroll(object? sender, EventArgs e)
{
AppConfig.setConfig("keyboard_brightness", trackBrightness.Value);
- AsusUSB.ApplyBrightness(trackBrightness.Value);
+ AsusUSB.ApplyBrightness(trackBrightness.Value, "Slider");
}
private void PictureHelp_Click(object? sender, EventArgs e)
diff --git a/app/GHelper.csproj b/app/GHelper.csproj
index 95ee8d90..7369900d 100644
--- a/app/GHelper.csproj
+++ b/app/GHelper.csproj
@@ -16,7 +16,7 @@
AnyCPU
False
True
- 0.75
+ 0.76
diff --git a/app/Settings.cs b/app/Settings.cs
index 89baa776..e775a1a1 100644
--- a/app/Settings.cs
+++ b/app/Settings.cs
@@ -370,7 +370,17 @@ namespace GHelper
var json = await httpClient.GetStringAsync("https://api.github.com/repos/seerge/g-helper/releases/latest");
var config = JsonSerializer.Deserialize(json);
var tag = config.GetProperty("tag_name").ToString().Replace("v", "");
- var url = config.GetProperty("assets")[0].GetProperty("browser_download_url").ToString();
+ var assets = config.GetProperty("assets");
+
+ string url = null;
+
+ for (int i = 0; i < assets.GetArrayLength(); i++) {
+ if (assets[i].GetProperty("browser_download_url").ToString().Contains(".zip"))
+ url = assets[i].GetProperty("browser_download_url").ToString();
+ }
+
+ if (url is null)
+ url = assets[0].GetProperty("browser_download_url").ToString();
var gitVersion = new Version(tag);
var appVersion = new Version(Assembly.GetExecutingAssembly().GetName().Version.ToString());
@@ -432,21 +442,21 @@ namespace GHelper
using (WebClient client = new WebClient())
{
client.DownloadFile(uri, zipLocation);
+
+ Logger.WriteLine(requestUri);
+ Logger.WriteLine(zipLocation);
+ Logger.WriteLine(exeLocation);
+
+ var cmd = new Process();
+ cmd.StartInfo.UseShellExecute = false;
+ cmd.StartInfo.CreateNoWindow = true;
+ cmd.StartInfo.FileName = "powershell";
+ cmd.StartInfo.Arguments = $"Start-Sleep -Seconds 1; Expand-Archive {zipLocation} -DestinationPath {exeDir} -Force; Remove-Item {zipLocation} -Force; {exeLocation}";
+ cmd.Start();
+
+ Application.Exit();
}
- var cmd = new Process();
- cmd.StartInfo.UseShellExecute = false;
- cmd.StartInfo.CreateNoWindow = true;
- cmd.StartInfo.FileName = "powershell";
- cmd.StartInfo.Arguments = $"Start-Sleep -Seconds 1; Expand-Archive {zipLocation} -DestinationPath {exeDir} -Force; Remove-Item {zipLocation} -Force; {exeLocation}";
- cmd.Start();
-
- Debug.WriteLine(requestUri);
- Debug.WriteLine(zipLocation);
-
- Application.Exit();
- return;
-
}