andreitdr/SethDiscordBot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Wizzy69
2022-06-03 22:38:20 +03:00
parent 0d524cdf65
commit 8fcd33e734
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
DiscordBotGUI/AppUpdater.axaml.cs
View File

@@ -1,7 +1,6 @@
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using PluginManager.Online; using PluginManager.Online;
using PluginManager.Others; using PluginManager.Others;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -16,6 +15,7 @@ namespace DiscordBotGUI
public partial class AppUpdater : Window public partial class AppUpdater : Window
{ {
private string _version; private string _version;
public AppUpdater() public AppUpdater()
{ {
InitializeComponent(); InitializeComponent();
@@ -27,7 +27,6 @@ namespace DiscordBotGUI
if (!File.Exists("./DiscordBot.exe")) DownloadDiscordBotClientNoGUIAsDLL(); if (!File.Exists("./DiscordBot.exe")) DownloadDiscordBotClientNoGUIAsDLL();
Updates(); Updates();
} }
private async void DownloadDiscordBotClientNoGUIAsDLL() private async void DownloadDiscordBotClientNoGUIAsDLL()
@@ -88,31 +87,27 @@ namespace DiscordBotGUI
return; return;
} }
IProgress<float> progress = new Progress<float>((percent) => IProgress<float> progress = new Progress<float>((percent) => { this.progressBar1.Value = percent; });
{
this.progressBar1.Value = percent;
});
textBox1.Text = "Extracting update files ..."; textBox1.Text = "Extracting update files ...";
await Functions.ExtractArchive(file, "./", progress); await Functions.ExtractArchive(file, "./", progress);
progressBar1.IsIndeterminate = true; progressBar1.IsIndeterminate = true;
textBox1.Text = "Setting up the new version ..."; textBox1.Text = "Setting up the new version ...";
File.Delete(file); File.Delete(file);
File.WriteAllText("./Version.txt", "DiscordBotVersion=" + _version); File.WriteAllText("./Version.txt", "DiscordBotVersion=" + _version);
await Task.Delay(5000); await Task.Delay(5000);
new MainWindow() { Height = 425, Width = 650 }.Show(); new MainWindow() { Height = 425, Width = 650 }.Show();
this.Close(); this.Close();
} }
private async Task<string> DownloadNewUpdate() private async Task<string> DownloadNewUpdate()
{ {
string urlNewUpdateZip = (await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Updates/Version"))[1]; string urlNewUpdateZip = (await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Updates/Version"))[1];
int secondsPast = 0; int secondsPast = 0;
bool isDownloading = true; bool isDownloading = true;
this.progressBar1.IsIndeterminate = true; this.progressBar1.IsIndeterminate = true;
textBox1.Text = "Downloading update ..."; textBox1.Text = "Downloading update ...";
IProgress<long> downloaded = new Progress<long>((bytes) => IProgress<long> downloaded = new Progress<long>((bytes) =>
@@ -123,14 +118,13 @@ namespace DiscordBotGUI
IProgress<float> progress = new Progress<float>((percent) => IProgress<float> progress = new Progress<float>((percent) =>
{ {
progressBar1.IsIndeterminate = false; progressBar1.IsIndeterminate = false;
this.progressBar1.Value = percent; this.progressBar1.Value = percent;
}); });
string FileName = $"{urlNewUpdateZip.Split('/')[urlNewUpdateZip.Split('/').Length - 1]}"; string FileName = $"{urlNewUpdateZip.Split('/')[urlNewUpdateZip.Split('/').Length - 1]}";
try try
{ {
new Thread(new Task(() => new Thread(new Task(() =>
{ {
while (isDownloading) while (isDownloading)
@@ -148,6 +142,7 @@ namespace DiscordBotGUI
await Task.Delay(1000); await Task.Delay(1000);
return null; return null;
} }
isDownloading = false; isDownloading = false;
return FileName; return FileName;
} }
@@ -156,14 +151,10 @@ namespace DiscordBotGUI
{ {
try try
{ {
string current_version = Functions.readCodeFromFile("Version.txt", "DiscordBotVersion", '=') ?? "0"; string current_version = Functions.readCodeFromFile("Version.txt", "DiscordBotVersion", '=') ?? "0";
string latest_version = (await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Updates/Version"))[0]; string latest_version = (await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Updates/Version"))[0];
_version = latest_version; _version = latest_version;
if (current_version != latest_version) if (current_version != latest_version) { return true; }
{
return true;
}
return false; return false;
} }