Mirrors/UWUVCI-AIO-WPF
2
0
Fork 0
mirror of https://github.com/stuff-by-3-random-dudes/UWUVCI-AIO-WPF synced 2024-11-10 13:44:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Made changes to make UWUVCI work as async, but it hangs for a while on first boot

Browse source
This commit is contained in:
ZestyTS 2022-07-03 00:13:08 -07:00
parent 904d314697
commit ef7ceb2400
2 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
UWUVCI AIO WPF/Classes/ToolCheck.cs
View file

@ -70,16 +70,16 @@ namespace UWUVCI_AIO_WPF.Classes
public static async Task<bool> IsToolRightAsync(string name)
{
bool ret = false;
using (var client = new WebClient())
WebClient client = new WebClient();
await client.DownloadFileTaskAsync(backupulr + name + ".md5", name + ".md5");
StreamReader sr = new StreamReader(name + ".md5");
var md5 = sr.ReadLine();
if (CalculateMD5(name) == md5)
{
await client.DownloadFileTaskAsync(backupulr + name + ".md5", name + ".md5");
using (var sr = new StreamReader(name + ".md5"))
{
var md5 = sr.ReadLine();
ret = CalculateMD5(name) == md5;
}
File.Delete(name + ".md5");
ret = true;
}
sr.Close();
File.Delete(name + ".md5");
return ret;
}
static string CalculateMD5(string filename)

20
UWUVCI AIO WPF/Models/MainViewModel.cs
View file

@ -1259,7 +1259,7 @@ namespace UWUVCI_AIO_WPF
foreach (string s in bases)
{
DeleteTool(s);
DownloadToolAsync(s, this);
Task.Run(() => DownloadToolAsync(s, this)).GetAwaiter();
Progress += Convert.ToInt32(l);
}
});
@ -1749,7 +1749,6 @@ namespace UWUVCI_AIO_WPF
string basePath = $@"bin\Tools\";
Directory.SetCurrentDirectory(basePath);
}
var toolsDownloaded = await ToolCheck.IsToolRightAsync(name);
do
{
if (File.Exists(name))
@ -1760,8 +1759,7 @@ namespace UWUVCI_AIO_WPF
{
await client.DownloadFileTaskAsync(await getDownloadLinkAsync(name, true), name);
}
toolsDownloaded = await ToolCheck.IsToolRightAsync(name);
} while (!toolsDownloaded);
} while (!Task.Run(() => ToolCheck.IsToolRightAsync(name)).GetAwaiter().GetResult());
}
@ -1858,7 +1856,7 @@ namespace UWUVCI_AIO_WPF
}
}
public async Task InjcttoolCheck()
public void InjcttoolCheck()
{
if (ToolCheck.DoesToolsFolderExist())
{
@ -1872,13 +1870,13 @@ namespace UWUVCI_AIO_WPF
foreach (MissingTool m in missingTools)
{
DownloadToolAsync(m.Name,this);
Task.Run(() => DownloadToolAsync(m.Name,this)).GetAwaiter();
}
await InjcttoolCheck();
InjcttoolCheck();
}
}
@ -1887,7 +1885,7 @@ namespace UWUVCI_AIO_WPF
string path = $@"{Directory.GetCurrentDirectory()}bin\\Tools";
Directory.CreateDirectory($@"{Directory.GetCurrentDirectory()}bin\\Tools");
await InjcttoolCheck();
InjcttoolCheck();
}
}
@ -1916,7 +1914,7 @@ namespace UWUVCI_AIO_WPF
}
else
{
DownloadToolAsync(m.Name, this);
Task.Run(() => DownloadToolAsync(m.Name, this)).GetAwaiter();
}
Progress += Convert.ToInt32(l);
@ -1948,9 +1946,9 @@ namespace UWUVCI_AIO_WPF
if(missingTools.Count > 0)
{
if (await CheckForInternetConnectionAsync())
if (Task.Run(() => CheckForInternetConnectionAsync()).GetAwaiter().GetResult())
{
Task.Run(() => ThreadDownload(missingTools));
Task.Run(() => ThreadDownload(missingTools)).GetAwaiter();
DownloadWait dw = new DownloadWait("Downloading Tools - Please Wait", "", this);
try
{